honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "build: update bazel rules_nodejs to 2.3.2 (#40367)" (#40395) 

This reverts commit c9de7daae4.
Causes CI failures. PR was not meant to be merged (merge label was
supposed to be removed)

PR Close #40395
This commit is contained in:
Andrew Scott 2021-01-11 12:24:51 -08:00 committed by atscott
parent 76954688b1
commit 4e6d69cc85
7 changed files with 40 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
WORKSPACE
View File

@ -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 # Fetch rules_nodejs so we can install our npm dependencies
http_archive( http_archive(
name = "build_bazel_rules_nodejs", name = "build_bazel_rules_nodejs",
sha256 = "b3521b29c7cb0c47a1a735cce7e7e811a4f80d8e3720cf3a1b624533e4bb7cb6", sha256 = "4952ef879704ab4ad6729a29007e7094aef213ea79e9f2e94cbe1c9a753e63ef",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/2.3.2/rules_nodejs-2.3.2.tar.gz"], urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/2.2.0/rules_nodejs-2.2.0.tar.gz"],
) )
# Check the rules_nodejs version and download npm dependencies # Check the rules_nodejs version and download npm dependencies

4
integration/bazel/WORKSPACE
View File

@ -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 # Fetch rules_nodejs so we can install our npm dependencies
http_archive( http_archive(
name = "build_bazel_rules_nodejs", name = "build_bazel_rules_nodejs",
sha256 = "b3521b29c7cb0c47a1a735cce7e7e811a4f80d8e3720cf3a1b624533e4bb7cb6", sha256 = "4952ef879704ab4ad6729a29007e7094aef213ea79e9f2e94cbe1c9a753e63ef",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/2.3.2/rules_nodejs-2.3.2.tar.gz"], urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/2.2.0/rules_nodejs-2.2.0.tar.gz"],
) )
# Fetch sass rules for compiling sass files # Fetch sass rules for compiling sass files

10
integration/bazel/package.json
View File

@ -23,11 +23,11 @@
"@angular/compiler": "file:../../dist/packages-dist/compiler", "@angular/compiler": "file:../../dist/packages-dist/compiler",
"@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli", "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
"@bazel/bazelisk": "file:../../node_modules/@bazel/bazelisk", "@bazel/bazelisk": "file:../../node_modules/@bazel/bazelisk",
"@bazel/karma": "2.3.2", "@bazel/karma": "2.2.0",
"@bazel/protractor": "2.3.2", "@bazel/protractor": "2.2.0",
"@bazel/rollup": "2.3.2", "@bazel/rollup": "2.2.0",
"@bazel/terser": "2.3.2", "@bazel/terser": "2.2.0",
"@bazel/typescript": "2.3.2", "@bazel/typescript": "2.2.0",
"@types/jasmine": "2.8.8", "@types/jasmine": "2.8.8",
"http-server": "0.12.0", "http-server": "0.12.0",
"karma": "4.4.1", "karma": "4.4.1",

12
package.json
View File

@ -52,12 +52,12 @@
"@babel/template": "^7.8.6", "@babel/template": "^7.8.6",
"@babel/traverse": "^7.8.6", "@babel/traverse": "^7.8.6",
"@babel/types": "^7.8.6", "@babel/types": "^7.8.6",
"@bazel/jasmine": "2.3.2", "@bazel/jasmine": "2.3.1",
"@bazel/karma": "2.3.2", "@bazel/karma": "2.3.1",
"@bazel/protractor": "2.3.2", "@bazel/protractor": "2.3.1",
"@bazel/rollup": "2.3.2", "@bazel/rollup": "2.3.1",
"@bazel/terser": "2.3.2", "@bazel/terser": "2.3.1",
"@bazel/typescript": "2.3.2", "@bazel/typescript": "2.3.1",
"@microsoft/api-extractor": "7.7.11", "@microsoft/api-extractor": "7.7.11",
"@octokit/rest": "16.28.7", "@octokit/rest": "16.28.7",
"@octokit/types": "^5.0.1", "@octokit/types": "^5.0.1",

2
packages/bazel/index.bzl
View File

@ -7,7 +7,7 @@
Users should not load files under "/src" Users should not load files under "/src"
""" """
load("//packages/bazel/src/ng_package:ng_package.bzl", _ng_package = "ng_package_macro") load("//packages/bazel/src/ng_package:ng_package.bzl", _ng_package = "ng_package")
load("//packages/bazel/src:ng_module.bzl", _ng_module = "ng_module_macro") load("//packages/bazel/src:ng_module.bzl", _ng_module = "ng_module_macro")
ng_module = _ng_module ng_module = _ng_module

20
packages/bazel/src/ng_package/ng_package.bzl
View File

@ -811,23 +811,3 @@ ng_package = rule(
""" """
ng_package produces an npm-ready package from an Angular library. 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",
}),
)

48
yarn.lock
View File

