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

build: update to latest bazel rules (#28931) 

PR Close #28931
This commit is contained in:
Alex Eagle 2019-02-22 13:22:11 -08:00 committed by Igor Minar
parent 10ba91b1d3
commit 350802b207
9 changed files with 39 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
WORKSPACE
View File

@ -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 # 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 = "1416d03823fed624b49a0abbd9979f7c63bbedfd37890ddecedd2fe25cccebc6", sha256 = "86ea92217dfd4a84e1e335cc07dfd942b12899796b080492546b947f12c5ab77",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.18.6/rules_nodejs-0.18.6.tar.gz"], 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 # Use a mock @npm repository while we are building angular from source

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 = "1416d03823fed624b49a0abbd9979f7c63bbedfd37890ddecedd2fe25cccebc6", sha256 = "86ea92217dfd4a84e1e335cc07dfd942b12899796b080492546b947f12c5ab77",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.18.6/rules_nodejs-0.18.6.tar.gz"], 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 # Fetch sass rules for compiling sass files

3
integration/bazel/src/package.json
View File

@ -18,8 +18,7 @@
"@angular/bazel": "packages-dist:bazel", "@angular/bazel": "packages-dist:bazel",
"@angular/compiler": "packages-dist:compiler", "@angular/compiler": "packages-dist:compiler",
"@angular/compiler-cli": "packages-dist:compiler-cli", "@angular/compiler-cli": "packages-dist:compiler-cli",
"@bazel/karma": "0.25.1", "@bazel/karma": "0.26.0-beta.0",
"@bazel/typescript": "0.25.1",
"@types/jasmine": "2.8.8", "@types/jasmine": "2.8.8",
"@types/source-map": "0.5.1", "@types/source-map": "0.5.1",
"protractor": "5.1.2", "protractor": "5.1.2",

7
package.json
View File

@ -35,8 +35,9 @@
"@angular-devkit/build-optimizer": "^0.13.2", "@angular-devkit/build-optimizer": "^0.13.2",
"@angular-devkit/core": "^7.3.2", "@angular-devkit/core": "^7.3.2",
"@angular-devkit/schematics": "^7.3.2", "@angular-devkit/schematics": "^7.3.2",
"@bazel/karma": "0.25.1", "@bazel/jasmine": "0.26.0-beta.0",
"@bazel/typescript": "0.25.1", "@bazel/karma": "0.26.0-beta.0",
"@bazel/typescript": "0.26.0-beta.0",
"@microsoft/api-extractor": "^7.0.17", "@microsoft/api-extractor": "^7.0.17",
"@schematics/angular": "^7.3.2", "@schematics/angular": "^7.3.2",
"@types/angular": "^1.6.47", "@types/angular": "^1.6.47",
@ -155,4 +156,4 @@
"resolutions": { "resolutions": {
"natives": "1.1.6" "natives": "1.1.6"
} }
} }

2
packages/bazel/package.json
View File

@ -21,7 +21,7 @@
"@angular-devkit/architect": "^0.10.6", "@angular-devkit/architect": "^0.10.6",
"@angular-devkit/core": "^7.0.4", "@angular-devkit/core": "^7.0.4",
"@angular-devkit/schematics": "^7.3.0-rc.0", "@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", "@microsoft/api-extractor": "^7.0.17",
"@schematics/angular": "^7.0.4", "@schematics/angular": "^7.0.4",
"@types/node": "6.0.84", "@types/node": "6.0.84",

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

@ -47,7 +47,6 @@ function addDevDependenciesToPackageJson(options: Schema) {
'@bazel/bazel': '^0.22.1', '@bazel/bazel': '^0.22.1',
'@bazel/ibazel': '^0.9.0', '@bazel/ibazel': '^0.9.0',
'@bazel/karma': '^0.25.1', '@bazel/karma': '^0.25.1',
'@bazel/typescript': '^0.25.1',
}; };
const recorder = host.beginUpdate(packageJson); const recorder = host.beginUpdate(packageJson);

1
packages/bazel/src/schematics/ng-add/index_spec.ts
View File

