diff --git a/.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx b/.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx index dc08716e4d8..174ea29cd8e 100755 --- a/.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx +++ b/.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx @@ -7,7 +7,7 @@ adev/package.json=2126666683 adev/shared-docs/package.json=450629456 adev/shared-docs/pipeline/api-gen/package.json=939673974 integration/package.json=-239561259 -modules/package.json=-2081919225 +modules/package.json=1001515086 package.json=517425656 packages/animations/package.json=-678724831 packages/benchpress/package.json=-1908328724 @@ -26,7 +26,7 @@ packages/platform-server/package.json=-737662753 packages/router/package.json=860819913 packages/upgrade/package.json=16347051 packages/zone.js/package.json=-1005735564 -pnpm-lock.yaml=-164067470 +pnpm-lock.yaml=-1965948364 pnpm-workspace.yaml=1738525657 tools/bazel/rules_angular_store/package.json=-239561259 yarn.lock=160655205 diff --git a/modules/benchmarks/BUILD.bazel b/modules/benchmarks/BUILD.bazel index c59477c8d44..b3a40436212 100644 --- a/modules/benchmarks/BUILD.bazel +++ b/modules/benchmarks/BUILD.bazel @@ -11,7 +11,7 @@ ts_config( name = "tsconfig_e2e", src = "tsconfig-e2e.json", deps = [ - "//:node_modules/@types/jasmine", - "//:node_modules/@types/node", + "//modules:node_modules/@types/jasmine", + "//modules:node_modules/@types/node", ], ) diff --git a/modules/benchmarks/benchmark_test.bzl b/modules/benchmarks/benchmark_test.bzl index 52b7d755490..3c92d8b7032 100644 --- a/modules/benchmarks/benchmark_test.bzl +++ b/modules/benchmarks/benchmark_test.bzl @@ -36,7 +36,7 @@ def benchmark_test(name, deps = [], server = None, tags = []): ], data = [ "//modules:node_modules/@angular/benchpress", - "//:node_modules/tslib", + "//modules:node_modules/tslib", "//modules:node_modules/protractor", "//modules:node_modules/selenium-webdriver", ], diff --git a/modules/benchmarks/e2e_test.bzl b/modules/benchmarks/e2e_test.bzl index e9054667afe..aa988a8a0c1 100644 --- a/modules/benchmarks/e2e_test.bzl +++ b/modules/benchmarks/e2e_test.bzl @@ -28,7 +28,7 @@ def e2e_test(name, deps = [], server = None): deps = [":%s_bundle" % name], server = server, data = [ - "//:node_modules/protractor", - "//:node_modules/selenium-webdriver", + "//modules:node_modules/protractor", + "//modules:node_modules/selenium-webdriver", ], ) diff --git a/modules/benchmarks/src/change_detection/BUILD.bazel b/modules/benchmarks/src/change_detection/BUILD.bazel index cee5c66cde1..6d61c8b960f 100644 --- a/modules/benchmarks/src/change_detection/BUILD.bazel +++ b/modules/benchmarks/src/change_detection/BUILD.bazel @@ -15,7 +15,7 @@ ts_project( srcs = ["change_detection.perf-spec.ts"], tsconfig = "//modules/benchmarks:tsconfig_e2e", deps = [ - "//:node_modules/protractor", + "//modules:node_modules/protractor", "//modules/utilities:utilities_rjs", ], ) @@ -26,7 +26,7 @@ ts_project( srcs = ["change_detection.e2e-spec.ts"], tsconfig = "//modules/benchmarks:tsconfig_e2e", deps = [ - "//:node_modules/protractor", + "//modules:node_modules/protractor", "//modules/utilities:utilities_rjs", ], ) diff --git a/modules/benchmarks/src/change_detection/transplanted_views/BUILD.bazel b/modules/benchmarks/src/change_detection/transplanted_views/BUILD.bazel index d79854d2122..5e3a8f77112 100644 --- a/modules/benchmarks/src/change_detection/transplanted_views/BUILD.bazel +++ b/modules/benchmarks/src/change_detection/transplanted_views/BUILD.bazel @@ -17,12 +17,12 @@ optimize_angular_app( ], include_zonejs = True, deps = [ - "//:node_modules/rxjs", - "//:node_modules/tslib", "//modules:node_modules/@angular/build", "//modules:node_modules/@angular/common", "//modules:node_modules/@angular/core", "//modules:node_modules/@angular/platform-browser", + "//modules:node_modules/rxjs", + "//modules:node_modules/tslib", "//modules:node_modules/zone.js", ], ) diff --git a/modules/benchmarks/src/class_bindings/BUILD.bazel b/modules/benchmarks/src/class_bindings/BUILD.bazel index 0ba90b5c19b..6f4ab7e78fc 100644 --- a/modules/benchmarks/src/class_bindings/BUILD.bazel +++ b/modules/benchmarks/src/class_bindings/BUILD.bazel @@ -1,25 +1 @@ package(default_visibility = ["//modules/benchmarks:__subpackages__"]) - -#component_benchmark( -# name = "benchmark", -# tags = -# driver = ":class_bindings.perf-spec.ts", -# driver_deps = [ -# "@npm//@angular/build-tooling/bazel/benchmark/driver-utilities", -# "@npm//@types/jasmine", -# "@npm//protractor", -# ], -# ng_deps = [ -# "//packages:types", -# "//packages/common", -# "//packages/core", -# "//packages/platform-browser", -# "@npm//rxjs", -# ], -# ng_srcs = glob( -# ["**/*.ts"], -# exclude = ["**/*.perf-spec.ts"], -# ), -# prefix = "", -# styles = ["styles.css"], -#) diff --git a/modules/benchmarks/src/defer/BUILD.bazel b/modules/benchmarks/src/defer/BUILD.bazel index 569e88f554c..d8494cc4901 100644 --- a/modules/benchmarks/src/defer/BUILD.bazel +++ b/modules/benchmarks/src/defer/BUILD.bazel @@ -21,7 +21,7 @@ ts_project( srcs = ["defer.perf-spec.ts"], tsconfig = "//modules/benchmarks:tsconfig_e2e", deps = [ - "//:node_modules/protractor", + "//modules:node_modules/protractor", "//modules/utilities:utilities_rjs", ], ) @@ -32,7 +32,7 @@ ts_project( srcs = ["defer.e2e-spec.ts"], tsconfig = "//modules/benchmarks:tsconfig_e2e", deps = [ - "//:node_modules/protractor", + "//modules:node_modules/protractor", "//modules/utilities:utilities_rjs", ], ) diff --git a/modules/benchmarks/src/defer/baseline/BUILD.bazel b/modules/benchmarks/src/defer/baseline/BUILD.bazel index 35638517b98..bf0c03ea284 100644 --- a/modules/benchmarks/src/defer/baseline/BUILD.bazel +++ b/modules/benchmarks/src/defer/baseline/BUILD.bazel @@ -16,12 +16,12 @@ optimize_angular_app( ], include_zonejs = True, deps = [ - "//:node_modules/rxjs", - "//:node_modules/tslib", "//modules:node_modules/@angular/build", "//modules:node_modules/@angular/common", "//modules:node_modules/@angular/core", "//modules:node_modules/@angular/platform-browser", + "//modules:node_modules/rxjs", + "//modules:node_modules/tslib", "//modules:node_modules/zone.js", ], ) diff --git a/modules/benchmarks/src/defer/main/BUILD.bazel b/modules/benchmarks/src/defer/main/BUILD.bazel index 35638517b98..bf0c03ea284 100644 --- a/modules/benchmarks/src/defer/main/BUILD.bazel +++ b/modules/benchmarks/src/defer/main/BUILD.bazel @@ -16,12 +16,12 @@ optimize_angular_app( ], include_zonejs = True, deps = [ - "//:node_modules/rxjs", - "//:node_modules/tslib", "//modules:node_modules/@angular/build", "//modules:node_modules/@angular/common", "//modules:node_modules/@angular/core", "//modules:node_modules/@angular/platform-browser", + "//modules:node_modules/rxjs", + "//modules:node_modules/tslib", "//modules:node_modules/zone.js", ], ) diff --git a/modules/benchmarks/src/expanding_rows/BUILD.bazel b/modules/benchmarks/src/expanding_rows/BUILD.bazel index adf8d7d0173..106499c1cb5 100644 --- a/modules/benchmarks/src/expanding_rows/BUILD.bazel +++ b/modules/benchmarks/src/expanding_rows/BUILD.bazel @@ -13,13 +13,13 @@ optimize_angular_app( ) + ["index.html"], include_zonejs = True, deps = [ - "//:node_modules/rxjs", - "//:node_modules/tslib", "//modules:node_modules/@angular/build", "//modules:node_modules/@angular/common", "//modules:node_modules/@angular/core", "//modules:node_modules/@angular/localize", "//modules:node_modules/@angular/platform-browser", + "//modules:node_modules/rxjs", + "//modules:node_modules/tslib", "//modules:node_modules/zone.js", ], ) @@ -38,7 +38,7 @@ ts_project( srcs = ["expanding_rows.perf-spec.ts"], tsconfig = "//modules/benchmarks:tsconfig_e2e", deps = [ - "//:node_modules/protractor", + "//modules:node_modules/protractor", "//modules/utilities:utilities_rjs", ], ) diff --git a/modules/benchmarks/src/hydration/BUILD.bazel b/modules/benchmarks/src/hydration/BUILD.bazel index fc951d4fb26..ce4508aa570 100644 --- a/modules/benchmarks/src/hydration/BUILD.bazel +++ b/modules/benchmarks/src/hydration/BUILD.bazel @@ -25,7 +25,7 @@ ts_project( srcs = ["hydration.perf-spec.ts"], tsconfig = "//modules/benchmarks:tsconfig_e2e", deps = [ - "//:node_modules/protractor", + "//modules:node_modules/protractor", "//modules/utilities:utilities_rjs", ], ) @@ -36,7 +36,7 @@ ts_project( srcs = ["hydration.e2e-spec.ts"], tsconfig = "//modules/benchmarks:tsconfig_e2e", deps = [ - "//:node_modules/protractor", + "//modules:node_modules/protractor", "//modules/utilities:utilities_rjs", ], ) diff --git a/modules/benchmarks/src/hydration/baseline/BUILD.bazel b/modules/benchmarks/src/hydration/baseline/BUILD.bazel index 909113ee270..f6e698eb950 100644 --- a/modules/benchmarks/src/hydration/baseline/BUILD.bazel +++ b/modules/benchmarks/src/hydration/baseline/BUILD.bazel @@ -14,12 +14,12 @@ optimize_angular_app( ], include_zonejs = True, deps = [ - "//:node_modules/rxjs", - "//:node_modules/tslib", "//modules:node_modules/@angular/build", "//modules:node_modules/@angular/common", "//modules:node_modules/@angular/core", "//modules:node_modules/@angular/platform-browser", + "//modules:node_modules/rxjs", + "//modules:node_modules/tslib", "//modules:node_modules/zone.js", ], ) diff --git a/modules/benchmarks/src/hydration/main/BUILD.bazel b/modules/benchmarks/src/hydration/main/BUILD.bazel index 909113ee270..f6e698eb950 100644 --- a/modules/benchmarks/src/hydration/main/BUILD.bazel +++ b/modules/benchmarks/src/hydration/main/BUILD.bazel @@ -14,12 +14,12 @@ optimize_angular_app( ], include_zonejs = True, deps = [ - "//:node_modules/rxjs", - "//:node_modules/tslib", "//modules:node_modules/@angular/build", "//modules:node_modules/@angular/common", "//modules:node_modules/@angular/core", "//modules:node_modules/@angular/platform-browser", + "//modules:node_modules/rxjs", + "//modules:node_modules/tslib", "//modules:node_modules/zone.js", ], ) diff --git a/modules/benchmarks/src/js-web-frameworks/BUILD.bazel b/modules/benchmarks/src/js-web-frameworks/BUILD.bazel index 9e8fd35c559..f80bdce9b9a 100644 --- a/modules/benchmarks/src/js-web-frameworks/BUILD.bazel +++ b/modules/benchmarks/src/js-web-frameworks/BUILD.bazel @@ -8,7 +8,7 @@ ts_project( srcs = ["js-web-frameworks.perf-spec.ts"], tsconfig = "//modules/benchmarks:tsconfig_e2e", deps = [ - "//:node_modules/protractor", + "//modules:node_modules/protractor", "//modules/utilities:utilities_rjs", ], ) diff --git a/modules/benchmarks/src/js-web-frameworks/ng2/BUILD.bazel b/modules/benchmarks/src/js-web-frameworks/ng2/BUILD.bazel index dece4b65078..da2534df25c 100644 --- a/modules/benchmarks/src/js-web-frameworks/ng2/BUILD.bazel +++ b/modules/benchmarks/src/js-web-frameworks/ng2/BUILD.bazel @@ -12,12 +12,12 @@ optimize_angular_app( ], include_zonejs = True, deps = [ - "//:node_modules/rxjs", - "//:node_modules/tslib", "//modules:node_modules/@angular/build", "//modules:node_modules/@angular/common", "//modules:node_modules/@angular/core", "//modules:node_modules/@angular/platform-browser", + "//modules:node_modules/rxjs", + "//modules:node_modules/tslib", "//modules:node_modules/zone.js", ], ) diff --git a/modules/benchmarks/src/largeform/BUILD.bazel b/modules/benchmarks/src/largeform/BUILD.bazel index aae3eea5192..e5dcf3e72ca 100644 --- a/modules/benchmarks/src/largeform/BUILD.bazel +++ b/modules/benchmarks/src/largeform/BUILD.bazel @@ -8,7 +8,7 @@ ts_project( srcs = ["largeform.perf-spec.ts"], tsconfig = "//modules/benchmarks:tsconfig_e2e", deps = [ - "//:node_modules/protractor", + "//modules:node_modules/protractor", "//modules/utilities:utilities_rjs", ], ) @@ -19,7 +19,7 @@ ts_project( srcs = ["largeform.e2e-spec.ts"], tsconfig = "//modules/benchmarks:tsconfig_e2e", deps = [ - "//:node_modules/protractor", + "//modules:node_modules/protractor", "//modules/utilities:utilities_rjs", ], ) diff --git a/modules/benchmarks/src/largeform/ng2/BUILD.bazel b/modules/benchmarks/src/largeform/ng2/BUILD.bazel index 349326e9c8d..40df1a1157f 100644 --- a/modules/benchmarks/src/largeform/ng2/BUILD.bazel +++ b/modules/benchmarks/src/largeform/ng2/BUILD.bazel @@ -15,13 +15,13 @@ optimize_angular_app( ], include_zonejs = True, deps = [ - "//:node_modules/rxjs", - "//:node_modules/tslib", "//modules:node_modules/@angular/build", "//modules:node_modules/@angular/common", "//modules:node_modules/@angular/core", "//modules:node_modules/@angular/forms", "//modules:node_modules/@angular/platform-browser", + "//modules:node_modules/rxjs", + "//modules:node_modules/tslib", "//modules:node_modules/zone.js", ], ) diff --git a/modules/benchmarks/src/largetable/BUILD.bazel b/modules/benchmarks/src/largetable/BUILD.bazel index 70304d59929..e007c89d506 100644 --- a/modules/benchmarks/src/largetable/BUILD.bazel +++ b/modules/benchmarks/src/largetable/BUILD.bazel @@ -15,7 +15,7 @@ ts_project( srcs = ["largetable.perf-spec.ts"], tsconfig = "//modules/benchmarks:tsconfig_e2e", deps = [ - "//:node_modules/protractor", + "//modules:node_modules/protractor", "//modules/utilities:utilities_rjs", ], ) @@ -26,7 +26,7 @@ ts_project( srcs = ["largetable.e2e-spec.ts"], tsconfig = "//modules/benchmarks:tsconfig_e2e", deps = [ - "//:node_modules/protractor", + "//modules:node_modules/protractor", "//modules/utilities:utilities_rjs", ], ) diff --git a/modules/benchmarks/src/largetable/baseline/BUILD.bazel b/modules/benchmarks/src/largetable/baseline/BUILD.bazel index def862ab443..d431dab985a 100644 --- a/modules/benchmarks/src/largetable/baseline/BUILD.bazel +++ b/modules/benchmarks/src/largetable/baseline/BUILD.bazel @@ -14,12 +14,12 @@ optimize_angular_app( ], include_zonejs = True, deps = [ - "//:node_modules/rxjs", - "//:node_modules/tslib", "//modules:node_modules/@angular/build", "//modules:node_modules/@angular/common", "//modules:node_modules/@angular/core", "//modules:node_modules/@angular/platform-browser", + "//modules:node_modules/rxjs", + "//modules:node_modules/tslib", "//modules:node_modules/zone.js", ], ) diff --git a/modules/benchmarks/src/largetable/ng2/BUILD.bazel b/modules/benchmarks/src/largetable/ng2/BUILD.bazel index 01d7902f031..57f233e55e9 100644 --- a/modules/benchmarks/src/largetable/ng2/BUILD.bazel +++ b/modules/benchmarks/src/largetable/ng2/BUILD.bazel @@ -17,12 +17,12 @@ optimize_angular_app( ], include_zonejs = True, deps = [ - "//:node_modules/rxjs", - "//:node_modules/tslib", "//modules:node_modules/@angular/build", "//modules:node_modules/@angular/common", "//modules:node_modules/@angular/core", "//modules:node_modules/@angular/platform-browser", + "//modules:node_modules/rxjs", + "//modules:node_modules/tslib", "//modules:node_modules/zone.js", ], ) diff --git a/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel b/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel index 8cceea1a651..bd6adcd09ec 100644 --- a/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel +++ b/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel @@ -14,12 +14,12 @@ optimize_angular_app( ], include_zonejs = True, deps = [ - "//:node_modules/rxjs", - "//:node_modules/tslib", "//modules:node_modules/@angular/build", "//modules:node_modules/@angular/common", "//modules:node_modules/@angular/core", "//modules:node_modules/@angular/platform-browser", + "//modules:node_modules/rxjs", + "//modules:node_modules/tslib", "//modules:node_modules/zone.js", ], ) diff --git a/modules/benchmarks/src/ng_template_outlet_context/BUILD.bazel b/modules/benchmarks/src/ng_template_outlet_context/BUILD.bazel index 522ee34e759..5330f4436e3 100644 --- a/modules/benchmarks/src/ng_template_outlet_context/BUILD.bazel +++ b/modules/benchmarks/src/ng_template_outlet_context/BUILD.bazel @@ -8,7 +8,7 @@ ts_project( srcs = ["ng_template_outlet_context.perf-spec.ts"], tsconfig = "//modules/benchmarks:tsconfig_e2e", deps = [ - "//:node_modules/protractor", + "//modules:node_modules/protractor", "//modules/utilities:utilities_rjs", ], ) diff --git a/modules/benchmarks/src/ng_template_outlet_context/ng2/BUILD.bazel b/modules/benchmarks/src/ng_template_outlet_context/ng2/BUILD.bazel index ee6da5ef68c..9d001f3abbd 100644 --- a/modules/benchmarks/src/ng_template_outlet_context/ng2/BUILD.bazel +++ b/modules/benchmarks/src/ng_template_outlet_context/ng2/BUILD.bazel @@ -12,12 +12,12 @@ optimize_angular_app( ], include_zonejs = True, deps = [ - "//:node_modules/rxjs", - "//:node_modules/tslib", "//modules:node_modules/@angular/build", "//modules:node_modules/@angular/common", "//modules:node_modules/@angular/core", "//modules:node_modules/@angular/platform-browser", + "//modules:node_modules/rxjs", + "//modules:node_modules/tslib", "//modules:node_modules/zone.js", ], ) diff --git a/modules/benchmarks/src/styling/BUILD.bazel b/modules/benchmarks/src/styling/BUILD.bazel index f4a524532e5..6193c7370f2 100644 --- a/modules/benchmarks/src/styling/BUILD.bazel +++ b/modules/benchmarks/src/styling/BUILD.bazel @@ -8,7 +8,7 @@ ts_project( srcs = ["styling_perf.spec.ts"], tsconfig = "//modules/benchmarks:tsconfig_e2e", deps = [ - "//:node_modules/protractor", + "//modules:node_modules/protractor", "//modules/utilities:utilities_rjs", ], ) diff --git a/modules/benchmarks/src/styling/ng2/BUILD.bazel b/modules/benchmarks/src/styling/ng2/BUILD.bazel index fc239602e14..c83298b91aa 100644 --- a/modules/benchmarks/src/styling/ng2/BUILD.bazel +++ b/modules/benchmarks/src/styling/ng2/BUILD.bazel @@ -12,12 +12,12 @@ optimize_angular_app( ], include_zonejs = True, deps = [ - "//:node_modules/rxjs", - "//:node_modules/tslib", "//modules:node_modules/@angular/build", "//modules:node_modules/@angular/common", "//modules:node_modules/@angular/core", "//modules:node_modules/@angular/platform-browser", + "//modules:node_modules/rxjs", + "//modules:node_modules/tslib", "//modules:node_modules/zone.js", ], ) diff --git a/modules/benchmarks/src/tree/BUILD.bazel b/modules/benchmarks/src/tree/BUILD.bazel index 308413cde26..051d4f7e04f 100644 --- a/modules/benchmarks/src/tree/BUILD.bazel +++ b/modules/benchmarks/src/tree/BUILD.bazel @@ -15,7 +15,7 @@ ts_project( srcs = ["test_utils.ts"], tsconfig = "//modules/benchmarks:tsconfig_e2e", deps = [ - "//:node_modules/protractor", + "//modules:node_modules/protractor", "//modules/utilities:utilities_rjs", ], ) @@ -27,7 +27,7 @@ ts_project( tsconfig = "//modules/benchmarks:tsconfig_e2e", deps = [ ":test_utils_lib_rjs", - "//:node_modules/protractor", + "//modules:node_modules/protractor", ], ) @@ -38,7 +38,7 @@ ts_project( tsconfig = "//modules/benchmarks:tsconfig_e2e", deps = [ ":test_utils_lib_rjs", - "//:node_modules/protractor", + "//modules:node_modules/protractor", ], ) @@ -49,7 +49,7 @@ ts_project( tsconfig = "//modules/benchmarks:tsconfig_e2e", deps = [ ":test_utils_lib_rjs", - "//:node_modules/protractor", + "//modules:node_modules/protractor", ], ) @@ -60,6 +60,6 @@ ts_project( tsconfig = "//modules/benchmarks:tsconfig_e2e", deps = [ ":test_utils_lib_rjs", - "//:node_modules/protractor", + "//modules:node_modules/protractor", ], ) diff --git a/modules/benchmarks/src/tree/baseline/BUILD.bazel b/modules/benchmarks/src/tree/baseline/BUILD.bazel index 077b0fbf9c2..15fa8d0dc0d 100644 --- a/modules/benchmarks/src/tree/baseline/BUILD.bazel +++ b/modules/benchmarks/src/tree/baseline/BUILD.bazel @@ -14,12 +14,12 @@ optimize_angular_app( ], include_zonejs = True, deps = [ - "//:node_modules/rxjs", - "//:node_modules/tslib", "//modules:node_modules/@angular/build", "//modules:node_modules/@angular/common", "//modules:node_modules/@angular/core", "//modules:node_modules/@angular/platform-browser", + "//modules:node_modules/rxjs", + "//modules:node_modules/tslib", "//modules:node_modules/zone.js", ], ) diff --git a/modules/benchmarks/src/tree/ng2/BUILD.bazel b/modules/benchmarks/src/tree/ng2/BUILD.bazel index de3452d3ff5..f117785ff1e 100644 --- a/modules/benchmarks/src/tree/ng2/BUILD.bazel +++ b/modules/benchmarks/src/tree/ng2/BUILD.bazel @@ -17,12 +17,12 @@ optimize_angular_app( ], include_zonejs = True, deps = [ - "//:node_modules/rxjs", - "//:node_modules/tslib", "//modules:node_modules/@angular/build", "//modules:node_modules/@angular/common", "//modules:node_modules/@angular/core", "//modules:node_modules/@angular/platform-browser", + "//modules:node_modules/rxjs", + "//modules:node_modules/tslib", "//modules:node_modules/zone.js", ], ) diff --git a/modules/benchmarks/src/tree/ng2_static/BUILD.bazel b/modules/benchmarks/src/tree/ng2_static/BUILD.bazel index 713e797ea05..07720b2899c 100644 --- a/modules/benchmarks/src/tree/ng2_static/BUILD.bazel +++ b/modules/benchmarks/src/tree/ng2_static/BUILD.bazel @@ -19,13 +19,13 @@ optimize_angular_app( # This benchmark relies on JIT. jq_config_filter = ".projects.boilerplate.architect.build.options.aot = false", deps = [ - "//:node_modules/rxjs", - "//:node_modules/tslib", "//modules:node_modules/@angular/build", "//modules:node_modules/@angular/common", "//modules:node_modules/@angular/compiler", "//modules:node_modules/@angular/core", "//modules:node_modules/@angular/platform-browser", + "//modules:node_modules/rxjs", + "//modules:node_modules/tslib", "//modules:node_modules/zone.js", ], ) @@ -42,10 +42,10 @@ http_server( name = "devserver", srcs = [ "index.html", - "@npm//:node_modules/reflect-metadata/Reflect.js", ], deps = [ ":app_bundle", + "//modules:node_modules/reflect-metadata", "//modules:node_modules/zone.js", ], ) diff --git a/modules/benchmarks/src/tree/ng2_static/index.html b/modules/benchmarks/src/tree/ng2_static/index.html index c59ddb12d79..8d0d3f996e1 100644 --- a/modules/benchmarks/src/tree/ng2_static/index.html +++ b/modules/benchmarks/src/tree/ng2_static/index.html @@ -26,7 +26,7 @@ - + diff --git a/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel b/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel index 084c515535c..1eec6f475ad 100644 --- a/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel +++ b/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel @@ -14,12 +14,12 @@ optimize_angular_app( ], include_zonejs = True, deps = [ - "//:node_modules/rxjs", - "//:node_modules/tslib", "//modules:node_modules/@angular/build", "//modules:node_modules/@angular/common", "//modules:node_modules/@angular/core", "//modules:node_modules/@angular/platform-browser", + "//modules:node_modules/rxjs", + "//modules:node_modules/tslib", "//modules:node_modules/zone.js", ], ) diff --git a/modules/package.json b/modules/package.json index 4c3fbefff2b..f662a7c59ed 100644 --- a/modules/package.json +++ b/modules/package.json @@ -8,15 +8,23 @@ "@angular/core": "workspace:*", "@angular/forms": "workspace:*", "@angular/localize": "workspace:*", - "@angular/platform-browser": "workspace:*", "@angular/platform-browser-dynamic": "workspace:*", + "@angular/platform-browser": "workspace:*", "@angular/router": "workspace:*", "@angular/upgrade": "workspace:*", + "@bazel/runfiles": "6.3.1", + "@types/jasmine": "5.1.8", + "@types/jasminewd2": "2.0.13", "@types/node": "24.0.10", "@types/selenium-webdriver": "3.0.7", + "angular-1.8": "npm:angular@1.8", "protractor": "7.0.0", + "reflect-metadata": "0.2.2", + "rxjs": "7.8.2", "selenium-webdriver": "3.6.0", + "source-map": "0.7.4", "tslib": "2.8.1", + "yargs": "18.0.0", "zone.js": "workspace:*" } } diff --git a/modules/playground/BUILD.bazel b/modules/playground/BUILD.bazel index de6449a72d6..9f06454ca63 100644 --- a/modules/playground/BUILD.bazel +++ b/modules/playground/BUILD.bazel @@ -6,8 +6,8 @@ ts_config( name = "tsconfig_e2e", src = "tsconfig-e2e.json", deps = [ - "//:node_modules/@types/jasmine", - "//:node_modules/@types/node", + "//modules:node_modules/@types/jasmine", + "//modules:node_modules/@types/node", ], ) @@ -16,6 +16,6 @@ ts_config( src = "tsconfig-e2e-legacy-wd2.json", deps = [ ":tsconfig_e2e", - "//:node_modules/@types/jasminewd2", + "//modules:node_modules/@types/jasminewd2", ], ) diff --git a/modules/playground/e2e_test/example_test.bzl b/modules/playground/e2e_test/example_test.bzl index 75beaacae16..6b912ed6e37 100644 --- a/modules/playground/e2e_test/example_test.bzl +++ b/modules/playground/e2e_test/example_test.bzl @@ -23,8 +23,8 @@ def example_test( srcs = srcs, tsconfig = tsconfig, deps = deps + [ - "//:node_modules/protractor", - "//:node_modules/@types/selenium-webdriver", + "//modules:node_modules/protractor", + "//modules:node_modules/@types/selenium-webdriver", "//modules/utilities:utilities_rjs", ], ) @@ -52,6 +52,6 @@ def example_test( server = server, data = data + [ "//modules:node_modules/selenium-webdriver", - "//:node_modules/yargs", + "//modules:node_modules/yargs", ], ) diff --git a/modules/playground/e2e_test/sourcemap/BUILD.bazel b/modules/playground/e2e_test/sourcemap/BUILD.bazel index 778aad519bc..085745bee3d 100644 --- a/modules/playground/e2e_test/sourcemap/BUILD.bazel +++ b/modules/playground/e2e_test/sourcemap/BUILD.bazel @@ -11,7 +11,7 @@ example_test( server = "//modules/playground/src/sourcemap:devserver", use_legacy_webdriver_types = False, deps = [ - "//:node_modules/@bazel/runfiles", - "//:node_modules/source-map", + "//modules:node_modules/@bazel/runfiles", + "//modules:node_modules/source-map", ], ) diff --git a/modules/playground/src/animate/BUILD.bazel b/modules/playground/src/animate/BUILD.bazel index 641117d4131..50a0dd022e5 100644 --- a/modules/playground/src/animate/BUILD.bazel +++ b/modules/playground/src/animate/BUILD.bazel @@ -8,13 +8,13 @@ optimize_angular_app( srcs = glob(["**/*.ts"]) + glob(["**/*.css"]) + ["index.html"], include_zonejs = True, deps = [ - "//:node_modules/rxjs", - "//:node_modules/tslib", "//modules:node_modules/@angular/animations", "//modules:node_modules/@angular/build", "//modules:node_modules/@angular/common", "//modules:node_modules/@angular/core", "//modules:node_modules/@angular/platform-browser", + "//modules:node_modules/rxjs", + "//modules:node_modules/tslib", "//modules:node_modules/zone.js", ], ) diff --git a/modules/playground/src/async/BUILD.bazel b/modules/playground/src/async/BUILD.bazel index b2efc668202..07b0fb80c93 100644 --- a/modules/playground/src/async/BUILD.bazel +++ b/modules/playground/src/async/BUILD.bazel @@ -8,12 +8,12 @@ optimize_angular_app( srcs = glob(["**/*.ts"]) + ["index.html"], include_zonejs = True, deps = [ - "//:node_modules/rxjs", - "//:node_modules/tslib", "//modules:node_modules/@angular/build", "//modules:node_modules/@angular/common", "//modules:node_modules/@angular/core", "//modules:node_modules/@angular/platform-browser", + "//modules:node_modules/rxjs", + "//modules:node_modules/tslib", "//modules:node_modules/zone.js", ], ) diff --git a/modules/playground/src/hello_world/BUILD.bazel b/modules/playground/src/hello_world/BUILD.bazel index a5f43960c1a..d41202e078b 100644 --- a/modules/playground/src/hello_world/BUILD.bazel +++ b/modules/playground/src/hello_world/BUILD.bazel @@ -8,12 +8,12 @@ optimize_angular_app( srcs = glob(["**/*.ts"]) + ["index.html"], include_zonejs = True, deps = [ - "//:node_modules/rxjs", - "//:node_modules/tslib", "//modules:node_modules/@angular/build", "//modules:node_modules/@angular/common", "//modules:node_modules/@angular/core", "//modules:node_modules/@angular/platform-browser", + "//modules:node_modules/rxjs", + "//modules:node_modules/tslib", "//modules:node_modules/zone.js", ], ) diff --git a/modules/playground/src/http/BUILD.bazel b/modules/playground/src/http/BUILD.bazel index 8816bb6ee8a..0fa07a949a4 100644 --- a/modules/playground/src/http/BUILD.bazel +++ b/modules/playground/src/http/BUILD.bazel @@ -11,12 +11,12 @@ optimize_angular_app( ], include_zonejs = True, deps = [ - "//:node_modules/rxjs", - "//:node_modules/tslib", "//modules:node_modules/@angular/build", "//modules:node_modules/@angular/common", "//modules:node_modules/@angular/core", "//modules:node_modules/@angular/platform-browser", + "//modules:node_modules/rxjs", + "//modules:node_modules/tslib", "//modules:node_modules/zone.js", ], ) diff --git a/modules/playground/src/jsonp/BUILD.bazel b/modules/playground/src/jsonp/BUILD.bazel index 8816bb6ee8a..0fa07a949a4 100644 --- a/modules/playground/src/jsonp/BUILD.bazel +++ b/modules/playground/src/jsonp/BUILD.bazel @@ -11,12 +11,12 @@ optimize_angular_app( ], include_zonejs = True, deps = [ - "//:node_modules/rxjs", - "//:node_modules/tslib", "//modules:node_modules/@angular/build", "//modules:node_modules/@angular/common", "//modules:node_modules/@angular/core", "//modules:node_modules/@angular/platform-browser", + "//modules:node_modules/rxjs", + "//modules:node_modules/tslib", "//modules:node_modules/zone.js", ], ) diff --git a/modules/playground/src/key_events/BUILD.bazel b/modules/playground/src/key_events/BUILD.bazel index a5f43960c1a..d41202e078b 100644 --- a/modules/playground/src/key_events/BUILD.bazel +++ b/modules/playground/src/key_events/BUILD.bazel @@ -8,12 +8,12 @@ optimize_angular_app( srcs = glob(["**/*.ts"]) + ["index.html"], include_zonejs = True, deps = [ - "//:node_modules/rxjs", - "//:node_modules/tslib", "//modules:node_modules/@angular/build", "//modules:node_modules/@angular/common", "//modules:node_modules/@angular/core", "//modules:node_modules/@angular/platform-browser", + "//modules:node_modules/rxjs", + "//modules:node_modules/tslib", "//modules:node_modules/zone.js", ], ) diff --git a/modules/playground/src/sourcemap/BUILD.bazel b/modules/playground/src/sourcemap/BUILD.bazel index 7f5c9b14f78..2bf6e059cc9 100644 --- a/modules/playground/src/sourcemap/BUILD.bazel +++ b/modules/playground/src/sourcemap/BUILD.bazel @@ -10,12 +10,12 @@ optimize_angular_app( include_zonejs = True, jq_config_filter = ".projects.boilerplate.architect.build.options.sourceMap.scripts = true", deps = [ - "//:node_modules/rxjs", - "//:node_modules/tslib", "//modules:node_modules/@angular/build", "//modules:node_modules/@angular/common", "//modules:node_modules/@angular/core", "//modules:node_modules/@angular/platform-browser", + "//modules:node_modules/rxjs", + "//modules:node_modules/tslib", "//modules:node_modules/zone.js", ], ) diff --git a/modules/playground/src/svg/BUILD.bazel b/modules/playground/src/svg/BUILD.bazel index b2efc668202..07b0fb80c93 100644 --- a/modules/playground/src/svg/BUILD.bazel +++ b/modules/playground/src/svg/BUILD.bazel @@ -8,12 +8,12 @@ optimize_angular_app( srcs = glob(["**/*.ts"]) + ["index.html"], include_zonejs = True, deps = [ - "//:node_modules/rxjs", - "//:node_modules/tslib", "//modules:node_modules/@angular/build", "//modules:node_modules/@angular/common", "//modules:node_modules/@angular/core", "//modules:node_modules/@angular/platform-browser", + "//modules:node_modules/rxjs", + "//modules:node_modules/tslib", "//modules:node_modules/zone.js", ], ) diff --git a/modules/playground/src/template_driven_forms/BUILD.bazel b/modules/playground/src/template_driven_forms/BUILD.bazel index 05cbca8ef4c..d4aecea27ca 100644 --- a/modules/playground/src/template_driven_forms/BUILD.bazel +++ b/modules/playground/src/template_driven_forms/BUILD.bazel @@ -8,13 +8,13 @@ optimize_angular_app( srcs = glob(["**/*.ts"]) + ["index.html"], include_zonejs = True, deps = [ - "//:node_modules/rxjs", - "//:node_modules/tslib", "//modules:node_modules/@angular/build", "//modules:node_modules/@angular/common", "//modules:node_modules/@angular/core", "//modules:node_modules/@angular/forms", "//modules:node_modules/@angular/platform-browser", + "//modules:node_modules/rxjs", + "//modules:node_modules/tslib", "//modules:node_modules/zone.js", ], ) diff --git a/modules/playground/src/todo/BUILD.bazel b/modules/playground/src/todo/BUILD.bazel index 639d4ea0416..a032f063b93 100644 --- a/modules/playground/src/todo/BUILD.bazel +++ b/modules/playground/src/todo/BUILD.bazel @@ -12,12 +12,12 @@ optimize_angular_app( ], include_zonejs = True, deps = [ - "//:node_modules/rxjs", - "//:node_modules/tslib", "//modules:node_modules/@angular/build", "//modules:node_modules/@angular/common", "//modules:node_modules/@angular/core", "//modules:node_modules/@angular/platform-browser", + "//modules:node_modules/rxjs", + "//modules:node_modules/tslib", "//modules:node_modules/zone.js", ], ) diff --git a/modules/playground/src/upgrade/BUILD.bazel b/modules/playground/src/upgrade/BUILD.bazel index a876b82d7a7..835759cf0f4 100644 --- a/modules/playground/src/upgrade/BUILD.bazel +++ b/modules/playground/src/upgrade/BUILD.bazel @@ -14,8 +14,6 @@ optimize_angular_app( .projects.boilerplate.architect.build.options.optimization.scripts = false """, deps = [ - "//:node_modules/rxjs", - "//:node_modules/tslib", "//modules:node_modules/@angular/build", "//modules:node_modules/@angular/common", "//modules:node_modules/@angular/compiler", @@ -23,6 +21,8 @@ optimize_angular_app( "//modules:node_modules/@angular/platform-browser", "//modules:node_modules/@angular/platform-browser-dynamic", "//modules:node_modules/@angular/upgrade", + "//modules:node_modules/rxjs", + "//modules:node_modules/tslib", "//modules:node_modules/zone.js", ], ) @@ -39,11 +39,11 @@ http_server( name = "devserver", srcs = [ "index.html", - "@npm//:node_modules/angular-1.8/angular.js", - "@npm//:node_modules/reflect-metadata/Reflect.js", ], deps = [ ":app_bundle", + "//modules:node_modules/angular-1.8", + "//modules:node_modules/reflect-metadata", "//modules:node_modules/zone.js", ], ) diff --git a/modules/playground/src/upgrade/index.html b/modules/playground/src/upgrade/index.html index b5b30c764c5..60fdf6e89fa 100644 --- a/modules/playground/src/upgrade/index.html +++ b/modules/playground/src/upgrade/index.html @@ -17,8 +17,8 @@ Greetings from {{name}}! - - + + diff --git a/modules/playground/src/zippy_component/BUILD.bazel b/modules/playground/src/zippy_component/BUILD.bazel index 99f6b32bfa0..5db2a57489f 100644 --- a/modules/playground/src/zippy_component/BUILD.bazel +++ b/modules/playground/src/zippy_component/BUILD.bazel @@ -11,12 +11,12 @@ optimize_angular_app( ], include_zonejs = True, deps = [ - "//:node_modules/rxjs", - "//:node_modules/tslib", "//modules:node_modules/@angular/build", "//modules:node_modules/@angular/common", "//modules:node_modules/@angular/core", "//modules:node_modules/@angular/platform-browser", + "//modules:node_modules/rxjs", + "//modules:node_modules/tslib", "//modules:node_modules/zone.js", ], ) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 04eff06abaf..bfb9f06fc02 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -846,21 +846,45 @@ importers: '@angular/upgrade': specifier: workspace:* version: link:../packages/upgrade + '@bazel/runfiles': + specifier: 6.3.1 + version: 6.3.1 + '@types/jasmine': + specifier: 5.1.8 + version: 5.1.8 + '@types/jasminewd2': + specifier: 2.0.13 + version: 2.0.13 '@types/node': specifier: 24.0.10 version: 24.0.10 '@types/selenium-webdriver': specifier: 3.0.7 version: 3.0.7 + angular-1.8: + specifier: npm:angular@1.8 + version: /angular@1.8.3 protractor: specifier: 7.0.0 version: 7.0.0 + reflect-metadata: + specifier: 0.2.2 + version: 0.2.2 + rxjs: + specifier: 7.8.2 + version: 7.8.2 selenium-webdriver: specifier: 3.6.0 version: 3.6.0 + source-map: + specifier: 0.7.4 + version: 0.7.4 tslib: specifier: 2.8.1 version: 2.8.1 + yargs: + specifier: 18.0.0 + version: 18.0.0 zone.js: specifier: workspace:* version: link:../packages/zone.js @@ -10908,26 +10932,26 @@ packages: /custom-event@1.0.1: resolution: {integrity: sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg==, tarball: https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz} - /cytoscape-cose-bilkent@4.1.0(cytoscape@3.32.0): + /cytoscape-cose-bilkent@4.1.0(cytoscape@3.32.1): resolution: {integrity: sha512-wgQlVIUJF13Quxiv5e1gstZ08rnZj2XaLHGoFMYXz7SkNfCDOOteKBE6SYRfA9WxxI/iBc3ajfDoc6hb/MRAHQ==, tarball: https://registry.npmjs.org/cytoscape-cose-bilkent/-/cytoscape-cose-bilkent-4.1.0.tgz} peerDependencies: cytoscape: ^3.2.0 dependencies: cose-base: 1.0.3 - cytoscape: 3.32.0 + cytoscape: 3.32.1 dev: false - /cytoscape-fcose@2.2.0(cytoscape@3.32.0): + /cytoscape-fcose@2.2.0(cytoscape@3.32.1): resolution: {integrity: sha512-ki1/VuRIHFCzxWNrsshHYPs6L7TvLu3DL+TyIGEsRcvVERmxokbf5Gdk7mFxZnTdiGtnA4cfSmjZJMviqSuZrQ==, tarball: https://registry.npmjs.org/cytoscape-fcose/-/cytoscape-fcose-2.2.0.tgz} peerDependencies: cytoscape: ^3.2.0 dependencies: cose-base: 2.2.0 - cytoscape: 3.32.0 + cytoscape: 3.32.1 dev: false - /cytoscape@3.32.0: - resolution: {integrity: sha512-5JHBC9n75kz5851jeklCPmZWcg3hUe6sjqJvyk3+hVqFaKcHwHgxsjeN1yLmggoUc6STbtm9/NQyabQehfjvWQ==, tarball: https://registry.npmjs.org/cytoscape/-/cytoscape-3.32.0.tgz} + /cytoscape@3.32.1: + resolution: {integrity: sha512-dbeqFTLYEwlFg7UGtcZhCCG/2WayX72zK3Sq323CEX29CY81tYfVhw1MIdduCtpstB0cTOhJswWlM/OEB3Xp+Q==, tarball: https://registry.npmjs.org/cytoscape/-/cytoscape-3.32.1.tgz} engines: {node: '>=0.10'} dev: false @@ -16400,9 +16424,9 @@ packages: '@iconify/utils': 2.3.0 '@mermaid-js/parser': 0.6.1 '@types/d3': 7.4.3 - cytoscape: 3.32.0 - cytoscape-cose-bilkent: 4.1.0(cytoscape@3.32.0) - cytoscape-fcose: 2.2.0(cytoscape@3.32.0) + cytoscape: 3.32.1 + cytoscape-cose-bilkent: 4.1.0(cytoscape@3.32.1) + cytoscape-fcose: 2.2.0(cytoscape@3.32.1) d3: 7.9.0 d3-sankey: 0.12.3 dagre-d3-es: 7.0.11