use package-scheme imports for generated web entrypoint (#45934)
diff --git a/packages/flutter_tools/lib/src/build_system/targets/web.dart b/packages/flutter_tools/lib/src/build_system/targets/web.dart
index abf9423..45ae84b 100644
--- a/packages/flutter_tools/lib/src/build_system/targets/web.dart
+++ b/packages/flutter_tools/lib/src/build_system/targets/web.dart
@@ -7,6 +7,7 @@
import '../../base/io.dart';
import '../../base/process_manager.dart';
import '../../build_info.dart';
+import '../../compile.dart';
import '../../dart/package_map.dart';
import '../../globals.dart';
import '../../project.dart';
@@ -51,21 +52,32 @@
final String targetFile = environment.defines[kTargetFile];
final bool shouldInitializePlatform = environment.defines[kInitializePlatform] == 'true';
final bool hasPlugins = environment.defines[kHasWebPlugins] == 'true';
- final String import = fs.file(fs.path.absolute(targetFile)).uri.toString();
+ final String importPath = fs.path.absolute(targetFile);
+ final PackageUriMapper packageUriMapper = PackageUriMapper(
+ importPath,
+ PackageMap.globalPackagesPath,
+ null,
+ null,
+ );
+ final Uri mainImport = packageUriMapper.map(importPath);
+ if (mainImport == null) {
+ throw Exception('Missing package definition for $mainImport');
+ }
String contents;
if (hasPlugins) {
final String generatedPath = environment.projectDir
.childDirectory('lib')
.childFile('generated_plugin_registrant.dart')
- .absolute.uri.toString();
+ .absolute.path;
+ final Uri generatedImport = packageUriMapper.map(generatedPath);
contents = '''
import 'dart:ui' as ui;
import 'package:flutter_web_plugins/flutter_web_plugins.dart';
-import '$generatedPath';
-import "$import" as entrypoint;
+import '$generatedImport';
+import '$mainImport' as entrypoint;
Future<void> main() async {
registerPlugins(webPluginRegistry);
@@ -79,7 +91,7 @@
contents = '''
import 'dart:ui' as ui;
-import "$import" as entrypoint;
+import '$mainImport' as entrypoint;
Future<void> main() async {
if ($shouldInitializePlatform) {
diff --git a/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart
index eaa93fe..ac7b7d2 100644
--- a/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart
+++ b/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart
@@ -9,6 +9,7 @@
import 'package:flutter_tools/src/build_system/depfile.dart';
import 'package:flutter_tools/src/build_system/targets/dart.dart';
import 'package:flutter_tools/src/build_system/targets/web.dart';
+import 'package:flutter_tools/src/dart/package_map.dart';
import 'package:mockito/mockito.dart';
import 'package:process/process.dart';
@@ -35,12 +36,17 @@
when(mockWindowsPlatform.isLinux).thenReturn(false);
testbed = Testbed(setup: () {
+ final File packagesFile = fs.file(fs.path.join('foo', '.packages'))
+ ..createSync(recursive: true)
+ ..writeAsStringSync('foo:lib/\n');
+ PackageMap.globalPackagesPath = packagesFile.path;
+
environment = Environment(
- projectDir: fs.currentDirectory,
+ projectDir: fs.currentDirectory.childDirectory('foo'),
outputDir: fs.currentDirectory,
buildDir: fs.currentDirectory,
defines: <String, String>{
- kTargetFile: fs.path.join('lib', 'main.dart'),
+ kTargetFile: fs.path.join('foo', 'lib', 'main.dart'),
}
);
environment.buildDir.createSync(recursive: true);
@@ -57,7 +63,7 @@
final String generated = environment.buildDir.childFile('main.dart').readAsStringSync();
// Plugins
- expect(generated, contains("import 'file:///lib/generated_plugin_registrant.dart';"));
+ expect(generated, contains("import 'package:foo/generated_plugin_registrant.dart';"));
expect(generated, contains('registerPlugins(webPluginRegistry);'));
// Platform
@@ -67,7 +73,7 @@
expect(generated, contains('entrypoint.main();'));
// Import.
- expect(generated, contains('import "file:///lib/main.dart" as entrypoint;'));
+ expect(generated, contains("import 'package:foo/main.dart' as entrypoint;"));
}));
test('WebEntrypointTarget generates an entrypoint with plugins and init platform on windows', () => testbed.run(() async {
@@ -78,7 +84,7 @@
final String generated = environment.buildDir.childFile('main.dart').readAsStringSync();
// Plugins
- expect(generated, contains("import 'file:///C:/lib/generated_plugin_registrant.dart';"));
+ expect(generated, contains("import 'package:foo/generated_plugin_registrant.dart';"));
expect(generated, contains('registerPlugins(webPluginRegistry);'));
// Platform
@@ -88,7 +94,7 @@
expect(generated, contains('entrypoint.main();'));
// Import.
- expect(generated, contains('import "file:///C:/lib/main.dart" as entrypoint;'));
+ expect(generated, contains("import 'package:foo/main.dart' as entrypoint;"));
}, overrides: <Type, Generator>{
Platform: () => mockWindowsPlatform,
}));
@@ -101,7 +107,7 @@
final String generated = environment.buildDir.childFile('main.dart').readAsStringSync();
// Plugins
- expect(generated, isNot(contains("import 'file:///lib/generated_plugin_registrant.dart';")));
+ expect(generated, isNot(contains("import 'package:foo/generated_plugin_registrant.dart';")));
expect(generated, isNot(contains('registerPlugins(webPluginRegistry);')));
// Platform
@@ -119,7 +125,7 @@
final String generated = environment.buildDir.childFile('main.dart').readAsStringSync();
// Plugins
- expect(generated, contains("import 'file:///lib/generated_plugin_registrant.dart';"));
+ expect(generated, contains("import 'package:foo/generated_plugin_registrant.dart';"));
expect(generated, contains('registerPlugins(webPluginRegistry);'));
// Platform
@@ -137,7 +143,7 @@
final String generated = environment.buildDir.childFile('main.dart').readAsStringSync();
// Plugins
- expect(generated, isNot(contains("import 'file:///lib/generated_plugin_registrant.dart';")));
+ expect(generated, isNot(contains("import 'package:foo/generated_plugin_registrant.dart';")));
expect(generated, isNot(contains('registerPlugins(webPluginRegistry);')));
// Platform
@@ -162,7 +168,7 @@
'--no-minify', // but uses unminified names for debugging
'-o',
environment.buildDir.childFile('main.dart.js').absolute.path,
- '--packages=.packages',
+ '--packages=${fs.path.join('foo', '.packages')}',
'-Ddart.vm.profile=true',
environment.buildDir.childFile('main.dart').absolute.path,
];
@@ -185,7 +191,7 @@
'-O4', // highest optimizations.
'-o',
environment.buildDir.childFile('main.dart.js').absolute.path,
- '--packages=.packages',
+ '--packages=${fs.path.join('foo', '.packages')}',
'-Ddart.vm.product=true',
environment.buildDir.childFile('main.dart').absolute.path,
];
@@ -209,7 +215,7 @@
'-O3', // configured optimizations.
'-o',
environment.buildDir.childFile('main.dart.js').absolute.path,
- '--packages=.packages',
+ '--packages=${fs.path.join('foo', '.packages')}',
'-Ddart.vm.product=true',
environment.buildDir.childFile('main.dart').absolute.path,
];
@@ -252,7 +258,7 @@
'-O4',
'-o',
environment.buildDir.childFile('main.dart.js').absolute.path,
- '--packages=.packages',
+ '--packages=${fs.path.join('foo', '.packages')}',
'-Ddart.vm.product=true',
'-DFOO=bar',
'-DBAZ=qux',
@@ -279,7 +285,7 @@
'--no-minify',
'-o',
environment.buildDir.childFile('main.dart.js').absolute.path,
- '--packages=.packages',
+ '--packages=${fs.path.join('foo', '.packages')}',
'-Ddart.vm.profile=true',
'-DFOO=bar',
'-DBAZ=qux',
