Skip to content

Commit afede96

Browse files
authored
Move injected client to package:dwds (#481)
Towards #475 - Move injected client from `package:webdev` to `package:dwds` - Create `_test` package used by `package:dwds` - This prevents collisions in builders since `package:dwds` now builds the client to source
1 parent 90c23b4 commit afede96

File tree

20 files changed

+43
-21
lines changed

20 files changed

+43
-21
lines changed

_test/pubspec.yaml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: _test
2+
version: 1.0.0
3+
description: >-
4+
A fake package used for testing
5+
publish_to: none
6+
7+
environment:
8+
sdk: ">=2.3.2-dev.0.1 <3.0.0"
9+
10+
dependencies:
11+
intl: ^0.15.8
12+
path: ^1.6.1
13+
webdev: ^2.0.0
14+
15+
dev_dependencies:
16+
build_runner: ^1.0.0
17+
build_web_compilers: '>=1.0.0 <3.0.0'
18+
19+
dependency_overrides:
20+
webdev:
21+
path: ../webdev
22+
dwds:
23+
path: ../dwds

dwds/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
- Move `data` abstractions from `package:webdev` into `package:dwds`.
44
- Move debugging related handlers from `package:webdev` into `package:dwds`.
5+
- Move injected client from `package:webdev` into `package:dwds`.
56

67
## 0.3.3
78

webdev/build.yaml renamed to dwds/build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ targets:
88
- -O4
99
generate_for:
1010
- web/client.dart
11-
webdev|client_js_copy_builder:
11+
dwds|client_js_copy_builder:
1212
enabled: true
1313

1414
builders:
@@ -18,6 +18,6 @@ builders:
1818
- copyBuilder
1919
build_extensions:
2020
web/client.dart.js:
21-
- lib/src/serve/injected/client.js
21+
- lib/src/injected/client.js
2222
auto_apply: none
2323
build_to: source

webdev/lib/src/serve/middlewares/injected_middleware.dart renamed to dwds/lib/src/handlers/injected_handler.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const entrypointExtensionMarker = '/* ENTRYPOINT_EXTENTION_MARKER */';
2121
/// Marker placed by build_web_compilers for where to put injected JS code.
2222
const mainExtensionMarker = '/* MAIN_EXTENSION_MARKER */';
2323

24-
const _clientScript = 'webdev/src/serve/injected/client';
24+
const _clientScript = 'dwds/src/injected/client';
2525

2626
Handler Function(Handler) createInjectedHandler(
2727
ReloadConfiguration configuration,
File renamed without changes.

dwds/pubspec.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ dev_dependencies:
2828
build_runner: ^1.0.0
2929
build_web_compilers: '>=1.0.0 <3.0.0'
3030
built_value_generator: ^6.4.0
31+
graphs: ^0.2.0
32+
js: ^0.6.1
3133
test: ^1.6.0
34+
uuid: ^2.0.0
3235
webdriver: ^2.0.0
3336
webdev: ^2.0.0
3437

0 commit comments

Comments
 (0)