@ -1972,38 +1972,38 @@
resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.12.4.tgz#ddda7c8ead6e29dc8d637af446086a750f395218" resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.12.4.tgz#ddda7c8ead6e29dc8d637af446086a750f395218"
integrity sha512-FzOy+esB/fXVDbAmL6Ce2yCEy+PESZih8GypKhi0B8XzoZHAAn3QNnQcMNwo9PrIfp3G1989nM/JQ1b8jwEinQ== integrity sha512-FzOy+esB/fXVDbAmL6Ce2yCEy+PESZih8GypKhi0B8XzoZHAAn3QNnQcMNwo9PrIfp3G1989nM/JQ1b8jwEinQ==
"@bazel/jasmine@2.3.2": "@bazel/jasmine@2.3.1":
version "2.3.2" version "2.3.1"
resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-2.3.2.tgz#ff120008a69a93ea2138c29cc266d7dec58333a9" resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-2.3.1.tgz#e4df8dd2b8d906e41e4073b5c49c700a962fe853"
integrity sha512-GG2xAvYXgoW9SHco8RETuxkBTeLF7RI4rtuvAJdVhwwzsUeGovKROTbHvQEyo1qxmeQjQu0hzKr11VfwZPcCMA== integrity sha512-6QYTfJfbwPxCvKu4rOhG1YZUm94MbG4K2Dq1q2A2OUiM0eqAZG8T1HJAswDh7L286r5x9nRX8h7Pb7CyJvSmbg==
dependencies: dependencies:
c8 "~7.1.0" c8 "~7.1.0"
jasmine-reporters "~2.3.2" jasmine-reporters "~2.3.2"
"@bazel/karma@2.3.2": "@bazel/karma@2.3.1":
version "2.3.2" version "2.3.1"
resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-2.3.2.tgz#4120618f7edd141b155f6f830fd0f04dc748a37c" resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-2.3.1.tgz#9a52128cefc4e061fc4e934c4918d7a3e17b1007"
integrity sha512-+FFpem1Ul/BtqNrom8y1xPIa1cPEZeBvpao8BRLfQt46r7Nk9u11KI8ylNFk+yIQVhFqAD3JBaL3sbLAU7BJ5Q== integrity sha512-4w1aS3qaKY8eekyDujAFD7xsM+z0rCsEofs8QliEmZaF+RCKw+QsxWEMrxIXkdoftcQS+MBatAoSDhHbl47VpQ==
"@bazel/protractor@2.3.2": "@bazel/protractor@2.3.1":
version "2.3.2" version "2.3.1"
resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-2.3.2.tgz#a57daa9488c40fa30843947f26474891db130229" resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-2.3.1.tgz#470c280841f5ec91b0a80d2ffb692841a125e240"
integrity sha512-VOKjJjvcO5RSoQX4nNeI41grgFc3j5xirxF26nF+MU0ePg+7giKVZWDtegLO2QRfMfFKjvzpT6HMlzd2GvxI+A== integrity sha512-1MF3JlGE6HyYzPFXJBFnv5eEOuTuXhsJT70g66+lMgPZ9g0uUPh6CPu/iUkT6/92sw+pHGUsaptxwNu89Z7Dag==
"@bazel/rollup@2.3.2": "@bazel/rollup@2.3.1":
version "2.3.2" version "2.3.1"
resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-2.3.2.tgz#637c9219d75fd40469efe881057b27032aa5896c" resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-2.3.1.tgz#30265ac682149e82f3a4a0cfda216f3d860e7373"
integrity sha512-Eyz99eI/rsWDJws3eO2UGAmIoWmZWEzmchIBU30EoVzvQ5wqZciZ2lLOXkUIAosZsijjE1THiqCCf5gJtOmExw== integrity sha512-KyMIYr8UV1MkwdW+2HUnwUNAddFhETM8OSaaOQK5I7hV4XKjBzc2EZstt4HRcNtsVF5Lnsi7Arb8xjbBdXTqvw==
"@bazel/terser@2.3.2": "@bazel/terser@2.3.1":
version "2.3.2" version "2.3.1"
resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-2.3.2.tgz#30f0b551f43eeafb64cb834d1f2f3e7f2ddef262" resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-2.3.1.tgz#c1aa0e88988d913be61d601e581a60c3bf771e06"
integrity sha512-UasdVrMdaOEBwzNTTyWtUTH+ITQtXhV64XG6SdyWY1wWLgcgoUOiFYPN2lgXRZyKNpFezmq+CHJ5pqfYwzN3Rg== integrity sha512-G0I7niJyQzDFx+Z4WlA19g8SQuWpfMKbMHi+e94NHVYYpoUF0nRhLfysvNx5Kx5J6/N2gErmtwYsTQpRUI/vCQ==
"@bazel/typescript@2.3.2": "@bazel/typescript@2.3.1":
version "2.3.2" version "2.3.1"
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-2.3.2.tgz#6d49cc064a9323905dcf791fe0e959f75ddf2ade" resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-2.3.1.tgz#f103c4a5230cabaffd8d574b7278265b5478f056"
integrity sha512-O2lZfVGx1Uyc7GzLMyD4uiu1qWxy7xviVTEDPzFGcqZsHMCXMV/fEgMoiD0cI4diHwSWrc7Gm/CG9j/z+SRDzA== integrity sha512-blgLpx+9Vh8DZWTVOYTWSk1HEU28FF+GwU1stFaemfY7/pUQfK/URb9FARRkw/v2UrPKCd9EBywFYQyPGSAb1A==
dependencies: dependencies:
protobufjs "6.8.8" protobufjs "6.8.8"
semver "5.6.0" semver "5.6.0"