From 0004896ff940881cf4bf6332f55da9dbe907cf51 Mon Sep 17 00:00:00 2001 From: Greg Magolan Date: Fri, 11 Oct 2019 10:56:03 -0700 Subject: [PATCH] build: update to nodejs rules 0.38.3 (#33073) All providers now loaded from "@build_bazel_rules_nodejs//:providers.bzl". PR Close #33073 --- WORKSPACE | 7 ++-- integration/bazel/WORKSPACE | 4 +-- integration/bazel/package.json | 6 ++-- package.json | 8 ++--- .../src/builders/files/WORKSPACE.template | 4 +-- packages/bazel/src/external.bzl | 7 ++-- packages/bazel/src/ng_package/ng_package.bzl | 3 +- packages/bazel/src/schematics/ng-add/index.ts | 6 ++-- yarn.lock | 32 +++++++++---------- 9 files changed, 37 insertions(+), 40 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index ff14b864db..bc5b1bba7c 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -21,8 +21,8 @@ http_archive( patch_args = ["-p1"], # Patch https://github.com/bazelbuild/rules_nodejs/pull/903 patches = ["//tools:rollup_bundle_commonjs_ignoreGlobal.patch"], - sha256 = "1447312c8570e8916da0f5f415186e7098cdd4ce48e04b8e864f793c766959c3", - urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.38.2/rules_nodejs-0.38.2.tar.gz"], + sha256 = "ad4be2c6f40f5af70c7edf294955f9d9a0222c8e2756109731b25f79ea2ccea0", + 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 @@ -56,7 +56,8 @@ Try running `yarn bazel` instead. # - 0.34.0 introduces protractor rule # - 0.37.1 windows fixes # - 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 node_repositories( diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE index 37baf8c3fd..b9359027e0 100644 --- a/integration/bazel/WORKSPACE +++ b/integration/bazel/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 = "1447312c8570e8916da0f5f415186e7098cdd4ce48e04b8e864f793c766959c3", - urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.38.2/rules_nodejs-0.38.2.tar.gz"], + sha256 = "ad4be2c6f40f5af70c7edf294955f9d9a0222c8e2756109731b25f79ea2ccea0", + 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 diff --git a/integration/bazel/package.json b/integration/bazel/package.json index 991164ebfc..2ac799ba8b 100644 --- a/integration/bazel/package.json +++ b/integration/bazel/package.json @@ -23,9 +23,9 @@ "@angular/compiler": "file:../../dist/packages-dist/compiler", "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli", "@bazel/bazel": "file:../../node_modules/@bazel/bazel", - "@bazel/karma": "0.38.2", - "@bazel/protractor": "0.38.2", - "@bazel/typescript": "0.38.2", + "@bazel/karma": "0.38.3", + "@bazel/protractor": "0.38.3", + "@bazel/typescript": "0.38.3", "@types/jasmine": "2.8.8", "http-server": "^0.11.1", "typescript": "3.4.2" diff --git a/package.json b/package.json index 95b589f61f..f8e5423710 100644 --- a/package.json +++ b/package.json @@ -40,10 +40,10 @@ "@angular-devkit/schematics": "^8.0.0-beta.15", "@angular/bazel": "file:./tools/npm/@angular_bazel", "@babel/core": "^7.5.5", - "@bazel/jasmine": "0.38.2", - "@bazel/karma": "0.38.2", - "@bazel/protractor": "0.38.2", - "@bazel/typescript": "0.38.2", + "@bazel/jasmine": "0.38.3", + "@bazel/karma": "0.38.3", + "@bazel/protractor": "0.38.3", + "@bazel/typescript": "0.38.3", "@microsoft/api-extractor": "^7.3.9", "@schematics/angular": "^8.0.0-beta.15", "@types/angular": "^1.6.47", diff --git a/packages/bazel/src/builders/files/WORKSPACE.template b/packages/bazel/src/builders/files/WORKSPACE.template index 06d41b0706..bedf14e2e2 100644 --- a/packages/bazel/src/builders/files/WORKSPACE.template +++ b/packages/bazel/src/builders/files/WORKSPACE.template @@ -15,8 +15,8 @@ workspace( load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -RULES_NODEJS_VERSION = "0.38.2" -RULES_NODEJS_SHA256 = "1447312c8570e8916da0f5f415186e7098cdd4ce48e04b8e864f793c766959c3" +RULES_NODEJS_VERSION = "0.38.3" +RULES_NODEJS_SHA256 = "ad4be2c6f40f5af70c7edf294955f9d9a0222c8e2756109731b25f79ea2ccea0" http_archive( name = "build_bazel_rules_nodejs", sha256 = RULES_NODEJS_SHA256, diff --git a/packages/bazel/src/external.bzl b/packages/bazel/src/external.bzl index 8b8d4d62c1..32b640ae30 100644 --- a/packages/bazel/src/external.bzl +++ b/packages/bazel/src/external.bzl @@ -13,19 +13,16 @@ load( _compile_ts = "compile_ts", _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( "@npm_bazel_typescript//internal:ts_config.bzl", _TsConfigInfo = "TsConfigInfo", ) load( "@build_bazel_rules_nodejs//:providers.bzl", + _NpmPackageInfo = "NpmPackageInfo", _js_ecma_script_module_info = "js_ecma_script_module_info", _js_named_module_info = "js_named_module_info", + _node_modules_aspect = "node_modules_aspect", ) NpmPackageInfo = _NpmPackageInfo diff --git a/packages/bazel/src/ng_package/ng_package.bzl b/packages/bazel/src/ng_package/ng_package.bzl index 75d8d6e129..cfd7790970 100644 --- a/packages/bazel/src/ng_package/ng_package.bzl +++ b/packages/bazel/src/ng_package/ng_package.bzl @@ -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//:providers.bzl", "JSNamedModuleInfo") -load("@build_bazel_rules_nodejs//internal/common:npm_package_info.bzl", "NpmPackageInfo") +load("@build_bazel_rules_nodejs//:providers.bzl", "JSNamedModuleInfo", "NpmPackageInfo") load( "@build_bazel_rules_nodejs//internal/rollup:rollup_bundle.bzl", "ROLLUP_ATTRS", diff --git a/packages/bazel/src/schematics/ng-add/index.ts b/packages/bazel/src/schematics/ng-add/index.ts index d8bb15df0e..d8e837a956 100755 --- a/packages/bazel/src/schematics/ng-add/index.ts +++ b/packages/bazel/src/schematics/ng-add/index.ts @@ -50,9 +50,9 @@ function addDevDependenciesToPackageJson(options: Schema) { '@angular/bazel': angularCoreVersion, '@bazel/bazel': '^0.28.1', '@bazel/ibazel': '^0.10.2', - '@bazel/karma': '0.38.2', - '@bazel/protractor': '0.38.2', - '@bazel/typescript': '0.38.2', + '@bazel/karma': '0.38.3', + '@bazel/protractor': '0.38.3', + '@bazel/typescript': '0.38.3', 'history-server': '^1.3.1', }; diff --git a/yarn.lock b/yarn.lock index 322883639e..50708d0ead 100644 --- a/yarn.lock +++ b/yarn.lock @@ -319,19 +319,19 @@ resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.10.3.tgz#2e2b8a1d3e885946eac41db2b1aa6801fb319887" integrity sha512-v1nXbMTHVlMM4z4uWp6XiRoHAyUlYggF1SOboLLWRp0+D22kWixqArWqnozLw2mOtnxr97BdLjluWiho6A8Hjg== -"@bazel/jasmine@0.38.2": - version "0.38.2" - resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-0.38.2.tgz#567a7b5f9639d8c0b757f8ab41bfff6b84029484" - integrity sha512-O5J/vSQBUwsUqV5dTqOg9SJUuQgLlYAY2NPkC6asYQ+IgtmrtZV+IxWoCC8eZEiu0ZWhV/EwgzXS1FjXI9GR0Q== +"@bazel/jasmine@0.38.3": + version "0.38.3" + resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-0.38.3.tgz#f010f0555acd1d363eca9fc90865704fcf510d3f" + integrity sha512-wTD+EoNUvOfLNmicLa7g/09gFHEpJE3A6xhz/UMF2KowCg+yBfzKGa2bSuqIMhwoDH0EpIOWZg2lmiBqz/w9/Q== dependencies: jasmine "~3.4.0" jasmine-core "~3.4.0" v8-coverage "1.0.9" -"@bazel/karma@0.38.2": - version "0.38.2" - resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.38.2.tgz#13c0eb8f09fdc579ef3a2493d6014d77cdc03670" - integrity sha512-pTeHciOyg5ViCCl8Vn5N/wSJSTrxh+26+drlh0GBW8gzUTGIfWDVnma3oA6lLp8zyaCzkpoMP2ukrwBky3nk1Q== +"@bazel/karma@0.38.3": + version "0.38.3" + resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.38.3.tgz#4db94a2227d7e8863505dfcfe9de81a2cb1f7d0b" + integrity sha512-5ywjZsigJpdG4wr1iy2UNkfEgQcBvRjHoVfUQqLF1Dp0uBdqG7Qq2quu0Zypd/UodbvTye1pHWQ+Lq7cEz6JWg== dependencies: jasmine-core "2.8.0" karma "~4.1.0" @@ -345,17 +345,17 @@ semver "5.6.0" tmp "0.0.33" -"@bazel/protractor@0.38.2": - version "0.38.2" - resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-0.38.2.tgz#be0804c246d412f8b285fc22a320ab9b471c7a5d" - integrity sha512-bo5v7CpG9TlPX2lx/XueviMt8KY7KDaL7rcw5SR3uU+4w+gX6bTjdnSsVXCUH2YrTTz6VgZaBZO3O0GTbjDP+w== +"@bazel/protractor@0.38.3": + version "0.38.3" + resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-0.38.3.tgz#e9599271e87527378e56d97de960919f72256746" + integrity sha512-vs5Zi9Gw3FZ0OnmdJxDzOZJaA2Aeqq3GcAvK8jlQ6fzVc9w8TP6BmAhraOHJYFPj5rMz2fQF/e3Ovrtn4KA3Zw== dependencies: protractor "^5.4.2" -"@bazel/typescript@0.38.2": - version "0.38.2" - resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.38.2.tgz#d07e20c910e0e7250ebbdf64f3ef3014ad8e3039" - integrity sha512-KATYNcRaF5JxtmEAczpr1CRZwmPSTAWUA/3Ogp8R17SA7ts9P+K8WPr3eml1b9JkiUzmNvERMU8HNEslDMuhvg== +"@bazel/typescript@0.38.3": + version "0.38.3" + resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.38.3.tgz#0e452413ca81fc9429404ceabf60ebfb4f13474a" + integrity sha512-sFPYNDEE5h/k+Arop3q8XWaqoTwSy0IUS0a/YSeLhR/yz7pNmOltjPyeseLmo004BhgH7X4X+LjUQjcgv7lpXw== dependencies: protobufjs "6.8.8" semver "5.6.0"