From a38433f36b036cb2956066cb6a5843bef73a4de1 Mon Sep 17 00:00:00 2001 From: Greg Magolan Date: Tue, 18 Jun 2019 21:26:53 -0700 Subject: [PATCH] build: update to rules_nodejs 0.32.2 (#31019) Brings in ts_library fixes required to get angular/angular building after 0.32.0: typescript: exclude typescript lib declarations in node_module_library transitive_declarations typescript: remove override of @bazel/tsetse (+1 squashed commit) @npm//node_modules/foobar:foobar.js labels changed to @npm//:node_modules/foobar/foobar.js with fix for bazelbuild/rules_nodejs#802 also updates to rules_rass commit compatible with rules_nodejs 0.32.0 PR Close #31019 --- .bazelignore | 1 + .bazelrc | 4 +- BUILD.bazel | 30 +- WORKSPACE | 21 +- integration/bazel/.bazelrc | 4 - integration/bazel/WORKSPACE | 19 +- integration/bazel/package.json | 8 +- integration/bazel/src/BUILD.bazel | 6 +- integration/bazel/src/hello-world/BUILD.bazel | 4 +- integration/bazel/yarn.lock | 284 +++++++++--------- .../benchmarks/src/expanding_rows/BUILD.bazel | 6 +- .../benchmarks/src/largeform/ng2/BUILD.bazel | 6 +- .../largetable/incremental_dom/BUILD.bazel | 2 +- .../benchmarks/src/largetable/ng2/BUILD.bazel | 6 +- .../src/largetable/ng2_switch/BUILD.bazel | 6 +- .../src/tree/incremental_dom/BUILD.bazel | 2 +- modules/benchmarks/src/tree/ng1/BUILD.bazel | 2 +- modules/benchmarks/src/tree/ng2/BUILD.bazel | 6 +- .../benchmarks/src/tree/ng2_next/BUILD.bazel | 2 +- .../src/tree/ng2_static/BUILD.bazel | 6 +- .../src/tree/ng2_switch/BUILD.bazel | 6 +- .../src/tree/render3_function/BUILD.bazel | 2 +- modules/playground/src/animate/BUILD.bazel | 6 +- modules/playground/src/async/BUILD.bazel | 6 +- modules/playground/src/gestures/BUILD.bazel | 8 +- .../playground/src/hello_world/BUILD.bazel | 6 +- modules/playground/src/http/BUILD.bazel | 6 +- modules/playground/src/jsonp/BUILD.bazel | 6 +- modules/playground/src/key_events/BUILD.bazel | 6 +- .../src/model_driven_forms/BUILD.bazel | 6 +- .../src/order_management/BUILD.bazel | 6 +- .../src/person_management/BUILD.bazel | 6 +- .../src/relative_assets/BUILD.bazel | 6 +- modules/playground/src/routing/BUILD.bazel | 10 +- modules/playground/src/sourcemap/BUILD.bazel | 6 +- modules/playground/src/svg/BUILD.bazel | 6 +- .../src/template_driven_forms/BUILD.bazel | 6 +- modules/playground/src/todo/BUILD.bazel | 6 +- modules/playground/src/upgrade/BUILD.bazel | 8 +- .../src/web_workers/animations/BUILD.bazel | 8 +- .../src/web_workers/images/BUILD.bazel | 16 +- .../src/web_workers/input/BUILD.bazel | 14 +- .../src/web_workers/kitchen_sink/BUILD.bazel | 14 +- .../web_workers/message_broker/BUILD.bazel | 14 +- .../src/web_workers/router/BUILD.bazel | 14 +- .../src/web_workers/todo/BUILD.bazel | 14 +- .../src/zippy_component/BUILD.bazel | 6 +- package.json | 7 +- packages/bazel/package.bzl | 7 +- packages/bazel/src/BUILD.bazel | 2 +- .../src/builders/files/WORKSPACE.template | 24 +- .../builders/files/__dot__bazelrc.template | 3 - .../builders/files/src/BUILD.bazel.template | 14 +- packages/bazel/src/ng_module.bzl | 9 +- .../src/protractor/protractor_web_test.bzl | 12 +- packages/bazel/src/schematics/ng-add/index.ts | 5 +- packages/core/schematics/utils/BUILD.bazel | 1 + packages/core/test/bundling/todo/BUILD.bazel | 2 +- .../core/test/bundling/todo_i18n/BUILD.bazel | 2 +- .../core/test/bundling/todo_r2/BUILD.bazel | 2 +- packages/elements/test/BUILD.bazel | 8 +- packages/examples/common/BUILD.bazel | 4 +- packages/examples/core/BUILD.bazel | 6 +- packages/examples/forms/BUILD.bazel | 4 +- .../router/activated-route/BUILD.bazel | 4 +- .../registration-options/BUILD.bazel | 4 +- packages/examples/upgrade/upgrade_example.bzl | 8 +- packages/service-worker/worker/BUILD.bazel | 4 +- tools/defaults.bzl | 8 +- tools/rxjs/BUILD.bazel | 2 +- yarn.lock | 29 +- 71 files changed, 392 insertions(+), 422 deletions(-) diff --git a/.bazelignore b/.bazelignore index f4721bf22c..0eeb743b1e 100644 --- a/.bazelignore +++ b/.bazelignore @@ -1,3 +1,4 @@ +.git node_modules dist aio/content diff --git a/.bazelrc b/.bazelrc index 449e82e52d..958def7b2e 100644 --- a/.bazelrc +++ b/.bazelrc @@ -11,9 +11,7 @@ build:angular-team --remote_http_cache=https://storage.googleapis.com/angular-te # Make compilation fast, by keeping a few copies of the compilers # running as daemons, and cache SourceFile AST's to reduce parse time. build --strategy=AngularTemplateCompile=worker -# TODO(alexeagle): re-enable after fixing worker instability with rxjs typings -# build --strategy=TypeScriptCompile=worker -build --strategy=TypeScriptCompile=standalone +build --strategy=TypeScriptCompile=worker # Enable debugging tests with --config=debug test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test_strategy=exclusive --test_timeout=9999 --nocache_test_results diff --git a/BUILD.bazel b/BUILD.bazel index d383ef4f3e..1fdf2dd33e 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -18,15 +18,15 @@ filegroup( name = "web_test_bootstrap_scripts", # do not sort srcs = [ - "@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", + "@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. - "@npm//node_modules/systemjs:dist/system.src.js", - "@npm//node_modules/reflect-metadata:Reflect.js", + "@npm//:node_modules/systemjs/dist/system.src.js", + "@npm//:node_modules/reflect-metadata/Reflect.js", ], ) @@ -35,15 +35,15 @@ 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) - "@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", + "@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", ], ) diff --git a/WORKSPACE b/WORKSPACE index 85ef8bd90a..70d51114f9 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -18,8 +18,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 = "e04a82a72146bfbca2d0575947daa60fda1878c8d3a3afe868a8ec39a6b968bb", - urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.31.1/rules_nodejs-0.31.1.tar.gz"], + sha256 = "6d4edbf28ff6720aedf5f97f9b9a7679401bf7fca9d14a0fff80f644a99992b4", + urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.32.2/rules_nodejs-0.32.2.tar.gz"], ) # Check the bazel version and download npm dependencies @@ -47,7 +47,10 @@ Try running `yarn bazel` instead. # - 0.27.12 Adds NodeModuleSources provider for transtive npm deps support # - 0.30.0 yarn_install now uses symlinked node_modules with new managed directories Bazel 0.26.0 feature # - 0.31.1 entry_point attribute of nodejs_binary & rollup_bundle is now a label -check_rules_nodejs_version(minimum_version_string = "0.31.1") +# - 0.32.0 yarn_install and npm_install no longer puts build files under symlinked node_modules +# - 0.32.1 remove override of @bazel/tsetse & exclude typescript lib declarations in node_module_library transitive_declarations +# - 0.32.2 resolves bug in @bazel/hide-bazel-files postinstall step +check_rules_nodejs_version(minimum_version_string = "0.32.2") # Setup the Node.js toolchain node_repositories( @@ -71,19 +74,7 @@ node_repositories( 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, - # Temporarily disable node_modules symlinking until the fix for - # https://github.com/bazelbuild/bazel/issues/8487 makes it into a - # future Bazel release - symlink_node_modules = False, yarn_lock = "//:yarn.lock", ) diff --git a/integration/bazel/.bazelrc b/integration/bazel/.bazelrc index 14e35c64a3..1e2c660e9c 100644 --- a/integration/bazel/.bazelrc +++ b/integration/bazel/.bazelrc @@ -20,7 +20,3 @@ build --symlink_prefix=/ # Turn on managed directories feature in Bazel # This allows us to avoid installing a second copy of node_modules common --experimental_allow_incremental_repository_updates - -# Temporary flag to for using nodejs rules 0.31.1 with Bazel 0.27.0 -# TODO(gregmagolan): remove after updating to next nodejs rules release -common --incompatible_depset_is_not_iterable=false diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE index 5d51f8ccd5..e315661260 100644 --- a/integration/bazel/WORKSPACE +++ b/integration/bazel/WORKSPACE @@ -8,16 +8,16 @@ 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 = "e04a82a72146bfbca2d0575947daa60fda1878c8d3a3afe868a8ec39a6b968bb", - urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.31.1/rules_nodejs-0.31.1.tar.gz"], + sha256 = "6d4edbf28ff6720aedf5f97f9b9a7679401bf7fca9d14a0fff80f644a99992b4", + urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.32.2/rules_nodejs-0.32.2.tar.gz"], ) # Fetch sass rules for compiling sass files -# TODO: change back to upstream release after https://github.com/bazelbuild/rules_sass/pull/87 merged and released http_archive( name = "io_bazel_rules_sass", - strip_prefix = "rules_sass-9862dfc96a4a1f66fe171ef5e043b29853e8445b", - url = "https://github.com/manekinekko/rules_sass/archive/9862dfc96a4a1f66fe171ef5e043b29853e8445b.zip", + sha256 = "4f05239080175a3f4efa8982d2b7775892d656bb47e8cf56914d5f9441fb5ea6", + strip_prefix = "rules_sass-86ca977cf2a8ed481859f83a286e164d07335116", + url = "https://github.com/bazelbuild/rules_sass/archive/86ca977cf2a8ed481859f83a286e164d07335116.zip", ) # Check the bazel version and download npm dependencies @@ -39,7 +39,14 @@ Try running `yarn bazel` instead. # Setup the Node.js toolchain node_repositories( - node_version = "10.9.0", + # Use same node version as root angular WORKSPACE since + # we share node_module packages and some require node >= 10.15.0 + node_repositories = { + "10.16.0-darwin_amd64": ("node-v10.16.0-darwin-x64.tar.gz", "node-v10.16.0-darwin-x64", "6c009df1b724026d84ae9a838c5b382662e30f6c5563a0995532f2bece39fa9c"), + "10.16.0-linux_amd64": ("node-v10.16.0-linux-x64.tar.xz", "node-v10.16.0-linux-x64", "1827f5b99084740234de0c506f4dd2202a696ed60f76059696747c34339b9d48"), + "10.16.0-windows_amd64": ("node-v10.16.0-win-x64.zip", "node-v10.16.0-win-x64", "aa22cb357f0fb54ccbc06b19b60e37eefea5d7dd9940912675d3ed988bf9a059"), + }, + node_version = "10.16.0", yarn_version = "1.12.1", ) diff --git a/integration/bazel/package.json b/integration/bazel/package.json index 217775f947..2864ca5968 100644 --- a/integration/bazel/package.json +++ b/integration/bazel/package.json @@ -23,8 +23,9 @@ "@angular/compiler": "file:../../dist/packages-dist/compiler", "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli", "@bazel/bazel": "file:../../node_modules/@bazel/bazel", - "@bazel/karma": "0.30.1", - "@bazel/typescript": "0.30.1", + "@bazel/hide-bazel-files": "0.32.2", + "@bazel/karma": "0.32.2", + "@bazel/typescript": "0.32.2", "@types/jasmine": "2.8.8", "@types/source-map": "0.5.1", "protractor": "5.1.2", @@ -32,7 +33,6 @@ }, "scripts": { "test": "bazel build ... --noshow_progress && bazel test ...", - "postinstall": "ngc -p ./angular-metadata.tsconfig.json", - "//": "TODO(gregmagolan): figure out how to keep dependencies here up to date with the root package.json" + "postinstall": "ngc -p ./angular-metadata.tsconfig.json" } } diff --git a/integration/bazel/src/BUILD.bazel b/integration/bazel/src/BUILD.bazel index 44caabe966..af4ae8a8b6 100644 --- a/integration/bazel/src/BUILD.bazel +++ b/integration/bazel/src/BUILD.bazel @@ -26,7 +26,7 @@ filegroup( name = "rxjs_umd_modules", srcs = [ # do not sort - "@npm//node_modules/rxjs:bundles/rxjs.umd.js", + "@npm//:node_modules/rxjs/bundles/rxjs.umd.js", ":rxjs_shims.js", ], ) @@ -40,7 +40,7 @@ ts_devserver( ], serving_path = "/bundle.min.js", static_files = [ - "@npm//node_modules/zone.js:dist/zone.min.js", + "@npm//:node_modules/zone.js/dist/zone.min.js", ], deps = ["//src"], ) @@ -64,7 +64,7 @@ web_package( name = "prodapp", assets = [ # do not sort - "@npm//node_modules/zone.js:dist/zone.min.js", + "@npm//:node_modules/zone.js/dist/zone.min.js", ":bundle.min.js", ], data = [ diff --git a/integration/bazel/src/hello-world/BUILD.bazel b/integration/bazel/src/hello-world/BUILD.bazel index 91e2787f22..49e46b1245 100644 --- a/integration/bazel/src/hello-world/BUILD.bazel +++ b/integration/bazel/src/hello-world/BUILD.bazel @@ -46,8 +46,8 @@ ts_library( ts_web_test_suite( name = "test", bootstrap = [ - "@npm//node_modules/zone.js:dist/zone-testing-bundle.js", - "@npm//node_modules/reflect-metadata:Reflect.js", + "@npm//:node_modules/zone.js/dist/zone-testing-bundle.js", + "@npm//:node_modules/reflect-metadata/Reflect.js", ], browsers = [ "@io_bazel_rules_webtesting//browsers:chromium-local", diff --git a/integration/bazel/yarn.lock b/integration/bazel/yarn.lock index b2b0fa369a..298d4a80ee 100644 --- a/integration/bazel/yarn.lock +++ b/integration/bazel/yarn.lock @@ -3,17 +3,17 @@ "@angular-devkit/architect@^0.800.0-beta.15": - version "0.800.0-rc.4" - resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.800.0-rc.4.tgz#ca0bb9b7b62663caf7bf76f8f0afb2ec5ac32db1" - integrity sha512-R+LxKHuGKawzAtSBL7fQ9oYEQfzAEX5DNMvDVC1f+INmyA03vcTKPNf1JzgzetKAN4Y3rt4zpv4OSLiuhjvFwg== + version "0.800.3" + resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.800.3.tgz#01264e5cd6495d724f8754c8bcfd8c35e33fed3c" + integrity sha512-SikMkzkBPtiRdaFIXB0+0NZUBI3bU7XfQRof/uHp9Xc+U1K3ORAtGGOIJtLdkk7RsWqePu5CiRX8XczgFKq5eA== dependencies: - "@angular-devkit/core" "8.0.0-rc.4" + "@angular-devkit/core" "8.0.3" rxjs "6.4.0" -"@angular-devkit/core@8.0.0-rc.4", "@angular-devkit/core@^8.0.0-beta.15": - version "8.0.0-rc.4" - resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-8.0.0-rc.4.tgz#1deef68aae6e79513b843e9ac75c4f37382eaf73" - integrity sha512-+CzO7ymFRZxKEhWGxzHUOvK0lSTW+XV8yoKzNMNWPP9WxHNluAUi82/fxaNtpyUEr0BxKkRlJyU9dkFGYpb++Q== +"@angular-devkit/core@8.0.3", "@angular-devkit/core@^8.0.0-beta.15": + version "8.0.3" + resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-8.0.3.tgz#f2a946030abee42865bc0250c5796befed1ec16b" + integrity sha512-Q5+jw2JQ7xfrDbo1VYH2cr+NysGV+psZ1TtC9eoVJ44fp8pCQAnvGJkeT7eLVEgMrpoBorUy7nqebCOR3WnkXA== dependencies: ajv "6.10.0" fast-json-stable-stringify "2.0.0" @@ -21,21 +21,21 @@ rxjs "6.4.0" source-map "0.7.3" -"@angular-devkit/schematics@8.0.0-rc.4", "@angular-devkit/schematics@^8.0.0-beta.15": - version "8.0.0-rc.4" - resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-8.0.0-rc.4.tgz#e12b3f7ec543ff11634521b390166c688ba3b90d" - integrity sha512-pAWPC0PGFB0SGHi2Pci5JKF7IzjIfcVrpbfc/COM2zMsLseL/J6PyS+47+Ku6kuqteTO9+PVWR7N8sVvAWWpvA== +"@angular-devkit/schematics@8.0.3", "@angular-devkit/schematics@^8.0.0-beta.15": + version "8.0.3" + resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-8.0.3.tgz#533cf328344d114c0d1aaf1b6ba479f94ad5d47e" + integrity sha512-Oj1VLsTEJhzAZjKWEjHXLMKD8B0Qp+3vaozYM22bNIfxP9B1XyUSPPv3UhhRhWusm4T6GRDvMVVLQ1k3mkusuA== dependencies: - "@angular-devkit/core" "8.0.0-rc.4" + "@angular-devkit/core" "8.0.3" rxjs "6.4.0" "@angular/animations@file:../../dist/packages-dist/animations": - version "8.0.0-rc.0" + version "8.1.0-next.3" dependencies: tslib "^1.9.0" "@angular/bazel@file:../../dist/packages-dist/bazel": - version "8.0.0-rc.0" + version "8.1.0-next.3" dependencies: "@angular-devkit/architect" "^0.800.0-beta.15" "@angular-devkit/core" "^8.0.0-beta.15" @@ -47,22 +47,13 @@ shelljs "0.8.2" tsickle "^0.35.0" -"@angular/cdk@8.0.1": - version "8.0.1" - resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-8.0.1.tgz#106872aa7fac0c55144ed5dd60df9af7e24b436a" - integrity sha512-Ul7rVU/rr4qGHs1w24P/6MHEosYp8AHRxBHrp/yJ50eHbHVS31FyfO8gKfNqPc1bnL1YoYYCs0hIBwNDaz8uDg== - dependencies: - tslib "^1.7.1" - optionalDependencies: - parse5 "^5.0.0" - "@angular/common@file:../../dist/packages-dist/common": - version "8.0.0-rc.0" + version "8.1.0-next.3" dependencies: tslib "^1.9.0" "@angular/compiler-cli@file:../../dist/packages-dist/compiler-cli": - version "8.0.0-rc.0" + version "8.1.0-next.3" dependencies: canonical-path "1.0.0" chokidar "^2.1.1" @@ -77,68 +68,61 @@ yargs "13.1.0" "@angular/compiler@file:../../dist/packages-dist/compiler": - version "8.0.0-rc.0" + version "8.1.0-next.3" dependencies: tslib "^1.9.0" "@angular/core@file:../../dist/packages-dist/core": - version "8.0.0-rc.0" + version "8.1.0-next.3" dependencies: tslib "^1.9.0" -"@angular/forms@file:../../dist/packages-dist/forms": - version "8.0.0-rc.0" - dependencies: - tslib "^1.9.0" - -"@angular/material@8.0.1": - version "8.0.1" - resolved "https://registry.yarnpkg.com/@angular/material/-/material-8.0.1.tgz#cbb3f7776d2405a1d75b6e7eb6675fd80a8a5cf5" - integrity sha512-BozIS+9yiqFTfXBoZfhFUibY8meDUcv/e+CxhSHyv3vZw9XVTNTbiaX7tX/FX0Ai+1VKnwRTGrKvPKGFSqynCA== - dependencies: - tslib "^1.7.1" - "@angular/platform-browser-dynamic@file:../../dist/packages-dist/platform-browser-dynamic": - version "8.0.0-rc.0" + version "8.1.0-next.3" dependencies: tslib "^1.9.0" "@angular/platform-browser@file:../../dist/packages-dist/platform-browser": - version "8.0.0-rc.0" + version "8.1.0-next.3" dependencies: tslib "^1.9.0" "@angular/router@file:../../dist/packages-dist/router": - version "8.0.0-rc.0" + version "8.1.0-next.3" dependencies: tslib "^1.9.0" -"@bazel/bazel-darwin_x64@0.26.1": - version "0.26.1" - resolved "https://registry.yarnpkg.com/@bazel/bazel-darwin_x64/-/bazel-darwin_x64-0.26.1.tgz#1b5c69b635e5c2a8c3090fa5f6bcb45735f06045" - integrity sha512-9VjrR+ce+iS9xS1lgeAo1RAPXlxCvez/r3smN1lP4s4YNF0s5LAT0cevIl6Zz2nwyEha/6JvY3v6Euemy36F0w== +"@bazel/bazel-darwin_x64@0.27.0": + version "0.27.0" + resolved "https://registry.yarnpkg.com/@bazel/bazel-darwin_x64/-/bazel-darwin_x64-0.27.0.tgz#83a03c92d52ae60e48e86a1ee697e69e12ddbdf6" + integrity sha512-CyavIbRKRa/55aMyfEM9hjbt4TVISfv7HLeymHTGTLWzS8uQokQ8W9tR/pgc7YJn8F0x64dd7nQKxhbYHM1Qfg== -"@bazel/bazel-linux_x64@0.26.1": - version "0.26.1" - resolved "https://registry.yarnpkg.com/@bazel/bazel-linux_x64/-/bazel-linux_x64-0.26.1.tgz#04dd194bdcd6b9d45bd865a9a60c280d0d600251" - integrity sha512-oZooDxI1C4p7o18zx2Uns2cK/NN2hgF2YSBKH0aVDPAAxQA85h+g124CWDEbsghOdRMSBM0Hd0SSeIqwZcqLSw== +"@bazel/bazel-linux_x64@0.27.0": + version "0.27.0" + resolved "https://registry.yarnpkg.com/@bazel/bazel-linux_x64/-/bazel-linux_x64-0.27.0.tgz#2358292aa4901f526ba9b90874256f63d6d6608c" + integrity sha512-hO04v7C6M3Jf+qNlLE+IticZZKkkS7Nv6+pXDnENgFWrqLV2H93un6kNQnk83B0hP2cEqRQ8rw5yrIcqXNNuSQ== -"@bazel/bazel-win32_x64@0.26.1": - version "0.26.1" - resolved "https://registry.yarnpkg.com/@bazel/bazel-win32_x64/-/bazel-win32_x64-0.26.1.tgz#9351f07313173b1f98006da8131c94db7aa7c506" - integrity sha512-0FkOo8+bxw13X2m6ALhXX2241gG9ZXgcLu0E/IbCWy/TmOB5bR0Z73CslszWbXIldVYnANuhFmnkxIa745Du5Q== +"@bazel/bazel-win32_x64@0.27.0": + version "0.27.0" + resolved "https://registry.yarnpkg.com/@bazel/bazel-win32_x64/-/bazel-win32_x64-0.27.0.tgz#0e5e498de5ccccc9a6cf481cd46904ee938ab6c2" + integrity sha512-7hIGNhdgaxRt9ceSOCs3eSTtCNi4GXz3nu6OjfgSp+QiqLbW/iAVWa8M8vD5aemZ1BSHek4/LISdWUTncLJk+w== "@bazel/bazel@file:../../node_modules/@bazel/bazel": - version "0.26.1" + version "0.27.0" optionalDependencies: - "@bazel/bazel-darwin_x64" "0.26.1" - "@bazel/bazel-linux_x64" "0.26.1" - "@bazel/bazel-win32_x64" "0.26.1" + "@bazel/bazel-darwin_x64" "0.27.0" + "@bazel/bazel-linux_x64" "0.27.0" + "@bazel/bazel-win32_x64" "0.27.0" -"@bazel/karma@0.30.1": - version "0.30.1" - resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.30.1.tgz#5ef08da0abfa5b7e8536a7242a3fc60bf60ed143" - integrity sha512-nDy/Hct/XO1XY8zQeNBVBbff3F5XwRf/TTIM21VksqN0bwn6eVkAm6Pwc96eB/FQ75Xq60vib7v/K5MYjs3EGg== +"@bazel/hide-bazel-files@0.32.2": + version "0.32.2" + resolved "https://registry.yarnpkg.com/@bazel/hide-bazel-files/-/hide-bazel-files-0.32.2.tgz#a482855eafbccb56b1fce0d92ff922c2c6e0a90c" + integrity sha512-585XY53mhMZaCjEQJ+aDqkmydWZbuXsKrZsSpoW9YeAVEH0poQY3YhdyCPmMVBo7/l1mkrqpFuOK5BpECfwdtA== + +"@bazel/karma@0.32.2": + version "0.32.2" + resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.32.2.tgz#0f6adf0cf1970c50cfdcf9cb2b10a8d3e21731fe" + integrity sha512-iWb8aqE+llpZhlreDweM7llwnSAQ9QTYdz4VvIcZBGVD0KtHxHaKiqK4Zo4Qrmr9H0kcOhT7nvRBg3QOUJVrUw== dependencies: jasmine-core "2.8.0" karma "^4.0.0" @@ -152,33 +136,33 @@ semver "5.6.0" tmp "0.0.33" -"@bazel/typescript@0.30.1": - version "0.30.1" - resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.30.1.tgz#58cf290a366418d713b29123d9c337da6500d764" - integrity sha512-tljA8Nv0of08L+I3cipJ096ni3548Qb4ZJS3bAV/pxPsEub4MB48TlASkWjQRp46oPUS3TrAes2kRQCF+kCxFg== +"@bazel/typescript@0.32.2": + version "0.32.2" + resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.32.2.tgz#c296bb44cb6362a0e3a08ca88752852bc9591ecf" + integrity sha512-32zDyvHdYjIa63vtImhl6wy5ErOFVWPkjMT2T035D0UPSKI1tvENW/bRZ3QFlFHqfmJZRBpaI3GiUpO3vUvzmw== dependencies: protobufjs "6.8.8" semver "5.6.0" source-map-support "0.5.9" tsutils "2.27.2" -"@microsoft/api-extractor-model@7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@microsoft/api-extractor-model/-/api-extractor-model-7.1.0.tgz#57e9805ba0f2322dd12945bb0588eeda522519cd" - integrity sha512-DvaJ1fEpwega9TVMR4xR0jeNV/9JHNMxN/t8TuBftZHSLZzTczh8HyqyFxKo2IwDDCoZy5FmXZsq/vo5JQvRMQ== +"@microsoft/api-extractor-model@7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@microsoft/api-extractor-model/-/api-extractor-model-7.2.0.tgz#9d081c44f704acba773b18dc5849b59b8c353242" + integrity sha512-LYMnA1cB2W3YuCOAFruNvnQBZ64OzEnsHxzcxclBhTcUGag6NrtGnip90AVTvVzFlXDLoT7trvPEenlWflWZFQ== dependencies: "@microsoft/node-core-library" "3.13.0" "@microsoft/tsdoc" "0.12.9" "@types/node" "8.5.8" "@microsoft/api-extractor@^7.0.21": - version "7.1.5" - resolved "https://registry.yarnpkg.com/@microsoft/api-extractor/-/api-extractor-7.1.5.tgz#d739db944986b5b51255cc2bcc30d53678ab68ec" - integrity sha512-MalxwkoaIKIc9vHMHFuGnM8egVNKBVI4OUr5Af97KvkO4NsshaHylIBvmxGtqM03G7ch1C3BL2oAF79a6TaFPw== + version "7.2.1" + resolved "https://registry.yarnpkg.com/@microsoft/api-extractor/-/api-extractor-7.2.1.tgz#4aaf807a7bd63d2c8867cea1758b1de2ed88db81" + integrity sha512-ClUKSplAoeVMQntRR+bydS+MziJ8EK44RzELVvNpjtV7L2+1SalafsOw5qo4kL1qcsSh1ZFB2NoO9EzfDSP7/g== dependencies: - "@microsoft/api-extractor-model" "7.1.0" + "@microsoft/api-extractor-model" "7.2.0" "@microsoft/node-core-library" "3.13.0" - "@microsoft/ts-command-line" "4.2.4" + "@microsoft/ts-command-line" "4.2.6" "@microsoft/tsdoc" "0.12.9" colors "~1.2.1" lodash "~4.17.5" @@ -200,10 +184,10 @@ jju "~1.4.0" z-schema "~3.18.3" -"@microsoft/ts-command-line@4.2.4": - version "4.2.4" - resolved "https://registry.yarnpkg.com/@microsoft/ts-command-line/-/ts-command-line-4.2.4.tgz#42fbd5dac0eb530b338867ec62e86a463d8280d6" - integrity sha512-aRKhg+Tpxx4PSRYzFmv+bMsoMFi2joE6tONlTHB2MER1mivS0qb8uJh1SvrjzeshD6sASlaQxgADRIdHyXBCWw== +"@microsoft/ts-command-line@4.2.6": + version "4.2.6" + resolved "https://registry.yarnpkg.com/@microsoft/ts-command-line/-/ts-command-line-4.2.6.tgz#c88a5d474f8c4f411598cdf17d23c1b6090e8fe9" + integrity sha512-GFLPg9Z5yiNca3di/V6Zt3tAvj1de9EK0eL88tE+1eckQSH405UQcm7D+H8LbEhRpqpG+ZqN9LXCAEw4L5uchg== dependencies: "@types/argparse" "1.0.33" "@types/node" "8.5.8" @@ -269,12 +253,12 @@ integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA= "@schematics/angular@^8.0.0-beta.15": - version "8.0.0-rc.4" - resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-8.0.0-rc.4.tgz#3bc62fe2288f4dc349f92ba1024bae36569e5c93" - integrity sha512-m7oP51sJEYfhwoypcnnUnL9wbYb7KU2udufW0qjin1TLf0cssImvmxyuL/7o4zgOZLQ5fGqoplYTE0kW9y08eA== + version "8.0.3" + resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-8.0.3.tgz#36b59b37a1733fa3978f1bd1a7827816d480064d" + integrity sha512-pOy5hPxhyCQNaxkYMardnmwqMeT1rHX5JEl4QRaUHvfOmgLekthXyp31e2CkKfZOOhT6MUeK1GhVqMiZsMvS9A== dependencies: - "@angular-devkit/core" "8.0.0-rc.4" - "@angular-devkit/schematics" "8.0.0-rc.4" + "@angular-devkit/core" "8.0.3" + "@angular-devkit/schematics" "8.0.3" "@types/argparse@1.0.33": version "1.0.33" @@ -304,9 +288,9 @@ integrity sha512-1w52Nyx4Gq47uuu0EVcsHBxZFJgurQ+rTKS3qMHxR1GY2T8c2AJYd6vZoZ9q1rupaDjU0yT+Jc2XTyXkjeMA+Q== "@types/node@*": - version "12.0.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.2.tgz#3452a24edf9fea138b48fad4a0a028a683da1e40" - integrity sha512-5tabW/i+9mhrfEOUcLDu2xBPsHJ+X5Orqy9FKpale3SjDA17j5AEpYq5vfy3oAeAHGcvANRCO3NV3d2D6q3NiA== + version "12.0.8" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.8.tgz#551466be11b2adc3f3d47156758f610bd9f6b1d8" + integrity sha512-b8bbUOTwzIY3V5vDTY1fIJ+ePKDUBqt2hC2woVGotdQQhG/2Sh62HOKHrT7ab+VerXAcPyAiTEipPu/FsreUtg== "@types/node@6.0.84": version "6.0.84" @@ -319,9 +303,9 @@ integrity sha512-8KmlRxwbKZfjUHFIt3q8TF5S2B+/E5BaAoo/3mgc5h6FJzqxXkCK/VMetO+IRDtwtU6HUvovHMBn+XRj7SV9Qg== "@types/node@^10.1.0": - version "10.14.7" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.7.tgz#1854f0a9aa8d2cd6818d607b3d091346c6730362" - integrity sha512-on4MmIDgHXiuJDELPk1NFaKVUxxCFr37tm8E9yN6rAiF5Pzp/9bBfBHkoexqRiY+hk/Z04EJU9kKEb59YqJ82A== + version "10.14.9" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.9.tgz#2e8d678039d27943ce53a1913386133227fd9066" + integrity sha512-NelG/dSahlXYtSoVPErrp06tYFrvzj8XLWmKA+X8x0W//4MqbUyZu++giUG/v0bjAT6/Qxa8IjodrfdACyb0Fg== "@types/node@^6.0.46": version "6.14.6" @@ -385,9 +369,9 @@ agent-base@2: semver "~5.0.1" agent-base@^4.1.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9" - integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg== + version "4.3.0" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee" + integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg== dependencies: es6-promisify "^5.0.0" @@ -610,9 +594,9 @@ blocking-proxy@0.0.5: minimist "^1.2.0" bluebird@^3.3.0: - version "3.5.4" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.4.tgz#d6cc661595de30d5b3af5fcedd3c0b3ef6ec5714" - integrity sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw== + version "3.5.5" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f" + integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w== body-parser@^1.16.1: version "1.19.0" @@ -869,9 +853,9 @@ copy-descriptor@^0.1.0: integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= core-js@^2.2.0: - version "2.6.8" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.8.tgz#dc3a1e633a04267944e0cb850d3880f340248139" - integrity sha512-RWlREFU74TEkdXzyl1bka66O3kYp8jeTXrvJZDzVVMH8AiHUSOFpL1yfhQJ+wHocAm1m+4971W1PPzfLuCv1vg== + version "2.6.9" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.9.tgz#6b4b214620c834152e179323727fc19741b084f2" + integrity sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -1100,9 +1084,9 @@ ent@~2.2.0: integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0= es6-promise@^4.0.3: - version "4.2.6" - resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.6.tgz#b685edd8258886365ea62b57d30de28fadcd974f" - integrity sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q== + version "4.2.8" + resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a" + integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w== es6-promisify@^5.0.0: version "5.0.0" @@ -1536,7 +1520,12 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.3, inherits@^2.0.3, inherits@~2.0.3: +inherits@2, inherits@^2.0.3, inherits@~2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +inherits@2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= @@ -1815,7 +1804,7 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.10.0" -jszip@^3.1.3: +jszip@^3.1.5: version "3.2.1" resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.2.1.tgz#c5d32df7274042282b157efb16e522b43435e01a" integrity sha512-iCMBbo4eE5rb1VCpm5qXOAaUiRKRUKiItn8ah2YQQx9qymmSAY98eyQfioChEYcVQLh0zxJ3wS4A0mh90AVPvw== @@ -1961,9 +1950,9 @@ lodash@^4.16.6, lodash@^4.17.11, lodash@~4.17.5: integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg== log4js@^4.0.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/log4js/-/log4js-4.3.0.tgz#dfca01d9ac0b862c2ed51a06cf57aeb96166713f" - integrity sha512-ivqZBkBvWLJ8rXfhb4E0979olSwnYBPSZy/5WhLNXwntqRgUhxHnqcXGmVw0t+XmLNTr3GAWEzjqHMzu4KM7rA== + version "4.3.2" + resolved "https://registry.yarnpkg.com/log4js/-/log4js-4.3.2.tgz#2c1d97c2ebeb5172d92df63ebf8750af4a1d91ea" + integrity sha512-72GjgSP+ifL156MD/bXEhE7UlFLKS2KkCXujodb1nl1z6PpKhCfS+41dyNQ7zKi4iM49TQl+aWLEISXGLcGCCQ== dependencies: date-format "^2.0.0" debug "^4.1.1" @@ -2056,9 +2045,9 @@ mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24: mime-db "1.40.0" mime@^2.3.1: - version "2.4.3" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.3.tgz#229687331e86f68924e6cb59e1cdd937f18275fe" - integrity sha512-QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw== + version "2.4.4" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5" + integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA== mimic-fn@^2.0.0: version "2.1.0" @@ -2087,7 +2076,7 @@ minimist@~0.0.1: resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8= -minipass@^2.2.1, minipass@^2.3.4: +minipass@^2.2.1, minipass@^2.3.5: version "2.3.5" resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848" integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA== @@ -2095,7 +2084,7 @@ minipass@^2.2.1, minipass@^2.3.4: safe-buffer "^5.1.2" yallist "^3.0.0" -minizlib@^1.1.1: +minizlib@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614" integrity sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA== @@ -2123,9 +2112,9 @@ ms@2.0.0: integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= ms@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" - integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== nan@^2.12.1: version "2.14.0" @@ -2375,11 +2364,6 @@ pako@~1.0.2: resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732" integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw== -parse5@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2" - integrity sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ== - parseqs@0.0.5: version "0.0.5" resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d" @@ -2462,9 +2446,9 @@ posix-character-classes@^0.1.0: integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= process-nextick-args@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" - integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw== + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== protobufjs@6.8.8: version "6.8.8" @@ -2512,9 +2496,9 @@ pseudomap@^1.0.2: integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= psl@^1.1.24: - version "1.1.31" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184" - integrity sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw== + version "1.1.33" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.33.tgz#5533d9384ca7aab86425198e10e8053ebfeab661" + integrity sha512-LTDP2uSrsc7XCb5lO7A8BI1qYxRe/8EqlRvMeEl6rsnYAqDOl8xHR+8lSAIVfrNaSAlTPTNOCgNjWcoUL3AZsw== pump@^3.0.0: version "3.0.0" @@ -2721,7 +2705,7 @@ rfdc@^1.1.2: resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.4.tgz#ba72cc1367a0ccd9cf81a870b3b58bd3ad07f8c2" integrity sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug== -rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1: +rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.3: version "2.6.3" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA== @@ -2809,14 +2793,14 @@ selenium-webdriver@^2.53.2: xml2js "0.4.4" selenium-webdriver@^4.0.0-alpha.1: - version "4.0.0-alpha.1" - resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-4.0.0-alpha.1.tgz#cc93415e21d2dc1dfd85dfc5f6b55f3ac53933b1" - integrity sha512-z88rdjHAv3jmTZ7KSGUkTvo4rGzcDGMq0oXWHNIDK96Gs31JKVdu9+FMtT4KBrVoibg8dUicJDok6GnqqttO5Q== + version "4.0.0-alpha.3" + resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-4.0.0-alpha.3.tgz#fb974f29696a6801ecaf203e38a65c3dbe7e363a" + integrity sha512-78a8bbvVtl3asv5JAiBXvK4KQ+GmXBCMO0DU1ZMbdO9EAb+ydPA53CI4ZA+I8muSLSVgNhRAnsndNWZLIQN2LA== dependencies: - jszip "^3.1.3" - rimraf "^2.5.4" + jszip "^3.1.5" + rimraf "^2.6.3" tmp "0.0.30" - xml2js "^0.4.17" + xml2js "^0.4.19" semver@5.6.0: version "5.6.0" @@ -3151,17 +3135,17 @@ supports-color@^2.0.0: integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= tar@^4: - version "4.4.8" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d" - integrity sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ== + version "4.4.10" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.10.tgz#946b2810b9a5e0b26140cf78bea6b0b0d689eba1" + integrity sha512-g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA== dependencies: chownr "^1.1.1" fs-minipass "^1.2.5" - minipass "^2.3.4" - minizlib "^1.1.1" + minipass "^2.3.5" + minizlib "^1.2.1" mkdirp "^0.5.0" safe-buffer "^5.1.2" - yallist "^3.0.2" + yallist "^3.0.3" tmp@0.0.24: version "0.0.24" @@ -3234,12 +3218,12 @@ tsickle@^0.35.0: mkdirp "^0.5.1" source-map "^0.7.3" -tslib@1.9.3, tslib@^1.8.1, tslib@^1.9.0: +tslib@1.9.3: version "1.9.3" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ== -tslib@^1.7.1: +tslib@^1.8.1, tslib@^1.9.0: version "1.10.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== @@ -3392,9 +3376,9 @@ webdriver-js-extender@^1.0.0: selenium-webdriver "^2.53.2" webdriver-manager@^12.0.6: - version "12.1.4" - resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.4.tgz#d737ab845fb131e4d66c0eaf8ac374c2bc3bfe22" - integrity sha512-aNUzdimlHSl3EotUTdE2QwP9sBUjZgWPCy8C+m1wMmF9jBDKuO/24nnpr2O25Db8dYtsjvj9drPTpSIGqRrNnQ== + version "12.1.5" + resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.5.tgz#28817b14d4b16b94ede10d5a7ee187aeb7679edf" + integrity sha512-f1apDjMpZ8SHlXtXGzqBxOjV+WQcDRz5PN7pWScgjXS7vhUIFcM3V89Shetf4A04n8DDR2MxiVQq6JproFcRZw== dependencies: adm-zip "^0.4.9" chalk "^1.1.1" @@ -3470,7 +3454,7 @@ xml2js@0.4.4: sax "0.6.x" xmlbuilder ">=1.0.0" -xml2js@^0.4.17: +xml2js@^0.4.17, xml2js@^0.4.19: version "0.4.19" resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7" integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q== @@ -3503,15 +3487,15 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= -yallist@^3.0.0, yallist@^3.0.2: +yallist@^3.0.0, yallist@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9" integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A== yargs-parser@^13.0.0: - version "13.1.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.0.tgz#7016b6dd03e28e1418a510e258be4bff5a31138f" - integrity sha512-Yq+32PrijHRri0vVKQEm+ys8mbqWjLiwQkMFNXEENutzLPP0bE4Lcd4iA3OQY5HF+GD3xXxf0MEHb8E4/SA3AA== + version "13.1.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0" + integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ== dependencies: camelcase "^5.0.0" decamelize "^1.2.0" diff --git a/modules/benchmarks/src/expanding_rows/BUILD.bazel b/modules/benchmarks/src/expanding_rows/BUILD.bazel index 26e50bbceb..b3d6925e74 100644 --- a/modules/benchmarks/src/expanding_rows/BUILD.bazel +++ b/modules/benchmarks/src/expanding_rows/BUILD.bazel @@ -43,7 +43,7 @@ ts_devserver( static_files = [ ":bundle.min_debug.js", ":bundle.min.js", - "@npm//node_modules/zone.js:dist/zone.js", + "@npm//:node_modules/zone.js/dist/zone.js", "index.html", ], ) @@ -53,12 +53,12 @@ ts_devserver( entry_module = "angular/modules/benchmarks/src/expanding_rows/index", index_html = "index.html", scripts = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ], serving_path = "/index.js", static_files = [ - "@npm//node_modules/zone.js:dist/zone.js", + "@npm//:node_modules/zone.js/dist/zone.js", "index.html", ], deps = [":application_lib"], diff --git a/modules/benchmarks/src/largeform/ng2/BUILD.bazel b/modules/benchmarks/src/largeform/ng2/BUILD.bazel index 289b6d54b5..3b31d5cc13 100644 --- a/modules/benchmarks/src/largeform/ng2/BUILD.bazel +++ b/modules/benchmarks/src/largeform/ng2/BUILD.bazel @@ -29,12 +29,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ], static_files = [ - "@npm//node_modules/zone.js:dist/zone.js", - "@npm//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/incremental_dom/BUILD.bazel b/modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel index f3459d5b44..37bc3ec86b 100644 --- a/modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel +++ b/modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel @@ -20,7 +20,7 @@ ts_devserver( index_html = "index.html", port = 4200, static_files = [ - "@npm//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 bcebc73065..670e10e2db 100644 --- a/modules/benchmarks/src/largetable/ng2/BUILD.bazel +++ b/modules/benchmarks/src/largetable/ng2/BUILD.bazel @@ -28,12 +28,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ], static_files = [ - "@npm//node_modules/zone.js:dist/zone.js", - "@npm//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 07039cd3fd..51a6079511 100644 --- a/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel +++ b/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel @@ -25,12 +25,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ], static_files = [ - "@npm//node_modules/zone.js:dist/zone.js", - "@npm//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/incremental_dom/BUILD.bazel b/modules/benchmarks/src/tree/incremental_dom/BUILD.bazel index 67ed3eb167..dc17b18cca 100644 --- a/modules/benchmarks/src/tree/incremental_dom/BUILD.bazel +++ b/modules/benchmarks/src/tree/incremental_dom/BUILD.bazel @@ -21,7 +21,7 @@ ts_devserver( index_html = "index.html", port = 4200, static_files = [ - "@npm//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/ng1/BUILD.bazel b/modules/benchmarks/src/tree/ng1/BUILD.bazel index 6caac7ab98..1308536f8a 100644 --- a/modules/benchmarks/src/tree/ng1/BUILD.bazel +++ b/modules/benchmarks/src/tree/ng1/BUILD.bazel @@ -20,7 +20,7 @@ ts_devserver( index_html = "index.html", port = 4200, static_files = [ - "@npm//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 290f02465e..94877a2df4 100644 --- a/modules/benchmarks/src/tree/ng2/BUILD.bazel +++ b/modules/benchmarks/src/tree/ng2/BUILD.bazel @@ -28,12 +28,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ], static_files = [ - "@npm//node_modules/zone.js:dist/zone.js", - "@npm//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 628fd51a64..093e546e79 100644 --- a/modules/benchmarks/src/tree/ng2_next/BUILD.bazel +++ b/modules/benchmarks/src/tree/ng2_next/BUILD.bazel @@ -23,7 +23,7 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@npm//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 9fdb2c364d..1af159d4c3 100644 --- a/modules/benchmarks/src/tree/ng2_static/BUILD.bazel +++ b/modules/benchmarks/src/tree/ng2_static/BUILD.bazel @@ -23,12 +23,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ], static_files = [ - "@npm//node_modules/zone.js:dist/zone.js", - "@npm//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 8c1d09fe20..0f05f9a066 100644 --- a/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel +++ b/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel @@ -25,12 +25,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ], static_files = [ - "@npm//node_modules/zone.js:dist/zone.js", - "@npm//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_function/BUILD.bazel b/modules/benchmarks/src/tree/render3_function/BUILD.bazel index d4225ec2e4..4c3380d5be 100644 --- a/modules/benchmarks/src/tree/render3_function/BUILD.bazel +++ b/modules/benchmarks/src/tree/render3_function/BUILD.bazel @@ -21,7 +21,7 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ], deps = [":render3_function_lib"], diff --git a/modules/playground/src/animate/BUILD.bazel b/modules/playground/src/animate/BUILD.bazel index 48ac5c29bb..136c46f988 100644 --- a/modules/playground/src/animate/BUILD.bazel +++ b/modules/playground/src/animate/BUILD.bazel @@ -23,10 +23,10 @@ ts_devserver( entry_module = "angular/modules/playground/src/animate/index", index_html = "index.html", port = 4200, - scripts = ["@npm//node_modules/tslib:tslib.js"], + scripts = ["@npm//:node_modules/tslib/tslib.js"], static_files = [ - "@npm//node_modules/zone.js:dist/zone.js", - "@npm//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 4e1d13130d..4ed589ea00 100644 --- a/modules/playground/src/async/BUILD.bazel +++ b/modules/playground/src/async/BUILD.bazel @@ -22,12 +22,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ], static_files = [ - "@npm//node_modules/zone.js:dist/zone.js", - "@npm//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/gestures/BUILD.bazel b/modules/playground/src/gestures/BUILD.bazel index 872534abf4..d6459424dd 100644 --- a/modules/playground/src/gestures/BUILD.bazel +++ b/modules/playground/src/gestures/BUILD.bazel @@ -23,11 +23,11 @@ ts_devserver( entry_module = "angular/modules/playground/src/gestures/index", index_html = "index.html", port = 4200, - scripts = ["@npm//node_modules/tslib:tslib.js"], + scripts = ["@npm//:node_modules/tslib/tslib.js"], static_files = [ - "@npm//node_modules/hammerjs:hammer.js", - "@npm//node_modules/zone.js:dist/zone.js", - "@npm//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 0f802e1b3d..b8e5d80ab7 100644 --- a/modules/playground/src/hello_world/BUILD.bazel +++ b/modules/playground/src/hello_world/BUILD.bazel @@ -22,12 +22,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ], static_files = [ - "@npm//node_modules/zone.js:dist/zone.js", - "@npm//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 1457d17c7f..001febf9c3 100644 --- a/modules/playground/src/http/BUILD.bazel +++ b/modules/playground/src/http/BUILD.bazel @@ -25,12 +25,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ], static_files = [ - "@npm//node_modules/zone.js:dist/zone.js", - "@npm//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 ec9d0f059d..b10104a99e 100644 --- a/modules/playground/src/jsonp/BUILD.bazel +++ b/modules/playground/src/jsonp/BUILD.bazel @@ -24,12 +24,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ], static_files = [ - "@npm//node_modules/zone.js:dist/zone.js", - "@npm//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 2cfec987fb..cda4df865a 100644 --- a/modules/playground/src/key_events/BUILD.bazel +++ b/modules/playground/src/key_events/BUILD.bazel @@ -22,12 +22,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ], static_files = [ - "@npm//node_modules/zone.js:dist/zone.js", - "@npm//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 271d04298b..f403ee6bf5 100644 --- a/modules/playground/src/model_driven_forms/BUILD.bazel +++ b/modules/playground/src/model_driven_forms/BUILD.bazel @@ -23,12 +23,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ], static_files = [ - "@npm//node_modules/zone.js:dist/zone.js", - "@npm//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 c31b1fc06a..0e1e7d1049 100644 --- a/modules/playground/src/order_management/BUILD.bazel +++ b/modules/playground/src/order_management/BUILD.bazel @@ -23,12 +23,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ], static_files = [ - "@npm//node_modules/zone.js:dist/zone.js", - "@npm//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 71c2c84c5e..e30028e48f 100644 --- a/modules/playground/src/person_management/BUILD.bazel +++ b/modules/playground/src/person_management/BUILD.bazel @@ -23,12 +23,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ], static_files = [ - "@npm//node_modules/zone.js:dist/zone.js", - "@npm//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 539c9a6363..b72a4e3f65 100644 --- a/modules/playground/src/relative_assets/BUILD.bazel +++ b/modules/playground/src/relative_assets/BUILD.bazel @@ -31,12 +31,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ], static_files = [ - "@npm//node_modules/zone.js:dist/zone.js", - "@npm//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 ab431b9fbf..240c6caf68 100644 --- a/modules/playground/src/routing/BUILD.bazel +++ b/modules/playground/src/routing/BUILD.bazel @@ -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", - "@npm//node_modules/rxjs:bundles/rxjs.umd.js", - "@npm//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", - "@npm//node_modules/zone.js:dist/zone.js", - "@npm//node_modules/reflect-metadata:Reflect.js", - "@npm//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/sourcemap/BUILD.bazel b/modules/playground/src/sourcemap/BUILD.bazel index 0860b5bb54..22e9b0afcc 100644 --- a/modules/playground/src/sourcemap/BUILD.bazel +++ b/modules/playground/src/sourcemap/BUILD.bazel @@ -26,12 +26,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ], static_files = [ - "@npm//node_modules/zone.js:dist/zone.js", - "@npm//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 f2e06c727f..c86a2456c0 100644 --- a/modules/playground/src/svg/BUILD.bazel +++ b/modules/playground/src/svg/BUILD.bazel @@ -22,12 +22,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ], static_files = [ - "@npm//node_modules/zone.js:dist/zone.js", - "@npm//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 46b877a07a..45169a3f44 100644 --- a/modules/playground/src/template_driven_forms/BUILD.bazel +++ b/modules/playground/src/template_driven_forms/BUILD.bazel @@ -23,12 +23,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ], static_files = [ - "@npm//node_modules/zone.js:dist/zone.js", - "@npm//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 401d06405f..5cc87dc184 100644 --- a/modules/playground/src/todo/BUILD.bazel +++ b/modules/playground/src/todo/BUILD.bazel @@ -23,10 +23,10 @@ ts_devserver( entry_module = "angular/modules/playground/src/todo/index", index_html = "index.html", port = 4200, - scripts = ["@npm//node_modules/tslib:tslib.js"], + scripts = ["@npm//:node_modules/tslib/tslib.js"], static_files = [ - "@npm//node_modules/zone.js:dist/zone.js", - "@npm//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 0bc6e6603d..4318e5093c 100644 --- a/modules/playground/src/upgrade/BUILD.bazel +++ b/modules/playground/src/upgrade/BUILD.bazel @@ -22,13 +22,13 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ], static_files = [ - "@npm//node_modules/zone.js:dist/zone.js", - "@npm//node_modules/reflect-metadata:Reflect.js", - "@npm//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/animations/BUILD.bazel b/modules/playground/src/web_workers/animations/BUILD.bazel index 3e9a474b60..4be78eaf3e 100644 --- a/modules/playground/src/web_workers/animations/BUILD.bazel +++ b/modules/playground/src/web_workers/animations/BUILD.bazel @@ -22,13 +22,13 @@ ts_devserver( data = [ "loader.js", "//modules/playground/src/web_workers:worker-config", - "@npm//node_modules/rxjs:bundles/rxjs.umd.js", - "@npm//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 = ["@npm//node_modules/tslib:tslib.js"], - static_files = ["@npm//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 83347441da..b375bd5e1f 100644 --- a/modules/playground/src/web_workers/images/BUILD.bazel +++ b/modules/playground/src/web_workers/images/BUILD.bazel @@ -24,20 +24,20 @@ ts_devserver( additional_root_paths = ["angular"], data = [ "//modules/playground/src/web_workers:worker-config", - "@npm//node_modules/base64-js:base64js.min.js", - "@npm//node_modules/rxjs:bundles/rxjs.umd.js", - "@npm//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 = ["@npm//node_modules/tslib:tslib.js"], + scripts = ["@npm//:node_modules/tslib/tslib.js"], static_files = [ - "@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", + "@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/input/BUILD.bazel b/modules/playground/src/web_workers/input/BUILD.bazel index e03cb7d7db..f4e35a1f03 100644 --- a/modules/playground/src/web_workers/input/BUILD.bazel +++ b/modules/playground/src/web_workers/input/BUILD.bazel @@ -21,21 +21,21 @@ ts_devserver( data = [ "loader.js", "//modules/playground/src/web_workers:worker-config", - "@npm//node_modules/rxjs:bundles/rxjs.umd.js", - "@npm//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 = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ], static_files = [ - "@npm//node_modules/systemjs:dist/system.js", - "@npm//node_modules/zone.js:dist/zone.js", - "@npm//node_modules/zone.js:dist/long-stack-trace-zone.js", - "@npm//node_modules/reflect-metadata:Reflect.js", + "@npm//:node_modules/systemjs/dist/system.js", + "@npm//:node_modules/zone.js/dist/zone.js", + "@npm//:node_modules/zone.js/dist/long-stack-trace-zone.js", + "@npm//:node_modules/reflect-metadata/Reflect.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 9583c966e1..6b01c6d889 100644 --- a/modules/playground/src/web_workers/kitchen_sink/BUILD.bazel +++ b/modules/playground/src/web_workers/kitchen_sink/BUILD.bazel @@ -21,21 +21,21 @@ ts_devserver( data = [ "loader.js", "//modules/playground/src/web_workers:worker-config", - "@npm//node_modules/rxjs:bundles/rxjs.umd.js", - "@npm//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 = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ], static_files = [ - "@npm//node_modules/systemjs:dist/system.js", - "@npm//node_modules/zone.js:dist/zone.js", - "@npm//node_modules/zone.js:dist/long-stack-trace-zone.js", - "@npm//node_modules/reflect-metadata:Reflect.js", + "@npm//:node_modules/systemjs/dist/system.js", + "@npm//:node_modules/zone.js/dist/zone.js", + "@npm//:node_modules/zone.js/dist/long-stack-trace-zone.js", + "@npm//:node_modules/reflect-metadata/Reflect.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 6a437903f8..404cf02af8 100644 --- a/modules/playground/src/web_workers/message_broker/BUILD.bazel +++ b/modules/playground/src/web_workers/message_broker/BUILD.bazel @@ -21,21 +21,21 @@ ts_devserver( data = [ "loader.js", "//modules/playground/src/web_workers:worker-config", - "@npm//node_modules/rxjs:bundles/rxjs.umd.js", - "@npm//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 = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ], static_files = [ - "@npm//node_modules/systemjs:dist/system.js", - "@npm//node_modules/zone.js:dist/zone.js", - "@npm//node_modules/zone.js:dist/long-stack-trace-zone.js", - "@npm//node_modules/reflect-metadata:Reflect.js", + "@npm//:node_modules/systemjs/dist/system.js", + "@npm//:node_modules/zone.js/dist/zone.js", + "@npm//:node_modules/zone.js/dist/long-stack-trace-zone.js", + "@npm//:node_modules/reflect-metadata/Reflect.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 6cfc59853a..9728217719 100644 --- a/modules/playground/src/web_workers/router/BUILD.bazel +++ b/modules/playground/src/web_workers/router/BUILD.bazel @@ -24,21 +24,21 @@ ts_devserver( data = [ "loader.js", "//modules/playground/src/web_workers:worker-config", - "@npm//node_modules/rxjs:bundles/rxjs.umd.js", - "@npm//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 = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ], static_files = [ - "@npm//node_modules/systemjs:dist/system.js", - "@npm//node_modules/zone.js:dist/zone.js", - "@npm//node_modules/zone.js:dist/long-stack-trace-zone.js", - "@npm//node_modules/reflect-metadata:Reflect.js", + "@npm//:node_modules/systemjs/dist/system.js", + "@npm//:node_modules/zone.js/dist/zone.js", + "@npm//:node_modules/zone.js/dist/long-stack-trace-zone.js", + "@npm//:node_modules/reflect-metadata/Reflect.js", ], deps = [":router"], ) diff --git a/modules/playground/src/web_workers/todo/BUILD.bazel b/modules/playground/src/web_workers/todo/BUILD.bazel index 2eda38a422..37e45bee38 100644 --- a/modules/playground/src/web_workers/todo/BUILD.bazel +++ b/modules/playground/src/web_workers/todo/BUILD.bazel @@ -24,21 +24,21 @@ ts_devserver( "css/main.css", "loader.js", "//modules/playground/src/web_workers:worker-config", - "@npm//node_modules/rxjs:bundles/rxjs.umd.js", - "@npm//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 = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ], static_files = [ - "@npm//node_modules/systemjs:dist/system.js", - "@npm//node_modules/zone.js:dist/zone.js", - "@npm//node_modules/zone.js:dist/long-stack-trace-zone.js", - "@npm//node_modules/reflect-metadata:Reflect.js", + "@npm//:node_modules/systemjs/dist/system.js", + "@npm//:node_modules/zone.js/dist/zone.js", + "@npm//:node_modules/zone.js/dist/long-stack-trace-zone.js", + "@npm//:node_modules/reflect-metadata/Reflect.js", ], deps = [":todo"], ) diff --git a/modules/playground/src/zippy_component/BUILD.bazel b/modules/playground/src/zippy_component/BUILD.bazel index 964af8ade7..f386c8ed19 100644 --- a/modules/playground/src/zippy_component/BUILD.bazel +++ b/modules/playground/src/zippy_component/BUILD.bazel @@ -23,12 +23,12 @@ ts_devserver( index_html = "index.html", port = 4200, scripts = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ], static_files = [ - "@npm//node_modules/zone.js:dist/zone.js", - "@npm//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/package.json b/package.json index 28d4cb3613..5266928a73 100644 --- a/package.json +++ b/package.json @@ -35,9 +35,10 @@ "@angular-devkit/core": "^8.0.0-beta.15", "@angular-devkit/schematics": "^8.0.0-beta.15", "@angular/bazel": "file:./tools/npm/@angular_bazel", - "@bazel/jasmine": "0.31.1", - "@bazel/karma": "0.31.1", - "@bazel/typescript": "0.31.1", + "@bazel/jasmine": "0.32.2", + "@bazel/hide-bazel-files": "0.32.2", + "@bazel/karma": "0.32.2", + "@bazel/typescript": "0.32.2", "@microsoft/api-extractor": "^7.0.21", "@schematics/angular": "^8.0.0-beta.15", "@types/angular": "^1.6.47", diff --git a/packages/bazel/package.bzl b/packages/bazel/package.bzl index 49507d7613..2cf12c1d43 100644 --- a/packages/bazel/package.bzl +++ b/packages/bazel/package.bzl @@ -38,12 +38,11 @@ def rules_angular_dev_dependencies(): ############################################# # Dependencies for generating documentation # ############################################# - # TODO(gregmagolan): update to upstream commit once https://github.com/bazelbuild/rules_sass/pull/87 lands http_archive( name = "io_bazel_rules_sass", - sha256 = "1c20d2ddc3d42712543e3b77bceac1bfea072849602569a6fc8b107e6d520ac6", - strip_prefix = "rules_sass-d033c0f9f7a2c75b73068f6647a5b0cc5070fd90", - url = "https://github.com/gregmagolan/rules_sass/archive/d033c0f9f7a2c75b73068f6647a5b0cc5070fd90.zip", + sha256 = "4f05239080175a3f4efa8982d2b7775892d656bb47e8cf56914d5f9441fb5ea6", + url = "https://github.com/bazelbuild/rules_sass/archive/86ca977cf2a8ed481859f83a286e164d07335116.zip", + strip_prefix = "rules_sass-86ca977cf2a8ed481859f83a286e164d07335116", ) http_archive( diff --git a/packages/bazel/src/BUILD.bazel b/packages/bazel/src/BUILD.bazel index ccd4008465..16121e38c6 100644 --- a/packages/bazel/src/BUILD.bazel +++ b/packages/bazel/src/BUILD.bazel @@ -22,7 +22,7 @@ nodejs_binary( "@npm//rollup-plugin-node-resolve", "@npm//rollup-plugin-sourcemaps", ], - entry_point = "@npm//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/builders/files/WORKSPACE.template b/packages/bazel/src/builders/files/WORKSPACE.template index 758344fd6b..90adba2e2e 100644 --- a/packages/bazel/src/builders/files/WORKSPACE.template +++ b/packages/bazel/src/builders/files/WORKSPACE.template @@ -15,8 +15,8 @@ workspace( load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -RULES_NODEJS_VERSION = "0.31.1" -RULES_NODEJS_SHA256 = "e04a82a72146bfbca2d0575947daa60fda1878c8d3a3afe868a8ec39a6b968bb" +RULES_NODEJS_VERSION = "0.32.2" +RULES_NODEJS_SHA256 = "6d4edbf28ff6720aedf5f97f9b9a7679401bf7fca9d14a0fff80f644a99992b4" http_archive( name = "build_bazel_rules_nodejs", sha256 = RULES_NODEJS_SHA256, @@ -24,16 +24,13 @@ http_archive( ) # Rules for compiling sass -RULES_SASS_VERSION = "3a4f31c74513ccfacce3f955b5c006352f7e9587" -RULES_SASS_SHA256 = "4c87befcb17282b039ba8341df9a6cc45f461bf05776dcf35c7e40c7e79ce374" +RULES_SASS_VERSION = "86ca977cf2a8ed481859f83a286e164d07335116" +RULES_SASS_SHA256 = "4f05239080175a3f4efa8982d2b7775892d656bb47e8cf56914d5f9441fb5ea6" http_archive( name = "io_bazel_rules_sass", -# sha256 = RULES_SASS_SHA256, -# url = "https://github.com/bazelbuild/rules_sass/archive/%s.zip" % RULES_SASS_VERSION, -# strip_prefix = "rules_sass-%s" % RULES_SASS_VERSION, - # TODO: change back to upstream release after https://github.com/bazelbuild/rules_sass/pull/87 merged and released - strip_prefix = "rules_sass-9862dfc96a4a1f66fe171ef5e043b29853e8445b", - url = "https://github.com/manekinekko/rules_sass/archive/9862dfc96a4a1f66fe171ef5e043b29853e8445b.zip", + sha256 = RULES_SASS_SHA256, + url = "https://github.com/bazelbuild/rules_sass/archive/%s.zip" % RULES_SASS_VERSION, + strip_prefix = "rules_sass-%s" % RULES_SASS_VERSION, ) #################################### @@ -66,12 +63,9 @@ node_repositories( yarn_install( name = "npm", - data = ["//:angular-metadata.tsconfig.json"], + # TODO(gregmagolan): fix rules_nodejs so that if @bazel/hide-bazel-files is detected then this is forced true + always_hide_bazel_files = True, package_json = "//:package.json", - # Temporarily disable node_modules symlinking until the fix for - # https://github.com/bazelbuild/bazel/issues/8487 makes it into a - # future Bazel release - symlink_node_modules = False, yarn_lock = "//:yarn.lock", ) diff --git a/packages/bazel/src/builders/files/__dot__bazelrc.template b/packages/bazel/src/builders/files/__dot__bazelrc.template index 97c4667f1d..215e72a24e 100644 --- a/packages/bazel/src/builders/files/__dot__bazelrc.template +++ b/packages/bazel/src/builders/files/__dot__bazelrc.template @@ -33,6 +33,3 @@ build --define=compile=legacy # Turn on managed directories feature in Bazel # This allows us to avoid installing a second copy of node_modules common --experimental_allow_incremental_repository_updates - -# Compatibility flag for Bazel 0.27.0 -common --incompatible_depset_is_not_iterable=false diff --git a/packages/bazel/src/builders/files/src/BUILD.bazel.template b/packages/bazel/src/builders/files/src/BUILD.bazel.template index e876d13fd0..bde8bd7c9d 100644 --- a/packages/bazel/src/builders/files/src/BUILD.bazel.template +++ b/packages/bazel/src/builders/files/src/BUILD.bazel.template @@ -59,7 +59,7 @@ web_package( name = "prodapp", assets = [ # do not sort - "@npm//node_modules/zone.js:dist/zone.min.js", + "@npm//:node_modules/zone.js/dist/zone.min.js", ":bundle.min.js", ":global_stylesheet", ], @@ -79,7 +79,7 @@ filegroup( name = "rxjs_umd_modules", srcs = [ # do not sort - "@npm//node_modules/rxjs:bundles/rxjs.umd.js", + "@npm//:node_modules/rxjs/bundles/rxjs.umd.js", ":rxjs_shims.js", ], ) @@ -90,11 +90,11 @@ ts_devserver( entry_module = "project/src/main.dev", serving_path = "/bundle.min.js", scripts = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", ":rxjs_umd_modules", ], static_files = [ - "@npm//node_modules/zone.js:dist/zone.min.js", + "@npm//:node_modules/zone.js/dist/zone.min.js", ":global_stylesheet", ], data = [ @@ -132,15 +132,15 @@ ts_library( ts_web_test_suite( name = "test", srcs = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", ], runtime_deps = [ ":initialize_testbed", ], # do not sort bootstrap = [ - "@npm//node_modules/zone.js:dist/zone-testing-bundle.js", - "@npm//node_modules/reflect-metadata:Reflect.js", + "@npm//:node_modules/zone.js/dist/zone-testing-bundle.js", + "@npm//:node_modules/reflect-metadata/Reflect.js", ], browsers = [ "@io_bazel_rules_webtesting//browsers:chromium-local", diff --git a/packages/bazel/src/ng_module.bzl b/packages/bazel/src/ng_module.bzl index fa46b646b4..b6527e74eb 100644 --- a/packages/bazel/src/ng_module.bzl +++ b/packages/bazel/src/ng_module.bzl @@ -13,7 +13,6 @@ load( "DEFAULT_NG_COMPILER", "DEFAULT_NG_XI18N", "DEPS_ASPECTS", - "NodeModuleInfo", "NodeModuleSources", "TsConfigInfo", "collect_node_modules_aspect", @@ -560,13 +559,7 @@ def ng_module_impl(ctx, ts_compile_actions): providers = ts_compile_actions( ctx, is_library = True, - # Filter out the node_modules from deps passed to TypeScript compiler - # since they don't have the required providers. - # They were added to the action inputs for tsc_wrapped already. - # strict_deps checking currently skips node_modules. - # TODO(alexeagle): turn on strict deps checking when we have a real - # provider for JS/DTS inputs to ts_library. - deps = [d for d in ctx.attr.deps if not NodeModuleInfo in d], + deps = ctx.attr.deps, compile_action = _prodmode_compile_action, devmode_compile_action = _devmode_compile_action, tsc_wrapped_tsconfig = _ngc_tsconfig, diff --git a/packages/bazel/src/protractor/protractor_web_test.bzl b/packages/bazel/src/protractor/protractor_web_test.bzl index dbdb9f2f6b..8eee99e0e4 100644 --- a/packages/bazel/src/protractor/protractor_web_test.bzl +++ b/packages/bazel/src/protractor/protractor_web_test.bzl @@ -173,7 +173,7 @@ def protractor_web_test( data = [], server = None, tags = [], - protractor = "@npm//node_modules/protractor:bin/protractor", + protractor = "@npm//:node_modules/protractor/bin/protractor", **kwargs): """Runs a protractor test in a browser. @@ -188,8 +188,8 @@ def protractor_web_test( data: Runtime dependencies server: Optional server executable target tags: Standard Bazel tags, this macro adds one for ibazel - protractor: Protractor entry_point. Defaults to @npm//node_modules/protractor:bin/protractor - but should be changed to @your_npm_workspace//node_modules/protractor:bin/protractor if + protractor: Protractor entry_point. Defaults to @npm//:node_modules/protractor/bin/protractor + but should be changed to @your_npm_workspace//:node_modules/protractor/bin/protractor if you are not using @npm for your npm dependencies. **kwargs: passed through to `_protractor_web_test` """ @@ -248,7 +248,7 @@ def protractor_web_test_suite( visibility = None, web_test_data = [], wrapped_test_tags = None, - protractor = "@npm//node_modules/protractor:bin/protractor", + protractor = "@npm//:node_modules/protractor/bin/protractor", **remaining_keyword_args): """Defines a test_suite of web_test targets that wrap a protractor_web_test target. @@ -282,8 +282,8 @@ def protractor_web_test_suite( visibility: List of labels; optional. web_test_data: Data dependencies for the web_test. wrapped_test_tags: A list of test tag strings to use for the wrapped test - protractor: Protractor entry_point. Defaults to @npm//node_modules/protractor:bin/protractor - but should be changed to @your_npm_workspace//node_modules/protractor:bin/protractor if + protractor: Protractor entry_point. Defaults to @npm//:node_modules/protractor/bin/protractor + but should be changed to @your_npm_workspace//:node_modules/protractor/bin/protractor if you are not using @npm for your npm dependencies. **remaining_keyword_args: Arguments for the wrapped test target. """ diff --git a/packages/bazel/src/schematics/ng-add/index.ts b/packages/bazel/src/schematics/ng-add/index.ts index e40d2dbe5d..50569e18dc 100755 --- a/packages/bazel/src/schematics/ng-add/index.ts +++ b/packages/bazel/src/schematics/ng-add/index.ts @@ -49,9 +49,10 @@ function addDevDependenciesToPackageJson(options: Schema) { const devDependencies: {[k: string]: string} = { '@angular/bazel': angularCoreVersion, '@bazel/bazel': '^0.27.0', + '@bazel/hide-bazel-files': '0.32.2', '@bazel/ibazel': '^0.10.2', - '@bazel/karma': '0.31.1', - '@bazel/typescript': '0.31.1', + '@bazel/karma': '0.32.2', + '@bazel/typescript': '0.32.2', }; const recorder = host.beginUpdate(packageJson); diff --git a/packages/core/schematics/utils/BUILD.bazel b/packages/core/schematics/utils/BUILD.bazel index 5ebf78b9b7..ae22c44cca 100644 --- a/packages/core/schematics/utils/BUILD.bazel +++ b/packages/core/schematics/utils/BUILD.bazel @@ -10,6 +10,7 @@ ts_library( "@npm//@angular-devkit/core", "@npm//@angular-devkit/schematics", "@npm//@schematics/angular", + "@npm//@types/inquirer", "@npm//@types/node", "@npm//typescript", ], diff --git a/packages/core/test/bundling/todo/BUILD.bazel b/packages/core/test/bundling/todo/BUILD.bazel index eaf8cdd0e6..5a0877908a 100644 --- a/packages/core/test/bundling/todo/BUILD.bazel +++ b/packages/core/test/bundling/todo/BUILD.bazel @@ -76,7 +76,7 @@ js_expected_symbol_test( genrule( name = "tslib", srcs = [ - "@npm//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 4cfa523264..11da031ee1 100644 --- a/packages/core/test/bundling/todo_i18n/BUILD.bazel +++ b/packages/core/test/bundling/todo_i18n/BUILD.bazel @@ -68,7 +68,7 @@ jasmine_node_test( genrule( name = "tslib", srcs = [ - "@npm//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 a3a98e529f..34aaaea086 100644 --- a/packages/core/test/bundling/todo_r2/BUILD.bazel +++ b/packages/core/test/bundling/todo_r2/BUILD.bazel @@ -71,7 +71,7 @@ jasmine_node_test( genrule( name = "tslib", srcs = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", ], outs = [ "tslib.js", diff --git a/packages/elements/test/BUILD.bazel b/packages/elements/test/BUILD.bazel index 0749710747..4a489ebb64 100644 --- a/packages/elements/test/BUILD.bazel +++ b/packages/elements/test/BUILD.bazel @@ -23,10 +23,10 @@ filegroup( testonly = True, # do not sort srcs = [ - "@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", + "@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 aaee6ef2ac..4bb4348722 100644 --- a/packages/examples/common/BUILD.bazel +++ b/packages/examples/common/BUILD.bazel @@ -41,11 +41,11 @@ ts_devserver( index_html = "//packages/examples:index.html", port = 4200, scripts = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ], static_files = [ - "@npm//node_modules/zone.js:dist/zone.js", + "@npm//:node_modules/zone.js/dist/zone.js", ], deps = [":common_examples"], ) diff --git a/packages/examples/core/BUILD.bazel b/packages/examples/core/BUILD.bazel index 81507b154c..19f93ac1ac 100644 --- a/packages/examples/core/BUILD.bazel +++ b/packages/examples/core/BUILD.bazel @@ -57,12 +57,12 @@ ts_devserver( index_html = "//packages/examples:index.html", port = 4200, scripts = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ], static_files = [ - "@npm//node_modules/zone.js:dist/zone.js", - "@npm//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"], ) diff --git a/packages/examples/forms/BUILD.bazel b/packages/examples/forms/BUILD.bazel index 7d602a4b1b..18ae2b9c20 100644 --- a/packages/examples/forms/BUILD.bazel +++ b/packages/examples/forms/BUILD.bazel @@ -41,11 +41,11 @@ ts_devserver( index_html = "//packages/examples:index.html", port = 4200, scripts = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ], static_files = [ - "@npm//node_modules/zone.js:dist/zone.js", + "@npm//:node_modules/zone.js/dist/zone.js", ], deps = [":forms_examples"], ) diff --git a/packages/examples/router/activated-route/BUILD.bazel b/packages/examples/router/activated-route/BUILD.bazel index a73eafe177..636eaac826 100644 --- a/packages/examples/router/activated-route/BUILD.bazel +++ b/packages/examples/router/activated-route/BUILD.bazel @@ -25,11 +25,11 @@ ts_devserver( index_html = "//packages/examples:index.html", port = 4200, scripts = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ], static_files = [ - "@npm//node_modules/zone.js:dist/zone.js", + "@npm//:node_modules/zone.js/dist/zone.js", ], deps = [":router_activated_route_examples"], ) diff --git a/packages/examples/service-worker/registration-options/BUILD.bazel b/packages/examples/service-worker/registration-options/BUILD.bazel index b9b9e7f5b6..65f3a8b39a 100644 --- a/packages/examples/service-worker/registration-options/BUILD.bazel +++ b/packages/examples/service-worker/registration-options/BUILD.bazel @@ -40,11 +40,11 @@ ts_devserver( port = 4200, scripts = [ "//tools/rxjs:rxjs_umd_modules", - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", ], static_files = [ "ngsw-worker.js", - "@npm//node_modules/zone.js:dist/zone.js", + "@npm//:node_modules/zone.js/dist/zone.js", ], deps = [":sw_registration_options_examples"], ) diff --git a/packages/examples/upgrade/upgrade_example.bzl b/packages/examples/upgrade/upgrade_example.bzl index 7391c9fff1..4f01f57e24 100644 --- a/packages/examples/upgrade/upgrade_example.bzl +++ b/packages/examples/upgrade/upgrade_example.bzl @@ -46,13 +46,13 @@ def create_upgrade_example_targets(name, srcs, e2e_srcs, entry_module, assets = port = 4200, entry_module = entry_module, static_files = [ - "@npm//node_modules/zone.js:dist/zone.js", - "@npm//node_modules/angular:angular.js", - "@npm//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 = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ], deps = [":%s_sources" % name], diff --git a/packages/service-worker/worker/BUILD.bazel b/packages/service-worker/worker/BUILD.bazel index f0f564e5e9..d520920c87 100644 --- a/packages/service-worker/worker/BUILD.bazel +++ b/packages/service-worker/worker/BUILD.bazel @@ -9,7 +9,9 @@ ts_library( "*.ts", "src/**/*.ts", ], - exclude = ["main.ts"], + exclude = [ + "main.ts", + ], ), tsconfig = ":tsconfig.json", deps = ["@npm//@types/node"], diff --git a/tools/defaults.bzl b/tools/defaults.bzl index c3ad35e90d..2c76f83dee 100644 --- a/tools/defaults.bzl +++ b/tools/defaults.bzl @@ -159,7 +159,7 @@ def ts_web_test(bootstrap = [], deps = [], runtime_deps = [], **kwargs): if not bootstrap: bootstrap = ["//:web_test_bootstrap_scripts"] local_deps = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ] + deps local_runtime_deps = [ @@ -178,7 +178,7 @@ def ts_web_test_suite(bootstrap = [], deps = [], runtime_deps = [], **kwargs): if not bootstrap: bootstrap = ["//:web_test_bootstrap_scripts"] local_deps = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ] + deps local_runtime_deps = [ @@ -209,7 +209,7 @@ def karma_web_test(bootstrap = [], deps = [], data = [], runtime_deps = [], **kw bootstrap = ["//:web_test_bootstrap_scripts"] local_deps = [ "@npm//karma-browserstack-launcher", - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ] + deps local_runtime_deps = [ @@ -234,7 +234,7 @@ def karma_web_test_suite(bootstrap = [], deps = [], **kwargs): if not bootstrap: bootstrap = ["//:web_test_bootstrap_scripts"] local_deps = [ - "@npm//node_modules/tslib:tslib.js", + "@npm//:node_modules/tslib/tslib.js", "//tools/rxjs:rxjs_umd_modules", ] + deps diff --git a/tools/rxjs/BUILD.bazel b/tools/rxjs/BUILD.bazel index ea1510c40e..71c23c7361 100644 --- a/tools/rxjs/BUILD.bazel +++ b/tools/rxjs/BUILD.bazel @@ -4,6 +4,6 @@ filegroup( name = "rxjs_umd_modules", srcs = [ ":rxjs_shims.js", - "@npm//node_modules/rxjs:bundles/rxjs.umd.js", + "@npm//:node_modules/rxjs/bundles/rxjs.umd.js", ], ) diff --git a/yarn.lock b/yarn.lock index 51e5534f59..3b51b9c1c5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -138,24 +138,29 @@ "@bazel/buildifier-linux_x64" "0.26.0" "@bazel/buildifier-win32_x64" "0.26.0" +"@bazel/hide-bazel-files@0.32.2": + version "0.32.2" + resolved "https://registry.yarnpkg.com/@bazel/hide-bazel-files/-/hide-bazel-files-0.32.2.tgz#a482855eafbccb56b1fce0d92ff922c2c6e0a90c" + integrity sha512-585XY53mhMZaCjEQJ+aDqkmydWZbuXsKrZsSpoW9YeAVEH0poQY3YhdyCPmMVBo7/l1mkrqpFuOK5BpECfwdtA== + "@bazel/ibazel@~0.9.0": version "0.9.0" resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.9.0.tgz#fd60023acd36313d304cc2f8c2e181b88b5445cd" integrity sha512-E31cefDcdJsx/oii6p/gqKZXSVw0kEg1O73DD2McFcSvnf/p1GYWcQtVgdRQmlviBEytJkJgdX8rtThitRvcow== -"@bazel/jasmine@0.31.1": - version "0.31.1" - resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-0.31.1.tgz#da3de10760fe1e29e9fc748fabc4fcf604f4356a" - integrity sha512-heKo8qzm6DTm8eOlfL69RJJi1GLI9vJDSmBGYgol18K7oXz6JrspGWUL9/TlCYbRUUCt22kqX7f3R+QlD0KrCg== +"@bazel/jasmine@0.32.2": + version "0.32.2" + resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-0.32.2.tgz#6375b5b0de3f352c2b2280c54878dd30915fc139" + integrity sha512-izF9hBcbTOj1VhJVeo8G479dXo9KlibX0N6Yag15GaIk1fibW4iRyTBC2fy4ihm31CYIId6Zd9AABVShd+1Sgw== dependencies: jasmine "~3.3.1" jasmine-core "~3.3.0" v8-coverage "1.0.9" -"@bazel/karma@0.31.1": - version "0.31.1" - resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.31.1.tgz#fecbb269c7693baa29ad78179cca752fe7c09068" - integrity sha512-PUOTQOD57IjM18iM+MOe9fRUFNJ8RQMq1i1qDaPLStMS/LtJAvDcvWhypK/2wNDdmAGz7U5uLlvl827XbwIuuA== +"@bazel/karma@0.32.2": + version "0.32.2" + resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.32.2.tgz#0f6adf0cf1970c50cfdcf9cb2b10a8d3e21731fe" + integrity sha512-iWb8aqE+llpZhlreDweM7llwnSAQ9QTYdz4VvIcZBGVD0KtHxHaKiqK4Zo4Qrmr9H0kcOhT7nvRBg3QOUJVrUw== dependencies: jasmine-core "2.8.0" karma "^4.0.0" @@ -169,10 +174,10 @@ semver "5.6.0" tmp "0.0.33" -"@bazel/typescript@0.31.1": - version "0.31.1" - resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.31.1.tgz#2ccf9997d97903c51e73f82e29433fe444b8d672" - integrity sha512-jUTJjwdc4JSDMt4kIj74gGtctu8xe0YZPJuPxOIS4TdrWcn+dG9Fy7Z8bJLXhePheig1JLY7NBP6BGwrtggzPQ== +"@bazel/typescript@0.32.2": + version "0.32.2" + resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.32.2.tgz#c296bb44cb6362a0e3a08ca88752852bc9591ecf" + integrity sha512-32zDyvHdYjIa63vtImhl6wy5ErOFVWPkjMT2T035D0UPSKI1tvENW/bRZ3QFlFHqfmJZRBpaI3GiUpO3vUvzmw== dependencies: protobufjs "6.8.8" semver "5.6.0"