diff --git a/BUILD.bazel b/BUILD.bazel
index bdd447f8dc..55c4299cdb 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -10,10 +10,10 @@ filegroup(
name = "web_test_bootstrap_scripts",
# do not sort
srcs = [
- "@ngdeps//node_modules/reflect-metadata:Reflect.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/reflect-metadata:Reflect.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",
],
)
@@ -23,32 +23,14 @@ 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",
],
)
-
-load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
-
-# 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"],
-)
diff --git a/WORKSPACE b/WORKSPACE
index 81fe6b5dfa..22f3ee5d41 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 = "1416d03823fed624b49a0abbd9979f7c63bbedfd37890ddecedd2fe25cccebc6",
- urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.18.6/rules_nodejs-0.18.6.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,13 @@ 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
+# - 0.26.0 Fix for data files in yarn_install and npm_install
+check_rules_nodejs_version("0.26.0")
+
# Setup the Node.js toolchain
node_repositories(
node_version = "10.9.0",
@@ -54,13 +52,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 +99,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-schematics/package.json.replace b/integration/bazel-schematics/package.json.replace
deleted file mode 100644
index b892e84f1d..0000000000
--- a/integration/bazel-schematics/package.json.replace
+++ /dev/null
@@ -1,53 +0,0 @@
-{
- "name": "demo",
- "version": "0.0.0",
- "scripts": {
- "ng": "ng",
- "start": "ng serve",
- "build": "ng build",
- "test": "ng test",
- "lint": "ng lint",
- "e2e": "ng e2e"
- },
- "private": true,
- "dependencies": {
- "@angular/animations": "file:../angular/dist/packages-dist/animations",
- "@angular/common": "file:../angular/dist/packages-dist/common",
- "@angular/compiler": "file:../angular/dist/packages-dist/compiler",
- "@angular/core": "file:../angular/dist/packages-dist/core",
- "@angular/forms": "file:../angular/dist/packages-dist/forms",
- "@angular/platform-browser": "file:../angular/dist/packages-dist/platform-browser",
- "@angular/platform-browser-dynamic": "file:../angular/dist/packages-dist/platform-browser-dynamic",
- "@angular/router": "file:../angular/dist/packages-dist/router",
- "core-js": "^2.5.4",
- "rxjs": "~6.4.0",
- "tslib": "^1.9.0",
- "zone.js": "~0.8.26"
- },
- "devDependencies": {
- "@angular-devkit/build-angular": "~0.12.0",
- "@angular/bazel": "file:../angular/dist/packages-dist/bazel",
- "@angular/cli": "~7.2.1",
- "@angular/compiler-cli": "file:../angular/dist/packages-dist/compiler-cli",
- "@angular/language-service": "file:../angular/dist/packages-dist/language-service",
- "@bazel/bazel": "^0.23.0",
- "@bazel/ibazel": "^0.9.0",
- "@bazel/karma": "^0.25.1",
- "@bazel/typescript": "^0.25.1",
- "@types/node": "~8.9.4",
- "@types/jasmine": "~2.8.8",
- "@types/jasminewd2": "~2.0.3",
- "codelyzer": "~4.5.0",
- "jasmine-core": "~2.99.1",
- "jasmine-spec-reporter": "~4.2.1",
- "karma": "~3.1.1",
- "karma-chrome-launcher": "~2.2.0",
- "karma-coverage-istanbul-reporter": "~2.0.1",
- "karma-jasmine": "~1.1.2",
- "karma-jasmine-html-reporter": "^0.2.2",
- "protractor": "~5.4.0",
- "ts-node": "~7.0.0",
- "tslint": "~5.11.0",
- "typescript": "~3.2.2"
- }
-}
diff --git a/integration/bazel-schematics/replace_angular_repo.js b/integration/bazel-schematics/replace_angular_repo.js
deleted file mode 100644
index 1b5babb0f4..0000000000
--- a/integration/bazel-schematics/replace_angular_repo.js
+++ /dev/null
@@ -1,46 +0,0 @@
-// TODO(kyliau): This file should be removed when we use Angular npm distro from
-// Bazel projects.
-
-const fs = require('fs');
-
-function replaceAngular(content) {
- const regex = /ANGULAR_VERSION.*\nhttp_archive\((.*\n){4}\)/;
- if (!regex.test(content)) {
- throw new Error("Failed to find http_archive rule for Angular in WORKSPACE");
- }
- return content.replace(regex, `
-local_repository(
- name = "angular",
- path = "../../..",
-)`);
-}
-
-function replaceNpm(content) {
- const regex = /yarn_install\((.*\n){4}\)/;
- if (!regex.test(content)) {
- throw new Error("Failed to find yarn_install rule for Angular in WORKSPACE");
- }
- return content.replace(regex, `
-yarn_install(
- name = "npm",
- # Need a reference to @angular here so that Bazel sets up the
- # external repository before calling yarn_install
- data = ["@angular//:LICENSE"],
- package_json = "//:package.json",
- yarn_lock = "//:yarn.lock",
-)`);
-}
-
-function main(argv) {
- argv = argv.slice(2);
- if (argv.length !== 1) {
- throw new Error('Expect WORKSPACE to be first parameter');
- }
- const workspace = argv[0];
- let content = fs.readFileSync(workspace, 'utf-8');
- content = replaceAngular(content);
- content = replaceNpm(content);
- fs.writeFileSync(workspace, content);
-}
-
-main(process.argv)
diff --git a/integration/bazel-schematics/test.sh b/integration/bazel-schematics/test.sh
index de1ebbefdb..b3e4c081b4 100755
--- a/integration/bazel-schematics/test.sh
+++ b/integration/bazel-schematics/test.sh
@@ -2,17 +2,32 @@
set -eux -o pipefail
+function installLocalPackages() {
+ # Install Angular packages that are built locally from HEAD.
+ # This also gets around the bug whereby yarn caches local `file://` urls.
+ # See https://github.com/yarnpkg/yarn/issues/2165
+ readonly pwd=$(pwd)
+ readonly packages=(
+ animations common compiler core forms platform-browser
+ platform-browser-dynamic router bazel compiler-cli language-service upgrade
+ )
+ local local_packages=()
+ for package in "${packages[@]}"; do
+ local_packages+=("@angular/${package}@file:${pwd}/../../../dist/packages-dist/${package}")
+ done
+ yarn add "${local_packages[@]}"
+}
+
function testBazel() {
# Set up
bazel version
+ ng version
rm -rf demo
# Create project
- ng new demo --collection=@angular/bazel --defaults --skip-git --style=scss
- node replace_angular_repo.js "./demo/WORKSPACE"
+ ng new demo --collection=@angular/bazel --defaults --skip-git --skip-install --style=scss
cd demo
- yarn add @angular/bazel@file:../../../dist/packages-dist/bazel
- yarn webdriver-manager update --gecko=false --standalone=false $CI_CHROMEDRIVER_VERSION_ARG
- cp ../package.json.replace ./package.json
+ installLocalPackages
+ yarn webdriver-manager update --gecko=false --standalone=false ${CI_CHROMEDRIVER_VERSION_ARG:---versions.chrome 2.45}
ng generate component widget --style=css
ng build
ng test
diff --git a/integration/bazel-schematics/yarn.lock b/integration/bazel-schematics/yarn.lock
index 385508f2f2..7d089b6adf 100644
--- a/integration/bazel-schematics/yarn.lock
+++ b/integration/bazel-schematics/yarn.lock
@@ -68,12 +68,12 @@
rxjs "6.3.3"
"@angular/bazel@file:../../dist/packages-dist/bazel":
- version "0.0.0"
+ version "7.2.7"
dependencies:
"@angular-devkit/architect" "^0.10.6"
"@angular-devkit/core" "^7.0.4"
"@angular-devkit/schematics" "^7.3.0-rc.0"
- "@microsoft/api-extractor" "^7.0.17"
+ "@bazel/typescript" "^0.26.0"
"@schematics/angular" "^7.0.4"
"@types/node" "6.0.84"
semver "^5.6.0"
@@ -119,50 +119,16 @@
"@bazel/bazel-linux_x64" "0.23.0"
"@bazel/bazel-win32_x64" "0.23.0"
-"@microsoft/api-extractor@^7.0.17":
- version "7.0.21"
- resolved "https://registry.yarnpkg.com/@microsoft/api-extractor/-/api-extractor-7.0.21.tgz#d5ff9bba4ff7283503aac83ad489b16cad293fc7"
- integrity sha512-7lFcHNykVz0tvgOz9juXqP+a1j0EmnJ9J080CBE/171IxL4fBrpslPhqN86dNuavuPragRpBLc8Okv/bV7FJPQ==
+"@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:
- "@microsoft/node-core-library" "3.12.0"
- "@microsoft/ts-command-line" "4.2.3"
- "@microsoft/tsdoc" "0.12.5"
- "@types/node" "8.5.8"
- "@types/z-schema" "3.16.31"
- colors "~1.2.1"
- lodash "~4.17.5"
- resolve "1.8.1"
- typescript "~3.1.6"
- z-schema "~3.18.3"
-
-"@microsoft/node-core-library@3.12.0":
- version "3.12.0"
- resolved "https://registry.yarnpkg.com/@microsoft/node-core-library/-/node-core-library-3.12.0.tgz#f9c27b8bb6b55d60b91d4e1962f42b03b9f8f47f"
- integrity sha512-9T2dEXmmxZqnqcpHuIB8mTAOM/DNSi/QcAwKYDjvZvkd+PGT5lCUXjM9GL7SaR2NPa3UrWDGgFhNoqLqLfEPbw==
- dependencies:
- "@types/fs-extra" "5.0.4"
- "@types/jju" "~1.4.0"
- "@types/node" "8.5.8"
- "@types/z-schema" "3.16.31"
- colors "~1.2.1"
- fs-extra "~7.0.1"
- jju "~1.4.0"
- z-schema "~3.18.3"
-
-"@microsoft/ts-command-line@4.2.3":
- version "4.2.3"
- resolved "https://registry.yarnpkg.com/@microsoft/ts-command-line/-/ts-command-line-4.2.3.tgz#20d6a1684148b9fc0df25ee7335c3bb227d47d4f"
- integrity sha512-SIs4q7RcG7efBbh5Ffrf6V4jVLxWihD4NDRY3+gPiOG8CYawBzE22tTEloZ1yj/FBvBZQkQ0GYwXoPhn6ElYXA==
- dependencies:
- "@types/argparse" "1.0.33"
- "@types/node" "8.5.8"
- argparse "~1.0.9"
- colors "~1.2.1"
-
-"@microsoft/tsdoc@0.12.5":
- version "0.12.5"
- resolved "https://registry.yarnpkg.com/@microsoft/tsdoc/-/tsdoc-0.12.5.tgz#c448a38902ccb5601c1b2ef3b1a105012ef7712c"
- integrity sha512-xEAyvLXo4Cter/b0EMCWUZTgXOfLOPJ/Xr52WdjVclPx9eDmNTGFtZl8Pn/nqSnZsQBNcHL0eHk/YyRyyXXpiQ==
+ jasmine-core "2.8.0"
+ protobufjs "5.0.3"
+ semver "5.6.0"
+ source-map-support "0.5.9"
+ tsutils "2.27.2"
"@schematics/angular@7.3.0-rc.0":
version "7.3.0-rc.0"
@@ -196,43 +162,11 @@
semver "5.6.0"
semver-intersect "1.4.0"
-"@types/argparse@1.0.33":
- version "1.0.33"
- resolved "https://registry.yarnpkg.com/@types/argparse/-/argparse-1.0.33.tgz#2728669427cdd74a99e53c9f457ca2866a37c52d"
- integrity sha512-VQgHxyPMTj3hIlq9SY1mctqx+Jj8kpQfoLvDlVSDNOyuYs8JYfkuY3OW/4+dO657yPmNhHpePRx0/Tje5ImNVQ==
-
-"@types/fs-extra@5.0.4":
- version "5.0.4"
- resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-5.0.4.tgz#b971134d162cc0497d221adde3dbb67502225599"
- integrity sha512-DsknoBvD8s+RFfSGjmERJ7ZOP1HI0UZRA3FSI+Zakhrc/Gy26YQsLI+m5V5DHxroHRJqCDLKJp7Hixn8zyaF7g==
- dependencies:
- "@types/node" "*"
-
-"@types/jju@~1.4.0":
- version "1.4.1"
- resolved "https://registry.yarnpkg.com/@types/jju/-/jju-1.4.1.tgz#0a39f5f8e84fec46150a7b9ca985c3f89ad98e9f"
- integrity sha512-LFt+YA7Lv2IZROMwokZKiPNORAV5N3huMs3IKnzlE430HWhWYZ8b+78HiwJXJJP1V2IEjinyJURuRJfGoaFSIA==
-
-"@types/node@*":
- version "11.10.0"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-11.10.0.tgz#08eeb736ae678ccf9ca0922063f3a08795894ede"
- integrity sha512-6Mb9+PPq9UzRpQrlPzZAbhEvodWDTnsIakddUAtSDpKYF6eu5zAdW31n8x7UZStvqGnDC7dCJnvU188ylv/Ytw==
-
"@types/node@6.0.84":
version "6.0.84"
resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.84.tgz#193ffe5a9f42864d425ffd9739d95b753c6a1eab"
integrity sha512-1SvEazClhUBRNroJM3oB3xf3u2r6xGmHDGbdigqNPHvNKLl8/BtATgO9eC04ZLuovpSh0B20BF1QJxdi+qmTlg==
-"@types/node@8.5.8":
- version "8.5.8"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-8.5.8.tgz#92509422653f10e9c0ac18d87e0610b39f9821c7"
- integrity sha512-8KmlRxwbKZfjUHFIt3q8TF5S2B+/E5BaAoo/3mgc5h6FJzqxXkCK/VMetO+IRDtwtU6HUvovHMBn+XRj7SV9Qg==
-
-"@types/z-schema@3.16.31":
- version "3.16.31"
- resolved "https://registry.yarnpkg.com/@types/z-schema/-/z-schema-3.16.31.tgz#2eb1d00a5e4ec3fa58c76afde12e182b66dc5c1c"
- integrity sha1-LrHQCl5Ow/pYx2r94S4YK2bcXBw=
-
"@yarnpkg/lockfile@1.1.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
@@ -333,13 +267,6 @@ are-we-there-yet@~1.1.2:
delegates "^1.0.0"
readable-stream "^2.0.6"
-argparse@~1.0.9:
- version "1.0.10"
- resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
- integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
- dependencies:
- sprintf-js "~1.0.2"
-
arr-diff@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
@@ -360,6 +287,14 @@ array-unique@^0.3.2:
resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
+ascli@~1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/ascli/-/ascli-1.0.1.tgz#bcfa5974a62f18e81cabaeb49732ab4a88f906bc"
+ integrity sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=
+ dependencies:
+ colour "~0.7.1"
+ optjs "~3.2.2"
+
assign-symbols@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
@@ -442,6 +377,13 @@ builtins@^1.0.3:
resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og=
+bytebuffer@~5:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/bytebuffer/-/bytebuffer-5.0.1.tgz#582eea4b1a873b6d020a48d58df85f0bba6cfddd"
+ integrity sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=
+ dependencies:
+ long "~3"
+
cacache@^11.0.1:
version "11.3.1"
resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.1.tgz#d09d25f6c4aca7a6d305d141ae332613aa1d515f"
@@ -497,6 +439,11 @@ cache-base@^1.0.1:
union-value "^1.0.0"
unset-value "^1.0.0"
+camelcase@^2.0.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
+ integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
+
chalk@^2.0.0:
version "2.4.1"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
@@ -558,6 +505,15 @@ cli-width@^2.0.0:
resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
+cliui@^3.0.3:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+ integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
+ dependencies:
+ string-width "^1.0.1"
+ strip-ansi "^3.0.1"
+ wrap-ansi "^2.0.0"
+
code-point-at@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
@@ -583,15 +539,10 @@ color-name@1.1.3:
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
-colors@~1.2.1:
- version "1.2.5"
- resolved "https://registry.yarnpkg.com/colors/-/colors-1.2.5.tgz#89c7ad9a374bc030df8013241f68136ed8835afc"
- integrity sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==
-
-commander@^2.7.1:
- version "2.19.0"
- resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
- integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
+colour@~0.7.1:
+ version "0.7.1"
+ resolved "https://registry.yarnpkg.com/colour/-/colour-0.7.1.tgz#9cb169917ec5d12c0736d3e8685746df1cadf778"
+ integrity sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g=
component-emitter@^1.2.1:
version "1.2.1"
@@ -666,6 +617,11 @@ debug@^3.1.0:
dependencies:
ms "^2.1.1"
+decamelize@^1.1.1:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+ integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+
decode-uri-component@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
@@ -865,15 +821,6 @@ from2@^2.1.0:
inherits "^2.0.1"
readable-stream "^2.0.0"
-fs-extra@~7.0.1:
- version "7.0.1"
- resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
- integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
- dependencies:
- graceful-fs "^4.1.2"
- jsonfile "^4.0.0"
- universalify "^0.1.0"
-
fs-minipass@^1.2.5:
version "1.2.5"
resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
@@ -955,7 +902,7 @@ glob@^7.0.0, glob@^7.0.5, glob@^7.1.2, glob@^7.1.3:
once "^1.3.0"
path-is-absolute "^1.0.0"
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2:
version "4.1.15"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
@@ -1100,6 +1047,11 @@ interpret@^1.0.0:
resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
integrity sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=
+invert-kv@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+ integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
+
ip@^1.1.5:
version "1.1.5"
resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
@@ -1264,10 +1216,10 @@ isobject@^3.0.0, isobject@^3.0.1:
resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
-jju@~1.4.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/jju/-/jju-1.4.0.tgz#a3abe2718af241a2b2904f84a625970f389ae32a"
- integrity sha1-o6vicYryQaKykE+EpiWXDzia4yo=
+jasmine-core@2.8.0:
+ version "2.8.0"
+ resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
+ integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=
json-parse-better-errors@^1.0.0:
version "1.0.2"
@@ -1279,13 +1231,6 @@ json-schema-traverse@^0.4.1:
resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
-jsonfile@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
- integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
- optionalDependencies:
- graceful-fs "^4.1.6"
-
jsonparse@^1.2.0:
version "1.3.1"
resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
@@ -1315,26 +1260,28 @@ kind-of@^6.0.0, kind-of@^6.0.2:
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
+lcid@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+ integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=
+ dependencies:
+ invert-kv "^1.0.0"
+
lodash.debounce@^4.0.8:
version "4.0.8"
resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
-lodash.get@^4.0.0:
- version "4.4.2"
- resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
- integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
-
-lodash.isequal@^4.0.0:
- version "4.5.0"
- resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
- integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
-
-lodash@^4.17.10, lodash@~4.17.5:
+lodash@^4.17.10:
version "4.17.11"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
+long@~3:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"
+ integrity sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=
+
lru-cache@^4.1.2, lru-cache@^4.1.3:
version "4.1.5"
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
@@ -1682,11 +1629,23 @@ opn@5.4.0:
dependencies:
is-wsl "^1.1.0"
+optjs@~3.2.2:
+ version "3.2.2"
+ resolved "https://registry.yarnpkg.com/optjs/-/optjs-3.2.2.tgz#69a6ce89c442a44403141ad2f9b370bd5bb6f4ee"
+ integrity sha1-aabOicRCpEQDFBrS+bNwvVu29O4=
+
os-homedir@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
+os-locale@^1.4.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+ integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=
+ dependencies:
+ lcid "^1.0.0"
+
os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
@@ -1785,6 +1744,16 @@ promise-retry@^1.1.1:
err-code "^1.0.0"
retry "^0.10.0"
+protobufjs@5.0.3:
+ version "5.0.3"
+ resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-5.0.3.tgz#e4dfe9fb67c90b2630d15868249bcc4961467a17"
+ integrity sha512-55Kcx1MhPZX0zTbVosMQEO5R6/rikNXd9b6RQK4KSPcrSIIwoXTtebIczUrXlwaSrbz4x8XUVThGPob1n8I4QA==
+ dependencies:
+ ascli "~1"
+ bytebuffer "~5"
+ glob "^7.0.5"
+ yargs "^3.10.0"
+
protoduck@^5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.1.tgz#03c3659ca18007b69a50fd82a7ebcc516261151f"
@@ -1894,7 +1863,7 @@ resolve-url@^0.2.1:
resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
-resolve@1.8.1, resolve@^1.1.6:
+resolve@^1.1.6:
version "1.8.1"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
integrity sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==
@@ -2082,6 +2051,14 @@ source-map-resolve@^0.5.0:
source-map-url "^0.4.0"
urix "^0.1.0"
+source-map-support@0.5.9:
+ version "0.5.9"
+ resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
+ integrity sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==
+ dependencies:
+ buffer-from "^1.0.0"
+ source-map "^0.6.0"
+
source-map-url@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
@@ -2097,6 +2074,11 @@ source-map@^0.5.6:
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+source-map@^0.6.0:
+ version "0.6.1"
+ resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+ integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
spdx-correct@^3.0.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
@@ -2130,11 +2112,6 @@ split-string@^3.0.1, split-string@^3.0.2:
dependencies:
extend-shallow "^3.0.0"
-sprintf-js@~1.0.2:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
- integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-
ssri@^6.0.0, ssri@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
@@ -2292,17 +2269,24 @@ tsickle@0.34.0:
mkdirp "^0.5.1"
source-map "^0.7.3"
-tslib@^1.9.0:
+tslib@^1.8.1, tslib@^1.9.0:
version "1.9.3"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
+tsutils@2.27.2:
+ version "2.27.2"
+ resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.27.2.tgz#60ba88a23d6f785ec4b89c6e8179cac9b431f1c7"
+ integrity sha512-qf6rmT84TFMuxAKez2pIfR8UCai49iQsfB7YWVjV1bKpy/d0PWT5rEOSM6La9PiHZ0k1RRZQiwVdVJfQ3BPHgg==
+ dependencies:
+ tslib "^1.8.1"
+
typedarray@^0.0.6:
version "0.0.6"
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
-typescript@3.1.6, typescript@~3.1.6:
+typescript@3.1.6:
version "3.1.6"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.6.tgz#b6543a83cfc8c2befb3f4c8fba6896f5b0c9be68"
integrity sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==
@@ -2336,11 +2320,6 @@ unique-slug@^2.0.0:
dependencies:
imurmurhash "^0.1.4"
-universalify@^0.1.0:
- version "0.1.2"
- resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
- integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
-
unset-value@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
@@ -2391,11 +2370,6 @@ validate-npm-package-name@^3.0.0:
dependencies:
builtins "^1.0.3"
-validator@^8.0.0:
- version "8.2.0"
- resolved "https://registry.yarnpkg.com/validator/-/validator-8.2.0.tgz#3c1237290e37092355344fef78c231249dab77b9"
- integrity sha512-Yw5wW34fSv5spzTXNkokD6S6/Oq92d8q/t14TqsS3fAiA1RYnxSFSIZ+CY3n6PGGRCq5HhJTSepQvFUS2QUDxA==
-
which@^1.3.1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
@@ -2410,6 +2384,19 @@ wide-align@^1.1.0:
dependencies:
string-width "^1.0.2 || 2"
+window-size@^0.1.4:
+ version "0.1.4"
+ resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"
+ integrity sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=
+
+wrap-ansi@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+ integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
+ dependencies:
+ string-width "^1.0.1"
+ strip-ansi "^3.0.1"
+
wrappy@1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -2420,6 +2407,11 @@ xtend@~4.0.1:
resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
+y18n@^3.2.0:
+ version "3.2.1"
+ resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+ integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
+
y18n@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
@@ -2435,13 +2427,15 @@ yallist@^3.0.0, yallist@^3.0.2:
resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
-z-schema@~3.18.3:
- version "3.18.4"
- resolved "https://registry.yarnpkg.com/z-schema/-/z-schema-3.18.4.tgz#ea8132b279533ee60be2485a02f7e3e42541a9a2"
- integrity sha512-DUOKC/IhbkdLKKiV89gw9DUauTV8U/8yJl1sjf6MtDmzevLKOF2duNJ495S3MFVjqZarr+qNGCPbkg4mu4PpLw==
+yargs@^3.10.0:
+ version "3.32.0"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995"
+ integrity sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=
dependencies:
- lodash.get "^4.0.0"
- lodash.isequal "^4.0.0"
- validator "^8.0.0"
- optionalDependencies:
- commander "^2.7.1"
+ camelcase "^2.0.1"
+ cliui "^3.0.3"
+ decamelize "^1.1.1"
+ os-locale "^1.4.0"
+ string-width "^1.0.1"
+ window-size "^0.1.4"
+ y18n "^3.2.0"
diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE
index 962093c4fa..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 = "1416d03823fed624b49a0abbd9979f7c63bbedfd37890ddecedd2fe25cccebc6",
- urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.18.6/rules_nodejs-0.18.6.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 11f39a8c74..e7c506b07e 100644
--- a/integration/bazel/src/hello-world/BUILD.bazel
+++ b/integration/bazel/src/hello-world/BUILD.bazel
@@ -2,8 +2,8 @@ package(default_visibility = ["//visibility:public"])
load("@io_bazel_rules_sass//sass:sass.bzl", "sass_binary")
load("@npm_angular_bazel//:index.bzl", "ng_module", "ng_package")
-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")
sass_binary(
name = "hello-world-styles",
diff --git a/integration/bazel/src/package.json b/integration/bazel/src/package.json
index 3832e5784b..d429b14700 100644
--- a/integration/bazel/src/package.json
+++ b/integration/bazel/src/package.json
@@ -18,8 +18,8 @@
"@angular/bazel": "packages-dist:bazel",
"@angular/compiler": "packages-dist:compiler",
"@angular/compiler-cli": "packages-dist:compiler-cli",
- "@bazel/karma": "0.25.1",
- "@bazel/typescript": "0.25.1",
+ "@bazel/karma": "0.26.0",
+ "@bazel/typescript": "0.26.0",
"@types/jasmine": "2.8.8",
"@types/source-map": "0.5.1",
"protractor": "5.1.2",
diff --git a/integration/bazel/src/yarn.lock b/integration/bazel/src/yarn.lock
index d551f752b2..e2185d68ed 100644
--- a/integration/bazel/src/yarn.lock
+++ b/integration/bazel/src/yarn.lock
@@ -59,31 +59,32 @@
"@angular-devkit/core" "7.3.3"
rxjs "6.3.3"
-"@angular/animations@file:../angular/dist/packages-dist/animations":
- version "7.2.6"
+"@angular/animations@file:../../../../../../../Users/greg/google/gregmagolan/angular-2/dist/packages-dist/animations":
+ version "8.0.0-beta.6"
dependencies:
tslib "^1.9.0"
-"@angular/bazel@file:../angular/dist/packages-dist/bazel":
- version "7.2.6"
+"@angular/bazel@file:../../../../../../../Users/greg/google/gregmagolan/angular-2/dist/packages-dist/bazel":
+ version "8.0.0-beta.6"
dependencies:
"@angular-devkit/architect" "^0.10.6"
"@angular-devkit/core" "^7.0.4"
"@angular-devkit/schematics" "^7.3.0-rc.0"
- "@bazel/typescript" "^0.25.1"
+ "@bazel/typescript" "^0.26.0"
+ "@microsoft/api-extractor" "^7.0.17"
"@schematics/angular" "^7.0.4"
"@types/node" "6.0.84"
semver "^5.6.0"
shelljs "0.8.2"
tsickle "0.34.0"
-"@angular/common@file:../angular/dist/packages-dist/common":
- version "7.2.6"
+"@angular/common@file:../../../../../../../Users/greg/google/gregmagolan/angular-2/dist/packages-dist/common":
+ version "8.0.0-beta.6"
dependencies:
tslib "^1.9.0"
-"@angular/compiler-cli@file:../angular/dist/packages-dist/compiler-cli":
- version "7.2.6"
+"@angular/compiler-cli@file:../../../../../../../Users/greg/google/gregmagolan/angular-2/dist/packages-dist/compiler-cli":
+ version "8.0.0-beta.6"
dependencies:
canonical-path "1.0.0"
chokidar "^2.1.1"
@@ -97,30 +98,30 @@
tslib "^1.9.0"
yargs "9.0.1"
-"@angular/compiler@file:../angular/dist/packages-dist/compiler":
- version "7.2.6"
+"@angular/compiler@file:../../../../../../../Users/greg/google/gregmagolan/angular-2/dist/packages-dist/compiler":
+ version "8.0.0-beta.6"
dependencies:
tslib "^1.9.0"
-"@angular/core@file:../angular/dist/packages-dist/core":
- version "7.2.6"
+"@angular/core@file:../../../../../../../Users/greg/google/gregmagolan/angular-2/dist/packages-dist/core":
+ version "8.0.0-beta.6"
dependencies:
tslib "^1.9.0"
-"@angular/platform-browser-dynamic@file:../angular/dist/packages-dist/platform-browser-dynamic":
- version "7.2.6"
+"@angular/platform-browser-dynamic@file:../../../../../../../Users/greg/google/gregmagolan/angular-2/dist/packages-dist/platform-browser-dynamic":
+ version "8.0.0-beta.6"
dependencies:
tslib "^1.9.0"
-"@angular/platform-browser@file:../angular/dist/packages-dist/platform-browser":
- version "7.2.6"
+"@angular/platform-browser@file:../../../../../../../Users/greg/google/gregmagolan/angular-2/dist/packages-dist/platform-browser":
+ version "8.0.0-beta.6"
dependencies:
tslib "^1.9.0"
-"@bazel/karma@0.25.1":
- version "0.25.1"
- resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.25.1.tgz#246286299b6e96fa4a91d240d3c3d7386164adaf"
- integrity sha512-e5qyZkeHdxEYTIcHg04pmPF1SR8jy8I1mQLgDxX6NJDVx3JT7iIFeISqlS8hjBiykyX/XZ0CsVzkKYU/sG3ilg==
+"@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"
@@ -134,10 +135,10 @@
semver "5.6.0"
tmp "0.0.33"
-"@bazel/typescript@0.25.1", "@bazel/typescript@^0.25.1":
- version "0.25.1"
- resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.25.1.tgz#71564de50ff6976fb37d90f2f7a479e87b158943"
- integrity sha512-QFitUUXIWQMfVk5EwI9J9d5iNPfT+kUjPbahiJbJVZz1Fz9zNZ8+CR6FESfnxuUKlZK3Oy0VWFcz7mlHaceL/Q==
+"@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"
diff --git a/integration/bazel/test/e2e/BUILD.bazel b/integration/bazel/test/e2e/BUILD.bazel
index 18ae55ced8..0e6dfc33ec 100644
--- a/integration/bazel/test/e2e/BUILD.bazel
+++ b/integration/bazel/test/e2e/BUILD.bazel
@@ -1,5 +1,5 @@
load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite")
-load("@npm_bazel_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:index.bzl", "ts_library")
ts_library(
name = "e2e",
diff --git a/karma-js.conf.js b/karma-js.conf.js
index e1575ed0ad..cfb171df03 100644
--- a/karma-js.conf.js
+++ b/karma-js.conf.js
@@ -112,7 +112,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 85706c9c97..6de905d56c 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/iv/BUILD.bazel b/modules/benchmarks/src/largetable/iv/BUILD.bazel
index 2c87ddba91..841de7c483 100644
--- a/modules/benchmarks/src/largetable/iv/BUILD.bazel
+++ b/modules/benchmarks/src/largetable/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/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 05d485954b..3638570f61 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 647b53205e..4f455e9c60 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.
-->
-
-
-
+
+
+