From 22e7f7e99f14e33f8d5e1c8a5353ecb911544963 Mon Sep 17 00:00:00 2001 From: Alex Eagle Date: Tue, 14 Aug 2018 14:07:22 -0700 Subject: [PATCH] build(bazel): update to rules_typescript 0.16.1 (#25490) PR Close #25490 --- WORKSPACE | 49 +++++-------------- integration/bazel/WORKSPACE | 41 +++------------- packages/bazel/src/modify_tsconfig.js | 3 -- .../test/ng_package/core_package.spec.ts | 4 +- .../hello_world_r2/bundle.golden_symbols.json | 12 +++++ 5 files changed, 34 insertions(+), 75 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 6dc1dd1ce0..1157b2e194 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -5,18 +5,13 @@ workspace(name = "angular") # http_archive( - name = "build_bazel_rules_nodejs", - urls = ["https://github.com/bazelbuild/rules_nodejs/archive/0.11.4.zip"], - strip_prefix = "rules_nodejs-0.11.4", - sha256 = "c31c4ead696944a50fad2b3ee9dfbbeffe31a8dcca0b21b9bf5b3e6c6b069801", -) - -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", + name = "build_bazel_rules_typescript", + url = "https://github.com/bazelbuild/rules_typescript/archive/0.16.1.zip", + strip_prefix = "rules_typescript-0.16.1", + sha256 = "5b2b0bc63cfcffe7bf97cad2dad3b26a73362f806de66207051f66c87956a995", ) +load("@build_bazel_rules_typescript//:package.bzl", "rules_typescript_dependencies") +rules_typescript_dependencies() http_archive( name = "bazel_toolchains", @@ -28,31 +23,11 @@ http_archive( sha256 = "c3b08805602cd1d2b67ebe96407c1e8c6ed3d4ce55236ae2efe2f1948f38168d", ) -http_archive( - name = "io_bazel_rules_webtesting", - url = "https://github.com/bazelbuild/rules_webtesting/archive/0.2.1.zip", - strip_prefix = "rules_webtesting-0.2.1", - sha256 = "7d490aadff9b5262e5251fa69427ab2ffd1548422467cb9f9e1d110e2c36f0fa", -) - -http_archive( - name = "build_bazel_rules_typescript", - url = "https://github.com/bazelbuild/rules_typescript/archive/0.16.0.zip", - strip_prefix = "rules_typescript-0.16.0", - sha256 = "e65c5639a42e2f6d3f9d2bda62487d6b42734830dda45be1620c3e2b1115070c", -) - -http_archive( - name = "io_bazel_rules_go", - url = "https://github.com/bazelbuild/rules_go/releases/download/0.10.3/rules_go-0.10.3.tar.gz", - sha256 = "feba3278c13cde8d67e341a837f69a029f698d7a27ddbb2a202be7a10b22142a", -) - http_archive( name = "io_bazel_rules_sass", - url = "https://github.com/bazelbuild/rules_sass/archive/0.1.0.zip", - strip_prefix = "rules_sass-0.1.0", - sha256 = "b243c4d64f054c174051785862ab079050d90b37a1cef7da93821c6981cb9ad4", + url = "https://github.com/bazelbuild/rules_sass/archive/1.11.0.zip", + strip_prefix = "rules_sass-1.11.0", + sha256 = "dbe9fb97d5a7833b2a733eebc78c9c1e3880f676ac8af16e58ccf2139cbcad03", ) # This commit matches the version of buildifier in angular/ngcontainer @@ -98,9 +73,9 @@ http_archive( http_archive( name = "org_brotli", - url = "https://github.com/google/brotli/archive/f9b8c02673c576a3e807edbf3a9328e9e7af6d7c.zip", - strip_prefix = "brotli-f9b8c02673c576a3e807edbf3a9328e9e7af6d7c", - sha256 = "8a517806d2b7c8505ba5c53934e7d7c70d341b68ffd268e9044d35b564a48828", + url = "https://github.com/google/brotli/archive/v1.0.5.zip", + strip_prefix = "brotli-1.0.5", + sha256 = "774b893a0700b0692a76e2e5b7e7610dbbe330ffbe3fe864b4b52ca718061d5a", ) # diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE index 3a6465f927..b9601f768d 100644 --- a/integration/bazel/WORKSPACE +++ b/integration/bazel/WORKSPACE @@ -4,45 +4,20 @@ workspace(name = "bazel_integration_test") # Download Bazel toolchain dependencies as needed by build actions # -http_archive( - name = "build_bazel_rules_nodejs", - urls = ["https://github.com/bazelbuild/rules_nodejs/archive/0.11.4.zip"], - strip_prefix = "rules_nodejs-0.11.4", - sha256 = "c31c4ead696944a50fad2b3ee9dfbbeffe31a8dcca0b21b9bf5b3e6c6b069801", -) - -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( - name = "io_bazel_rules_webtesting", - url = "https://github.com/bazelbuild/rules_webtesting/archive/0.2.1.zip", - strip_prefix = "rules_webtesting-0.2.1", - sha256 = "7d490aadff9b5262e5251fa69427ab2ffd1548422467cb9f9e1d110e2c36f0fa", -) - http_archive( name = "build_bazel_rules_typescript", - url = "https://github.com/bazelbuild/rules_typescript/archive/0.16.0.zip", - strip_prefix = "rules_typescript-0.16.0", - sha256 = "e65c5639a42e2f6d3f9d2bda62487d6b42734830dda45be1620c3e2b1115070c", -) - -http_archive( - name = "io_bazel_rules_go", - url = "https://github.com/bazelbuild/rules_go/releases/download/0.11.0/rules_go-0.11.0.tar.gz", - sha256 = "f70c35a8c779bb92f7521ecb5a1c6604e9c3edd431e50b6376d7497abc8ad3c1", + url = "https://github.com/bazelbuild/rules_typescript/archive/0.16.1.zip", + strip_prefix = "rules_typescript-0.16.1", + sha256 = "5b2b0bc63cfcffe7bf97cad2dad3b26a73362f806de66207051f66c87956a995", ) +load("@build_bazel_rules_typescript//:package.bzl", "rules_typescript_dependencies") +rules_typescript_dependencies() http_archive( name = "io_bazel_rules_sass", - url = "https://github.com/bazelbuild/rules_sass/archive/0.1.0.zip", - strip_prefix = "rules_sass-0.1.0", - sha256 = "b243c4d64f054c174051785862ab079050d90b37a1cef7da93821c6981cb9ad4", + url = "https://github.com/bazelbuild/rules_sass/archive/1.11.0.zip", + strip_prefix = "rules_sass-1.11.0", + sha256 = "dbe9fb97d5a7833b2a733eebc78c9c1e3880f676ac8af16e58ccf2139cbcad03", ) # diff --git a/packages/bazel/src/modify_tsconfig.js b/packages/bazel/src/modify_tsconfig.js index e1e5508e99..7eee260c2f 100644 --- a/packages/bazel/src/modify_tsconfig.js +++ b/packages/bazel/src/modify_tsconfig.js @@ -23,9 +23,6 @@ function main(args) { const data = JSON.parse(fs.readFileSync(input, {encoding: 'utf-8'})); data['compilerOptions']['target'] = 'es5'; data['bazelOptions']['es5Mode'] = true; - // Enable tsickle for decorator downleveling only - data['bazelOptions']['tsickle'] = true; - data['bazelOptions']['tsickleExternsPath'] = ''; data['compilerOptions']['outDir'] = path.join(data['compilerOptions']['outDir'], newRoot); if (data['angularCompilerOptions']) { // Don't enable tsickle's closure conversions diff --git a/packages/bazel/test/ng_package/core_package.spec.ts b/packages/bazel/test/ng_package/core_package.spec.ts index 9496201c5d..9ebb0001ff 100644 --- a/packages/bazel/test/ng_package/core_package.spec.ts +++ b/packages/bazel/test/ng_package/core_package.spec.ts @@ -126,8 +126,8 @@ describe('@angular/core ng_package', () => { expect(shx.cat('fesm5/core.js')).not.toContain('@fileoverview added by tsickle'); }); - it('should have annotations rather than decorators', - () => { expect(shx.cat('fesm5/core.js')).not.toContain('__decorate'); }); + it('should have decorators', + () => { expect(shx.cat('fesm5/core.js')).toContain('__decorate'); }); it('should load tslib from external bundle', () => { expect(shx.cat('fesm5/core.js')).not.toContain('function __extends'); diff --git a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json index 324aafc61e..43c6ba7cbd 100644 --- a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json +++ b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json @@ -182,6 +182,9 @@ { "name": "APP_BOOTSTRAP_LISTENER" }, + { + "name": "APP_INITIALIZER" + }, { "name": "APP_ROOT" }, @@ -1910,6 +1913,9 @@ { "name": "__assign" }, + { + "name": "__decorate" + }, { "name": "__extends" }, @@ -1946,6 +1952,12 @@ { "name": "__extends$u" }, + { + "name": "__metadata" + }, + { + "name": "__param" + }, { "name": "__read" },