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

build: update to nodejs rules 0.38.3 (#33073)

Browse Source 
All providers now loaded from "@build_bazel_rules_nodejs//:providers.bzl".

PR Close #33073
This commit is contained in:
Greg Magolan 2019-10-11 10:56:03 -07:00 committed by Miško Hevery
parent 5e694e519b
commit 0004896ff9
9 changed files with 37 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
WORKSPACE
View File

@ -21,8 +21,8 @@ http_archive(
patch_args = ["-p1"], patch_args = ["-p1"],
# Patch https://github.com/bazelbuild/rules_nodejs/pull/903 # Patch https://github.com/bazelbuild/rules_nodejs/pull/903
patches = ["//tools:rollup_bundle_commonjs_ignoreGlobal.patch"], patches = ["//tools:rollup_bundle_commonjs_ignoreGlobal.patch"],
sha256 = "1447312c8570e8916da0f5f415186e7098cdd4ce48e04b8e864f793c766959c3", sha256 = "ad4be2c6f40f5af70c7edf294955f9d9a0222c8e2756109731b25f79ea2ccea0",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.38.2/rules_nodejs-0.38.2.tar.gz"], urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.38.3/rules_nodejs-0.38.3.tar.gz"],
) )
# Check the bazel version and download npm dependencies # Check the bazel version and download npm dependencies
@ -56,7 +56,8 @@ Try running `yarn bazel` instead.
# - 0.34.0 introduces protractor rule # - 0.34.0 introduces protractor rule
# - 0.37.1 windows fixes # - 0.37.1 windows fixes
# - 0.38.2 Adds NpmPackageInfo & JSNamedModuleInfo providers # - 0.38.2 Adds NpmPackageInfo & JSNamedModuleInfo providers
check_rules_nodejs_version(minimum_version_string = "0.38.2") # - 0.38.3 all providers loaded from //:providers.bzl
check_rules_nodejs_version(minimum_version_string = "0.38.3")
# Setup the Node.js toolchain # Setup the Node.js toolchain
node_repositories( node_repositories(

4
integration/bazel/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 = "1447312c8570e8916da0f5f415186e7098cdd4ce48e04b8e864f793c766959c3", sha256 = "ad4be2c6f40f5af70c7edf294955f9d9a0222c8e2756109731b25f79ea2ccea0",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.38.2/rules_nodejs-0.38.2.tar.gz"], urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.38.3/rules_nodejs-0.38.3.tar.gz"],
) )
# Fetch sass rules for compiling sass files # Fetch sass rules for compiling sass files

6
integration/bazel/package.json
View File

@ -23,9 +23,9 @@
"@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/bazel": "file:../../node_modules/@bazel/bazel", "@bazel/bazel": "file:../../node_modules/@bazel/bazel",
"@bazel/karma": "0.38.2", "@bazel/karma": "0.38.3",
"@bazel/protractor": "0.38.2", "@bazel/protractor": "0.38.3",
"@bazel/typescript": "0.38.2", "@bazel/typescript": "0.38.3",
"@types/jasmine": "2.8.8", "@types/jasmine": "2.8.8",
"http-server": "^0.11.1", "http-server": "^0.11.1",
"typescript": "3.4.2" "typescript": "3.4.2"

8
package.json
View File

@ -40,10 +40,10 @@
"@angular-devkit/schematics": "^8.0.0-beta.15", "@angular-devkit/schematics": "^8.0.0-beta.15",
"@angular/bazel": "file:./tools/npm/@angular_bazel", "@angular/bazel": "file:./tools/npm/@angular_bazel",
"@babel/core": "^7.5.5", "@babel/core": "^7.5.5",
"@bazel/jasmine": "0.38.2", "@bazel/jasmine": "0.38.3",
"@bazel/karma": "0.38.2", "@bazel/karma": "0.38.3",
"@bazel/protractor": "0.38.2", "@bazel/protractor": "0.38.3",
"@bazel/typescript": "0.38.2", "@bazel/typescript": "0.38.3",
"@microsoft/api-extractor": "^7.3.9", "@microsoft/api-extractor": "^7.3.9",
"@schematics/angular": "^8.0.0-beta.15", "@schematics/angular": "^8.0.0-beta.15",
"@types/angular": "^1.6.47", "@types/angular": "^1.6.47",

