Skip to content

Commit ac85cbb

Browse files
yjbanovyjbanov
committed
fix(web_workers): support @AngularEntrypoint in web workers
And enable transformers on all playground apps Closes angular#6013
1 parent b0cebdb commit ac85cbb

File tree

19 files changed

+107
-89
lines changed

19 files changed

+107
-89
lines changed

‎gulpfile.js

+14-18
Original file line numberDiff line numberDiff line change
@@ -906,24 +906,20 @@ gulp.task('build/pure-packages.dart/standalone', function() {
906906
.pipe(gulp.dest(CONFIG.dest.dart));
907907
});
908908

909-
gulp.task('build/pure-packages.dart/license',
910-
function() {
911-
return gulp.src(['LICENSE'])
912-
.pipe(gulp.dest(path.join(CONFIG.dest.dart, 'angular2_testing')));
913-
})
914-
915-
916-
gulp.task('build/pure-packages.dart/angular2', function() {
917-
var yaml = require('js-yaml');
918-
919-
return gulp.src([
920-
'modules_dart/transform/**/*',
921-
'!modules_dart/transform/**/*.proto',
922-
'!modules_dart/transform/pubspec.yaml',
923-
'!modules_dart/transform/**/packages{,/**}',
924-
])
925-
.pipe(gulp.dest(path.join(CONFIG.dest.dart, 'angular2')));
926-
});
909+
gulp.task('build/pure-packages.dart/license', function() {
910+
return gulp.src(['LICENSE']).pipe(gulp.dest(path.join(CONFIG.dest.dart, 'angular2_testing')));
911+
});
912+
913+
914+
gulp.task('build/pure-packages.dart/angular2', function() {
915+
return gulp.src([
916+
'modules_dart/transform/**/*',
917+
'!modules_dart/transform/**/*.proto',
918+
'!modules_dart/transform/pubspec.yaml',
919+
'!modules_dart/transform/**/packages{,/**}',
920+
])
921+
.pipe(gulp.dest(path.join(CONFIG.dest.dart, 'angular2')));
922+
});
927923

