From cffb00ec11ae1da822019d1e6f7f18b7409c9d23 Mon Sep 17 00:00:00 2001 From: Joey Perrott Date: Tue, 26 Jan 2021 09:11:37 -0800 Subject: [PATCH] build: update bazel rules_nodejs to 2.3.3 (#40581) Updates to rules_nodejs@2.3.3 to take advantage of windows specific fixes. rules_nodejs@2.3.3 was created as a patch specifically with a fix for the issues we found updating to rules_nodejs@2.2.2. PR Close #40581 --- WORKSPACE | 4 +- integration/bazel/WORKSPACE | 4 +- integration/bazel/package.json | 10 ++-- package.json | 12 ++--- packages/bazel/index.bzl | 2 +- packages/bazel/src/ng_package/ng_package.bzl | 20 ++++++++ yarn.lock | 48 ++++++++++---------- 7 files changed, 60 insertions(+), 40 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 371ff87b6c..abc0a58541 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -8,8 +8,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 = "4952ef879704ab4ad6729a29007e7094aef213ea79e9f2e94cbe1c9a753e63ef", - urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/2.2.0/rules_nodejs-2.2.0.tar.gz"], + sha256 = "9d93d4e1340c43dbf6b2fd66b683d89630a6310bf8be3bf40ec96685dcacc26c", + urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/2.3.3/rules_nodejs-2.3.3.tar.gz"], ) # Check the rules_nodejs version and download npm dependencies diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE index a8182e19aa..cf0da16cf6 100644 --- a/integration/bazel/WORKSPACE +++ b/integration/bazel/WORKSPACE @@ -5,8 +5,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") # Fetch rules_nodejs so we can install our npm dependencies http_archive( name = "build_bazel_rules_nodejs", - sha256 = "4952ef879704ab4ad6729a29007e7094aef213ea79e9f2e94cbe1c9a753e63ef", - urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/2.2.0/rules_nodejs-2.2.0.tar.gz"], + sha256 = "9d93d4e1340c43dbf6b2fd66b683d89630a6310bf8be3bf40ec96685dcacc26c", + urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/2.3.3/rules_nodejs-2.3.3.tar.gz"], ) # Fetch sass rules for compiling sass files diff --git a/integration/bazel/package.json b/integration/bazel/package.json index c7347b3814..442013ef5a 100644 --- a/integration/bazel/package.json +++ b/integration/bazel/package.json @@ -23,11 +23,11 @@ "@angular/compiler": "file:../../dist/packages-dist/compiler", "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli", "@bazel/bazelisk": "file:../../node_modules/@bazel/bazelisk", - "@bazel/karma": "2.2.0", - "@bazel/protractor": "2.2.0", - "@bazel/rollup": "2.2.0", - "@bazel/terser": "2.2.0", - "@bazel/typescript": "2.2.0", + "@bazel/karma": "2.3.3", + "@bazel/protractor": "2.3.3", + "@bazel/rollup": "2.3.3", + "@bazel/terser": "2.3.3", + "@bazel/typescript": "2.3.3", "@types/jasmine": "2.8.8", "http-server": "0.12.0", "karma": "4.4.1", diff --git a/package.json b/package.json index 5d66b5e224..a280632b7a 100644 --- a/package.json +++ b/package.json @@ -52,12 +52,12 @@ "@babel/template": "^7.8.6", "@babel/traverse": "^7.8.6", "@babel/types": "^7.8.6", - "@bazel/jasmine": "2.3.1", - "@bazel/karma": "2.3.1", - "@bazel/protractor": "2.3.1", - "@bazel/rollup": "2.3.1", - "@bazel/terser": "2.3.1", - "@bazel/typescript": "2.3.1", + "@bazel/jasmine": "2.3.3", + "@bazel/karma": "2.3.3", + "@bazel/protractor": "2.3.3", + "@bazel/rollup": "2.3.3", + "@bazel/terser": "2.3.3", + "@bazel/typescript": "2.3.3", "@microsoft/api-extractor": "7.7.11", "@octokit/rest": "16.28.7", "@octokit/types": "^5.0.1", diff --git a/packages/bazel/index.bzl b/packages/bazel/index.bzl index 8c85c121ad..6f28d7db87 100644 --- a/packages/bazel/index.bzl +++ b/packages/bazel/index.bzl @@ -7,7 +7,7 @@ Users should not load files under "/src" """ -load("//packages/bazel/src/ng_package:ng_package.bzl", _ng_package = "ng_package") +load("//packages/bazel/src/ng_package:ng_package.bzl", _ng_package = "ng_package_macro") load("//packages/bazel/src:ng_module.bzl", _ng_module = "ng_module_macro") ng_module = _ng_module diff --git a/packages/bazel/src/ng_package/ng_package.bzl b/packages/bazel/src/ng_package/ng_package.bzl index e038f4a8b8..f0a07a848e 100644 --- a/packages/bazel/src/ng_package/ng_package.bzl +++ b/packages/bazel/src/ng_package/ng_package.bzl @@ -811,3 +811,23 @@ ng_package = rule( """ ng_package produces an npm-ready package from an Angular library. """ + +def ng_package_macro(name, **kwargs): + ng_package( + name = name, + **kwargs + ) + native.alias( + name = name + ".pack", + actual = select({ + "@bazel_tools//src/conditions:host_windows": name + ".pack.bat", + "//conditions:default": name + ".pack.sh", + }), + ) + native.alias( + name = name + ".publish", + actual = select({ + "@bazel_tools//src/conditions:host_windows": name + ".publish.bat", + "//conditions:default": name + ".publish.sh", + }), + ) diff --git a/yarn.lock b/yarn.lock index 28e744ac4b..351df8af91 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1972,38 +1972,38 @@ resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.12.4.tgz#ddda7c8ead6e29dc8d637af446086a750f395218" integrity sha512-FzOy+esB/fXVDbAmL6Ce2yCEy+PESZih8GypKhi0B8XzoZHAAn3QNnQcMNwo9PrIfp3G1989nM/JQ1b8jwEinQ== -"@bazel/jasmine@2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-2.3.1.tgz#e4df8dd2b8d906e41e4073b5c49c700a962fe853" - integrity sha512-6QYTfJfbwPxCvKu4rOhG1YZUm94MbG4K2Dq1q2A2OUiM0eqAZG8T1HJAswDh7L286r5x9nRX8h7Pb7CyJvSmbg== +"@bazel/jasmine@2.3.3": + version "2.3.3" + resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-2.3.3.tgz#7221c3704e63a4b8b19a9c7c9dec4b0337f302e0" + integrity sha512-YAXSCSBQ51/Ep+PAIro9WnO1c47on4KJ3ISMLbBoowIsWVhXIRGVLUoRivIRE89yKX2vHE1+4OuwYpywgRQOZw== dependencies: c8 "~7.1.0" jasmine-reporters "~2.3.2" -"@bazel/karma@2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-2.3.1.tgz#9a52128cefc4e061fc4e934c4918d7a3e17b1007" - integrity sha512-4w1aS3qaKY8eekyDujAFD7xsM+z0rCsEofs8QliEmZaF+RCKw+QsxWEMrxIXkdoftcQS+MBatAoSDhHbl47VpQ== +"@bazel/karma@2.3.3": + version "2.3.3" + resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-2.3.3.tgz#063192e597ec4bd7bf2b80bf6bc5d7e2013e2002" + integrity sha512-qetKRmK0abViVDZH6okAXlDsFgr5btdwrWngjStlGDHHaTR23ORNilPIUTLrbwyIgy6qHlMdGrTp9KVXGGK6sQ== -"@bazel/protractor@2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-2.3.1.tgz#470c280841f5ec91b0a80d2ffb692841a125e240" - integrity sha512-1MF3JlGE6HyYzPFXJBFnv5eEOuTuXhsJT70g66+lMgPZ9g0uUPh6CPu/iUkT6/92sw+pHGUsaptxwNu89Z7Dag== +"@bazel/protractor@2.3.3": + version "2.3.3" + resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-2.3.3.tgz#44eca70d159d3e5a67654683f81266cc3594ce5a" + integrity sha512-06EFGstTshvofjiUd1ZJJepGeTgkLZNZB9Bfb7IhMC/ca1ZaeKB8SRWHhiPw7wN1QojHf4JJ+uhbqDt60m+Xrg== -"@bazel/rollup@2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-2.3.1.tgz#30265ac682149e82f3a4a0cfda216f3d860e7373" - integrity sha512-KyMIYr8UV1MkwdW+2HUnwUNAddFhETM8OSaaOQK5I7hV4XKjBzc2EZstt4HRcNtsVF5Lnsi7Arb8xjbBdXTqvw== +"@bazel/rollup@2.3.3": + version "2.3.3" + resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-2.3.3.tgz#ecefb4e23b3fd63c6f36f925a98bcfc5436f7fa6" + integrity sha512-8KsW+0GpYPMV1jKiEuAZhBm2wMcU3gKjCxasXqdXTSYDyuwE4n/aihuPxSBSWpJ82Gv4MBBkSmieFZ+s9nVoBw== -"@bazel/terser@2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-2.3.1.tgz#c1aa0e88988d913be61d601e581a60c3bf771e06" - integrity sha512-G0I7niJyQzDFx+Z4WlA19g8SQuWpfMKbMHi+e94NHVYYpoUF0nRhLfysvNx5Kx5J6/N2gErmtwYsTQpRUI/vCQ== +"@bazel/terser@2.3.3": + version "2.3.3" + resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-2.3.3.tgz#680cedce0569291534ee832f76cae078948c4a7d" + integrity sha512-0PytwAoKO4Yqbfgm3HKzkLF7mycj1O10jndg7Sz8Z20yWmU35087ssULFzFy3sXehKSypFeV+PVJ3eO824/0OQ== -"@bazel/typescript@2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-2.3.1.tgz#f103c4a5230cabaffd8d574b7278265b5478f056" - integrity sha512-blgLpx+9Vh8DZWTVOYTWSk1HEU28FF+GwU1stFaemfY7/pUQfK/URb9FARRkw/v2UrPKCd9EBywFYQyPGSAb1A== +"@bazel/typescript@2.3.3": + version "2.3.3" + resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-2.3.3.tgz#8f238a6d395140cdc6ed6900f0861efb744ca91b" + integrity sha512-tkkrV1wrpMKj7gDlgloo/24lGmW5btHxzg9xqBZsXVvEfhr3HP9dU296bBxtdS1zZuORCxdIhh7D3iPonQDibg== dependencies: protobufjs "6.8.8" semver "5.6.0"