diff --git a/packages/flutter_tools/lib/src/artifacts.dart b/packages/flutter_tools/lib/src/artifacts.dart index 3f5e6caa54..56fc1f4fad 100644 --- a/packages/flutter_tools/lib/src/artifacts.dart +++ b/packages/flutter_tools/lib/src/artifacts.dart @@ -92,6 +92,8 @@ enum HostArtifact { /// Folder that contains platform dill files for the web sdk. webPlatformKernelFolder, + // TODO(matanlurey): Remove the non-Sound variants, and rename the Sound variants, https://github.com/flutter/flutter/issues/162846. + /// The summary dill for the dartdevc target. webPlatformDDCKernelDill, diff --git a/packages/flutter_tools/lib/src/isolated/devfs_web.dart b/packages/flutter_tools/lib/src/isolated/devfs_web.dart index b34264c6c2..3885aa4c18 100644 --- a/packages/flutter_tools/lib/src/isolated/devfs_web.dart +++ b/packages/flutter_tools/lib/src/isolated/devfs_web.dart @@ -127,7 +127,6 @@ class WebAssetServer implements AssetReader { this.internetAddress, this._modules, this._digests, - this._nullSafetyMode, this._ddcModuleSystem, this._canaryFeatures, { required this.webRenderer, @@ -250,8 +249,7 @@ class WebAssetServer implements AssetReader { bool enableDds, Uri entrypoint, ExpressionCompiler? expressionCompiler, - Map extraHeaders, - NullSafetyMode nullSafetyMode, { + Map extraHeaders, { required WebRendererMode webRenderer, required bool isWasm, required bool useLocalCanvasKit, @@ -311,7 +309,6 @@ class WebAssetServer implements AssetReader { address, modules, digests, - nullSafetyMode, ddcModuleSystem, canaryFeatures, webRenderer: webRenderer, @@ -432,7 +429,6 @@ class WebAssetServer implements AssetReader { return server; } - final NullSafetyMode _nullSafetyMode; final bool _ddcModuleSystem; final bool _canaryFeatures; final HttpServer _httpServer; @@ -752,19 +748,15 @@ _flutter.buildConfig = ${jsonEncode(buildConfig)}; } File get _resolveDartSdkJsFile { - final Map> dartSdkArtifactMap = + final Map dartSdkArtifactMap = _ddcModuleSystem ? kDdcLibraryBundleDartSdkJsArtifactMap : kAmdDartSdkJsArtifactMap; - return globals.fs.file( - globals.artifacts!.getHostArtifact(dartSdkArtifactMap[webRenderer]![_nullSafetyMode]!), - ); + return globals.fs.file(globals.artifacts!.getHostArtifact(dartSdkArtifactMap[webRenderer]!)); } File get _resolveDartSdkJsMapFile { - final Map> dartSdkArtifactMap = + final Map dartSdkArtifactMap = _ddcModuleSystem ? kDdcLibraryBundleDartSdkJsMapArtifactMap : kAmdDartSdkJsMapArtifactMap; - return globals.fs.file( - globals.artifacts!.getHostArtifact(dartSdkArtifactMap[webRenderer]![_nullSafetyMode]!), - ); + return globals.fs.file(globals.artifacts!.getHostArtifact(dartSdkArtifactMap[webRenderer]!)); } @override @@ -839,7 +831,6 @@ class WebDevFS implements DevFS { required this.chromiumLauncher, required this.nullAssertions, required this.nativeNullAssertions, - required this.nullSafetyMode, required this.ddcModuleSystem, required this.canaryFeatures, required this.webRenderer, @@ -875,7 +866,6 @@ class WebDevFS implements DevFS { final bool nullAssertions; final bool nativeNullAssertions; final int _port; - final NullSafetyMode nullSafetyMode; final String? tlsCertPath; final String? tlsCertKeyPath; final WebRendererMode webRenderer; @@ -977,7 +967,6 @@ class WebDevFS implements DevFS { entrypoint, expressionCompiler, extraHeaders, - nullSafetyMode, webRenderer: webRenderer, isWasm: isWasm, useLocalCanvasKit: useLocalCanvasKit, diff --git a/packages/flutter_tools/lib/src/isolated/resident_web_runner.dart b/packages/flutter_tools/lib/src/isolated/resident_web_runner.dart index f3ccd0636f..0211eb3122 100644 --- a/packages/flutter_tools/lib/src/isolated/resident_web_runner.dart +++ b/packages/flutter_tools/lib/src/isolated/resident_web_runner.dart @@ -306,7 +306,6 @@ Please provide a valid TCP port (an integer between 0 and 65535, inclusive). extraHeaders: debuggingOptions.webHeaders, chromiumLauncher: _chromiumLauncher, nullAssertions: debuggingOptions.nullAssertions, - nullSafetyMode: debuggingOptions.buildInfo.nullSafetyMode, nativeNullAssertions: debuggingOptions.nativeNullAssertions, ddcModuleSystem: debuggingOptions.buildInfo.ddcModuleFormat == DdcModuleFormat.ddc, canaryFeatures: debuggingOptions.buildInfo.canaryFeatures ?? false, diff --git a/packages/flutter_tools/lib/src/test/flutter_web_platform.dart b/packages/flutter_tools/lib/src/test/flutter_web_platform.dart index 80b27fb7a6..696d3c36ab 100644 --- a/packages/flutter_tools/lib/src/test/flutter_web_platform.dart +++ b/packages/flutter_tools/lib/src/test/flutter_web_platform.dart @@ -228,12 +228,6 @@ class FlutterWebPlatform extends PlatformPlugin { bool get _closed => _closeMemo.hasRun; - NullSafetyMode get _nullSafetyMode { - return buildInfo.nullSafetyMode == NullSafetyMode.sound - ? NullSafetyMode.sound - : NullSafetyMode.unsound; - } - final Configuration _config; final shelf.Server _server; Uri get url => _server.url; @@ -298,13 +292,11 @@ class FlutterWebPlatform extends PlatformPlugin { if (buildInfo.ddcModuleFormat == DdcModuleFormat.ddc) { assert(buildInfo.canaryFeatures ?? true); } - final Map> dartSdkArtifactMap = + final Map dartSdkArtifactMap = buildInfo.ddcModuleFormat == DdcModuleFormat.ddc ? kDdcLibraryBundleDartSdkJsArtifactMap : kAmdDartSdkJsArtifactMap; - return _fileSystem.file( - _artifacts!.getHostArtifact(dartSdkArtifactMap[webRenderer]![_nullSafetyMode]!), - ); + return _fileSystem.file(_artifacts!.getHostArtifact(dartSdkArtifactMap[webRenderer]!)); } File get _dartSdkSourcemaps { @@ -313,13 +305,11 @@ class FlutterWebPlatform extends PlatformPlugin { if (buildInfo.ddcModuleFormat == DdcModuleFormat.ddc) { assert(buildInfo.canaryFeatures ?? true); } - final Map> dartSdkArtifactMap = + final Map dartSdkArtifactMap = buildInfo.ddcModuleFormat == DdcModuleFormat.ddc ? kDdcLibraryBundleDartSdkJsMapArtifactMap : kAmdDartSdkJsMapArtifactMap; - return _fileSystem.file( - _artifacts!.getHostArtifact(dartSdkArtifactMap[webRenderer]![_nullSafetyMode]!), - ); + return _fileSystem.file(_artifacts!.getHostArtifact(dartSdkArtifactMap[webRenderer]!)); } File _canvasKitFile(String relativePath) { diff --git a/packages/flutter_tools/lib/src/web/compile.dart b/packages/flutter_tools/lib/src/web/compile.dart index c12159c079..053b730601 100644 --- a/packages/flutter_tools/lib/src/web/compile.dart +++ b/packages/flutter_tools/lib/src/web/compile.dart @@ -250,72 +250,42 @@ enum WebRendererMode { /// The correct precompiled artifact to use for each build and render mode for DDC with AMD modules. // TODO(markzipan): delete this when DDC's AMD module system is deprecated, https://github.com/flutter/flutter/issues/142060. -const Map> kAmdDartSdkJsArtifactMap = - >{ - WebRendererMode.auto: { - NullSafetyMode.sound: HostArtifact.webPrecompiledAmdCanvaskitAndHtmlSoundSdk, - NullSafetyMode.unsound: HostArtifact.webPrecompiledAmdCanvaskitAndHtmlSdk, - }, - WebRendererMode.canvaskit: { - NullSafetyMode.sound: HostArtifact.webPrecompiledAmdCanvaskitSoundSdk, - NullSafetyMode.unsound: HostArtifact.webPrecompiledAmdCanvaskitSdk, - }, - WebRendererMode.html: { - NullSafetyMode.sound: HostArtifact.webPrecompiledAmdSoundSdk, - NullSafetyMode.unsound: HostArtifact.webPrecompiledAmdSdk, - }, - }; +const Map kAmdDartSdkJsArtifactMap = { + WebRendererMode.auto: HostArtifact.webPrecompiledAmdCanvaskitAndHtmlSoundSdk, + WebRendererMode.canvaskit: HostArtifact.webPrecompiledAmdCanvaskitSoundSdk, + WebRendererMode.html: HostArtifact.webPrecompiledAmdSoundSdk, +}; /// The correct source map artifact to use for each build and render mode for DDC with AMD modules. // TODO(markzipan): delete this when DDC's AMD module system is deprecated, https://github.com/flutter/flutter/issues/142060. -const Map> kAmdDartSdkJsMapArtifactMap = - >{ - WebRendererMode.auto: { - NullSafetyMode.sound: HostArtifact.webPrecompiledAmdCanvaskitAndHtmlSoundSdkSourcemaps, - NullSafetyMode.unsound: HostArtifact.webPrecompiledAmdCanvaskitAndHtmlSdkSourcemaps, - }, - WebRendererMode.canvaskit: { - NullSafetyMode.sound: HostArtifact.webPrecompiledAmdCanvaskitSoundSdkSourcemaps, - NullSafetyMode.unsound: HostArtifact.webPrecompiledAmdCanvaskitSdkSourcemaps, - }, - WebRendererMode.html: { - NullSafetyMode.sound: HostArtifact.webPrecompiledAmdSoundSdkSourcemaps, - NullSafetyMode.unsound: HostArtifact.webPrecompiledAmdSdkSourcemaps, - }, +const Map kAmdDartSdkJsMapArtifactMap = + { + WebRendererMode.auto: HostArtifact.webPrecompiledAmdCanvaskitAndHtmlSoundSdkSourcemaps, + WebRendererMode.canvaskit: HostArtifact.webPrecompiledAmdCanvaskitSoundSdkSourcemaps, + WebRendererMode.html: HostArtifact.webPrecompiledAmdSoundSdkSourcemaps, }; /// The correct precompiled artifact to use for each build and render mode for /// DDC with DDC library bundle module format. Only artifacts with sound /// null-safety are provided. -const Map> -kDdcLibraryBundleDartSdkJsArtifactMap = >{ - WebRendererMode.auto: { - NullSafetyMode.sound: HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitAndHtmlSoundSdk, - }, - WebRendererMode.canvaskit: { - NullSafetyMode.sound: HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSoundSdk, - }, - WebRendererMode.html: { - NullSafetyMode.sound: HostArtifact.webPrecompiledDdcLibraryBundleSoundSdk, - }, -}; +const Map kDdcLibraryBundleDartSdkJsArtifactMap = + { + WebRendererMode.auto: HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitAndHtmlSoundSdk, + WebRendererMode.canvaskit: HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSoundSdk, + WebRendererMode.html: HostArtifact.webPrecompiledDdcLibraryBundleSoundSdk, + }; /// The correct source map artifact to use for each build and render mode for /// DDC with DDC library bundle module format. Only artifacts with sound /// null-safety are provided. -const Map> -kDdcLibraryBundleDartSdkJsMapArtifactMap = >{ - WebRendererMode.auto: { - NullSafetyMode.sound: - HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitAndHtmlSoundSdkSourcemaps, - }, - WebRendererMode.canvaskit: { - NullSafetyMode.sound: HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSoundSdkSourcemaps, - }, - WebRendererMode.html: { - NullSafetyMode.sound: HostArtifact.webPrecompiledDdcLibraryBundleSoundSdkSourcemaps, - }, -}; +const Map kDdcLibraryBundleDartSdkJsMapArtifactMap = + { + WebRendererMode.auto: + HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitAndHtmlSoundSdkSourcemaps, + WebRendererMode.canvaskit: + HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSoundSdkSourcemaps, + WebRendererMode.html: HostArtifact.webPrecompiledDdcLibraryBundleSoundSdkSourcemaps, + }; String _buildEventAnalyticsSettings({required List configs}) { final Map values = {}; diff --git a/packages/flutter_tools/test/general.shard/web/devfs_web_ddc_modules_test.dart b/packages/flutter_tools/test/general.shard/web/devfs_web_ddc_modules_test.dart index 13f2b864b5..3d06e34943 100644 --- a/packages/flutter_tools/test/general.shard/web/devfs_web_ddc_modules_test.dart +++ b/packages/flutter_tools/test/general.shard/web/devfs_web_ddc_modules_test.dart @@ -72,7 +72,6 @@ void main() { InternetAddress.loopbackIPv4, {}, {}, - NullSafetyMode.unsound, usesDdcModuleSystem, canaryFeatures, webRenderer: WebRendererMode.canvaskit, @@ -318,7 +317,6 @@ void main() { InternetAddress.loopbackIPv4, {}, {}, - NullSafetyMode.unsound, usesDdcModuleSystem, canaryFeatures, webRenderer: WebRendererMode.canvaskit, @@ -339,7 +337,6 @@ void main() { InternetAddress.loopbackIPv4, {}, {}, - NullSafetyMode.unsound, usesDdcModuleSystem, canaryFeatures, webRenderer: WebRendererMode.canvaskit, @@ -363,7 +360,6 @@ void main() { InternetAddress.loopbackIPv4, {}, {}, - NullSafetyMode.unsound, usesDdcModuleSystem, canaryFeatures, webRenderer: WebRendererMode.canvaskit, @@ -386,7 +382,6 @@ void main() { InternetAddress.loopbackIPv4, {}, {}, - NullSafetyMode.unsound, usesDdcModuleSystem, canaryFeatures, webRenderer: WebRendererMode.canvaskit, @@ -810,7 +805,6 @@ void main() { expressionCompiler: null, extraHeaders: const {}, chromiumLauncher: null, - nullSafetyMode: NullSafetyMode.sound, ddcModuleSystem: usesDdcModuleSystem, canaryFeatures: canaryFeatures, webRenderer: WebRendererMode.html, @@ -938,7 +932,6 @@ void main() { expressionCompiler: null, extraHeaders: const {}, chromiumLauncher: null, - nullSafetyMode: NullSafetyMode.sound, ddcModuleSystem: usesDdcModuleSystem, canaryFeatures: canaryFeatures, webRenderer: WebRendererMode.canvaskit, @@ -1014,7 +1007,6 @@ void main() { chromiumLauncher: null, nullAssertions: true, nativeNullAssertions: true, - nullSafetyMode: NullSafetyMode.sound, ddcModuleSystem: usesDdcModuleSystem, canaryFeatures: canaryFeatures, webRenderer: WebRendererMode.canvaskit, @@ -1065,7 +1057,6 @@ void main() { expressionCompiler: null, extraHeaders: const {}, chromiumLauncher: null, - nullSafetyMode: NullSafetyMode.sound, ddcModuleSystem: usesDdcModuleSystem, canaryFeatures: canaryFeatures, webRenderer: WebRendererMode.canvaskit, @@ -1117,7 +1108,6 @@ void main() { expressionCompiler: null, extraHeaders: const {}, chromiumLauncher: null, - nullSafetyMode: NullSafetyMode.sound, ddcModuleSystem: usesDdcModuleSystem, canaryFeatures: canaryFeatures, webRenderer: WebRendererMode.auto, @@ -1169,7 +1159,6 @@ void main() { expressionCompiler: null, extraHeaders: const {}, chromiumLauncher: null, - nullSafetyMode: NullSafetyMode.unsound, ddcModuleSystem: usesDdcModuleSystem, canaryFeatures: canaryFeatures, webRenderer: WebRendererMode.canvaskit, @@ -1211,7 +1200,6 @@ void main() { Uri.base, null, const {}, - NullSafetyMode.unsound, webRenderer: WebRendererMode.canvaskit, isWasm: false, useLocalCanvasKit: false, @@ -1246,7 +1234,6 @@ void main() { Uri.base, null, const {extraHeaderKey: extraHeaderValue}, - NullSafetyMode.unsound, webRenderer: WebRendererMode.canvaskit, isWasm: false, useLocalCanvasKit: false, @@ -1284,7 +1271,6 @@ void main() { InternetAddress.anyIPv4, {}, {}, - NullSafetyMode.sound, usesDdcModuleSystem, canaryFeatures, webRenderer: WebRendererMode.canvaskit, @@ -1334,7 +1320,6 @@ void main() { expressionCompiler: null, extraHeaders: const {}, chromiumLauncher: null, - nullSafetyMode: NullSafetyMode.unsound, ddcModuleSystem: usesDdcModuleSystem, canaryFeatures: canaryFeatures, webRenderer: WebRendererMode.canvaskit, diff --git a/packages/flutter_tools/test/general.shard/web/devfs_web_test.dart b/packages/flutter_tools/test/general.shard/web/devfs_web_test.dart index db3395ccf3..fc83ebefcc 100644 --- a/packages/flutter_tools/test/general.shard/web/devfs_web_test.dart +++ b/packages/flutter_tools/test/general.shard/web/devfs_web_test.dart @@ -30,70 +30,14 @@ import '../../src/common.dart'; import '../../src/testbed.dart'; const List kTransparentImage = [ - 0x89, - 0x50, - 0x4E, - 0x47, - 0x0D, - 0x0A, - 0x1A, - 0x0A, - 0x00, - 0x00, - 0x00, - 0x0D, - 0x49, - 0x48, - 0x44, - 0x52, - 0x00, - 0x00, - 0x00, - 0x01, - 0x00, - 0x00, - 0x00, - 0x01, - 0x08, - 0x06, - 0x00, - 0x00, - 0x00, - 0x1F, - 0x15, - 0xC4, - 0x89, - 0x00, - 0x00, - 0x00, - 0x0A, - 0x49, - 0x44, - 0x41, - 0x54, - 0x78, - 0x9C, - 0x63, - 0x00, - 0x01, - 0x00, - 0x00, - 0x05, - 0x00, - 0x01, - 0x0D, - 0x0A, - 0x2D, - 0xB4, - 0x00, - 0x00, - 0x00, - 0x00, - 0x49, - 0x45, - 0x4E, - 0x44, - 0xAE, + 0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, // + 0x00, 0x00, 0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, + 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, + 0x08, 0x06, 0x00, 0x00, 0x00, 0x1F, 0x15, 0xC4, + 0x89, 0x00, 0x00, 0x00, 0x0A, 0x49, 0x44, 0x41, + 0x54, 0x78, 0x9C, 0x63, 0x00, 0x01, 0x00, 0x00, + 0x05, 0x00, 0x01, 0x0D, 0x0A, 0x2D, 0xB4, 0x00, + 0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, ]; void main() { @@ -127,7 +71,6 @@ void main() { InternetAddress.loopbackIPv4, {}, {}, - NullSafetyMode.unsound, usesDdcModuleSystem, canaryFeatures, webRenderer: WebRendererMode.canvaskit, @@ -395,7 +338,6 @@ void main() { InternetAddress.loopbackIPv4, {}, {}, - NullSafetyMode.unsound, usesDdcModuleSystem, canaryFeatures, webRenderer: WebRendererMode.canvaskit, @@ -419,7 +361,6 @@ void main() { InternetAddress.loopbackIPv4, {}, {}, - NullSafetyMode.unsound, usesDdcModuleSystem, canaryFeatures, webRenderer: WebRendererMode.canvaskit, @@ -446,7 +387,6 @@ void main() { InternetAddress.loopbackIPv4, {}, {}, - NullSafetyMode.unsound, usesDdcModuleSystem, canaryFeatures, webRenderer: WebRendererMode.canvaskit, @@ -472,7 +412,6 @@ void main() { InternetAddress.loopbackIPv4, {}, {}, - NullSafetyMode.unsound, usesDdcModuleSystem, canaryFeatures, webRenderer: WebRendererMode.canvaskit, @@ -545,7 +484,6 @@ void main() { InternetAddress.loopbackIPv4, {}, {}, - NullSafetyMode.unsound, usesDdcModuleSystem, canaryFeatures, webRenderer: WebRendererMode.canvaskit, @@ -988,7 +926,6 @@ void main() { expressionCompiler: null, extraHeaders: const {}, chromiumLauncher: null, - nullSafetyMode: NullSafetyMode.unsound, ddcModuleSystem: usesDdcModuleSystem, canaryFeatures: canaryFeatures, webRenderer: WebRendererMode.html, @@ -1004,11 +941,13 @@ void main() { final Uri uri = await webDevFS.create(); webDevFS.webAssetServer.entrypointCacheDirectory = globals.fs.currentDirectory; final String webPrecompiledSdk = - globals.artifacts!.getHostArtifact(HostArtifact.webPrecompiledAmdSdk).path; + globals.artifacts!.getHostArtifact(HostArtifact.webPrecompiledAmdSoundSdk).path; final String webPrecompiledSdkSourcemaps = - globals.artifacts!.getHostArtifact(HostArtifact.webPrecompiledAmdSdkSourcemaps).path; + globals.artifacts!.getHostArtifact(HostArtifact.webPrecompiledAmdSoundSdkSourcemaps).path; final String webPrecompiledCanvaskitSdk = - globals.artifacts!.getHostArtifact(HostArtifact.webPrecompiledAmdCanvaskitSdk).path; + globals.artifacts! + .getHostArtifact(HostArtifact.webPrecompiledAmdCanvaskitSdkSourcemaps) + .path; final String webPrecompiledCanvaskitSdkSourcemaps = globals.artifacts! .getHostArtifact(HostArtifact.webPrecompiledAmdCanvaskitSdkSourcemaps) @@ -1108,7 +1047,6 @@ void main() { expressionCompiler: null, extraHeaders: const {}, chromiumLauncher: null, - nullSafetyMode: NullSafetyMode.sound, ddcModuleSystem: usesDdcModuleSystem, canaryFeatures: canaryFeatures, webRenderer: WebRendererMode.html, @@ -1234,7 +1172,6 @@ void main() { expressionCompiler: null, extraHeaders: const {}, chromiumLauncher: null, - nullSafetyMode: NullSafetyMode.sound, ddcModuleSystem: usesDdcModuleSystem, canaryFeatures: canaryFeatures, webRenderer: WebRendererMode.canvaskit, @@ -1313,7 +1250,6 @@ void main() { chromiumLauncher: null, nullAssertions: true, nativeNullAssertions: true, - nullSafetyMode: NullSafetyMode.sound, ddcModuleSystem: usesDdcModuleSystem, canaryFeatures: canaryFeatures, webRenderer: WebRendererMode.canvaskit, @@ -1367,7 +1303,6 @@ void main() { expressionCompiler: null, extraHeaders: const {}, chromiumLauncher: null, - nullSafetyMode: NullSafetyMode.sound, ddcModuleSystem: usesDdcModuleSystem, canaryFeatures: canaryFeatures, webRenderer: WebRendererMode.canvaskit, @@ -1422,7 +1357,6 @@ void main() { expressionCompiler: null, extraHeaders: const {}, chromiumLauncher: null, - nullSafetyMode: NullSafetyMode.sound, ddcModuleSystem: usesDdcModuleSystem, canaryFeatures: canaryFeatures, webRenderer: WebRendererMode.auto, @@ -1477,7 +1411,6 @@ void main() { expressionCompiler: null, extraHeaders: const {}, chromiumLauncher: null, - nullSafetyMode: NullSafetyMode.unsound, ddcModuleSystem: usesDdcModuleSystem, canaryFeatures: canaryFeatures, webRenderer: WebRendererMode.canvaskit, @@ -1520,7 +1453,6 @@ void main() { Uri.base, null, const {}, - NullSafetyMode.unsound, webRenderer: WebRendererMode.canvaskit, isWasm: false, useLocalCanvasKit: false, @@ -1555,7 +1487,6 @@ void main() { Uri.base, null, const {extraHeaderKey: extraHeaderValue}, - NullSafetyMode.unsound, webRenderer: WebRendererMode.canvaskit, isWasm: false, useLocalCanvasKit: false, @@ -1601,7 +1532,6 @@ void main() { InternetAddress.anyIPv4, {}, {}, - NullSafetyMode.sound, usesDdcModuleSystem, canaryFeatures, webRenderer: WebRendererMode.canvaskit, @@ -1652,7 +1582,6 @@ void main() { expressionCompiler: null, extraHeaders: const {}, chromiumLauncher: null, - nullSafetyMode: NullSafetyMode.unsound, ddcModuleSystem: usesDdcModuleSystem, canaryFeatures: canaryFeatures, webRenderer: WebRendererMode.canvaskit,