From 350802b2077648f22c75210427b12263eb5a2738 Mon Sep 17 00:00:00 2001 From: Alex Eagle Date: Fri, 22 Feb 2019 13:22:11 -0800 Subject: [PATCH] build: update to latest bazel rules (#28931) PR Close #28931 --- WORKSPACE | 4 +- integration/bazel/WORKSPACE | 4 +- integration/bazel/src/package.json | 3 +- package.json | 7 ++-- packages/bazel/package.json | 2 +- packages/bazel/src/schematics/ng-add/index.ts | 1 - .../bazel/src/schematics/ng-add/index_spec.ts | 1 - tools/defaults.bzl | 5 ++- yarn.lock | 40 ++++++++++++------- 9 files changed, 39 insertions(+), 28 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 6396b707f9..2ace4e6428 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -15,8 +15,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 = "1416d03823fed624b49a0abbd9979f7c63bbedfd37890ddecedd2fe25cccebc6", - urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.18.6/rules_nodejs-0.18.6.tar.gz"], + sha256 = "86ea92217dfd4a84e1e335cc07dfd942b12899796b080492546b947f12c5ab77", + urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.26.0-beta.0/rules_nodejs-0.26.0-beta.0.tar.gz"], ) # Use a mock @npm repository while we are building angular from source diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE index 131cba4261..2d77e96a3a 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 = "1416d03823fed624b49a0abbd9979f7c63bbedfd37890ddecedd2fe25cccebc6", - urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.18.6/rules_nodejs-0.18.6.tar.gz"], + sha256 = "86ea92217dfd4a84e1e335cc07dfd942b12899796b080492546b947f12c5ab77", + urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.26.0-beta.0/rules_nodejs-0.26.0-beta.0.tar.gz"], ) # Fetch sass rules for compiling sass files diff --git a/integration/bazel/src/package.json b/integration/bazel/src/package.json index c6fb36e26b..acbb72877e 100644 --- a/integration/bazel/src/package.json +++ b/integration/bazel/src/package.json @@ -18,8 +18,7 @@ "@angular/bazel": "packages-dist:bazel", "@angular/compiler": "packages-dist:compiler", "@angular/compiler-cli": "packages-dist:compiler-cli", - "@bazel/karma": "0.25.1", - "@bazel/typescript": "0.25.1", + "@bazel/karma": "0.26.0-beta.0", "@types/jasmine": "2.8.8", "@types/source-map": "0.5.1", "protractor": "5.1.2", diff --git a/package.json b/package.json index 5f3daba35e..082b957820 100644 --- a/package.json +++ b/package.json @@ -35,8 +35,9 @@ "@angular-devkit/build-optimizer": "^0.13.2", "@angular-devkit/core": "^7.3.2", "@angular-devkit/schematics": "^7.3.2", - "@bazel/karma": "0.25.1", - "@bazel/typescript": "0.25.1", + "@bazel/jasmine": "0.26.0-beta.0", + "@bazel/karma": "0.26.0-beta.0", + "@bazel/typescript": "0.26.0-beta.0", "@microsoft/api-extractor": "^7.0.17", "@schematics/angular": "^7.3.2", "@types/angular": "^1.6.47", @@ -155,4 +156,4 @@ "resolutions": { "natives": "1.1.6" } -} \ No newline at end of file +} diff --git a/packages/bazel/package.json b/packages/bazel/package.json index db0a4f1e9a..9d97fca331 100644 --- a/packages/bazel/package.json +++ b/packages/bazel/package.json @@ -21,7 +21,7 @@ "@angular-devkit/architect": "^0.10.6", "@angular-devkit/core": "^7.0.4", "@angular-devkit/schematics": "^7.3.0-rc.0", - "@bazel/typescript": "^0.25.1", + "@bazel/typescript": "^0.26.0-beta.0", "@microsoft/api-extractor": "^7.0.17", "@schematics/angular": "^7.0.4", "@types/node": "6.0.84", diff --git a/packages/bazel/src/schematics/ng-add/index.ts b/packages/bazel/src/schematics/ng-add/index.ts index 27cc24adf6..36dea7bfc7 100755 --- a/packages/bazel/src/schematics/ng-add/index.ts +++ b/packages/bazel/src/schematics/ng-add/index.ts @@ -47,7 +47,6 @@ function addDevDependenciesToPackageJson(options: Schema) { '@bazel/bazel': '^0.22.1', '@bazel/ibazel': '^0.9.0', '@bazel/karma': '^0.25.1', - '@bazel/typescript': '^0.25.1', }; const recorder = host.beginUpdate(packageJson); diff --git a/packages/bazel/src/schematics/ng-add/index_spec.ts b/packages/bazel/src/schematics/ng-add/index_spec.ts index ecbdc946e3..4e5d62d5e4 100644 --- a/packages/bazel/src/schematics/ng-add/index_spec.ts +++ b/packages/bazel/src/schematics/ng-add/index_spec.ts @@ -107,7 +107,6 @@ describe('ng-add schematic', () => { expect(devDeps).toContain('@bazel/bazel'); expect(devDeps).toContain('@bazel/ibazel'); expect(devDeps).toContain('@bazel/karma'); - expect(devDeps).toContain('@bazel/typescript'); }); it('should create Bazel workspace file', () => { diff --git a/tools/defaults.bzl b/tools/defaults.bzl index 2993efd87f..776cd8c555 100644 --- a/tools/defaults.bzl +++ b/tools/defaults.bzl @@ -1,6 +1,7 @@ """Re-export of some bazel rules with repository-wide defaults.""" -load("@build_bazel_rules_nodejs//:defs.bzl", _jasmine_node_test = "jasmine_node_test", _nodejs_binary = "nodejs_binary", _npm_package = "npm_package") +load("@build_bazel_rules_nodejs//:defs.bzl", _nodejs_binary = "nodejs_binary", _npm_package = "npm_package") +load("@npm_bazel_jasmine//:index.bzl", _jasmine_node_test = "jasmine_node_test") load("@npm_bazel_karma//:defs.bzl", _karma_web_test = "karma_web_test", _karma_web_test_suite = "karma_web_test_suite", _ts_web_test = "ts_web_test", _ts_web_test_suite = "ts_web_test_suite") load("@npm_bazel_typescript//:defs.bzl", _ts_library = "ts_library") load("//packages/bazel:index.bzl", _ng_module = "ng_module", _ng_package = "ng_package") @@ -279,7 +280,6 @@ def jasmine_node_test(deps = [], **kwargs): # Very common dependencies for tests "@ngdeps//chokidar", "@ngdeps//domino", - "@ngdeps//jasmine", "@ngdeps//jasmine-core", "@ngdeps//mock-fs", "@ngdeps//reflect-metadata", @@ -291,6 +291,7 @@ def jasmine_node_test(deps = [], **kwargs): deps = deps, # Pass-thru --define=compile=foo as an environment variable configuration_env_vars = ["compile"], + jasmine = "@ngdeps//jasmine", **kwargs ) diff --git a/yarn.lock b/yarn.lock index 28b02fbb03..2f4acfb2ed 100644 --- a/yarn.lock +++ b/yarn.lock @@ -105,10 +105,17 @@ resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.9.0.tgz#fd60023acd36313d304cc2f8c2e181b88b5445cd" integrity sha512-E31cefDcdJsx/oii6p/gqKZXSVw0kEg1O73DD2McFcSvnf/p1GYWcQtVgdRQmlviBEytJkJgdX8rtThitRvcow== -"@bazel/karma@0.25.1": - version "0.25.1" - resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.25.1.tgz#246286299b6e96fa4a91d240d3c3d7386164adaf" - integrity sha512-e5qyZkeHdxEYTIcHg04pmPF1SR8jy8I1mQLgDxX6NJDVx3JT7iIFeISqlS8hjBiykyX/XZ0CsVzkKYU/sG3ilg== +"@bazel/jasmine@0.26.0-beta.0": + version "0.26.0-beta.0" + resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-0.26.0-beta.0.tgz#77243fea16dd7b31c60e0aa78bb89b7dcf0a9443" + integrity sha512-6dTuxGitXP6VcmgNwB9D9KqatDGX+Xw9GXDTJNnAT7wNDaakggiRg1ocLe8/xDMB+EXVg1qKOKS5NhZYHq3jVQ== + dependencies: + jasmine "~3.3.1" + +"@bazel/karma@0.26.0-beta.0": + version "0.26.0-beta.0" + resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.26.0-beta.0.tgz#0a83bac1adaa0cfec8e3fb4acb49d02e05b141ed" + integrity sha512-N2doztMGN6TMT3Gi4R4dfB7ypZI4tF3U1HG09lP7MVmr46czVNp/lwTnjyfJgbababYBfhiGgrXD9VOC9QqKnA== dependencies: jasmine-core "2.8.0" karma "^4.0.0" @@ -122,10 +129,10 @@ semver "5.6.0" tmp "0.0.33" -"@bazel/typescript@0.25.1": - version "0.25.1" - resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.25.1.tgz#71564de50ff6976fb37d90f2f7a479e87b158943" - integrity sha512-QFitUUXIWQMfVk5EwI9J9d5iNPfT+kUjPbahiJbJVZz1Fz9zNZ8+CR6FESfnxuUKlZK3Oy0VWFcz7mlHaceL/Q== +"@bazel/typescript@0.26.0-beta.0": + version "0.26.0-beta.0" + resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.26.0-beta.0.tgz#aa025951563f47baca302c8ebcf24eb596724426" + integrity sha512-Ot7k3sfLQAdf14IDmsc6wSgfySctJdW6Uwg7YmD4Zv1sGWkjKaWEtQDFgjtf5kEgFpC0aeM5uK+heqz1CC+VcQ== dependencies: jasmine-core "2.8.0" protobufjs "5.0.3" @@ -5630,11 +5637,16 @@ jasmine-core@2.8.0, jasmine-core@~2.8.0: resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e" integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4= -jasmine-core@^3.1.0, jasmine-core@~3.1.0: +jasmine-core@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.1.0.tgz#a4785e135d5df65024dfc9224953df585bd2766c" integrity sha1-pHheE11d9lAk38kiSVPfWFvSdmw= +jasmine-core@~3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.3.0.tgz#dea1cdc634bc93c7e0d4ad27185df30fa971b10e" + integrity sha512-3/xSmG/d35hf80BEN66Y6g9Ca5l/Isdeg/j6zvbTYlTzeKinzmaTM4p9am5kYqOmE05D7s1t8FGjzdSnbUbceA== + jasmine@2.8.0: version "2.8.0" resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.8.0.tgz#6b089c0a11576b1f16df11b80146d91d4e8b8a3e" @@ -5644,13 +5656,13 @@ jasmine@2.8.0: glob "^7.0.6" jasmine-core "~2.8.0" -jasmine@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-3.1.0.tgz#2bd59fd7ec6ec0e8acb64e09f45a68ed2ad1952a" - integrity sha1-K9Wf1+xuwOistk4J9Fpo7SrRlSo= +jasmine@^3.1.0, jasmine@~3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-3.3.1.tgz#d61bb1dd8888859bd11ea83074a78ee13d949905" + integrity sha512-/vU3/H7U56XsxIXHwgEuWpCgQ0bRi2iiZeUpx7Nqo8n1TpoDHfZhkPIc7CO8I4pnMzYsi3XaSZEiy8cnTfujng== dependencies: glob "^7.0.6" - jasmine-core "~3.1.0" + jasmine-core "~3.3.0" jasminewd2@^2.1.0: version "2.2.0"