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

build: update to rules_nodejs 0.9.1 and rules_typescript 0.15.0 (#24212) 

PR Close #24212
This commit is contained in:
Greg Magolan 2018-05-30 18:15:38 -07:00 committed by Victor Berchet
parent 3647cb7f3b
commit ec57133b61
7 changed files with 216 additions and 441 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.circleci/config.yml
View File

@ -80,7 +80,7 @@ jobs:
- run: ls /home/circleci/bazel_repository_cache || true - run: ls /home/circleci/bazel_repository_cache || true
- run: bazel info release - run: bazel info release
- run: bazel run @yarn//:yarn - run: bazel run @nodejs//:yarn
# Use bazel query so that we explicitly ask for all buildable targets to be built as well # Use bazel query so that we explicitly ask for all buildable targets to be built as well
# This avoids waiting for the slowest build target to finish before running the first test # This avoids waiting for the slowest build target to finish before running the first test
# See https://github.com/bazelbuild/bazel/issues/4257 # See https://github.com/bazelbuild/bazel/issues/4257
@ -131,7 +131,7 @@ jobs:
- run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
- *setup-bazel-remote-cache - *setup-bazel-remote-cache
- run: bazel run @yarn//:yarn - run: bazel run @nodejs//:yarn
- run: scripts/build-packages-dist.sh - run: scripts/build-packages-dist.sh
# Save the npm packages from //packages/... for other workflow jobs to read # Save the npm packages from //packages/... for other workflow jobs to read

2
BUILD.bazel
View File

@ -11,7 +11,7 @@ exports_files([
# This ensures that package.json in subdirectories get installed as well. # This ensures that package.json in subdirectories get installed as well.
alias( alias(
name = "install", name = "install",
actual = "@yarn//:yarn", actual = "@nodejs//:yarn",
) )
node_modules_filegroup( node_modules_filegroup(

12
WORKSPACE
View File

@ -6,9 +6,9 @@ workspace(name = "angular")
http_archive( http_archive(
name = "build_bazel_rules_nodejs", name = "build_bazel_rules_nodejs",
url = "https://github.com/bazelbuild/rules_nodejs/archive/0.8.0.zip", url = "https://github.com/bazelbuild/rules_nodejs/archive/0.9.1.zip",
strip_prefix = "rules_nodejs-0.8.0", strip_prefix = "rules_nodejs-0.9.1",
sha256 = "4e40dd49ae7668d245c3107645f2a138660fcfd975b9310b91eda13f0c973953", sha256 = "6139762b62b37c1fd171d7f22aa39566cb7dc2916f0f801d505a9aaf118c117f",
) )
http_archive( http_archive(
@ -20,9 +20,9 @@ http_archive(
http_archive( http_archive(
name = "build_bazel_rules_typescript", name = "build_bazel_rules_typescript",
url = "https://github.com/bazelbuild/rules_typescript/archive/3b86d6d46269fb52d4c6f1416868869e847feac2.zip", url = "https://github.com/bazelbuild/rules_typescript/archive/0.15.0.zip",
strip_prefix = "rules_typescript-3b86d6d46269fb52d4c6f1416868869e847feac2", strip_prefix = "rules_typescript-0.15.0",
sha256 = "f67e5fbe4a2b34b3ead9fe56f22b713540c23b501bd24d661d3fb047071dc2c1", sha256 = "1aa75917330b820cb239b3c10a936a10f0a46fe215063d4492dd76dc6e1616f4",
) )
http_archive( http_archive(

2
docs/BAZEL.md
View File

@ -37,7 +37,7 @@ That repository defines dependencies on specific versions of
all the tools. You can run the tools Bazel installed, for all the tools. You can run the tools Bazel installed, for
example rather than `yarn install` (which depends on whatever example rather than `yarn install` (which depends on whatever
version you have installed on your machine), you can version you have installed on your machine), you can
`bazel run @yarn//:yarn`. `bazel run @nodejs//:yarn`.
Bazel accepts a lot of options. We check in some options in the Bazel accepts a lot of options. We check in some options in the
`.bazelrc` file. See the [bazelrc doc]. For example, if you don't `.bazelrc` file. See the [bazelrc doc]. For example, if you don't

19
integration/bazel/WORKSPACE
View File

@ -2,17 +2,26 @@ workspace(name = "bazel_integration_test")
http_archive( http_archive(
name = "build_bazel_rules_nodejs", name = "build_bazel_rules_nodejs",
url = "https://github.com/bazelbuild/rules_nodejs/archive/0.8.0.zip", url = "https://github.com/bazelbuild/rules_nodejs/archive/0.9.1.zip",
strip_prefix = "rules_nodejs-0.8.0", strip_prefix = "rules_nodejs-0.9.1",
sha256 = "4e40dd49ae7668d245c3107645f2a138660fcfd975b9310b91eda13f0c973953", sha256 = "6139762b62b37c1fd171d7f22aa39566cb7dc2916f0f801d505a9aaf118c117f",
) )
load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories") load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories")
node_repositories(package_json = ["//:package.json"]) node_repositories(package_json = ["//:package.json"])
local_repository( http_archive(
name = "io_bazel_rules_webtesting",
url = "https://github.com/bazelbuild/rules_webtesting/archive/v0.2.0.zip",
strip_prefix = "rules_webtesting-0.2.0",
sha256 = "cecc12f07e95740750a40d38e8b14b76fefa1551bef9332cb432d564d693723c",
)
http_archive(
name = "build_bazel_rules_typescript", name = "build_bazel_rules_typescript",
path = "node_modules/@bazel/typescript", url = "https://github.com/bazelbuild/rules_typescript/archive/0.15.0.zip",
strip_prefix = "rules_typescript-0.15.0",
sha256 = "1aa75917330b820cb239b3c10a936a10f0a46fe215063d4492dd76dc6e1616f4",
) )
load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace") load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")

616
integration/bazel/yarn.lock
View File

File diff suppressed because it is too large Load Diff

2
packages/bazel/package.json
View File

@ -5,7 +5,7 @@
"author": "angular", "author": "angular",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@bazel/typescript": "^0.11.1", "@bazel/typescript": "^0.15.0",
"@types/node": "6.0.84", "@types/node": "6.0.84",
"@types/shelljs": "0.7.7", "@types/shelljs": "0.7.7",
"shelljs": "0.7.8", "shelljs": "0.7.8",