@ -107,7 +107,6 @@ describe('ng-add schematic', () => {
expect(devDeps).toContain('@bazel/bazel'); expect(devDeps).toContain('@bazel/bazel');
expect(devDeps).toContain('@bazel/ibazel'); expect(devDeps).toContain('@bazel/ibazel');
expect(devDeps).toContain('@bazel/karma'); expect(devDeps).toContain('@bazel/karma');
expect(devDeps).toContain('@bazel/typescript');
}); });
it('should create Bazel workspace file', () => { it('should create Bazel workspace file', () => {

5
tools/defaults.bzl
View File

@ -1,6 +1,7 @@
"""Re-export of some bazel rules with repository-wide defaults.""" """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_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("@npm_bazel_typescript//:defs.bzl", _ts_library = "ts_library")
load("//packages/bazel:index.bzl", _ng_module = "ng_module", _ng_package = "ng_package") 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 # Very common dependencies for tests
"@ngdeps//chokidar", "@ngdeps//chokidar",
"@ngdeps//domino", "@ngdeps//domino",
"@ngdeps//jasmine",
"@ngdeps//jasmine-core", "@ngdeps//jasmine-core",
"@ngdeps//mock-fs", "@ngdeps//mock-fs",
"@ngdeps//reflect-metadata", "@ngdeps//reflect-metadata",
@ -291,6 +291,7 @@ def jasmine_node_test(deps = [], **kwargs):
deps = deps, deps = deps,
# Pass-thru --define=compile=foo as an environment variable # Pass-thru --define=compile=foo as an environment variable
configuration_env_vars = ["compile"], configuration_env_vars = ["compile"],
jasmine = "@ngdeps//jasmine",
**kwargs **kwargs
) )

40
yarn.lock
View File

@ -105,10 +105,17 @@
resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.9.0.tgz#fd60023acd36313d304cc2f8c2e181b88b5445cd" resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.9.0.tgz#fd60023acd36313d304cc2f8c2e181b88b5445cd"
integrity sha512-E31cefDcdJsx/oii6p/gqKZXSVw0kEg1O73DD2McFcSvnf/p1GYWcQtVgdRQmlviBEytJkJgdX8rtThitRvcow== integrity sha512-E31cefDcdJsx/oii6p/gqKZXSVw0kEg1O73DD2McFcSvnf/p1GYWcQtVgdRQmlviBEytJkJgdX8rtThitRvcow==
"@bazel/karma@0.25.1": "@bazel/jasmine@0.26.0-beta.0":
version "0.25.1" version "0.26.0-beta.0"
resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.25.1.tgz#246286299b6e96fa4a91d240d3c3d7386164adaf" resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-0.26.0-beta.0.tgz#77243fea16dd7b31c60e0aa78bb89b7dcf0a9443"
integrity sha512-e5qyZkeHdxEYTIcHg04pmPF1SR8jy8I1mQLgDxX6NJDVx3JT7iIFeISqlS8hjBiykyX/XZ0CsVzkKYU/sG3ilg== 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: dependencies:
jasmine-core "2.8.0" jasmine-core "2.8.0"
karma "^4.0.0" karma "^4.0.0"
@ -122,10 +129,10 @@
semver "5.6.0" semver "5.6.0"
tmp "0.0.33" tmp "0.0.33"
"@bazel/typescript@0.25.1": "@bazel/typescript@0.26.0-beta.0":
version "0.25.1" version "0.26.0-beta.0"
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.25.1.tgz#71564de50ff6976fb37d90f2f7a479e87b158943" resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.26.0-beta.0.tgz#aa025951563f47baca302c8ebcf24eb596724426"
integrity sha512-QFitUUXIWQMfVk5EwI9J9d5iNPfT+kUjPbahiJbJVZz1Fz9zNZ8+CR6FESfnxuUKlZK3Oy0VWFcz7mlHaceL/Q== integrity sha512-Ot7k3sfLQAdf14IDmsc6wSgfySctJdW6Uwg7YmD4Zv1sGWkjKaWEtQDFgjtf5kEgFpC0aeM5uK+heqz1CC+VcQ==
dependencies: dependencies:
jasmine-core "2.8.0" jasmine-core "2.8.0"
protobufjs "5.0.3" 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" resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4= integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=
jasmine-core@^3.1.0, jasmine-core@~3.1.0: jasmine-core@^3.1.0:
version "3.1.0" version "3.1.0"
resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.1.0.tgz#a4785e135d5df65024dfc9224953df585bd2766c" resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.1.0.tgz#a4785e135d5df65024dfc9224953df585bd2766c"
integrity sha1-pHheE11d9lAk38kiSVPfWFvSdmw= 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: jasmine@2.8.0:
version "2.8.0" version "2.8.0"
resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.8.0.tgz#6b089c0a11576b1f16df11b80146d91d4e8b8a3e" resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.8.0.tgz#6b089c0a11576b1f16df11b80146d91d4e8b8a3e"
@ -5644,13 +5656,13 @@ jasmine@2.8.0:
glob "^7.0.6" glob "^7.0.6"
jasmine-core "~2.8.0" jasmine-core "~2.8.0"
jasmine@^3.1.0: jasmine@^3.1.0, jasmine@~3.3.1:
version "3.1.0" version "3.3.1"
resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-3.1.0.tgz#2bd59fd7ec6ec0e8acb64e09f45a68ed2ad1952a" resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-3.3.1.tgz#d61bb1dd8888859bd11ea83074a78ee13d949905"
integrity sha1-K9Wf1+xuwOistk4J9Fpo7SrRlSo= integrity sha512-/vU3/H7U56XsxIXHwgEuWpCgQ0bRi2iiZeUpx7Nqo8n1TpoDHfZhkPIc7CO8I4pnMzYsi3XaSZEiy8cnTfujng==
dependencies: dependencies:
glob "^7.0.6" glob "^7.0.6"
jasmine-core "~3.1.0" jasmine-core "~3.3.0"
jasminewd2@^2.1.0: jasminewd2@^2.1.0:
version "2.2.0" version "2.2.0"