From ea09430039fe3a40dceac86ac8001286bb0ea584 Mon Sep 17 00:00:00 2001 From: Greg Magolan Date: Wed, 20 Feb 2019 09:54:42 -0800 Subject: [PATCH] build: rules_nodejs 0.26.0 & use @npm instead of @ngdeps now that downstream angular build uses angular bundles (#28871) PR Close #28871 --- BUILD.bazel | 46 +++++--------- WORKSPACE | 50 ++++++++++------ index.bzl | 28 --------- integration/bazel/WORKSPACE | 14 +---- integration/bazel/src/BUILD.bazel | 2 +- integration/bazel/src/hello-world/BUILD.bazel | 4 +- integration/bazel/src/package.json | 2 +- integration/bazel/test/e2e/BUILD.bazel | 2 +- karma-js.conf.js | 2 +- modules/benchmarks/benchmark_test.bzl | 4 +- modules/benchmarks/src/largeform/BUILD.bazel | 4 +- .../benchmarks/src/largeform/ng2/BUILD.bazel | 8 +-- modules/benchmarks/src/largetable/BUILD.bazel | 2 +- .../src/largetable/baseline/BUILD.bazel | 2 +- .../largetable/incremental_dom/BUILD.bazel | 4 +- .../benchmarks/src/largetable/ng2/BUILD.bazel | 8 +-- .../src/largetable/ng2_switch/BUILD.bazel | 8 +-- .../src/largetable/render3/BUILD.bazel | 6 +- modules/benchmarks/src/tree/BUILD.bazel | 6 +- .../benchmarks/src/tree/baseline/BUILD.bazel | 2 +- .../src/tree/incremental_dom/BUILD.bazel | 6 +- modules/benchmarks/src/tree/iv/BUILD.bazel | 2 +- modules/benchmarks/src/tree/ng1/BUILD.bazel | 4 +- modules/benchmarks/src/tree/ng2/BUILD.bazel | 8 +-- .../benchmarks/src/tree/ng2_next/BUILD.bazel | 4 +- .../src/tree/ng2_static/BUILD.bazel | 8 +-- .../src/tree/ng2_switch/BUILD.bazel | 8 +-- .../benchmarks/src/tree/render3/BUILD.bazel | 6 +- .../src/tree/render3_function/BUILD.bazel | 4 +- modules/e2e_util/BUILD.bazel | 12 ++-- modules/playground/e2e_test/example_test.bzl | 14 ++--- modules/playground/src/animate/BUILD.bazel | 8 +-- modules/playground/src/async/BUILD.bazel | 8 +-- modules/playground/src/benchpress/BUILD.bazel | 2 +- modules/playground/src/gestures/BUILD.bazel | 12 ++-- .../playground/src/hello_world/BUILD.bazel | 8 +-- modules/playground/src/http/BUILD.bazel | 10 ++-- modules/playground/src/jsonp/BUILD.bazel | 8 +-- modules/playground/src/key_events/BUILD.bazel | 8 +-- .../src/model_driven_forms/BUILD.bazel | 8 +-- .../src/order_management/BUILD.bazel | 8 +-- .../src/person_management/BUILD.bazel | 8 +-- .../src/relative_assets/BUILD.bazel | 10 ++-- modules/playground/src/routing/BUILD.bazel | 14 ++--- modules/playground/src/routing/index.html | 6 +- modules/playground/src/sourcemap/BUILD.bazel | 8 +-- modules/playground/src/svg/BUILD.bazel | 8 +-- .../src/template_driven_forms/BUILD.bazel | 8 +-- modules/playground/src/todo/BUILD.bazel | 8 +-- modules/playground/src/upgrade/BUILD.bazel | 10 ++-- .../playground/src/web_workers/BUILD.bazel | 6 +- .../src/web_workers/animations/BUILD.bazel | 10 ++-- .../src/web_workers/images/BUILD.bazel | 20 +++---- .../src/web_workers/images/loader.js | 2 +- .../src/web_workers/input/BUILD.bazel | 10 ++-- .../src/web_workers/kitchen_sink/BUILD.bazel | 10 ++-- .../web_workers/message_broker/BUILD.bazel | 10 ++-- .../src/web_workers/router/BUILD.bazel | 12 ++-- .../src/web_workers/todo/BUILD.bazel | 10 ++-- .../src/web_workers/worker-configure.js | 8 +-- .../src/zippy_component/BUILD.bazel | 8 +-- modules/playground/systemjs-config.js | 4 +- package.json | 7 ++- packages/BUILD.bazel | 6 +- packages/bazel/BUILD.bazel | 2 - packages/bazel/docs/BUILD.bazel | 1 - packages/bazel/index.bzl | 9 ++- packages/bazel/package.json | 2 +- packages/bazel/src/BUILD.bazel | 12 ++-- packages/bazel/src/api-extractor/BUILD.bazel | 10 ++-- packages/bazel/src/builders/BUILD.bazel | 8 +-- packages/bazel/src/external.bzl | 2 +- packages/bazel/src/ng_package/BUILD.bazel | 10 ++-- packages/bazel/src/ng_rollup_bundle.bzl | 2 +- packages/bazel/src/ng_setup_workspace.bzl | 13 ---- packages/bazel/src/ngc-wrapped/BUILD.bazel | 18 +++--- .../bazel/src/protractor/utils/BUILD.bazel | 6 +- .../schematics/bazel-workspace/BUILD.bazel | 8 +-- .../bazel-workspace/files/WORKSPACE.template | 4 +- .../files/e2e/BUILD.bazel.template | 2 +- .../files/src/BUILD.bazel.template | 4 +- .../src/schematics/bazel-workspace/index.ts | 4 +- .../bazel/src/schematics/ng-add/BUILD.bazel | 10 ++-- packages/bazel/src/schematics/ng-add/index.ts | 2 +- .../bazel/src/schematics/ng-new/BUILD.bazel | 6 +- .../bazel/src/schematics/utility/BUILD.bazel | 12 ++-- packages/bazel/test/ng_package/BUILD.bazel | 16 ++--- .../bazel/test/ng_package/example/BUILD.bazel | 2 +- .../ng_package/example/secondary/BUILD.bazel | 2 +- packages/bazel/test/ngc-wrapped/BUILD.bazel | 2 +- .../bazel/test/ngc-wrapped/empty/BUILD.bazel | 2 +- .../test/ngc-wrapped/tsconfig_template.ts | 2 +- packages/bazel/test/protractor-2/BUILD.bazel | 10 ++-- .../bazel/test/protractor-utils/BUILD.bazel | 2 +- packages/bazel/test/protractor/BUILD.bazel | 8 +-- packages/benchpress/BUILD.bazel | 4 +- packages/benchpress/test/BUILD.bazel | 4 +- packages/common/BUILD.bazel | 2 +- packages/common/http/BUILD.bazel | 2 +- packages/common/http/test/BUILD.bazel | 2 +- packages/common/http/testing/BUILD.bazel | 2 +- packages/common/http/testing/test/BUILD.bazel | 2 +- packages/common/testing/BUILD.bazel | 2 +- packages/compiler-cli/BUILD.bazel | 10 ++-- .../compiler-cli/integrationtest/BUILD.bazel | 34 +++++------ .../bazel/injectable_def/app/BUILD.bazel | 4 +- .../bazel/injectable_def/lib1/BUILD.bazel | 2 +- .../bazel/injectable_def/lib2/BUILD.bazel | 2 +- .../injector_def/ivy_build/app/BUILD.bazel | 2 +- .../bazel/ng_module/BUILD.bazel | 4 +- packages/compiler-cli/integrationtest/test.js | 2 +- .../integrationtest/test_helpers.js | 20 +++---- packages/compiler-cli/src/ngcc/BUILD.bazel | 20 +++---- .../compiler-cli/src/ngcc/test/BUILD.bazel | 14 ++--- .../src/ngtsc/annotations/BUILD.bazel | 4 +- .../src/ngtsc/annotations/test/BUILD.bazel | 2 +- .../compiler-cli/src/ngtsc/cycles/BUILD.bazel | 2 +- .../src/ngtsc/cycles/test/BUILD.bazel | 2 +- .../src/ngtsc/diagnostics/BUILD.bazel | 2 +- .../src/ngtsc/entry_point/BUILD.bazel | 4 +- .../src/ngtsc/entry_point/test/BUILD.bazel | 2 +- .../src/ngtsc/imports/BUILD.bazel | 4 +- .../src/ngtsc/partial_evaluator/BUILD.bazel | 4 +- .../ngtsc/partial_evaluator/test/BUILD.bazel | 2 +- .../compiler-cli/src/ngtsc/path/BUILD.bazel | 4 +- .../src/ngtsc/reflection/BUILD.bazel | 2 +- .../src/ngtsc/reflection/test/BUILD.bazel | 2 +- .../src/ngtsc/routing/BUILD.bazel | 4 +- .../compiler-cli/src/ngtsc/scope/BUILD.bazel | 2 +- .../src/ngtsc/scope/test/BUILD.bazel | 2 +- .../compiler-cli/src/ngtsc/shims/BUILD.bazel | 4 +- .../compiler-cli/src/ngtsc/switch/BUILD.bazel | 2 +- .../src/ngtsc/testing/BUILD.bazel | 2 +- .../src/ngtsc/transform/BUILD.bazel | 2 +- .../src/ngtsc/translator/BUILD.bazel | 2 +- .../src/ngtsc/typecheck/BUILD.bazel | 2 +- .../src/ngtsc/typecheck/test/BUILD.bazel | 2 +- .../compiler-cli/src/ngtsc/util/BUILD.bazel | 4 +- .../src/ngtsc/util/test/BUILD.bazel | 2 +- packages/compiler-cli/test/BUILD.bazel | 18 +++--- .../compiler-cli/test/compliance/BUILD.bazel | 2 +- .../compiler-cli/test/diagnostics/BUILD.bazel | 8 +-- .../compiler-cli/test/metadata/BUILD.bazel | 2 +- packages/compiler-cli/test/ngcc/BUILD.bazel | 12 ++-- packages/compiler-cli/test/ngtsc/BUILD.bazel | 8 +-- packages/compiler-cli/test/test_support.ts | 2 +- .../test/transformers/BUILD.bazel | 4 +- packages/compiler/test/BUILD.bazel | 8 +-- packages/compiler/testing/BUILD.bazel | 2 +- packages/core/BUILD.bazel | 4 +- packages/core/src/di/interface/BUILD.bazel | 2 +- packages/core/src/util/BUILD.bazel | 2 +- packages/core/test/BUILD.bazel | 10 ++-- packages/core/test/acceptance/BUILD.bazel | 8 +-- .../test/bundling/animation_world/BUILD.bazel | 2 +- .../test/bundling/cyclic_import/BUILD.bazel | 2 +- .../test/bundling/hello_world/BUILD.bazel | 2 +- .../bundling/hello_world_i18n/BUILD.bazel | 2 +- .../test/bundling/hello_world_r2/BUILD.bazel | 2 +- .../core/test/bundling/injection/BUILD.bazel | 2 +- packages/core/test/bundling/todo/BUILD.bazel | 6 +- .../core/test/bundling/todo_i18n/BUILD.bazel | 6 +- .../core/test/bundling/todo_r2/BUILD.bazel | 6 +- packages/core/test/bundling/util/BUILD.bazel | 2 +- packages/core/test/render3/BUILD.bazel | 6 +- packages/core/testing/BUILD.bazel | 4 +- packages/elements/BUILD.bazel | 2 +- .../elements/schematics/ng-add/BUILD.bazel | 10 ++-- packages/elements/test/BUILD.bazel | 10 ++-- packages/examples/common/BUILD.bazel | 18 +++--- packages/examples/core/BUILD.bazel | 18 +++--- packages/examples/core/testing/ts/BUILD.bazel | 4 +- packages/examples/forms/BUILD.bazel | 16 ++--- packages/examples/test-utils/BUILD.bazel | 2 +- packages/examples/testing/BUILD.bazel | 4 +- packages/examples/upgrade/upgrade_example.bzl | 20 +++---- packages/forms/BUILD.bazel | 2 +- packages/forms/test/BUILD.bazel | 2 +- packages/http/BUILD.bazel | 2 +- packages/http/test/BUILD.bazel | 2 +- packages/http/testing/BUILD.bazel | 2 +- packages/language-service/BUILD.bazel | 4 +- packages/language-service/bundles/BUILD.bazel | 4 +- packages/language-service/test/BUILD.bazel | 2 +- packages/platform-browser/BUILD.bazel | 4 +- .../animations/test/BUILD.bazel | 2 +- packages/platform-browser/test/BUILD.bazel | 2 +- packages/platform-browser/testing/BUILD.bazel | 4 +- packages/platform-server/BUILD.bazel | 6 +- packages/platform-server/test/BUILD.bazel | 2 +- packages/platform-webworker/BUILD.bazel | 2 +- packages/router/BUILD.bazel | 2 +- packages/router/test/BUILD.bazel | 2 +- .../test/aot_ngsummary_test/BUILD.bazel | 2 +- packages/router/testing/BUILD.bazel | 2 +- packages/service-worker/BUILD.bazel | 2 +- packages/service-worker/cli/BUILD.bazel | 2 +- packages/service-worker/test/BUILD.bazel | 2 +- packages/service-worker/testing/BUILD.bazel | 2 +- packages/service-worker/worker/BUILD.bazel | 2 +- .../service-worker/worker/testing/BUILD.bazel | 2 +- packages/upgrade/BUILD.bazel | 2 +- packages/upgrade/test/BUILD.bazel | 2 +- packages/upgrade/test/common/test_helpers.ts | 2 +- tools/BUILD.bazel | 2 +- tools/defaults.bzl | 60 ++++++++----------- tools/ng_setup_workspace.bzl | 46 -------------- tools/npm/@angular_bazel/index.js | 1 + tools/npm/@angular_bazel/package.json | 6 ++ .../npm_workspace/@angular/bazel/BUILD.bazel | 8 --- .../@bazel/typescript/BUILD.bazel | 8 --- .../@bazel/typescript/bin/BUILD.bazel | 7 --- tools/npm_workspace/BUILD.bazel | 1 - tools/npm_workspace/WORKSPACE | 1 - tools/rxjs/BUILD.bazel | 2 +- tools/symbol-extractor/BUILD.bazel | 4 +- tools/symbol-extractor/index.bzl | 2 +- tools/testing/BUILD.bazel | 2 +- tools/ts-api-guardian/BUILD.bazel | 2 +- yarn.lock | 27 +++++---- 220 files changed, 660 insertions(+), 781 deletions(-) delete mode 100644 index.bzl delete mode 100644 packages/bazel/src/ng_setup_workspace.bzl delete mode 100644 tools/ng_setup_workspace.bzl create mode 100755 tools/npm/@angular_bazel/index.js create mode 100644 tools/npm/@angular_bazel/package.json delete mode 100644 tools/npm_workspace/@angular/bazel/BUILD.bazel delete mode 100644 tools/npm_workspace/@bazel/typescript/BUILD.bazel delete mode 100644 tools/npm_workspace/@bazel/typescript/bin/BUILD.bazel delete mode 100644 tools/npm_workspace/BUILD.bazel delete mode 100644 tools/npm_workspace/WORKSPACE diff --git a/BUILD.bazel b/BUILD.bazel index 021a333ee9..09ebe562dd 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -16,15 +16,15 @@ filegroup( name = "web_test_bootstrap_scripts", # do not sort srcs = [ - "@ngdeps//node_modules/core-js:client/core.js", - "@ngdeps//node_modules/zone.js:dist/zone.js", - "@ngdeps//node_modules/zone.js:dist/zone-testing.js", - "@ngdeps//node_modules/zone.js:dist/task-tracking.js", + "@npm//node_modules/core-js:client/core.js", + "@npm//node_modules/zone.js:dist/zone.js", + "@npm//node_modules/zone.js:dist/zone-testing.js", + "@npm//node_modules/zone.js:dist/task-tracking.js", "//:test-events.js", "//:shims_for_IE.js", # Including systemjs because it defines `__eval`, which produces correct stack traces. - "@ngdeps//node_modules/systemjs:dist/system.src.js", - "@ngdeps//node_modules/reflect-metadata:Reflect.js", + "@npm//node_modules/systemjs:dist/system.src.js", + "@npm//node_modules/reflect-metadata:Reflect.js", ], ) @@ -33,34 +33,18 @@ filegroup( srcs = [ # We also declare the unminfied AngularJS files since these can be used for # local debugging (e.g. see: packages/upgrade/test/common/test_helpers.ts) - "@ngdeps//node_modules/angular:angular.js", - "@ngdeps//node_modules/angular:angular.min.js", - "@ngdeps//node_modules/angular-1.5:angular.js", - "@ngdeps//node_modules/angular-1.5:angular.min.js", - "@ngdeps//node_modules/angular-1.6:angular.js", - "@ngdeps//node_modules/angular-1.6:angular.min.js", - "@ngdeps//node_modules/angular-mocks:angular-mocks.js", - "@ngdeps//node_modules/angular-mocks-1.5:angular-mocks.js", - "@ngdeps//node_modules/angular-mocks-1.6:angular-mocks.js", + "@npm//node_modules/angular:angular.js", + "@npm//node_modules/angular:angular.min.js", + "@npm//node_modules/angular-1.5:angular.js", + "@npm//node_modules/angular-1.5:angular.min.js", + "@npm//node_modules/angular-1.6:angular.js", + "@npm//node_modules/angular-1.6:angular.min.js", + "@npm//node_modules/angular-mocks:angular-mocks.js", + "@npm//node_modules/angular-mocks-1.5:angular-mocks.js", + "@npm//node_modules/angular-mocks-1.6:angular-mocks.js", ], ) -# A nodejs_binary for @angular/bazel/ngc-wrapped to use by default in -# ng_module that depends on @npm//@angular/bazel instead of the -# output of the //packages/bazel/src/ngc-wrapped ts_library rule. This -# default is for downstream users that depend on the @angular/bazel npm -# package. The generated @npm//@angular/bazel/ngc-wrapped target -# does not work because it does not have the node `--expose-gc` flag -# set which is required to support the call to `global.gc()`. -nodejs_binary( - name = "@angular/bazel/ngc-wrapped", - configuration_env_vars = ["compile"], - data = ["@npm//@angular/bazel"], - entry_point = "@angular/bazel/src/ngc-wrapped/index.js", - install_source_map_support = False, - templated_args = ["--node_options=--expose-gc"], -) - # To run a karma_web_test target locally on SauceLabs: # 1) have SAUCE_USERNAME, SAUCE_ACCESS_KEY (and optionally a SAUCE_TUNNEL_IDENTIFIER) set in your environment # 2) open a sauce connection with `./scripts/saucelabs/start-tunnel.sh` diff --git a/WORKSPACE b/WORKSPACE index d551c641dd..2743d71434 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -15,22 +15,13 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") # Fetch rules_nodejs so we can install our npm dependencies http_archive( name = "build_bazel_rules_nodejs", - sha256 = "86ea92217dfd4a84e1e335cc07dfd942b12899796b080492546b947f12c5ab77", - urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.26.0-beta.0/rules_nodejs-0.26.0-beta.0.tar.gz"], -) - -# 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(). -# TODO(gregmagolan): remove @ngdeps once angular is no longer build from source -# downstream and have build use @npm for npm dependencies -local_repository( - name = "npm", - path = "tools/npm_workspace", + sha256 = "5c86b055c57e15bf32d9009a15bcd6d8e190c41b1ff2fb18037b75e0012e4e7c", + urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.26.0/rules_nodejs-0.26.0.tar.gz"], ) # Check the bazel version and download npm dependencies -load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories") +load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install") +load("@build_bazel_rules_nodejs//:package.bzl", "check_rules_nodejs_version") # Bazel version must be at least v0.21.0 because: # - 0.21.0 Using --incompatible_strict_action_env flag fixes cache when running `yarn bazel` @@ -46,6 +37,12 @@ Try running `yarn bazel` instead. minimum_bazel_version = "0.21.0", ) +# The NodeJS rules version must be at least v0.15.3 because: +# - 0.15.2 Re-introduced the prod_only attribute on yarn_install +# - 0.15.3 Includes a fix for the `jasmine_node_test` rule ignoring target tags +# - 0.16.8 Supports npm installed bazel workspaces +check_rules_nodejs_version("0.16.8") + # Setup the Node.js toolchain node_repositories( node_version = "10.9.0", @@ -54,13 +51,28 @@ node_repositories( yarn_version = "1.12.1", ) -# Setup the angular toolchain which installs npm dependencies into @ngdeps -load("//tools:ng_setup_workspace.bzl", "ng_setup_workspace") +yarn_install( + name = "npm", + data = [ + "//:tools/npm/@angular_bazel/index.js", + "//:tools/npm/@angular_bazel/package.json", + "//:tools/postinstall-patches.js", + "//:tools/yarn/check-yarn.js", + ], + package_json = "//:package.json", + # Don't install devDependencies, they are large and not used under Bazel + prod_only = True, + yarn_lock = "//:yarn.lock", +) -ng_setup_workspace() +yarn_install( + name = "ts-api-guardian_deps", + package_json = "@angular//tools/ts-api-guardian:package.json", + yarn_lock = "@angular//tools/ts-api-guardian:yarn.lock", +) -# Install all bazel dependencies of the @ngdeps npm packages -load("@ngdeps//:install_bazel_dependencies.bzl", "install_bazel_dependencies") +# Install all bazel dependencies of the @npm npm packages +load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies") install_bazel_dependencies() @@ -86,7 +98,7 @@ load("@npm_bazel_karma//:browser_repositories.bzl", "browser_repositories") browser_repositories() # Setup the rules_typescript tooolchain -load("@npm_bazel_typescript//:defs.bzl", "ts_setup_workspace") +load("@npm_bazel_typescript//:index.bzl", "ts_setup_workspace") ts_setup_workspace() diff --git a/index.bzl b/index.bzl deleted file mode 100644 index f5d5e80371..0000000000 --- a/index.bzl +++ /dev/null @@ -1,28 +0,0 @@ -# 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 -""" Public API surface is re-exported here. - -This API is exported for users building angular from source in downstream -projects. The rules from packages/bazel are re-exported here as well -as the ng_setup_workspace repository rule needed when building angular -from source downstream. Alternately, this API is available from the -@angular/bazel npm package if the npm distribution of angular is -used in a downstream project. -""" - -load( - "//packages/bazel:index.bzl", - _ng_module = "ng_module", - _ng_package = "ng_package", - _protractor_web_test = "protractor_web_test", - _protractor_web_test_suite = "protractor_web_test_suite", -) -load("//tools:ng_setup_workspace.bzl", _ng_setup_workspace = "ng_setup_workspace") - -ng_module = _ng_module -ng_package = _ng_package -protractor_web_test = _protractor_web_test -protractor_web_test_suite = _protractor_web_test_suite -ng_setup_workspace = _ng_setup_workspace diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE index 86c1470cac..f718d38b04 100644 --- a/integration/bazel/WORKSPACE +++ b/integration/bazel/WORKSPACE @@ -5,8 +5,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") # Fetch rules_nodejs so we can install our npm dependencies http_archive( name = "build_bazel_rules_nodejs", - sha256 = "86ea92217dfd4a84e1e335cc07dfd942b12899796b080492546b947f12c5ab77", - urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.26.0-beta.0/rules_nodejs-0.26.0-beta.0.tar.gz"], + sha256 = "5c86b055c57e15bf32d9009a15bcd6d8e190c41b1ff2fb18037b75e0012e4e7c", + urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.26.0/rules_nodejs-0.26.0.tar.gz"], ) # Fetch sass rules for compiling sass files @@ -73,7 +73,7 @@ load("@npm_bazel_karma//:browser_repositories.bzl", "browser_repositories") browser_repositories() # Setup the rules_typescript tooolchain -load("@npm_bazel_typescript//:defs.bzl", "ts_setup_workspace") +load("@npm_bazel_typescript//:index.bzl", "ts_setup_workspace") ts_setup_workspace() @@ -81,11 +81,3 @@ ts_setup_workspace() load("@io_bazel_rules_sass//sass:sass_repositories.bzl", "sass_repositories") sass_repositories() - -# Setup the angular toolchain. This integration test no longer builds Angular from source, -# but we still need to set up the "angular" workspace since some Bazel rules depend on -# the "ngdeps" repository. This can be fixed if we switched the Angular repository to the -# "npm" repository for the bazel managed dependencies. -load("@npm_angular_bazel//:index.bzl", "ng_setup_workspace") - -ng_setup_workspace() diff --git a/integration/bazel/src/BUILD.bazel b/integration/bazel/src/BUILD.bazel index e04abde8c5..db57258012 100644 --- a/integration/bazel/src/BUILD.bazel +++ b/integration/bazel/src/BUILD.bazel @@ -3,7 +3,7 @@ package(default_visibility = ["//visibility:public"]) load("@npm_angular_bazel//:index.bzl", "ng_module") load("@build_bazel_rules_nodejs//:defs.bzl", "http_server", "rollup_bundle") load("@build_bazel_rules_nodejs//internal/web_package:web_package.bzl", "web_package") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") # Allow targets under sub-packages to reference the tsconfig.json file exports_files(["tsconfig.json"]) diff --git a/integration/bazel/src/hello-world/BUILD.bazel b/integration/bazel/src/hello-world/BUILD.bazel index e081522371..768cff8e41 100644 --- a/integration/bazel/src/hello-world/BUILD.bazel +++ b/integration/bazel/src/hello-world/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility = ["//visibility:public"]) -load("@npm_bazel_karma//:defs.bzl", "ts_web_test_suite") -load("@npm_bazel_typescript//:defs.bzl", "ts_library") +load("@npm_bazel_karma//:index.bzl", "ts_web_test_suite") +load("@npm_bazel_typescript//:index.bzl", "ts_library") load("@io_bazel_rules_sass//sass:sass.bzl", "sass_binary") load("@npm_angular_bazel//:index.bzl", "ng_module", "ng_package") diff --git a/integration/bazel/src/package.json b/integration/bazel/src/package.json index acbb72877e..9dac26fb15 100644 --- a/integration/bazel/src/package.json +++ b/integration/bazel/src/package.json @@ -18,7 +18,7 @@ "@angular/bazel": "packages-dist:bazel", "@angular/compiler": "packages-dist:compiler", "@angular/compiler-cli": "packages-dist:compiler-cli", - "@bazel/karma": "0.26.0-beta.0", + "@bazel/karma": "0.26.0", "@types/jasmine": "2.8.8", "@types/source-map": "0.5.1", "protractor": "5.1.2", diff --git a/integration/bazel/test/e2e/BUILD.bazel b/integration/bazel/test/e2e/BUILD.bazel index d41619f827..45f82c4af1 100644 --- a/integration/bazel/test/e2e/BUILD.bazel +++ b/integration/bazel/test/e2e/BUILD.bazel @@ -1,4 +1,4 @@ -load("@npm_bazel_typescript//:defs.bzl", "ts_library") +load("@npm_bazel_typescript//:index.bzl", "ts_library") load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") ts_library( diff --git a/karma-js.conf.js b/karma-js.conf.js index 4d07a2f369..3381ec2b52 100644 --- a/karma-js.conf.js +++ b/karma-js.conf.js @@ -111,7 +111,7 @@ module.exports = function(config) { // don't need this entire config file. proxies: { '/base/angular/': '/base/', - '/base/ngdeps/': '/base/', + '/base/npm/': '/base/', }, reporters: ['dots'], diff --git a/modules/benchmarks/benchmark_test.bzl b/modules/benchmarks/benchmark_test.bzl index 2f068d8f2a..0948985cdc 100644 --- a/modules/benchmarks/benchmark_test.bzl +++ b/modules/benchmarks/benchmark_test.bzl @@ -18,7 +18,7 @@ def benchmark_test(name, server, deps, tags = []): server = server, tags = tags, deps = [ - "@ngdeps//protractor", - "@ngdeps//yargs", + "@npm//protractor", + "@npm//yargs", ] + deps, ) diff --git a/modules/benchmarks/src/largeform/BUILD.bazel b/modules/benchmarks/src/largeform/BUILD.bazel index 0bfbe75e36..37cf09c97d 100644 --- a/modules/benchmarks/src/largeform/BUILD.bazel +++ b/modules/benchmarks/src/largeform/BUILD.bazel @@ -9,7 +9,7 @@ ts_library( tsconfig = "//modules/benchmarks:tsconfig-e2e.json", deps = [ "//modules/e2e_util", - "@ngdeps//@types/jasminewd2", - "@ngdeps//protractor", + "@npm//@types/jasminewd2", + "@npm//protractor", ], ) diff --git a/modules/benchmarks/src/largeform/ng2/BUILD.bazel b/modules/benchmarks/src/largeform/ng2/BUILD.bazel index f1558418fa..289b6d54b5 100644 --- a/modules/benchmarks/src/largeform/ng2/BUILD.bazel +++ b/modules/benchmarks/src/largeform/ng2/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) @@ -29,12 +29,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//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", + "@npm//node_modules/zone.js:dist/zone.js", + "@npm//node_modules/reflect-metadata:Reflect.js", ], tags = ["fixme-ivy-aot"], deps = [":ng2"], diff --git a/modules/benchmarks/src/largetable/BUILD.bazel b/modules/benchmarks/src/largetable/BUILD.bazel index 3b2888efd0..cc00b3f5b8 100644 --- a/modules/benchmarks/src/largetable/BUILD.bazel +++ b/modules/benchmarks/src/largetable/BUILD.bazel @@ -14,6 +14,6 @@ ts_library( srcs = ["largetable_perf.spec.ts"], deps = [ "//modules/e2e_util", - "@ngdeps//protractor", + "@npm//protractor", ], ) diff --git a/modules/benchmarks/src/largetable/baseline/BUILD.bazel b/modules/benchmarks/src/largetable/baseline/BUILD.bazel index 55519ed578..8fda5883d9 100644 --- a/modules/benchmarks/src/largetable/baseline/BUILD.bazel +++ b/modules/benchmarks/src/largetable/baseline/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ts_library") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel b/modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel index 429b80b64e..f3459d5b44 100644 --- a/modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel +++ b/modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ts_library") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) @@ -20,7 +20,7 @@ ts_devserver( index_html = "index.html", port = 4200, static_files = [ - "@ngdeps//node_modules/incremental-dom:dist/incremental-dom.js", + "@npm//node_modules/incremental-dom:dist/incremental-dom.js", ], deps = [":incremental_dom"], ) diff --git a/modules/benchmarks/src/largetable/ng2/BUILD.bazel b/modules/benchmarks/src/largetable/ng2/BUILD.bazel index 15b9c0ad66..bcebc73065 100644 --- a/modules/benchmarks/src/largetable/ng2/BUILD.bazel +++ b/modules/benchmarks/src/largetable/ng2/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) @@ -28,12 +28,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//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", + "@npm//node_modules/zone.js:dist/zone.js", + "@npm//node_modules/reflect-metadata:Reflect.js", ], deps = [":ng2"], ) diff --git a/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel b/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel index b96d1444c2..07039cd3fd 100644 --- a/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel +++ b/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) @@ -25,12 +25,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//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", + "@npm//node_modules/zone.js:dist/zone.js", + "@npm//node_modules/reflect-metadata:Reflect.js", ], deps = [":ng2_switch"], ) diff --git a/modules/benchmarks/src/largetable/render3/BUILD.bazel b/modules/benchmarks/src/largetable/render3/BUILD.bazel index a4ae3675cb..45fabba43a 100644 --- a/modules/benchmarks/src/largetable/render3/BUILD.bazel +++ b/modules/benchmarks/src/largetable/render3/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility = ["//visibility:public"]) load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") ng_module( @@ -14,7 +14,7 @@ ng_module( "//packages:types", "//packages/common", "//packages/core", - "@ngdeps//reflect-metadata", + "@npm//reflect-metadata", ], ) @@ -24,7 +24,7 @@ ng_rollup_bundle( tags = ["ivy-only"], deps = [ ":largetable_lib", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/modules/benchmarks/src/tree/BUILD.bazel b/modules/benchmarks/src/tree/BUILD.bazel index 1941513d5c..3a7c4d5f01 100644 --- a/modules/benchmarks/src/tree/BUILD.bazel +++ b/modules/benchmarks/src/tree/BUILD.bazel @@ -14,7 +14,7 @@ ts_library( srcs = ["tree_perf_test_utils.ts"], deps = [ "//modules/e2e_util", - "@ngdeps//protractor", + "@npm//protractor", ], ) @@ -24,7 +24,7 @@ ts_library( srcs = ["tree_perf.spec.ts"], deps = [ ":test_utils_lib", - "@ngdeps//protractor", + "@npm//protractor", ], ) @@ -34,6 +34,6 @@ ts_library( srcs = ["tree_perf_detect_changes.spec.ts"], deps = [ ":test_utils_lib", - "@ngdeps//protractor", + "@npm//protractor", ], ) diff --git a/modules/benchmarks/src/tree/baseline/BUILD.bazel b/modules/benchmarks/src/tree/baseline/BUILD.bazel index 6712588295..328724542e 100644 --- a/modules/benchmarks/src/tree/baseline/BUILD.bazel +++ b/modules/benchmarks/src/tree/baseline/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ts_library") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/tree/incremental_dom/BUILD.bazel b/modules/benchmarks/src/tree/incremental_dom/BUILD.bazel index d0a5c5d47b..67ed3eb167 100644 --- a/modules/benchmarks/src/tree/incremental_dom/BUILD.bazel +++ b/modules/benchmarks/src/tree/incremental_dom/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ts_library") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) @@ -11,7 +11,7 @@ ts_library( deps = [ "//modules/benchmarks/src:util_lib", "//modules/benchmarks/src/tree:util_lib", - "@ngdeps//@types/node", + "@npm//@types/node", ], ) @@ -21,7 +21,7 @@ ts_devserver( index_html = "index.html", port = 4200, static_files = [ - "@ngdeps//node_modules/incremental-dom:dist/incremental-dom.js", + "@npm//node_modules/incremental-dom:dist/incremental-dom.js", ], deps = [":incremental_dom"], ) diff --git a/modules/benchmarks/src/tree/iv/BUILD.bazel b/modules/benchmarks/src/tree/iv/BUILD.bazel index 7585cfc884..9452166c28 100644 --- a/modules/benchmarks/src/tree/iv/BUILD.bazel +++ b/modules/benchmarks/src/tree/iv/BUILD.bazel @@ -1,4 +1,4 @@ -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/tree/ng1/BUILD.bazel b/modules/benchmarks/src/tree/ng1/BUILD.bazel index d1dc388f6d..6caac7ab98 100644 --- a/modules/benchmarks/src/tree/ng1/BUILD.bazel +++ b/modules/benchmarks/src/tree/ng1/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ts_library") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) @@ -20,7 +20,7 @@ ts_devserver( index_html = "index.html", port = 4200, static_files = [ - "@ngdeps//node_modules/angular:angular.js", + "@npm//node_modules/angular:angular.js", ], deps = [":ng1"], ) diff --git a/modules/benchmarks/src/tree/ng2/BUILD.bazel b/modules/benchmarks/src/tree/ng2/BUILD.bazel index e7d0059f99..290f02465e 100644 --- a/modules/benchmarks/src/tree/ng2/BUILD.bazel +++ b/modules/benchmarks/src/tree/ng2/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) @@ -28,12 +28,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//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", + "@npm//node_modules/zone.js:dist/zone.js", + "@npm//node_modules/reflect-metadata:Reflect.js", ], deps = [":ng2"], ) diff --git a/modules/benchmarks/src/tree/ng2_next/BUILD.bazel b/modules/benchmarks/src/tree/ng2_next/BUILD.bazel index 8136fb9361..628fd51a64 100644 --- a/modules/benchmarks/src/tree/ng2_next/BUILD.bazel +++ b/modules/benchmarks/src/tree/ng2_next/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ts_library") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) @@ -23,7 +23,7 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//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 7cc98422d2..9fdb2c364d 100644 --- a/modules/benchmarks/src/tree/ng2_static/BUILD.bazel +++ b/modules/benchmarks/src/tree/ng2_static/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ts_library") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) @@ -23,12 +23,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//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", + "@npm//node_modules/zone.js:dist/zone.js", + "@npm//node_modules/reflect-metadata:Reflect.js", ], deps = [":ng2_static"], ) diff --git a/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel b/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel index 03f31005a0..8c1d09fe20 100644 --- a/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel +++ b/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) @@ -25,12 +25,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//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", + "@npm//node_modules/zone.js:dist/zone.js", + "@npm//node_modules/reflect-metadata:Reflect.js", ], deps = [":ng2_switch"], ) diff --git a/modules/benchmarks/src/tree/render3/BUILD.bazel b/modules/benchmarks/src/tree/render3/BUILD.bazel index 705018b0eb..b44eeeaa49 100644 --- a/modules/benchmarks/src/tree/render3/BUILD.bazel +++ b/modules/benchmarks/src/tree/render3/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility = ["//modules/benchmarks:__subpackages__"]) load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") ng_module( @@ -13,7 +13,7 @@ ng_module( "//packages:types", "//packages/common", "//packages/core", - "@ngdeps//reflect-metadata", + "@npm//reflect-metadata", ], ) @@ -23,7 +23,7 @@ ng_rollup_bundle( tags = ["ivy-only"], deps = [ ":tree_lib", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/modules/benchmarks/src/tree/render3_function/BUILD.bazel b/modules/benchmarks/src/tree/render3_function/BUILD.bazel index 2d7a924ebb..d4225ec2e4 100644 --- a/modules/benchmarks/src/tree/render3_function/BUILD.bazel +++ b/modules/benchmarks/src/tree/render3_function/BUILD.bazel @@ -1,4 +1,4 @@ -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") load("//tools:defaults.bzl", "ts_library") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") @@ -21,7 +21,7 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//node_modules/tslib:tslib.js", "//tools/rxjs:rxjs_umd_modules", ], deps = [":render3_function_lib"], diff --git a/modules/e2e_util/BUILD.bazel b/modules/e2e_util/BUILD.bazel index 3dc9b959c9..0fa699b43b 100644 --- a/modules/e2e_util/BUILD.bazel +++ b/modules/e2e_util/BUILD.bazel @@ -9,11 +9,11 @@ ts_library( deps = [ "//packages:types", "//packages/benchpress", - "@ngdeps//@types/fs-extra", - "@ngdeps//@types/selenium-webdriver", - "@ngdeps//fs-extra", - "@ngdeps//node-uuid", - "@ngdeps//protractor", - "@ngdeps//selenium-webdriver", + "@npm//@types/fs-extra", + "@npm//@types/selenium-webdriver", + "@npm//fs-extra", + "@npm//node-uuid", + "@npm//protractor", + "@npm//selenium-webdriver", ], ) diff --git a/modules/playground/e2e_test/example_test.bzl b/modules/playground/e2e_test/example_test.bzl index b9f1b018e0..70eaa43388 100644 --- a/modules/playground/e2e_test/example_test.bzl +++ b/modules/playground/e2e_test/example_test.bzl @@ -10,9 +10,9 @@ def example_test(name, srcs, server, data = [], **kwargs): deps = [ "//modules/e2e_util", "//packages/private/testing", - "@ngdeps//@types/jasminewd2", - "@ngdeps//@types/selenium-webdriver", - "@ngdeps//protractor", + "@npm//@types/jasminewd2", + "@npm//@types/selenium-webdriver", + "@npm//protractor", ], ) @@ -23,10 +23,10 @@ def example_test(name, srcs, server, data = [], **kwargs): server = server, deps = [ ":%s_lib" % name, - "@ngdeps//protractor", - "@ngdeps//selenium-webdriver", - "@ngdeps//yargs", - "@ngdeps//source-map", + "@npm//protractor", + "@npm//selenium-webdriver", + "@npm//yargs", + "@npm//source-map", ], **kwargs ) diff --git a/modules/playground/src/animate/BUILD.bazel b/modules/playground/src/animate/BUILD.bazel index 49855b059f..48ac5c29bb 100644 --- a/modules/playground/src/animate/BUILD.bazel +++ b/modules/playground/src/animate/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) @@ -23,10 +23,10 @@ ts_devserver( entry_module = "angular/modules/playground/src/animate/index", index_html = "index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = ["@npm//node_modules/tslib:tslib.js"], static_files = [ - "@ngdeps//node_modules/zone.js:dist/zone.js", - "@ngdeps//node_modules/reflect-metadata:Reflect.js", + "@npm//node_modules/zone.js:dist/zone.js", + "@npm//node_modules/reflect-metadata:Reflect.js", ], deps = [":animate"], ) diff --git a/modules/playground/src/async/BUILD.bazel b/modules/playground/src/async/BUILD.bazel index fe301f8268..4e1d13130d 100644 --- a/modules/playground/src/async/BUILD.bazel +++ b/modules/playground/src/async/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) @@ -22,12 +22,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//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", + "@npm//node_modules/zone.js:dist/zone.js", + "@npm//node_modules/reflect-metadata:Reflect.js", ], deps = [":async"], ) diff --git a/modules/playground/src/benchpress/BUILD.bazel b/modules/playground/src/benchpress/BUILD.bazel index 8b4b173938..5c51cf1ce6 100644 --- a/modules/playground/src/benchpress/BUILD.bazel +++ b/modules/playground/src/benchpress/BUILD.bazel @@ -1,4 +1,4 @@ -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/gestures/BUILD.bazel b/modules/playground/src/gestures/BUILD.bazel index 1188d330d6..872534abf4 100644 --- a/modules/playground/src/gestures/BUILD.bazel +++ b/modules/playground/src/gestures/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) @@ -14,7 +14,7 @@ ng_module( "//packages/core", "//packages/platform-browser", "//packages/platform-browser-dynamic", - "@ngdeps//@types/hammerjs", + "@npm//@types/hammerjs", ], ) @@ -23,11 +23,11 @@ ts_devserver( entry_module = "angular/modules/playground/src/gestures/index", index_html = "index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = ["@npm//node_modules/tslib:tslib.js"], static_files = [ - "@ngdeps//node_modules/hammerjs:hammer.js", - "@ngdeps//node_modules/zone.js:dist/zone.js", - "@ngdeps//node_modules/reflect-metadata:Reflect.js", + "@npm//node_modules/hammerjs:hammer.js", + "@npm//node_modules/zone.js:dist/zone.js", + "@npm//node_modules/reflect-metadata:Reflect.js", ], deps = [":gestures"], ) diff --git a/modules/playground/src/hello_world/BUILD.bazel b/modules/playground/src/hello_world/BUILD.bazel index d90d3efb57..0f802e1b3d 100644 --- a/modules/playground/src/hello_world/BUILD.bazel +++ b/modules/playground/src/hello_world/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) @@ -22,12 +22,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//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", + "@npm//node_modules/zone.js:dist/zone.js", + "@npm//node_modules/reflect-metadata:Reflect.js", ], deps = [":hello_world"], ) diff --git a/modules/playground/src/http/BUILD.bazel b/modules/playground/src/http/BUILD.bazel index 6ba83ed650..1457d17c7f 100644 --- a/modules/playground/src/http/BUILD.bazel +++ b/modules/playground/src/http/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) @@ -14,7 +14,7 @@ ng_module( "//packages/http", "//packages/platform-browser", "//packages/platform-browser-dynamic", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) @@ -25,12 +25,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//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", + "@npm//node_modules/zone.js:dist/zone.js", + "@npm//node_modules/reflect-metadata:Reflect.js", ], deps = [":http"], ) diff --git a/modules/playground/src/jsonp/BUILD.bazel b/modules/playground/src/jsonp/BUILD.bazel index 5bc0b47f24..ec9d0f059d 100644 --- a/modules/playground/src/jsonp/BUILD.bazel +++ b/modules/playground/src/jsonp/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) @@ -24,12 +24,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//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", + "@npm//node_modules/zone.js:dist/zone.js", + "@npm//node_modules/reflect-metadata:Reflect.js", ], deps = [":jsonp"], ) diff --git a/modules/playground/src/key_events/BUILD.bazel b/modules/playground/src/key_events/BUILD.bazel index 1ce543a100..2cfec987fb 100644 --- a/modules/playground/src/key_events/BUILD.bazel +++ b/modules/playground/src/key_events/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) @@ -22,12 +22,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//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", + "@npm//node_modules/zone.js:dist/zone.js", + "@npm//node_modules/reflect-metadata:Reflect.js", ], deps = [":key_events"], ) diff --git a/modules/playground/src/model_driven_forms/BUILD.bazel b/modules/playground/src/model_driven_forms/BUILD.bazel index 87af847a9b..271d04298b 100644 --- a/modules/playground/src/model_driven_forms/BUILD.bazel +++ b/modules/playground/src/model_driven_forms/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) @@ -23,12 +23,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//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", + "@npm//node_modules/zone.js:dist/zone.js", + "@npm//node_modules/reflect-metadata:Reflect.js", ], deps = [":model_driven_forms"], ) diff --git a/modules/playground/src/order_management/BUILD.bazel b/modules/playground/src/order_management/BUILD.bazel index ef3c9781e4..c31b1fc06a 100644 --- a/modules/playground/src/order_management/BUILD.bazel +++ b/modules/playground/src/order_management/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) @@ -23,12 +23,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//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", + "@npm//node_modules/zone.js:dist/zone.js", + "@npm//node_modules/reflect-metadata:Reflect.js", ], deps = [":order_management"], ) diff --git a/modules/playground/src/person_management/BUILD.bazel b/modules/playground/src/person_management/BUILD.bazel index d5a8a50c10..71c2c84c5e 100644 --- a/modules/playground/src/person_management/BUILD.bazel +++ b/modules/playground/src/person_management/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) @@ -23,12 +23,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//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", + "@npm//node_modules/zone.js:dist/zone.js", + "@npm//node_modules/reflect-metadata:Reflect.js", ], deps = [":person_management"], ) diff --git a/modules/playground/src/relative_assets/BUILD.bazel b/modules/playground/src/relative_assets/BUILD.bazel index 64ac75e630..539c9a6363 100644 --- a/modules/playground/src/relative_assets/BUILD.bazel +++ b/modules/playground/src/relative_assets/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) @@ -17,7 +17,7 @@ ng_module( "//packages/platform-browser", "//packages/platform-browser-dynamic", # Needed because the example uses "module.id" in order to load assets relatively. - "@ngdeps//@types/node", + "@npm//@types/node", ], ) @@ -31,12 +31,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//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", + "@npm//node_modules/zone.js:dist/zone.js", + "@npm//node_modules/reflect-metadata:Reflect.js", ], deps = [":relative_assets"], ) diff --git a/modules/playground/src/routing/BUILD.bazel b/modules/playground/src/routing/BUILD.bazel index 692c7f9309..ab431b9fbf 100644 --- a/modules/playground/src/routing/BUILD.bazel +++ b/modules/playground/src/routing/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) @@ -15,7 +15,7 @@ ng_module( "//packages/platform-browser", "//packages/platform-browser-dynamic", "//packages/router", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) @@ -26,15 +26,15 @@ ts_devserver( # there is only one RxJS UMD bundle that re-exports everything at the root. "//modules/playground:systemjs-rxjs-operators.js", "//third_party/fonts.google.com/open-sans", - "@ngdeps//node_modules/rxjs:bundles/rxjs.umd.js", - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//node_modules/rxjs:bundles/rxjs.umd.js", + "@npm//node_modules/tslib:tslib.js", ] + glob(["**/*.css"]), port = 4200, static_files = [ "index.html", - "@ngdeps//node_modules/zone.js:dist/zone.js", - "@ngdeps//node_modules/reflect-metadata:Reflect.js", - "@ngdeps//node_modules/systemjs:dist/system.js", + "@npm//node_modules/zone.js:dist/zone.js", + "@npm//node_modules/reflect-metadata:Reflect.js", + "@npm//node_modules/systemjs:dist/system.js", "//modules/playground:systemjs-config.js", "load-app.js", ], diff --git a/modules/playground/src/routing/index.html b/modules/playground/src/routing/index.html index 414edae61c..49e677877a 100644 --- a/modules/playground/src/routing/index.html +++ b/modules/playground/src/routing/index.html @@ -14,9 +14,9 @@ This is because we want to use SystemJS instead of RequireJS and want to support lazy loading of routes. Read more in the "load-app.js" file. --> - - - + + + diff --git a/modules/playground/src/sourcemap/BUILD.bazel b/modules/playground/src/sourcemap/BUILD.bazel index 2a672d201d..0860b5bb54 100644 --- a/modules/playground/src/sourcemap/BUILD.bazel +++ b/modules/playground/src/sourcemap/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) @@ -26,12 +26,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//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", + "@npm//node_modules/zone.js:dist/zone.js", + "@npm//node_modules/reflect-metadata:Reflect.js", ], deps = [":sourcemap"], ) diff --git a/modules/playground/src/svg/BUILD.bazel b/modules/playground/src/svg/BUILD.bazel index 670a6a15a5..f2e06c727f 100644 --- a/modules/playground/src/svg/BUILD.bazel +++ b/modules/playground/src/svg/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) @@ -22,12 +22,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//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", + "@npm//node_modules/zone.js:dist/zone.js", + "@npm//node_modules/reflect-metadata:Reflect.js", ], deps = [":svg"], ) diff --git a/modules/playground/src/template_driven_forms/BUILD.bazel b/modules/playground/src/template_driven_forms/BUILD.bazel index 3e7d25d50e..46b877a07a 100644 --- a/modules/playground/src/template_driven_forms/BUILD.bazel +++ b/modules/playground/src/template_driven_forms/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) @@ -23,12 +23,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//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", + "@npm//node_modules/zone.js:dist/zone.js", + "@npm//node_modules/reflect-metadata:Reflect.js", ], deps = [":template_driven_forms"], ) diff --git a/modules/playground/src/todo/BUILD.bazel b/modules/playground/src/todo/BUILD.bazel index 8cafae5bd9..401d06405f 100644 --- a/modules/playground/src/todo/BUILD.bazel +++ b/modules/playground/src/todo/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) @@ -23,10 +23,10 @@ ts_devserver( entry_module = "angular/modules/playground/src/todo/index", index_html = "index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = ["@npm//node_modules/tslib:tslib.js"], static_files = [ - "@ngdeps//node_modules/zone.js:dist/zone.js", - "@ngdeps//node_modules/reflect-metadata:Reflect.js", + "@npm//node_modules/zone.js:dist/zone.js", + "@npm//node_modules/reflect-metadata:Reflect.js", ], deps = [":todo"], ) diff --git a/modules/playground/src/upgrade/BUILD.bazel b/modules/playground/src/upgrade/BUILD.bazel index bbd0c31cc3..0bc6e6603d 100644 --- a/modules/playground/src/upgrade/BUILD.bazel +++ b/modules/playground/src/upgrade/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ts_library") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) @@ -22,13 +22,13 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//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", - "@ngdeps//node_modules/angular:angular.js", + "@npm//node_modules/zone.js:dist/zone.js", + "@npm//node_modules/reflect-metadata:Reflect.js", + "@npm//node_modules/angular:angular.js", ], deps = [":upgrade"], ) diff --git a/modules/playground/src/web_workers/BUILD.bazel b/modules/playground/src/web_workers/BUILD.bazel index 03a0fd21d9..adce10e034 100644 --- a/modules/playground/src/web_workers/BUILD.bazel +++ b/modules/playground/src/web_workers/BUILD.bazel @@ -6,8 +6,8 @@ filegroup( data = [ "//modules/playground:systemjs-config.js", "//modules/playground:systemjs-rxjs-operators.js", - "@ngdeps//reflect-metadata", - "@ngdeps//systemjs", - "@ngdeps//zone.js", + "@npm//reflect-metadata", + "@npm//systemjs", + "@npm//zone.js", ], ) diff --git a/modules/playground/src/web_workers/animations/BUILD.bazel b/modules/playground/src/web_workers/animations/BUILD.bazel index f2cbd59c76..3e9a474b60 100644 --- a/modules/playground/src/web_workers/animations/BUILD.bazel +++ b/modules/playground/src/web_workers/animations/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) @@ -22,13 +22,13 @@ ts_devserver( data = [ "loader.js", "//modules/playground/src/web_workers:worker-config", - "@ngdeps//node_modules/rxjs:bundles/rxjs.umd.js", - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//node_modules/rxjs:bundles/rxjs.umd.js", + "@npm//node_modules/tslib:tslib.js", ], entry_module = "angular/modules/playground/src/web_workers/animations/index", index_html = "index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], - static_files = ["@ngdeps//node_modules/zone.js:dist/zone.js"], + scripts = ["@npm//node_modules/tslib:tslib.js"], + static_files = ["@npm//node_modules/zone.js:dist/zone.js"], deps = [":animations"], ) diff --git a/modules/playground/src/web_workers/images/BUILD.bazel b/modules/playground/src/web_workers/images/BUILD.bazel index b794c2e24c..83347441da 100644 --- a/modules/playground/src/web_workers/images/BUILD.bazel +++ b/modules/playground/src/web_workers/images/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) @@ -14,7 +14,7 @@ ng_module( "//packages/core", "//packages/platform-webworker", "//packages/platform-webworker-dynamic", - "@ngdeps//@types/base64-js", + "@npm//@types/base64-js", ], ) @@ -24,20 +24,20 @@ ts_devserver( additional_root_paths = ["angular"], data = [ "//modules/playground/src/web_workers:worker-config", - "@ngdeps//node_modules/base64-js:base64js.min.js", - "@ngdeps//node_modules/rxjs:bundles/rxjs.umd.js", - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//node_modules/base64-js:base64js.min.js", + "@npm//node_modules/rxjs:bundles/rxjs.umd.js", + "@npm//node_modules/tslib:tslib.js", "loader.js", ] + glob(["**/*.css"]), entry_module = "angular/modules/playground/src/web_workers/images/index", index_html = "index.html", port = 4200, - scripts = ["@ngdeps//node_modules/tslib:tslib.js"], + scripts = ["@npm//node_modules/tslib:tslib.js"], static_files = [ - "@ngdeps//node_modules/zone.js:dist/zone.js", - "@ngdeps//node_modules/materialize-css:dist/js/materialize.min.js", - "@ngdeps//node_modules/materialize-css:dist/css/materialize.min.css", - "@ngdeps//node_modules/jquery:dist/jquery.min.js", + "@npm//node_modules/zone.js:dist/zone.js", + "@npm//node_modules/materialize-css:dist/js/materialize.min.js", + "@npm//node_modules/materialize-css:dist/css/materialize.min.css", + "@npm//node_modules/jquery:dist/jquery.min.js", "//third_party/github.com/google/material-design-icons", ], deps = [":images"], diff --git a/modules/playground/src/web_workers/images/loader.js b/modules/playground/src/web_workers/images/loader.js index 3612f5426f..c6ea58279a 100644 --- a/modules/playground/src/web_workers/images/loader.js +++ b/modules/playground/src/web_workers/images/loader.js @@ -10,7 +10,7 @@ importScripts('angular/modules/playground/src/web_workers/worker-configure.js'); System.config({ map: { - 'base64-js': 'ngdeps/node_modules/base64-js/base64js.min.js', + 'base64-js': 'npm/node_modules/base64-js/base64js.min.js', }, packages: {'angular/modules/playground/src/web_workers': {defaultExtension: 'js'}} }); diff --git a/modules/playground/src/web_workers/input/BUILD.bazel b/modules/playground/src/web_workers/input/BUILD.bazel index 20fdd641ca..484ecd337c 100644 --- a/modules/playground/src/web_workers/input/BUILD.bazel +++ b/modules/playground/src/web_workers/input/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) @@ -21,16 +21,16 @@ ts_devserver( data = [ "loader.js", "//modules/playground/src/web_workers:worker-config", - "@ngdeps//node_modules/rxjs:bundles/rxjs.umd.js", - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//node_modules/rxjs:bundles/rxjs.umd.js", + "@npm//node_modules/tslib:tslib.js", ], entry_module = "angular/modules/playground/src/web_workers/input/index", index_html = "index.html", port = 4200, scripts = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//node_modules/tslib:tslib.js", "//tools/rxjs:rxjs_umd_modules", ], - static_files = ["@ngdeps//node_modules/zone.js:dist/zone.js"], + static_files = ["@npm//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 dfc299b6cf..034e2cb206 100644 --- a/modules/playground/src/web_workers/kitchen_sink/BUILD.bazel +++ b/modules/playground/src/web_workers/kitchen_sink/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) @@ -21,16 +21,16 @@ ts_devserver( data = [ "loader.js", "//modules/playground/src/web_workers:worker-config", - "@ngdeps//node_modules/rxjs:bundles/rxjs.umd.js", - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//node_modules/rxjs:bundles/rxjs.umd.js", + "@npm//node_modules/tslib:tslib.js", ], entry_module = "angular/modules/playground/src/web_workers/kitchen_sink/index", index_html = "index.html", port = 4200, scripts = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//node_modules/tslib:tslib.js", "//tools/rxjs:rxjs_umd_modules", ], - static_files = ["@ngdeps//node_modules/zone.js:dist/zone.js"], + static_files = ["@npm//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 8c032975ca..78354b7e4e 100644 --- a/modules/playground/src/web_workers/message_broker/BUILD.bazel +++ b/modules/playground/src/web_workers/message_broker/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) @@ -21,16 +21,16 @@ ts_devserver( data = [ "loader.js", "//modules/playground/src/web_workers:worker-config", - "@ngdeps//node_modules/rxjs:bundles/rxjs.umd.js", - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//node_modules/rxjs:bundles/rxjs.umd.js", + "@npm//node_modules/tslib:tslib.js", ], entry_module = "angular/modules/playground/src/web_workers/message_broker/index", index_html = "index.html", port = 4200, scripts = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//node_modules/tslib:tslib.js", "//tools/rxjs:rxjs_umd_modules", ], - static_files = ["@ngdeps//node_modules/zone.js:dist/zone.js"], + static_files = ["@npm//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 62bd1ed1c5..c1ad9fedf7 100644 --- a/modules/playground/src/web_workers/router/BUILD.bazel +++ b/modules/playground/src/web_workers/router/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) @@ -15,7 +15,7 @@ ng_module( "//packages/platform-webworker", "//packages/platform-webworker-dynamic", "//packages/router", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) @@ -24,16 +24,16 @@ ts_devserver( data = [ "loader.js", "//modules/playground/src/web_workers:worker-config", - "@ngdeps//node_modules/rxjs:bundles/rxjs.umd.js", - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//node_modules/rxjs:bundles/rxjs.umd.js", + "@npm//node_modules/tslib:tslib.js", ], entry_module = "angular/modules/playground/src/web_workers/router/index", index_html = "index.html", port = 4200, scripts = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//node_modules/tslib:tslib.js", "//tools/rxjs:rxjs_umd_modules", ], - static_files = ["@ngdeps//node_modules/zone.js:dist/zone.js"], + static_files = ["@npm//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 a6c873df0f..d8e2b35ebb 100644 --- a/modules/playground/src/web_workers/todo/BUILD.bazel +++ b/modules/playground/src/web_workers/todo/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) @@ -24,16 +24,16 @@ ts_devserver( "css/main.css", "loader.js", "//modules/playground/src/web_workers:worker-config", - "@ngdeps//node_modules/rxjs:bundles/rxjs.umd.js", - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//node_modules/rxjs:bundles/rxjs.umd.js", + "@npm//node_modules/tslib:tslib.js", ], entry_module = "angular/modules/playground/src/web_workers/todo/index", index_html = "index.html", port = 4200, scripts = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//node_modules/tslib:tslib.js", "//tools/rxjs:rxjs_umd_modules", ], - static_files = ["@ngdeps//node_modules/zone.js:dist/zone.js"], + static_files = ["@npm//node_modules/zone.js:dist/zone.js"], deps = [":todo"], ) diff --git a/modules/playground/src/web_workers/worker-configure.js b/modules/playground/src/web_workers/worker-configure.js index 96041039ec..0f7906b156 100644 --- a/modules/playground/src/web_workers/worker-configure.js +++ b/modules/playground/src/web_workers/worker-configure.js @@ -6,9 +6,9 @@ * found in the LICENSE file at https://angular.io/license */ -importScripts('ngdeps/node_modules/reflect-metadata/Reflect.js'); -importScripts('ngdeps/node_modules/zone.js/dist/zone.js'); -importScripts('ngdeps/node_modules/zone.js/dist/long-stack-trace-zone.js'); -importScripts('ngdeps/node_modules/systemjs/dist/system.js'); +importScripts('npm/node_modules/reflect-metadata/Reflect.js'); +importScripts('npm/node_modules/zone.js/dist/zone.js'); +importScripts('npm/node_modules/zone.js/dist/long-stack-trace-zone.js'); +importScripts('npm/node_modules/systemjs/dist/system.js'); importScripts('angular/modules/playground/systemjs-config.js'); diff --git a/modules/playground/src/zippy_component/BUILD.bazel b/modules/playground/src/zippy_component/BUILD.bazel index c4779d184d..964af8ade7 100644 --- a/modules/playground/src/zippy_component/BUILD.bazel +++ b/modules/playground/src/zippy_component/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) @@ -23,12 +23,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//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", + "@npm//node_modules/zone.js:dist/zone.js", + "@npm//node_modules/reflect-metadata:Reflect.js", ], deps = [":zippy_component"], ) diff --git a/modules/playground/systemjs-config.js b/modules/playground/systemjs-config.js index a9f4c0b75d..8e3fbe8f2a 100644 --- a/modules/playground/systemjs-config.js +++ b/modules/playground/systemjs-config.js @@ -30,8 +30,8 @@ const angularPackages = [ const packagesConfig = {}; const mapConfig = { - 'tslib': 'ngdeps/node_modules/tslib/tslib.js', - 'rxjs': 'ngdeps/node_modules/rxjs/bundles/rxjs.umd.js', + 'tslib': 'npm/node_modules/tslib/tslib.js', + 'rxjs': 'npm/node_modules/rxjs/bundles/rxjs.umd.js', 'rxjs/operators': 'angular/modules/playground/systemjs-rxjs-operators.js', }; diff --git a/package.json b/package.json index 7d54afad2a..ae641c65e3 100644 --- a/package.json +++ b/package.json @@ -31,13 +31,14 @@ }, "// 1": "dependencies are used locally and by bazel", "dependencies": { + "@angular/bazel": "file:./tools/npm/@angular_bazel", "@angular-devkit/architect": "^0.13.2", "@angular-devkit/build-optimizer": "^0.13.2", "@angular-devkit/core": "^7.3.2", "@angular-devkit/schematics": "^7.3.2", - "@bazel/jasmine": "0.26.0-beta.0", - "@bazel/karma": "0.26.0-beta.0", - "@bazel/typescript": "0.26.0-beta.0", + "@bazel/jasmine": "0.26.0", + "@bazel/karma": "0.26.0", + "@bazel/typescript": "0.26.0", "@microsoft/api-extractor": "^7.0.17", "@schematics/angular": "^7.3.2", "@types/angular": "^1.6.47", diff --git a/packages/BUILD.bazel b/packages/BUILD.bazel index 65ff743075..b3202fba0d 100644 --- a/packages/BUILD.bazel +++ b/packages/BUILD.bazel @@ -5,15 +5,15 @@ exports_files([ "tsconfig.json", ]) -load("@npm_bazel_typescript//:defs.bzl", "ts_config") +load("@npm_bazel_typescript//:index.bzl", "ts_config") load("//tools:defaults.bzl", "ts_library") ts_library( name = "types", srcs = glob(["*.ts"]), deps = [ - "@ngdeps//@types/hammerjs", - "@ngdeps//zone.js", + "@npm//@types/hammerjs", + "@npm//zone.js", ], ) diff --git a/packages/bazel/BUILD.bazel b/packages/bazel/BUILD.bazel index 3522a3c2e7..1b7410dbb8 100644 --- a/packages/bazel/BUILD.bazel +++ b/packages/bazel/BUILD.bazel @@ -21,8 +21,6 @@ npm_package( replacements = { "(#|\/\/)\\s+BEGIN-DEV-ONLY[\\w\W]+?(#|\/\/)\\s+END-DEV-ONLY": "", "//packages/bazel/": "//", - "@ngdeps//": "@npm//", - "@angular//:@angular/bazel/ngc-wrapped": "@npm//@angular/bazel/bin:ngc-wrapped", "angular/packages/bazel/": "npm_angular_bazel/", }, tags = ["release-with-framework"], diff --git a/packages/bazel/docs/BUILD.bazel b/packages/bazel/docs/BUILD.bazel index 234fb875da..b7d4094d0f 100644 --- a/packages/bazel/docs/BUILD.bazel +++ b/packages/bazel/docs/BUILD.bazel @@ -5,7 +5,6 @@ skylark_doc( srcs = [ "//packages/bazel/src:ng_module.bzl", "//packages/bazel/src:ng_rollup_bundle.bzl", - "//packages/bazel/src:ng_setup_workspace.bzl", "//packages/bazel/src/ng_package:ng_package.bzl", "//packages/bazel/src/protractor:protractor_web_test.bzl", ], diff --git a/packages/bazel/index.bzl b/packages/bazel/index.bzl index 18b55abe3d..11c5eb8509 100644 --- a/packages/bazel/index.bzl +++ b/packages/bazel/index.bzl @@ -14,12 +14,17 @@ load( _protractor_web_test_suite = "protractor_web_test_suite", ) load("//packages/bazel/src:ng_module.bzl", _ng_module = "ng_module") -load("//packages/bazel/src:ng_setup_workspace.bzl", _ng_setup_workspace = "ng_setup_workspace") ng_module = _ng_module ng_package = _ng_package protractor_web_test = _protractor_web_test protractor_web_test_suite = _protractor_web_test_suite -ng_setup_workspace = _ng_setup_workspace # DO NOT ADD PUBLIC API without including in the documentation generation # Run `yarn bazel build //packages/bazel/docs` to verify + +def ng_setup_workspace(): + print("""DEPRECATION WARNING: + ng_setup_workspace is no longer needed, and will be removed in a future release. + We assume you will fetch rules_nodejs in your WORKSPACE file, and no other dependencies remain here. + Simply remove any calls to this function and the corresponding load statement. + """) diff --git a/packages/bazel/package.json b/packages/bazel/package.json index 9d97fca331..8ba57c7d69 100644 --- a/packages/bazel/package.json +++ b/packages/bazel/package.json @@ -21,7 +21,7 @@ "@angular-devkit/architect": "^0.10.6", "@angular-devkit/core": "^7.0.4", "@angular-devkit/schematics": "^7.3.0-rc.0", - "@bazel/typescript": "^0.26.0-beta.0", + "@bazel/typescript": "^0.26.0", "@microsoft/api-extractor": "^7.0.17", "@schematics/angular": "^7.0.4", "@types/node": "6.0.84", diff --git a/packages/bazel/src/BUILD.bazel b/packages/bazel/src/BUILD.bazel index 6f806fbfec..c7cd30b973 100644 --- a/packages/bazel/src/BUILD.bazel +++ b/packages/bazel/src/BUILD.bazel @@ -13,13 +13,13 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary") nodejs_binary( name = "rollup_with_build_optimizer", data = [ - "@ngdeps//@angular-devkit/build-optimizer", - "@ngdeps//is-builtin-module", - "@ngdeps//rollup", - "@ngdeps//rollup-plugin-node-resolve", - "@ngdeps//rollup-plugin-sourcemaps", + "@npm//@angular-devkit/build-optimizer", + "@npm//is-builtin-module", + "@npm//rollup", + "@npm//rollup-plugin-node-resolve", + "@npm//rollup-plugin-sourcemaps", ], - entry_point = "ngdeps/node_modules/rollup/bin/rollup", + entry_point = "npm/node_modules/rollup/bin/rollup", install_source_map_support = False, visibility = ["//visibility:public"], ) diff --git a/packages/bazel/src/api-extractor/BUILD.bazel b/packages/bazel/src/api-extractor/BUILD.bazel index 459e7b5a96..da7d1322eb 100644 --- a/packages/bazel/src/api-extractor/BUILD.bazel +++ b/packages/bazel/src/api-extractor/BUILD.bazel @@ -11,9 +11,9 @@ ts_library( "index.ts", ], deps = [ - "@ngdeps//@bazel/typescript", - "@ngdeps//@microsoft/api-extractor", - "@ngdeps//@types/node", + "@npm//@bazel/typescript", + "@npm//@microsoft/api-extractor", + "@npm//@types/node", ], ) @@ -22,8 +22,8 @@ nodejs_binary( name = "api_extractor", data = [ ":lib", - "@ngdeps//@bazel/typescript", - "@ngdeps//@microsoft/api-extractor", + "@npm//@bazel/typescript", + "@npm//@microsoft/api-extractor", ], entry_point = "angular/packages/bazel/src/api-extractor/index.js", visibility = ["//visibility:public"], diff --git a/packages/bazel/src/builders/BUILD.bazel b/packages/bazel/src/builders/BUILD.bazel index 175ce6d437..23e4a0add8 100644 --- a/packages/bazel/src/builders/BUILD.bazel +++ b/packages/bazel/src/builders/BUILD.bazel @@ -22,9 +22,9 @@ ts_library( ], module_name = "@angular/bazel/src/builders", deps = [ - "@ngdeps//@angular-devkit/architect", - "@ngdeps//@angular-devkit/core", - "@ngdeps//@types/node", - "@ngdeps//rxjs", + "@npm//@angular-devkit/architect", + "@npm//@angular-devkit/core", + "@npm//@types/node", + "@npm//rxjs", ], ) diff --git a/packages/bazel/src/external.bzl b/packages/bazel/src/external.bzl index e96ce98af7..f9bbc98140 100644 --- a/packages/bazel/src/external.bzl +++ b/packages/bazel/src/external.bzl @@ -33,7 +33,7 @@ compile_ts = _compile_ts DEPS_ASPECTS = _DEPS_ASPECTS ts_providers_dict_to_struct = _ts_providers_dict_to_struct -DEFAULT_NG_COMPILER = "@angular//:@angular/bazel/ngc-wrapped" +DEFAULT_NG_COMPILER = "@npm//@angular/bazel/bin:ngc-wrapped" DEFAULT_NG_XI18N = "@npm//@angular/bazel/bin:xi18n" FLAT_DTS_FILE_SUFFIX = ".bundle.d.ts" TsConfigInfo = _TsConfigInfo diff --git a/packages/bazel/src/ng_package/BUILD.bazel b/packages/bazel/src/ng_package/BUILD.bazel index 8cfc2cfab3..c9a0318cc8 100644 --- a/packages/bazel/src/ng_package/BUILD.bazel +++ b/packages/bazel/src/ng_package/BUILD.bazel @@ -3,16 +3,16 @@ package(default_visibility = ["//visibility:public"]) load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary") # BEGIN-DEV-ONLY -load("@npm_bazel_typescript//:defs.bzl", "ts_library") +load("@npm_bazel_typescript//:index.bzl", "ts_library") ts_library( name = "lib", srcs = glob(["*.ts"]), - node_modules = "@ngdeps//typescript:typescript__typings", + node_modules = "@npm//typescript:typescript__typings", tsconfig = ":tsconfig.json", deps = [ - "@ngdeps//@types/node", - "@ngdeps//@types/shelljs", + "@npm//@types/node", + "@npm//@types/shelljs", ], ) @@ -21,7 +21,7 @@ nodejs_binary( name = "packager", data = [ "lib", - "@ngdeps//shelljs", + "@npm//shelljs", ], entry_point = "angular/packages/bazel/src/ng_package/packager.js", install_source_map_support = False, diff --git a/packages/bazel/src/ng_rollup_bundle.bzl b/packages/bazel/src/ng_rollup_bundle.bzl index d6992fc24e..502697390f 100644 --- a/packages/bazel/src/ng_rollup_bundle.bzl +++ b/packages/bazel/src/ng_rollup_bundle.bzl @@ -43,7 +43,7 @@ PACKAGES = [ PLUGIN_CONFIG = "{sideEffectFreeModules: [\n%s]}" % ",\n".join( [" '.esm5/{0}'".format(p) for p in PACKAGES], ) -BO_ROLLUP = "ngdeps/node_modules/@angular-devkit/build-optimizer/src/build-optimizer/rollup-plugin.js" +BO_ROLLUP = "npm/node_modules/@angular-devkit/build-optimizer/src/build-optimizer/rollup-plugin.js" BO_PLUGIN = "require('%s').default(%s)" % (BO_ROLLUP, PLUGIN_CONFIG) def _use_plain_rollup(ctx): diff --git a/packages/bazel/src/ng_setup_workspace.bzl b/packages/bazel/src/ng_setup_workspace.bzl deleted file mode 100644 index 4845f7b701..0000000000 --- a/packages/bazel/src/ng_setup_workspace.bzl +++ /dev/null @@ -1,13 +0,0 @@ -# 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 - -"Install toolchain dependencies" - -def ng_setup_workspace(): - """This repository rule should be called from your WORKSPACE file. - - It creates some additional Bazel external repositories that are used internally - by the Angular rules. - """ diff --git a/packages/bazel/src/ngc-wrapped/BUILD.bazel b/packages/bazel/src/ngc-wrapped/BUILD.bazel index 00a5e25958..f419f1075a 100644 --- a/packages/bazel/src/ngc-wrapped/BUILD.bazel +++ b/packages/bazel/src/ngc-wrapped/BUILD.bazel @@ -1,5 +1,5 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary") -load("@npm_bazel_typescript//:defs.bzl", "ts_library") +load("@npm_bazel_typescript//:index.bzl", "ts_library") ts_library( name = "ngc_lib", @@ -8,7 +8,7 @@ ts_library( "index.ts", ], module_name = "@angular/bazel", - node_modules = "@ngdeps//typescript:typescript__typings", + node_modules = "@npm//typescript:typescript__typings", tsconfig = ":tsconfig.json", visibility = [ "//packages/bazel:__pkg__", @@ -20,10 +20,10 @@ ts_library( # Users will get this dependency from node_modules. "//packages/compiler-cli", # END-INTERNAL - "@ngdeps//@bazel/typescript", - "@ngdeps//@types/node", - "@ngdeps//tsickle", - "@ngdeps//typescript", + "@npm//@bazel/typescript", + "@npm//@types/node", + "@npm//tsickle", + "@npm//typescript", ], ) @@ -33,8 +33,8 @@ nodejs_binary( data = [ ":ngc_lib", "//packages/bazel/third_party/github.com/bazelbuild/bazel/src/main/protobuf:worker_protocol.proto", - "@ngdeps//source-map-support", - "@ngdeps//tslib", + "@npm//source-map-support", + "@npm//tslib", ], entry_point = "angular/packages/bazel/src/ngc-wrapped/index.js", visibility = ["//visibility:public"], @@ -44,7 +44,7 @@ nodejs_binary( name = "xi18n", data = [ ":ngc_lib", - "@ngdeps//source-map-support", + "@npm//source-map-support", ], entry_point = "angular/packages/bazel/src/ngc-wrapped/extract_i18n.js", visibility = ["//visibility:public"], diff --git a/packages/bazel/src/protractor/utils/BUILD.bazel b/packages/bazel/src/protractor/utils/BUILD.bazel index fd461d9610..fcfe0ecec8 100644 --- a/packages/bazel/src/protractor/utils/BUILD.bazel +++ b/packages/bazel/src/protractor/utils/BUILD.bazel @@ -1,12 +1,12 @@ package(default_visibility = ["//visibility:public"]) -load("@npm_bazel_typescript//:defs.bzl", "ts_library") +load("@npm_bazel_typescript//:index.bzl", "ts_library") ts_library( name = "utils", srcs = ["index.ts"], module_name = "@angular/bazel/protractor-utils", - node_modules = "@ngdeps//typescript:typescript__typings", + node_modules = "@npm//typescript:typescript__typings", tsconfig = ":tsconfig.json", - deps = ["@ngdeps//@types/node"], + deps = ["@npm//@types/node"], ) diff --git a/packages/bazel/src/schematics/bazel-workspace/BUILD.bazel b/packages/bazel/src/schematics/bazel-workspace/BUILD.bazel index 44945a27e8..a59b2da406 100644 --- a/packages/bazel/src/schematics/bazel-workspace/BUILD.bazel +++ b/packages/bazel/src/schematics/bazel-workspace/BUILD.bazel @@ -12,9 +12,9 @@ ts_library( "schema.json", ], deps = [ - "@ngdeps//@angular-devkit/core", - "@ngdeps//@angular-devkit/schematics", - "@ngdeps//@schematics/angular", + "@npm//@angular-devkit/core", + "@npm//@angular-devkit/schematics", + "@npm//@schematics/angular", ], ) @@ -29,6 +29,6 @@ ts_library( ], deps = [ ":bazel-workspace", - "@ngdeps//@angular-devkit/schematics", + "@npm//@angular-devkit/schematics", ], ) diff --git a/packages/bazel/src/schematics/bazel-workspace/files/WORKSPACE.template b/packages/bazel/src/schematics/bazel-workspace/files/WORKSPACE.template index a8138b433b..5b4d987081 100644 --- a/packages/bazel/src/schematics/bazel-workspace/files/WORKSPACE.template +++ b/packages/bazel/src/schematics/bazel-workspace/files/WORKSPACE.template @@ -55,11 +55,9 @@ web_test_repositories() load("@npm_bazel_karma//:browser_repositories.bzl", "browser_repositories") browser_repositories() -load("@npm_bazel_typescript//:defs.bzl", "ts_setup_workspace") +load("@npm_bazel_typescript//:index.bzl", "ts_setup_workspace") ts_setup_workspace() <% if (sass) { %> load("@io_bazel_rules_sass//sass:sass_repositories.bzl", "sass_repositories") sass_repositories() <% } %> -load("@npm_angular_bazel//:index.bzl", "ng_setup_workspace") -ng_setup_workspace() diff --git a/packages/bazel/src/schematics/bazel-workspace/files/e2e/BUILD.bazel.template b/packages/bazel/src/schematics/bazel-workspace/files/e2e/BUILD.bazel.template index 7416073301..b38c34575f 100644 --- a/packages/bazel/src/schematics/bazel-workspace/files/e2e/BUILD.bazel.template +++ b/packages/bazel/src/schematics/bazel-workspace/files/e2e/BUILD.bazel.template @@ -1,4 +1,4 @@ -load("@npm_bazel_typescript//:defs.bzl", "ts_library") +load("@npm_bazel_typescript//:index.bzl", "ts_library") load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") ts_library( 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 c9fc7845d6..237f039881 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 @@ -1,10 +1,10 @@ package(default_visibility = ["//visibility:public"]) load("@npm_angular_bazel//:index.bzl", "ng_module") -load("@npm_bazel_karma//:defs.bzl", "ts_web_test_suite") +load("@npm_bazel_karma//:index.bzl", "ts_web_test_suite") load("@build_bazel_rules_nodejs//:defs.bzl", "rollup_bundle", "history_server") load("@build_bazel_rules_nodejs//internal/web_package:web_package.bzl", "web_package") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver", "ts_library") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver", "ts_library") <% if (sass) { %>load("@io_bazel_rules_sass//:defs.bzl", "multi_sass_binary") multi_sass_binary( diff --git a/packages/bazel/src/schematics/bazel-workspace/index.ts b/packages/bazel/src/schematics/bazel-workspace/index.ts index 1c9e716ab1..0fbdf9beb6 100644 --- a/packages/bazel/src/schematics/bazel-workspace/index.ts +++ b/packages/bazel/src/schematics/bazel-workspace/index.ts @@ -57,8 +57,8 @@ export default function(options: BazelWorkspaceOptions): Rule { } const workspaceVersions = { - 'RULES_NODEJS_VERSION': '0.18.6', - 'RULES_NODEJS_SHA256': '1416d03823fed624b49a0abbd9979f7c63bbedfd37890ddecedd2fe25cccebc6', + 'RULES_NODEJS_VERSION': '0.26.0', + 'RULES_NODEJS_SHA256': '5c86b055c57e15bf32d9009a15bcd6d8e190c41b1ff2fb18037b75e0012e4e7c', 'RULES_SASS_VERSION': '1.17.2', 'RULES_SASS_SHA256': 'e5316ee8a09d1cbb732d3938b400836bf94dba91a27476e9e27706c4c0edae1f', }; diff --git a/packages/bazel/src/schematics/ng-add/BUILD.bazel b/packages/bazel/src/schematics/ng-add/BUILD.bazel index 461a1cd924..1a67bbc1c0 100644 --- a/packages/bazel/src/schematics/ng-add/BUILD.bazel +++ b/packages/bazel/src/schematics/ng-add/BUILD.bazel @@ -14,10 +14,10 @@ ts_library( deps = [ "//packages/bazel/src/schematics/bazel-workspace", "//packages/bazel/src/schematics/utility", - "@ngdeps//@angular-devkit/core", - "@ngdeps//@angular-devkit/schematics", - "@ngdeps//@schematics/angular", - "@ngdeps//typescript", + "@npm//@angular-devkit/core", + "@npm//@angular-devkit/schematics", + "@npm//@schematics/angular", + "@npm//typescript", ], ) @@ -32,6 +32,6 @@ ts_library( ], deps = [ ":ng-add", - "@ngdeps//@angular-devkit/schematics", + "@npm//@angular-devkit/schematics", ], ) diff --git a/packages/bazel/src/schematics/ng-add/index.ts b/packages/bazel/src/schematics/ng-add/index.ts index 36dea7bfc7..32730aaedb 100755 --- a/packages/bazel/src/schematics/ng-add/index.ts +++ b/packages/bazel/src/schematics/ng-add/index.ts @@ -46,7 +46,7 @@ function addDevDependenciesToPackageJson(options: Schema) { '@angular/upgrade': angularCoreVersion, '@bazel/bazel': '^0.22.1', '@bazel/ibazel': '^0.9.0', - '@bazel/karma': '^0.25.1', + '@bazel/karma': '^0.26.0', }; const recorder = host.beginUpdate(packageJson); diff --git a/packages/bazel/src/schematics/ng-new/BUILD.bazel b/packages/bazel/src/schematics/ng-new/BUILD.bazel index 45a103934b..10f4836c45 100644 --- a/packages/bazel/src/schematics/ng-new/BUILD.bazel +++ b/packages/bazel/src/schematics/ng-new/BUILD.bazel @@ -13,8 +13,8 @@ ts_library( ], deps = [ "//packages/bazel/src/schematics/ng-add", - "@ngdeps//@angular-devkit/schematics", - "@ngdeps//@schematics/angular", + "@npm//@angular-devkit/schematics", + "@npm//@schematics/angular", ], ) @@ -29,6 +29,6 @@ ts_library( ], deps = [ ":ng-new", - "@ngdeps//@angular-devkit/schematics", + "@npm//@angular-devkit/schematics", ], ) diff --git a/packages/bazel/src/schematics/utility/BUILD.bazel b/packages/bazel/src/schematics/utility/BUILD.bazel index 2c82c9ae28..9420f1a17a 100644 --- a/packages/bazel/src/schematics/utility/BUILD.bazel +++ b/packages/bazel/src/schematics/utility/BUILD.bazel @@ -9,10 +9,10 @@ ts_library( ], module_name = "@angular/bazel/src/schematics/utility", deps = [ - "@ngdeps//@angular-devkit/core", - "@ngdeps//@angular-devkit/schematics", - "@ngdeps//@schematics/angular", - "@ngdeps//typescript", + "@npm//@angular-devkit/core", + "@npm//@angular-devkit/schematics", + "@npm//@schematics/angular", + "@npm//typescript", ], ) @@ -24,7 +24,7 @@ ts_library( ], deps = [ ":utility", - "@ngdeps//@angular-devkit/core", - "@ngdeps//@angular-devkit/schematics", + "@npm//@angular-devkit/core", + "@npm//@angular-devkit/schematics", ], ) diff --git a/packages/bazel/test/ng_package/BUILD.bazel b/packages/bazel/test/ng_package/BUILD.bazel index 0925aa37f6..9c4884b8be 100644 --- a/packages/bazel/test/ng_package/BUILD.bazel +++ b/packages/bazel/test/ng_package/BUILD.bazel @@ -13,7 +13,7 @@ ts_library( deps = [ "//packages:types", "//packages/private/testing", - "@ngdeps//@types/shelljs", + "@npm//@types/shelljs", ], ) @@ -22,8 +22,8 @@ jasmine_node_test( srcs = [":core_spec_lib"], data = [ "//packages/core:npm_package", - "@ngdeps//@types/shelljs", - "@ngdeps//shelljs", + "@npm//@types/shelljs", + "@npm//shelljs", ], ) @@ -34,7 +34,7 @@ ts_library( deps = [ "//packages:types", "//packages/private/testing", - "@ngdeps//@types/shelljs", + "@npm//@types/shelljs", ], ) @@ -43,7 +43,7 @@ jasmine_node_test( srcs = [":common_spec_lib"], data = [ "//packages/common:npm_package", - "@ngdeps//shelljs", + "@npm//shelljs", ], ) @@ -53,7 +53,7 @@ ts_library( srcs = ["example_package.spec.ts"], deps = [ "//packages:types", - "@ngdeps//@types/diff", + "@npm//@types/diff", ], ) @@ -68,7 +68,7 @@ jasmine_node_test( # file is based on non-ivy output and therefore won't work for ngc and Ivy at the same time. # TODO: We should be able to have another golden for ivy-aot as well. tags = ["no-ivy-aot"], - deps = ["@ngdeps//diff"], + deps = ["@npm//diff"], ) nodejs_binary( @@ -78,7 +78,7 @@ nodejs_binary( "example_package.golden", ":example_spec_lib", "//packages/bazel/test/ng_package/example:npm_package", - "@ngdeps//diff", + "@npm//diff", ], entry_point = "angular/packages/bazel/test/ng_package/example_package.spec.js", templated_args = ["--accept"], diff --git a/packages/bazel/test/ng_package/example/BUILD.bazel b/packages/bazel/test/ng_package/example/BUILD.bazel index 3e5733ae7b..948caaaa98 100644 --- a/packages/bazel/test/ng_package/example/BUILD.bazel +++ b/packages/bazel/test/ng_package/example/BUILD.bazel @@ -9,7 +9,7 @@ ng_module( module_name = "example", deps = [ "//packages/bazel/test/ng_package/example/secondary", - "@ngdeps//@types", + "@npm//@types", ], ) diff --git a/packages/bazel/test/ng_package/example/secondary/BUILD.bazel b/packages/bazel/test/ng_package/example/secondary/BUILD.bazel index f66a3af590..a743b6891c 100644 --- a/packages/bazel/test/ng_package/example/secondary/BUILD.bazel +++ b/packages/bazel/test/ng_package/example/secondary/BUILD.bazel @@ -9,6 +9,6 @@ ng_module( module_name = "example/secondary", deps = [ "//packages/core", - "@ngdeps//@types", + "@npm//@types", ], ) diff --git a/packages/bazel/test/ngc-wrapped/BUILD.bazel b/packages/bazel/test/ngc-wrapped/BUILD.bazel index 902a5a6fe8..f8f7907701 100644 --- a/packages/bazel/test/ngc-wrapped/BUILD.bazel +++ b/packages/bazel/test/ngc-wrapped/BUILD.bazel @@ -12,7 +12,7 @@ ts_library( deps = [ "//packages/bazel/src/ngc-wrapped:ngc_lib", "//packages/compiler-cli", - "@ngdeps//typescript", + "@npm//typescript", ], ) diff --git a/packages/bazel/test/ngc-wrapped/empty/BUILD.bazel b/packages/bazel/test/ngc-wrapped/empty/BUILD.bazel index 68e33b75fa..f9809da07b 100644 --- a/packages/bazel/test/ngc-wrapped/empty/BUILD.bazel +++ b/packages/bazel/test/ngc-wrapped/empty/BUILD.bazel @@ -8,6 +8,6 @@ ng_module( tsconfig = ":tsconfig.json", deps = [ "//packages/core", - "@ngdeps//@types", + "@npm//@types", ], ) diff --git a/packages/bazel/test/ngc-wrapped/tsconfig_template.ts b/packages/bazel/test/ngc-wrapped/tsconfig_template.ts index 5459a6e62f..7f52d2b503 100644 --- a/packages/bazel/test/ngc-wrapped/tsconfig_template.ts +++ b/packages/bazel/test/ngc-wrapped/tsconfig_template.ts @@ -71,7 +71,7 @@ export function createTsConfig(options: TsConfigOptions) { 'tsickleExternsPath': '', // we don't copy the node_modules into our tmp dir, so we should look in // the original workspace directory for it - 'nodeModulesPrefix': '../ngdeps/node_modules', + 'nodeModulesPrefix': '../npm/node_modules', }, 'files': options.files, 'angularCompilerOptions': { diff --git a/packages/bazel/test/protractor-2/BUILD.bazel b/packages/bazel/test/protractor-2/BUILD.bazel index 2abc047509..bf3dae8778 100644 --- a/packages/bazel/test/protractor-2/BUILD.bazel +++ b/packages/bazel/test/protractor-2/BUILD.bazel @@ -1,5 +1,5 @@ load("//packages/bazel:index.bzl", "protractor_web_test_suite") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") load("@build_bazel_rules_nodejs//:defs.bzl", "http_server", "rollup_bundle") load("//tools:defaults.bzl", "ts_library") @@ -36,8 +36,8 @@ ts_library( srcs = ["test.spec.ts"], tsconfig = ":tsconfig.test.json", deps = [ - "@ngdeps//@types/selenium-webdriver", - "@ngdeps//protractor", + "@npm//@types/selenium-webdriver", + "@npm//protractor", ], ) @@ -49,7 +49,7 @@ protractor_web_test_suite( server = ":prodserver", deps = [ ":ts_spec", - "@ngdeps//protractor", + "@npm//protractor", ], ) @@ -61,6 +61,6 @@ protractor_web_test_suite( server = ":devserver", deps = [ ":ts_spec", - "@ngdeps//protractor", + "@npm//protractor", ], ) diff --git a/packages/bazel/test/protractor-utils/BUILD.bazel b/packages/bazel/test/protractor-utils/BUILD.bazel index 33c2d77f4f..e2ddbf2008 100644 --- a/packages/bazel/test/protractor-utils/BUILD.bazel +++ b/packages/bazel/test/protractor-utils/BUILD.bazel @@ -14,7 +14,7 @@ nodejs_binary( testonly = True, data = [ "fake-devserver.js", - "@ngdeps//minimist", + "@npm//minimist", ], entry_point = "angular/packages/bazel/test/protractor-utils/fake-devserver.js", ) diff --git a/packages/bazel/test/protractor/BUILD.bazel b/packages/bazel/test/protractor/BUILD.bazel index 1f600e0d17..6301ba8b8f 100644 --- a/packages/bazel/test/protractor/BUILD.bazel +++ b/packages/bazel/test/protractor/BUILD.bazel @@ -7,8 +7,8 @@ ts_library( srcs = ["test.spec.ts"], tsconfig = ":tsconfig.json", deps = [ - "@ngdeps//@types/selenium-webdriver", - "@ngdeps//protractor", + "@npm//@types/selenium-webdriver", + "@npm//protractor", ], ) @@ -19,7 +19,7 @@ ts_library( tsconfig = ":tsconfig.json", deps = [ "//packages/bazel/src/protractor/utils", - "@ngdeps//protractor", + "@npm//protractor", ], ) @@ -29,6 +29,6 @@ protractor_web_test_suite( data = ["//packages/bazel/src/protractor/utils"], deps = [ ":ts_spec", - "@ngdeps//protractor", + "@npm//protractor", ], ) diff --git a/packages/benchpress/BUILD.bazel b/packages/benchpress/BUILD.bazel index b418569d6e..3cb0cf4dfb 100644 --- a/packages/benchpress/BUILD.bazel +++ b/packages/benchpress/BUILD.bazel @@ -13,8 +13,8 @@ ts_library( deps = [ "//packages:types", "//packages/core", - "@ngdeps//@types/node", - "@ngdeps//reflect-metadata", + "@npm//@types/node", + "@npm//reflect-metadata", ], ) diff --git a/packages/benchpress/test/BUILD.bazel b/packages/benchpress/test/BUILD.bazel index 9e6d8e46a1..ea75062fab 100644 --- a/packages/benchpress/test/BUILD.bazel +++ b/packages/benchpress/test/BUILD.bazel @@ -9,7 +9,7 @@ ts_library( "//packages/benchpress", "//packages/core", "//packages/core/testing", - "@ngdeps//protractor", + "@npm//protractor", ], ) @@ -21,6 +21,6 @@ jasmine_node_test( "//packages/benchpress", "//packages/core/testing", "//tools/testing:node", - "@ngdeps//protractor", + "@npm//protractor", ], ) diff --git a/packages/common/BUILD.bazel b/packages/common/BUILD.bazel index 7e429d92ec..f1c5a910ef 100644 --- a/packages/common/BUILD.bazel +++ b/packages/common/BUILD.bazel @@ -12,7 +12,7 @@ ng_module( ), deps = [ "//packages/core", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/common/http/BUILD.bazel b/packages/common/http/BUILD.bazel index 120fb214f5..575b51476b 100644 --- a/packages/common/http/BUILD.bazel +++ b/packages/common/http/BUILD.bazel @@ -15,6 +15,6 @@ ng_module( deps = [ "//packages/common", "//packages/core", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/common/http/test/BUILD.bazel b/packages/common/http/test/BUILD.bazel index 122b3b78d5..507110a73f 100644 --- a/packages/common/http/test/BUILD.bazel +++ b/packages/common/http/test/BUILD.bazel @@ -13,7 +13,7 @@ ts_library( "//packages/common/http/testing", "//packages/core", "//packages/core/testing", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/common/http/testing/BUILD.bazel b/packages/common/http/testing/BUILD.bazel index 74fab73105..2d69ff6a28 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", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/common/http/testing/test/BUILD.bazel b/packages/common/http/testing/test/BUILD.bazel index c8c150c274..df1213806b 100644 --- a/packages/common/http/testing/test/BUILD.bazel +++ b/packages/common/http/testing/test/BUILD.bazel @@ -11,7 +11,7 @@ ts_library( deps = [ "//packages/common/http", "//packages/common/http/testing", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/common/testing/BUILD.bazel b/packages/common/testing/BUILD.bazel index 9addcc00c3..0c9ead6e05 100644 --- a/packages/common/testing/BUILD.bazel +++ b/packages/common/testing/BUILD.bazel @@ -10,6 +10,6 @@ ng_module( deps = [ "//packages/common", "//packages/core", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/compiler-cli/BUILD.bazel b/packages/compiler-cli/BUILD.bazel index 65550129bb..72dc853589 100644 --- a/packages/compiler-cli/BUILD.bazel +++ b/packages/compiler-cli/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility = ["//visibility:public"]) load("//tools:defaults.bzl", "npm_package", "ts_library") -load("@npm_bazel_typescript//:defs.bzl", "ts_config") +load("@npm_bazel_typescript//:index.bzl", "ts_config") ts_config( name = "tsconfig", @@ -38,10 +38,10 @@ ts_library( "//packages/compiler-cli/src/ngtsc/transform", "//packages/compiler-cli/src/ngtsc/typecheck", "//packages/compiler-cli/src/ngtsc/util", - "@ngdeps//@bazel/typescript", - "@ngdeps//@types", - "@ngdeps//tsickle", - "@ngdeps//typescript", + "@npm//@bazel/typescript", + "@npm//@types", + "@npm//tsickle", + "@npm//typescript", ], ) diff --git a/packages/compiler-cli/integrationtest/BUILD.bazel b/packages/compiler-cli/integrationtest/BUILD.bazel index 985fdbe756..be32c13964 100644 --- a/packages/compiler-cli/integrationtest/BUILD.bazel +++ b/packages/compiler-cli/integrationtest/BUILD.bazel @@ -7,8 +7,8 @@ nodejs_binary( name = "ngc_bin", data = [ "//packages/compiler-cli", - "@ngdeps//chokidar", - "@ngdeps//reflect-metadata", + "@npm//chokidar", + "@npm//reflect-metadata", ], entry_point = "angular/packages/compiler-cli/src/main.js", ) @@ -17,8 +17,8 @@ nodejs_binary( name = "ng_xi18n", data = [ "//packages/compiler-cli", - "@ngdeps//chokidar", - "@ngdeps//reflect-metadata", + "@npm//chokidar", + "@npm//reflect-metadata", ], entry_point = "angular/packages/compiler-cli/src/extract_i18n.js", ) @@ -29,19 +29,19 @@ nodejs_test( ":ngc_bin", ":ng_xi18n", "@nodejs//:node", - "@ngdeps//domino", - "@ngdeps//chokidar", - "@ngdeps//source-map-support", - "@ngdeps//shelljs", - "@ngdeps//typescript", - "@ngdeps//reflect-metadata", - "@ngdeps//rxjs", - "@ngdeps//tslib", - "@ngdeps//jasmine/bin:jasmine", - "@ngdeps//zone.js", - "@ngdeps//xhr2", - "@ngdeps//@types/node", - "@ngdeps//@types/jasmine", + "@npm//domino", + "@npm//chokidar", + "@npm//source-map-support", + "@npm//shelljs", + "@npm//typescript", + "@npm//reflect-metadata", + "@npm//rxjs", + "@npm//tslib", + "@npm//jasmine/bin:jasmine", + "@npm//zone.js", + "@npm//xhr2", + "@npm//@types/node", + "@npm//@types/jasmine", "//packages/animations:npm_package", "//packages/common:npm_package", "//packages/compiler:npm_package", 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 524b44082a..a692dcbd9f 100644 --- a/packages/compiler-cli/integrationtest/bazel/injectable_def/app/BUILD.bazel +++ b/packages/compiler-cli/integrationtest/bazel/injectable_def/app/BUILD.bazel @@ -17,7 +17,7 @@ ng_module( "//packages/platform-browser", "//packages/platform-server", "//packages/router", - "@ngdeps//reflect-metadata", - "@ngdeps//rxjs", + "@npm//reflect-metadata", + "@npm//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 efa1d38972..f0be898990 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", - "@ngdeps//rxjs", + "@npm//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 e29a00e29c..9b7c1ebed0 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", - "@ngdeps//rxjs", + "@npm//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 bd8a754c72..f138ec6090 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 @@ -13,6 +13,6 @@ ng_module( tags = ["ivy-only"], deps = [ "//packages/core", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/compiler-cli/integrationtest/bazel/ng_module/BUILD.bazel b/packages/compiler-cli/integrationtest/bazel/ng_module/BUILD.bazel index e42d728325..f3db21e7c8 100644 --- a/packages/compiler-cli/integrationtest/bazel/ng_module/BUILD.bazel +++ b/packages/compiler-cli/integrationtest/bazel/ng_module/BUILD.bazel @@ -11,7 +11,7 @@ ng_module( flat_module_out_file = "flat_module_filename", module_name = "some_npm_module", ng_xi18n = "//packages/bazel/src/ngc-wrapped:xi18n", - node_modules = "@ngdeps//typescript:typescript__typings", + node_modules = "@npm//typescript:typescript__typings", tags = [ # Disabled as this test is specific to the flat module indexing of metadata.json files that # the old ngc compiler does. Ivy has no metadata.json files so this test does not apply. @@ -19,7 +19,7 @@ ng_module( ], deps = [ "//packages/core", - "@ngdeps//@types", + "@npm//@types", ], ) diff --git a/packages/compiler-cli/integrationtest/test.js b/packages/compiler-cli/integrationtest/test.js index 2b62fd7f0c..67d93e3beb 100644 --- a/packages/compiler-cli/integrationtest/test.js +++ b/packages/compiler-cli/integrationtest/test.js @@ -14,7 +14,7 @@ const {runCommand, setupTestDirectory} = require('./test_helpers'); const ngcBin = require.resolve('./ngc_bin'); const xi18nBin = require.resolve('./ng_xi18n'); const nodeBin = require.resolve(`nodejs/bin/node${(os.platform() === 'win32' ? '.cmd' : '')}`); -const jasmineBin = require.resolve('ngdeps/node_modules/jasmine/bin/jasmine.js'); +const jasmineBin = require.resolve('npm/node_modules/jasmine/bin/jasmine.js'); // Prepare the test directory before building the integration test output. This ensures that // the test runs in an hermetic way and works on Windows. diff --git a/packages/compiler-cli/integrationtest/test_helpers.js b/packages/compiler-cli/integrationtest/test_helpers.js index c0c87fc3c2..3e8123211b 100644 --- a/packages/compiler-cli/integrationtest/test_helpers.js +++ b/packages/compiler-cli/integrationtest/test_helpers.js @@ -38,23 +38,23 @@ const requiredNodeModules = { '@angular/router': resolveNpmTreeArtifact('angular/packages/router/npm_package'), // Note, @bazel/typescript does not appear here because it's not listed as a dependency of // @angular/compiler-cli - '@types/jasmine': resolveNpmTreeArtifact('ngdeps/node_modules/@types/jasmine'), - '@types/node': resolveNpmTreeArtifact('ngdeps/node_modules/@types/node'), + '@types/jasmine': resolveNpmTreeArtifact('npm/node_modules/@types/jasmine'), + '@types/node': resolveNpmTreeArtifact('npm/node_modules/@types/node'), // Transitive dependencies which need to be specified because the Angular NPM packages // depend on these without the Angular NPM packages being part of the Bazel managed deps. // This means that transitive dependencies need to be manually declared as required. - 'tslib': resolveNpmTreeArtifact('ngdeps/node_modules/tslib'), - 'domino': resolveNpmTreeArtifact('ngdeps/node_modules/domino'), - 'xhr2': resolveNpmTreeArtifact('ngdeps/node_modules/xhr2'), + 'tslib': resolveNpmTreeArtifact('npm/node_modules/tslib'), + 'domino': resolveNpmTreeArtifact('npm/node_modules/domino'), + 'xhr2': resolveNpmTreeArtifact('npm/node_modules/xhr2'), // Fine grained dependencies which are used by the integration test Angular modules, and // need to be symlinked so that they can be resolved by NodeJS or NGC. - 'reflect-metadata': resolveNpmTreeArtifact('ngdeps/node_modules/reflect-metadata'), - 'rxjs': resolveNpmTreeArtifact('ngdeps/node_modules/rxjs'), - 'source-map-support': resolveNpmTreeArtifact('ngdeps/node_modules/source-map-support'), - 'typescript': resolveNpmTreeArtifact('ngdeps/node_modules/typescript'), - 'zone.js': resolveNpmTreeArtifact('ngdeps/node_modules/zone.js'), + 'reflect-metadata': resolveNpmTreeArtifact('npm/node_modules/reflect-metadata'), + 'rxjs': resolveNpmTreeArtifact('npm/node_modules/rxjs'), + 'source-map-support': resolveNpmTreeArtifact('npm/node_modules/source-map-support'), + 'typescript': resolveNpmTreeArtifact('npm/node_modules/typescript'), + 'zone.js': resolveNpmTreeArtifact('npm/node_modules/zone.js'), }; /** Sets up the temporary test directory and returns the path to the directory. */ diff --git a/packages/compiler-cli/src/ngcc/BUILD.bazel b/packages/compiler-cli/src/ngcc/BUILD.bazel index 271f47f2de..00658a5e0e 100644 --- a/packages/compiler-cli/src/ngcc/BUILD.bazel +++ b/packages/compiler-cli/src/ngcc/BUILD.bazel @@ -20,15 +20,15 @@ ts_library( "//packages/compiler-cli/src/ngtsc/scope", "//packages/compiler-cli/src/ngtsc/transform", "//packages/compiler-cli/src/ngtsc/translator", - "@ngdeps//@types/convert-source-map", - "@ngdeps//@types/node", - "@ngdeps//@types/shelljs", - "@ngdeps//@types/source-map", - "@ngdeps//@types/yargs", - "@ngdeps//canonical-path", - "@ngdeps//dependency-graph", - "@ngdeps//magic-string", - "@ngdeps//source-map", - "@ngdeps//typescript", + "@npm//@types/convert-source-map", + "@npm//@types/node", + "@npm//@types/shelljs", + "@npm//@types/source-map", + "@npm//@types/yargs", + "@npm//canonical-path", + "@npm//dependency-graph", + "@npm//magic-string", + "@npm//source-map", + "@npm//typescript", ], ) diff --git a/packages/compiler-cli/src/ngcc/test/BUILD.bazel b/packages/compiler-cli/src/ngcc/test/BUILD.bazel index f2e51149d1..3f19cbe32f 100644 --- a/packages/compiler-cli/src/ngcc/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngcc/test/BUILD.bazel @@ -16,11 +16,11 @@ ts_library( "//packages/compiler-cli/src/ngtsc/reflection", "//packages/compiler-cli/src/ngtsc/testing", "//packages/compiler-cli/src/ngtsc/transform", - "@ngdeps//@types/convert-source-map", - "@ngdeps//@types/mock-fs", - "@ngdeps//canonical-path", - "@ngdeps//magic-string", - "@ngdeps//typescript", + "@npm//@types/convert-source-map", + "@npm//@types/mock-fs", + "@npm//canonical-path", + "@npm//magic-string", + "@npm//typescript", ], ) @@ -30,7 +30,7 @@ jasmine_node_test( deps = [ ":test_lib", "//tools/testing:node_no_angular", - "@ngdeps//canonical-path", - "@ngdeps//convert-source-map", + "@npm//canonical-path", + "@npm//convert-source-map", ], ) diff --git a/packages/compiler-cli/src/ngtsc/annotations/BUILD.bazel b/packages/compiler-cli/src/ngtsc/annotations/BUILD.bazel index ea3eb2f159..139a1db6a3 100644 --- a/packages/compiler-cli/src/ngtsc/annotations/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/annotations/BUILD.bazel @@ -19,7 +19,7 @@ ts_library( "//packages/compiler-cli/src/ngtsc/transform", "//packages/compiler-cli/src/ngtsc/typecheck", "//packages/compiler-cli/src/ngtsc/util", - "@ngdeps//@types/node", - "@ngdeps//typescript", + "@npm//@types/node", + "@npm//typescript", ], ) diff --git a/packages/compiler-cli/src/ngtsc/annotations/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/annotations/test/BUILD.bazel index e6da783313..74960efdfe 100644 --- a/packages/compiler-cli/src/ngtsc/annotations/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/annotations/test/BUILD.bazel @@ -22,7 +22,7 @@ ts_library( "//packages/compiler-cli/src/ngtsc/testing", "//packages/compiler-cli/src/ngtsc/translator", "//packages/compiler-cli/src/ngtsc/util", - "@ngdeps//typescript", + "@npm//typescript", ], ) diff --git a/packages/compiler-cli/src/ngtsc/cycles/BUILD.bazel b/packages/compiler-cli/src/ngtsc/cycles/BUILD.bazel index f54673ed0f..ef45798579 100644 --- a/packages/compiler-cli/src/ngtsc/cycles/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/cycles/BUILD.bazel @@ -10,6 +10,6 @@ ts_library( module_name = "@angular/compiler-cli/src/ngtsc/cycles", deps = [ "//packages/compiler-cli/src/ngtsc/imports", - "@ngdeps//typescript", + "@npm//typescript", ], ) diff --git a/packages/compiler-cli/src/ngtsc/cycles/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/cycles/test/BUILD.bazel index 0ed3c04e0d..37728045e2 100644 --- a/packages/compiler-cli/src/ngtsc/cycles/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/cycles/test/BUILD.bazel @@ -13,7 +13,7 @@ ts_library( "//packages/compiler-cli/src/ngtsc/cycles", "//packages/compiler-cli/src/ngtsc/imports", "//packages/compiler-cli/src/ngtsc/testing", - "@ngdeps//typescript", + "@npm//typescript", ], ) diff --git a/packages/compiler-cli/src/ngtsc/diagnostics/BUILD.bazel b/packages/compiler-cli/src/ngtsc/diagnostics/BUILD.bazel index 965c7ae178..d7ccf63c58 100644 --- a/packages/compiler-cli/src/ngtsc/diagnostics/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/diagnostics/BUILD.bazel @@ -9,6 +9,6 @@ ts_library( ]), deps = [ "//packages/compiler", - "@ngdeps//typescript", + "@npm//typescript", ], ) diff --git a/packages/compiler-cli/src/ngtsc/entry_point/BUILD.bazel b/packages/compiler-cli/src/ngtsc/entry_point/BUILD.bazel index 77c0d8fc55..afbf98fc6b 100644 --- a/packages/compiler-cli/src/ngtsc/entry_point/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/entry_point/BUILD.bazel @@ -12,7 +12,7 @@ ts_library( "//packages/compiler-cli/src/ngtsc/diagnostics", "//packages/compiler-cli/src/ngtsc/shims", "//packages/compiler-cli/src/ngtsc/util", - "@ngdeps//@types/node", - "@ngdeps//typescript", + "@npm//@types/node", + "@npm//typescript", ], ) diff --git a/packages/compiler-cli/src/ngtsc/entry_point/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/entry_point/test/BUILD.bazel index cb761a55da..31b933d9a3 100644 --- a/packages/compiler-cli/src/ngtsc/entry_point/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/entry_point/test/BUILD.bazel @@ -11,7 +11,7 @@ ts_library( deps = [ "//packages:types", "//packages/compiler-cli/src/ngtsc/entry_point", - "@ngdeps//typescript", + "@npm//typescript", ], ) diff --git a/packages/compiler-cli/src/ngtsc/imports/BUILD.bazel b/packages/compiler-cli/src/ngtsc/imports/BUILD.bazel index 07db415e02..48952cb198 100644 --- a/packages/compiler-cli/src/ngtsc/imports/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/imports/BUILD.bazel @@ -12,7 +12,7 @@ ts_library( "//packages/compiler", "//packages/compiler-cli/src/ngtsc/path", "//packages/compiler-cli/src/ngtsc/util", - "@ngdeps//@types/node", - "@ngdeps//typescript", + "@npm//@types/node", + "@npm//typescript", ], ) diff --git a/packages/compiler-cli/src/ngtsc/partial_evaluator/BUILD.bazel b/packages/compiler-cli/src/ngtsc/partial_evaluator/BUILD.bazel index 02979fd2da..fd71126460 100644 --- a/packages/compiler-cli/src/ngtsc/partial_evaluator/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/partial_evaluator/BUILD.bazel @@ -14,7 +14,7 @@ ts_library( "//packages/compiler-cli/src/ngtsc/imports", "//packages/compiler-cli/src/ngtsc/reflection", "//packages/compiler-cli/src/ngtsc/util", - "@ngdeps//@types/node", - "@ngdeps//typescript", + "@npm//@types/node", + "@npm//typescript", ], ) diff --git a/packages/compiler-cli/src/ngtsc/partial_evaluator/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/partial_evaluator/test/BUILD.bazel index d4caa3a9ed..78d7ce4ef3 100644 --- a/packages/compiler-cli/src/ngtsc/partial_evaluator/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/partial_evaluator/test/BUILD.bazel @@ -15,7 +15,7 @@ ts_library( "//packages/compiler-cli/src/ngtsc/partial_evaluator", "//packages/compiler-cli/src/ngtsc/reflection", "//packages/compiler-cli/src/ngtsc/testing", - "@ngdeps//typescript", + "@npm//typescript", ], ) diff --git a/packages/compiler-cli/src/ngtsc/path/BUILD.bazel b/packages/compiler-cli/src/ngtsc/path/BUILD.bazel index 2435fdc0e9..ebdbdfe262 100644 --- a/packages/compiler-cli/src/ngtsc/path/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/path/BUILD.bazel @@ -9,7 +9,7 @@ ts_library( ]), deps = [ "//packages:types", - "@ngdeps//@types/node", - "@ngdeps//typescript", + "@npm//@types/node", + "@npm//typescript", ], ) diff --git a/packages/compiler-cli/src/ngtsc/reflection/BUILD.bazel b/packages/compiler-cli/src/ngtsc/reflection/BUILD.bazel index 591bba9075..0e90eea893 100644 --- a/packages/compiler-cli/src/ngtsc/reflection/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/reflection/BUILD.bazel @@ -7,5 +7,5 @@ ts_library( srcs = ["index.ts"] + glob([ "src/**/*.ts", ]), - deps = ["@ngdeps//typescript"], + deps = ["@npm//typescript"], ) diff --git a/packages/compiler-cli/src/ngtsc/reflection/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/reflection/test/BUILD.bazel index 55e21e18e8..605b9dd910 100644 --- a/packages/compiler-cli/src/ngtsc/reflection/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/reflection/test/BUILD.bazel @@ -12,7 +12,7 @@ ts_library( "//packages:types", "//packages/compiler-cli/src/ngtsc/reflection", "//packages/compiler-cli/src/ngtsc/testing", - "@ngdeps//typescript", + "@npm//typescript", ], ) diff --git a/packages/compiler-cli/src/ngtsc/routing/BUILD.bazel b/packages/compiler-cli/src/ngtsc/routing/BUILD.bazel index 9670f24f81..84d14c119b 100644 --- a/packages/compiler-cli/src/ngtsc/routing/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/routing/BUILD.bazel @@ -12,7 +12,7 @@ ts_library( "//packages/compiler", "//packages/compiler-cli/src/ngtsc/imports", "//packages/compiler-cli/src/ngtsc/partial_evaluator", - "@ngdeps//@types/node", - "@ngdeps//typescript", + "@npm//@types/node", + "@npm//typescript", ], ) diff --git a/packages/compiler-cli/src/ngtsc/scope/BUILD.bazel b/packages/compiler-cli/src/ngtsc/scope/BUILD.bazel index 655f6d8929..0fed081640 100644 --- a/packages/compiler-cli/src/ngtsc/scope/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/scope/BUILD.bazel @@ -13,6 +13,6 @@ ts_library( "//packages/compiler-cli/src/ngtsc/reflection", "//packages/compiler-cli/src/ngtsc/typecheck", "//packages/compiler-cli/src/ngtsc/util", - "@ngdeps//typescript", + "@npm//typescript", ], ) diff --git a/packages/compiler-cli/src/ngtsc/scope/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/scope/test/BUILD.bazel index ed9c2b3e6e..307b55610c 100644 --- a/packages/compiler-cli/src/ngtsc/scope/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/scope/test/BUILD.bazel @@ -15,7 +15,7 @@ ts_library( "//packages/compiler-cli/src/ngtsc/reflection", "//packages/compiler-cli/src/ngtsc/scope", "//packages/compiler-cli/src/ngtsc/testing", - "@ngdeps//typescript", + "@npm//typescript", ], ) diff --git a/packages/compiler-cli/src/ngtsc/shims/BUILD.bazel b/packages/compiler-cli/src/ngtsc/shims/BUILD.bazel index f25ef3e838..8a3b57f06c 100644 --- a/packages/compiler-cli/src/ngtsc/shims/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/shims/BUILD.bazel @@ -11,7 +11,7 @@ ts_library( "//packages/compiler", "//packages/compiler-cli/src/ngtsc/imports", "//packages/compiler-cli/src/ngtsc/util", - "@ngdeps//@types/node", - "@ngdeps//typescript", + "@npm//@types/node", + "@npm//typescript", ], ) diff --git a/packages/compiler-cli/src/ngtsc/switch/BUILD.bazel b/packages/compiler-cli/src/ngtsc/switch/BUILD.bazel index cb758ef2bb..7ceb4ad96e 100644 --- a/packages/compiler-cli/src/ngtsc/switch/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/switch/BUILD.bazel @@ -9,6 +9,6 @@ ts_library( ]), deps = [ "//packages/compiler", - "@ngdeps//typescript", + "@npm//typescript", ], ) diff --git a/packages/compiler-cli/src/ngtsc/testing/BUILD.bazel b/packages/compiler-cli/src/ngtsc/testing/BUILD.bazel index 7509f42d95..028ee75e41 100644 --- a/packages/compiler-cli/src/ngtsc/testing/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/testing/BUILD.bazel @@ -10,6 +10,6 @@ ts_library( ]), deps = [ "//packages:types", - "@ngdeps//typescript", + "@npm//typescript", ], ) diff --git a/packages/compiler-cli/src/ngtsc/transform/BUILD.bazel b/packages/compiler-cli/src/ngtsc/transform/BUILD.bazel index d3a6fe38da..8ea057933a 100644 --- a/packages/compiler-cli/src/ngtsc/transform/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/transform/BUILD.bazel @@ -15,6 +15,6 @@ ts_library( "//packages/compiler-cli/src/ngtsc/translator", "//packages/compiler-cli/src/ngtsc/typecheck", "//packages/compiler-cli/src/ngtsc/util", - "@ngdeps//typescript", + "@npm//typescript", ], ) diff --git a/packages/compiler-cli/src/ngtsc/translator/BUILD.bazel b/packages/compiler-cli/src/ngtsc/translator/BUILD.bazel index 5da5a9dcac..351b1a7513 100644 --- a/packages/compiler-cli/src/ngtsc/translator/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/translator/BUILD.bazel @@ -10,6 +10,6 @@ ts_library( "//packages/compiler", "//packages/compiler-cli/src/ngtsc/imports", "//packages/compiler-cli/src/ngtsc/util", - "@ngdeps//typescript", + "@npm//typescript", ], ) diff --git a/packages/compiler-cli/src/ngtsc/typecheck/BUILD.bazel b/packages/compiler-cli/src/ngtsc/typecheck/BUILD.bazel index 12725051a4..ded2c9dded 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/typecheck/BUILD.bazel @@ -11,6 +11,6 @@ ts_library( "//packages/compiler-cli/src/ngtsc/imports", "//packages/compiler-cli/src/ngtsc/translator", "//packages/compiler-cli/src/ngtsc/util", - "@ngdeps//typescript", + "@npm//typescript", ], ) diff --git a/packages/compiler-cli/src/ngtsc/typecheck/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/typecheck/test/BUILD.bazel index cc73dee179..0a693ec11e 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/typecheck/test/BUILD.bazel @@ -15,7 +15,7 @@ ts_library( "//packages/compiler-cli/src/ngtsc/testing", "//packages/compiler-cli/src/ngtsc/typecheck", "//packages/compiler-cli/src/ngtsc/util", - "@ngdeps//typescript", + "@npm//typescript", ], ) diff --git a/packages/compiler-cli/src/ngtsc/util/BUILD.bazel b/packages/compiler-cli/src/ngtsc/util/BUILD.bazel index 2ae5def318..ecf6afaafb 100644 --- a/packages/compiler-cli/src/ngtsc/util/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/util/BUILD.bazel @@ -10,7 +10,7 @@ ts_library( deps = [ "//packages:types", "//packages/compiler-cli/src/ngtsc/path", - "@ngdeps//@types/node", - "@ngdeps//typescript", + "@npm//@types/node", + "@npm//typescript", ], ) diff --git a/packages/compiler-cli/src/ngtsc/util/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/util/test/BUILD.bazel index 0aaa4f777c..dde23724a8 100644 --- a/packages/compiler-cli/src/ngtsc/util/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/util/test/BUILD.bazel @@ -12,7 +12,7 @@ ts_library( "//packages:types", "//packages/compiler-cli/src/ngtsc/testing", "//packages/compiler-cli/src/ngtsc/util", - "@ngdeps//typescript", + "@npm//typescript", ], ) diff --git a/packages/compiler-cli/test/BUILD.bazel b/packages/compiler-cli/test/BUILD.bazel index ede4cd1c4c..9f8a8cee66 100644 --- a/packages/compiler-cli/test/BUILD.bazel +++ b/packages/compiler-cli/test/BUILD.bazel @@ -18,7 +18,7 @@ ts_library( "//packages:types", "//packages/compiler", "//packages/compiler-cli", - "@ngdeps//typescript", + "@npm//typescript", ], ) @@ -33,7 +33,7 @@ ts_library( ":test_utils", "//packages/compiler", "//packages/compiler-cli", - "@ngdeps//typescript", + "@npm//typescript", ], ) @@ -53,7 +53,7 @@ jasmine_node_test( "//packages/common:npm_package", "//packages/core", "//tools/testing:node", - "@ngdeps//minimist", + "@npm//minimist", ], ) @@ -68,7 +68,7 @@ ts_library( ":test_utils", "//packages/compiler", "//packages/compiler-cli", - "@ngdeps//typescript", + "@npm//typescript", ], ) @@ -91,9 +91,9 @@ jasmine_node_test( ":ngc_lib", "//packages/core", "//tools/testing:node", - "@ngdeps//minimist", - "@ngdeps//rxjs", - "@ngdeps//tsickle", + "@npm//minimist", + "@npm//rxjs", + "@npm//tsickle", ], ) @@ -109,7 +109,7 @@ ts_library( "//packages/compiler", "//packages/compiler-cli", "//packages/private/testing", - "@ngdeps//typescript", + "@npm//typescript", ], ) @@ -138,7 +138,7 @@ ts_library( ":test_utils", "//packages/compiler", "//packages/compiler-cli", - "@ngdeps//typescript", + "@npm//typescript", ], ) diff --git a/packages/compiler-cli/test/compliance/BUILD.bazel b/packages/compiler-cli/test/compliance/BUILD.bazel index 66ec58e13c..56cc452d63 100644 --- a/packages/compiler-cli/test/compliance/BUILD.bazel +++ b/packages/compiler-cli/test/compliance/BUILD.bazel @@ -11,7 +11,7 @@ ts_library( "//packages/compiler", "//packages/compiler-cli", "//packages/compiler/test:test_utils", - "@ngdeps//typescript", + "@npm//typescript", ], ) diff --git a/packages/compiler-cli/test/diagnostics/BUILD.bazel b/packages/compiler-cli/test/diagnostics/BUILD.bazel index 19eb83b305..65fab5a496 100644 --- a/packages/compiler-cli/test/diagnostics/BUILD.bazel +++ b/packages/compiler-cli/test/diagnostics/BUILD.bazel @@ -12,7 +12,7 @@ ts_library( "//packages/compiler-cli", "//packages/compiler-cli/test:test_utils", "//packages/core", - "@ngdeps//typescript", + "@npm//typescript", ], ) @@ -25,7 +25,7 @@ ts_library( ":mocks", "//packages/compiler-cli", "//packages/compiler-cli/test:test_utils", - "@ngdeps//typescript", + "@npm//typescript", ], ) @@ -60,7 +60,7 @@ ts_library( "//packages/compiler-cli", "//packages/compiler-cli/test:test_utils", "//packages/language-service", - "@ngdeps//typescript", + "@npm//typescript", ], ) @@ -96,7 +96,7 @@ ts_library( "//packages/compiler-cli/test:test_utils", "//packages/compiler/test:test_utils", "//packages/language-service", - "@ngdeps//typescript", + "@npm//typescript", ], ) diff --git a/packages/compiler-cli/test/metadata/BUILD.bazel b/packages/compiler-cli/test/metadata/BUILD.bazel index ea274a7571..8fe58d3d1e 100644 --- a/packages/compiler-cli/test/metadata/BUILD.bazel +++ b/packages/compiler-cli/test/metadata/BUILD.bazel @@ -10,7 +10,7 @@ ts_library( "//packages/compiler-cli", "//packages/compiler-cli/test:test_utils", "//packages/core", - "@ngdeps//typescript", + "@npm//typescript", ], ) diff --git a/packages/compiler-cli/test/ngcc/BUILD.bazel b/packages/compiler-cli/test/ngcc/BUILD.bazel index c18e086dae..6409276bc9 100644 --- a/packages/compiler-cli/test/ngcc/BUILD.bazel +++ b/packages/compiler-cli/test/ngcc/BUILD.bazel @@ -10,7 +10,7 @@ ts_library( deps = [ "//packages/compiler-cli/src/ngcc", "//packages/compiler-cli/test:test_utils", - "@ngdeps//@types/mock-fs", + "@npm//@types/mock-fs", ], ) @@ -24,10 +24,10 @@ jasmine_node_test( deps = [ ":ngcc_lib", "//tools/testing:node_no_angular", - "@ngdeps//@types/mock-fs", - "@ngdeps//canonical-path", - "@ngdeps//convert-source-map", - "@ngdeps//shelljs", - "@ngdeps//yargs", + "@npm//@types/mock-fs", + "@npm//canonical-path", + "@npm//convert-source-map", + "@npm//shelljs", + "@npm//yargs", ], ) diff --git a/packages/compiler-cli/test/ngtsc/BUILD.bazel b/packages/compiler-cli/test/ngtsc/BUILD.bazel index 23900a055c..880234345e 100644 --- a/packages/compiler-cli/test/ngtsc/BUILD.bazel +++ b/packages/compiler-cli/test/ngtsc/BUILD.bazel @@ -10,9 +10,9 @@ ts_library( "//packages/compiler-cli/src/ngtsc/routing", "//packages/compiler-cli/src/ngtsc/util", "//packages/compiler-cli/test:test_utils", - "@ngdeps//@types/source-map", - "@ngdeps//source-map", - "@ngdeps//typescript", + "@npm//@types/source-map", + "@npm//source-map", + "@npm//typescript", ], ) @@ -25,6 +25,6 @@ jasmine_node_test( deps = [ ":ngtsc_lib", "//tools/testing:node_no_angular", - "@ngdeps//minimist", + "@npm//minimist", ], ) diff --git a/packages/compiler-cli/test/test_support.ts b/packages/compiler-cli/test/test_support.ts index 8322b8b1d3..b033097299 100644 --- a/packages/compiler-cli/test/test_support.ts +++ b/packages/compiler-cli/test/test_support.ts @@ -126,7 +126,7 @@ export function setupBazelTo(tmpDirPath: string) { ({pkgPath, name}) => { fs.symlinkSync(pkgPath, path.join(angularDirectory, name), 'dir'); }); // Link typescript - const typeScriptSource = resolveNpmTreeArtifact('ngdeps/node_modules/typescript'); + const typeScriptSource = resolveNpmTreeArtifact('npm/node_modules/typescript'); const typescriptDest = path.join(nodeModulesPath, 'typescript'); fs.symlinkSync(typeScriptSource, typescriptDest, 'dir'); diff --git a/packages/compiler-cli/test/transformers/BUILD.bazel b/packages/compiler-cli/test/transformers/BUILD.bazel index b4435f7c59..8c9b603f4f 100644 --- a/packages/compiler-cli/test/transformers/BUILD.bazel +++ b/packages/compiler-cli/test/transformers/BUILD.bazel @@ -12,7 +12,7 @@ ts_library( "//packages/compiler/test:test_utils", "//packages/core", "//packages/platform-browser", - "@ngdeps//typescript", + "@npm//typescript", ], ) @@ -34,6 +34,6 @@ jasmine_node_test( ":test_lib", "//packages/core", "//tools/testing:node", - "@ngdeps//source-map", + "@npm//source-map", ], ) diff --git a/packages/compiler/test/BUILD.bazel b/packages/compiler/test/BUILD.bazel index 75c16aac68..005800ee6e 100644 --- a/packages/compiler/test/BUILD.bazel +++ b/packages/compiler/test/BUILD.bazel @@ -22,7 +22,7 @@ ts_library( "//packages:types", "//packages/compiler", "//packages/compiler-cli", - "@ngdeps//typescript", + "@npm//typescript", ], ) @@ -64,7 +64,7 @@ ts_library( "//packages/compiler/test/expression_parser/utils", "//packages/compiler/testing", "//packages/core", - "@ngdeps//typescript", + "@npm//typescript", ], ) @@ -85,8 +85,8 @@ jasmine_node_test( ":test_node_only_lib", "//packages/core", "//tools/testing:node", - "@ngdeps//base64-js", - "@ngdeps//source-map", + "@npm//base64-js", + "@npm//source-map", ], ) diff --git a/packages/compiler/testing/BUILD.bazel b/packages/compiler/testing/BUILD.bazel index 188ec1260c..e0fe802fde 100644 --- a/packages/compiler/testing/BUILD.bazel +++ b/packages/compiler/testing/BUILD.bazel @@ -14,6 +14,6 @@ ng_module( "//packages:types", "//packages/compiler", "//packages/core", - "@ngdeps//@types/node", + "@npm//@types/node", ], ) diff --git a/packages/core/BUILD.bazel b/packages/core/BUILD.bazel index 193bdf0cf5..1fcc01021e 100644 --- a/packages/core/BUILD.bazel +++ b/packages/core/BUILD.bazel @@ -17,8 +17,8 @@ ng_module( "//packages/core/src/interface", "//packages/core/src/reflection", "//packages/core/src/util", - "@ngdeps//rxjs", - "@ngdeps//zone.js", + "@npm//rxjs", + "@npm//zone.js", ], ) diff --git a/packages/core/src/di/interface/BUILD.bazel b/packages/core/src/di/interface/BUILD.bazel index c27b5da5f0..787db340e9 100644 --- a/packages/core/src/di/interface/BUILD.bazel +++ b/packages/core/src/di/interface/BUILD.bazel @@ -15,6 +15,6 @@ ts_library( deps = [ "//packages/core/src/interface", "//packages/core/src/util", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/core/src/util/BUILD.bazel b/packages/core/src/util/BUILD.bazel index f1752340de..982244b765 100644 --- a/packages/core/src/util/BUILD.bazel +++ b/packages/core/src/util/BUILD.bazel @@ -14,6 +14,6 @@ ts_library( ), deps = [ "//packages/core/src/interface", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/core/test/BUILD.bazel b/packages/core/test/BUILD.bazel index c14aad99c1..99fa8a82cc 100644 --- a/packages/core/test/BUILD.bazel +++ b/packages/core/test/BUILD.bazel @@ -33,8 +33,8 @@ ts_library( "//packages/private/testing", "//packages/router", "//packages/router/testing", - "@ngdeps//rxjs", - "@ngdeps//zone.js", + "@npm//rxjs", + "@npm//zone.js", ], ) @@ -64,9 +64,9 @@ jasmine_node_test( "//packages/platform-server", "//packages/platform-server/testing", "//tools/testing:node", - "@ngdeps//base64-js", - "@ngdeps//source-map", - "@ngdeps//zone.js", + "@npm//base64-js", + "@npm//source-map", + "@npm//zone.js", ], ) diff --git a/packages/core/test/acceptance/BUILD.bazel b/packages/core/test/acceptance/BUILD.bazel index 6ef8cb8dd6..997be2d82b 100644 --- a/packages/core/test/acceptance/BUILD.bazel +++ b/packages/core/test/acceptance/BUILD.bazel @@ -18,7 +18,7 @@ ts_library( "//packages/platform-browser-dynamic", "//packages/platform-browser/testing", "//packages/private/testing", - "@ngdeps//zone.js", + "@npm//zone.js", ], ) @@ -28,8 +28,8 @@ jasmine_node_test( deps = [ ":acceptance_lib", "//tools/testing:node", - "@ngdeps//base64-js", - "@ngdeps//source-map", - "@ngdeps//zone.js", + "@npm//base64-js", + "@npm//source-map", + "@npm//zone.js", ], ) diff --git a/packages/core/test/bundling/animation_world/BUILD.bazel b/packages/core/test/bundling/animation_world/BUILD.bazel index f895027191..cb29e0f7a9 100644 --- a/packages/core/test/bundling/animation_world/BUILD.bazel +++ b/packages/core/test/bundling/animation_world/BUILD.bazel @@ -32,7 +32,7 @@ ng_rollup_bundle( deps = [ ":animation_world", "//packages/core", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/core/test/bundling/cyclic_import/BUILD.bazel b/packages/core/test/bundling/cyclic_import/BUILD.bazel index b489b4e32c..792c16e7a8 100644 --- a/packages/core/test/bundling/cyclic_import/BUILD.bazel +++ b/packages/core/test/bundling/cyclic_import/BUILD.bazel @@ -33,7 +33,7 @@ ng_rollup_bundle( deps = [ ":cyclic_import", "//packages/core", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/core/test/bundling/hello_world/BUILD.bazel b/packages/core/test/bundling/hello_world/BUILD.bazel index 4a48c199b4..7e103895a0 100644 --- a/packages/core/test/bundling/hello_world/BUILD.bazel +++ b/packages/core/test/bundling/hello_world/BUILD.bazel @@ -30,7 +30,7 @@ ng_rollup_bundle( deps = [ ":hello_world", "//packages/core", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/core/test/bundling/hello_world_i18n/BUILD.bazel b/packages/core/test/bundling/hello_world_i18n/BUILD.bazel index f0b7d00712..0624700f3e 100644 --- a/packages/core/test/bundling/hello_world_i18n/BUILD.bazel +++ b/packages/core/test/bundling/hello_world_i18n/BUILD.bazel @@ -24,7 +24,7 @@ ng_rollup_bundle( deps = [ ":hello_world_i18n", "//packages/core", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/core/test/bundling/hello_world_r2/BUILD.bazel b/packages/core/test/bundling/hello_world_r2/BUILD.bazel index 1601c9b57b..d539b93269 100644 --- a/packages/core/test/bundling/hello_world_r2/BUILD.bazel +++ b/packages/core/test/bundling/hello_world_r2/BUILD.bazel @@ -31,7 +31,7 @@ ng_rollup_bundle( ":hello_world", "//packages/core", "//packages/platform-browser", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/core/test/bundling/injection/BUILD.bazel b/packages/core/test/bundling/injection/BUILD.bazel index 8caa0a1f01..1b0453819c 100644 --- a/packages/core/test/bundling/injection/BUILD.bazel +++ b/packages/core/test/bundling/injection/BUILD.bazel @@ -32,7 +32,7 @@ ng_rollup_bundle( deps = [ ":injection", "//packages/core", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/core/test/bundling/todo/BUILD.bazel b/packages/core/test/bundling/todo/BUILD.bazel index eb60ff4618..b4450dfdc9 100644 --- a/packages/core/test/bundling/todo/BUILD.bazel +++ b/packages/core/test/bundling/todo/BUILD.bazel @@ -3,7 +3,7 @@ package(default_visibility = ["//visibility:public"]) load("//tools:defaults.bzl", "jasmine_node_test", "ng_module", "ng_rollup_bundle", "ts_library") load("//tools/symbol-extractor:index.bzl", "js_expected_symbol_test") load("@build_bazel_rules_nodejs//:defs.bzl", "http_server") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") ng_module( name = "todo", @@ -35,7 +35,7 @@ ng_rollup_bundle( "//packages/common", "//packages/core", "//packages/core/test/bundling/util:reflect_metadata", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) @@ -82,7 +82,7 @@ js_expected_symbol_test( genrule( name = "tslib", srcs = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//node_modules/tslib:tslib.js", ], outs = [ "tslib.js", diff --git a/packages/core/test/bundling/todo_i18n/BUILD.bazel b/packages/core/test/bundling/todo_i18n/BUILD.bazel index 94da2d7409..0d04699423 100644 --- a/packages/core/test/bundling/todo_i18n/BUILD.bazel +++ b/packages/core/test/bundling/todo_i18n/BUILD.bazel @@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"]) load("//tools:defaults.bzl", "jasmine_node_test", "ng_module", "ng_rollup_bundle", "ts_library") load("@build_bazel_rules_nodejs//:defs.bzl", "http_server") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") ng_module( name = "todo_i18n", @@ -37,7 +37,7 @@ ng_rollup_bundle( "//packages/common", "//packages/core", "//packages/core/test/bundling/util:reflect_metadata", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) @@ -74,7 +74,7 @@ jasmine_node_test( genrule( name = "tslib", srcs = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//node_modules/tslib:tslib.js", ], outs = [ "tslib.js", diff --git a/packages/core/test/bundling/todo_r2/BUILD.bazel b/packages/core/test/bundling/todo_r2/BUILD.bazel index 3eeed75691..cecb46625f 100644 --- a/packages/core/test/bundling/todo_r2/BUILD.bazel +++ b/packages/core/test/bundling/todo_r2/BUILD.bazel @@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"]) load("//tools:defaults.bzl", "jasmine_node_test", "ng_module", "ng_rollup_bundle", "ts_library") load("@build_bazel_rules_nodejs//:defs.bzl", "http_server") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") ng_module( name = "todo", @@ -38,7 +38,7 @@ ng_rollup_bundle( "//packages/core/test/bundling/util:reflect_metadata", "//packages/platform-browser", "//packages/platform-browser-dynamic", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) @@ -77,7 +77,7 @@ jasmine_node_test( genrule( name = "tslib", srcs = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//node_modules/tslib:tslib.js", ], outs = [ "tslib.js", diff --git a/packages/core/test/bundling/util/BUILD.bazel b/packages/core/test/bundling/util/BUILD.bazel index c596830d96..33e77aff59 100644 --- a/packages/core/test/bundling/util/BUILD.bazel +++ b/packages/core/test/bundling/util/BUILD.bazel @@ -12,7 +12,7 @@ ts_library( ":metadata_switch", ], module_name = "@angular/core/test/bundling/util/src/reflect_metadata", - deps = ["@ngdeps//reflect-metadata"], + deps = ["@npm//reflect-metadata"], ) # See packages/core/BUILD.bazel. diff --git a/packages/core/test/render3/BUILD.bazel b/packages/core/test/render3/BUILD.bazel index 0cd5a39ce6..2d769b430e 100644 --- a/packages/core/test/render3/BUILD.bazel +++ b/packages/core/test/render3/BUILD.bazel @@ -30,7 +30,7 @@ ts_library( "//packages/platform-browser/animations", "//packages/platform-browser/testing", "//packages/private/testing", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) @@ -45,7 +45,7 @@ ts_library( "//packages/compiler", "//packages/platform-browser", "//packages/platform-server", - "@ngdeps//zone.js", + "@npm//zone.js", ], ) @@ -66,7 +66,7 @@ jasmine_node_test( ], deps = [ ":render3_node_lib", - "@ngdeps//zone.js", + "@npm//zone.js", ], ) diff --git a/packages/core/testing/BUILD.bazel b/packages/core/testing/BUILD.bazel index 774fd2ad42..8009d9f276 100644 --- a/packages/core/testing/BUILD.bazel +++ b/packages/core/testing/BUILD.bazel @@ -13,7 +13,7 @@ ng_module( "//packages:types", "//packages/compiler", "//packages/core", - "@ngdeps//@types/jasmine", - "@ngdeps//zone.js", + "@npm//@types/jasmine", + "@npm//zone.js", ], ) diff --git a/packages/elements/BUILD.bazel b/packages/elements/BUILD.bazel index 30ab2b5ab3..63385d8636 100644 --- a/packages/elements/BUILD.bazel +++ b/packages/elements/BUILD.bazel @@ -14,7 +14,7 @@ ng_module( deps = [ "//packages/core", "//packages/platform-browser", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/elements/schematics/ng-add/BUILD.bazel b/packages/elements/schematics/ng-add/BUILD.bazel index c7825948bd..bc961159c8 100644 --- a/packages/elements/schematics/ng-add/BUILD.bazel +++ b/packages/elements/schematics/ng-add/BUILD.bazel @@ -12,8 +12,8 @@ ts_library( deps = [ "//packages/common", "//packages/core", - "@ngdeps//@angular-devkit/schematics", - "@ngdeps//rxjs", + "@npm//@angular-devkit/schematics", + "@npm//rxjs", ], ) @@ -27,8 +27,8 @@ ts_library( ":ng-add", "//packages/common", "//packages/core", - "@ngdeps//@angular-devkit/schematics", - "@ngdeps//rxjs", + "@npm//@angular-devkit/schematics", + "@npm//rxjs", ], ) @@ -37,6 +37,6 @@ jasmine_node_test( deps = [ ":test_lib", "//packages/elements/schematics:collection", - "@ngdeps//@schematics/angular", + "@npm//@schematics/angular", ], ) diff --git a/packages/elements/test/BUILD.bazel b/packages/elements/test/BUILD.bazel index 71bea73873..0749710747 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", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) @@ -23,10 +23,10 @@ filegroup( testonly = True, # do not sort srcs = [ - "@ngdeps//node_modules/@webcomponents/custom-elements:src/native-shim.js", - "@ngdeps//node_modules/reflect-metadata:Reflect.js", - "@ngdeps//node_modules/zone.js:dist/zone.js", - "@ngdeps//node_modules/zone.js:dist/zone-testing.js", + "@npm//node_modules/@webcomponents/custom-elements:src/native-shim.js", + "@npm//node_modules/reflect-metadata:Reflect.js", + "@npm//node_modules/zone.js:dist/zone.js", + "@npm//node_modules/zone.js:dist/zone-testing.js", ], ) diff --git a/packages/examples/common/BUILD.bazel b/packages/examples/common/BUILD.bazel index ce56d77001..ac61a89f2e 100644 --- a/packages/examples/common/BUILD.bazel +++ b/packages/examples/common/BUILD.bazel @@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"]) load("//packages/bazel:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ts_library") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") ng_module( name = "common_examples", @@ -18,7 +18,7 @@ ng_module( "//packages/platform-browser", "//packages/platform-browser-dynamic", "//packages/router", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) @@ -30,8 +30,8 @@ ts_library( deps = [ "//packages/examples/test-utils", "//packages/private/testing", - "@ngdeps//@types/jasminewd2", - "@ngdeps//protractor", + "@npm//@types/jasminewd2", + "@npm//protractor", ], ) @@ -41,14 +41,14 @@ ts_devserver( index_html = "//packages/examples:index.html", port = 4200, scripts = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//node_modules/tslib:tslib.js", "//tools/rxjs:rxjs_umd_modules", ], static_files = [ - "@ngdeps//node_modules/zone.js:dist/zone.js", + "@npm//node_modules/zone.js:dist/zone.js", # This is needed because the "ngComponentOutlet" test uses the JIT compiler # and needs to be able to read metadata at runtime. - "@ngdeps//node_modules/reflect-metadata:Reflect.js", + "@npm//node_modules/reflect-metadata:Reflect.js", ], deps = [":common_examples"], ) @@ -60,7 +60,7 @@ protractor_web_test_suite( server = ":devserver", deps = [ ":common_tests_lib", - "@ngdeps//protractor", - "@ngdeps//selenium-webdriver", + "@npm//protractor", + "@npm//selenium-webdriver", ], ) diff --git a/packages/examples/core/BUILD.bazel b/packages/examples/core/BUILD.bazel index 99db5fcec3..81507b154c 100644 --- a/packages/examples/core/BUILD.bazel +++ b/packages/examples/core/BUILD.bazel @@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"]) load("//packages/bazel:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "jasmine_node_test", "ng_module", "ts_library") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") ng_module( name = "core_examples", @@ -22,7 +22,7 @@ ng_module( "//packages/platform-browser-dynamic", "//packages/platform-browser/animations", "//packages/router", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) @@ -46,8 +46,8 @@ ts_library( tsconfig = "//packages/examples:tsconfig-e2e.json", deps = [ "//packages/examples/test-utils", - "@ngdeps//@types/jasminewd2", - "@ngdeps//protractor", + "@npm//@types/jasminewd2", + "@npm//protractor", ], ) @@ -57,12 +57,12 @@ ts_devserver( index_html = "//packages/examples:index.html", port = 4200, scripts = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//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", + "@npm//node_modules/zone.js:dist/zone.js", + "@npm//node_modules/zone.js:dist/task-tracking.js", ], deps = [":core_examples"], ) @@ -74,8 +74,8 @@ protractor_web_test_suite( server = ":devserver", deps = [ ":core_e2e_tests_lib", - "@ngdeps//protractor", - "@ngdeps//selenium-webdriver", + "@npm//protractor", + "@npm//selenium-webdriver", ], ) diff --git a/packages/examples/core/testing/ts/BUILD.bazel b/packages/examples/core/testing/ts/BUILD.bazel index 2fe7a63b68..cbfb89fcca 100644 --- a/packages/examples/core/testing/ts/BUILD.bazel +++ b/packages/examples/core/testing/ts/BUILD.bazel @@ -8,8 +8,8 @@ ts_library( ], deps = [ "//packages/core/testing", - "@ngdeps//@types/jasmine", - "@ngdeps//@types/node", + "@npm//@types/jasmine", + "@npm//@types/node", ], ) diff --git a/packages/examples/forms/BUILD.bazel b/packages/examples/forms/BUILD.bazel index ca51c39d24..7d602a4b1b 100644 --- a/packages/examples/forms/BUILD.bazel +++ b/packages/examples/forms/BUILD.bazel @@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"]) load("//packages/bazel:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ts_library") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") ng_module( name = "forms_examples", @@ -18,7 +18,7 @@ ng_module( "//packages/platform-browser", "//packages/platform-browser-dynamic", "//packages/router", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) @@ -30,8 +30,8 @@ ts_library( deps = [ "//packages/examples/test-utils", "//packages/private/testing", - "@ngdeps//@types/jasminewd2", - "@ngdeps//protractor", + "@npm//@types/jasminewd2", + "@npm//protractor", ], ) @@ -41,11 +41,11 @@ ts_devserver( index_html = "//packages/examples:index.html", port = 4200, scripts = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//node_modules/tslib:tslib.js", "//tools/rxjs:rxjs_umd_modules", ], static_files = [ - "@ngdeps//node_modules/zone.js:dist/zone.js", + "@npm//node_modules/zone.js:dist/zone.js", ], deps = [":forms_examples"], ) @@ -57,7 +57,7 @@ protractor_web_test_suite( server = ":devserver", deps = [ ":forms_e2e_tests_lib", - "@ngdeps//protractor", - "@ngdeps//selenium-webdriver", + "@npm//protractor", + "@npm//selenium-webdriver", ], ) diff --git a/packages/examples/test-utils/BUILD.bazel b/packages/examples/test-utils/BUILD.bazel index be2496ecae..87dae5608e 100644 --- a/packages/examples/test-utils/BUILD.bazel +++ b/packages/examples/test-utils/BUILD.bazel @@ -6,6 +6,6 @@ ts_library( name = "test-utils", srcs = ["index.ts"], deps = [ - "@ngdeps//@types/selenium-webdriver", + "@npm//@types/selenium-webdriver", ], ) diff --git a/packages/examples/testing/BUILD.bazel b/packages/examples/testing/BUILD.bazel index 00d2cae68d..887da4b1bb 100644 --- a/packages/examples/testing/BUILD.bazel +++ b/packages/examples/testing/BUILD.bazel @@ -7,7 +7,7 @@ ts_library( srcs = glob(["**/*.ts"]), tsconfig = "//packages:tsconfig-test", deps = [ - "@ngdeps//@types/jasmine", - "@ngdeps//@types/node", + "@npm//@types/jasmine", + "@npm//@types/node", ], ) diff --git a/packages/examples/upgrade/upgrade_example.bzl b/packages/examples/upgrade/upgrade_example.bzl index 471ef32bdd..ad1b2c2151 100644 --- a/packages/examples/upgrade/upgrade_example.bzl +++ b/packages/examples/upgrade/upgrade_example.bzl @@ -1,6 +1,6 @@ load("//packages/bazel:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ts_library") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:index.bzl", "ts_devserver") """ Macro that can be used to create the Bazel targets for an "upgrade" example. Since the @@ -16,7 +16,7 @@ def create_upgrade_example_targets(name, srcs, e2e_srcs, entry_module, assets = # TODO: FW-1004 Type checking is currently not complete. type_check = False, deps = [ - "@ngdeps//@types/angular", + "@npm//@types/angular", "//packages/core", "//packages/platform-browser", "//packages/platform-browser-dynamic", @@ -30,8 +30,8 @@ def create_upgrade_example_targets(name, srcs, e2e_srcs, entry_module, assets = srcs = e2e_srcs, testonly = True, deps = [ - "@ngdeps//@types/jasminewd2", - "@ngdeps//protractor", + "@npm//@types/jasminewd2", + "@npm//protractor", "//packages/examples/test-utils", "//packages/private/testing", ], @@ -43,13 +43,13 @@ def create_upgrade_example_targets(name, srcs, e2e_srcs, entry_module, assets = port = 4200, entry_module = entry_module, static_files = [ - "@ngdeps//node_modules/zone.js:dist/zone.js", - "@ngdeps//node_modules/angular:angular.js", - "@ngdeps//node_modules/reflect-metadata:Reflect.js", + "@npm//node_modules/zone.js:dist/zone.js", + "@npm//node_modules/angular:angular.js", + "@npm//node_modules/reflect-metadata:Reflect.js", ], index_html = "//packages/examples:index.html", scripts = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//node_modules/tslib:tslib.js", "//tools/rxjs:rxjs_umd_modules", ], deps = [":%s_sources" % name], @@ -63,7 +63,7 @@ def create_upgrade_example_targets(name, srcs, e2e_srcs, entry_module, assets = server = ":devserver", deps = [ ":%s_e2e_lib" % name, - "@ngdeps//protractor", - "@ngdeps//selenium-webdriver", + "@npm//protractor", + "@npm//selenium-webdriver", ], ) diff --git a/packages/forms/BUILD.bazel b/packages/forms/BUILD.bazel index ec38d66fd6..0991d31aff 100644 --- a/packages/forms/BUILD.bazel +++ b/packages/forms/BUILD.bazel @@ -13,7 +13,7 @@ ng_module( deps = [ "//packages/core", "//packages/platform-browser", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/forms/test/BUILD.bazel b/packages/forms/test/BUILD.bazel index 3a5d16fdba..4f7e0b9109 100644 --- a/packages/forms/test/BUILD.bazel +++ b/packages/forms/test/BUILD.bazel @@ -13,7 +13,7 @@ ts_library( "//packages/platform-browser", "//packages/platform-browser/testing", "//packages/private/testing", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/http/BUILD.bazel b/packages/http/BUILD.bazel index b43f975831..07a2745f80 100644 --- a/packages/http/BUILD.bazel +++ b/packages/http/BUILD.bazel @@ -14,7 +14,7 @@ ng_module( deps = [ "//packages/core", "//packages/platform-browser", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/http/test/BUILD.bazel b/packages/http/test/BUILD.bazel index df2af84980..3b398d41c6 100644 --- a/packages/http/test/BUILD.bazel +++ b/packages/http/test/BUILD.bazel @@ -13,7 +13,7 @@ ts_library( "//packages/http/testing", "//packages/platform-browser", "//packages/platform-browser/testing", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/http/testing/BUILD.bazel b/packages/http/testing/BUILD.bazel index b2cfc00ea5..8c157f123c 100644 --- a/packages/http/testing/BUILD.bazel +++ b/packages/http/testing/BUILD.bazel @@ -11,6 +11,6 @@ ng_module( deps = [ "//packages/core", "//packages/http", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/language-service/BUILD.bazel b/packages/language-service/BUILD.bazel index e1c9a382c9..eba37455db 100644 --- a/packages/language-service/BUILD.bazel +++ b/packages/language-service/BUILD.bazel @@ -15,8 +15,8 @@ ts_library( "//packages/compiler", "//packages/compiler-cli", "//packages/core", - "@ngdeps//@types/node", - "@ngdeps//typescript", + "@npm//@types/node", + "@npm//typescript", ], ) diff --git a/packages/language-service/bundles/BUILD.bazel b/packages/language-service/bundles/BUILD.bazel index 951be9ef5e..7206dcc92b 100644 --- a/packages/language-service/bundles/BUILD.bazel +++ b/packages/language-service/bundles/BUILD.bazel @@ -12,7 +12,7 @@ ls_rollup_bundle( visibility = ["//packages/language-service:__pkg__"], deps = [ "//packages/language-service", - "@ngdeps//rxjs", - "@ngdeps//tslib", + "@npm//rxjs", + "@npm//tslib", ], ) diff --git a/packages/language-service/test/BUILD.bazel b/packages/language-service/test/BUILD.bazel index 7fbf945576..52501d9b0d 100644 --- a/packages/language-service/test/BUILD.bazel +++ b/packages/language-service/test/BUILD.bazel @@ -9,7 +9,7 @@ ts_library( "//packages/compiler", "//packages/compiler-cli/test:test_utils", "//packages/language-service", - "@ngdeps//typescript", + "@npm//typescript", ], ) diff --git a/packages/platform-browser/BUILD.bazel b/packages/platform-browser/BUILD.bazel index 35ceb82f5f..ee29582837 100644 --- a/packages/platform-browser/BUILD.bazel +++ b/packages/platform-browser/BUILD.bazel @@ -15,8 +15,8 @@ ng_module( "//packages:types", "//packages/common", "//packages/core", - "@ngdeps//@types/hammerjs", - "@ngdeps//zone.js", + "@npm//@types/hammerjs", + "@npm//zone.js", ], ) diff --git a/packages/platform-browser/animations/test/BUILD.bazel b/packages/platform-browser/animations/test/BUILD.bazel index 16f6b1ce91..384641faf2 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", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/platform-browser/test/BUILD.bazel b/packages/platform-browser/test/BUILD.bazel index ea5827ec4a..8d4a83d79a 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", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/platform-browser/testing/BUILD.bazel b/packages/platform-browser/testing/BUILD.bazel index 85ebed9b67..89367aafe0 100644 --- a/packages/platform-browser/testing/BUILD.bazel +++ b/packages/platform-browser/testing/BUILD.bazel @@ -12,7 +12,7 @@ ng_module( "//packages/core", "//packages/core/testing", "//packages/platform-browser", - "@ngdeps//@types/jasmine", - "@ngdeps//rxjs", + "@npm//@types/jasmine", + "@npm//rxjs", ], ) diff --git a/packages/platform-server/BUILD.bazel b/packages/platform-server/BUILD.bazel index b94304cc54..d3a9194f42 100644 --- a/packages/platform-server/BUILD.bazel +++ b/packages/platform-server/BUILD.bazel @@ -21,9 +21,9 @@ ng_module( "//packages/platform-browser", "//packages/platform-browser-dynamic", "//packages/platform-browser/animations", - "@ngdeps//@types/node", - "@ngdeps//rxjs", - "@ngdeps//zone.js", + "@npm//@types/node", + "@npm//rxjs", + "@npm//zone.js", ], ) diff --git a/packages/platform-server/test/BUILD.bazel b/packages/platform-server/test/BUILD.bazel index 263a5d47ee..c71f1377cd 100644 --- a/packages/platform-server/test/BUILD.bazel +++ b/packages/platform-server/test/BUILD.bazel @@ -18,7 +18,7 @@ ts_library( "//packages/platform-browser", "//packages/platform-server", "//packages/private/testing", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/platform-webworker/BUILD.bazel b/packages/platform-webworker/BUILD.bazel index d3a1057105..c98457f8f0 100644 --- a/packages/platform-webworker/BUILD.bazel +++ b/packages/platform-webworker/BUILD.bazel @@ -17,7 +17,7 @@ ng_module( "//packages/compiler", "//packages/core", "//packages/platform-browser", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/router/BUILD.bazel b/packages/router/BUILD.bazel index 97e0c52a3c..59ee3d3920 100644 --- a/packages/router/BUILD.bazel +++ b/packages/router/BUILD.bazel @@ -14,7 +14,7 @@ ng_module( "//packages/common", "//packages/core", "//packages/platform-browser", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/router/test/BUILD.bazel b/packages/router/test/BUILD.bazel index 49fcf3253d..b19f104576 100644 --- a/packages/router/test/BUILD.bazel +++ b/packages/router/test/BUILD.bazel @@ -17,7 +17,7 @@ ts_library( "//packages/private/testing", "//packages/router", "//packages/router/testing", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/router/test/aot_ngsummary_test/BUILD.bazel b/packages/router/test/aot_ngsummary_test/BUILD.bazel index 5a4b60bf49..7f8646ada7 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", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/router/testing/BUILD.bazel b/packages/router/testing/BUILD.bazel index 5061eeeec6..9e0b86acda 100644 --- a/packages/router/testing/BUILD.bazel +++ b/packages/router/testing/BUILD.bazel @@ -12,6 +12,6 @@ ng_module( "//packages/common/testing", "//packages/core", "//packages/router", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/service-worker/BUILD.bazel b/packages/service-worker/BUILD.bazel index 7eb0955228..3d5a85bdfe 100644 --- a/packages/service-worker/BUILD.bazel +++ b/packages/service-worker/BUILD.bazel @@ -14,7 +14,7 @@ ng_module( deps = [ "//packages/common", "//packages/core", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/service-worker/cli/BUILD.bazel b/packages/service-worker/cli/BUILD.bazel index ce2c48bee4..54b5e85e5e 100644 --- a/packages/service-worker/cli/BUILD.bazel +++ b/packages/service-worker/cli/BUILD.bazel @@ -10,7 +10,7 @@ ts_library( tsconfig = ":tsconfig.json", deps = [ "//packages/service-worker/config", - "@ngdeps//@types/node", + "@npm//@types/node", ], ) diff --git a/packages/service-worker/test/BUILD.bazel b/packages/service-worker/test/BUILD.bazel index 42831ca6be..05ee1eb951 100644 --- a/packages/service-worker/test/BUILD.bazel +++ b/packages/service-worker/test/BUILD.bazel @@ -12,7 +12,7 @@ ts_library( "//packages/service-worker/testing", "//packages/service-worker/worker", "//packages/service-worker/worker/testing", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/service-worker/testing/BUILD.bazel b/packages/service-worker/testing/BUILD.bazel index 25b06c37e3..629685fc32 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", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/service-worker/worker/BUILD.bazel b/packages/service-worker/worker/BUILD.bazel index c4ec4e90c6..136ffb2fad 100644 --- a/packages/service-worker/worker/BUILD.bazel +++ b/packages/service-worker/worker/BUILD.bazel @@ -12,7 +12,7 @@ ts_library( exclude = ["main.ts"], ), tsconfig = ":tsconfig.json", - deps = ["@ngdeps//@types/node"], + deps = ["@npm//@types/node"], ) ts_library( diff --git a/packages/service-worker/worker/testing/BUILD.bazel b/packages/service-worker/worker/testing/BUILD.bazel index 1c98b537da..47ceea0d7a 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", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/upgrade/BUILD.bazel b/packages/upgrade/BUILD.bazel index af9f35723a..5b15383918 100644 --- a/packages/upgrade/BUILD.bazel +++ b/packages/upgrade/BUILD.bazel @@ -16,7 +16,7 @@ ng_module( "//packages/core", "//packages/platform-browser", "//packages/platform-browser-dynamic", - "@ngdeps//zone.js", + "@npm//zone.js", ], ) diff --git a/packages/upgrade/test/BUILD.bazel b/packages/upgrade/test/BUILD.bazel index d36a265c91..48cc479d08 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", - "@ngdeps//rxjs", + "@npm//rxjs", ], ) diff --git a/packages/upgrade/test/common/test_helpers.ts b/packages/upgrade/test/common/test_helpers.ts index 8ee147d91d..2880e6f9b6 100644 --- a/packages/upgrade/test/common/test_helpers.ts +++ b/packages/upgrade/test/common/test_helpers.ts @@ -89,7 +89,7 @@ export function createWithEachNg1VersionFn(setNg1: typeof setAngularJSGlobal) { document.body.removeChild(script); resolve(); }; - script.src = `base/ngdeps/node_modules/${file}`; + script.src = `base/npm/node_modules/${file}`; document.body.appendChild(script); })), Promise.resolve()) diff --git a/tools/BUILD.bazel b/tools/BUILD.bazel index 83e4953fa9..85fb872a35 100644 --- a/tools/BUILD.bazel +++ b/tools/BUILD.bazel @@ -1,6 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("@npm_bazel_typescript//:defs.bzl", "ts_config") +load("@npm_bazel_typescript//:index.bzl", "ts_config") exports_files([ "tsconfig.json", diff --git a/tools/defaults.bzl b/tools/defaults.bzl index 776cd8c555..846dcd4c86 100644 --- a/tools/defaults.bzl +++ b/tools/defaults.bzl @@ -2,15 +2,13 @@ load("@build_bazel_rules_nodejs//:defs.bzl", _nodejs_binary = "nodejs_binary", _npm_package = "npm_package") load("@npm_bazel_jasmine//:index.bzl", _jasmine_node_test = "jasmine_node_test") -load("@npm_bazel_karma//:defs.bzl", _karma_web_test = "karma_web_test", _karma_web_test_suite = "karma_web_test_suite", _ts_web_test = "ts_web_test", _ts_web_test_suite = "ts_web_test_suite") -load("@npm_bazel_typescript//:defs.bzl", _ts_library = "ts_library") +load("@npm_bazel_karma//:index.bzl", _karma_web_test = "karma_web_test", _karma_web_test_suite = "karma_web_test_suite", _ts_web_test = "ts_web_test", _ts_web_test_suite = "ts_web_test_suite") +load("@npm_bazel_typescript//:index.bzl", _ts_library = "ts_library") load("//packages/bazel:index.bzl", _ng_module = "ng_module", _ng_package = "ng_package") load("//packages/bazel/src:ng_rollup_bundle.bzl", _ng_rollup_bundle = "ng_rollup_bundle") _DEFAULT_TSCONFIG_BUILD = "//packages:tsconfig-build.json" _DEFAULT_TSCONFIG_TEST = "//packages:tsconfig-test" -_DEFAULT_TS_TYPINGS = "@ngdeps//typescript:typescript__typings" -_DEFAULT_KARMA_BIN = "@ngdeps//@bazel/karma/bin:karma" _INTERNAL_NG_MODULE_COMPILER = "//packages/bazel/src/ngc-wrapped" _INTERNAL_NG_MODULE_XI18N = "//packages/bazel/src/ngc-wrapped:xi18n" _INTERNAL_NG_PACKAGER_PACKAGER = "//packages/bazel/src/ng_package:packager" @@ -79,11 +77,11 @@ def _default_module_name(testonly): def ts_library(tsconfig = None, testonly = False, deps = [], module_name = None, **kwargs): """Default values for ts_library""" - deps = deps + ["@ngdeps//tslib"] + deps = deps + ["@npm//tslib"] if testonly: # Match the types[] in //packages:tsconfig-test.json - deps.append("@ngdeps//@types/jasmine") - deps.append("@ngdeps//@types/node") + deps.append("@npm//@types/jasmine") + deps.append("@npm//@types/node") if not tsconfig: if testonly: tsconfig = _DEFAULT_TSCONFIG_TEST @@ -97,18 +95,17 @@ def ts_library(tsconfig = None, testonly = False, deps = [], module_name = None, tsconfig = tsconfig, testonly = testonly, deps = deps, - node_modules = _DEFAULT_TS_TYPINGS, module_name = module_name, **kwargs ) def ng_module(name, tsconfig = None, entry_point = None, testonly = False, deps = [], module_name = None, **kwargs): """Default values for ng_module""" - deps = deps + ["@ngdeps//tslib"] + deps = deps + ["@npm//tslib"] if testonly: # Match the types[] in //packages:tsconfig-test.json - deps.append("@ngdeps//@types/jasmine") - deps.append("@ngdeps//@types/node") + deps.append("@npm//@types/jasmine") + deps.append("@npm//@types/node") if not tsconfig: if testonly: tsconfig = _DEFAULT_TSCONFIG_TEST @@ -127,7 +124,6 @@ def ng_module(name, tsconfig = None, entry_point = None, testonly = False, deps deps = deps, compiler = _INTERNAL_NG_MODULE_COMPILER, ng_xi18n = _INTERNAL_NG_MODULE_XI18N, - node_modules = _DEFAULT_TS_TYPINGS, module_name = module_name, **kwargs ) @@ -139,7 +135,7 @@ def ng_package(name, readme_md = None, license_banner = None, deps = [], **kwarg if not license_banner: license_banner = "//packages:license-banner.txt" deps = deps + [ - "@ngdeps//tslib", + "@npm//tslib", ] _ng_package( @@ -165,7 +161,7 @@ def ts_web_test(bootstrap = [], deps = [], runtime_deps = [], **kwargs): if not bootstrap: bootstrap = ["//:web_test_bootstrap_scripts"] local_deps = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//node_modules/tslib:tslib.js", "//tools/rxjs:rxjs_umd_modules", ] + deps local_runtime_deps = [ @@ -176,7 +172,6 @@ def ts_web_test(bootstrap = [], deps = [], runtime_deps = [], **kwargs): runtime_deps = local_runtime_deps, bootstrap = bootstrap, deps = local_deps, - karma = _DEFAULT_KARMA_BIN, **kwargs ) @@ -185,7 +180,7 @@ def ts_web_test_suite(bootstrap = [], deps = [], runtime_deps = [], **kwargs): if not bootstrap: bootstrap = ["//:web_test_bootstrap_scripts"] local_deps = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//node_modules/tslib:tslib.js", "//tools/rxjs:rxjs_umd_modules", ] + deps local_runtime_deps = [ @@ -196,7 +191,6 @@ def ts_web_test_suite(bootstrap = [], deps = [], runtime_deps = [], **kwargs): runtime_deps = local_runtime_deps, bootstrap = bootstrap, deps = local_deps, - karma = _DEFAULT_KARMA_BIN, # Run unit tests on local Chromium by default. # You can exclude tests based on tags, e.g. to skip Firefox testing, # `yarn bazel test --test_tag_filters=-browser:firefox-local [targets]` @@ -216,8 +210,8 @@ def karma_web_test(bootstrap = [], deps = [], data = [], runtime_deps = [], **kw if not bootstrap: bootstrap = ["//:web_test_bootstrap_scripts"] local_deps = [ - "@ngdeps//karma-browserstack-launcher", - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//karma-browserstack-launcher", + "@npm//node_modules/tslib:tslib.js", "//tools/rxjs:rxjs_umd_modules", ] + deps local_runtime_deps = [ @@ -229,7 +223,6 @@ def karma_web_test(bootstrap = [], deps = [], data = [], runtime_deps = [], **kw bootstrap = bootstrap, config_file = "//:karma-js.conf.js", deps = local_deps, - karma = _DEFAULT_KARMA_BIN, data = data + [ "//:browser-providers.conf.js", "//tools:jasmine-seed-generator.js", @@ -243,14 +236,13 @@ def karma_web_test_suite(bootstrap = [], deps = [], **kwargs): if not bootstrap: bootstrap = ["//:web_test_bootstrap_scripts"] local_deps = [ - "@ngdeps//node_modules/tslib:tslib.js", + "@npm//node_modules/tslib:tslib.js", "//tools/rxjs:rxjs_umd_modules", ] + deps _karma_web_test_suite( bootstrap = bootstrap, deps = local_deps, - karma = _DEFAULT_KARMA_BIN, # Run unit tests on local Chromium by default. # You can exclude tests based on tags, e.g. to skip Firefox testing, # `yarn bazel test --test_tag_filters=-browser:firefox-local [targets]` @@ -270,7 +262,7 @@ def nodejs_binary(data = [], **kwargs): _nodejs_binary( # Pass-thru --define=compile=foo as an environment variable configuration_env_vars = ["compile"], - data = data + ["@ngdeps//source-map-support"], + data = data + ["@npm//source-map-support"], **kwargs ) @@ -278,28 +270,28 @@ def jasmine_node_test(deps = [], **kwargs): """Default values for jasmine_node_test""" deps = deps + [ # Very common dependencies for tests - "@ngdeps//chokidar", - "@ngdeps//domino", - "@ngdeps//jasmine-core", - "@ngdeps//mock-fs", - "@ngdeps//reflect-metadata", - "@ngdeps//source-map-support", - "@ngdeps//tslib", - "@ngdeps//xhr2", + "@npm//chokidar", + "@npm//domino", + "@npm//jasmine-core", + "@npm//mock-fs", + "@npm//reflect-metadata", + "@npm//source-map-support", + "@npm//tslib", + "@npm//xhr2", ] _jasmine_node_test( deps = deps, # Pass-thru --define=compile=foo as an environment variable configuration_env_vars = ["compile"], - jasmine = "@ngdeps//jasmine", + jasmine = "@npm//jasmine", **kwargs ) def ng_rollup_bundle(deps = [], **kwargs): """Default values for ng_rollup_bundle""" deps = deps + [ - "@ngdeps//tslib", - "@ngdeps//reflect-metadata", + "@npm//tslib", + "@npm//reflect-metadata", ] _ng_rollup_bundle( deps = deps, diff --git a/tools/ng_setup_workspace.bzl b/tools/ng_setup_workspace.bzl deleted file mode 100644 index 259c96af1a..0000000000 --- a/tools/ng_setup_workspace.bzl +++ /dev/null @@ -1,46 +0,0 @@ -# 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 - -"Install angular source dependencies" - -load("@angular//packages/bazel/src:ng_setup_workspace.bzl", _ng_setup_workspace = "ng_setup_workspace") -load("@build_bazel_rules_nodejs//:defs.bzl", "yarn_install") -load("@build_bazel_rules_nodejs//:package.bzl", "check_rules_nodejs_version") - -def ng_setup_workspace(): - """This repository rule should be called from your WORKSPACE file. - - It creates some additional Bazel external repositories that are used internally - to build angular - """ - - # The NodeJS rules version must be at least v0.15.3 because: - # - 0.15.2 Re-introduced the prod_only attribute on yarn_install - # - 0.15.3 Includes a fix for the `jasmine_node_test` rule ignoring target tags - # - 0.16.8 Supports npm installed bazel workspaces - check_rules_nodejs_version("0.16.8") - - yarn_install( - name = "ngdeps", - package_json = "@angular//:package.json", - yarn_lock = "@angular//:yarn.lock", - data = ["@angular//:tools/yarn/check-yarn.js", "@angular//:tools/postinstall-patches.js"], - # Don't install devDependencies, they are large and not used under Bazel - prod_only = True, - ) - - yarn_install( - name = "ts-api-guardian_deps", - package_json = "@angular//tools/ts-api-guardian:package.json", - yarn_lock = "@angular//tools/ts-api-guardian:yarn.lock", - ) - - yarn_install( - name = "http-server_runtime_deps", - package_json = "@angular//tools/http-server:package.json", - yarn_lock = "@angular//tools/http-server:yarn.lock", - ) - - _ng_setup_workspace() diff --git a/tools/npm/@angular_bazel/index.js b/tools/npm/@angular_bazel/index.js new file mode 100755 index 0000000000..f587267587 --- /dev/null +++ b/tools/npm/@angular_bazel/index.js @@ -0,0 +1 @@ +throw new Error('should never be run'); \ No newline at end of file diff --git a/tools/npm/@angular_bazel/package.json b/tools/npm/@angular_bazel/package.json new file mode 100644 index 0000000000..99c97e797b --- /dev/null +++ b/tools/npm/@angular_bazel/package.json @@ -0,0 +1,6 @@ +{ + "version": "0.0.0", + "bin": { + "ngc-wrapped": "./index.js" + } +} diff --git a/tools/npm_workspace/@angular/bazel/BUILD.bazel b/tools/npm_workspace/@angular/bazel/BUILD.bazel deleted file mode 100644 index c7f3bdf55b..0000000000 --- a/tools/npm_workspace/@angular/bazel/BUILD.bazel +++ /dev/null @@ -1,8 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -# Empty filegroup here so that @npm//@angular/bazel is a valid Bazel target -# for the @angular//:@angular/bazel/ngc-wrapped target -filegroup( - name = "bazel", - srcs = [], -) diff --git a/tools/npm_workspace/@bazel/typescript/BUILD.bazel b/tools/npm_workspace/@bazel/typescript/BUILD.bazel deleted file mode 100644 index 0f51acdf28..0000000000 --- a/tools/npm_workspace/@bazel/typescript/BUILD.bazel +++ /dev/null @@ -1,8 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -# Alias here so that @npm//@bazel/typescript is a valid Bazel target -# which is reference in npm_bazel_typescript/BUILD.bazel -alias( - name = "typescript", - actual = "@ngdeps//@bazel/typescript", -) diff --git a/tools/npm_workspace/@bazel/typescript/bin/BUILD.bazel b/tools/npm_workspace/@bazel/typescript/bin/BUILD.bazel deleted file mode 100644 index a37485571a..0000000000 --- a/tools/npm_workspace/@bazel/typescript/bin/BUILD.bazel +++ /dev/null @@ -1,7 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -# Alias here so that references actual in @ngdeps -alias( - name = "tsc_wrapped", - actual = "@ngdeps//@bazel/typescript/bin:tsc_wrapped", -) diff --git a/tools/npm_workspace/BUILD.bazel b/tools/npm_workspace/BUILD.bazel deleted file mode 100644 index f8b3c38bd8..0000000000 --- a/tools/npm_workspace/BUILD.bazel +++ /dev/null @@ -1 +0,0 @@ -# Marker file that this directory is a bazel package diff --git a/tools/npm_workspace/WORKSPACE b/tools/npm_workspace/WORKSPACE deleted file mode 100644 index d1060be5c5..0000000000 --- a/tools/npm_workspace/WORKSPACE +++ /dev/null @@ -1 +0,0 @@ -workspace(name = "npm") diff --git a/tools/rxjs/BUILD.bazel b/tools/rxjs/BUILD.bazel index 4e99bafd17..ea1510c40e 100644 --- a/tools/rxjs/BUILD.bazel +++ b/tools/rxjs/BUILD.bazel @@ -4,6 +4,6 @@ filegroup( name = "rxjs_umd_modules", srcs = [ ":rxjs_shims.js", - "@ngdeps//node_modules/rxjs:bundles/rxjs.umd.js", + "@npm//node_modules/rxjs:bundles/rxjs.umd.js", ], ) diff --git a/tools/symbol-extractor/BUILD.bazel b/tools/symbol-extractor/BUILD.bazel index 68945a07dd..8cd5f39c3e 100644 --- a/tools/symbol-extractor/BUILD.bazel +++ b/tools/symbol-extractor/BUILD.bazel @@ -14,7 +14,7 @@ ts_library( ), deps = [ "//packages:types", - "@ngdeps//typescript", + "@npm//typescript", ], ) @@ -28,7 +28,7 @@ ts_library( deps = [ ":lib", "//packages:types", - "@ngdeps//typescript", + "@npm//typescript", ], ) diff --git a/tools/symbol-extractor/index.bzl b/tools/symbol-extractor/index.bzl index 07e6247d96..3a59ce2a21 100644 --- a/tools/symbol-extractor/index.bzl +++ b/tools/symbol-extractor/index.bzl @@ -18,7 +18,7 @@ def js_expected_symbol_test(name, src, golden, data = [], **kwargs): golden, Label("//tools/symbol-extractor:lib"), Label("@bazel_tools//tools/bash/runfiles"), - Label("@ngdeps//typescript"), + Label("@npm//typescript"), ] entry_point = "angular/tools/symbol-extractor/cli.js" diff --git a/tools/testing/BUILD.bazel b/tools/testing/BUILD.bazel index 2f0d7bf928..0df9a118a1 100644 --- a/tools/testing/BUILD.bazel +++ b/tools/testing/BUILD.bazel @@ -23,7 +23,7 @@ ts_library( "//packages/core/testing", "//packages/platform-server", "//packages/platform-server/testing", - "@ngdeps//domino", + "@npm//domino", ], ) diff --git a/tools/ts-api-guardian/BUILD.bazel b/tools/ts-api-guardian/BUILD.bazel index eb6c2f2f07..80e976a93e 100644 --- a/tools/ts-api-guardian/BUILD.bazel +++ b/tools/ts-api-guardian/BUILD.bazel @@ -3,7 +3,7 @@ load( "jasmine_node_test", "npm_package", ) -load("@npm_bazel_typescript//:defs.bzl", "ts_library") +load("@npm_bazel_typescript//:index.bzl", "ts_library") exports_files(["bin/ts-api-guardian"]) diff --git a/yarn.lock b/yarn.lock index 2f4acfb2ed..b39656d38e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -39,6 +39,9 @@ "@angular-devkit/core" "7.3.2" rxjs "6.3.3" +"@angular/bazel@file:./tools/npm/@angular_bazel": + version "0.0.0" + "@angular/cli@^7.3.2": version "7.3.2" resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.3.2.tgz#2664bfa5b00259440066a5cf851c74f6099dd4f9" @@ -105,17 +108,17 @@ resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.9.0.tgz#fd60023acd36313d304cc2f8c2e181b88b5445cd" integrity sha512-E31cefDcdJsx/oii6p/gqKZXSVw0kEg1O73DD2McFcSvnf/p1GYWcQtVgdRQmlviBEytJkJgdX8rtThitRvcow== -"@bazel/jasmine@0.26.0-beta.0": - version "0.26.0-beta.0" - resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-0.26.0-beta.0.tgz#77243fea16dd7b31c60e0aa78bb89b7dcf0a9443" - integrity sha512-6dTuxGitXP6VcmgNwB9D9KqatDGX+Xw9GXDTJNnAT7wNDaakggiRg1ocLe8/xDMB+EXVg1qKOKS5NhZYHq3jVQ== +"@bazel/jasmine@0.26.0": + version "0.26.0" + resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-0.26.0.tgz#f7aed169b057b5af547d2573657b394ecbda0b5d" + integrity sha512-lkvzPHdbSEe1zitnV1hIBwodriXqp/ClHSZQJ5Y486UaLQ6Sm7k7gV2phOwtg7LqLVZnElZDmFLSI0/O1UYYyQ== dependencies: jasmine "~3.3.1" -"@bazel/karma@0.26.0-beta.0": - version "0.26.0-beta.0" - resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.26.0-beta.0.tgz#0a83bac1adaa0cfec8e3fb4acb49d02e05b141ed" - integrity sha512-N2doztMGN6TMT3Gi4R4dfB7ypZI4tF3U1HG09lP7MVmr46czVNp/lwTnjyfJgbababYBfhiGgrXD9VOC9QqKnA== +"@bazel/karma@0.26.0": + version "0.26.0" + resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.26.0.tgz#6ad796686f5775df33a96fa5ef3df76a66aed3b2" + integrity sha512-yZv0fgAjVrfrM0ld8e+wNaPIpYCpwBzVQi2GUErsKStUZXPUUofpBwBjlYsdY1Osn5/FmAF9e6xDkk1JWn/wSg== dependencies: jasmine-core "2.8.0" karma "^4.0.0" @@ -129,10 +132,10 @@ semver "5.6.0" tmp "0.0.33" -"@bazel/typescript@0.26.0-beta.0": - version "0.26.0-beta.0" - resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.26.0-beta.0.tgz#aa025951563f47baca302c8ebcf24eb596724426" - integrity sha512-Ot7k3sfLQAdf14IDmsc6wSgfySctJdW6Uwg7YmD4Zv1sGWkjKaWEtQDFgjtf5kEgFpC0aeM5uK+heqz1CC+VcQ== +"@bazel/typescript@0.26.0": + version "0.26.0" + resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.26.0.tgz#c06139d76c8b9d3a3ed98a721b776fedb4b11c82" + integrity sha512-dh/Y/SZzmeChsLap8FVHYl0FuaeLh/6t9WBVhm5nOgyVrqfEyVpNzy4W20E4NqnmJY2/PqmD5qncf+Oo1q9h1A== dependencies: jasmine-core "2.8.0" protobufjs "5.0.3"