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

build(bazel): update to rules_nodejs 0.11.2 and latest rules_typescript (#25169) 

PR Close #25169
This commit is contained in:
Greg Magolan 2018-07-27 11:32:51 -07:00 committed by Igor Minar
parent 4ee9db959a
commit 5254d3447d
11 changed files with 48 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
WORKSPACE
View File

@ -6,9 +6,16 @@ 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/20ff5892612f8359aec8aaf26dd3902a24976ada.zip", urls = ["https://github.com/bazelbuild/rules_nodejs/archive/0.11.2.zip"],
strip_prefix = "rules_nodejs-20ff5892612f8359aec8aaf26dd3902a24976ada", strip_prefix = "rules_nodejs-0.11.2",
sha256 = "07da9d4c3e688a02745d0f50709a87744706d4f5d1959b799b0ac38e97acd622", sha256 = "c00d5381adeefb56e0ef959a7b168cae628535dab933cfad1c2cd1870cd7c9de",
)
http_archive(
name = "bazel_skylib",
urls = ["https://github.com/bazelbuild/bazel-skylib/archive/0.3.1.zip"],
strip_prefix = "bazel-skylib-0.3.1",
sha256 = "95518adafc9a2b656667bbf517a952e54ce7f350779d0dd95133db4eb5c27fb1",
) )
http_archive( http_archive(
@ -20,9 +27,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/0.15.3.zip", url = "https://github.com/bazelbuild/rules_typescript/archive/1d9a4b0087f307e31af91e2b221a6447288994c6.zip",
strip_prefix = "rules_typescript-0.15.3", strip_prefix = "rules_typescript-1d9a4b0087f307e31af91e2b221a6447288994c6",
sha256 = "a2b26ac3fc13036011196063db1bf7f1eae81334449201dc28087ebfa3708c99", sha256 = "e17ac3f33d5d3cd2a0c385c4fd28b814d0ad46c6c67ccaef97160be99d7a24eb",
) )
http_archive( http_archive(

19
integration/bazel/WORKSPACE
View File

@ -6,9 +6,16 @@ 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.10.1.zip", urls = ["https://github.com/bazelbuild/rules_nodejs/archive/0.11.2.zip"],
strip_prefix = "rules_nodejs-0.10.1", strip_prefix = "rules_nodejs-0.11.2",
sha256 = "634206524d90dc03c52392fa3f19a16637d2bcf154910436fe1d669a0d9d7b9c", sha256 = "c00d5381adeefb56e0ef959a7b168cae628535dab933cfad1c2cd1870cd7c9de",
)
http_archive(
name = "bazel_skylib",
urls = ["https://github.com/bazelbuild/bazel-skylib/archive/0.3.1.zip"],
strip_prefix = "bazel-skylib-0.3.1",
sha256 = "95518adafc9a2b656667bbf517a952e54ce7f350779d0dd95133db4eb5c27fb1",
) )
http_archive( http_archive(
@ -20,9 +27,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/0.15.0.zip", url = "https://github.com/bazelbuild/rules_typescript/archive/1d9a4b0087f307e31af91e2b221a6447288994c6.zip",
strip_prefix = "rules_typescript-0.15.0", strip_prefix = "rules_typescript-1d9a4b0087f307e31af91e2b221a6447288994c6",
sha256 = "1aa75917330b820cb239b3c10a936a10f0a46fe215063d4492dd76dc6e1616f4", sha256 = "e17ac3f33d5d3cd2a0c385c4fd28b814d0ad46c6c67ccaef97160be99d7a24eb",
) )
http_archive( http_archive(

1
integration/bazel/src/hello-world/BUILD.bazel
View File

@ -32,6 +32,7 @@ ts_library(
name = "test_lib", name = "test_lib",
testonly = 1, testonly = 1,
srcs = glob(["*.spec.ts"]), srcs = glob(["*.spec.ts"]),
tsconfig = "//src:tsconfig.json",
deps = [":hello-world"], deps = [":hello-world"],
) )

1
integration/bazel/test/e2e/BUILD.bazel
View File

@ -5,6 +5,7 @@ ts_library(
name = "e2e", name = "e2e",
testonly = 1, testonly = 1,
srcs = ["app.spec.ts"], srcs = ["app.spec.ts"],
tsconfig = ":tsconfig.json",
) )
ts_library( ts_library(

26
integration/bazel/yarn.lock
View File

@ -3,47 +3,47 @@
"@angular/animations@file:../../dist/packages-dist/animations": "@angular/animations@file:../../dist/packages-dist/animations":
version "6.1.0-beta.3" version "6.1.0"
dependencies: dependencies:
tslib "^1.9.0" tslib "^1.9.0"
"@angular/bazel@file:../../dist/packages-dist/bazel": "@angular/bazel@file:../../dist/packages-dist/bazel":
version "6.1.0-beta.3" version "6.1.0"
dependencies: dependencies:
"@bazel/typescript" "^0.15.0" "@bazel/typescript" "^0.15.0"
"@types/node" "6.0.84" "@types/node" "6.0.84"
protobufjs "5.0.0" protobufjs "5.0.0"
"@angular/common@file:../../dist/packages-dist/common": "@angular/common@file:../../dist/packages-dist/common":
version "6.1.0-beta.3" version "6.1.0"
dependencies: dependencies:
tslib "^1.9.0" tslib "^1.9.0"
"@angular/compiler-cli@file:../../dist/packages-dist/compiler-cli": "@angular/compiler-cli@file:../../dist/packages-dist/compiler-cli":
version "6.1.0-beta.3" version "6.1.0"
dependencies: dependencies:
chokidar "^1.4.2" chokidar "^1.4.2"
minimist "^1.2.0" minimist "^1.2.0"
reflect-metadata "^0.1.2" reflect-metadata "^0.1.2"
tsickle "^0.30.0" tsickle "^0.32.1"
"@angular/compiler@file:../../dist/packages-dist/compiler": "@angular/compiler@file:../../dist/packages-dist/compiler":
version "6.1.0-beta.3" version "6.1.0"
dependencies: dependencies:
tslib "^1.9.0" tslib "^1.9.0"
"@angular/core@file:../../dist/packages-dist/core": "@angular/core@file:../../dist/packages-dist/core":
version "6.1.0-beta.3" version "6.1.0"
dependencies: dependencies:
tslib "^1.9.0" tslib "^1.9.0"
"@angular/platform-browser-dynamic@file:../../dist/packages-dist/platform-browser-dynamic": "@angular/platform-browser-dynamic@file:../../dist/packages-dist/platform-browser-dynamic":
version "6.1.0-beta.3" version "6.1.0"
dependencies: dependencies:
tslib "^1.9.0" tslib "^1.9.0"
"@angular/platform-browser@file:../../dist/packages-dist/platform-browser": "@angular/platform-browser@file:../../dist/packages-dist/platform-browser":
version "6.1.0-beta.3" version "6.1.0"
dependencies: dependencies:
tslib "^1.9.0" tslib "^1.9.0"
@ -1223,7 +1223,7 @@ rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1:
glob "^7.0.5" glob "^7.0.5"
"rxjs@file:../../node_modules/rxjs": "rxjs@file:../../node_modules/rxjs":
version "6.0.0" version "6.2.1"
dependencies: dependencies:
tslib "^1.9.0" tslib "^1.9.0"
@ -1393,9 +1393,9 @@ tough-cookie@~2.3.3:
dependencies: dependencies:
punycode "^1.4.1" punycode "^1.4.1"
tsickle@^0.30.0: tsickle@^0.32.1:
version "0.30.0" version "0.32.1"
resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.30.0.tgz#7941146ae92933854a8742fa1047606c4536649b" resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.32.1.tgz#f16e94ba80b32fc9ebe320dc94fbc2ca7f3521a5"
dependencies: dependencies:
jasmine-diff "^0.1.3" jasmine-diff "^0.1.3"
minimist "^1.2.0" minimist "^1.2.0"

2
packages/bazel/src/ngc-wrapped/BUILD.bazel
View File

@ -30,7 +30,7 @@ nodejs_binary(
name = "ngc-wrapped", name = "ngc-wrapped",
data = [ data = [
":ngc_lib", ":ngc_lib",
"@build_bazel_rules_typescript//internal:worker_protocol.proto", "@build_bazel_rules_typescript//third_party/github.com/bazelbuild/bazel/src/main/protobuf:worker_protocol.proto",
], ],
entry_point = "angular/packages/bazel/src/ngc-wrapped/index.js", entry_point = "angular/packages/bazel/src/ngc-wrapped/index.js",
visibility = ["//visibility:public"], visibility = ["//visibility:public"],

2
packages/bazel/test/ngc-wrapped/BUILD.bazel
View File

@ -30,6 +30,6 @@ jasmine_node_test(
":angular_core", ":angular_core",
"//packages/bazel/test/ngc-wrapped/empty:empty_tsconfig.json", "//packages/bazel/test/ngc-wrapped/empty:empty_tsconfig.json",
"//packages/bazel/test/ngc-wrapped/empty:tsconfig.json", "//packages/bazel/test/ngc-wrapped/empty:tsconfig.json",
"@build_bazel_rules_typescript//internal:worker_protocol.proto", "@build_bazel_rules_typescript//third_party/github.com/bazelbuild/bazel/src/main/protobuf:worker_protocol.proto",
], ],
) )

