Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/dart.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions dwds/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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).
Expand Down
2 changes: 1 addition & 1 deletion dwds/debug_extension/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dwds/debug_extension_mv3/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 7 additions & 9 deletions dwds/lib/src/handlers/dev_handler.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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<AppConnection> _handleConnectRequest(
Expand Down
2 changes: 1 addition & 1 deletion dwds/lib/src/services/debug_service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ class DebugService {
Future<String> 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;
}

Expand Down
6 changes: 3 additions & 3 deletions dwds/lib/src/utilities/objects.dart
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ 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)
RemoteObject? get value {
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 {
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dwds/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion fixtures/_experimentSound/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion fixtures/_test/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion fixtures/_testCircular1/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion fixtures/_testCircular1Sound/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion fixtures/_testCircular2/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion fixtures/_testCircular2Sound/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion fixtures/_testPackage/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion fixtures/_testPackageSound/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion fixtures/_testSound/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion fixtures/_webdevSmoke/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion fixtures/_webdevSoundSmoke/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions frontend_server_client/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions frontend_server_client/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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', '''
Expand Down
2 changes: 1 addition & 1 deletion frontend_server_common/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test_common/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tool/ci.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tool/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions webdev/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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`.
Expand Down
2 changes: 1 addition & 1 deletion webdev/lib/src/pubspec.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion webdev/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down