From 25aae64274e75469a30b1c216d4aa5893526bd3a Mon Sep 17 00:00:00 2001 From: Greg Magolan Date: Wed, 13 Feb 2019 16:31:29 -0800 Subject: [PATCH] build(bazel): do not build rxjs from source under Bazel (#28720) PR Close #28720 --- WORKSPACE | 9 ---- .../bazel-schematics/package.json.replace | 2 +- integration/bazel/WORKSPACE | 9 ---- integration/bazel/src/BUILD.bazel | 52 +++++++++++-------- integration/bazel/src/hello-world/BUILD.bazel | 4 +- integration/bazel/src/index.html | 5 +- integration/bazel/src/package.json | 2 +- integration/bazel/src/rxjs_shims.js | 35 +++++++++++++ .../benchmarks/src/largeform/ng2/BUILD.bazel | 5 +- .../benchmarks/src/largetable/ng2/BUILD.bazel | 5 +- .../src/largetable/ng2_switch/BUILD.bazel | 5 +- .../src/largetable/render3/BUILD.bazel | 1 + modules/benchmarks/src/tree/ng2/BUILD.bazel | 5 +- .../benchmarks/src/tree/ng2_next/BUILD.bazel | 5 +- .../src/tree/ng2_static/BUILD.bazel | 5 +- .../src/tree/ng2_switch/BUILD.bazel | 5 +- .../benchmarks/src/tree/render3/BUILD.bazel | 1 + .../src/tree/render3_function/BUILD.bazel | 5 +- modules/playground/src/async/BUILD.bazel | 5 +- .../playground/src/hello_world/BUILD.bazel | 5 +- modules/playground/src/http/BUILD.bazel | 6 ++- modules/playground/src/jsonp/BUILD.bazel | 5 +- modules/playground/src/key_events/BUILD.bazel | 5 +- .../src/model_driven_forms/BUILD.bazel | 5 +- .../src/order_management/BUILD.bazel | 5 +- .../src/person_management/BUILD.bazel | 5 +- .../src/relative_assets/BUILD.bazel | 5 +- modules/playground/src/routing/BUILD.bazel | 1 + modules/playground/src/sourcemap/BUILD.bazel | 5 +- modules/playground/src/svg/BUILD.bazel | 5 +- .../src/template_driven_forms/BUILD.bazel | 5 +- modules/playground/src/upgrade/BUILD.bazel | 5 +- .../src/web_workers/input/BUILD.bazel | 5 +- .../src/web_workers/kitchen_sink/BUILD.bazel | 5 +- .../web_workers/message_broker/BUILD.bazel | 5 +- .../src/web_workers/router/BUILD.bazel | 6 ++- .../src/web_workers/todo/BUILD.bazel | 5 +- .../src/zippy_component/BUILD.bazel | 5 +- package.json | 2 +- packages/bazel/src/builders/BUILD.bazel | 3 +- .../bazel-workspace/files/WORKSPACE.template | 7 --- .../files/src/BUILD.bazel.template | 25 ++++++--- .../files/src/rxjs_shims.js.template | 32 ++++++++++++ .../src/schematics/bazel-workspace/index.ts | 1 - packages/common/BUILD.bazel | 2 +- packages/common/http/BUILD.bazel | 2 +- packages/common/http/test/BUILD.bazel | 3 +- packages/common/http/testing/BUILD.bazel | 2 +- packages/common/http/testing/test/BUILD.bazel | 1 + .../common/http/testing/test/request_spec.ts | 2 + packages/common/testing/BUILD.bazel | 2 +- .../bazel/injectable_def/app/BUILD.bazel | 2 +- .../bazel/injectable_def/lib1/BUILD.bazel | 2 +- .../bazel/injectable_def/lib2/BUILD.bazel | 2 +- .../injector_def/ivy_build/app/BUILD.bazel | 2 +- packages/compiler-cli/test/BUILD.bazel | 1 + packages/core/BUILD.bazel | 3 +- packages/core/src/di/interface/BUILD.bazel | 3 +- packages/core/src/util/BUILD.bazel | 3 +- packages/core/test/BUILD.bazel | 3 +- .../test/bundling/animation_world/BUILD.bazel | 1 + .../test/bundling/cyclic_import/BUILD.bazel | 1 + .../test/bundling/hello_world/BUILD.bazel | 1 + .../bundling/hello_world_i18n/BUILD.bazel | 1 + .../test/bundling/hello_world_r2/BUILD.bazel | 1 + .../core/test/bundling/injection/BUILD.bazel | 1 + packages/core/test/bundling/todo/BUILD.bazel | 1 + .../core/test/bundling/todo_i18n/BUILD.bazel | 1 + .../core/test/bundling/todo_r2/BUILD.bazel | 1 + packages/core/test/render3/BUILD.bazel | 1 + packages/core/test/render3/outputs_spec.ts | 2 + packages/core/test/render3/properties_spec.ts | 2 + packages/core/test/render3/query_spec.ts | 2 + packages/elements/BUILD.bazel | 2 +- .../elements/schematics/ng-add/BUILD.bazel | 5 +- packages/elements/test/BUILD.bazel | 2 +- packages/examples/common/BUILD.bazel | 7 ++- packages/examples/core/BUILD.bazel | 6 ++- packages/examples/forms/BUILD.bazel | 6 ++- packages/examples/upgrade/upgrade_example.bzl | 5 +- packages/forms/BUILD.bazel | 2 +- packages/forms/test/BUILD.bazel | 3 +- packages/http/BUILD.bazel | 2 +- packages/http/test/BUILD.bazel | 2 +- packages/http/testing/BUILD.bazel | 2 +- packages/language-service/bundles/BUILD.bazel | 1 + .../animations/test/BUILD.bazel | 2 +- packages/platform-browser/test/BUILD.bazel | 2 +- packages/platform-browser/testing/BUILD.bazel | 2 +- packages/platform-server/BUILD.bazel | 2 +- packages/platform-server/test/BUILD.bazel | 3 +- packages/platform-webworker/BUILD.bazel | 1 + packages/router/BUILD.bazel | 3 +- packages/router/test/BUILD.bazel | 4 +- .../test/aot_ngsummary_test/BUILD.bazel | 2 +- packages/router/testing/BUILD.bazel | 1 + packages/service-worker/BUILD.bazel | 3 +- packages/service-worker/test/BUILD.bazel | 3 +- packages/service-worker/testing/BUILD.bazel | 2 +- .../service-worker/worker/testing/BUILD.bazel | 2 +- packages/upgrade/test/BUILD.bazel | 2 +- tools/defaults.bzl | 1 + tools/rxjs/BUILD.bazel | 9 ++++ tools/rxjs/rxjs_shims.js | 35 +++++++++++++ yarn.lock | 9 +++- 105 files changed, 366 insertions(+), 146 deletions(-) create mode 100644 integration/bazel/src/rxjs_shims.js create mode 100644 packages/bazel/src/schematics/bazel-workspace/files/src/rxjs_shims.js.template create mode 100644 tools/rxjs/BUILD.bazel create mode 100644 tools/rxjs/rxjs_shims.js diff --git a/WORKSPACE b/WORKSPACE index 6c70dcbfc9..214ef7a076 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -19,15 +19,6 @@ http_archive( urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.18.6/rules_nodejs-0.18.6.tar.gz"], ) -# Fetch the rxjs repository since we build rxjs from source -# TODO(gregmagolan): use rxjs bundles in the bazel build -http_archive( - name = "rxjs", - sha256 = "72b0b4e517f43358f554c125e40e39f67688cd2738a8998b4a266981ed32f403", - strip_prefix = "package/src", - url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz", -) - # Use a mock @npm repository while we are building angular from source # downstream. Angular will get its npm dependencies with in @ngdeps which # is setup in ng_setup_workspace(). diff --git a/integration/bazel-schematics/package.json.replace b/integration/bazel-schematics/package.json.replace index e3f0bd2998..a57fe8451b 100644 --- a/integration/bazel-schematics/package.json.replace +++ b/integration/bazel-schematics/package.json.replace @@ -20,7 +20,7 @@ "@angular/platform-browser-dynamic": "file:../angular/dist/packages-dist/platform-browser-dynamic", "@angular/router": "file:../angular/dist/packages-dist/router", "core-js": "^2.5.4", - "rxjs": "~6.3.3", + "rxjs": "~6.4.0", "tslib": "^1.9.0", "zone.js": "~0.8.26" }, diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE index 23bebc3753..a670301b9e 100644 --- a/integration/bazel/WORKSPACE +++ b/integration/bazel/WORKSPACE @@ -24,15 +24,6 @@ local_repository( path = "../..", ) -# Fetch the rxjs repository since we build rxjs from source -# TODO(gregmagolan): use rxjs bundles in the Bazel build -http_archive( - name = "rxjs", - sha256 = "72b0b4e517f43358f554c125e40e39f67688cd2738a8998b4a266981ed32f403", - strip_prefix = "package/src", - url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz", -) - # Check the bazel version and download npm dependencies load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install") diff --git a/integration/bazel/src/BUILD.bazel b/integration/bazel/src/BUILD.bazel index e2bb3be579..b1ccf49082 100644 --- a/integration/bazel/src/BUILD.bazel +++ b/integration/bazel/src/BUILD.bazel @@ -1,6 +1,9 @@ package(default_visibility = ["//visibility:public"]) load("@angular//:index.bzl", "ng_module") +load("@build_bazel_rules_nodejs//:defs.bzl", "http_server", "nodejs_binary", "rollup_bundle") +load("@build_bazel_rules_nodejs//internal/web_package:web_package.bzl", "web_package") +load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") # Allow targets under sub-packages to reference the tsconfig.json file exports_files(["tsconfig.json"]) @@ -14,29 +17,34 @@ ng_module( "@npm//@angular/core", "@npm//@angular/platform-browser", "@npm//@types", + "@npm//rxjs", ], ) -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +filegroup( + name = "rxjs_umd_modules", + srcs = [ + # do not sort + "@npm//node_modules/rxjs:bundles/rxjs.umd.js", + ":rxjs_shims.js", + ], +) ts_devserver( name = "devserver", - additional_root_paths = [ - "npm/node_modules/tslib", - "npm/node_modules/zone.js/dist", - ], entry_module = "bazel_integration_test/src/main", + index_html = "index.html", scripts = [ "@npm//node_modules/@angular/common:bundles/common.umd.js", "@npm//node_modules/@angular/common:bundles/common-http.umd.js", "@npm//node_modules/@angular/core:bundles/core.umd.js", "@npm//node_modules/@angular/platform-browser:bundles/platform-browser.umd.js", + "@npm//node_modules/tslib:tslib.js", + ":rxjs_umd_modules", ], serving_path = "/bundle.min.js", static_files = [ - "@npm//node_modules/tslib:tslib.js", "@npm//node_modules/zone.js:dist/zone.min.js", - "index.html", ], deps = [ "//src", @@ -46,8 +54,6 @@ ts_devserver( ], ) -load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary", "rollup_bundle") - rollup_bundle( name = "bundle", entry_point = "src/main", @@ -56,25 +62,25 @@ rollup_bundle( "@npm//@angular/common", "@npm//@angular/core", "@npm//@angular/platform-browser", + "@npm//rxjs", ], ) -# Needed because the prodserver only loads static files that appear under this -# package. -genrule( - name = "zone.js", - srcs = ["@npm//node_modules/zone.js:dist/zone.min.js"], - outs = ["zone.min.js"], - cmd = "cp $< $@", +web_package( + name = "prodapp", + assets = [ + # do not sort + "@npm//node_modules/zone.js:dist/zone.min.js", + ":bundle.min.js", + ], + data = [ + ":bundle", + ], + index_html = "index.html", ) -load("@build_bazel_rules_nodejs//:defs.bzl", "http_server") - http_server( name = "prodserver", - data = [ - "index.html", - ":bundle", - ":zone.js", - ], + data = [":prodapp"], + templated_args = ["src/prodapp"], ) diff --git a/integration/bazel/src/hello-world/BUILD.bazel b/integration/bazel/src/hello-world/BUILD.bazel index 11cc5ebd39..62b619834f 100644 --- a/integration/bazel/src/hello-world/BUILD.bazel +++ b/integration/bazel/src/hello-world/BUILD.bazel @@ -69,8 +69,6 @@ ts_web_test_suite( ], deps = [ ":test_lib", - # This will be removed with https://github.com/angular/angular/pull/28720. This is the - # only remaining dependency that we still build from source here. - "@rxjs", + "//src:rxjs_umd_modules", ], ) diff --git a/integration/bazel/src/index.html b/integration/bazel/src/index.html index 766707a3f2..f4ab9d187d 100644 --- a/integration/bazel/src/index.html +++ b/integration/bazel/src/index.html @@ -3,10 +3,11 @@ Bazel Integration Test + + + - - diff --git a/integration/bazel/src/package.json b/integration/bazel/src/package.json index 15109e1fb5..903fbbe10c 100644 --- a/integration/bazel/src/package.json +++ b/integration/bazel/src/package.json @@ -10,7 +10,7 @@ "@angular/platform-browser": "file:../angular/dist/packages-dist/platform-browser", "@angular/platform-browser-dynamic": "file:../angular/dist/packages-dist/platform-browser-dynamic", "reflect-metadata": "0.1.12", - "rxjs": "6.3.3", + "rxjs": "6.4.0", "tslib": "1.9.3", "zone.js": "0.8.26" }, diff --git a/integration/bazel/src/rxjs_shims.js b/integration/bazel/src/rxjs_shims.js new file mode 100644 index 0000000000..9a15da5715 --- /dev/null +++ b/integration/bazel/src/rxjs_shims.js @@ -0,0 +1,35 @@ +/** + * @license + * Copyright Google Inc. All Rights Reserved. + * + * Use of this source code is governed by an MIT-style license that can be + * found in the LICENSE file at https://angular.io/license + */ + +// rxjs/operators +(function(factory) { + if (typeof module === 'object' && typeof module.exports === 'object') { + var v = factory(require, exports); + if (v !== undefined) module.exports = v; + } else if (typeof define === 'function' && define.amd) { + define('rxjs/operators', ['exports', 'rxjs'], factory); + } +})(function(exports, rxjs) { + 'use strict'; + Object.keys(rxjs.operators).forEach(function(key) { exports[key] = rxjs.operators[key]; }); + Object.defineProperty(exports, '__esModule', {value: true}); +}); + +// rxjs/testing +(function(factory) { + if (typeof module === 'object' && typeof module.exports === 'object') { + var v = factory(require, exports); + if (v !== undefined) module.exports = v; + } else if (typeof define === 'function' && define.amd) { + define('rxjs/testing', ['exports', 'rxjs'], factory); + } +})(function(exports, rxjs) { + 'use strict'; + Object.keys(rxjs.testing).forEach(function(key) { exports[key] = rxjs.testing[key]; }); + Object.defineProperty(exports, '__esModule', {value: true}); +}); diff --git a/modules/benchmarks/src/largeform/ng2/BUILD.bazel b/modules/benchmarks/src/largeform/ng2/BUILD.bazel index 741b3cf264..e0a45ec002 100644 --- a/modules/benchmarks/src/largeform/ng2/BUILD.bazel +++ b/modules/benchmarks/src/largeform/ng2/BUILD.bazel @@ -28,7 +28,10 @@ ts_devserver( entry_module = "angular/modules/benchmarks/src/largeform/ng2/index", index_html = "index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = [ + "@ngdeps//node_modules/tslib:tslib.js", + "//tools/rxjs:rxjs_umd_modules", + ], static_files = [ "@ngdeps//node_modules/zone.js:dist/zone.js", "@ngdeps//node_modules/reflect-metadata:Reflect.js", diff --git a/modules/benchmarks/src/largetable/ng2/BUILD.bazel b/modules/benchmarks/src/largetable/ng2/BUILD.bazel index 18ad59f723..dc77effc7a 100644 --- a/modules/benchmarks/src/largetable/ng2/BUILD.bazel +++ b/modules/benchmarks/src/largetable/ng2/BUILD.bazel @@ -27,7 +27,10 @@ ts_devserver( entry_module = "angular/modules/benchmarks/src/largetable/ng2/index", index_html = "index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = [ + "@ngdeps//node_modules/tslib:tslib.js", + "//tools/rxjs:rxjs_umd_modules", + ], static_files = [ "@ngdeps//node_modules/zone.js:dist/zone.js", "@ngdeps//node_modules/reflect-metadata:Reflect.js", diff --git a/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel b/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel index 72a4c1bc2d..b2c56a4e21 100644 --- a/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel +++ b/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel @@ -24,7 +24,10 @@ ts_devserver( entry_module = "angular/modules/benchmarks/src/largetable/ng2_switch/index", index_html = "index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = [ + "@ngdeps//node_modules/tslib:tslib.js", + "//tools/rxjs:rxjs_umd_modules", + ], static_files = [ "@ngdeps//node_modules/zone.js:dist/zone.js", "@ngdeps//node_modules/reflect-metadata:Reflect.js", diff --git a/modules/benchmarks/src/largetable/render3/BUILD.bazel b/modules/benchmarks/src/largetable/render3/BUILD.bazel index f8ae700c47..4818c6cbf4 100644 --- a/modules/benchmarks/src/largetable/render3/BUILD.bazel +++ b/modules/benchmarks/src/largetable/render3/BUILD.bazel @@ -24,6 +24,7 @@ ng_rollup_bundle( tags = ["ivy-only"], deps = [ ":largetable_lib", + "@ngdeps//rxjs", ], ) diff --git a/modules/benchmarks/src/tree/ng2/BUILD.bazel b/modules/benchmarks/src/tree/ng2/BUILD.bazel index 4a8eb58635..bc4f5ab76c 100644 --- a/modules/benchmarks/src/tree/ng2/BUILD.bazel +++ b/modules/benchmarks/src/tree/ng2/BUILD.bazel @@ -27,7 +27,10 @@ ts_devserver( entry_module = "angular/modules/benchmarks/src/tree/ng2/index", index_html = "index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = [ + "@ngdeps//node_modules/tslib:tslib.js", + "//tools/rxjs:rxjs_umd_modules", + ], static_files = [ "@ngdeps//node_modules/zone.js:dist/zone.js", "@ngdeps//node_modules/reflect-metadata:Reflect.js", diff --git a/modules/benchmarks/src/tree/ng2_next/BUILD.bazel b/modules/benchmarks/src/tree/ng2_next/BUILD.bazel index 585674c2cc..f26d255891 100644 --- a/modules/benchmarks/src/tree/ng2_next/BUILD.bazel +++ b/modules/benchmarks/src/tree/ng2_next/BUILD.bazel @@ -22,7 +22,10 @@ ts_devserver( entry_module = "angular/modules/benchmarks/src/tree/ng2_next/index", index_html = "index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = [ + "@ngdeps//node_modules/tslib:tslib.js", + "//tools/rxjs:rxjs_umd_modules", + ], deps = [":ng2_next"], ) diff --git a/modules/benchmarks/src/tree/ng2_static/BUILD.bazel b/modules/benchmarks/src/tree/ng2_static/BUILD.bazel index 4bed4314a6..90192f913d 100644 --- a/modules/benchmarks/src/tree/ng2_static/BUILD.bazel +++ b/modules/benchmarks/src/tree/ng2_static/BUILD.bazel @@ -22,7 +22,10 @@ ts_devserver( entry_module = "angular/modules/benchmarks/src/tree/ng2_static/index", index_html = "index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = [ + "@ngdeps//node_modules/tslib:tslib.js", + "//tools/rxjs:rxjs_umd_modules", + ], static_files = [ "@ngdeps//node_modules/zone.js:dist/zone.js", "@ngdeps//node_modules/reflect-metadata:Reflect.js", diff --git a/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel b/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel index bfbe8565da..b760d1f351 100644 --- a/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel +++ b/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel @@ -24,7 +24,10 @@ ts_devserver( entry_module = "angular/modules/benchmarks/src/tree/ng2_switch/index", index_html = "index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = [ + "@ngdeps//node_modules/tslib:tslib.js", + "//tools/rxjs:rxjs_umd_modules", + ], static_files = [ "@ngdeps//node_modules/zone.js:dist/zone.js", "@ngdeps//node_modules/reflect-metadata:Reflect.js", diff --git a/modules/benchmarks/src/tree/render3/BUILD.bazel b/modules/benchmarks/src/tree/render3/BUILD.bazel index 7e6564a6c6..e1c25f01d7 100644 --- a/modules/benchmarks/src/tree/render3/BUILD.bazel +++ b/modules/benchmarks/src/tree/render3/BUILD.bazel @@ -23,6 +23,7 @@ ng_rollup_bundle( tags = ["ivy-only"], deps = [ ":tree_lib", + "@ngdeps//rxjs", ], ) diff --git a/modules/benchmarks/src/tree/render3_function/BUILD.bazel b/modules/benchmarks/src/tree/render3_function/BUILD.bazel index 69760e79ea..d21b26aaaf 100644 --- a/modules/benchmarks/src/tree/render3_function/BUILD.bazel +++ b/modules/benchmarks/src/tree/render3_function/BUILD.bazel @@ -20,7 +20,10 @@ ts_devserver( entry_module = "angular/modules/benchmarks/src/tree/render3_function/index", index_html = "index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = [ + "@ngdeps//node_modules/tslib:tslib.js", + "//tools/rxjs:rxjs_umd_modules", + ], deps = [":render3_function_lib"], ) diff --git a/modules/playground/src/async/BUILD.bazel b/modules/playground/src/async/BUILD.bazel index 7d81f1bd66..6a357df79b 100644 --- a/modules/playground/src/async/BUILD.bazel +++ b/modules/playground/src/async/BUILD.bazel @@ -21,7 +21,10 @@ ts_devserver( entry_module = "angular/modules/playground/src/async/index", index_html = "index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = [ + "@ngdeps//node_modules/tslib:tslib.js", + "//tools/rxjs:rxjs_umd_modules", + ], static_files = [ "@ngdeps//node_modules/zone.js:dist/zone.js", "@ngdeps//node_modules/reflect-metadata:Reflect.js", diff --git a/modules/playground/src/hello_world/BUILD.bazel b/modules/playground/src/hello_world/BUILD.bazel index 1a89868573..6bcff03c9b 100644 --- a/modules/playground/src/hello_world/BUILD.bazel +++ b/modules/playground/src/hello_world/BUILD.bazel @@ -21,7 +21,10 @@ ts_devserver( entry_module = "angular/modules/playground/src/hello_world/index", index_html = "index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = [ + "@ngdeps//node_modules/tslib:tslib.js", + "//tools/rxjs:rxjs_umd_modules", + ], static_files = [ "@ngdeps//node_modules/zone.js:dist/zone.js", "@ngdeps//node_modules/reflect-metadata:Reflect.js", diff --git a/modules/playground/src/http/BUILD.bazel b/modules/playground/src/http/BUILD.bazel index 676990e4e2..f9c73326b9 100644 --- a/modules/playground/src/http/BUILD.bazel +++ b/modules/playground/src/http/BUILD.bazel @@ -14,6 +14,7 @@ ng_module( "//packages/http", "//packages/platform-browser", "//packages/platform-browser-dynamic", + "@ngdeps//rxjs", ], ) @@ -23,7 +24,10 @@ ts_devserver( entry_module = "angular/modules/playground/src/http/index", index_html = "index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = [ + "@ngdeps//node_modules/tslib:tslib.js", + "//tools/rxjs:rxjs_umd_modules", + ], static_files = [ "@ngdeps//node_modules/zone.js:dist/zone.js", "@ngdeps//node_modules/reflect-metadata:Reflect.js", diff --git a/modules/playground/src/jsonp/BUILD.bazel b/modules/playground/src/jsonp/BUILD.bazel index 2cf58c5573..e610d1cf50 100644 --- a/modules/playground/src/jsonp/BUILD.bazel +++ b/modules/playground/src/jsonp/BUILD.bazel @@ -23,7 +23,10 @@ ts_devserver( entry_module = "angular/modules/playground/src/jsonp/index", index_html = "index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = [ + "@ngdeps//node_modules/tslib:tslib.js", + "//tools/rxjs:rxjs_umd_modules", + ], static_files = [ "@ngdeps//node_modules/zone.js:dist/zone.js", "@ngdeps//node_modules/reflect-metadata:Reflect.js", diff --git a/modules/playground/src/key_events/BUILD.bazel b/modules/playground/src/key_events/BUILD.bazel index 08b0584912..5b94bbcb97 100644 --- a/modules/playground/src/key_events/BUILD.bazel +++ b/modules/playground/src/key_events/BUILD.bazel @@ -21,7 +21,10 @@ ts_devserver( entry_module = "angular/modules/playground/src/key_events/index", index_html = "index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = [ + "@ngdeps//node_modules/tslib:tslib.js", + "//tools/rxjs:rxjs_umd_modules", + ], static_files = [ "@ngdeps//node_modules/zone.js:dist/zone.js", "@ngdeps//node_modules/reflect-metadata:Reflect.js", diff --git a/modules/playground/src/model_driven_forms/BUILD.bazel b/modules/playground/src/model_driven_forms/BUILD.bazel index 24058d1e94..f4c310f398 100644 --- a/modules/playground/src/model_driven_forms/BUILD.bazel +++ b/modules/playground/src/model_driven_forms/BUILD.bazel @@ -22,7 +22,10 @@ ts_devserver( entry_module = "angular/modules/playground/src/model_driven_forms/index", index_html = "index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = [ + "@ngdeps//node_modules/tslib:tslib.js", + "//tools/rxjs:rxjs_umd_modules", + ], static_files = [ "@ngdeps//node_modules/zone.js:dist/zone.js", "@ngdeps//node_modules/reflect-metadata:Reflect.js", diff --git a/modules/playground/src/order_management/BUILD.bazel b/modules/playground/src/order_management/BUILD.bazel index 12b0eed56d..4468b98db1 100644 --- a/modules/playground/src/order_management/BUILD.bazel +++ b/modules/playground/src/order_management/BUILD.bazel @@ -22,7 +22,10 @@ ts_devserver( entry_module = "angular/modules/playground/src/order_management/index", index_html = "index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = [ + "@ngdeps//node_modules/tslib:tslib.js", + "//tools/rxjs:rxjs_umd_modules", + ], static_files = [ "@ngdeps//node_modules/zone.js:dist/zone.js", "@ngdeps//node_modules/reflect-metadata:Reflect.js", diff --git a/modules/playground/src/person_management/BUILD.bazel b/modules/playground/src/person_management/BUILD.bazel index 55d66aa41c..608d08d412 100644 --- a/modules/playground/src/person_management/BUILD.bazel +++ b/modules/playground/src/person_management/BUILD.bazel @@ -22,7 +22,10 @@ ts_devserver( entry_module = "angular/modules/playground/src/person_management/index", index_html = "index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = [ + "@ngdeps//node_modules/tslib:tslib.js", + "//tools/rxjs:rxjs_umd_modules", + ], static_files = [ "@ngdeps//node_modules/zone.js:dist/zone.js", "@ngdeps//node_modules/reflect-metadata:Reflect.js", diff --git a/modules/playground/src/relative_assets/BUILD.bazel b/modules/playground/src/relative_assets/BUILD.bazel index faa1534bfb..6eb726c4ea 100644 --- a/modules/playground/src/relative_assets/BUILD.bazel +++ b/modules/playground/src/relative_assets/BUILD.bazel @@ -30,7 +30,10 @@ ts_devserver( entry_module = "angular/modules/playground/src/relative_assets/index", index_html = "index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = [ + "@ngdeps//node_modules/tslib:tslib.js", + "//tools/rxjs:rxjs_umd_modules", + ], static_files = [ "@ngdeps//node_modules/zone.js:dist/zone.js", "@ngdeps//node_modules/reflect-metadata:Reflect.js", diff --git a/modules/playground/src/routing/BUILD.bazel b/modules/playground/src/routing/BUILD.bazel index 2186c1130d..9d6fc56252 100644 --- a/modules/playground/src/routing/BUILD.bazel +++ b/modules/playground/src/routing/BUILD.bazel @@ -15,6 +15,7 @@ ng_module( "//packages/platform-browser", "//packages/platform-browser-dynamic", "//packages/router", + "@ngdeps//rxjs", ], ) diff --git a/modules/playground/src/sourcemap/BUILD.bazel b/modules/playground/src/sourcemap/BUILD.bazel index 0865ca9ceb..94be798e4d 100644 --- a/modules/playground/src/sourcemap/BUILD.bazel +++ b/modules/playground/src/sourcemap/BUILD.bazel @@ -25,7 +25,10 @@ ts_devserver( entry_module = "angular/modules/playground/src/sourcemap/index", index_html = "index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = [ + "@ngdeps//node_modules/tslib:tslib.js", + "//tools/rxjs:rxjs_umd_modules", + ], static_files = [ "@ngdeps//node_modules/zone.js:dist/zone.js", "@ngdeps//node_modules/reflect-metadata:Reflect.js", diff --git a/modules/playground/src/svg/BUILD.bazel b/modules/playground/src/svg/BUILD.bazel index b7da7a0c7f..00ca97e267 100644 --- a/modules/playground/src/svg/BUILD.bazel +++ b/modules/playground/src/svg/BUILD.bazel @@ -21,7 +21,10 @@ ts_devserver( entry_module = "angular/modules/playground/src/svg/index", index_html = "index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = [ + "@ngdeps//node_modules/tslib:tslib.js", + "//tools/rxjs:rxjs_umd_modules", + ], static_files = [ "@ngdeps//node_modules/zone.js:dist/zone.js", "@ngdeps//node_modules/reflect-metadata:Reflect.js", diff --git a/modules/playground/src/template_driven_forms/BUILD.bazel b/modules/playground/src/template_driven_forms/BUILD.bazel index 23d1a5d73f..54ec8b26a8 100644 --- a/modules/playground/src/template_driven_forms/BUILD.bazel +++ b/modules/playground/src/template_driven_forms/BUILD.bazel @@ -22,7 +22,10 @@ ts_devserver( entry_module = "angular/modules/playground/src/template_driven_forms/index", index_html = "index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = [ + "@ngdeps//node_modules/tslib:tslib.js", + "//tools/rxjs:rxjs_umd_modules", + ], static_files = [ "@ngdeps//node_modules/zone.js:dist/zone.js", "@ngdeps//node_modules/reflect-metadata:Reflect.js", diff --git a/modules/playground/src/upgrade/BUILD.bazel b/modules/playground/src/upgrade/BUILD.bazel index c30cbc0089..5f9a12134f 100644 --- a/modules/playground/src/upgrade/BUILD.bazel +++ b/modules/playground/src/upgrade/BUILD.bazel @@ -21,7 +21,10 @@ ts_devserver( entry_module = "angular/modules/playground/src/upgrade/index", index_html = "index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = [ + "@ngdeps//node_modules/tslib:tslib.js", + "//tools/rxjs:rxjs_umd_modules", + ], static_files = [ "@ngdeps//node_modules/zone.js:dist/zone.js", "@ngdeps//node_modules/reflect-metadata:Reflect.js", diff --git a/modules/playground/src/web_workers/input/BUILD.bazel b/modules/playground/src/web_workers/input/BUILD.bazel index 2d714d76f1..e14da9b2b8 100644 --- a/modules/playground/src/web_workers/input/BUILD.bazel +++ b/modules/playground/src/web_workers/input/BUILD.bazel @@ -27,7 +27,10 @@ ts_devserver( entry_module = "angular/modules/playground/src/web_workers/input/index", index_html = "index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = [ + "@ngdeps//node_modules/tslib:tslib.js", + "//tools/rxjs:rxjs_umd_modules", + ], static_files = ["@ngdeps//node_modules/zone.js:dist/zone.js"], deps = [":input"], ) diff --git a/modules/playground/src/web_workers/kitchen_sink/BUILD.bazel b/modules/playground/src/web_workers/kitchen_sink/BUILD.bazel index 768d4dec31..ee1fe9059f 100644 --- a/modules/playground/src/web_workers/kitchen_sink/BUILD.bazel +++ b/modules/playground/src/web_workers/kitchen_sink/BUILD.bazel @@ -27,7 +27,10 @@ ts_devserver( entry_module = "angular/modules/playground/src/web_workers/kitchen_sink/index", index_html = "index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = [ + "@ngdeps//node_modules/tslib:tslib.js", + "//tools/rxjs:rxjs_umd_modules", + ], static_files = ["@ngdeps//node_modules/zone.js:dist/zone.js"], deps = [":kitchen_sink"], ) diff --git a/modules/playground/src/web_workers/message_broker/BUILD.bazel b/modules/playground/src/web_workers/message_broker/BUILD.bazel index 0f2dda548d..da0e8ead12 100644 --- a/modules/playground/src/web_workers/message_broker/BUILD.bazel +++ b/modules/playground/src/web_workers/message_broker/BUILD.bazel @@ -27,7 +27,10 @@ ts_devserver( entry_module = "angular/modules/playground/src/web_workers/message_broker/index", index_html = "index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = [ + "@ngdeps//node_modules/tslib:tslib.js", + "//tools/rxjs:rxjs_umd_modules", + ], static_files = ["@ngdeps//node_modules/zone.js:dist/zone.js"], deps = [":message_broker"], ) diff --git a/modules/playground/src/web_workers/router/BUILD.bazel b/modules/playground/src/web_workers/router/BUILD.bazel index d9b6385cd3..4b1a727154 100644 --- a/modules/playground/src/web_workers/router/BUILD.bazel +++ b/modules/playground/src/web_workers/router/BUILD.bazel @@ -15,6 +15,7 @@ ng_module( "//packages/platform-webworker", "//packages/platform-webworker-dynamic", "//packages/router", + "@ngdeps//rxjs", ], ) @@ -29,7 +30,10 @@ ts_devserver( entry_module = "angular/modules/playground/src/web_workers/router/index", index_html = "index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = [ + "@ngdeps//node_modules/tslib:tslib.js", + "//tools/rxjs:rxjs_umd_modules", + ], static_files = ["@ngdeps//node_modules/zone.js:dist/zone.js"], deps = [":router"], ) diff --git a/modules/playground/src/web_workers/todo/BUILD.bazel b/modules/playground/src/web_workers/todo/BUILD.bazel index aaba201256..7afbcfd6cf 100644 --- a/modules/playground/src/web_workers/todo/BUILD.bazel +++ b/modules/playground/src/web_workers/todo/BUILD.bazel @@ -30,7 +30,10 @@ ts_devserver( entry_module = "angular/modules/playground/src/web_workers/todo/index", index_html = "index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = [ + "@ngdeps//node_modules/tslib:tslib.js", + "//tools/rxjs:rxjs_umd_modules", + ], static_files = ["@ngdeps//node_modules/zone.js:dist/zone.js"], deps = [":todo"], ) diff --git a/modules/playground/src/zippy_component/BUILD.bazel b/modules/playground/src/zippy_component/BUILD.bazel index da9d9396f2..e80bf6141e 100644 --- a/modules/playground/src/zippy_component/BUILD.bazel +++ b/modules/playground/src/zippy_component/BUILD.bazel @@ -22,7 +22,10 @@ ts_devserver( entry_module = "angular/modules/playground/src/zippy_component/index", index_html = "index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = [ + "@ngdeps//node_modules/tslib:tslib.js", + "//tools/rxjs:rxjs_umd_modules", + ], static_files = [ "@ngdeps//node_modules/zone.js:dist/zone.js", "@ngdeps//node_modules/reflect-metadata:Reflect.js", diff --git a/package.json b/package.json index a8c6b555d9..05fad91d67 100644 --- a/package.json +++ b/package.json @@ -85,6 +85,7 @@ "rollup": "^1.1.0", "rollup-plugin-node-resolve": "^4.0.0", "rollup-plugin-sourcemaps": "^0.4.2", + "rxjs": "^6.4.0", "selenium-webdriver": "3.5.0", "shelljs": "^0.8.1", "source-map": "^0.6.1", @@ -139,7 +140,6 @@ "mutation-observer": "^1.0.3", "rewire": "2.5.2", "rollup-plugin-commonjs": "8.1.0", - "rxjs": "^6.3.0", "sauce-connect": "https://saucelabs.com/downloads/sc-4.5.1-linux.tar.gz", "semver": "5.4.1", "tslint": "5.7.0", diff --git a/packages/bazel/src/builders/BUILD.bazel b/packages/bazel/src/builders/BUILD.bazel index c745a5816b..93134df6e1 100644 --- a/packages/bazel/src/builders/BUILD.bazel +++ b/packages/bazel/src/builders/BUILD.bazel @@ -25,7 +25,6 @@ ts_library( "@ngdeps//@angular-devkit/architect", "@ngdeps//@angular-devkit/core", "@ngdeps//@types/node", - "@rxjs", - "@rxjs//operators", + "@ngdeps//rxjs", ], ) diff --git a/packages/bazel/src/schematics/bazel-workspace/files/WORKSPACE.template b/packages/bazel/src/schematics/bazel-workspace/files/WORKSPACE.template index 101f133610..5776eeb3fa 100644 --- a/packages/bazel/src/schematics/bazel-workspace/files/WORKSPACE.template +++ b/packages/bazel/src/schematics/bazel-workspace/files/WORKSPACE.template @@ -28,13 +28,6 @@ http_archive( strip_prefix = "angular-%s" % ANGULAR_VERSION, ) -# RxJS -RXJS_VERSION = "<%= RXJS_VERSION %>" -http_archive( - name = "rxjs", - url = "https://registry.yarnpkg.com/rxjs/-/rxjs-%s.tgz" % RXJS_VERSION, - strip_prefix = "package/src", -) <% if (sass) { %> # Rules for compiling sass RULES_SASS_VERSION = "<%= RULES_SASS_VERSION %>" diff --git a/packages/bazel/src/schematics/bazel-workspace/files/src/BUILD.bazel.template b/packages/bazel/src/schematics/bazel-workspace/files/src/BUILD.bazel.template index 172bfedb04..709fe7b41f 100644 --- a/packages/bazel/src/schematics/bazel-workspace/files/src/BUILD.bazel.template +++ b/packages/bazel/src/schematics/bazel-workspace/files/src/BUILD.bazel.template @@ -7,6 +7,15 @@ load("@build_bazel_rules_nodejs//internal/web_package:web_package.bzl", "web_pac load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver", "ts_library") <% if (sass) { %>load("@io_bazel_rules_sass//:defs.bzl", "multi_sass_binary") +filegroup( + name = "rxjs_umd_modules", + srcs = [ + # do not sort + "@npm//node_modules/rxjs:bundles/rxjs.umd.js", + ":rxjs_shims.js", + ], +) + multi_sass_binary( name = "styles", srcs = glob(["**/*.scss"]), @@ -32,13 +41,17 @@ ng_module( "@angular//packages/platform-browser",<% if (routing) { %> "@angular//packages/router",<% } %> "@npm//@types", + "@npm//rxjs", ], ) rollup_bundle( name = "bundle", entry_point = "src/main.prod", - deps = ["//src"], + deps = [ + "//src", + "@npm//rxjs", + ], ) web_package( @@ -63,15 +76,14 @@ history_server( ts_devserver( name = "devserver", port = 4200, - additional_root_paths = [ - "npm/node_modules/zone.js/dist", - "npm/node_modules/tslib", - ], entry_module = "<%= utils.underscore(name) %>/src/main.dev", serving_path = "/bundle.min.js", + scripts = [ + "@npm//node_modules/tslib:tslib.js", + ":rxjs_umd_modules", + ], static_files = [ "@npm//node_modules/zone.js:dist/zone.min.js", - "@npm//node_modules/tslib:tslib.js", ], index_html = "index.html", deps = [":src"], @@ -116,6 +128,7 @@ ts_web_test_suite( "@io_bazel_rules_webtesting//browsers:chromium-local", ], deps = [ + ":rxjs_umd_modules", ":test_lib", "@npm//karma-jasmine", ], diff --git a/packages/bazel/src/schematics/bazel-workspace/files/src/rxjs_shims.js.template b/packages/bazel/src/schematics/bazel-workspace/files/src/rxjs_shims.js.template new file mode 100644 index 0000000000..b120990487 --- /dev/null +++ b/packages/bazel/src/schematics/bazel-workspace/files/src/rxjs_shims.js.template @@ -0,0 +1,32 @@ +/** + * @fileoverview Provides named UMD shims for `rxjs/operators` and `rxjs/testing`. + * This file should be included in the "scripts" of a "ts_devserver" + * rule and the "deps" of a "ts_web_test_suite" rule. + */ +// rxjs/operators +(function(factory) { + if (typeof module === 'object' && typeof module.exports === 'object') { + var v = factory(require, exports); + if (v !== undefined) module.exports = v; + } else if (typeof define === 'function' && define.amd) { + define('rxjs/operators', ['exports', 'rxjs'], factory); + } +})(function(exports, rxjs) { + 'use strict'; + Object.keys(rxjs.operators).forEach(function(key) { exports[key] = rxjs.operators[key]; }); + Object.defineProperty(exports, '__esModule', {value: true}); +}); + +// rxjs/testing +(function(factory) { + if (typeof module === 'object' && typeof module.exports === 'object') { + var v = factory(require, exports); + if (v !== undefined) module.exports = v; + } else if (typeof define === 'function' && define.amd) { + define('rxjs/testing', ['exports', 'rxjs'], factory); + } +})(function(exports, rxjs) { + 'use strict'; + Object.keys(rxjs.testing).forEach(function(key) { exports[key] = rxjs.testing[key]; }); + Object.defineProperty(exports, '__esModule', {value: true}); +}); diff --git a/packages/bazel/src/schematics/bazel-workspace/index.ts b/packages/bazel/src/schematics/bazel-workspace/index.ts index de65eead65..8b013008d4 100644 --- a/packages/bazel/src/schematics/bazel-workspace/index.ts +++ b/packages/bazel/src/schematics/bazel-workspace/index.ts @@ -94,7 +94,6 @@ export default function(options: BazelWorkspaceOptions): Rule { 'RULES_NODEJS_VERSION': '0.18.6', 'RULES_NODEJS_SHA256': '1416d03823fed624b49a0abbd9979f7c63bbedfd37890ddecedd2fe25cccebc6', 'ANGULAR_VERSION': existingVersions.Angular || clean(latestVersions.Angular), - 'RXJS_VERSION': existingVersions.RxJs || clean(latestVersions.RxJs), // TODO(kyliau): Consider moving this to latest-versions.ts 'RULES_SASS_VERSION': '1.17.0', }; diff --git a/packages/common/BUILD.bazel b/packages/common/BUILD.bazel index a1b53fc202..ebdd72f73c 100644 --- a/packages/common/BUILD.bazel +++ b/packages/common/BUILD.bazel @@ -12,7 +12,7 @@ ng_module( ), deps = [ "//packages/core", - "@rxjs", + "@ngdeps//rxjs", ], ) diff --git a/packages/common/http/BUILD.bazel b/packages/common/http/BUILD.bazel index 745c07801d..7fb75cfbd8 100644 --- a/packages/common/http/BUILD.bazel +++ b/packages/common/http/BUILD.bazel @@ -15,6 +15,6 @@ ng_module( deps = [ "//packages/common", "//packages/core", - "@rxjs", + "@ngdeps//rxjs", ], ) diff --git a/packages/common/http/test/BUILD.bazel b/packages/common/http/test/BUILD.bazel index 896449cfff..e3c6f91998 100644 --- a/packages/common/http/test/BUILD.bazel +++ b/packages/common/http/test/BUILD.bazel @@ -11,8 +11,7 @@ ts_library( "//packages/common/http/testing", "//packages/core", "//packages/core/testing", - "@rxjs", - "@rxjs//operators", + "@ngdeps//rxjs", ], ) diff --git a/packages/common/http/testing/BUILD.bazel b/packages/common/http/testing/BUILD.bazel index a851ea06f7..2679e45ed3 100644 --- a/packages/common/http/testing/BUILD.bazel +++ b/packages/common/http/testing/BUILD.bazel @@ -15,6 +15,6 @@ ng_module( deps = [ "//packages/common/http", "//packages/core", - "@rxjs", + "@ngdeps//rxjs", ], ) diff --git a/packages/common/http/testing/test/BUILD.bazel b/packages/common/http/testing/test/BUILD.bazel index 7f3c7b2745..95d1c3eeb9 100644 --- a/packages/common/http/testing/test/BUILD.bazel +++ b/packages/common/http/testing/test/BUILD.bazel @@ -9,6 +9,7 @@ ts_library( deps = [ "//packages/common/http", "//packages/common/http/testing", + "@ngdeps//rxjs", ], ) diff --git a/packages/common/http/testing/test/request_spec.ts b/packages/common/http/testing/test/request_spec.ts index ee7ba15c6f..ae1f1851f1 100644 --- a/packages/common/http/testing/test/request_spec.ts +++ b/packages/common/http/testing/test/request_spec.ts @@ -6,6 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ +/// + import {HttpClient} from '@angular/common/http'; import {HttpClientTestingBackend} from '@angular/common/http/testing/src/backend'; diff --git a/packages/common/testing/BUILD.bazel b/packages/common/testing/BUILD.bazel index 0a4c036836..c5028e1b31 100644 --- a/packages/common/testing/BUILD.bazel +++ b/packages/common/testing/BUILD.bazel @@ -10,6 +10,6 @@ ng_module( deps = [ "//packages/common", "//packages/core", - "@rxjs", + "@ngdeps//rxjs", ], ) diff --git a/packages/compiler-cli/integrationtest/bazel/injectable_def/app/BUILD.bazel b/packages/compiler-cli/integrationtest/bazel/injectable_def/app/BUILD.bazel index e7dcd9c33a..489eeba8c2 100644 --- a/packages/compiler-cli/integrationtest/bazel/injectable_def/app/BUILD.bazel +++ b/packages/compiler-cli/integrationtest/bazel/injectable_def/app/BUILD.bazel @@ -18,6 +18,6 @@ ng_module( "//packages/platform-server", "//packages/router", "@ngdeps//reflect-metadata", - "@rxjs", + "@ngdeps//rxjs", ], ) diff --git a/packages/compiler-cli/integrationtest/bazel/injectable_def/lib1/BUILD.bazel b/packages/compiler-cli/integrationtest/bazel/injectable_def/lib1/BUILD.bazel index 4caedba714..1541ba9e83 100644 --- a/packages/compiler-cli/integrationtest/bazel/injectable_def/lib1/BUILD.bazel +++ b/packages/compiler-cli/integrationtest/bazel/injectable_def/lib1/BUILD.bazel @@ -12,6 +12,6 @@ ng_module( module_name = "lib1_built", deps = [ "//packages/core", - "@rxjs", + "@ngdeps//rxjs", ], ) diff --git a/packages/compiler-cli/integrationtest/bazel/injectable_def/lib2/BUILD.bazel b/packages/compiler-cli/integrationtest/bazel/injectable_def/lib2/BUILD.bazel index 1c08147d30..aee1ff6d32 100644 --- a/packages/compiler-cli/integrationtest/bazel/injectable_def/lib2/BUILD.bazel +++ b/packages/compiler-cli/integrationtest/bazel/injectable_def/lib2/BUILD.bazel @@ -13,6 +13,6 @@ ng_module( deps = [ "//packages/compiler-cli/integrationtest/bazel/injectable_def/lib1", "//packages/core", - "@rxjs", + "@ngdeps//rxjs", ], ) diff --git a/packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/BUILD.bazel b/packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/BUILD.bazel index 0d0572a43e..a603a75afb 100644 --- a/packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/BUILD.bazel +++ b/packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/BUILD.bazel @@ -14,6 +14,6 @@ ng_module( tags = ["ivy-only"], deps = [ "//packages/core", - "@rxjs", + "@ngdeps//rxjs", ], ) diff --git a/packages/compiler-cli/test/BUILD.bazel b/packages/compiler-cli/test/BUILD.bazel index 8bb948fec1..ede4cd1c4c 100644 --- a/packages/compiler-cli/test/BUILD.bazel +++ b/packages/compiler-cli/test/BUILD.bazel @@ -92,6 +92,7 @@ jasmine_node_test( "//packages/core", "//tools/testing:node", "@ngdeps//minimist", + "@ngdeps//rxjs", "@ngdeps//tsickle", ], ) diff --git a/packages/core/BUILD.bazel b/packages/core/BUILD.bazel index 78df5ffef1..bacfc259d3 100644 --- a/packages/core/BUILD.bazel +++ b/packages/core/BUILD.bazel @@ -17,9 +17,8 @@ ng_module( "//packages/core/src/interface", "//packages/core/src/reflection", "//packages/core/src/util", + "@ngdeps//rxjs", "@ngdeps//zone.js", - "@rxjs", - "@rxjs//operators", ], ) diff --git a/packages/core/src/di/interface/BUILD.bazel b/packages/core/src/di/interface/BUILD.bazel index e92fad0fae..11b110996f 100644 --- a/packages/core/src/di/interface/BUILD.bazel +++ b/packages/core/src/di/interface/BUILD.bazel @@ -15,7 +15,6 @@ ts_library( deps = [ "//packages/core/src/interface", "//packages/core/src/util", - "@rxjs", - "@rxjs//operators", + "@ngdeps//rxjs", ], ) diff --git a/packages/core/src/util/BUILD.bazel b/packages/core/src/util/BUILD.bazel index 59e3930a63..7cf01e30b2 100644 --- a/packages/core/src/util/BUILD.bazel +++ b/packages/core/src/util/BUILD.bazel @@ -14,7 +14,6 @@ ts_library( ), deps = [ "//packages/core/src/interface", - "@rxjs", - "@rxjs//operators", + "@ngdeps//rxjs", ], ) diff --git a/packages/core/test/BUILD.bazel b/packages/core/test/BUILD.bazel index 9bfbf00aa8..e5d2f4e067 100644 --- a/packages/core/test/BUILD.bazel +++ b/packages/core/test/BUILD.bazel @@ -31,9 +31,8 @@ ts_library( "//packages/private/testing", "//packages/router", "//packages/router/testing", + "@ngdeps//rxjs", "@ngdeps//zone.js", - "@rxjs", - "@rxjs//operators", ], ) diff --git a/packages/core/test/bundling/animation_world/BUILD.bazel b/packages/core/test/bundling/animation_world/BUILD.bazel index 95b2e6872d..563c5c53e0 100644 --- a/packages/core/test/bundling/animation_world/BUILD.bazel +++ b/packages/core/test/bundling/animation_world/BUILD.bazel @@ -32,6 +32,7 @@ ng_rollup_bundle( deps = [ ":animation_world", "//packages/core", + "@ngdeps//rxjs", ], ) diff --git a/packages/core/test/bundling/cyclic_import/BUILD.bazel b/packages/core/test/bundling/cyclic_import/BUILD.bazel index 72de586885..bd18309ddf 100644 --- a/packages/core/test/bundling/cyclic_import/BUILD.bazel +++ b/packages/core/test/bundling/cyclic_import/BUILD.bazel @@ -33,6 +33,7 @@ ng_rollup_bundle( deps = [ ":cyclic_import", "//packages/core", + "@ngdeps//rxjs", ], ) diff --git a/packages/core/test/bundling/hello_world/BUILD.bazel b/packages/core/test/bundling/hello_world/BUILD.bazel index 5e8056af83..242db560bc 100644 --- a/packages/core/test/bundling/hello_world/BUILD.bazel +++ b/packages/core/test/bundling/hello_world/BUILD.bazel @@ -30,6 +30,7 @@ ng_rollup_bundle( deps = [ ":hello_world", "//packages/core", + "@ngdeps//rxjs", ], ) diff --git a/packages/core/test/bundling/hello_world_i18n/BUILD.bazel b/packages/core/test/bundling/hello_world_i18n/BUILD.bazel index c6508680db..c4501ccbed 100644 --- a/packages/core/test/bundling/hello_world_i18n/BUILD.bazel +++ b/packages/core/test/bundling/hello_world_i18n/BUILD.bazel @@ -24,6 +24,7 @@ ng_rollup_bundle( deps = [ ":hello_world_i18n", "//packages/core", + "@ngdeps//rxjs", ], ) diff --git a/packages/core/test/bundling/hello_world_r2/BUILD.bazel b/packages/core/test/bundling/hello_world_r2/BUILD.bazel index 1ccb4c5d90..563b48f338 100644 --- a/packages/core/test/bundling/hello_world_r2/BUILD.bazel +++ b/packages/core/test/bundling/hello_world_r2/BUILD.bazel @@ -31,6 +31,7 @@ ng_rollup_bundle( ":hello_world", "//packages/core", "//packages/platform-browser", + "@ngdeps//rxjs", ], ) diff --git a/packages/core/test/bundling/injection/BUILD.bazel b/packages/core/test/bundling/injection/BUILD.bazel index 5147014a94..170bf48536 100644 --- a/packages/core/test/bundling/injection/BUILD.bazel +++ b/packages/core/test/bundling/injection/BUILD.bazel @@ -32,6 +32,7 @@ ng_rollup_bundle( deps = [ ":injection", "//packages/core", + "@ngdeps//rxjs", ], ) diff --git a/packages/core/test/bundling/todo/BUILD.bazel b/packages/core/test/bundling/todo/BUILD.bazel index 3db6e3211c..b9be62dac6 100644 --- a/packages/core/test/bundling/todo/BUILD.bazel +++ b/packages/core/test/bundling/todo/BUILD.bazel @@ -35,6 +35,7 @@ ng_rollup_bundle( "//packages/common", "//packages/core", "//packages/core/test/bundling/util:reflect_metadata", + "@ngdeps//rxjs", ], ) diff --git a/packages/core/test/bundling/todo_i18n/BUILD.bazel b/packages/core/test/bundling/todo_i18n/BUILD.bazel index d2dea295a8..fcde7f7f7b 100644 --- a/packages/core/test/bundling/todo_i18n/BUILD.bazel +++ b/packages/core/test/bundling/todo_i18n/BUILD.bazel @@ -37,6 +37,7 @@ ng_rollup_bundle( "//packages/common", "//packages/core", "//packages/core/test/bundling/util:reflect_metadata", + "@ngdeps//rxjs", ], ) diff --git a/packages/core/test/bundling/todo_r2/BUILD.bazel b/packages/core/test/bundling/todo_r2/BUILD.bazel index 51191dd2e0..027b9390d0 100644 --- a/packages/core/test/bundling/todo_r2/BUILD.bazel +++ b/packages/core/test/bundling/todo_r2/BUILD.bazel @@ -38,6 +38,7 @@ ng_rollup_bundle( "//packages/core/test/bundling/util:reflect_metadata", "//packages/platform-browser", "//packages/platform-browser-dynamic", + "@ngdeps//rxjs", ], ) diff --git a/packages/core/test/render3/BUILD.bazel b/packages/core/test/render3/BUILD.bazel index f57c278e75..c2ad02cac1 100644 --- a/packages/core/test/render3/BUILD.bazel +++ b/packages/core/test/render3/BUILD.bazel @@ -30,6 +30,7 @@ ts_library( "//packages/platform-browser/animations", "//packages/platform-browser/testing", "//packages/private/testing", + "@ngdeps//rxjs", ], ) diff --git a/packages/core/test/render3/outputs_spec.ts b/packages/core/test/render3/outputs_spec.ts index 4c32408009..a6549afd84 100644 --- a/packages/core/test/render3/outputs_spec.ts +++ b/packages/core/test/render3/outputs_spec.ts @@ -6,6 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ +/// + import {EventEmitter} from '@angular/core'; import {defineComponent, defineDirective} from '../../src/render3/index'; diff --git a/packages/core/test/render3/properties_spec.ts b/packages/core/test/render3/properties_spec.ts index 808901d036..629b5df250 100644 --- a/packages/core/test/render3/properties_spec.ts +++ b/packages/core/test/render3/properties_spec.ts @@ -6,6 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ +/// + import {EventEmitter} from '@angular/core'; import {defineComponent, defineDirective} from '../../src/render3/index'; diff --git a/packages/core/test/render3/query_spec.ts b/packages/core/test/render3/query_spec.ts index 637ec8cf66..2f3b95c4e9 100644 --- a/packages/core/test/render3/query_spec.ts +++ b/packages/core/test/render3/query_spec.ts @@ -6,6 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ +/// + import {NgForOfContext} from '@angular/common'; import {ElementRef, QueryList, TemplateRef, ViewContainerRef} from '@angular/core'; diff --git a/packages/elements/BUILD.bazel b/packages/elements/BUILD.bazel index 5e39ef5bab..5df813eb72 100644 --- a/packages/elements/BUILD.bazel +++ b/packages/elements/BUILD.bazel @@ -13,7 +13,7 @@ ng_module( deps = [ "//packages/core", "//packages/platform-browser", - "@rxjs", + "@ngdeps//rxjs", ], ) diff --git a/packages/elements/schematics/ng-add/BUILD.bazel b/packages/elements/schematics/ng-add/BUILD.bazel index 8c34393397..5c1703fe3b 100644 --- a/packages/elements/schematics/ng-add/BUILD.bazel +++ b/packages/elements/schematics/ng-add/BUILD.bazel @@ -14,7 +14,7 @@ ts_library( "//packages/common", "//packages/core", "@ngdeps//@angular-devkit/schematics", - "@rxjs", + "@ngdeps//rxjs", ], ) @@ -31,8 +31,7 @@ ts_library( "//packages/common", "//packages/core", "@ngdeps//@angular-devkit/schematics", - "@rxjs", - "@rxjs//operators", + "@ngdeps//rxjs", ], ) diff --git a/packages/elements/test/BUILD.bazel b/packages/elements/test/BUILD.bazel index 27937c82e1..06549ecf4a 100644 --- a/packages/elements/test/BUILD.bazel +++ b/packages/elements/test/BUILD.bazel @@ -14,7 +14,7 @@ ts_library( "//packages/platform-browser-dynamic", "//packages/platform-browser-dynamic/testing", "//packages/platform-browser/testing", - "@rxjs", + "@ngdeps//rxjs", ], ) diff --git a/packages/examples/common/BUILD.bazel b/packages/examples/common/BUILD.bazel index 5b7ce353f2..a38da6eb88 100644 --- a/packages/examples/common/BUILD.bazel +++ b/packages/examples/common/BUILD.bazel @@ -18,7 +18,7 @@ ng_module( "//packages/platform-browser", "//packages/platform-browser-dynamic", "//packages/router", - "@rxjs", + "@ngdeps//rxjs", ], ) @@ -40,7 +40,10 @@ ts_devserver( entry_module = "@angular/examples/common/main", index_html = "//packages/examples:index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = [ + "@ngdeps//node_modules/tslib:tslib.js", + "//tools/rxjs:rxjs_umd_modules", + ], static_files = [ "@ngdeps//node_modules/zone.js:dist/zone.js", # This is needed because the "ngComponentOutlet" test uses the JIT compiler diff --git a/packages/examples/core/BUILD.bazel b/packages/examples/core/BUILD.bazel index 0c25642b88..7f9e4b86c7 100644 --- a/packages/examples/core/BUILD.bazel +++ b/packages/examples/core/BUILD.bazel @@ -22,6 +22,7 @@ ng_module( "//packages/platform-browser-dynamic", "//packages/platform-browser/animations", "//packages/router", + "@ngdeps//rxjs", ], ) @@ -42,7 +43,10 @@ ts_devserver( entry_module = "@angular/examples/core/main", index_html = "//packages/examples:index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = [ + "@ngdeps//node_modules/tslib:tslib.js", + "//tools/rxjs:rxjs_umd_modules", + ], static_files = [ "@ngdeps//node_modules/zone.js:dist/zone.js", "@ngdeps//node_modules/zone.js:dist/task-tracking.js", diff --git a/packages/examples/forms/BUILD.bazel b/packages/examples/forms/BUILD.bazel index 3b82221b41..4d9e9965c7 100644 --- a/packages/examples/forms/BUILD.bazel +++ b/packages/examples/forms/BUILD.bazel @@ -18,6 +18,7 @@ ng_module( "//packages/platform-browser", "//packages/platform-browser-dynamic", "//packages/router", + "@ngdeps//rxjs", ], ) @@ -39,7 +40,10 @@ ts_devserver( entry_module = "@angular/examples/forms/main", index_html = "//packages/examples:index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = [ + "@ngdeps//node_modules/tslib:tslib.js", + "//tools/rxjs:rxjs_umd_modules", + ], static_files = [ "@ngdeps//node_modules/zone.js:dist/zone.js", ], diff --git a/packages/examples/upgrade/upgrade_example.bzl b/packages/examples/upgrade/upgrade_example.bzl index 3934e0cad8..29657531e5 100644 --- a/packages/examples/upgrade/upgrade_example.bzl +++ b/packages/examples/upgrade/upgrade_example.bzl @@ -48,7 +48,10 @@ def create_upgrade_example_targets(name, srcs, e2e_srcs, entry_module, assets = "@ngdeps//node_modules/reflect-metadata:Reflect.js", ], index_html = "//packages/examples:index.html", - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = [ + "@ngdeps//node_modules/tslib:tslib.js", + "//tools/rxjs:rxjs_umd_modules", + ], deps = [":%s_sources" % name], data = assets, ) diff --git a/packages/forms/BUILD.bazel b/packages/forms/BUILD.bazel index 6391e5e16d..f5f87572fe 100644 --- a/packages/forms/BUILD.bazel +++ b/packages/forms/BUILD.bazel @@ -13,7 +13,7 @@ ng_module( deps = [ "//packages/core", "//packages/platform-browser", - "@rxjs", + "@ngdeps//rxjs", ], ) diff --git a/packages/forms/test/BUILD.bazel b/packages/forms/test/BUILD.bazel index d0fceb4806..7a0b8b5d57 100644 --- a/packages/forms/test/BUILD.bazel +++ b/packages/forms/test/BUILD.bazel @@ -11,8 +11,7 @@ ts_library( "//packages/platform-browser", "//packages/platform-browser/testing", "//packages/private/testing", - "@rxjs", - "@rxjs//operators", + "@ngdeps//rxjs", ], ) diff --git a/packages/http/BUILD.bazel b/packages/http/BUILD.bazel index 6eabc9e41a..63b3f20cb2 100644 --- a/packages/http/BUILD.bazel +++ b/packages/http/BUILD.bazel @@ -13,7 +13,7 @@ ng_module( deps = [ "//packages/core", "//packages/platform-browser", - "@rxjs", + "@ngdeps//rxjs", ], ) diff --git a/packages/http/test/BUILD.bazel b/packages/http/test/BUILD.bazel index a16c2669ef..5581b37e00 100644 --- a/packages/http/test/BUILD.bazel +++ b/packages/http/test/BUILD.bazel @@ -11,7 +11,7 @@ ts_library( "//packages/http/testing", "//packages/platform-browser", "//packages/platform-browser/testing", - "@rxjs", + "@ngdeps//rxjs", ], ) diff --git a/packages/http/testing/BUILD.bazel b/packages/http/testing/BUILD.bazel index ba1d140b56..7c8a96ccdd 100644 --- a/packages/http/testing/BUILD.bazel +++ b/packages/http/testing/BUILD.bazel @@ -10,6 +10,6 @@ ng_module( deps = [ "//packages/core", "//packages/http", - "@rxjs", + "@ngdeps//rxjs", ], ) diff --git a/packages/language-service/bundles/BUILD.bazel b/packages/language-service/bundles/BUILD.bazel index a02fc1dc84..edc67cde63 100644 --- a/packages/language-service/bundles/BUILD.bazel +++ b/packages/language-service/bundles/BUILD.bazel @@ -12,6 +12,7 @@ ls_rollup_bundle( visibility = ["//packages/language-service:__pkg__"], deps = [ "//packages/language-service", + "@ngdeps//rxjs", "@ngdeps//tslib", ], ) diff --git a/packages/platform-browser/animations/test/BUILD.bazel b/packages/platform-browser/animations/test/BUILD.bazel index a92acc09be..16f6b1ce91 100644 --- a/packages/platform-browser/animations/test/BUILD.bazel +++ b/packages/platform-browser/animations/test/BUILD.bazel @@ -18,7 +18,7 @@ ts_library( "//packages/platform-browser/animations", "//packages/platform-browser/testing", "//packages/private/testing", - "@rxjs", + "@ngdeps//rxjs", ], ) diff --git a/packages/platform-browser/test/BUILD.bazel b/packages/platform-browser/test/BUILD.bazel index 657236a713..ea5827ec4a 100644 --- a/packages/platform-browser/test/BUILD.bazel +++ b/packages/platform-browser/test/BUILD.bazel @@ -23,7 +23,7 @@ ts_library( "//packages/platform-browser/animations", "//packages/platform-browser/testing", "//packages/private/testing", - "@rxjs", + "@ngdeps//rxjs", ], ) diff --git a/packages/platform-browser/testing/BUILD.bazel b/packages/platform-browser/testing/BUILD.bazel index ad8a09cfa9..ab4dcd6d76 100644 --- a/packages/platform-browser/testing/BUILD.bazel +++ b/packages/platform-browser/testing/BUILD.bazel @@ -12,6 +12,6 @@ ng_module( "//packages/core/testing", "//packages/platform-browser", "@ngdeps//@types/jasmine", - "@rxjs", + "@ngdeps//rxjs", ], ) diff --git a/packages/platform-server/BUILD.bazel b/packages/platform-server/BUILD.bazel index 7e4e0022a8..63b4aa0fec 100644 --- a/packages/platform-server/BUILD.bazel +++ b/packages/platform-server/BUILD.bazel @@ -21,8 +21,8 @@ ng_module( "//packages/platform-browser-dynamic", "//packages/platform-browser/animations", "@ngdeps//@types/node", + "@ngdeps//rxjs", "@ngdeps//zone.js", - "@rxjs", ], ) diff --git a/packages/platform-server/test/BUILD.bazel b/packages/platform-server/test/BUILD.bazel index 145ce77f0e..263a5d47ee 100644 --- a/packages/platform-server/test/BUILD.bazel +++ b/packages/platform-server/test/BUILD.bazel @@ -18,8 +18,7 @@ ts_library( "//packages/platform-browser", "//packages/platform-server", "//packages/private/testing", - "@rxjs", - "@rxjs//operators", + "@ngdeps//rxjs", ], ) diff --git a/packages/platform-webworker/BUILD.bazel b/packages/platform-webworker/BUILD.bazel index fcc14ecce8..32fc5fc828 100644 --- a/packages/platform-webworker/BUILD.bazel +++ b/packages/platform-webworker/BUILD.bazel @@ -16,6 +16,7 @@ ng_module( "//packages/compiler", "//packages/core", "//packages/platform-browser", + "@ngdeps//rxjs", ], ) diff --git a/packages/router/BUILD.bazel b/packages/router/BUILD.bazel index 480deb3a88..d6c244852f 100644 --- a/packages/router/BUILD.bazel +++ b/packages/router/BUILD.bazel @@ -14,8 +14,7 @@ ng_module( "//packages/common", "//packages/core", "//packages/platform-browser", - "@rxjs", - "@rxjs//operators", + "@ngdeps//rxjs", ], ) diff --git a/packages/router/test/BUILD.bazel b/packages/router/test/BUILD.bazel index 15be00ff80..55496311d1 100644 --- a/packages/router/test/BUILD.bazel +++ b/packages/router/test/BUILD.bazel @@ -15,9 +15,7 @@ ts_library( "//packages/private/testing", "//packages/router", "//packages/router/testing", - "@rxjs", - "@rxjs//operators", - "@rxjs//testing", + "@ngdeps//rxjs", ], ) diff --git a/packages/router/test/aot_ngsummary_test/BUILD.bazel b/packages/router/test/aot_ngsummary_test/BUILD.bazel index ba3458fb9a..65d4c197cc 100644 --- a/packages/router/test/aot_ngsummary_test/BUILD.bazel +++ b/packages/router/test/aot_ngsummary_test/BUILD.bazel @@ -7,7 +7,7 @@ ng_module( deps = [ "//packages/core", "//packages/router", - "@rxjs", + "@ngdeps//rxjs", ], ) diff --git a/packages/router/testing/BUILD.bazel b/packages/router/testing/BUILD.bazel index 4590f3833e..cc75d95dcb 100644 --- a/packages/router/testing/BUILD.bazel +++ b/packages/router/testing/BUILD.bazel @@ -12,5 +12,6 @@ ng_module( "//packages/common/testing", "//packages/core", "//packages/router", + "@ngdeps//rxjs", ], ) diff --git a/packages/service-worker/BUILD.bazel b/packages/service-worker/BUILD.bazel index 4f2dab5485..d974d83a4f 100644 --- a/packages/service-worker/BUILD.bazel +++ b/packages/service-worker/BUILD.bazel @@ -13,8 +13,7 @@ ng_module( deps = [ "//packages/common", "//packages/core", - "@rxjs", - "@rxjs//operators", + "@ngdeps//rxjs", ], ) diff --git a/packages/service-worker/test/BUILD.bazel b/packages/service-worker/test/BUILD.bazel index c7593ec73b..42831ca6be 100644 --- a/packages/service-worker/test/BUILD.bazel +++ b/packages/service-worker/test/BUILD.bazel @@ -12,8 +12,7 @@ ts_library( "//packages/service-worker/testing", "//packages/service-worker/worker", "//packages/service-worker/worker/testing", - "@rxjs", - "@rxjs//operators", + "@ngdeps//rxjs", ], ) diff --git a/packages/service-worker/testing/BUILD.bazel b/packages/service-worker/testing/BUILD.bazel index 1888beac93..3878b16b95 100644 --- a/packages/service-worker/testing/BUILD.bazel +++ b/packages/service-worker/testing/BUILD.bazel @@ -8,6 +8,6 @@ ng_module( srcs = glob(["**/*.ts"]), deps = [ "//packages/core", - "@rxjs", + "@ngdeps//rxjs", ], ) diff --git a/packages/service-worker/worker/testing/BUILD.bazel b/packages/service-worker/worker/testing/BUILD.bazel index af19335e0b..a593be6cb1 100644 --- a/packages/service-worker/worker/testing/BUILD.bazel +++ b/packages/service-worker/worker/testing/BUILD.bazel @@ -10,6 +10,6 @@ ts_library( "//packages:types", "//packages/core", "//packages/service-worker/worker", - "@rxjs", + "@ngdeps//rxjs", ], ) diff --git a/packages/upgrade/test/BUILD.bazel b/packages/upgrade/test/BUILD.bazel index 8787f0185c..e8cae7a5b6 100644 --- a/packages/upgrade/test/BUILD.bazel +++ b/packages/upgrade/test/BUILD.bazel @@ -13,7 +13,7 @@ ts_library( "//packages/platform-browser/testing", "//packages/upgrade", "//packages/upgrade/static", - "@rxjs", + "@ngdeps//rxjs", ], ) diff --git a/tools/defaults.bzl b/tools/defaults.bzl index 514484d7ce..29c83bff08 100644 --- a/tools/defaults.bzl +++ b/tools/defaults.bzl @@ -165,6 +165,7 @@ def ts_web_test_suite(bootstrap = [], deps = [], runtime_deps = [], **kwargs): bootstrap = ["//:web_test_bootstrap_scripts"] local_deps = [ "@ngdeps//node_modules/tslib:tslib.js", + "//tools/rxjs:rxjs_umd_modules", ] + deps local_runtime_deps = [ "//tools/testing:browser", diff --git a/tools/rxjs/BUILD.bazel b/tools/rxjs/BUILD.bazel new file mode 100644 index 0000000000..4e99bafd17 --- /dev/null +++ b/tools/rxjs/BUILD.bazel @@ -0,0 +1,9 @@ +package(default_visibility = ["//visibility:public"]) + +filegroup( + name = "rxjs_umd_modules", + srcs = [ + ":rxjs_shims.js", + "@ngdeps//node_modules/rxjs:bundles/rxjs.umd.js", + ], +) diff --git a/tools/rxjs/rxjs_shims.js b/tools/rxjs/rxjs_shims.js new file mode 100644 index 0000000000..9a15da5715 --- /dev/null +++ b/tools/rxjs/rxjs_shims.js @@ -0,0 +1,35 @@ +/** + * @license + * Copyright Google Inc. All Rights Reserved. + * + * Use of this source code is governed by an MIT-style license that can be + * found in the LICENSE file at https://angular.io/license + */ + +// rxjs/operators +(function(factory) { + if (typeof module === 'object' && typeof module.exports === 'object') { + var v = factory(require, exports); + if (v !== undefined) module.exports = v; + } else if (typeof define === 'function' && define.amd) { + define('rxjs/operators', ['exports', 'rxjs'], factory); + } +})(function(exports, rxjs) { + 'use strict'; + Object.keys(rxjs.operators).forEach(function(key) { exports[key] = rxjs.operators[key]; }); + Object.defineProperty(exports, '__esModule', {value: true}); +}); + +// rxjs/testing +(function(factory) { + if (typeof module === 'object' && typeof module.exports === 'object') { + var v = factory(require, exports); + if (v !== undefined) module.exports = v; + } else if (typeof define === 'function' && define.amd) { + define('rxjs/testing', ['exports', 'rxjs'], factory); + } +})(function(exports, rxjs) { + 'use strict'; + Object.keys(rxjs.testing).forEach(function(key) { exports[key] = rxjs.testing[key]; }); + Object.defineProperty(exports, '__esModule', {value: true}); +}); diff --git a/yarn.lock b/yarn.lock index 11ea95007d..bf110fe30e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9016,13 +9016,20 @@ rx-lite@^3.1.2: resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102" integrity sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI= -rxjs@6.3.3, rxjs@^6.1.0, rxjs@^6.3.0: +rxjs@6.3.3, rxjs@^6.1.0: version "6.3.3" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55" integrity sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw== dependencies: tslib "^1.9.0" +rxjs@^6.4.0: + version "6.4.0" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504" + integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw== + dependencies: + tslib "^1.9.0" + safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"