diff --git a/packages/flutter_tools/lib/src/web/bootstrap.dart b/packages/flutter_tools/lib/src/web/bootstrap.dart index 53ef4bfd3e2..5f5f6d1f697 100644 --- a/packages/flutter_tools/lib/src/web/bootstrap.dart +++ b/packages/flutter_tools/lib/src/web/bootstrap.dart @@ -196,6 +196,12 @@ define("$bootstrapModule", ["$entrypoint", "dart_sdk"], function(app, dart_sdk) return dart.getSourceMap(url); }); } + // Prevent DDC's requireJS to interfere with modern bundling. + if (typeof define === 'function' && define.amd) { + // Preserve a copy just in case... + define._amd = define.amd; + delete define.amd; + } }); '''; } diff --git a/packages/flutter_tools/test/general.shard/web/bootstrap_test.dart b/packages/flutter_tools/test/general.shard/web/bootstrap_test.dart index f0c28e11074..b2f3ad70569 100644 --- a/packages/flutter_tools/test/general.shard/web/bootstrap_test.dart +++ b/packages/flutter_tools/test/general.shard/web/bootstrap_test.dart @@ -62,6 +62,18 @@ void main() { expect(result, matches(regex), reason: 'require.config must have a waitSeconds: 0 config entry'); }); + test('generateMainModule hides requireJS injected by DDC', () { + final String result = generateMainModule( + entrypoint: 'foo/bar/main.js', + nullAssertions: false, + nativeNullAssertions: false, + ); + expect(result, contains('''define._amd = define.amd;'''), + reason: 'define.amd must be preserved as _amd so users may restore it if needed.'); + expect(result, contains('''delete define.amd;'''), + reason: "define.amd must be removed so packages don't attempt to use Dart's instance."); + }); + test('generateMainModule embeds urls correctly', () { final String result = generateMainModule( entrypoint: 'foo/bar/main.js',