From a9262a186bf6b91832fc47f67110a8c53f4cb944 Mon Sep 17 00:00:00 2001 From: Parker Lougheed Date: Thu, 31 Aug 2023 22:37:54 -0500 Subject: [PATCH 1/3] Update SDK constraints for Dart 3.1 release --- .github/workflows/dart.yml | 4 ++-- dwds/CHANGELOG.md | 2 ++ dwds/debug_extension/pubspec.yaml | 2 +- dwds/debug_extension_mv3/pubspec.yaml | 2 +- dwds/pubspec.yaml | 2 +- example/pubspec.yaml | 2 +- fixtures/_experimentSound/pubspec.yaml | 2 +- fixtures/_test/pubspec.yaml | 2 +- fixtures/_testCircular1/pubspec.yaml | 2 +- fixtures/_testCircular1Sound/pubspec.yaml | 2 +- fixtures/_testCircular2/pubspec.yaml | 2 +- fixtures/_testCircular2Sound/pubspec.yaml | 2 +- fixtures/_testPackage/pubspec.yaml | 2 +- fixtures/_testPackageSound/pubspec.yaml | 2 +- fixtures/_testSound/pubspec.yaml | 2 +- fixtures/_webdevSmoke/pubspec.yaml | 2 +- fixtures/_webdevSoundSmoke/pubspec.yaml | 2 +- frontend_server_client/CHANGELOG.md | 4 ++-- frontend_server_client/pubspec.yaml | 4 ++-- frontend_server_client/test/frontend_sever_client_test.dart | 2 +- frontend_server_common/pubspec.yaml | 2 +- test_common/pubspec.yaml | 2 +- tool/ci.sh | 2 +- tool/pubspec.yaml | 2 +- webdev/CHANGELOG.md | 2 ++ webdev/pubspec.yaml | 2 +- 26 files changed, 31 insertions(+), 27 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 98c48d6b0..41d295593 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -1,4 +1,4 @@ -# Created with package:mono_repo v6.4.3 +# Created with package:mono_repo v6.5.7 name: Dart CI on: push: @@ -37,7 +37,7 @@ jobs: name: Checkout repository uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b - name: mono_repo self validate - run: dart pub global activate mono_repo 6.4.3 + run: dart pub global activate mono_repo 6.5.7 - name: mono_repo self validate run: dart pub global run mono_repo generate --validate job_002: diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md index 19b249967..960399a0a 100644 --- a/dwds/CHANGELOG.md +++ b/dwds/CHANGELOG.md @@ -1,5 +1,7 @@ ## 21.0.0-wip +- Update Dart SDK constraint to `>=3.2.0-36.0.dev <4.0.0`. + **Breaking changes** - Allow clients to specify where to find the package config. - [#2203](https://github.com/dart-lang/webdev/pull/2203). diff --git a/dwds/debug_extension/pubspec.yaml b/dwds/debug_extension/pubspec.yaml index 07cf7ad41..c51aeb4ab 100644 --- a/dwds/debug_extension/pubspec.yaml +++ b/dwds/debug_extension/pubspec.yaml @@ -6,7 +6,7 @@ description: >- A chrome extension for Dart debugging. environment: - sdk: ">=3.1.0-340.0.dev <4.0.0" + sdk: ^3.2.0-36.0.dev dependencies: async: ^2.3.0 diff --git a/dwds/debug_extension_mv3/pubspec.yaml b/dwds/debug_extension_mv3/pubspec.yaml index c8e542a93..f903619a3 100644 --- a/dwds/debug_extension_mv3/pubspec.yaml +++ b/dwds/debug_extension_mv3/pubspec.yaml @@ -6,7 +6,7 @@ description: >- A Chrome extension for Dart debugging. environment: - sdk: ">=3.1.0-340.0.dev <4.0.0" + sdk: ^3.2.0-36.0.dev dependencies: built_value: ^8.3.0 diff --git a/dwds/pubspec.yaml b/dwds/pubspec.yaml index b80111396..c2a957467 100644 --- a/dwds/pubspec.yaml +++ b/dwds/pubspec.yaml @@ -6,7 +6,7 @@ description: >- service protocol. repository: https://github.com/dart-lang/webdev/tree/master/dwds environment: - sdk: ">=3.1.0-340.0.dev <4.0.0" + sdk: ^3.2.0-36.0.dev dependencies: async: ^2.9.0 diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 747180c44..bbaf11574 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -4,7 +4,7 @@ description: A web app example for webdev CLI. publish_to: none environment: - sdk: ">=3.1.0-340.0.dev <4.0.0" + sdk: ^3.2.0-36.0.dev dev_dependencies: build_runner: ^2.4.0 diff --git a/fixtures/_experimentSound/pubspec.yaml b/fixtures/_experimentSound/pubspec.yaml index 517ea35fc..6640daef1 100644 --- a/fixtures/_experimentSound/pubspec.yaml +++ b/fixtures/_experimentSound/pubspec.yaml @@ -5,7 +5,7 @@ description: >- publish_to: none environment: - sdk: ">=3.1.0-254.0.dev<4.0.0" + sdk: ^3.2.0-36.0.dev dependencies: intl: ^0.17.0 diff --git a/fixtures/_test/pubspec.yaml b/fixtures/_test/pubspec.yaml index ca7044b90..296935c42 100644 --- a/fixtures/_test/pubspec.yaml +++ b/fixtures/_test/pubspec.yaml @@ -9,7 +9,7 @@ description: >- publish_to: none environment: - sdk: ">=3.1.0-340.0.dev <4.0.0" + sdk: ^3.2.0-36.0.dev dependencies: intl: ^0.17.0 diff --git a/fixtures/_testCircular1/pubspec.yaml b/fixtures/_testCircular1/pubspec.yaml index ce209823c..c6b0dd504 100644 --- a/fixtures/_testCircular1/pubspec.yaml +++ b/fixtures/_testCircular1/pubspec.yaml @@ -9,7 +9,7 @@ description: >- publish_to: none environment: - sdk: ">=3.1.0-340.0.dev <4.0.0" + sdk: ^3.2.0-36.0.dev dependencies: intl: ^0.17.0 diff --git a/fixtures/_testCircular1Sound/pubspec.yaml b/fixtures/_testCircular1Sound/pubspec.yaml index b1e07e8ac..a95c387ff 100644 --- a/fixtures/_testCircular1Sound/pubspec.yaml +++ b/fixtures/_testCircular1Sound/pubspec.yaml @@ -5,7 +5,7 @@ description: >- publish_to: none environment: - sdk: ">=3.1.0-340.0.dev <4.0.0" + sdk: ^3.2.0-36.0.dev dependencies: intl: ^0.17.0 diff --git a/fixtures/_testCircular2/pubspec.yaml b/fixtures/_testCircular2/pubspec.yaml index 153ccb245..fca9f9a9c 100644 --- a/fixtures/_testCircular2/pubspec.yaml +++ b/fixtures/_testCircular2/pubspec.yaml @@ -9,7 +9,7 @@ description: >- publish_to: none environment: - sdk: ">=3.1.0-340.0.dev <4.0.0" + sdk: ^3.2.0-36.0.dev dependencies: _test_circular1: diff --git a/fixtures/_testCircular2Sound/pubspec.yaml b/fixtures/_testCircular2Sound/pubspec.yaml index 51f768ab8..233a2384c 100644 --- a/fixtures/_testCircular2Sound/pubspec.yaml +++ b/fixtures/_testCircular2Sound/pubspec.yaml @@ -5,7 +5,7 @@ description: >- publish_to: none environment: - sdk: ">=3.1.0-340.0.dev <4.0.0" + sdk: ^3.2.0-36.0.dev dependencies: _test_circular1_sound: diff --git a/fixtures/_testPackage/pubspec.yaml b/fixtures/_testPackage/pubspec.yaml index 7c3ec06ef..a087d6083 100644 --- a/fixtures/_testPackage/pubspec.yaml +++ b/fixtures/_testPackage/pubspec.yaml @@ -9,7 +9,7 @@ description: >- publish_to: none environment: - sdk: ">=3.1.0-254.0.dev<4.0.0" + sdk: ^3.2.0-36.0.dev dependencies: _test: diff --git a/fixtures/_testPackageSound/pubspec.yaml b/fixtures/_testPackageSound/pubspec.yaml index 6a41aa485..e547e7168 100644 --- a/fixtures/_testPackageSound/pubspec.yaml +++ b/fixtures/_testPackageSound/pubspec.yaml @@ -5,7 +5,7 @@ description: >- publish_to: none environment: - sdk: ">=3.1.0-340.0.dev <4.0.0" + sdk: ^3.2.0-36.0.dev dependencies: _test_sound: diff --git a/fixtures/_testSound/pubspec.yaml b/fixtures/_testSound/pubspec.yaml index bb4ae18de..36cc7d1bb 100644 --- a/fixtures/_testSound/pubspec.yaml +++ b/fixtures/_testSound/pubspec.yaml @@ -5,7 +5,7 @@ description: >- publish_to: none environment: - sdk: ">=3.1.0-340.0.dev <4.0.0" + sdk: ^3.2.0-36.0.dev dependencies: intl: ^0.17.0 diff --git a/fixtures/_webdevSmoke/pubspec.yaml b/fixtures/_webdevSmoke/pubspec.yaml index fefa22f7b..bb2384603 100644 --- a/fixtures/_webdevSmoke/pubspec.yaml +++ b/fixtures/_webdevSmoke/pubspec.yaml @@ -14,7 +14,7 @@ publish_to: none # and build_web_compilers constraint should match those defined # in pubspec.dart. environment: - sdk: ">=3.1.0-340.0.dev <4.0.0" + sdk: ^3.2.0-36.0.dev dev_dependencies: build_runner: '>=1.6.2 <3.0.0' diff --git a/fixtures/_webdevSoundSmoke/pubspec.yaml b/fixtures/_webdevSoundSmoke/pubspec.yaml index 0775b1960..b286a9962 100644 --- a/fixtures/_webdevSoundSmoke/pubspec.yaml +++ b/fixtures/_webdevSoundSmoke/pubspec.yaml @@ -4,7 +4,7 @@ description: A test fixture for webdev testing with sound support. publish_to: none environment: - sdk: ">=3.1.0-340.0.dev <4.0.0" + sdk: ^3.2.0-36.0.dev dev_dependencies: build_runner: ^2.4.0 diff --git a/frontend_server_client/CHANGELOG.md b/frontend_server_client/CHANGELOG.md index 9f210a476..baedcf926 100644 --- a/frontend_server_client/CHANGELOG.md +++ b/frontend_server_client/CHANGELOG.md @@ -1,6 +1,6 @@ -## 3.3.0-dev +## 3.3.0-wip -- Update SDK constraint to `>=3.0.0-134.0.dev <4.0.0`. +- Update Dart SDK constraint to `>=3.0.0 <4.0.0`. - Support changes in the SDK layout for Dart 3.0. ## 3.2.0 diff --git a/frontend_server_client/pubspec.yaml b/frontend_server_client/pubspec.yaml index e1507b406..5ef52a2f2 100644 --- a/frontend_server_client/pubspec.yaml +++ b/frontend_server_client/pubspec.yaml @@ -1,12 +1,12 @@ name: frontend_server_client -version: 3.3.0-dev +version: 3.3.0-wip description: >- Client code to start and interact with the frontend_server compiler from the Dart SDK. repository: https://github.com/dart-lang/webdev/tree/master/frontend_server_client environment: - sdk: ">=3.0.0-134.0.dev <4.0.0" + sdk: ^3.0.0 dependencies: async: ^2.5.0 diff --git a/frontend_server_client/test/frontend_sever_client_test.dart b/frontend_server_client/test/frontend_sever_client_test.dart index b8a637649..4deab4fac 100644 --- a/frontend_server_client/test/frontend_sever_client_test.dart +++ b/frontend_server_client/test/frontend_sever_client_test.dart @@ -28,7 +28,7 @@ dependencies: path: ^1.0.0 environment: - sdk: ">3.0.0-134.0.dev <4.0.0" + sdk: ^3.0.0 '''), d.dir('bin', [ d.file('main.dart', ''' diff --git a/frontend_server_common/pubspec.yaml b/frontend_server_common/pubspec.yaml index 0e7cd75c6..22e6c31f6 100644 --- a/frontend_server_common/pubspec.yaml +++ b/frontend_server_common/pubspec.yaml @@ -3,7 +3,7 @@ publish_to: none description: >- Frontend server integration code to use for dwds tests. Mimics flutter code. environment: - sdk: ">=3.0.0-134.0.dev <4.0.0" + sdk: ^3.2.0-36.0.dev dependencies: dwds: any diff --git a/test_common/pubspec.yaml b/test_common/pubspec.yaml index a253de213..760d45f98 100644 --- a/test_common/pubspec.yaml +++ b/test_common/pubspec.yaml @@ -3,7 +3,7 @@ publish_to: none description: >- Common test functionality. environment: - sdk: ">=3.0.0-134.0.dev <4.0.0" + sdk: ^3.1.0 dependencies: dwds: any diff --git a/tool/ci.sh b/tool/ci.sh index b7b7e66f1..b834a526b 100755 --- a/tool/ci.sh +++ b/tool/ci.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Created with package:mono_repo v6.4.3 +# Created with package:mono_repo v6.5.7 # Support built in commands on windows out of the box. # When it is a flutter repo (check the pubspec.yaml for "sdk: flutter") diff --git a/tool/pubspec.yaml b/tool/pubspec.yaml index 2e78f1363..bb3967c34 100644 --- a/tool/pubspec.yaml +++ b/tool/pubspec.yaml @@ -3,7 +3,7 @@ publish_to: none description: >- Common tools for the mono-repo. environment: - sdk: ">=3.0.0-134.0.dev <4.0.0" + sdk: ^3.1.0 dev_dependencies: args: ^2.4.0 diff --git a/webdev/CHANGELOG.md b/webdev/CHANGELOG.md index 110952096..63ee061b4 100644 --- a/webdev/CHANGELOG.md +++ b/webdev/CHANGELOG.md @@ -1,5 +1,7 @@ ## 3.0.8-wip +- Update Dart SDK constraint to `>=3.2.0-36.0.dev <4.0.0`. + ## 3.0.7 - Update `build_web_compilers` constraint to `^4.0.4`. diff --git a/webdev/pubspec.yaml b/webdev/pubspec.yaml index e5efd3059..22666bad3 100644 --- a/webdev/pubspec.yaml +++ b/webdev/pubspec.yaml @@ -8,7 +8,7 @@ description: >- features for users and tools to build and deploy web applications with Dart. repository: https://github.com/dart-lang/webdev/tree/master/webdev environment: - sdk: ">=3.1.0-340.0.dev <4.0.0" + sdk: ^3.2.0-36.0.dev dependencies: args: ^2.3.1 From 2fa7423c8e40ed13244ec9777f7c76a8d2f4b9a5 Mon Sep 17 00:00:00 2001 From: Parker Lougheed Date: Thu, 31 Aug 2023 22:54:59 -0500 Subject: [PATCH 2/3] Take advantage of expanded type promotion to fix diagnostics --- dwds/lib/src/handlers/dev_handler.dart | 16 +++++++--------- dwds/lib/src/services/debug_service.dart | 2 +- dwds/lib/src/utilities/objects.dart | 6 +++--- webdev/lib/src/pubspec.dart | 2 +- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dwds/lib/src/handlers/dev_handler.dart b/dwds/lib/src/handlers/dev_handler.dart index 3012b2eb1..51c634ac6 100644 --- a/dwds/lib/src/handlers/dev_handler.dart +++ b/dwds/lib/src/handlers/dev_handler.dart @@ -420,15 +420,13 @@ class DevHandler { debuggerStart: debuggerStart, devToolsStart: DateTime.now(), ); - if (_devTools != null) { - await _launchDevTools( - appServices.chromeProxyService.remoteDebugger, - _constructDevToolsUri( - appServices.debugService.uri, - ideQueryParam: 'Dwds', - ), - ); - } + await _launchDevTools( + appServices.chromeProxyService.remoteDebugger, + _constructDevToolsUri( + appServices.debugService.uri, + ideQueryParam: 'Dwds', + ), + ); } Future _handleConnectRequest( diff --git a/dwds/lib/src/services/debug_service.dart b/dwds/lib/src/services/debug_service.dart index a0f8fae99..5976e7e22 100644 --- a/dwds/lib/src/services/debug_service.dart +++ b/dwds/lib/src/services/debug_service.dart @@ -203,7 +203,7 @@ class DebugService { Future get encodedUri async { if (_encodedUri != null) return _encodedUri!; var encoded = uri; - if (_urlEncoder != null) encoded = await _urlEncoder!(encoded); + if (_urlEncoder != null) encoded = await _urlEncoder(encoded); return _encodedUri = encoded; } diff --git a/dwds/lib/src/utilities/objects.dart b/dwds/lib/src/utilities/objects.dart index 05aedd52c..0aafa86ec 100644 --- a/dwds/lib/src/utilities/objects.dart +++ b/dwds/lib/src/utilities/objects.dart @@ -21,7 +21,7 @@ class Property { /// /// Useful for getting access to properties of particular types of /// RemoteObject. - Object? get rawValue => _map == null ? null : _map!['value']; + Object? get rawValue => _map == null ? null : _map['value']; /// Remote object value in case of primitive values or JSON values (if it was /// requested). (optional) @@ -29,7 +29,7 @@ class Property { if (_remoteObjectValue != null) return _remoteObjectValue!; if (_map == null) return null; if (rawValue == null) return null; - final val = _map!['value']; + final val = _map['value']; if (val is RemoteObject) { _remoteObjectValue = val; } else { @@ -59,7 +59,7 @@ class Property { /// Will be of the form 'Symbol(_actualName)' for private fields. String? get rawName { if (_map == null) return null; - return _map!['name'] as String; + return _map['name'] as String; } @override diff --git a/webdev/lib/src/pubspec.dart b/webdev/lib/src/pubspec.dart index 65207438f..34cc83c7d 100644 --- a/webdev/lib/src/pubspec.dart +++ b/webdev/lib/src/pubspec.dart @@ -91,7 +91,7 @@ class PubspecLock { PackageExceptionDetails.missingDep(pkgName, constraint); var pkgDataMap = - (_packages == null) ? null : _packages![pkgName] as YamlMap?; + (_packages == null) ? null : _packages[pkgName] as YamlMap?; if (pkgDataMap == null) { issues.add(missingDetails); } else { From 490d56d4dbb440ab217469d563890cb025077633 Mon Sep 17 00:00:00 2001 From: Parker Lougheed Date: Thu, 7 Sep 2023 15:46:51 -0500 Subject: [PATCH 3/3] Add PR link to changelogs --- dwds/CHANGELOG.md | 2 +- webdev/CHANGELOG.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md index 960399a0a..822fb3b16 100644 --- a/dwds/CHANGELOG.md +++ b/dwds/CHANGELOG.md @@ -1,6 +1,6 @@ ## 21.0.0-wip -- Update Dart SDK constraint to `>=3.2.0-36.0.dev <4.0.0`. +- Update Dart SDK constraint to `>=3.2.0-36.0.dev <4.0.0`. - [#2207](https://github.com/dart-lang/webdev/pull/2207) **Breaking changes** diff --git a/webdev/CHANGELOG.md b/webdev/CHANGELOG.md index 63ee061b4..949cf543b 100644 --- a/webdev/CHANGELOG.md +++ b/webdev/CHANGELOG.md @@ -1,6 +1,6 @@ ## 3.0.8-wip -- Update Dart SDK constraint to `>=3.2.0-36.0.dev <4.0.0`. +- Update Dart SDK constraint to `>=3.2.0-36.0.dev <4.0.0`. - [#2207](https://github.com/dart-lang/webdev/pull/2207) ## 3.0.7