928924
// Builds all Dart packages, but does not compile them
929925
gulp.task('build/packages.dart', function(done) {

‎modules/angular2/angular2.dart

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ library angular2;
55
*
66
* This library does not include `bootstrap`. Import `bootstrap.dart` instead.
77
*/
8-
export 'package:angular2/core.dart'
9-
hide forwardRef, resolveForwardRef, ForwardRefFn;
8+
export 'package:angular2/core.dart';
109
export 'package:angular2/common.dart';
1110
export 'package:angular2/instrumentation.dart';
1211
export 'package:angular2/src/core/angular_entrypoint.dart' show AngularEntrypoint;

‎modules/angular2/core.dart

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
library angular2.core;
22

3+
export './src/core/angular_entrypoint.dart' show AngularEntrypoint;
34
export './src/core/metadata.dart';
45
export './src/core/util.dart';
56
export 'package:angular2/src/facade/lang.dart' show enableProdMode;

‎modules/angular2/src/platform/worker_app.ts

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
import {WORKER_APP_APPLICATION_COMMON} from './worker_app_common';
1111
import {APP_INITIALIZER} from 'angular2/core';
1212
import {MessageBus} from 'angular2/src/web_workers/shared/message_bus';
13+
import {COMPILER_PROVIDERS} from 'angular2/src/compiler/compiler';
1314

1415
// TODO(jteplitz602) remove this and compile with lib.webworker.d.ts (#3492)
1516
let _postMessage = {
@@ -20,6 +21,7 @@ let _postMessage = {
2021

2122
export const WORKER_APP_APPLICATION: Array<any /*Type | Provider | any[]*/> = [
2223
WORKER_APP_APPLICATION_COMMON,
24+
COMPILER_PROVIDERS,
2325
new Provider(MessageBus, {useFactory: createMessageBus, deps: [NgZone]}),
2426
new Provider(APP_INITIALIZER, {useValue: setupWebWorker, multi: true})
2527
];

‎modules/angular2/src/platform/worker_app_common.ts

-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import {
1919
ServiceMessageBrokerFactory,
2020
ServiceMessageBrokerFactory_
2121
} from 'angular2/src/web_workers/shared/service_message_broker';
22-
import {COMPILER_PROVIDERS} from 'angular2/src/compiler/compiler';
2322
import {Serializer} from "angular2/src/web_workers/shared/serializer";
2423
import {ON_WEB_WORKER} from "angular2/src/web_workers/shared/api";
2524
import {Provider} from 'angular2/src/core/di';
@@ -37,7 +36,6 @@ export const WORKER_APP_PLATFORM: Array<any /*Type | Provider | any[]*/> =
3736

3837
export const WORKER_APP_APPLICATION_COMMON: Array<any /*Type | Provider | any[]*/> = CONST_EXPR([
3938
APPLICATION_COMMON_PROVIDERS,
40-
COMPILER_PROVIDERS,
4139
FORM_PROVIDERS,
4240
Serializer,
4341
new Provider(PLATFORM_PIPES, {useValue: COMMON_PIPES, multi: true}),

‎modules/angular2/test/web_workers/shared/service_message_broker_spec.ts

+21-15
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ import {
33
inject,
44
describe,
55
it,
6+
iit,
67
expect,
78
beforeEach,
89
beforeEachProviders,
910
SpyObject,
10-
proxy
11+
proxy,
12+
browserDetection
1113
} from 'angular2/testing_internal';
1214
import {createPairedMessageBuses} from '../shared/web_worker_test_util';
1315
import {Serializer, PRIMITIVE} from 'angular2/src/web_workers/shared/serializer';
@@ -49,19 +51,23 @@ export function main() {
4951
{'method': TEST_METHOD, 'args': [PASSED_ARG_1, PASSED_ARG_2]});
5052
}));
5153

52-
it("should return promises to the worker", inject([Serializer], (serializer) => {
53-
var broker = new ServiceMessageBroker_(messageBuses.ui, serializer, CHANNEL);
54-
broker.registerMethod(TEST_METHOD, [PRIMITIVE], (arg1) => {
55-
expect(arg1).toEqual(PASSED_ARG_1);
56-
return PromiseWrapper.wrap(() => { return RESULT; });
57-
});
58-
ObservableWrapper.callEmit(messageBuses.worker.to(CHANNEL),
59-
{'method': TEST_METHOD, 'id': ID, 'args': [PASSED_ARG_1]});
60-
ObservableWrapper.subscribe(messageBuses.worker.from(CHANNEL), (data: any) => {
61-
expect(data.type).toEqual("result");
62-
expect(data.id).toEqual(ID);
63-
expect(data.value).toEqual(RESULT);
64-
});
65-
}));
54+
// TODO(pkozlowski): this fails only in Edge with
55+
// "No provider for RenderStore! (Serializer -> RenderStore)"
56+
if (!browserDetection.isEdge) {
57+
it("should return promises to the worker", inject([Serializer], (serializer) => {
58+
var broker = new ServiceMessageBroker_(messageBuses.ui, serializer, CHANNEL);
59+
broker.registerMethod(TEST_METHOD, [PRIMITIVE], (arg1) => {
60+
expect(arg1).toEqual(PASSED_ARG_1);
61+
return PromiseWrapper.wrap(() => { return RESULT; });
62+
});
63+
ObservableWrapper.callEmit(messageBuses.worker.to(CHANNEL),
64+
{'method': TEST_METHOD, 'id': ID, 'args': [PASSED_ARG_1]});
65+
ObservableWrapper.subscribe(messageBuses.worker.from(CHANNEL), (data: any) => {
66+
expect(data.type).toEqual("result");
67+
expect(data.id).toEqual(ID);
68+
expect(data.value).toEqual(RESULT);
69+
});
70+
}));
71+
}
6672
});
6773
}