4
packages/bazel/src/builders/files/WORKSPACE.template
View File

@ -15,8 +15,8 @@ workspace(
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
RULES_NODEJS_VERSION = "0.38.2" RULES_NODEJS_VERSION = "0.38.3"
RULES_NODEJS_SHA256 = "1447312c8570e8916da0f5f415186e7098cdd4ce48e04b8e864f793c766959c3" RULES_NODEJS_SHA256 = "ad4be2c6f40f5af70c7edf294955f9d9a0222c8e2756109731b25f79ea2ccea0"
http_archive( http_archive(
name = "build_bazel_rules_nodejs", name = "build_bazel_rules_nodejs",
sha256 = RULES_NODEJS_SHA256, sha256 = RULES_NODEJS_SHA256,

7
packages/bazel/src/external.bzl
View File

@ -13,19 +13,16 @@ load(
_compile_ts = "compile_ts", _compile_ts = "compile_ts",
_ts_providers_dict_to_struct = "ts_providers_dict_to_struct", _ts_providers_dict_to_struct = "ts_providers_dict_to_struct",
) )
load(
"@build_bazel_rules_nodejs//internal/common:npm_package_info.bzl",
_NpmPackageInfo = "NpmPackageInfo",
_node_modules_aspect = "node_modules_aspect",
)
load( load(
"@npm_bazel_typescript//internal:ts_config.bzl", "@npm_bazel_typescript//internal:ts_config.bzl",
_TsConfigInfo = "TsConfigInfo", _TsConfigInfo = "TsConfigInfo",
) )
load( load(
"@build_bazel_rules_nodejs//:providers.bzl", "@build_bazel_rules_nodejs//:providers.bzl",
_NpmPackageInfo = "NpmPackageInfo",
_js_ecma_script_module_info = "js_ecma_script_module_info", _js_ecma_script_module_info = "js_ecma_script_module_info",
_js_named_module_info = "js_named_module_info", _js_named_module_info = "js_named_module_info",
_node_modules_aspect = "node_modules_aspect",
) )
NpmPackageInfo = _NpmPackageInfo NpmPackageInfo = _NpmPackageInfo

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

@ -14,8 +14,7 @@ specification of this format at https://goo.gl/jB3GVv
""" """
load("@build_bazel_rules_nodejs//internal/common:collect_es6_sources.bzl", "collect_es6_sources") load("@build_bazel_rules_nodejs//internal/common:collect_es6_sources.bzl", "collect_es6_sources")
load("@build_bazel_rules_nodejs//:providers.bzl", "JSNamedModuleInfo") load("@build_bazel_rules_nodejs//:providers.bzl", "JSNamedModuleInfo", "NpmPackageInfo")
load("@build_bazel_rules_nodejs//internal/common:npm_package_info.bzl", "NpmPackageInfo")
load( load(
"@build_bazel_rules_nodejs//internal/rollup:rollup_bundle.bzl", "@build_bazel_rules_nodejs//internal/rollup:rollup_bundle.bzl",
"ROLLUP_ATTRS", "ROLLUP_ATTRS",

6
packages/bazel/src/schematics/ng-add/index.ts
View File

@ -50,9 +50,9 @@ function addDevDependenciesToPackageJson(options: Schema) {
'@angular/bazel': angularCoreVersion, '@angular/bazel': angularCoreVersion,
'@bazel/bazel': '^0.28.1', '@bazel/bazel': '^0.28.1',
'@bazel/ibazel': '^0.10.2', '@bazel/ibazel': '^0.10.2',
'@bazel/karma': '0.38.2', '@bazel/karma': '0.38.3',
'@bazel/protractor': '0.38.2', '@bazel/protractor': '0.38.3',
'@bazel/typescript': '0.38.2', '@bazel/typescript': '0.38.3',
'history-server': '^1.3.1', 'history-server': '^1.3.1',
}; };

32
yarn.lock
View File

@ -319,19 +319,19 @@
resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.10.3.tgz#2e2b8a1d3e885946eac41db2b1aa6801fb319887" resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.10.3.tgz#2e2b8a1d3e885946eac41db2b1aa6801fb319887"
integrity sha512-v1nXbMTHVlMM4z4uWp6XiRoHAyUlYggF1SOboLLWRp0+D22kWixqArWqnozLw2mOtnxr97BdLjluWiho6A8Hjg== integrity sha512-v1nXbMTHVlMM4z4uWp6XiRoHAyUlYggF1SOboLLWRp0+D22kWixqArWqnozLw2mOtnxr97BdLjluWiho6A8Hjg==
"@bazel/jasmine@0.38.2": "@bazel/jasmine@0.38.3":
version "0.38.2" version "0.38.3"
resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-0.38.2.tgz#567a7b5f9639d8c0b757f8ab41bfff6b84029484" resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-0.38.3.tgz#f010f0555acd1d363eca9fc90865704fcf510d3f"
integrity sha512-O5J/vSQBUwsUqV5dTqOg9SJUuQgLlYAY2NPkC6asYQ+IgtmrtZV+IxWoCC8eZEiu0ZWhV/EwgzXS1FjXI9GR0Q== integrity sha512-wTD+EoNUvOfLNmicLa7g/09gFHEpJE3A6xhz/UMF2KowCg+yBfzKGa2bSuqIMhwoDH0EpIOWZg2lmiBqz/w9/Q==
dependencies: dependencies:
jasmine "~3.4.0" jasmine "~3.4.0"
jasmine-core "~3.4.0" jasmine-core "~3.4.0"
v8-coverage "1.0.9" v8-coverage "1.0.9"
"@bazel/karma@0.38.2": "@bazel/karma@0.38.3":
version "0.38.2" version "0.38.3"
resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.38.2.tgz#13c0eb8f09fdc579ef3a2493d6014d77cdc03670" resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.38.3.tgz#4db94a2227d7e8863505dfcfe9de81a2cb1f7d0b"
integrity sha512-pTeHciOyg5ViCCl8Vn5N/wSJSTrxh+26+drlh0GBW8gzUTGIfWDVnma3oA6lLp8zyaCzkpoMP2ukrwBky3nk1Q== integrity sha512-5ywjZsigJpdG4wr1iy2UNkfEgQcBvRjHoVfUQqLF1Dp0uBdqG7Qq2quu0Zypd/UodbvTye1pHWQ+Lq7cEz6JWg==
dependencies: dependencies:
jasmine-core "2.8.0" jasmine-core "2.8.0"
karma "~4.1.0" karma "~4.1.0"
@ -345,17 +345,17 @@
semver "5.6.0" semver "5.6.0"
tmp "0.0.33" tmp "0.0.33"
"@bazel/protractor@0.38.2": "@bazel/protractor@0.38.3":
version "0.38.2" version "0.38.3"
resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-0.38.2.tgz#be0804c246d412f8b285fc22a320ab9b471c7a5d" resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-0.38.3.tgz#e9599271e87527378e56d97de960919f72256746"
integrity sha512-bo5v7CpG9TlPX2lx/XueviMt8KY7KDaL7rcw5SR3uU+4w+gX6bTjdnSsVXCUH2YrTTz6VgZaBZO3O0GTbjDP+w== integrity sha512-vs5Zi9Gw3FZ0OnmdJxDzOZJaA2Aeqq3GcAvK8jlQ6fzVc9w8TP6BmAhraOHJYFPj5rMz2fQF/e3Ovrtn4KA3Zw==
dependencies: dependencies:
protractor "^5.4.2" protractor "^5.4.2"
"@bazel/typescript@0.38.2": "@bazel/typescript@0.38.3":
version "0.38.2" version "0.38.3"
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.38.2.tgz#d07e20c910e0e7250ebbdf64f3ef3014ad8e3039" resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.38.3.tgz#0e452413ca81fc9429404ceabf60ebfb4f13474a"
integrity sha512-KATYNcRaF5JxtmEAczpr1CRZwmPSTAWUA/3Ogp8R17SA7ts9P+K8WPr3eml1b9JkiUzmNvERMU8HNEslDMuhvg== integrity sha512-sFPYNDEE5h/k+Arop3q8XWaqoTwSy0IUS0a/YSeLhR/yz7pNmOltjPyeseLmo004BhgH7X4X+LjUQjcgv7lpXw==
dependencies: dependencies:
protobufjs "6.8.8" protobufjs "6.8.8"
semver "5.6.0" semver "5.6.0"