From 6b976956868bb37342f7efe79373284949804ee2 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 25 Aug 2021 05:28:44 +0000 Subject: [PATCH 1/2] build: update bazel to v4 --- WORKSPACE | 4 ++-- package.json | 4 ++-- yarn.lock | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 7de2fee5ad9f..219516499688 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -7,8 +7,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "build_bazel_rules_nodejs", - sha256 = "e79c08a488cc5ac40981987d862c7320cee8741122a2649e9b08e850b6f20442", - urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/3.8.0/rules_nodejs-3.8.0.tar.gz"], + sha256 = "8a7c981217239085f78acc9898a1f7ba99af887c1996ceb3b4504655383a2c3c", + urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/4.0.0/rules_nodejs-4.0.0.tar.gz"], ) # Check the bazel version and download npm dependencies diff --git a/package.json b/package.json index e3330b25383e..661a721cd9d5 100644 --- a/package.json +++ b/package.json @@ -92,8 +92,8 @@ "@babel/template": "7.14.5", "@bazel/bazelisk": "1.10.1", "@bazel/buildifier": "4.0.1", - "@bazel/jasmine": "3.8.0", - "@bazel/typescript": "3.8.0", + "@bazel/jasmine": "4.0.0", + "@bazel/typescript": "4.0.0", "@discoveryjs/json-ext": "0.5.3", "@jsdevtools/coverage-istanbul-loader": "3.0.5", "@types/babel__core": "7.1.15", diff --git a/yarn.lock b/yarn.lock index edd7ff066e42..f0056ac973ae 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1169,10 +1169,10 @@ resolved "https://registry.yarnpkg.com/@bazel/esbuild/-/esbuild-4.0.0-rc.1.tgz#d212e31a7ceb0a5f8328119a9a2abd4d0e9e10b5" integrity sha512-Xlb0wCYjN2LTPusAxFOrZOESzdjQU9nXO2vAU4yaivny7B+xmaEhLU7/8XPWxq5rU/jRfeuwe1NpKuRlZiQ3hQ== -"@bazel/jasmine@3.8.0": - version "3.8.0" - resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-3.8.0.tgz#f66a94fd17439cf9281c21200bad3c8b91d5525b" - integrity sha512-JjqEqFbl+kmABEcdbMYhicIOsNbocXIo/Wd2C7NNBz02ehQiynjYlc0BfyKyH7eHWR01z39RsGlXCyJD4kYKjw== +"@bazel/jasmine@4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-4.0.0.tgz#2e95f1b3458e0d69f16e0c820fe4631a43942a90" + integrity sha512-vi1n+vbLwKki7aa8kXDG709nxRXAmLEvqbijSpm8d3rrW4f68Ad5xKyT2gezO84OeysUHU3cDZViXWwFcoHRng== dependencies: c8 "~7.5.0" jasmine-reporters "~2.4.0" @@ -1195,10 +1195,10 @@ resolved "https://registry.yarnpkg.com/@bazel/runfiles/-/runfiles-4.0.0-rc.1.tgz#aaf97d633ba813db2c0bfa5bc126f50118d82066" integrity sha512-0RGbEe4hBpafbLSIIBYGFPRLZ7FRJ+S6PjdVfRkpZlNpe6T1QXxgdg6M5/ETQXNVqfdUhMLdNFZ1heMk4uXhzg== -"@bazel/typescript@3.8.0": - version "3.8.0" - resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-3.8.0.tgz#725d51a1c25e314a1d8cddb8b880ac05ba97acd4" - integrity sha512-4C1pLe4V7aidWqcPsWNqXFS7uHAB1nH5SUKG5uWoVv4JT9XhkNSvzzQIycMwXs2tZeCylX4KYNeNvfKrmkyFlw== +"@bazel/typescript@4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-4.0.0.tgz#71a6f0f5e340c6b8516b21fbc0f0853e74055d0c" + integrity sha512-+Le9q+5IR9gEnSH8sXyxDB5dD6NJx2kbm6AL+cijYVat2MczpGV4sI1mu0mdLzYsEX5Tjt5iHkaNb7sFESjnYA== dependencies: protobufjs "6.8.8" semver "5.6.0" From a7318a9ca55080fc3bb159a69487c9f553c4b0e7 Mon Sep 17 00:00:00 2001 From: Charles Lyding <19598772+clydin@users.noreply.github.com> Date: Wed, 25 Aug 2021 13:03:19 -0400 Subject: [PATCH 2/2] build: add Bazel ts_library rule package_name properties to all packages rules_nodejs 4 requires that a package_name property be specified within a ts_library rule for the output to be linked into the package repository. Failing to add the property can cause test failures due to unresolved packages. --- packages/angular/cli/BUILD.bazel | 1 + packages/angular/pwa/BUILD.bazel | 1 + packages/angular_devkit/architect/BUILD.bazel | 1 + packages/angular_devkit/architect_cli/BUILD.bazel | 1 + packages/angular_devkit/benchmark/BUILD.bazel | 1 + packages/angular_devkit/build_angular/BUILD.bazel | 1 + packages/angular_devkit/build_optimizer/BUILD.bazel | 1 + packages/angular_devkit/build_webpack/BUILD.bazel | 1 + packages/angular_devkit/core/BUILD.bazel | 1 + packages/angular_devkit/schematics/BUILD.bazel | 1 + packages/angular_devkit/schematics_cli/BUILD.bazel | 1 + packages/ngtools/webpack/BUILD.bazel | 1 + packages/schematics/angular/BUILD.bazel | 1 + 13 files changed, 13 insertions(+) diff --git a/packages/angular/cli/BUILD.bazel b/packages/angular/cli/BUILD.bazel index cd7398fc2698..ef345b90c9ba 100644 --- a/packages/angular/cli/BUILD.bazel +++ b/packages/angular/cli/BUILD.bazel @@ -19,6 +19,7 @@ package(default_visibility = ["//visibility:public"]) ts_library( name = "angular-cli", + package_name = "@angular/cli", srcs = glob( include = ["**/*.ts"], exclude = [ diff --git a/packages/angular/pwa/BUILD.bazel b/packages/angular/pwa/BUILD.bazel index d51f7597381e..5b7a218b5c96 100644 --- a/packages/angular/pwa/BUILD.bazel +++ b/packages/angular/pwa/BUILD.bazel @@ -13,6 +13,7 @@ package(default_visibility = ["//visibility:public"]) ts_library( name = "pwa", + package_name = "@angular/pwa", srcs = glob( ["**/*.ts"], # Currently, this library is used only with the rollup plugin. diff --git a/packages/angular_devkit/architect/BUILD.bazel b/packages/angular_devkit/architect/BUILD.bazel index 595c478fa478..e0fcd482d69f 100644 --- a/packages/angular_devkit/architect/BUILD.bazel +++ b/packages/angular_devkit/architect/BUILD.bazel @@ -39,6 +39,7 @@ ts_json_schema( ts_library( name = "architect", + package_name = "@angular-devkit/architect", srcs = glob( include = ["src/**/*.ts"], exclude = ["**/*_spec.ts"], diff --git a/packages/angular_devkit/architect_cli/BUILD.bazel b/packages/angular_devkit/architect_cli/BUILD.bazel index 99c780a3c7f2..2381827d2753 100644 --- a/packages/angular_devkit/architect_cli/BUILD.bazel +++ b/packages/angular_devkit/architect_cli/BUILD.bazel @@ -10,6 +10,7 @@ package(default_visibility = ["//visibility:public"]) ts_library( name = "architect_cli", + package_name = "@angular-devkit/architect-cli", srcs = [ "bin/architect.ts", ] + glob(["src/**/*.ts"]), diff --git a/packages/angular_devkit/benchmark/BUILD.bazel b/packages/angular_devkit/benchmark/BUILD.bazel index a2a51076e6a1..be39c99f8c53 100644 --- a/packages/angular_devkit/benchmark/BUILD.bazel +++ b/packages/angular_devkit/benchmark/BUILD.bazel @@ -17,6 +17,7 @@ package(default_visibility = ["//visibility:public"]) ts_library( name = "benchmark", + package_name = "@angular-devkit/benchmark", srcs = glob( include = ["src/**/*.ts"], exclude = [ diff --git a/packages/angular_devkit/build_angular/BUILD.bazel b/packages/angular_devkit/build_angular/BUILD.bazel index d6fc16e9d0e6..ff7517b77b30 100644 --- a/packages/angular_devkit/build_angular/BUILD.bazel +++ b/packages/angular_devkit/build_angular/BUILD.bazel @@ -59,6 +59,7 @@ ts_json_schema( ts_library( name = "build_angular", + package_name = "@angular-devkit/build-angular", srcs = glob( include = [ "src/**/*.ts", diff --git a/packages/angular_devkit/build_optimizer/BUILD.bazel b/packages/angular_devkit/build_optimizer/BUILD.bazel index b02beb4a7d81..9847f12c893f 100644 --- a/packages/angular_devkit/build_optimizer/BUILD.bazel +++ b/packages/angular_devkit/build_optimizer/BUILD.bazel @@ -18,6 +18,7 @@ package(default_visibility = ["//visibility:public"]) ts_library( name = "build_optimizer", + package_name = "@angular-devkit/build-optimizer", srcs = glob( include = ["src/**/*.ts"], exclude = [ diff --git a/packages/angular_devkit/build_webpack/BUILD.bazel b/packages/angular_devkit/build_webpack/BUILD.bazel index 9876e2c92431..a25c7a6fa47c 100644 --- a/packages/angular_devkit/build_webpack/BUILD.bazel +++ b/packages/angular_devkit/build_webpack/BUILD.bazel @@ -29,6 +29,7 @@ ts_json_schema( ts_library( name = "build_webpack", + package_name = "@angular-devkit/build-webpack", srcs = glob( include = ["src/**/*.ts"], exclude = [ diff --git a/packages/angular_devkit/core/BUILD.bazel b/packages/angular_devkit/core/BUILD.bazel index dfdcdd3b908b..0f7485f44ee1 100644 --- a/packages/angular_devkit/core/BUILD.bazel +++ b/packages/angular_devkit/core/BUILD.bazel @@ -19,6 +19,7 @@ licenses(["notice"]) # MIT License ts_library( name = "core", + package_name = "@angular-devkit/core", srcs = glob( include = ["src/**/*.ts"], exclude = [ diff --git a/packages/angular_devkit/schematics/BUILD.bazel b/packages/angular_devkit/schematics/BUILD.bazel index c108c65eff5f..7b22b7976311 100644 --- a/packages/angular_devkit/schematics/BUILD.bazel +++ b/packages/angular_devkit/schematics/BUILD.bazel @@ -19,6 +19,7 @@ licenses(["notice"]) ts_library( name = "schematics", + package_name = "@angular-devkit/schematics", srcs = glob( include = ["src/**/*.ts"], exclude = [ diff --git a/packages/angular_devkit/schematics_cli/BUILD.bazel b/packages/angular_devkit/schematics_cli/BUILD.bazel index 8dedb20c2bbc..1d2ccc908b91 100644 --- a/packages/angular_devkit/schematics_cli/BUILD.bazel +++ b/packages/angular_devkit/schematics_cli/BUILD.bazel @@ -13,6 +13,7 @@ package(default_visibility = ["//visibility:public"]) # @angular-devkit/schematics-cli ts_library( name = "schematics_cli", + package_name = "@angular-devkit/schematics-cli", srcs = glob( include = ["**/*.ts"], exclude = [ diff --git a/packages/ngtools/webpack/BUILD.bazel b/packages/ngtools/webpack/BUILD.bazel index 2ef7e20f7007..1222ccb29863 100644 --- a/packages/ngtools/webpack/BUILD.bazel +++ b/packages/ngtools/webpack/BUILD.bazel @@ -18,6 +18,7 @@ package(default_visibility = ["//visibility:public"]) ts_library( name = "webpack", + package_name = "@ngtools/webpack", srcs = glob( include = [ "src/**/*.ts", diff --git a/packages/schematics/angular/BUILD.bazel b/packages/schematics/angular/BUILD.bazel index 68ce02da5d48..b08c3791d3da 100644 --- a/packages/schematics/angular/BUILD.bazel +++ b/packages/schematics/angular/BUILD.bazel @@ -42,6 +42,7 @@ ALL_SCHEMA_TARGETS = [ ts_library( name = "angular", + package_name = "@schematics/angular", srcs = glob( include = ["**/*.ts"], exclude = [