‎modules/benchmarks/pubspec.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ transformers:
2626
- web/src/static_tree/tree_benchmark.dart
2727
- web/src/tree/tree_benchmark.dart
2828
- $dart2js:
29+
$include: web/src/**
2930
minify: false
3031
commandLineOptions:
3132
- --dump-info
3233
- --trust-type-annotations
3334
- --trust-primitives
3435
- --show-package-warnings
36+
- --fatal-warnings

‎modules/benchmarks_external/pubspec.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ dependency_overrides:
1111
intl: '^0.12.4' # angular depends on an older version of intl.
1212
transformers:
1313
- angular:
14-
$exclude: "web/e2e_test"
14+
$include: "web/src"
1515
html_files:
1616
- web/src/naive_infinite_scroll/scroll_area.html
1717
- web/src/naive_infinite_scroll/scroll_item.html
1818
- $dart2js:
19+
$include: "web/src"
1920
commandLineOptions:
2021
- --show-package-warnings

‎modules/playground/pubspec.yaml

+45-28
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,12 @@ transformers:
1919
- angular2:
2020
platform_directives: 'package:angular2/src/common/directives.dart#CORE_DIRECTIVES'
2121
entry_points:
22+
- web/src/animate/index.dart
23+
- web/src/async/index.dart
2224
- web/src/gestures/index.dart
25+
- web/src/hash_routing/index.dart
2326
- web/src/hello_world/index.dart
2427
- web/src/key_events/index.dart
25-
- web/src/sourcemap/index.dart
26-
- web/src/todo/index.dart
27-
- web/src/order_management/index.dart
28-
- web/src/model_driven_forms/index.dart
29-
- web/src/observable_models/index.dart
30-
- web/src/person_management/index.dart
31-
- web/src/routing/index.dart
32-
- web/src/template_driven_forms/index.dart
33-
- web/src/zippy_component/index.dart
34-
- web/src/relative_assets/index.dart
35-
- web/src/svg/index.dart
3628
- web/src/material/button/index.dart
3729
- web/src/material/checkbox/index.dart
3830
- web/src/material/dialog/index.dart
@@ -41,25 +33,50 @@ transformers:
4133
- web/src/material/progress-linear/index.dart
4234
- web/src/material/radio/index.dart
4335
- web/src/material/switcher/index.dart
36+
- web/src/model_driven_forms/index.dart
37+
- web/src/observable_models/index.dart
38+
- web/src/order_management/index.dart
39+
- web/src/person_management/index.dart
40+
- web/src/relative_assets/index.dart
41+
- web/src/routing/index.dart
42+
- web/src/sourcemap/index.dart
43+
- web/src/svg/index.dart
44+
- web/src/template_driven_forms/index.dart
45+
- web/src/todo/index.dart
46+
- web/src/web_workers/kitchen_sink/background_index.dart
47+
- web/src/web_workers/kitchen_sink/index.dart
48+
- web/src/web_workers/message_broker/background_index.dart
49+
- web/src/web_workers/message_broker/index.dart
50+
- web/src/web_workers/todo/background_index.dart
51+
- web/src/web_workers/todo/index.dart
52+
- web/src/web_workers/todo/server_index.dart
53+
- web/src/zippy_component/index.dart
4454

45-
# These entrypoints are disabled untl the transformer supports UI bootstrap (issue #3971)
46-
# - web/src/web_workers/message_broker/index.dart
47-
# - web/src/web_workers/kitchen_sink/index.dart
48-
# - web/src/web_workers/todo/index.dart
49-
# - web/src/web_workers/todo/server_index.dart
50-
# - web/src/web_workers/todo/background_index.dart
51-
# - web/src/web_workers/message_broker/background_index.dart
52-
# - web/src/web_workers/kitchen_sink/background_index.dart
53-
#
54-
# This entrypoint is not needed:
55-
# - web/src/material/demo_common.dart
55+
- $dart2js:
56+
$include:
57+
- web/src/**
58+
$exclude:
59+
# web worker code compiled separately; see below
60+
- web/src/web_workers/**
61+
minify: false
62+
commandLineOptions:
63+
- --show-package-warnings
64+
- --trust-type-annotations
65+
- --trust-primitives
66+
- --enable-experimental-mirrors
67+
- --fatal-warnings
5668

69+
# TODO(yjbanov): cannot use --fatal-warnings on web-worker code due to
70+
# dart2js bug https://github.com/dart-lang/sdk/issues/23875
5771
- $dart2js:
72+
$include:
73+
- web/src/web_workers/**
74+
$exclude:
75+
- web/src/web_workers/images/**
76+
- web/src/web_workers/todo/server_index.dart
5877
minify: false
5978
commandLineOptions:
60-
- --show-package-warnings
61-
- --trust-type-annotations
62-
- --trust-primitives
63-
- --enable-experimental-mirrors
64-
# Uncomment to generate summaries from dart2js
65-
# - --dump-info
79+
- --show-package-warnings
80+
- --trust-type-annotations
81+
- --trust-primitives
82+
- --enable-experimental-mirrors

‎modules/playground/src/web_workers/kitchen_sink/background_index.dart

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@ import "index_common.dart" show HelloCmp;
44
import "dart:isolate";
55
import "package:angular2/platform/worker_app.dart";
66
import "package:angular2/core.dart";
7-
import "package:angular2/src/core/reflection/reflection_capabilities.dart";
8-
import "package:angular2/src/core/reflection/reflection.dart";
97

8+
@AngularEntrypoint()
109
main(List<String> args, SendPort replyTo) {
11-
reflector.reflectionCapabilities = new ReflectionCapabilities();
1210
platform([WORKER_APP_PLATFORM, new Provider(RENDER_SEND_PORT, useValue: replyTo)])
1311
.application([WORKER_APP_APPLICATION])
1412
.bootstrap(HelloCmp);

‎modules/playground/src/web_workers/kitchen_sink/index.dart

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@ library angular2.examples.web_workers.kitchen_sink.index;
22

33
import "package:angular2/platform/worker_render.dart";
44
import "package:angular2/core.dart";
5-
import "package:angular2/src/core/reflection/reflection_capabilities.dart";
6-
import "package:angular2/src/core/reflection/reflection.dart";
75

6+
@AngularEntrypoint()
87
main() {
9-
reflector.reflectionCapabilities = new ReflectionCapabilities();
108
platform([WORKER_RENDER_PLATFORM])
119
.asyncApplication(initIsolate("background_index.dart"));
1210
}

‎modules/playground/src/web_workers/message_broker/background_index.dart

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@ library angular2.examples.message_broker.background_index;
22

33
import "package:angular2/platform/worker_app.dart";
44
import "package:angular2/core.dart";
5-
import "package:angular2/src/core/reflection/reflection_capabilities.dart";
6-
import "package:angular2/src/core/reflection/reflection.dart";
75
import "index_common.dart" show App;
86
import "dart:isolate";
97

8+
@AngularEntrypoint()
109
main(List<String> args, SendPort replyTo) {
11-
reflector.reflectionCapabilities = new ReflectionCapabilities();
1210
platform([WORKER_APP_PLATFORM, new Provider(RENDER_SEND_PORT, useValue: replyTo)])
1311
.application([WORKER_APP_APPLICATION])
1412
.bootstrap(App);

‎modules/playground/src/web_workers/message_broker/index.dart

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@ library angular2.examples.message_broker.index;
22

33
import "package:angular2/platform/worker_render.dart";
44
import "package:angular2/core.dart";
5-
import "package:angular2/src/core/reflection/reflection_capabilities.dart";
6-
import "package:angular2/src/core/reflection/reflection.dart";
75
import "dart:html";
86

7+
@AngularEntrypoint()
98
main() {
10-
reflector.reflectionCapabilities = new ReflectionCapabilities();
119
const ECHO_CHANNEL = "ECHO";
1210
platform([WORKER_RENDER_PLATFORM])
1311
.asyncApplication(initIsolate("background_index.dart"))

‎modules/playground/src/web_workers/todo/background_index.dart

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@ import "index_common.dart" show TodoApp;
44
import "dart:isolate";
55
import "package:angular2/platform/worker_app.dart";
66
import "package:angular2/core.dart";
7-
import "package:angular2/src/core/reflection/reflection_capabilities.dart";
8-
import "package:angular2/src/core/reflection/reflection.dart";
97

8+
@AngularEntrypoint()
109
main(List<String> args, SendPort replyTo) {
11-
reflector.reflectionCapabilities = new ReflectionCapabilities();
1210
platform([WORKER_APP_PLATFORM, new Provider(RENDER_SEND_PORT, useValue: replyTo)])
1311
.application([WORKER_APP_APPLICATION])
1412
.bootstrap(TodoApp);

‎modules/playground/src/web_workers/todo/index.dart

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@ library angular2.examples.web_workers.todo.index;
22

33
import "package:angular2/platform/worker_render.dart";
44
import "package:angular2/core.dart";
5-
import "package:angular2/src/core/reflection/reflection_capabilities.dart";
6-
import "package:angular2/src/core/reflection/reflection.dart";
75

6+
@AngularEntrypoint()
87
main() {
9-
reflector.reflectionCapabilities = new ReflectionCapabilities();
108
platform([WORKER_RENDER_PLATFORM])
119
.asyncApplication(initIsolate("background_index.dart"));
1210
}

‎modules/playground/src/web_workers/todo/index_web_socket.dart

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
library angular2.examples.web_workers.todo.index_web_socket;
22

3-
import "package:angular2/src/core/reflection/reflection_capabilities.dart";
4-
import "package:angular2/src/core/reflection/reflection.dart";
53
import "package:angular2/core.dart";
64
import "package:angular2/platform/worker_render.dart";
75
import "package:angular2/src/web_workers/debug_tools/web_socket_message_bus.dart";
86
import 'dart:html' show WebSocket;
97

8+
@AngularEntrypoint()
109
main() {
11-
reflector.reflectionCapabilities = new ReflectionCapabilities();
1210
var webSocket = new WebSocket("ws://127.0.0.1:1337/ws");
1311
webSocket.onOpen.listen((e) {
1412
var bus = new WebSocketMessageBus.fromWebSocket(webSocket);

‎modules_dart/transform/lib/src/transform/common/annotation_matcher.dart

+3
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,14 @@ const _VIEWS = const [
7373

7474
const _ENTRYPOINTS = const [
7575
const ClassDescriptor('AngularEntrypoint', 'package:angular2/angular2.dart'),
76+
const ClassDescriptor('AngularEntrypoint', 'package:angular2/core.dart'),
7677
const ClassDescriptor('AngularEntrypoint', 'package:angular2/bootstrap.dart'),
7778
const ClassDescriptor(
7879
'AngularEntrypoint', 'package:angular2/bootstrap_static.dart'),
7980
const ClassDescriptor(
8081
'AngularEntrypoint', 'package:angular2/platform/browser.dart'),
82+
const ClassDescriptor(
83+
'AngularEntrypoint', 'package:angular2/platform/worker_app.dart'),
8184
const ClassDescriptor(
8285
'AngularEntrypoint', 'package:angular2/platform/browser_static.dart'),
8386
const ClassDescriptor(

0 commit comments

Comments
 (0)