2
packages/bazel/test/protractor-2/BUILD.bazel
View File

@ -6,6 +6,7 @@ load("//tools/http-server:http_server.bzl", "http_server")
ts_library( ts_library(
name = "app", name = "app",
srcs = ["app.ts"], srcs = ["app.ts"],
tsconfig = ":tsconfig.json",
) )
ts_devserver( ts_devserver(
@ -33,6 +34,7 @@ ts_library(
name = "ts_spec", name = "ts_spec",
testonly = True, testonly = True,
srcs = ["test.spec.ts"], srcs = ["test.spec.ts"],
tsconfig = ":tsconfig.json",
) )
protractor_web_test_suite( protractor_web_test_suite(

2
packages/bazel/test/protractor-2/tsconfig.json
View File

@ -1,5 +1,5 @@
{ {
"compilerOptions": { "compilerOptions": {
"lib": ["es2015"] "lib": ["dom", "es2015"]
} }
} }

1
packages/bazel/test/protractor/BUILD.bazel
View File

@ -5,6 +5,7 @@ ts_library(
name = "ts_spec", name = "ts_spec",
testonly = True, testonly = True,
srcs = ["test.spec.ts"], srcs = ["test.spec.ts"],
tsconfig = ":tsconfig.json",
) )
ts_library( ts_library(

1
tools/ts-api-guardian/BUILD.bazel
View File

@ -46,6 +46,7 @@ ts_library(
name = "test_lib", name = "test_lib",
testonly = True, testonly = True,
srcs = glob(["test/*.ts"]), srcs = glob(["test/*.ts"]),
tsconfig = "//tools:tsconfig.json",
deps = [":lib"], deps = [":lib"],
) )