diff --git a/WORKSPACE b/WORKSPACE index 149160dd0f..19c17a5072 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1,11 +1,10 @@ workspace(name = "angular") -load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") - -git_repository( +http_archive( name = "build_bazel_rules_nodejs", - remote = "https://github.com/bazelbuild/rules_nodejs.git", - commit = "5307b572d86a0764bd86a5681fc72cca016e9390", + url = "https://github.com/bazelbuild/rules_nodejs/archive/0.4.1.zip", + strip_prefix = "rules_nodejs-0.4.1", + sha256 = "e9bc013417272b17f302dc169ad597f05561bb277451f010043f4da493417607", ) load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories") @@ -13,10 +12,11 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_reposi check_bazel_version("0.9.0") node_repositories(package_json = ["//:package.json"]) -git_repository( +http_archive( name = "build_bazel_rules_typescript", - remote = "https://github.com/bazelbuild/rules_typescript.git", - commit = "d3ad16d1f105e2490859da9ad528ba4c45991d09" + url = "https://github.com/bazelbuild/rules_typescript/archive/0.10.1.zip", + strip_prefix = "rules_typescript-0.10.1", + sha256 = "a2c81776a4a492ff9f878f9705639f5647bef345f7f3e1da09c9eeb8dec80485", ) load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace") @@ -63,10 +63,11 @@ http_archive( # re-packaging or "npm link"ing. # Even better, things like aspects will visit the entire graph including # ts_library rules in the devkit repository. -git_repository( +http_archive( name = "angular_devkit", - remote = "https://github.com/angular/devkit.git", - commit = "69fcdee61c5ff3f08aa609dec69155dfd29c809a", + url = "https://github.com/angular/devkit/archive/v0.3.1.zip", + strip_prefix = "devkit-0.3.1", + sha256 = "31d4b597fe9336650acf13df053c1c84dcbe9c29c6a833bcac3819cd3fd8cad3", ) http_archive( diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE index a5983fedb5..7b17d4eab4 100644 --- a/integration/bazel/WORKSPACE +++ b/integration/bazel/WORKSPACE @@ -1,20 +1,20 @@ workspace(name = "bazel_integration_test") -load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") - -git_repository( +http_archive( name = "build_bazel_rules_nodejs", - remote = "https://github.com/bazelbuild/rules_nodejs.git", - commit = "230d39a391226f51c03448f91eb61370e2e58c42", + url = "https://github.com/bazelbuild/rules_nodejs/archive/0.4.1.zip", + strip_prefix = "rules_nodejs-0.4.1", + sha256 = "e9bc013417272b17f302dc169ad597f05561bb277451f010043f4da493417607", ) load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories") node_repositories(package_json = ["//:package.json"]) -git_repository( +http_archive( name = "build_bazel_rules_typescript", - remote = "https://github.com/bazelbuild/rules_typescript.git", - commit = "d3ad16d1f105e2490859da9ad528ba4c45991d09" + url = "https://github.com/bazelbuild/rules_typescript/archive/0.10.1.zip", + strip_prefix = "rules_typescript-0.10.1", + sha256 = "a2c81776a4a492ff9f878f9705639f5647bef345f7f3e1da09c9eeb8dec80485", ) load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace") diff --git a/package.json b/package.json index 8f7d9dd5d5..0ed233810f 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,7 @@ "tsickle": "0.26.0", "tslint": "5.7.0", "tslint-eslint-rules": "4.1.1", - "tsutils": "2.12.1", + "tsutils": "2.20.0", "typescript": "2.6.x", "uglify-js": "2.8.29", "universal-analytics": "0.4.15", diff --git a/packages/bazel/src/ng_rollup_bundle.bzl b/packages/bazel/src/ng_rollup_bundle.bzl index 003d313942..2108b4bc08 100644 --- a/packages/bazel/src/ng_rollup_bundle.bzl +++ b/packages/bazel/src/ng_rollup_bundle.bzl @@ -57,8 +57,10 @@ def _ng_rollup_bundle(ctx): rollup_config = write_rollup_config(ctx, [BO_PLUGIN], root_dirs) run_rollup(ctx, depset(transitive = esm5_sources).to_list(), rollup_config, ctx.outputs.build_es5) - run_uglify(ctx, ctx.outputs.build_es5, ctx.outputs.build_es5_min) - run_uglify(ctx, ctx.outputs.build_es5, ctx.outputs.build_es5_min_debug, debug = True) + run_uglify(ctx, ctx.outputs.build_es5, ctx.outputs.build_es5_min, + comments = False) + run_uglify(ctx, ctx.outputs.build_es5, ctx.outputs.build_es5_min_debug, + debug = True, comments = False) run_brotli(ctx, ctx.outputs.build_es5_min, ctx.outputs.build_es5_min_compressed) diff --git a/packages/tsconfig-build.json b/packages/tsconfig-build.json index b73786cfcb..a7d464ca6d 100644 --- a/packages/tsconfig-build.json +++ b/packages/tsconfig-build.json @@ -23,5 +23,8 @@ "emitDecoratorMetadata": true, "sourceMap": true, "inlineSources": true + }, + "bazelOptions": { + "suppressTsconfigOverrideWarnings": true } } diff --git a/yarn.lock b/yarn.lock index 716af993c4..05f87a79e0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7096,6 +7096,10 @@ tslib@^1.0.0, tslib@^1.7.1: version "1.7.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.7.1.tgz#bc8004164691923a79fe8378bbeb3da2017538ec" +tslib@^1.8.1: + version "1.9.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8" + tslint-eslint-rules@4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/tslint-eslint-rules/-/tslint-eslint-rules-4.1.1.tgz#7c30e7882f26bc276bff91d2384975c69daf88ba" @@ -7137,11 +7141,11 @@ tsscmp@1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.5.tgz#7dc4a33af71581ab4337da91d85ca5427ebd9a97" -tsutils@2.12.1: - version "2.12.1" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.12.1.tgz#f4d95ce3391c8971e46e54c4cf0edb0a21dd5b24" +tsutils@2.20.0: + version "2.20.0" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.20.0.tgz#303394064bc80be8ee04e10b8609ae852e9312d3" dependencies: - tslib "^1.7.1" + tslib "^1.8.1" tsutils@^1.4.0: version "1.9.1"