From d698b0eadff4e4adb076ba3fb98a72c8487cc6a2 Mon Sep 17 00:00:00 2001 From: Greg Magolan Date: Fri, 5 Oct 2018 07:16:47 -0700 Subject: [PATCH] build: update to rules_typescript 0.20.1 and rules_nodejs 0.15.0 (#26260) (#26488) PR Close #26488 --- .circleci/config.yml | 1 + integration/bazel/package.json | 4 ++-- integration/bazel/yarn.lock | 14 +++++++------- package.json | 4 ++-- packages/bazel/package.bzl | 4 ++-- packages/bazel/rules_nodejs_package.bzl | 4 ++-- packages/bazel/rules_typescript_package.bzl | 8 ++++---- packages/bazel/src/ng_setup_workspace.bzl | 3 ++- tools/npm/package.json | 4 ++-- tools/npm/yarn.lock | 14 +++++++------- yarn.lock | 12 ++++++------ 11 files changed, 37 insertions(+), 35 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3f095d52c5..a7494b0775 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -113,6 +113,7 @@ jobs: paths: - "node_modules" - "~/bazel_repository_cache" + # Temporary job to test what will happen when we flip the Ivy flag to true test_ivy_jit: <<: *job_defaults diff --git a/integration/bazel/package.json b/integration/bazel/package.json index f6f50404f5..4832a29747 100644 --- a/integration/bazel/package.json +++ b/integration/bazel/package.json @@ -10,8 +10,8 @@ "zone.js": "0.8.26" }, "devDependencies": { - "@bazel/karma": "0.19.1", - "@bazel/typescript": "0.19.1", + "@bazel/karma": "0.20.1", + "@bazel/typescript": "0.20.1", "@types/jasmine": "2.8.8", "@types/source-map": "0.5.1", "protractor": "5.1.2", diff --git a/integration/bazel/yarn.lock b/integration/bazel/yarn.lock index 8c8846126d..edc4a670e5 100644 --- a/integration/bazel/yarn.lock +++ b/integration/bazel/yarn.lock @@ -2,9 +2,9 @@ # yarn lockfile v1 -"@bazel/karma@0.19.1": - version "0.19.1" - resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.19.1.tgz#99873ee9d85456b693f435f689ce0acfd09d2445" +"@bazel/karma@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.20.1.tgz#84e437cb4c4545906152bbfab401ed8111d5d558" dependencies: jasmine-core "2.8.0" karma alexeagle/karma#fa1a84ac881485b5657cb669e9b4e5da77b79f0a @@ -17,9 +17,9 @@ requirejs "2.3.5" tmp "0.0.33" -"@bazel/typescript@0.19.1": - version "0.19.1" - resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.19.1.tgz#61dd57c0ab8a6c9930d2463d44e9522ec007fe3a" +"@bazel/typescript@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.20.1.tgz#f6d3ff13fb203ccb6ddeb7ca670978983b3e1b73" dependencies: protobufjs "5.0.0" source-map-support "0.5.9" @@ -1781,7 +1781,7 @@ karma-sourcemap-loader@0.3.7: dependencies: graceful-fs "^4.1.2" -karma@alexeagle/karma#fa1a84ac881485b5657cb669e9b4e5da77b79f0a: +"karma@github:alexeagle/karma#fa1a84ac881485b5657cb669e9b4e5da77b79f0a": version "1.7.1" resolved "https://codeload.github.com/alexeagle/karma/tar.gz/fa1a84ac881485b5657cb669e9b4e5da77b79f0a" dependencies: diff --git a/package.json b/package.json index 6cea0b6a79..999c053318 100644 --- a/package.json +++ b/package.json @@ -41,8 +41,8 @@ }, "devDependencies": { "@bazel/ibazel": "^0.1.1", - "@bazel/karma": "0.19.1", - "@bazel/typescript": "0.19.1", + "@bazel/karma": "0.20.1", + "@bazel/typescript": "0.20.1", "@types/angular": "^1.6.47", "@types/base64-js": "1.2.5", "@types/chai": "^4.1.2", diff --git a/packages/bazel/package.bzl b/packages/bazel/package.bzl index 49344dc4fb..447ff4be8e 100644 --- a/packages/bazel/package.bzl +++ b/packages/bazel/package.bzl @@ -24,8 +24,8 @@ def rules_angular_dependencies(): _maybe( http_archive, name = "build_bazel_rules_typescript", - url = "https://github.com/bazelbuild/rules_typescript/archive/6561f95aa621a6e3d421ab86451167ec84e580fa.zip", - strip_prefix = "rules_typescript-6561f95aa621a6e3d421ab86451167ec84e580fa", + url = "https://github.com/bazelbuild/rules_typescript/archive/0.20.1.zip", + strip_prefix = "rules_typescript-0.20.1", ) # Needed for Remote Execution diff --git a/packages/bazel/rules_nodejs_package.bzl b/packages/bazel/rules_nodejs_package.bzl index c64a5e8e84..55eef2cd1e 100644 --- a/packages/bazel/rules_nodejs_package.bzl +++ b/packages/bazel/rules_nodejs_package.bzl @@ -19,8 +19,8 @@ Fulfills similar role as the package.json file. load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -# This file mirrored from https://raw.githubusercontent.com/bazelbuild/rules_nodejs/0.14.2/package.bzl -VERSION = "0.14.2" +# This file mirrored from https://raw.githubusercontent.com/bazelbuild/rules_nodejs/0.15.0/package.bzl +VERSION = "0.15.0" def rules_nodejs_dependencies(): """ diff --git a/packages/bazel/rules_typescript_package.bzl b/packages/bazel/rules_typescript_package.bzl index c493d9aab6..96a462a2bf 100644 --- a/packages/bazel/rules_typescript_package.bzl +++ b/packages/bazel/rules_typescript_package.bzl @@ -20,8 +20,8 @@ against a minimum dependent build_bazel_rules_typescript version. load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -# This file mirrored from https://raw.githubusercontent.com/bazelbuild/rules_typescript/0.19.1/package.bzl -VERSION = "0.19.1" +# This file mirrored from https://raw.githubusercontent.com/bazelbuild/rules_typescript/0.20.1/package.bzl +VERSION = "0.20.1" def rules_typescript_dependencies(): """ @@ -35,8 +35,8 @@ def rules_typescript_dependencies(): _maybe( http_archive, name = "build_bazel_rules_nodejs", - urls = ["https://github.com/bazelbuild/rules_nodejs/archive/3501f9b6a9a78a01fd1ef9b808f022bfcbb478a0.zip"], - strip_prefix = "rules_nodejs-3501f9b6a9a78a01fd1ef9b808f022bfcbb478a0", + urls = ["https://github.com/bazelbuild/rules_nodejs/archive/0.15.0.zip"], + strip_prefix = "rules_nodejs-0.15.0", ) # ts_web_test depends on the web testing rules to provision browsers. diff --git a/packages/bazel/src/ng_setup_workspace.bzl b/packages/bazel/src/ng_setup_workspace.bzl index e939fd856e..3f06c4f278 100644 --- a/packages/bazel/src/ng_setup_workspace.bzl +++ b/packages/bazel/src/ng_setup_workspace.bzl @@ -22,4 +22,5 @@ def ng_setup_workspace(): # 0.16.0: minimal version required to work with ng_module # 0.16.2: bazel type resolution for zone.js types - check_rules_typescript_version("0.16.2") + # 0.20.1: fine grained deps + check_rules_typescript_version("0.20.1") diff --git a/tools/npm/package.json b/tools/npm/package.json index 292d64a4ac..b688681000 100644 --- a/tools/npm/package.json +++ b/tools/npm/package.json @@ -1,8 +1,8 @@ { "description": "minimal @npm repo", "dependencies": { - "@bazel/karma": "0.19.1", - "@bazel/typescript": "0.19.1", + "@bazel/karma": "0.20.1", + "@bazel/typescript": "0.20.1", "typescript": "~3.1.1" }, "scripts": { diff --git a/tools/npm/yarn.lock b/tools/npm/yarn.lock index 6cc24c0ace..9778290b1a 100644 --- a/tools/npm/yarn.lock +++ b/tools/npm/yarn.lock @@ -2,9 +2,9 @@ # yarn lockfile v1 -"@bazel/karma@0.19.1": - version "0.19.1" - resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.19.1.tgz#99873ee9d85456b693f435f689ce0acfd09d2445" +"@bazel/karma@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.20.1.tgz#84e437cb4c4545906152bbfab401ed8111d5d558" dependencies: jasmine-core "2.8.0" karma alexeagle/karma#fa1a84ac881485b5657cb669e9b4e5da77b79f0a @@ -17,9 +17,9 @@ requirejs "2.3.5" tmp "0.0.33" -"@bazel/typescript@0.19.1": - version "0.19.1" - resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.19.1.tgz#61dd57c0ab8a6c9930d2463d44e9522ec007fe3a" +"@bazel/typescript@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.20.1.tgz#f6d3ff13fb203ccb6ddeb7ca670978983b3e1b73" dependencies: protobufjs "5.0.0" source-map-support "0.5.9" @@ -1649,7 +1649,7 @@ karma-sourcemap-loader@0.3.7: dependencies: graceful-fs "^4.1.2" -karma@alexeagle/karma#fa1a84ac881485b5657cb669e9b4e5da77b79f0a: +"karma@github:alexeagle/karma#fa1a84ac881485b5657cb669e9b4e5da77b79f0a": version "1.7.1" resolved "https://codeload.github.com/alexeagle/karma/tar.gz/fa1a84ac881485b5657cb669e9b4e5da77b79f0a" dependencies: diff --git a/yarn.lock b/yarn.lock index fcafff796b..4070b779ab 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22,9 +22,9 @@ version "0.1.1" resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.1.1.tgz#f970c08b4e4efb0ab17e04ade3cc610554f33bed" -"@bazel/karma@0.19.1": - version "0.19.1" - resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.19.1.tgz#99873ee9d85456b693f435f689ce0acfd09d2445" +"@bazel/karma@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.20.1.tgz#84e437cb4c4545906152bbfab401ed8111d5d558" dependencies: jasmine-core "2.8.0" karma alexeagle/karma#fa1a84ac881485b5657cb669e9b4e5da77b79f0a @@ -37,9 +37,9 @@ requirejs "2.3.5" tmp "0.0.33" -"@bazel/typescript@0.19.1": - version "0.19.1" - resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.19.1.tgz#61dd57c0ab8a6c9930d2463d44e9522ec007fe3a" +"@bazel/typescript@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.20.1.tgz#f6d3ff13fb203ccb6ddeb7ca670978983b3e1b73" dependencies: protobufjs "5.0.0" source-map-support "0.5.9"