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

build: update to Bazel 0.26.1 (#30627) 

PR Close #30627
This commit is contained in:
Alex Eagle 2019-06-10 07:35:33 -07:00 committed by Igor Minar
parent ef0b2cc74d
commit 532c1cb485
6 changed files with 44 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
WORKSPACE
View File

@ -65,19 +65,7 @@ node_repositories(
yarn_install( yarn_install(
name = "npm", name = "npm",
data = [
"//:tools/npm/@angular_bazel/index.js",
"//:tools/npm/@angular_bazel/package.json",
"//:tools/postinstall-patches.js",
"//:tools/yarn/check-yarn.js",
],
package_json = "//:package.json", package_json = "//:package.json",
# Don't install devDependencies, they are large and not used under Bazel
prod_only = True,
# Temporarily disable node_modules symlinking until the fix for
# https://github.com/bazelbuild/bazel/issues/8487 makes it into a
# future Bazel release
symlink_node_modules = False,
yarn_lock = "//:yarn.lock", yarn_lock = "//:yarn.lock",
) )

34
integration/bazel-schematics/yarn.lock
View File

@ -30,7 +30,7 @@
rxjs "6.4.0" rxjs "6.4.0"
"@angular/bazel@file:../../dist/packages-dist/bazel": "@angular/bazel@file:../../dist/packages-dist/bazel":
version "8.0.0-rc.0" version "0.0.0"
dependencies: dependencies:
"@angular-devkit/architect" "^0.800.0-beta.15" "@angular-devkit/architect" "^0.800.0-beta.15"
"@angular-devkit/core" "^8.0.0-beta.15" "@angular-devkit/core" "^8.0.0-beta.15"
@ -62,27 +62,27 @@
universal-analytics "^0.4.20" universal-analytics "^0.4.20"
uuid "^3.3.2" uuid "^3.3.2"
"@bazel/bazel-darwin_x64@0.26.0-rc13": "@bazel/bazel-darwin_x64@0.26.1":
version "0.26.0-rc13" version "0.26.1"
resolved "https://registry.yarnpkg.com/@bazel/bazel-darwin_x64/-/bazel-darwin_x64-0.26.0-rc13.tgz#b580f470e2e221a3dd0e449c2b652ebfda661644" resolved "https://registry.yarnpkg.com/@bazel/bazel-darwin_x64/-/bazel-darwin_x64-0.26.1.tgz#1b5c69b635e5c2a8c3090fa5f6bcb45735f06045"
integrity sha512-I1TvJuD49UtiE8yt8vRcejvG/ISX09MdFTXRIhHKnB+soRZF2zbUtqs0H4ugMK2fzb80T/QK3QmXbjSfcZbx2w== integrity sha512-9VjrR+ce+iS9xS1lgeAo1RAPXlxCvez/r3smN1lP4s4YNF0s5LAT0cevIl6Zz2nwyEha/6JvY3v6Euemy36F0w==
"@bazel/bazel-linux_x64@0.26.0-rc13": "@bazel/bazel-linux_x64@0.26.1":
version "0.26.0-rc13" version "0.26.1"
resolved "https://registry.yarnpkg.com/@bazel/bazel-linux_x64/-/bazel-linux_x64-0.26.0-rc13.tgz#2b794b23b8954fe08b3c5f8a8b50c69e26ac08aa" resolved "https://registry.yarnpkg.com/@bazel/bazel-linux_x64/-/bazel-linux_x64-0.26.1.tgz#04dd194bdcd6b9d45bd865a9a60c280d0d600251"
integrity sha512-VIyJMR18ItGZFwMSRxYU+5bTohsn45yfrpjFdVP+aVcIl2c4KuPAyM4dTKwjGUUeDDGUDMb809PjyTgsRe5x3w== integrity sha512-oZooDxI1C4p7o18zx2Uns2cK/NN2hgF2YSBKH0aVDPAAxQA85h+g124CWDEbsghOdRMSBM0Hd0SSeIqwZcqLSw==
"@bazel/bazel-win32_x64@0.26.0-rc13": "@bazel/bazel-win32_x64@0.26.1":
version "0.26.0-rc13" version "0.26.1"
resolved "https://registry.yarnpkg.com/@bazel/bazel-win32_x64/-/bazel-win32_x64-0.26.0-rc13.tgz#fe862c700c35a41d43ee3223f8dbe5f735395e68" resolved "https://registry.yarnpkg.com/@bazel/bazel-win32_x64/-/bazel-win32_x64-0.26.1.tgz#9351f07313173b1f98006da8131c94db7aa7c506"
integrity sha512-8nAntbZTFp9xv504L5u4aLMKgkq2rhgqW+fJwcNmVz9Wg3cKVMxl+G49cYzImGxqrv9MFLe3lD1ldBYdoEvNqg== integrity sha512-0FkOo8+bxw13X2m6ALhXX2241gG9ZXgcLu0E/IbCWy/TmOB5bR0Z73CslszWbXIldVYnANuhFmnkxIa745Du5Q==
"@bazel/bazel@file:../../node_modules/@bazel/bazel": "@bazel/bazel@file:../../node_modules/@bazel/bazel":
version "0.26.0-rc13" version "0.26.1"
optionalDependencies: optionalDependencies:
"@bazel/bazel-darwin_x64" "0.26.0-rc13" "@bazel/bazel-darwin_x64" "0.26.1"
"@bazel/bazel-linux_x64" "0.26.0-rc13" "@bazel/bazel-linux_x64" "0.26.1"
"@bazel/bazel-win32_x64" "0.26.0-rc13" "@bazel/bazel-win32_x64" "0.26.1"
"@microsoft/api-extractor@^7.0.21": "@microsoft/api-extractor@^7.0.21":
version "7.0.22" version "7.0.22"

2
package.json
View File

@ -117,7 +117,7 @@
"// 3": "when updating @bazel/bazel version you also need to update the RBE settings in .bazelrc (see https://github.com/angular/angular/pull/27935)", "// 3": "when updating @bazel/bazel version you also need to update the RBE settings in .bazelrc (see https://github.com/angular/angular/pull/27935)",
"devDependencies": { "devDependencies": {
"@angular/cli": "^8.0.0-beta.15", "@angular/cli": "^8.0.0-beta.15",
"@bazel/bazel": "0.26.0", "@bazel/bazel": "0.26.1",
"@bazel/buildifier": "^0.19.2", "@bazel/buildifier": "^0.19.2",
"@bazel/ibazel": "~0.9.0", "@bazel/ibazel": "~0.9.0",
"@types/minimist": "^1.2.0", "@types/minimist": "^1.2.0",

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

@ -28,9 +28,12 @@ RULES_SASS_VERSION = "3a4f31c74513ccfacce3f955b5c006352f7e9587"
RULES_SASS_SHA256 = "4c87befcb17282b039ba8341df9a6cc45f461bf05776dcf35c7e40c7e79ce374" RULES_SASS_SHA256 = "4c87befcb17282b039ba8341df9a6cc45f461bf05776dcf35c7e40c7e79ce374"
http_archive( http_archive(
name = "io_bazel_rules_sass", name = "io_bazel_rules_sass",
sha256 = RULES_SASS_SHA256, # sha256 = RULES_SASS_SHA256,
url = "https://github.com/bazelbuild/rules_sass/archive/%s.zip" % RULES_SASS_VERSION, # url = "https://github.com/bazelbuild/rules_sass/archive/%s.zip" % RULES_SASS_VERSION,
strip_prefix = "rules_sass-%s" % RULES_SASS_VERSION, # strip_prefix = "rules_sass-%s" % RULES_SASS_VERSION,
# TODO: change back to upstream release after https://github.com/bazelbuild/rules_sass/pull/87 merged and released
strip_prefix = "rules_sass-9862dfc96a4a1f66fe171ef5e043b29853e8445b",
url = "https://github.com/manekinekko/rules_sass/archive/9862dfc96a4a1f66fe171ef5e043b29853e8445b.zip",
) )
#################################### ####################################
@ -49,13 +52,8 @@ Try running `yarn bazel` instead.
) )
yarn_install( yarn_install(
name = "npm", name = "npm",
data = ["//:angular-metadata.tsconfig.json"],
package_json = "//:package.json", package_json = "//:package.json",
yarn_lock = "//:yarn.lock", yarn_lock = "//:yarn.lock",
# Temporarily disable node_modules symlinking until the fix for
# https://github.com/bazelbuild/bazel/issues/8487 makes it into a
# future Bazel release
symlink_node_modules = False,
) )
load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies") load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies")

2
packages/bazel/src/builders/files/src/BUILD.bazel.template
View File

@ -47,7 +47,7 @@ ng_module(
rollup_bundle( rollup_bundle(
name = "bundle", name = "bundle",
entry_point = "src/main.prod", entry_point = ":main.prod.ts",
deps = [ deps = [
"//src", "//src",
"@npm//@angular/router", "@npm//@angular/router",

38
yarn.lock
View File

@ -90,29 +90,29 @@
esutils "^2.0.2" esutils "^2.0.2"
js-tokens "^4.0.0" js-tokens "^4.0.0"
"@bazel/bazel-darwin_x64@0.26.0": "@bazel/bazel-darwin_x64@0.26.1":
version "0.26.0" version "0.26.1"
resolved "https://registry.yarnpkg.com/@bazel/bazel-darwin_x64/-/bazel-darwin_x64-0.26.0.tgz#24660853a01e286359636025618a1fda1aa978e1" resolved "https://registry.yarnpkg.com/@bazel/bazel-darwin_x64/-/bazel-darwin_x64-0.26.1.tgz#1b5c69b635e5c2a8c3090fa5f6bcb45735f06045"
integrity sha512-9qcRlTW9g8TPJ1PWYIkNDUMsEjdhN4sJz5fDjva3GM7mnIST0sgJiRRW5Y9L3Ksv9+jNWmIOlj5wsibAUYyb5w== integrity sha512-9VjrR+ce+iS9xS1lgeAo1RAPXlxCvez/r3smN1lP4s4YNF0s5LAT0cevIl6Zz2nwyEha/6JvY3v6Euemy36F0w==
"@bazel/bazel-linux_x64@0.26.0": "@bazel/bazel-linux_x64@0.26.1":
version "0.26.0" version "0.26.1"
resolved "https://registry.yarnpkg.com/@bazel/bazel-linux_x64/-/bazel-linux_x64-0.26.0.tgz#9302b6df4363b5c492f2755174988935b84fb076" resolved "https://registry.yarnpkg.com/@bazel/bazel-linux_x64/-/bazel-linux_x64-0.26.1.tgz#04dd194bdcd6b9d45bd865a9a60c280d0d600251"
integrity sha512-v9RTFIZb/A8Ej0Q1uCc/uTCRFZIRGqQpBVLO9Vqkbg4kScND9FxAI2RO0bv3Zhz7YTXBvJ8+kSfd/DY+0azwsA== integrity sha512-oZooDxI1C4p7o18zx2Uns2cK/NN2hgF2YSBKH0aVDPAAxQA85h+g124CWDEbsghOdRMSBM0Hd0SSeIqwZcqLSw==
"@bazel/bazel-win32_x64@0.26.0": "@bazel/bazel-win32_x64@0.26.1":
version "0.26.0" version "0.26.1"
resolved "https://registry.yarnpkg.com/@bazel/bazel-win32_x64/-/bazel-win32_x64-0.26.0.tgz#ae878cf2aae0ad9799141e554c47417f426c1aa7" resolved "https://registry.yarnpkg.com/@bazel/bazel-win32_x64/-/bazel-win32_x64-0.26.1.tgz#9351f07313173b1f98006da8131c94db7aa7c506"
integrity sha512-hmhuWQUzTmVLDusSt701LFzkWoRdEsakDtEGKgIuQuAJ7zqwH8QUn3PpWIg5BA0qF0gxJBKMfTHGvNhMft3pmg== integrity sha512-0FkOo8+bxw13X2m6ALhXX2241gG9ZXgcLu0E/IbCWy/TmOB5bR0Z73CslszWbXIldVYnANuhFmnkxIa745Du5Q==
"@bazel/bazel@0.26.0": "@bazel/bazel@0.26.1":
version "0.26.0" version "0.26.1"
resolved "https://registry.yarnpkg.com/@bazel/bazel/-/bazel-0.26.0.tgz#651513d5e11198f4c911024fdd57e76e0742fe9d" resolved "https://registry.yarnpkg.com/@bazel/bazel/-/bazel-0.26.1.tgz#de5febbd1f4b457aa870fb69492f474850283e5d"
integrity sha512-vxm3nuvYu97NRVkcRBfuLHqDytykCazZaTX13j+Ssqg0XIuuIiewTXGNKq2lcxeydJnscArMyYEv+gyXpexHDA== integrity sha512-x0IR0KEML4JGG6QpAOpHQHWpMqM1YQjOi8zY1jjLwiRHhC3Y8Tc/Mcspnd6zUnjfs7MerPfppkyx2jaEnZwUuQ==
optionalDependencies: optionalDependencies:
"@bazel/bazel-darwin_x64" "0.26.0" "@bazel/bazel-darwin_x64" "0.26.1"
"@bazel/bazel-linux_x64" "0.26.0" "@bazel/bazel-linux_x64" "0.26.1"
"@bazel/bazel-win32_x64" "0.26.0" "@bazel/bazel-win32_x64" "0.26.1"
"@bazel/buildifier-darwin_x64@0.19.2": "@bazel/buildifier-darwin_x64@0.19.2":
version "0.19.2" version "0.19.2"