firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unsound artifacts, remove *Sound qualifier. (#163015)

Browse Source 
Towards https://github.com/flutter/flutter/issues/162846.

Removes all of the unsound host artifacts, and then uses their name for
the sound artifacts.

That is, for something like `webPlatformDDCKernelDill`, this PR:

- Changes the web GN builders to only emit the sound SDK, without the
`-sound` suffixes
- Deletes `webPlatformDDCKernelDill` and all usages of it (implicitly
unsound, and unused).
- Renames `webPlatformDDCKernelSoundDill` to `webPlatformDDCKernelDill`.

No user impact expected, as there was no way to use the unsound
artifacts from the Flutter tool.
This commit is contained in:
Matan Lurey 2025-02-11 18:40:18 -08:00 committed by GitHub
parent 8c843aa9d3
commit b728c4c06a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 120 additions and 344 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
engine/src/flutter/web_sdk/BUILD.gn
View File

@ -204,8 +204,6 @@ template("_kernel_worker") {
} }
template("_compile_platform") { template("_compile_platform") {
assert(defined(invoker.sound_null_safety),
"sound_null_safety must be defined for $target_name")
assert(defined(invoker.kernel_target), assert(defined(invoker.kernel_target),
"kernel_target must be defined for $target_name") "kernel_target must be defined for $target_name")
assert(defined(invoker.summary_only), assert(defined(invoker.summary_only),
@ -216,12 +214,7 @@ template("_compile_platform") {
inputs = [ "sdk_rewriter.dart" ] + web_ui_sources inputs = [ "sdk_rewriter.dart" ] + web_ui_sources
outputs = [ invoker.output_dill ] outputs = [ invoker.output_dill ]
args = []
if (invoker.sound_null_safety) {
args = [ "--sound-null-safety" ]
} else {
args = [ "--no-sound-null-safety" ]
}
if (invoker.summary_only) { if (invoker.summary_only) {
args += [ "--summary-only" ] args += [ "--summary-only" ]
@ -280,41 +273,20 @@ template("_compile_platform") {
} }
} }
# Compile the unsound DDC SDK's summary. _compile_platform("flutter_dartdevc_kernel_sdk_outline") {
_compile_platform("flutter_dartdevc_kernel_sdk_outline_unsound") {
sound_null_safety = false
kernel_target = "ddc" kernel_target = "ddc"
summary_only = true summary_only = true
output_dill = "$root_out_dir/flutter_web_sdk/kernel/ddc_outline.dill" output_dill = "$root_out_dir/flutter_web_sdk/kernel/ddc_outline.dill"
} }
# Compile the sound DDC SDK's summary. _compile_platform("flutter_dart2js_kernel_sdk_full") {
_compile_platform("flutter_dartdevc_kernel_sdk_outline_sound") {
sound_null_safety = true
kernel_target = "ddc"
summary_only = true
output_dill = "$root_out_dir/flutter_web_sdk/kernel/ddc_outline_sound.dill"
}
_compile_platform("flutter_dart2js_kernel_sdk_full_unsound") {
sound_null_safety = false
kernel_target = "dart2js"
summary_only = false
output_dill =
"$root_out_dir/flutter_web_sdk/kernel/dart2js_platform_unsound.dill"
null_environment = true
}
_compile_platform("flutter_dart2js_kernel_sdk_full_sound") {
sound_null_safety = true
kernel_target = "dart2js" kernel_target = "dart2js"
summary_only = false summary_only = false
output_dill = "$root_out_dir/flutter_web_sdk/kernel/dart2js_platform.dill" output_dill = "$root_out_dir/flutter_web_sdk/kernel/dart2js_platform.dill"
null_environment = true null_environment = true
} }
_compile_platform("flutter_dart2wasm_kernel_sdk_full_sound") { _compile_platform("flutter_dart2wasm_kernel_sdk_full") {
sound_null_safety = true
kernel_target = "dart2wasm" kernel_target = "dart2wasm"
summary_only = false summary_only = false
output_dill = "$root_out_dir/flutter_web_sdk/kernel/dart2wasm_platform.dill" output_dill = "$root_out_dir/flutter_web_sdk/kernel/dart2wasm_platform.dill"
@ -323,22 +295,14 @@ _compile_platform("flutter_dart2wasm_kernel_sdk_full_sound") {
group("flutter_platform_dills") { group("flutter_platform_dills") {
public_deps = [ public_deps = [
":flutter_dart2js_kernel_sdk_full_sound", ":flutter_dart2js_kernel_sdk_full",
":flutter_dart2js_kernel_sdk_full_unsound", ":flutter_dart2wasm_kernel_sdk_full",
":flutter_dart2wasm_kernel_sdk_full_sound", ":flutter_dartdevc_kernel_sdk_outline",
":flutter_dartdevc_kernel_sdk_outline_sound", ":flutter_dartdevc_kernel_sdk_outline",
":flutter_dartdevc_kernel_sdk_outline_unsound",
# TODO(jacksongardner): remove these once they are no longer used by the flutter tool
# https://github.com/flutter/flutter/issues/113303
":flutter_dartdevc_kernel_sdk_outline_sound",
":flutter_dartdevc_kernel_sdk_outline_unsound",
] ]
} }
template("_compile_ddc_module") { template("_compile_ddc_module") {
assert(defined(invoker.sound_null_safety),
"sound_null_safety must be defined for $target_name")
assert(defined(invoker.sdk_path_prefix), assert(defined(invoker.sdk_path_prefix),
"sdk_path_prefix must be defined for $target_name") "sdk_path_prefix must be defined for $target_name")
assert(defined(invoker.module_format), assert(defined(invoker.module_format),
@ -351,9 +315,6 @@ template("_compile_ddc_module") {
packages = dart_sdk_package_config packages = dart_sdk_package_config
name_suffix = "-canvaskit" name_suffix = "-canvaskit"
if (invoker.sound_null_safety) {
name_suffix += "-sound"
}
dart_sdk_js_path = "$root_out_dir/flutter_web_sdk/kernel/${invoker.sdk_path_prefix}${name_suffix}/dart_sdk.js" dart_sdk_js_path = "$root_out_dir/flutter_web_sdk/kernel/${invoker.sdk_path_prefix}${name_suffix}/dart_sdk.js"
@ -362,13 +323,7 @@ template("_compile_ddc_module") {
dart_sdk_js_path + ".map", dart_sdk_js_path + ".map",
] ]
if (invoker.sound_null_safety) { args = [
args = [ "--sound-null-safety" ]
} else {
args = [ "--no-sound-null-safety" ]
}
args += [
"--compile-sdk", "--compile-sdk",
"dart:core", "dart:core",
@ -415,8 +370,6 @@ template("_compile_ddc_module") {
} }
template("_compile_ddc_modules") { template("_compile_ddc_modules") {
assert(defined(invoker.sound_null_safety),
"sound_null_safety must be defined for $target_name")
forward_variables_from(invoker, "*") forward_variables_from(invoker, "*")
# We compile multiple times instead of passing multiple modules to a single # We compile multiple times instead of passing multiple modules to a single
@ -428,31 +381,22 @@ template("_compile_ddc_modules") {
canary = false canary = false
} }
# No support for unsound null safety with the DDC library bundle format. _compile_ddc_module("${target_name}_ddcLibraryBundle") {
if (sound_null_safety) { sdk_path_prefix = "ddcLibraryBundle"
_compile_ddc_module("${target_name}_ddcLibraryBundle") { module_format = "ddc"
sdk_path_prefix = "ddcLibraryBundle" canary = true
module_format = "ddc"
canary = true
}
} }
} }
# Compiles the unsound canvaskit only renderer. # Compiles the canvaskit only renderer.
_compile_ddc_modules("flutter_dartdevc_canvaskit_kernel_sdk") { _compile_ddc_modules("flutter_dartdevc_canvaskit_kernel_sdk") {
sound_null_safety = false
}
# Compiles the sound canvaskit only renderer.
_compile_ddc_modules("flutter_dartdevc_canvaskit_kernel_sdk_sound") {
sound_null_safety = true
} }
group("flutter_ddc_modules") { group("flutter_ddc_modules") {
public_deps = [ public_deps = [
":flutter_dartdevc_canvaskit_kernel_sdk_amd", ":flutter_dartdevc_canvaskit_kernel_sdk_amd",
":flutter_dartdevc_canvaskit_kernel_sdk_sound_amd", ":flutter_dartdevc_canvaskit_kernel_sdk_amd",
":flutter_dartdevc_canvaskit_kernel_sdk_sound_ddcLibraryBundle", ":flutter_dartdevc_canvaskit_kernel_sdk_ddcLibraryBundle",
] ]
} }
@ -477,18 +421,14 @@ if (!is_fuchsia) {
# flutter_ddc_modules # flutter_ddc_modules
sources = get_target_outputs(":flutter_dartdevc_canvaskit_kernel_sdk_amd") sources = get_target_outputs(":flutter_dartdevc_canvaskit_kernel_sdk_amd")
sources += sources += get_target_outputs(":flutter_dartdevc_canvaskit_kernel_sdk_amd")
get_target_outputs(":flutter_dartdevc_canvaskit_kernel_sdk_sound_amd")
sources += get_target_outputs( sources += get_target_outputs(
":flutter_dartdevc_canvaskit_kernel_sdk_sound_ddcLibraryBundle") ":flutter_dartdevc_canvaskit_kernel_sdk_ddcLibraryBundle")
# flutter_platform_dills # flutter_platform_dills
sources += sources += get_target_outputs(":flutter_dartdevc_kernel_sdk_outline")
get_target_outputs(":flutter_dartdevc_kernel_sdk_outline_unsound") sources += get_target_outputs(":flutter_dart2js_kernel_sdk_full")
sources += get_target_outputs(":flutter_dartdevc_kernel_sdk_outline_sound") sources += get_target_outputs(":flutter_dart2wasm_kernel_sdk_full")
sources += get_target_outputs(":flutter_dart2js_kernel_sdk_full_unsound")
sources += get_target_outputs(":flutter_dart2js_kernel_sdk_full_sound")
sources += get_target_outputs(":flutter_dart2wasm_kernel_sdk_full_sound")
if (is_wasm) { if (is_wasm) {
sources += [ sources += [
"$root_out_dir/flutter_web_sdk/canvaskit/canvaskit.js", "$root_out_dir/flutter_web_sdk/canvaskit/canvaskit.js",

198
packages/flutter_tools/lib/src/artifacts.dart
View File

@ -89,20 +89,18 @@ enum HostArtifact {
/// Folder that contains platform dill files for the web sdk. /// Folder that contains platform dill files for the web sdk.
webPlatformKernelFolder, webPlatformKernelFolder,
// TODO(matanlurey): Remove the non-Sound variants, and rename the Sound variants, https://github.com/flutter/flutter/issues/162846. // **NOTE**: All of the precompiled SDKs, summaries, and source maps are
// strictly with sound null-safety, there is no longer support for unsound
// null-safety within the Flutter tool or SDK.
//
// See https://github.com/flutter/flutter/issues/162846.
/// The summary dill for the dartdevc target. /// The summary dill for the dartdevc target.
webPlatformDDCKernelDill, webPlatformDDCKernelDill,
/// The summary dill with null safety enabled for the dartdevc target.g /// The summary dill for the dart2js target.
webPlatformDDCSoundKernelDill,
/// The summary dill for the dartdevc target.
webPlatformDart2JSKernelDill, webPlatformDart2JSKernelDill,
/// The summary dill with null safety enabled for the dartdevc target.
webPlatformDart2JSSoundKernelDill,
/// The precompiled SDKs and sourcemaps for web debug builds with the AMD module system. /// The precompiled SDKs and sourcemaps for web debug builds with the AMD module system.
// TODO(markzipan): delete these when DDC's AMD module system is deprecated, https://github.com/flutter/flutter/issues/142060. // TODO(markzipan): delete these when DDC's AMD module system is deprecated, https://github.com/flutter/flutter/issues/142060.
webPrecompiledAmdSdk, webPrecompiledAmdSdk,
@ -111,22 +109,15 @@ enum HostArtifact {
webPrecompiledAmdCanvaskitSdkSourcemaps, webPrecompiledAmdCanvaskitSdkSourcemaps,
webPrecompiledAmdCanvaskitAndHtmlSdk, webPrecompiledAmdCanvaskitAndHtmlSdk,
webPrecompiledAmdCanvaskitAndHtmlSdkSourcemaps, webPrecompiledAmdCanvaskitAndHtmlSdkSourcemaps,
webPrecompiledAmdSoundSdk,
webPrecompiledAmdSoundSdkSourcemaps,
webPrecompiledAmdCanvaskitSoundSdk,
webPrecompiledAmdCanvaskitSoundSdkSourcemaps,
webPrecompiledAmdCanvaskitAndHtmlSoundSdk,
webPrecompiledAmdCanvaskitAndHtmlSoundSdkSourcemaps,
/// The precompiled SDKs and sourcemaps for web debug builds with the DDC /// The precompiled SDKs and sourcemaps for web debug builds with the DDC
/// library bundle module system. Only SDKs built with sound null-safety are /// library bundle module system.
/// provided here. webPrecompiledDdcLibraryBundleSdk,
webPrecompiledDdcLibraryBundleSoundSdk, webPrecompiledDdcLibraryBundleSdkSourcemaps,
webPrecompiledDdcLibraryBundleSoundSdkSourcemaps, webPrecompiledDdcLibraryBundleCanvaskitSdk,
webPrecompiledDdcLibraryBundleCanvaskitSoundSdk, webPrecompiledDdcLibraryBundleCanvaskitSdkSourcemaps,
webPrecompiledDdcLibraryBundleCanvaskitSoundSdkSourcemaps, webPrecompiledDdcLibraryBundleCanvaskitAndHtmlSdk,
webPrecompiledDdcLibraryBundleCanvaskitAndHtmlSoundSdk, webPrecompiledDdcLibraryBundleCanvaskitAndHtmlSdkSourcemaps,
webPrecompiledDdcLibraryBundleCanvaskitAndHtmlSoundSdkSourcemaps,
iosDeploy, iosDeploy,
idevicesyslog, idevicesyslog,
@ -268,33 +259,23 @@ String _hostArtifactToFileName(HostArtifact artifact, Platform platform) {
return 'kernel'; return 'kernel';
case HostArtifact.webPlatformDDCKernelDill: case HostArtifact.webPlatformDDCKernelDill:
return 'ddc_outline.dill'; return 'ddc_outline.dill';
case HostArtifact.webPlatformDDCSoundKernelDill:
return 'ddc_outline_sound.dill';
case HostArtifact.webPlatformDart2JSKernelDill: case HostArtifact.webPlatformDart2JSKernelDill:
return 'dart2js_platform_unsound.dill';
case HostArtifact.webPlatformDart2JSSoundKernelDill:
return 'dart2js_platform.dill'; return 'dart2js_platform.dill';
case HostArtifact.flutterWebLibrariesJson: case HostArtifact.flutterWebLibrariesJson:
return 'libraries.json'; return 'libraries.json';
case HostArtifact.webPrecompiledAmdSdk: case HostArtifact.webPrecompiledAmdSdk:
case HostArtifact.webPrecompiledAmdCanvaskitSdk: case HostArtifact.webPrecompiledAmdCanvaskitSdk:
case HostArtifact.webPrecompiledAmdCanvaskitAndHtmlSdk: case HostArtifact.webPrecompiledAmdCanvaskitAndHtmlSdk:
case HostArtifact.webPrecompiledAmdSoundSdk: case HostArtifact.webPrecompiledDdcLibraryBundleSdk:
case HostArtifact.webPrecompiledAmdCanvaskitSoundSdk: case HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSdk:
case HostArtifact.webPrecompiledAmdCanvaskitAndHtmlSoundSdk: case HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitAndHtmlSdk:
case HostArtifact.webPrecompiledDdcLibraryBundleSoundSdk:
case HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSoundSdk:
case HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitAndHtmlSoundSdk:
return 'dart_sdk.js'; return 'dart_sdk.js';
case HostArtifact.webPrecompiledAmdSdkSourcemaps: case HostArtifact.webPrecompiledAmdSdkSourcemaps:
case HostArtifact.webPrecompiledAmdCanvaskitSdkSourcemaps: case HostArtifact.webPrecompiledAmdCanvaskitSdkSourcemaps:
case HostArtifact.webPrecompiledAmdCanvaskitAndHtmlSdkSourcemaps: case HostArtifact.webPrecompiledAmdCanvaskitAndHtmlSdkSourcemaps:
case HostArtifact.webPrecompiledAmdSoundSdkSourcemaps: case HostArtifact.webPrecompiledDdcLibraryBundleSdkSourcemaps:
case HostArtifact.webPrecompiledAmdCanvaskitSoundSdkSourcemaps: case HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSdkSourcemaps:
case HostArtifact.webPrecompiledAmdCanvaskitAndHtmlSoundSdkSourcemaps: case HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitAndHtmlSdkSourcemaps:
case HostArtifact.webPrecompiledDdcLibraryBundleSoundSdkSourcemaps:
case HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSoundSdkSourcemaps:
case HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitAndHtmlSoundSdkSourcemaps:
return 'dart_sdk.js.map'; return 'dart_sdk.js.map';
case HostArtifact.impellerc: case HostArtifact.impellerc:
return 'impellerc$exe'; return 'impellerc$exe';
@ -471,9 +452,7 @@ class CachedArtifacts implements Artifacts {
final String path = _fileSystem.path.join(_getFlutterWebSdkPath(), 'kernel'); final String path = _fileSystem.path.join(_getFlutterWebSdkPath(), 'kernel');
return _fileSystem.file(path); return _fileSystem.file(path);
case HostArtifact.webPlatformDDCKernelDill: case HostArtifact.webPlatformDDCKernelDill:
case HostArtifact.webPlatformDDCSoundKernelDill:
case HostArtifact.webPlatformDart2JSKernelDill: case HostArtifact.webPlatformDart2JSKernelDill:
case HostArtifact.webPlatformDart2JSSoundKernelDill:
final String path = _fileSystem.path.join( final String path = _fileSystem.path.join(
_getFlutterWebSdkPath(), _getFlutterWebSdkPath(),
'kernel', 'kernel',
@ -507,57 +486,30 @@ class CachedArtifacts implements Artifacts {
_hostArtifactToFileName(artifact, _platform), _hostArtifactToFileName(artifact, _platform),
); );
return _fileSystem.file(path); return _fileSystem.file(path);
case HostArtifact.webPrecompiledAmdSoundSdk: case HostArtifact.webPrecompiledDdcLibraryBundleSdk:
case HostArtifact.webPrecompiledAmdSoundSdkSourcemaps: case HostArtifact.webPrecompiledDdcLibraryBundleSdkSourcemaps:
final String path = _fileSystem.path.join( final String path = _fileSystem.path.join(
_getFlutterWebSdkPath(), _getFlutterWebSdkPath(),
'kernel', 'kernel',
'amd-sound', 'ddcLibraryBundle',
_hostArtifactToFileName(artifact, _platform), _hostArtifactToFileName(artifact, _platform),
); );
return _fileSystem.file(path); return _fileSystem.file(path);
case HostArtifact.webPrecompiledAmdCanvaskitSoundSdk: case HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSdk:
case HostArtifact.webPrecompiledAmdCanvaskitSoundSdkSourcemaps: case HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSdkSourcemaps:
final String path = _fileSystem.path.join( final String path = _fileSystem.path.join(
_getFlutterWebSdkPath(), _getFlutterWebSdkPath(),
'kernel', 'kernel',
'amd-canvaskit-sound', 'ddcLibraryBundle-canvaskit',
_hostArtifactToFileName(artifact, _platform), _hostArtifactToFileName(artifact, _platform),
); );
return _fileSystem.file(path); return _fileSystem.file(path);
case HostArtifact.webPrecompiledAmdCanvaskitAndHtmlSoundSdk: case HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitAndHtmlSdk:
case HostArtifact.webPrecompiledAmdCanvaskitAndHtmlSoundSdkSourcemaps: case HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitAndHtmlSdkSourcemaps:
final String path = _fileSystem.path.join( final String path = _fileSystem.path.join(
_getFlutterWebSdkPath(), _getFlutterWebSdkPath(),
'kernel', 'kernel',
'amd-canvaskit-html-sound', 'ddcLibraryBundle-canvaskit-html',
_hostArtifactToFileName(artifact, _platform),
);
return _fileSystem.file(path);
case HostArtifact.webPrecompiledDdcLibraryBundleSoundSdk:
case HostArtifact.webPrecompiledDdcLibraryBundleSoundSdkSourcemaps:
final String path = _fileSystem.path.join(
_getFlutterWebSdkPath(),
'kernel',
'ddcLibraryBundle-sound',
_hostArtifactToFileName(artifact, _platform),
);
return _fileSystem.file(path);
case HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSoundSdk:
case HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSoundSdkSourcemaps:
final String path = _fileSystem.path.join(
_getFlutterWebSdkPath(),
'kernel',
'ddcLibraryBundle-canvaskit-sound',
_hostArtifactToFileName(artifact, _platform),
);
return _fileSystem.file(path);
case HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitAndHtmlSoundSdk:
case HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitAndHtmlSoundSdkSourcemaps:
final String path = _fileSystem.path.join(
_getFlutterWebSdkPath(),
'kernel',
'ddcLibraryBundle-canvaskit-html-sound',
_hostArtifactToFileName(artifact, _platform), _hostArtifactToFileName(artifact, _platform),
); );
return _fileSystem.file(path); return _fileSystem.file(path);
@ -1203,9 +1155,7 @@ class CachedLocalEngineArtifacts implements Artifacts {
final String path = _fileSystem.path.join(_getFlutterWebSdkPath(), 'kernel'); final String path = _fileSystem.path.join(_getFlutterWebSdkPath(), 'kernel');
return _fileSystem.file(path); return _fileSystem.file(path);
case HostArtifact.webPlatformDDCKernelDill: case HostArtifact.webPlatformDDCKernelDill:
case HostArtifact.webPlatformDDCSoundKernelDill:
case HostArtifact.webPlatformDart2JSKernelDill: case HostArtifact.webPlatformDart2JSKernelDill:
case HostArtifact.webPlatformDart2JSSoundKernelDill:
final String path = _fileSystem.path.join( final String path = _fileSystem.path.join(
_getFlutterWebSdkPath(), _getFlutterWebSdkPath(),
'kernel', 'kernel',
@ -1239,57 +1189,30 @@ class CachedLocalEngineArtifacts implements Artifacts {
_hostArtifactToFileName(artifact, _platform), _hostArtifactToFileName(artifact, _platform),
); );
return _fileSystem.file(path); return _fileSystem.file(path);
case HostArtifact.webPrecompiledAmdSoundSdk: case HostArtifact.webPrecompiledDdcLibraryBundleSdk:
case HostArtifact.webPrecompiledAmdSoundSdkSourcemaps: case HostArtifact.webPrecompiledDdcLibraryBundleSdkSourcemaps:
final String path = _fileSystem.path.join( final String path = _fileSystem.path.join(
_getFlutterWebSdkPath(), _getFlutterWebSdkPath(),
'kernel', 'kernel',
'amd-sound', 'ddcLibraryBundle',
_hostArtifactToFileName(artifact, _platform), _hostArtifactToFileName(artifact, _platform),
); );
return _fileSystem.file(path); return _fileSystem.file(path);
case HostArtifact.webPrecompiledAmdCanvaskitSoundSdk: case HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSdk:
case HostArtifact.webPrecompiledAmdCanvaskitSoundSdkSourcemaps: case HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSdkSourcemaps:
final String path = _fileSystem.path.join( final String path = _fileSystem.path.join(
_getFlutterWebSdkPath(), _getFlutterWebSdkPath(),
'kernel', 'kernel',
'amd-canvaskit-sound', 'ddcLibraryBundle-canvaskit',
_hostArtifactToFileName(artifact, _platform), _hostArtifactToFileName(artifact, _platform),
); );
return _fileSystem.file(path); return _fileSystem.file(path);
case HostArtifact.webPrecompiledAmdCanvaskitAndHtmlSoundSdk: case HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitAndHtmlSdk:
case HostArtifact.webPrecompiledAmdCanvaskitAndHtmlSoundSdkSourcemaps: case HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitAndHtmlSdkSourcemaps:
final String path = _fileSystem.path.join( final String path = _fileSystem.path.join(
_getFlutterWebSdkPath(), _getFlutterWebSdkPath(),
'kernel', 'kernel',
'amd-canvaskit-html-sound', 'ddcLibraryBundle-canvaskit-html',
_hostArtifactToFileName(artifact, _platform),
);
return _fileSystem.file(path);
case HostArtifact.webPrecompiledDdcLibraryBundleSoundSdk:
case HostArtifact.webPrecompiledDdcLibraryBundleSoundSdkSourcemaps:
final String path = _fileSystem.path.join(
_getFlutterWebSdkPath(),
'kernel',
'ddcLibraryBundle-sound',
_hostArtifactToFileName(artifact, _platform),
);
return _fileSystem.file(path);
case HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSoundSdk:
case HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSoundSdkSourcemaps:
final String path = _fileSystem.path.join(
_getFlutterWebSdkPath(),
'kernel',
'ddcLibraryBundle-canvaskit-sound',
_hostArtifactToFileName(artifact, _platform),
);
return _fileSystem.file(path);
case HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitAndHtmlSoundSdk:
case HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitAndHtmlSoundSdkSourcemaps:
final String path = _fileSystem.path.join(
_getFlutterWebSdkPath(),
'kernel',
'ddcLibraryBundle-canvaskit-html-sound',
_hostArtifactToFileName(artifact, _platform), _hostArtifactToFileName(artifact, _platform),
); );
return _fileSystem.file(path); return _fileSystem.file(path);
@ -1639,9 +1562,7 @@ class CachedLocalWebSdkArtifacts implements Artifacts {
final String path = _fileSystem.path.join(_getFlutterWebSdkPath(), 'kernel'); final String path = _fileSystem.path.join(_getFlutterWebSdkPath(), 'kernel');
return _fileSystem.file(path); return _fileSystem.file(path);
case HostArtifact.webPlatformDDCKernelDill: case HostArtifact.webPlatformDDCKernelDill:
case HostArtifact.webPlatformDDCSoundKernelDill:
case HostArtifact.webPlatformDart2JSKernelDill: case HostArtifact.webPlatformDart2JSKernelDill:
case HostArtifact.webPlatformDart2JSSoundKernelDill:
final String path = _fileSystem.path.join( final String path = _fileSystem.path.join(
_getFlutterWebSdkPath(), _getFlutterWebSdkPath(),
'kernel', 'kernel',
@ -1675,57 +1596,30 @@ class CachedLocalWebSdkArtifacts implements Artifacts {
_hostArtifactToFileName(artifact, _platform), _hostArtifactToFileName(artifact, _platform),
); );
return _fileSystem.file(path); return _fileSystem.file(path);
case HostArtifact.webPrecompiledAmdSoundSdk: case HostArtifact.webPrecompiledDdcLibraryBundleSdk:
case HostArtifact.webPrecompiledAmdSoundSdkSourcemaps: case HostArtifact.webPrecompiledDdcLibraryBundleSdkSourcemaps:
final String path = _fileSystem.path.join( final String path = _fileSystem.path.join(
_getFlutterWebSdkPath(), _getFlutterWebSdkPath(),
'kernel', 'kernel',
'amd-sound', 'ddcLibraryBundle',
_hostArtifactToFileName(artifact, _platform), _hostArtifactToFileName(artifact, _platform),
); );
return _fileSystem.file(path); return _fileSystem.file(path);
case HostArtifact.webPrecompiledAmdCanvaskitSoundSdk: case HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSdk:
case HostArtifact.webPrecompiledAmdCanvaskitSoundSdkSourcemaps: case HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSdkSourcemaps:
final String path = _fileSystem.path.join( final String path = _fileSystem.path.join(
_getFlutterWebSdkPath(), _getFlutterWebSdkPath(),
'kernel', 'kernel',
'amd-canvaskit-sound', 'ddcLibraryBundle-canvaskit',
_hostArtifactToFileName(artifact, _platform), _hostArtifactToFileName(artifact, _platform),
); );
return _fileSystem.file(path); return _fileSystem.file(path);
case HostArtifact.webPrecompiledAmdCanvaskitAndHtmlSoundSdk: case HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitAndHtmlSdk:
case HostArtifact.webPrecompiledAmdCanvaskitAndHtmlSoundSdkSourcemaps: case HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitAndHtmlSdkSourcemaps:
final String path = _fileSystem.path.join( final String path = _fileSystem.path.join(
_getFlutterWebSdkPath(), _getFlutterWebSdkPath(),
'kernel', 'kernel',
'amd-canvaskit-html-sound', 'ddcLibraryBundle-canvaskit-html',
_hostArtifactToFileName(artifact, _platform),
);
return _fileSystem.file(path);
case HostArtifact.webPrecompiledDdcLibraryBundleSoundSdk:
case HostArtifact.webPrecompiledDdcLibraryBundleSoundSdkSourcemaps:
final String path = _fileSystem.path.join(
_getFlutterWebSdkPath(),
'kernel',
'ddcLibraryBundle-sound',
_hostArtifactToFileName(artifact, _platform),
);
return _fileSystem.file(path);
case HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSoundSdk:
case HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSoundSdkSourcemaps:
final String path = _fileSystem.path.join(
_getFlutterWebSdkPath(),
'kernel',
'ddcLibraryBundle-canvaskit-sound',
_hostArtifactToFileName(artifact, _platform),
);
return _fileSystem.file(path);
case HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitAndHtmlSoundSdk:
case HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitAndHtmlSoundSdkSourcemaps:
final String path = _fileSystem.path.join(
_getFlutterWebSdkPath(),
'kernel',
'ddcLibraryBundle-canvaskit-html-sound',
_hostArtifactToFileName(artifact, _platform), _hostArtifactToFileName(artifact, _platform),
); );
return _fileSystem.file(path); return _fileSystem.file(path);

11
packages/flutter_tools/lib/src/resident_runner.dart
View File

@ -124,15 +124,10 @@ class FlutterDevice {
final List<String> extraFrontEndOptions = List<String>.of(buildInfo.extraFrontEndOptions); final List<String> extraFrontEndOptions = List<String>.of(buildInfo.extraFrontEndOptions);
switch (buildInfo.nullSafetyMode) { switch (buildInfo.nullSafetyMode) {
case NullSafetyMode.unsound: case NullSafetyMode.unsound:
platformDillName = 'ddc_outline.dill'; // TODO(matanlurey): Should be unreachable, remove as part of https://github.com/flutter/flutter/issues/162846.
if (!extraFrontEndOptions.contains('--no-sound-null-safety')) { throw UnsupportedError('Unsound null safety mode is not supported');
extraFrontEndOptions.add('--no-sound-null-safety');
}
case NullSafetyMode.sound: case NullSafetyMode.sound:
platformDillName = 'ddc_outline_sound.dill'; platformDillName = 'ddc_outline.dill';
if (!extraFrontEndOptions.contains('--sound-null-safety')) {
extraFrontEndOptions.add('--sound-null-safety');
}
case NullSafetyMode.autodetect: case NullSafetyMode.autodetect:
throw StateError( throw StateError(
'Expected buildInfo.nullSafetyMode to be one of unsound or sound, ' 'Expected buildInfo.nullSafetyMode to be one of unsound or sound, '

11
packages/flutter_tools/lib/src/test/web_test_compiler.dart
View File

@ -126,16 +126,11 @@ class WebTestCompiler {
final List<String> extraFrontEndOptions = List<String>.of(buildInfo.extraFrontEndOptions); final List<String> extraFrontEndOptions = List<String>.of(buildInfo.extraFrontEndOptions);
switch (buildInfo.nullSafetyMode) { switch (buildInfo.nullSafetyMode) {
case NullSafetyMode.unsound || NullSafetyMode.autodetect: case NullSafetyMode.unsound || NullSafetyMode.autodetect:
platformDillName = 'ddc_outline.dill'; // TODO(matanlurey): Should be unreachable, remove as part of https://github.com/flutter/flutter/issues/162846.
if (!extraFrontEndOptions.contains('--no-sound-null-safety')) { throw UnsupportedError('Unsound null safety mode is not supported');
extraFrontEndOptions.add('--no-sound-null-safety');
}
case NullSafetyMode.sound: case NullSafetyMode.sound:
languageVersion = currentLanguageVersion(_fileSystem, Cache.flutterRoot!); languageVersion = currentLanguageVersion(_fileSystem, Cache.flutterRoot!);
platformDillName = 'ddc_outline_sound.dill'; platformDillName = 'ddc_outline.dill';
if (!extraFrontEndOptions.contains('--sound-null-safety')) {
extraFrontEndOptions.add('--sound-null-safety');
}
} }
final String platformDillPath = _fileSystem.path.join( final String platformDillPath = _fileSystem.path.join(

31
packages/flutter_tools/lib/src/web/compile.dart
View File

@ -251,40 +251,37 @@ enum WebRendererMode {
/// The correct precompiled artifact to use for each build and render mode for DDC with AMD modules. /// 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. // TODO(markzipan): delete this when DDC's AMD module system is deprecated, https://github.com/flutter/flutter/issues/142060.
const Map<WebRendererMode, HostArtifact> kAmdDartSdkJsArtifactMap = <WebRendererMode, HostArtifact>{ const Map<WebRendererMode, HostArtifact> kAmdDartSdkJsArtifactMap = <WebRendererMode, HostArtifact>{
WebRendererMode.auto: HostArtifact.webPrecompiledAmdCanvaskitAndHtmlSoundSdk, WebRendererMode.auto: HostArtifact.webPrecompiledAmdCanvaskitAndHtmlSdk,
WebRendererMode.canvaskit: HostArtifact.webPrecompiledAmdCanvaskitSoundSdk, WebRendererMode.canvaskit: HostArtifact.webPrecompiledAmdCanvaskitSdk,
WebRendererMode.html: HostArtifact.webPrecompiledAmdSoundSdk, WebRendererMode.html: HostArtifact.webPrecompiledAmdSdk,
}; };
/// The correct source map artifact to use for each build and render mode for DDC with AMD modules. /// 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. // TODO(markzipan): delete this when DDC's AMD module system is deprecated, https://github.com/flutter/flutter/issues/142060.
const Map<WebRendererMode, HostArtifact> kAmdDartSdkJsMapArtifactMap = const Map<WebRendererMode, HostArtifact> kAmdDartSdkJsMapArtifactMap =
<WebRendererMode, HostArtifact>{ <WebRendererMode, HostArtifact>{
WebRendererMode.auto: HostArtifact.webPrecompiledAmdCanvaskitAndHtmlSoundSdkSourcemaps, WebRendererMode.auto: HostArtifact.webPrecompiledAmdCanvaskitAndHtmlSdkSourcemaps,
WebRendererMode.canvaskit: HostArtifact.webPrecompiledAmdCanvaskitSoundSdkSourcemaps, WebRendererMode.canvaskit: HostArtifact.webPrecompiledAmdCanvaskitSdkSourcemaps,
WebRendererMode.html: HostArtifact.webPrecompiledAmdSoundSdkSourcemaps, WebRendererMode.html: HostArtifact.webPrecompiledAmdSdkSourcemaps,
}; };
/// The correct precompiled artifact to use for each build and render mode for /// The correct precompiled artifact to use for each build and render mode for
/// DDC with DDC library bundle module format. Only artifacts with sound /// DDC with DDC library bundle module format.
/// null-safety are provided.
const Map<WebRendererMode, HostArtifact> kDdcLibraryBundleDartSdkJsArtifactMap = const Map<WebRendererMode, HostArtifact> kDdcLibraryBundleDartSdkJsArtifactMap =
<WebRendererMode, HostArtifact>{ <WebRendererMode, HostArtifact>{
WebRendererMode.auto: HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitAndHtmlSoundSdk, WebRendererMode.auto: HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitAndHtmlSdk,
WebRendererMode.canvaskit: HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSoundSdk, WebRendererMode.canvaskit: HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSdk,
WebRendererMode.html: HostArtifact.webPrecompiledDdcLibraryBundleSoundSdk, WebRendererMode.html: HostArtifact.webPrecompiledDdcLibraryBundleSdk,
}; };
/// The correct source map artifact to use for each build and render mode for /// 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 /// DDC with DDC library bundle module format.
/// null-safety are provided.
const Map<WebRendererMode, HostArtifact> kDdcLibraryBundleDartSdkJsMapArtifactMap = const Map<WebRendererMode, HostArtifact> kDdcLibraryBundleDartSdkJsMapArtifactMap =
<WebRendererMode, HostArtifact>{ <WebRendererMode, HostArtifact>{
WebRendererMode.auto: WebRendererMode.auto:
HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitAndHtmlSoundSdkSourcemaps, HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitAndHtmlSdkSourcemaps,
WebRendererMode.canvaskit: WebRendererMode.canvaskit: HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSdkSourcemaps,
HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSoundSdkSourcemaps, WebRendererMode.html: HostArtifact.webPrecompiledDdcLibraryBundleSdkSourcemaps,
WebRendererMode.html: HostArtifact.webPrecompiledDdcLibraryBundleSoundSdkSourcemaps,
}; };
String _buildEventAnalyticsSettings({required List<WebCompilerConfig> configs}) { String _buildEventAnalyticsSettings({required List<WebCompilerConfig> configs}) {

13
packages/flutter_tools/test/commands.shard/hermetic/flutter_web_platform_test.dart
View File

@ -53,15 +53,12 @@ void main() {
tempDir = fileSystem.systemTempDirectory.createTempSync('flutter_web_platform_test.'); tempDir = fileSystem.systemTempDirectory.createTempSync('flutter_web_platform_test.');
for (final HostArtifact artifact in <HostArtifact>[ for (final HostArtifact artifact in <HostArtifact>[
HostArtifact.webPrecompiledAmdCanvaskitAndHtmlSoundSdk,
HostArtifact.webPrecompiledAmdCanvaskitAndHtmlSdk, HostArtifact.webPrecompiledAmdCanvaskitAndHtmlSdk,
HostArtifact.webPrecompiledAmdCanvaskitSoundSdk,
HostArtifact.webPrecompiledAmdCanvaskitSdk, HostArtifact.webPrecompiledAmdCanvaskitSdk,
HostArtifact.webPrecompiledAmdSoundSdk,
HostArtifact.webPrecompiledAmdSdk, HostArtifact.webPrecompiledAmdSdk,
HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitAndHtmlSoundSdk, HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitAndHtmlSdk,
HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSoundSdk, HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSdk,
HostArtifact.webPrecompiledDdcLibraryBundleSoundSdk, HostArtifact.webPrecompiledDdcLibraryBundleSdk,
]) { ]) {
final File artifactFile = artifacts.getHostArtifact(artifact) as File; final File artifactFile = artifacts.getHostArtifact(artifact) as File;
artifactFile.createSync(); artifactFile.createSync();
@ -109,7 +106,7 @@ void main() {
shelf.Request('GET', Uri.parse('http://localhost/dart_sdk.js')), shelf.Request('GET', Uri.parse('http://localhost/dart_sdk.js')),
); );
final String contents = await response.readAsString(); final String contents = await response.readAsString();
expect(contents, HostArtifact.webPrecompiledAmdCanvaskitSoundSdk.name); expect(contents, HostArtifact.webPrecompiledAmdCanvaskitSdk.name);
await webPlatform.close(); await webPlatform.close();
}, },
overrides: <Type, Generator>{ overrides: <Type, Generator>{
@ -161,7 +158,7 @@ void main() {
shelf.Request('GET', Uri.parse('http://localhost/dart_sdk.js')), shelf.Request('GET', Uri.parse('http://localhost/dart_sdk.js')),
); );
final String contents = await response.readAsString(); final String contents = await response.readAsString();
expect(contents, HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSoundSdk.name); expect(contents, HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSdk.name);
await webPlatform.close(); await webPlatform.close();
}, },
overrides: <Type, Generator>{ overrides: <Type, Generator>{

46
packages/flutter_tools/test/general.shard/artifacts_test.dart
View File

@ -252,50 +252,28 @@ void main() {
artifacts.getHostArtifact(HostArtifact.webPrecompiledAmdCanvaskitSdkSourcemaps).path, artifacts.getHostArtifact(HostArtifact.webPrecompiledAmdCanvaskitSdkSourcemaps).path,
'root/bin/cache/flutter_web_sdk/kernel/amd-canvaskit/dart_sdk.js.map', 'root/bin/cache/flutter_web_sdk/kernel/amd-canvaskit/dart_sdk.js.map',
); );
expect(
artifacts.getHostArtifact(HostArtifact.webPrecompiledAmdSoundSdk).path,
'root/bin/cache/flutter_web_sdk/kernel/amd-sound/dart_sdk.js',
);
expect(
artifacts.getHostArtifact(HostArtifact.webPrecompiledAmdSoundSdkSourcemaps).path,
'root/bin/cache/flutter_web_sdk/kernel/amd-sound/dart_sdk.js.map',
);
expect(
artifacts.getHostArtifact(HostArtifact.webPrecompiledAmdCanvaskitSoundSdk).path,
'root/bin/cache/flutter_web_sdk/kernel/amd-canvaskit-sound/dart_sdk.js',
);
expect(
artifacts.getHostArtifact(HostArtifact.webPrecompiledAmdCanvaskitSoundSdkSourcemaps).path,
'root/bin/cache/flutter_web_sdk/kernel/amd-canvaskit-sound/dart_sdk.js.map',
);
}); });
testWithoutContext( testWithoutContext(
'Precompiled web DDC library bundle module system artifact paths are correct', 'Precompiled web DDC library bundle module system artifact paths are correct',
() { () {
expect( expect(
artifacts.getHostArtifact(HostArtifact.webPrecompiledDdcLibraryBundleSoundSdk).path, artifacts.getHostArtifact(HostArtifact.webPrecompiledDdcLibraryBundleSdk).path,
'root/bin/cache/flutter_web_sdk/kernel/ddcLibraryBundle-sound/dart_sdk.js', 'root/bin/cache/flutter_web_sdk/kernel/ddcLibraryBundle/dart_sdk.js',
);
expect(
artifacts.getHostArtifact(HostArtifact.webPrecompiledDdcLibraryBundleSdkSourcemaps).path,
'root/bin/cache/flutter_web_sdk/kernel/ddcLibraryBundle/dart_sdk.js.map',
);
expect(
artifacts.getHostArtifact(HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSdk).path,
'root/bin/cache/flutter_web_sdk/kernel/ddcLibraryBundle-canvaskit/dart_sdk.js',
); );
expect( expect(
artifacts artifacts
.getHostArtifact(HostArtifact.webPrecompiledDdcLibraryBundleSoundSdkSourcemaps) .getHostArtifact(HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSdkSourcemaps)
.path, .path,
'root/bin/cache/flutter_web_sdk/kernel/ddcLibraryBundle-sound/dart_sdk.js.map', 'root/bin/cache/flutter_web_sdk/kernel/ddcLibraryBundle-canvaskit/dart_sdk.js.map',
);
expect(
artifacts
.getHostArtifact(HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSoundSdk)
.path,
'root/bin/cache/flutter_web_sdk/kernel/ddcLibraryBundle-canvaskit-sound/dart_sdk.js',
);
expect(
artifacts
.getHostArtifact(
HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSoundSdkSourcemaps,
)
.path,
'root/bin/cache/flutter_web_sdk/kernel/ddcLibraryBundle-canvaskit-sound/dart_sdk.js.map',
); );
}, },
); );

7
packages/flutter_tools/test/general.shard/resident_runner_test.dart
View File

@ -1785,7 +1785,6 @@ flutter:
BuildMode.debug, BuildMode.debug,
'', '',
treeShakeIcons: false, treeShakeIcons: false,
nullSafetyMode: NullSafetyMode.unsound,
packageConfigPath: '.dart_tool/package_config.json', packageConfigPath: '.dart_tool/package_config.json',
), ),
target: null, target: null,
@ -1795,7 +1794,7 @@ flutter:
expect( expect(
residentCompiler!.initializeFromDill, residentCompiler!.initializeFromDill,
globals.fs.path.join(getBuildDirectory(), 'fbbe6a61fb7a1de317d381f8df4814e5.cache.dill'), globals.fs.path.join(getBuildDirectory(), 'cache.dill'),
); );
expect( expect(
residentCompiler.librariesSpec, residentCompiler.librariesSpec,
@ -1844,7 +1843,7 @@ flutter:
expect( expect(
residentCompiler!.initializeFromDill, residentCompiler!.initializeFromDill,
globals.fs.path.join(getBuildDirectory(), '80b1a4cf4e7b90e1ab5f72022a0bc624.cache.dill'), globals.fs.path.join(getBuildDirectory(), 'cache.dill'),
); );
expect( expect(
residentCompiler.librariesSpec, residentCompiler.librariesSpec,
@ -1860,7 +1859,7 @@ flutter:
); );
expect( expect(
residentCompiler.platformDill, residentCompiler.platformDill,
'file:///HostArtifact.webPlatformKernelFolder/ddc_outline_sound.dill', 'file:///HostArtifact.webPlatformKernelFolder/ddc_outline.dill',
); );
}, },
overrides: <Type, Generator>{ overrides: <Type, Generator>{

7
packages/flutter_tools/test/general.shard/test/web_test_compiler_test.dart
View File

@ -34,7 +34,7 @@ void main() {
platform: platform, platform: platform,
); );
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[ final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
FakeCommand( const FakeCommand(
command: <Pattern>[ command: <Pattern>[
'Artifact.engineDartAotRuntime.TargetPlatform.web_javascript', 'Artifact.engineDartAotRuntime.TargetPlatform.web_javascript',
'Artifact.frontendServerSnapshotForEngineDartSdk.TargetPlatform.web_javascript', 'Artifact.frontendServerSnapshotForEngineDartSdk.TargetPlatform.web_javascript',
@ -59,11 +59,10 @@ void main() {
'--filesystem-scheme', '--filesystem-scheme',
'org-dartlang-app', 'org-dartlang-app',
'--initialize-from-dill', '--initialize-from-dill',
RegExp(r'^build\/(?:[a-z0-9]{32})\.cache\.dill$'), 'build/cache.dill',
'--platform', '--platform',
'file:///HostArtifact.webPlatformKernelFolder/ddc_outline_sound.dill', 'file:///HostArtifact.webPlatformKernelFolder/ddc_outline.dill',
'--verbosity=error', '--verbosity=error',
'--sound-null-safety',
], ],
stdout: 'result abc\nline0\nline1\nabc\nabc build/out 0', stdout: 'result abc\nline0\nline1\nabc\nabc build/out 0',
), ),

12
packages/flutter_tools/test/general.shard/web/devfs_web_ddc_modules_test.dart
View File

@ -823,22 +823,18 @@ void main() {
..createSync(recursive: true) ..createSync(recursive: true)
..writeAsStringSync('GENERATED'); ..writeAsStringSync('GENERATED');
final String webPrecompiledSdk = final String webPrecompiledSdk =
globals.artifacts! globals.artifacts!.getHostArtifact(HostArtifact.webPrecompiledDdcLibraryBundleSdk).path;
.getHostArtifact(HostArtifact.webPrecompiledDdcLibraryBundleSoundSdk)
.path;
final String webPrecompiledSdkSourcemaps = final String webPrecompiledSdkSourcemaps =
globals.artifacts! globals.artifacts!
.getHostArtifact(HostArtifact.webPrecompiledDdcLibraryBundleSoundSdkSourcemaps) .getHostArtifact(HostArtifact.webPrecompiledDdcLibraryBundleSdkSourcemaps)
.path; .path;
final String webPrecompiledCanvaskitSdk = final String webPrecompiledCanvaskitSdk =
globals.artifacts! globals.artifacts!
.getHostArtifact(HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSoundSdk) .getHostArtifact(HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSdk)
.path; .path;
final String webPrecompiledCanvaskitSdkSourcemaps = final String webPrecompiledCanvaskitSdkSourcemaps =
globals.artifacts! globals.artifacts!
.getHostArtifact( .getHostArtifact(HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSdkSourcemaps)
HostArtifact.webPrecompiledDdcLibraryBundleCanvaskitSoundSdkSourcemaps,
)
.path; .path;
globals.fs.file(webPrecompiledSdk) globals.fs.file(webPrecompiledSdk)
..createSync(recursive: true) ..createSync(recursive: true)

26
packages/flutter_tools/test/general.shard/web/devfs_web_test.dart
View File

@ -941,17 +941,9 @@ void main() {
final Uri uri = await webDevFS.create(); final Uri uri = await webDevFS.create();
webDevFS.webAssetServer.entrypointCacheDirectory = globals.fs.currentDirectory; webDevFS.webAssetServer.entrypointCacheDirectory = globals.fs.currentDirectory;
final String webPrecompiledSdk = final String webPrecompiledSdk =
globals.artifacts!.getHostArtifact(HostArtifact.webPrecompiledAmdSoundSdk).path; globals.artifacts!.getHostArtifact(HostArtifact.webPrecompiledAmdSdk).path;
final String webPrecompiledSdkSourcemaps = final String webPrecompiledSdkSourcemaps =
globals.artifacts!.getHostArtifact(HostArtifact.webPrecompiledAmdSoundSdkSourcemaps).path; globals.artifacts!.getHostArtifact(HostArtifact.webPrecompiledAmdSdkSourcemaps).path;
final String webPrecompiledCanvaskitSdk =
globals.artifacts!
.getHostArtifact(HostArtifact.webPrecompiledAmdCanvaskitSdkSourcemaps)
.path;
final String webPrecompiledCanvaskitSdkSourcemaps =
globals.artifacts!
.getHostArtifact(HostArtifact.webPrecompiledAmdCanvaskitSdkSourcemaps)
.path;
globals.fs.currentDirectory.childDirectory('lib').childFile('web_entrypoint.dart') globals.fs.currentDirectory.childDirectory('lib').childFile('web_entrypoint.dart')
..createSync(recursive: true) ..createSync(recursive: true)
..writeAsStringSync('GENERATED'); ..writeAsStringSync('GENERATED');
@ -961,12 +953,6 @@ void main() {
globals.fs.file(webPrecompiledSdkSourcemaps) globals.fs.file(webPrecompiledSdkSourcemaps)
..createSync(recursive: true) ..createSync(recursive: true)
..writeAsStringSync('THERE'); ..writeAsStringSync('THERE');
globals.fs.file(webPrecompiledCanvaskitSdk)
..createSync(recursive: true)
..writeAsStringSync('OL');
globals.fs.file(webPrecompiledCanvaskitSdkSourcemaps)
..createSync(recursive: true)
..writeAsStringSync('CHUM');
await webDevFS.update( await webDevFS.update(
mainUri: globals.fs.file(globals.fs.path.join('lib', 'main.dart')).uri, mainUri: globals.fs.file(globals.fs.path.join('lib', 'main.dart')).uri,
@ -1065,14 +1051,14 @@ void main() {
..createSync(recursive: true) ..createSync(recursive: true)
..writeAsStringSync('GENERATED'); ..writeAsStringSync('GENERATED');
final String webPrecompiledSdk = final String webPrecompiledSdk =
globals.artifacts!.getHostArtifact(HostArtifact.webPrecompiledAmdSoundSdk).path; globals.artifacts!.getHostArtifact(HostArtifact.webPrecompiledAmdSdk).path;
final String webPrecompiledSdkSourcemaps = final String webPrecompiledSdkSourcemaps =
globals.artifacts!.getHostArtifact(HostArtifact.webPrecompiledAmdSoundSdkSourcemaps).path; globals.artifacts!.getHostArtifact(HostArtifact.webPrecompiledAmdSdkSourcemaps).path;
final String webPrecompiledCanvaskitSdk = final String webPrecompiledCanvaskitSdk =
globals.artifacts!.getHostArtifact(HostArtifact.webPrecompiledAmdCanvaskitSoundSdk).path; globals.artifacts!.getHostArtifact(HostArtifact.webPrecompiledAmdCanvaskitSdk).path;
final String webPrecompiledCanvaskitSdkSourcemaps = final String webPrecompiledCanvaskitSdkSourcemaps =
globals.artifacts! globals.artifacts!
.getHostArtifact(HostArtifact.webPrecompiledAmdCanvaskitSoundSdkSourcemaps) .getHostArtifact(HostArtifact.webPrecompiledAmdCanvaskitSdkSourcemaps)
.path; .path;
final String flutterJs = globals.fs.path.join( final String flutterJs = globals.fs.path.join(
globals.artifacts!.getHostArtifact(HostArtifact.flutterJsDirectory).path, globals.artifacts!.getHostArtifact(HostArtifact.flutterJsDirectory).path,