From 6fe58fa82b742de283f2d574daf32bb4595c34f5 Mon Sep 17 00:00:00 2001 From: Gary Roumanis Date: Mon, 22 Jul 2019 10:13:05 -0700 Subject: [PATCH 1/5] prep for publish --- dwds/CHANGELOG.md | 2 +- dwds/pubspec.yaml | 13 ++++++++++++- example/pubspec.yaml | 8 +++++++- webdev/CHANGELOG.md | 3 ++- webdev/lib/src/pubspec.dart | 4 ++-- webdev/pubspec.yaml | 4 ++-- 6 files changed, 26 insertions(+), 8 deletions(-) diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md index 0634b86ee..0ca1e9b2e 100644 --- a/dwds/CHANGELOG.md +++ b/dwds/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.4.0-dev +## 0.4.0 - Move `data` abstractions from `package:webdev` into `package:dwds`. - Move debugging related handlers from `package:webdev` into `package:dwds`. diff --git a/dwds/pubspec.yaml b/dwds/pubspec.yaml index 2b415cbcf..40f937b2c 100644 --- a/dwds/pubspec.yaml +++ b/dwds/pubspec.yaml @@ -1,5 +1,5 @@ name: dwds -version: 0.3.3 +version: 0.4.0 author: Dart Team homepage: https://github.com/dart-lang/webdev/tree/master/dwds description: >- @@ -10,23 +10,34 @@ environment: sdk: ">=2.3.2-dev.0.1 <3.0.0" dependencies: + async: ^2.3.0 + build: ^1.1.5 + build_daemon: ^2.0.0 + built_collection: ^4.2.2 + built_value: ^6.7.0 + crypto: ^2.0.6 devtools: ^0.1.0 http: ^0.12.0 http_multi_server: ^2.0.0 + logging: ^0.11.3 meta: ^1.1.7 path: ^1.6.0 pedantic: ^1.5.0 pub_semver: ^1.4.2 shelf: ^0.7.0 shelf_proxy: ^0.1.0+6 + shelf_static: ^0.2.8 shelf_web_socket: ^0.2.0 source_maps: ^0.10.0 + sse: ^2.0.2 + stream_channel: ^2.0.0 vm_service_lib: 3.20.0+02 web_socket_channel: ^1.0.0 webkit_inspection_protocol: ^0.4.0 dev_dependencies: args: ^1.0.0 + build: ^1.1.5 build_runner: ^1.0.0 build_web_compilers: '>=1.0.0 <3.0.0' built_value_generator: ^6.4.0 diff --git a/example/pubspec.yaml b/example/pubspec.yaml index b096fa00a..4169d7c06 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -11,6 +11,12 @@ dependencies: angular_components: ^0.13.0 dev_dependencies: - build_runner: '>=1.3.0 <2.0.0' + build_runner: '>=1.6.2 <2.0.0' build_web_compilers: '>=1.0.0 <3.0.0' webdev: ^2.0.0 + +dependency_overrides: + webdev: + path: ../webdev + dwds: + path: ../dwds diff --git a/webdev/CHANGELOG.md b/webdev/CHANGELOG.md index d5072e2bf..fe803e4c7 100644 --- a/webdev/CHANGELOG.md +++ b/webdev/CHANGELOG.md @@ -1,6 +1,7 @@ -## 2.3.0-dev +## 2.3.0 - Depend on the latest `package:dwds`. +- Depend on the latest `package:build_daemon`. ## 2.2.0 diff --git a/webdev/lib/src/pubspec.dart b/webdev/lib/src/pubspec.dart index e62c97149..96e20b075 100644 --- a/webdev/lib/src/pubspec.dart +++ b/webdev/lib/src/pubspec.dart @@ -140,7 +140,7 @@ class PubspecLock { Future> _validateBuildDaemonVersion( PubspecLock pubspecLock) async { - var buildDaemonConstraint = '>=1.0.0 <2.0.0'; + var buildDaemonConstraint = '>=2.0.0 <3.0.0'; var issues = []; @@ -180,7 +180,7 @@ Future checkPubspecLock(PubspecLock pubspecLock, var issues = []; var buildRunnerIssues = pubspecLock.checkPackage( - 'build_runner', VersionConstraint.parse('>=1.5.0 <2.0.0')); + 'build_runner', VersionConstraint.parse('>=1.6.2 <2.0.0')); issues.addAll(buildRunnerIssues); diff --git a/webdev/pubspec.yaml b/webdev/pubspec.yaml index 523e2265b..e6f0717e5 100644 --- a/webdev/pubspec.yaml +++ b/webdev/pubspec.yaml @@ -1,6 +1,6 @@ name: webdev # Every time this changes you need to run `pub run build_runner build`. -version: 2.3.0-dev +version: 2.3.0 author: Dart Team homepage: https://github.com/dart-lang/webdev description: >- @@ -13,7 +13,7 @@ environment: dependencies: args: ^1.5.0 async: ^2.2.0 - build_daemon: ^1.1.0 + build_daemon: ^2.0.0 built_value: ^6.3.0 crypto: ^2.0.6 dwds: ^0.4.0 From 0448b6bdf2dccb70c6e70fc3043587d47fbd8aae Mon Sep 17 00:00:00 2001 From: Gary Roumanis Date: Mon, 22 Jul 2019 10:13:37 -0700 Subject: [PATCH 2/5] build --- webdev/lib/src/version.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webdev/lib/src/version.dart b/webdev/lib/src/version.dart index ca26a8818..369259122 100644 --- a/webdev/lib/src/version.dart +++ b/webdev/lib/src/version.dart @@ -1,2 +1,2 @@ // Generated code. Do not modify. -const packageVersion = '2.3.0-dev'; +const packageVersion = '2.3.0'; From 3b40821851b6378b88bd47d473283044432eb054 Mon Sep 17 00:00:00 2001 From: Gary Roumanis Date: Mon, 22 Jul 2019 10:16:52 -0700 Subject: [PATCH 3/5] fix integration test --- webdev/test/integration_test.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webdev/test/integration_test.dart b/webdev/test/integration_test.dart index fe312bddd..8178259b2 100644 --- a/webdev/test/integration_test.dart +++ b/webdev/test/integration_test.dart @@ -143,7 +143,7 @@ name: sample switch (entry.key) { case 'build_runner': buildRunnerVersion = version; - supportedRange = '>=1.5.0 <2.0.0'; + supportedRange = '>=1.6.2 <2.0.0'; break; case 'build_web_compilers': webCompilersVersion = version; @@ -288,9 +288,9 @@ dependencies: } } -const _supportedBuildRunnerVersion = '1.5.0'; +const _supportedBuildRunnerVersion = '1.6.2'; const _supportedWebCompilersVersion = '1.2.0'; -const _supportedBuildDaemonVersion = '1.0.0'; +const _supportedBuildDaemonVersion = '2.0.0'; String _pubspecLock( {String runnerVersion = _supportedBuildRunnerVersion, From 7ad04019348b410b7a7143ca29ca84d259049f04 Mon Sep 17 00:00:00 2001 From: Gary Roumanis Date: Mon, 22 Jul 2019 11:07:57 -0700 Subject: [PATCH 4/5] fix constraints --- _test/pubspec.yaml | 3 +-- dwds/pubspec.yaml | 6 +++--- webdev/pubspec.yaml | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/_test/pubspec.yaml b/_test/pubspec.yaml index 058ed106e..c3279af87 100644 --- a/_test/pubspec.yaml +++ b/_test/pubspec.yaml @@ -10,8 +10,7 @@ environment: dependencies: intl: ^0.15.8 path: ^1.6.1 - webdev: ^2.0.0 dev_dependencies: - build_runner: ^1.0.0 + build_runner: ^1.6.2 build_web_compilers: '>=1.0.0 <3.0.0' diff --git a/dwds/pubspec.yaml b/dwds/pubspec.yaml index 40f937b2c..a5d30c697 100644 --- a/dwds/pubspec.yaml +++ b/dwds/pubspec.yaml @@ -11,9 +11,9 @@ environment: dependencies: async: ^2.3.0 - build: ^1.1.5 + build: ^1.1.0 build_daemon: ^2.0.0 - built_collection: ^4.2.2 + built_collection: ^4.2.0 built_value: ^6.7.0 crypto: ^2.0.6 devtools: ^0.1.0 @@ -38,7 +38,7 @@ dependencies: dev_dependencies: args: ^1.0.0 build: ^1.1.5 - build_runner: ^1.0.0 + build_runner: ^1.6.2 build_web_compilers: '>=1.0.0 <3.0.0' built_value_generator: ^6.4.0 graphs: ^0.2.0 diff --git a/webdev/pubspec.yaml b/webdev/pubspec.yaml index e6f0717e5..91331ea4f 100644 --- a/webdev/pubspec.yaml +++ b/webdev/pubspec.yaml @@ -37,7 +37,7 @@ dependencies: dev_dependencies: build: ^1.0.0 - build_runner: ^1.0.0 + build_runner: ^1.6.2 build_verify: ^1.0.0 build_version: ^2.0.0 test: ^1.6.0 From 1320d9e9fa7b7ddabcab5fdfca90f506c4feddab Mon Sep 17 00:00:00 2001 From: Gary Roumanis Date: Mon, 22 Jul 2019 12:12:53 -0700 Subject: [PATCH 5/5] update readme --- webdev/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webdev/README.md b/webdev/README.md index 0ae0032bc..a399c1735 100644 --- a/webdev/README.md +++ b/webdev/README.md @@ -14,7 +14,7 @@ similar to: ```yaml ... dev_dependencies: - build_runner: ^1.3.0 + build_runner: ^1.6.2 build_web_compilers: ^2.0.0 ... ```