diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md index 0d00e8192..7ff81f47c 100644 --- a/dwds/CHANGELOG.md +++ b/dwds/CHANGELOG.md @@ -1,6 +1,7 @@ ## 24.3.6-dev - Bump minimum sdk version to 3.7.0 +- use 'compile js-dev' instead of directly invoking the ddc snapshot. ## 24.3.5 - Allow clients to specify the `packageConfigPath` in `LoadStrategy` class and associated providers. diff --git a/dwds/test/expression_compiler_service_common.dart b/dwds/test/expression_compiler_service_common.dart index de28b8577..2efe33a9b 100644 --- a/dwds/test/expression_compiler_service_common.dart +++ b/dwds/test/expression_compiler_service_common.dart @@ -52,8 +52,6 @@ void testAll({required CompilerOptions compilerOptions}) { // generated in the SDK, so we use the current SDK layout and // configuration. final executable = Platform.resolvedExecutable; - final dartdevc = - SdkConfiguration.defaultConfiguration.compilerWorkerPath!; // redirect logs for testing _output = StreamController.broadcast(); output.stream.listen(printOnFailure); @@ -110,7 +108,8 @@ void testAll({required CompilerOptions compilerOptions}) { '''); final args = [ - dartdevc, + 'compile', + 'js-dev', 'try.dart', '-o', 'try.js', diff --git a/frontend_server_client/example/web_client.dart b/frontend_server_client/example/web_client.dart index cbbe257d2..94e2b8142 100644 --- a/frontend_server_client/example/web_client.dart +++ b/frontend_server_client/example/web_client.dart @@ -22,7 +22,8 @@ void main(List args) async { _print('compiling the dart sdk'); final sdkCompileResult = await Process.run(Platform.resolvedExecutable, [ - p.join(sdkDir, 'bin', 'snapshots', 'dartdevc.dart.snapshot'), + 'compile', + 'js-dev', '--multi-root-scheme=org-dartlang-sdk', '--modules=amd', '--module-name=dart_sdk', diff --git a/test_common/lib/sdk_asset_generator.dart b/test_common/lib/sdk_asset_generator.dart index e86f0317e..65f4c0ffa 100644 --- a/test_common/lib/sdk_asset_generator.dart +++ b/test_common/lib/sdk_asset_generator.dart @@ -112,7 +112,8 @@ class SdkAssetGenerator { final sdkDirectoryUri = fileSystem.directory(sdkLayout.sdkDirectory).uri; final args = [ - sdkLayout.dartdevcSnapshotPath, + 'compile', + 'js-dev', '--compile-sdk', '--multi-root', '$sdkDirectoryUri', diff --git a/test_common/lib/test_sdk_layout.dart b/test_common/lib/test_sdk_layout.dart index dca372e80..7218a60e2 100644 --- a/test_common/lib/test_sdk_layout.dart +++ b/test_common/lib/test_sdk_layout.dart @@ -108,7 +108,7 @@ class TestSdkLayout { sdkLayout.sdkDirectory, 'bin', 'snapshots', - 'kernel_worker.dart.snapshot', + 'kernel_worker_aot.dart.snapshot', ), devToolsDirectory: p.join( sdkLayout.sdkDirectory,