From 68db1de00236fe2d56f090aedec0182b7f68efea Mon Sep 17 00:00:00 2001 From: Nicholas Shahan Date: Thu, 31 Jul 2025 15:37:22 -0700 Subject: [PATCH 1/2] Null safety cleanup in test runner code --- frontend_server_common/lib/src/devfs.dart | 4 ---- test_common/lib/test_sdk_configuration.dart | 7 ++----- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/frontend_server_common/lib/src/devfs.dart b/frontend_server_common/lib/src/devfs.dart index b6caf471d..3e451988b 100644 --- a/frontend_server_common/lib/src/devfs.dart +++ b/frontend_server_common/lib/src/devfs.dart @@ -29,7 +29,6 @@ class WebDevFS { required this.projectDirectory, required this.packageUriMapper, required this.index, - this.soundNullSafety = true, this.urlTunneler, required this.sdkLayout, required this.compilerOptions, @@ -46,9 +45,6 @@ class WebDevFS { List sources = []; DateTime? lastCompiled; - @Deprecated('Only sound null safety is supported as of Dart 3.0') - final bool soundNullSafety; - final TestSdkLayout sdkLayout; final CompilerOptions compilerOptions; diff --git a/test_common/lib/test_sdk_configuration.dart b/test_common/lib/test_sdk_configuration.dart index 407ecde60..07ed65f33 100644 --- a/test_common/lib/test_sdk_configuration.dart +++ b/test_common/lib/test_sdk_configuration.dart @@ -14,11 +14,8 @@ import 'package:test_common/test_sdk_layout.dart'; /// Implementation for SDK configuration for tests that can generate /// missing assets. /// -/// - Generate SDK js, source map, and full dill (normally included in flutter -/// SDK or produced by build). -/// -/// TODO(annagrin): update to only generating missing sound artifacts -/// for frontend server after we have no uses of weak null safety. +/// - Generate SDK js, source map (normally included in flutter SDK +/// or produced by build). class TestSdkConfigurationProvider extends SdkConfigurationProvider { final _logger = Logger('TestSdkConfigurationProvider'); From 4006a2f9c0de6bba8722db14ba43d972ddf70ed3 Mon Sep 17 00:00:00 2001 From: Nicholas Shahan Date: Fri, 1 Aug 2025 09:43:25 -0700 Subject: [PATCH 2/2] a few more cleanup bits --- frontend_server_client/example/web_client.dart | 1 - frontend_server_common/lib/src/frontend_server_client.dart | 1 - 2 files changed, 2 deletions(-) diff --git a/frontend_server_client/example/web_client.dart b/frontend_server_client/example/web_client.dart index 94e2b8142..4b341aaef 100644 --- a/frontend_server_client/example/web_client.dart +++ b/frontend_server_client/example/web_client.dart @@ -27,7 +27,6 @@ void main(List args) async { '--multi-root-scheme=org-dartlang-sdk', '--modules=amd', '--module-name=dart_sdk', - '--sound-null-safety', '-o', dartSdkJs, p.url.join(sdkDir, sdkKernelPath), diff --git a/frontend_server_common/lib/src/frontend_server_client.dart b/frontend_server_common/lib/src/frontend_server_client.dart index 3c3ae3c1d..b029cbc0d 100644 --- a/frontend_server_common/lib/src/frontend_server_client.dart +++ b/frontend_server_common/lib/src/frontend_server_client.dart @@ -394,7 +394,6 @@ class ResidentCompiler { ], if (useDebuggerModuleNames) '--debugger-module-names', '--experimental-emit-debug-metadata', - '--sound-null-safety', for (final experiment in compilerOptions.experiments) '--enable-experiment=$experiment', if (compilerOptions.canaryFeatures) '--dartdevc-canary',