diff --git a/WORKSPACE b/WORKSPACE index c0a8f312d4..6396b707f9 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -8,7 +8,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") # path = "../rules_nodejs", #) #local_repository( -# name = "build_bazel_rules_typescript", +# name = "npm_bazel_typescript", # path = "../rules_typescript", #) @@ -67,7 +67,7 @@ load("//packages/bazel:package.bzl", "rules_angular_dev_dependencies") rules_angular_dev_dependencies() # Load karma dependencies -load("@build_bazel_rules_karma//:package.bzl", "rules_karma_dependencies") +load("@npm_bazel_karma//:package.bzl", "rules_karma_dependencies") rules_karma_dependencies() @@ -78,12 +78,12 @@ web_test_repositories() # Temporary work-around for https://github.com/angular/angular/issues/28681 # TODO(gregmagolan): go back to @io_bazel_rules_webtesting browser_repositories -load("@angular//:browser_repositories.bzl", "browser_repositories") +load("@npm_bazel_karma//:browser_repositories.bzl", "browser_repositories") browser_repositories() # Setup the rules_typescript tooolchain -load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace") +load("@npm_bazel_typescript//:defs.bzl", "ts_setup_workspace") ts_setup_workspace() diff --git a/browser_repositories.bzl b/browser_repositories.bzl deleted file mode 100644 index facd7cd9be..0000000000 --- a/browser_repositories.bzl +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 2018 The Bazel Authors. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -"""Pinned browser versions. - -This function is here temporarily to fix https://github.com/angular/angular/issues/28681. -It will be removed once the browser versions are fixed upstream and we can pull -working versions from rules_webtesting browser_repositories(). - -TODO(gregmagolan): remove this file once we have working browser versions from rules_webtesting. -""" - -load("@io_bazel_rules_webtesting//web/internal:platform_http_file.bzl", "platform_http_file") - -def browser_repositories(): - """Load pinned rules_webtesting browser versions.""" - - platform_http_file( - name = "org_chromium_chromium", - amd64_sha256 = - "941de83d78b27d43db07f427136ba159d661bb111db8d9ffe12499b863a003e1", - amd64_urls = [ - # Chromium 69.0.3497.0 (2018-07-19 snaphot 576668) - # https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html?prefix=Linux_x64/576668/ - "https://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/576668/chrome-linux.zip", - ], - licenses = ["notice"], # BSD 3-clause (maybe more?) - macos_sha256 = - "bd01783e7d179e9f85d4b6f0c9df53118d13977cc7d365a1caa9d198c6afcfd8", - macos_urls = [ - # Chromium 69.0.3497.0 (2018-07-19 snaphot 576668) - # https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html?prefix=Mac/576668/ - "https://commondatastorage.googleapis.com/chromium-browser-snapshots/Mac/576668/chrome-mac.zip", - ], - windows_sha256 = - "2997d6231867688a2bceb49af1d8dbdbe6ea5de848b98d686d40dd153ae4d271", - windows_urls = [ - # Chromium 69.0.3497.0 (2018-07-19 snaphot 576668) - # https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html?prefix=Win_x64/576668/ - "https://commondatastorage.googleapis.com/chromium-browser-snapshots/Win_x64/576668/chrome-win32.zip", - ], - ) - - platform_http_file( - name = "org_chromium_chromedriver", - amd64_sha256 = - "687d2e15c42908e2911344c08a949461b3f20a83017a7a682ef4d002e05b5d46", - amd64_urls = [ - # ChromeDriver 2.44 supports Chrome v69-71 - # http://chromedriver.chromium.org/downloads - "https://chromedriver.storage.googleapis.com/2.44/chromedriver_linux64.zip", - ], - licenses = ["reciprocal"], # BSD 3-clause, ICU, MPL 1.1, libpng (BSD/MIT-like), Academic Free License v. 2.0, BSD 2-clause, MIT - macos_sha256 = - "3fd49c2782a5f93cb48ff2dee021004d9a7fb393798e4c4807b391cedcd30ed9", - macos_urls = [ - # ChromeDriver 2.44 supports Chrome v69-71 - # http://chromedriver.chromium.org/downloads - "https://chromedriver.storage.googleapis.com/2.44/chromedriver_mac64.zip", - ], - windows_sha256 = - "5d2d2ddb2ed3730672484160c822b75b41c4e77f9cadb5111530699d561c548c", - windows_urls = [ - # ChromeDriver 2.44 supports Chrome v69-71 - # http://chromedriver.chromium.org/downloads - "https://chromedriver.storage.googleapis.com/2.44/chromedriver_win32.zip", - ], - ) - - platform_http_file( - name = "org_mozilla_firefox", - amd64_sha256 = - "3a729ddcb1e0f5d63933177a35177ac6172f12edbf9fbbbf45305f49333608de", - amd64_urls = [ - "https://mirror.bazel.build/ftp.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-US/firefox-61.0.2.tar.bz2", - "https://ftp.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-US/firefox-61.0.2.tar.bz2", - ], - licenses = ["reciprocal"], # MPL 2.0 - macos_sha256 = - "bf23f659ae34832605dd0576affcca060d1077b7bf7395bc9874f62b84936dc5", - macos_urls = [ - "https://mirror.bazel.build/ftp.mozilla.org/pub/firefox/releases/61.0.2/mac/en-US/Firefox%2061.0.2.dmg", - "https://ftp.mozilla.org/pub/firefox/releases/61.0.2/mac/en-US/Firefox%2061.0.2.dmg", - ], - ) - - platform_http_file( - name = "org_mozilla_geckodriver", - amd64_sha256 = - "c9ae92348cf00aa719be6337a608fae8304691a95668e8e338d92623ba9e0ec6", - amd64_urls = [ - "https://mirror.bazel.build/github.com/mozilla/geckodriver/releases/download/v0.21.0/geckodriver-v0.21.0-linux64.tar.gz", - "https://github.com/mozilla/geckodriver/releases/download/v0.21.0/geckodriver-v0.21.0-linux64.tar.gz", - ], - licenses = ["reciprocal"], # MPL 2.0 - macos_sha256 = - "ce4a3e9d706db94e8760988de1ad562630412fa8cf898819572522be584f01ce", - macos_urls = [ - "https://mirror.bazel.build/github.com/mozilla/geckodriver/releases/download/v0.21.0/geckodriver-v0.21.0-macos.tar.gz", - "https://github.com/mozilla/geckodriver/releases/download/v0.21.0/geckodriver-v0.21.0-macos.tar.gz", - ], - ) diff --git a/docs/BAZEL.md b/docs/BAZEL.md index 730ba66e88..897871d133 100644 --- a/docs/BAZEL.md +++ b/docs/BAZEL.md @@ -22,7 +22,7 @@ You can access Bazel with the `yarn bazel` command The `WORKSPACE` file indicates that our root directory is a Bazel project. It contains the version of the Bazel rules we -use to execute build steps, from `build_bazel_rules_typescript`. +use to execute build steps, from `npm_bazel_typescript`. The sources on [GitHub] are published from Google's internal repository (google3). diff --git a/integration/bazel-schematics/package.json.replace b/integration/bazel-schematics/package.json.replace index a57fe8451b..7299ca000a 100644 --- a/integration/bazel-schematics/package.json.replace +++ b/integration/bazel-schematics/package.json.replace @@ -32,8 +32,8 @@ "@angular/language-service": "file:../angular/dist/packages-dist/language-service", "@bazel/bazel": "^0.21.0", "@bazel/ibazel": "^0.9.0", - "@bazel/karma": "^0.23.2", - "@bazel/typescript": "^0.23.2", + "@bazel/karma": "^0.25.1", + "@bazel/typescript": "^0.25.1", "@types/node": "~8.9.4", "@types/jasmine": "~2.8.8", "@types/jasminewd2": "~2.0.3", diff --git a/integration/bazel-schematics/yarn.lock b/integration/bazel-schematics/yarn.lock index dd1315007e..112defc789 100644 --- a/integration/bazel-schematics/yarn.lock +++ b/integration/bazel-schematics/yarn.lock @@ -68,12 +68,12 @@ rxjs "6.3.3" "@angular/bazel@file:../../dist/packages-dist/bazel": - version "8.0.0-beta.2" + version "7.2.6" dependencies: "@angular-devkit/architect" "^0.10.6" "@angular-devkit/core" "^7.0.4" "@angular-devkit/schematics" "^7.3.0-rc.0" - "@bazel/typescript" "^0.23.2" + "@bazel/typescript" "^0.25.1" "@schematics/angular" "^7.0.4" "@types/node" "6.0.84" semver "^5.6.0" @@ -119,10 +119,10 @@ "@bazel/bazel-linux_x64" "0.22.0" "@bazel/bazel-win32_x64" "0.22.0" -"@bazel/typescript@^0.23.2": - version "0.23.2" - resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.23.2.tgz#a3ff199880855259d84216cb41644c1d9a0fad14" - integrity sha512-GrTyDW6Fvp/rgnxZGYampB5/QmDWvxtLEtUyMCPa/QXFR1OVxaMWeHxxuFEcES2UKJegqBDKAA8IzX21x4UbEw== +"@bazel/typescript@^0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.25.1.tgz#71564de50ff6976fb37d90f2f7a479e87b158943" + integrity sha512-QFitUUXIWQMfVk5EwI9J9d5iNPfT+kUjPbahiJbJVZz1Fz9zNZ8+CR6FESfnxuUKlZK3Oy0VWFcz7mlHaceL/Q== dependencies: jasmine-core "2.8.0" protobufjs "5.0.3" diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE index 4b217fe3ba..131cba4261 100644 --- a/integration/bazel/WORKSPACE +++ b/integration/bazel/WORKSPACE @@ -54,7 +54,7 @@ load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies") install_bazel_dependencies() # Load karma dependencies -load("@build_bazel_rules_karma//:package.bzl", "rules_karma_dependencies") +load("@npm_bazel_karma//:package.bzl", "rules_karma_dependencies") rules_karma_dependencies() @@ -65,12 +65,12 @@ web_test_repositories() # Temporary work-around for https://github.com/angular/angular/issues/28681 # TODO(gregmagolan): go back to @io_bazel_rules_webtesting browser_repositories -load("@npm_angular_bazel//:browser_repositories.bzl", "browser_repositories") +load("@npm_bazel_karma//:browser_repositories.bzl", "browser_repositories") browser_repositories() # Setup the rules_typescript tooolchain -load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace") +load("@npm_bazel_typescript//:defs.bzl", "ts_setup_workspace") ts_setup_workspace() diff --git a/integration/bazel/src/BUILD.bazel b/integration/bazel/src/BUILD.bazel index e54aa70f3d..1014cdd936 100644 --- a/integration/bazel/src/BUILD.bazel +++ b/integration/bazel/src/BUILD.bazel @@ -3,7 +3,7 @@ package(default_visibility = ["//visibility:public"]) load("@npm_angular_bazel//:index.bzl", "ng_module") load("@build_bazel_rules_nodejs//:defs.bzl", "http_server", "nodejs_binary", "rollup_bundle") load("@build_bazel_rules_nodejs//internal/web_package:web_package.bzl", "web_package") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") # Allow targets under sub-packages to reference the tsconfig.json file exports_files(["tsconfig.json"]) diff --git a/integration/bazel/src/hello-world/BUILD.bazel b/integration/bazel/src/hello-world/BUILD.bazel index 397afa978b..11f39a8c74 100644 --- a/integration/bazel/src/hello-world/BUILD.bazel +++ b/integration/bazel/src/hello-world/BUILD.bazel @@ -1,9 +1,9 @@ package(default_visibility = ["//visibility:public"]) -load("@build_bazel_rules_karma//:defs.bzl", "ts_web_test_suite") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_library") load("@io_bazel_rules_sass//sass:sass.bzl", "sass_binary") load("@npm_angular_bazel//:index.bzl", "ng_module", "ng_package") +load("@npm_bazel_karma//:defs.bzl", "ts_web_test_suite") +load("@npm_bazel_typescript//:defs.bzl", "ts_library") sass_binary( name = "hello-world-styles", diff --git a/integration/bazel/src/package.json b/integration/bazel/src/package.json index f7400d5136..3832e5784b 100644 --- a/integration/bazel/src/package.json +++ b/integration/bazel/src/package.json @@ -18,8 +18,8 @@ "@angular/bazel": "packages-dist:bazel", "@angular/compiler": "packages-dist:compiler", "@angular/compiler-cli": "packages-dist:compiler-cli", - "@bazel/karma": "0.23.2", - "@bazel/typescript": "0.23.2", + "@bazel/karma": "0.25.1", + "@bazel/typescript": "0.25.1", "@types/jasmine": "2.8.8", "@types/source-map": "0.5.1", "protractor": "5.1.2", diff --git a/integration/bazel/src/yarn.lock b/integration/bazel/src/yarn.lock index 5731721262..d551f752b2 100644 --- a/integration/bazel/src/yarn.lock +++ b/integration/bazel/src/yarn.lock @@ -32,12 +32,12 @@ rxjs "6.3.3" source-map "0.7.3" -"@angular-devkit/core@7.3.1": - version "7.3.1" - resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.1.tgz#d92f6545796579cabdcfc29579a2c977f7a96c6c" - integrity sha512-56XDWWfIzOAkEk69lBLgmCYybPUA4yjunhmMlCk7vVdb7gbQUyzNjFD04Uj0GjlejatAQ5F76tRwygD9C+3RXQ== +"@angular-devkit/core@7.3.3": + version "7.3.3" + resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.3.tgz#cd6d5a8eca25ef07b6394bc2b08133d90d08d39f" + integrity sha512-fosULDtMoDWrOyUzTmBkJccOy7zodo02kENyKai7vOv9EWfv9jytkVdNc+jl0ys9OE2QadvSYBo49jhnZxFXfQ== dependencies: - ajv "6.7.0" + ajv "6.9.1" chokidar "2.0.4" fast-json-stable-stringify "2.0.0" rxjs "6.3.3" @@ -51,26 +51,26 @@ "@angular-devkit/core" "7.1.2" rxjs "6.3.3" -"@angular-devkit/schematics@^7.0.4": - version "7.3.1" - resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.1.tgz#7dc704005b966ea6c1ee62f380120183bb76eee6" - integrity sha512-cd7usiasfSgw75INz72/VssrLr9tiVRYfo1TEdvr9ww0GuQbuQpB33xbV8W135eAV8+wzQ3Ce8ohaDHibvj6Yg== +"@angular-devkit/schematics@^7.3.0-rc.0": + version "7.3.3" + resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.3.tgz#80e9dc3197a3181f32edfb5c07e7ac016eace7d3" + integrity sha512-SdDq9eKwceb6WLwci1fywtZ/kARR5CYyzi5dZIR1lOxrz00682uUBqH/X39mKdqc6eVqR7rtPceqNm6nQpOIMg== dependencies: - "@angular-devkit/core" "7.3.1" + "@angular-devkit/core" "7.3.3" rxjs "6.3.3" "@angular/animations@file:../angular/dist/packages-dist/animations": - version "0.0.0" + version "7.2.6" dependencies: tslib "^1.9.0" "@angular/bazel@file:../angular/dist/packages-dist/bazel": - version "0.0.0" + version "7.2.6" dependencies: "@angular-devkit/architect" "^0.10.6" "@angular-devkit/core" "^7.0.4" - "@angular-devkit/schematics" "^7.0.4" - "@bazel/typescript" "^0.21.0" + "@angular-devkit/schematics" "^7.3.0-rc.0" + "@bazel/typescript" "^0.25.1" "@schematics/angular" "^7.0.4" "@types/node" "6.0.84" semver "^5.6.0" @@ -78,15 +78,15 @@ tsickle "0.34.0" "@angular/common@file:../angular/dist/packages-dist/common": - version "0.0.0" + version "7.2.6" dependencies: tslib "^1.9.0" "@angular/compiler-cli@file:../angular/dist/packages-dist/compiler-cli": - version "0.0.0" + version "7.2.6" dependencies: canonical-path "1.0.0" - chokidar "^1.4.2" + chokidar "^2.1.1" convert-source-map "^1.5.1" dependency-graph "^0.7.2" magic-string "^0.25.0" @@ -98,29 +98,29 @@ yargs "9.0.1" "@angular/compiler@file:../angular/dist/packages-dist/compiler": - version "0.0.0" + version "7.2.6" dependencies: tslib "^1.9.0" "@angular/core@file:../angular/dist/packages-dist/core": - version "0.0.0" + version "7.2.6" dependencies: tslib "^1.9.0" "@angular/platform-browser-dynamic@file:../angular/dist/packages-dist/platform-browser-dynamic": - version "0.0.0" + version "7.2.6" dependencies: tslib "^1.9.0" "@angular/platform-browser@file:../angular/dist/packages-dist/platform-browser": - version "0.0.0" + version "7.2.6" dependencies: tslib "^1.9.0" -"@bazel/karma@0.23.2": - version "0.23.2" - resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.23.2.tgz#17421a61cbcc6c917902beaaef88d61f22471f11" - integrity sha512-aNujXKusUjJIkc6CF03LS8AS7ULwNE0MKEL2TlYvnGCZviQ3nKrpRiEtWFmZlT+GrTOeu7AM4t3l4pSdQx/jnw== +"@bazel/karma@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.25.1.tgz#246286299b6e96fa4a91d240d3c3d7386164adaf" + integrity sha512-e5qyZkeHdxEYTIcHg04pmPF1SR8jy8I1mQLgDxX6NJDVx3JT7iIFeISqlS8hjBiykyX/XZ0CsVzkKYU/sG3ilg== dependencies: jasmine-core "2.8.0" karma "^4.0.0" @@ -134,10 +134,10 @@ semver "5.6.0" tmp "0.0.33" -"@bazel/typescript@0.23.2": - version "0.23.2" - resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.23.2.tgz#a3ff199880855259d84216cb41644c1d9a0fad14" - integrity sha512-GrTyDW6Fvp/rgnxZGYampB5/QmDWvxtLEtUyMCPa/QXFR1OVxaMWeHxxuFEcES2UKJegqBDKAA8IzX21x4UbEw== +"@bazel/typescript@0.25.1", "@bazel/typescript@^0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.25.1.tgz#71564de50ff6976fb37d90f2f7a479e87b158943" + integrity sha512-QFitUUXIWQMfVk5EwI9J9d5iNPfT+kUjPbahiJbJVZz1Fz9zNZ8+CR6FESfnxuUKlZK3Oy0VWFcz7mlHaceL/Q== dependencies: jasmine-core "2.8.0" protobufjs "5.0.3" @@ -145,15 +145,6 @@ source-map-support "0.5.9" tsutils "2.27.2" -"@bazel/typescript@^0.21.0": - version "0.21.0" - resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.21.0.tgz#41c304f77a42c6a016280d0f4c20e0749c3f4b2a" - integrity sha512-ASXj0RFybmqoa3LwqkTU3gNkX9bY9wL/VDNo5hlp9pynYWl4RMpe9V3m/qDIdtSuLJ+qD+Z3FKT/OcpWQHMlYA== - dependencies: - protobufjs "5.0.3" - source-map-support "0.5.9" - tsutils "2.27.2" - "@schematics/angular@^7.0.4": version "7.1.2" resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.1.2.tgz#b3eefbc81d12b0b53816896f6172eb613885826c" @@ -246,10 +237,10 @@ ajv@6.5.3: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@6.7.0: - version "6.7.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.7.0.tgz#e3ce7bb372d6577bb1839f1dfdfcbf5ad2948d96" - integrity sha512-RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg== +ajv@6.9.1: + version "6.9.1" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.9.1.tgz#a4d3683d74abc5670e75f0b16520f70a20ea8dc1" + integrity sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA== dependencies: fast-deep-equal "^2.0.1" fast-json-stable-stringify "^2.0.0" @@ -281,14 +272,6 @@ ansi-styles@^2.2.1: resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= -anymatch@^1.3.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a" - integrity sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA== - dependencies: - micromatch "^2.1.5" - normalize-path "^2.0.0" - anymatch@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" @@ -310,19 +293,12 @@ are-we-there-yet@~1.1.2: delegates "^1.0.0" readable-stream "^2.0.6" -arr-diff@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf" - integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8= - dependencies: - arr-flatten "^1.0.1" - arr-diff@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA= -arr-flatten@^1.0.1, arr-flatten@^1.1.0: +arr-flatten@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== @@ -394,7 +370,7 @@ assign-symbols@^1.0.0: resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= -async-each@^1.0.0: +async-each@^1.0.0, async-each@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" integrity sha1-GdOGodntxufByF04iu28xW0zYC0= @@ -531,16 +507,7 @@ braces@^0.1.2: dependencies: expand-range "^0.1.0" -braces@^1.8.2: - version "1.8.5" - resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7" - integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc= - dependencies: - expand-range "^1.8.1" - preserve "^0.2.0" - repeat-element "^1.1.2" - -braces@^2.3.0, braces@^2.3.1: +braces@^2.3.0, braces@^2.3.1, braces@^2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w== @@ -667,21 +634,24 @@ chokidar@2.0.4, chokidar@^2.0.3: optionalDependencies: fsevents "^1.2.2" -chokidar@^1.4.2: - version "1.7.0" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" - integrity sha1-eY5ol3gVHIB2tLNg5e3SjNortGg= +chokidar@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.2.tgz#9c23ea40b01638439e0513864d362aeacc5ad058" + integrity sha512-IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg== dependencies: - anymatch "^1.3.0" - async-each "^1.0.0" - glob-parent "^2.0.0" - inherits "^2.0.1" + anymatch "^2.0.0" + async-each "^1.0.1" + braces "^2.3.2" + glob-parent "^3.1.0" + inherits "^2.0.3" is-binary-path "^1.0.0" - is-glob "^2.0.0" + is-glob "^4.0.0" + normalize-path "^3.0.0" path-is-absolute "^1.0.0" - readdirp "^2.0.0" + readdirp "^2.2.1" + upath "^1.1.0" optionalDependencies: - fsevents "^1.0.0" + fsevents "^1.2.7" chownr@^1.0.1: version "1.1.1" @@ -1099,13 +1069,6 @@ expand-braces@^0.1.1: array-unique "^0.2.1" braces "^0.1.2" -expand-brackets@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b" - integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s= - dependencies: - is-posix-bracket "^0.1.0" - expand-brackets@^2.1.4: version "2.1.4" resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" @@ -1127,13 +1090,6 @@ expand-range@^0.1.0: is-number "^0.1.1" repeat-string "^0.2.2" -expand-range@^1.8.1: - version "1.8.2" - resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337" - integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc= - dependencies: - fill-range "^2.1.0" - extend-shallow@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" @@ -1154,13 +1110,6 @@ extend@3, extend@^3.0.0, extend@~3.0.0, extend@~3.0.2: resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== -extglob@^0.3.1: - version "0.3.2" - resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1" - integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE= - dependencies: - is-extglob "^1.0.0" - extglob@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" @@ -1200,22 +1149,6 @@ fast-json-stable-stringify@2.0.0, fast-json-stable-stringify@^2.0.0: resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I= -filename-regex@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" - integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY= - -fill-range@^2.1.0: - version "2.2.4" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565" - integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q== - dependencies: - is-number "^2.1.0" - isobject "^2.0.0" - randomatic "^3.0.0" - repeat-element "^1.1.2" - repeat-string "^1.5.2" - fill-range@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" @@ -1258,18 +1191,11 @@ follow-redirects@^1.0.0: dependencies: debug "=3.1.0" -for-in@^1.0.1, for-in@^1.0.2: +for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= -for-own@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce" - integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4= - dependencies: - for-in "^1.0.1" - forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" @@ -1310,7 +1236,7 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= -fsevents@^1.0.0, fsevents@^1.2.2: +fsevents@^1.2.2: version "1.2.4" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426" integrity sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg== @@ -1318,6 +1244,14 @@ fsevents@^1.0.0, fsevents@^1.2.2: nan "^2.9.2" node-pre-gyp "^0.10.0" +fsevents@^1.2.7: + version "1.2.7" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.7.tgz#4851b664a3783e52003b3c66eb0eee1074933aa4" + integrity sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw== + dependencies: + nan "^2.9.2" + node-pre-gyp "^0.10.0" + gauge@~2.7.3: version "2.7.4" resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" @@ -1354,21 +1288,6 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" -glob-base@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" - integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q= - dependencies: - glob-parent "^2.0.0" - is-glob "^2.0.0" - -glob-parent@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28" - integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg= - dependencies: - is-glob "^2.0.0" - glob-parent@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" @@ -1563,7 +1482,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@~2.0.1, inherits@~2.0.3: +inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= @@ -1653,18 +1572,6 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2: is-data-descriptor "^1.0.0" kind-of "^6.0.2" -is-dotfile@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1" - integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE= - -is-equal-shallow@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534" - integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ= - dependencies: - is-primitive "^2.0.0" - is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" @@ -1677,11 +1584,6 @@ is-extendable@^1.0.1: dependencies: is-plain-object "^2.0.4" -is-extglob@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" - integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA= - is-extglob@^2.1.0, is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" @@ -1699,13 +1601,6 @@ is-fullwidth-code-point@^2.0.0: resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= -is-glob@^2.0.0, is-glob@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" - integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM= - dependencies: - is-extglob "^1.0.0" - is-glob@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" @@ -1725,13 +1620,6 @@ is-number@^0.1.1: resolved "https://registry.yarnpkg.com/is-number/-/is-number-0.1.1.tgz#69a7af116963d47206ec9bd9b48a14216f1e3806" integrity sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY= -is-number@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" - integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8= - dependencies: - kind-of "^3.0.2" - is-number@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" @@ -1739,11 +1627,6 @@ is-number@^3.0.0: dependencies: kind-of "^3.0.2" -is-number@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff" - integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ== - is-path-cwd@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d" @@ -1770,16 +1653,6 @@ is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: dependencies: isobject "^3.0.1" -is-posix-bracket@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" - integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q= - -is-primitive@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575" - integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU= - is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" @@ -2086,11 +1959,6 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" -math-random@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac" - integrity sha1-izqsWIuKZuSXXjzepn97sylgH6w= - media-typer@0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" @@ -2103,25 +1971,6 @@ mem@^1.1.0: dependencies: mimic-fn "^1.0.0" -micromatch@^2.1.5: - version "2.3.11" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" - integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU= - dependencies: - arr-diff "^2.0.0" - array-unique "^0.2.1" - braces "^1.8.2" - expand-brackets "^0.1.4" - extglob "^0.3.1" - filename-regex "^2.0.0" - is-extglob "^1.0.0" - is-glob "^2.0.1" - kind-of "^3.0.2" - normalize-path "^2.0.1" - object.omit "^2.0.0" - parse-glob "^3.0.4" - regex-cache "^0.4.2" - micromatch@^3.1.10, micromatch@^3.1.4: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" @@ -2295,13 +2144,18 @@ normalize-package-data@^2.3.2: semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" -normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1: +normalize-path@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= dependencies: remove-trailing-separator "^1.0.1" +normalize-path@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + npm-bundled@^1.0.1: version "1.0.5" resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979" @@ -2373,14 +2227,6 @@ object-visit@^1.0.0: dependencies: isobject "^3.0.0" -object.omit@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" - integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo= - dependencies: - for-own "^0.1.4" - is-extendable "^0.1.1" - object.pick@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" @@ -2483,16 +2329,6 @@ pako@~1.0.2: resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.8.tgz#6844890aab9c635af868ad5fecc62e8acbba3ea4" integrity sha512-6i0HVbUfcKaTv+EG8ZTr75az7GFXcLYk9UyLEg7Notv/Ma+z/UG3TCoz6GiNeOrn1E/e63I0X/Hpw18jHOTUnA== -parse-glob@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" - integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw= - dependencies: - glob-base "^0.3.0" - is-dotfile "^1.0.0" - is-extglob "^1.0.0" - is-glob "^2.0.0" - parse-json@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" @@ -2588,11 +2424,6 @@ posix-character-classes@^0.1.0: resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= -preserve@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" - integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks= - process-nextick-args@~1.0.6: version "1.0.7" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" @@ -2674,15 +2505,6 @@ qs@6.5.2, qs@~6.5.2: resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== -randomatic@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.0.tgz#36f2ca708e9e567f5ed2ec01949026d50aa10116" - integrity sha512-KnGPVE0lo2WoXxIZ7cPR8YBpiol4gsSuOwDSg410oHh80ZMp5EiypNqL2K4Z77vJn6lB5rap7IkAmcUlalcnBQ== - dependencies: - is-number "^4.0.0" - kind-of "^6.0.0" - math-random "^1.0.1" - range-parser@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" @@ -2750,7 +2572,7 @@ readable-stream@~2.0.6: string_decoder "~0.10.x" util-deprecate "~1.0.1" -readdirp@^2.0.0: +readdirp@^2.0.0, readdirp@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ== @@ -2771,13 +2593,6 @@ reflect-metadata@0.1.12, reflect-metadata@^0.1.2: resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.12.tgz#311bf0c6b63cd782f228a81abe146a2bfa9c56f2" integrity sha512-n+IyV+nGz3+0q3/Yf1ra12KpCyi001bi4XFxSjbiWWjfqb52iTTtpGXmCCAOWWIAn9KEuFZKGqBERHmrtScZ3A== -regex-cache@^0.4.2: - version "0.4.4" - resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd" - integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ== - dependencies: - is-equal-shallow "^0.1.3" - regex-not@^1.0.0, regex-not@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" @@ -2801,7 +2616,7 @@ repeat-string@^0.2.2: resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-0.2.2.tgz#c7a8d3236068362059a7e4651fc6884e8b1fb4ae" integrity sha1-x6jTI2BoNiBZp+RlH8aITosftK4= -repeat-string@^1.5.2, repeat-string@^1.6.1: +repeat-string@^1.6.1: version "1.6.1" resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= @@ -2888,6 +2703,13 @@ rxjs@6.3.3: dependencies: tslib "^1.9.0" +rxjs@6.4.0: + version "6.4.0" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504" + integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw== + dependencies: + tslib "^1.9.0" + safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" @@ -3463,7 +3285,7 @@ unset-value@^1.0.0: has-value "^0.3.1" isobject "^3.0.0" -upath@^1.0.5: +upath@^1.0.5, upath@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd" integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw== diff --git a/integration/bazel/test/e2e/BUILD.bazel b/integration/bazel/test/e2e/BUILD.bazel index 60fd4cdde9..18ae55ced8 100644 --- a/integration/bazel/test/e2e/BUILD.bazel +++ b/integration/bazel/test/e2e/BUILD.bazel @@ -1,5 +1,5 @@ -load("@build_bazel_rules_typescript//:defs.bzl", "ts_library") load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") +load("@npm_bazel_typescript//:defs.bzl", "ts_library") ts_library( name = "e2e", diff --git a/modules/benchmarks/src/largeform/ng2/BUILD.bazel b/modules/benchmarks/src/largeform/ng2/BUILD.bazel index e0a45ec002..f1558418fa 100644 --- a/modules/benchmarks/src/largeform/ng2/BUILD.bazel +++ b/modules/benchmarks/src/largeform/ng2/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/largetable/baseline/BUILD.bazel b/modules/benchmarks/src/largetable/baseline/BUILD.bazel index bcdbc22a1f..55519ed578 100644 --- a/modules/benchmarks/src/largetable/baseline/BUILD.bazel +++ b/modules/benchmarks/src/largetable/baseline/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ts_library") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel b/modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel index fc94da3175..429b80b64e 100644 --- a/modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel +++ b/modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ts_library") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/largetable/iv/BUILD.bazel b/modules/benchmarks/src/largetable/iv/BUILD.bazel index a58fcd7a59..d7b68d723d 100644 --- a/modules/benchmarks/src/largetable/iv/BUILD.bazel +++ b/modules/benchmarks/src/largetable/iv/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ts_library") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/largetable/ng2/BUILD.bazel b/modules/benchmarks/src/largetable/ng2/BUILD.bazel index dc77effc7a..15b9c0ad66 100644 --- a/modules/benchmarks/src/largetable/ng2/BUILD.bazel +++ b/modules/benchmarks/src/largetable/ng2/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel b/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel index b2c56a4e21..b96d1444c2 100644 --- a/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel +++ b/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/largetable/render3/BUILD.bazel b/modules/benchmarks/src/largetable/render3/BUILD.bazel index 4818c6cbf4..a4ae3675cb 100644 --- a/modules/benchmarks/src/largetable/render3/BUILD.bazel +++ b/modules/benchmarks/src/largetable/render3/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility = ["//visibility:public"]) load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") ng_module( diff --git a/modules/benchmarks/src/tree/baseline/BUILD.bazel b/modules/benchmarks/src/tree/baseline/BUILD.bazel index 9450d53c15..6712588295 100644 --- a/modules/benchmarks/src/tree/baseline/BUILD.bazel +++ b/modules/benchmarks/src/tree/baseline/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ts_library") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/tree/incremental_dom/BUILD.bazel b/modules/benchmarks/src/tree/incremental_dom/BUILD.bazel index da172f9d6e..d0a5c5d47b 100644 --- a/modules/benchmarks/src/tree/incremental_dom/BUILD.bazel +++ b/modules/benchmarks/src/tree/incremental_dom/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ts_library") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/tree/iv/BUILD.bazel b/modules/benchmarks/src/tree/iv/BUILD.bazel index b6c88e036a..7585cfc884 100644 --- a/modules/benchmarks/src/tree/iv/BUILD.bazel +++ b/modules/benchmarks/src/tree/iv/BUILD.bazel @@ -1,4 +1,4 @@ -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/tree/ng1/BUILD.bazel b/modules/benchmarks/src/tree/ng1/BUILD.bazel index 6bdc2c4ce8..d1dc388f6d 100644 --- a/modules/benchmarks/src/tree/ng1/BUILD.bazel +++ b/modules/benchmarks/src/tree/ng1/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ts_library") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/tree/ng2/BUILD.bazel b/modules/benchmarks/src/tree/ng2/BUILD.bazel index bc4f5ab76c..e7d0059f99 100644 --- a/modules/benchmarks/src/tree/ng2/BUILD.bazel +++ b/modules/benchmarks/src/tree/ng2/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/tree/ng2_next/BUILD.bazel b/modules/benchmarks/src/tree/ng2_next/BUILD.bazel index f26d255891..8136fb9361 100644 --- a/modules/benchmarks/src/tree/ng2_next/BUILD.bazel +++ b/modules/benchmarks/src/tree/ng2_next/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ts_library") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/tree/ng2_static/BUILD.bazel b/modules/benchmarks/src/tree/ng2_static/BUILD.bazel index 90192f913d..7cc98422d2 100644 --- a/modules/benchmarks/src/tree/ng2_static/BUILD.bazel +++ b/modules/benchmarks/src/tree/ng2_static/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ts_library") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel b/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel index b760d1f351..03f31005a0 100644 --- a/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel +++ b/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/tree/render3/BUILD.bazel b/modules/benchmarks/src/tree/render3/BUILD.bazel index e1c25f01d7..705018b0eb 100644 --- a/modules/benchmarks/src/tree/render3/BUILD.bazel +++ b/modules/benchmarks/src/tree/render3/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility = ["//modules/benchmarks:__subpackages__"]) load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") ng_module( diff --git a/modules/benchmarks/src/tree/render3_function/BUILD.bazel b/modules/benchmarks/src/tree/render3_function/BUILD.bazel index d21b26aaaf..2d7a924ebb 100644 --- a/modules/benchmarks/src/tree/render3_function/BUILD.bazel +++ b/modules/benchmarks/src/tree/render3_function/BUILD.bazel @@ -1,4 +1,4 @@ -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") load("//tools:defaults.bzl", "ts_library") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") diff --git a/modules/playground/src/animate/BUILD.bazel b/modules/playground/src/animate/BUILD.bazel index de99d38015..49855b059f 100644 --- a/modules/playground/src/animate/BUILD.bazel +++ b/modules/playground/src/animate/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/async/BUILD.bazel b/modules/playground/src/async/BUILD.bazel index 6a357df79b..fe301f8268 100644 --- a/modules/playground/src/async/BUILD.bazel +++ b/modules/playground/src/async/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/benchpress/BUILD.bazel b/modules/playground/src/benchpress/BUILD.bazel index 3816a88355..8b4b173938 100644 --- a/modules/playground/src/benchpress/BUILD.bazel +++ b/modules/playground/src/benchpress/BUILD.bazel @@ -1,4 +1,4 @@ -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/gestures/BUILD.bazel b/modules/playground/src/gestures/BUILD.bazel index 877a085205..1188d330d6 100644 --- a/modules/playground/src/gestures/BUILD.bazel +++ b/modules/playground/src/gestures/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/hello_world/BUILD.bazel b/modules/playground/src/hello_world/BUILD.bazel index 6bcff03c9b..d90d3efb57 100644 --- a/modules/playground/src/hello_world/BUILD.bazel +++ b/modules/playground/src/hello_world/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/http/BUILD.bazel b/modules/playground/src/http/BUILD.bazel index f9c73326b9..6ba83ed650 100644 --- a/modules/playground/src/http/BUILD.bazel +++ b/modules/playground/src/http/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/jsonp/BUILD.bazel b/modules/playground/src/jsonp/BUILD.bazel index e610d1cf50..5bc0b47f24 100644 --- a/modules/playground/src/jsonp/BUILD.bazel +++ b/modules/playground/src/jsonp/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/key_events/BUILD.bazel b/modules/playground/src/key_events/BUILD.bazel index 5b94bbcb97..1ce543a100 100644 --- a/modules/playground/src/key_events/BUILD.bazel +++ b/modules/playground/src/key_events/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/model_driven_forms/BUILD.bazel b/modules/playground/src/model_driven_forms/BUILD.bazel index f4c310f398..87af847a9b 100644 --- a/modules/playground/src/model_driven_forms/BUILD.bazel +++ b/modules/playground/src/model_driven_forms/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/order_management/BUILD.bazel b/modules/playground/src/order_management/BUILD.bazel index 4468b98db1..ef3c9781e4 100644 --- a/modules/playground/src/order_management/BUILD.bazel +++ b/modules/playground/src/order_management/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/person_management/BUILD.bazel b/modules/playground/src/person_management/BUILD.bazel index 608d08d412..d5a8a50c10 100644 --- a/modules/playground/src/person_management/BUILD.bazel +++ b/modules/playground/src/person_management/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/relative_assets/BUILD.bazel b/modules/playground/src/relative_assets/BUILD.bazel index 6eb726c4ea..64ac75e630 100644 --- a/modules/playground/src/relative_assets/BUILD.bazel +++ b/modules/playground/src/relative_assets/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/routing/BUILD.bazel b/modules/playground/src/routing/BUILD.bazel index 9d6fc56252..692c7f9309 100644 --- a/modules/playground/src/routing/BUILD.bazel +++ b/modules/playground/src/routing/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/sourcemap/BUILD.bazel b/modules/playground/src/sourcemap/BUILD.bazel index 94be798e4d..2a672d201d 100644 --- a/modules/playground/src/sourcemap/BUILD.bazel +++ b/modules/playground/src/sourcemap/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/svg/BUILD.bazel b/modules/playground/src/svg/BUILD.bazel index 00ca97e267..670a6a15a5 100644 --- a/modules/playground/src/svg/BUILD.bazel +++ b/modules/playground/src/svg/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/template_driven_forms/BUILD.bazel b/modules/playground/src/template_driven_forms/BUILD.bazel index 54ec8b26a8..3e7d25d50e 100644 --- a/modules/playground/src/template_driven_forms/BUILD.bazel +++ b/modules/playground/src/template_driven_forms/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/todo/BUILD.bazel b/modules/playground/src/todo/BUILD.bazel index 024754cb60..8cafae5bd9 100644 --- a/modules/playground/src/todo/BUILD.bazel +++ b/modules/playground/src/todo/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/upgrade/BUILD.bazel b/modules/playground/src/upgrade/BUILD.bazel index 5f9a12134f..bbd0c31cc3 100644 --- a/modules/playground/src/upgrade/BUILD.bazel +++ b/modules/playground/src/upgrade/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ts_library") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/web_workers/animations/BUILD.bazel b/modules/playground/src/web_workers/animations/BUILD.bazel index 35138500ea..f2cbd59c76 100644 --- a/modules/playground/src/web_workers/animations/BUILD.bazel +++ b/modules/playground/src/web_workers/animations/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/web_workers/images/BUILD.bazel b/modules/playground/src/web_workers/images/BUILD.bazel index e53583a85d..b794c2e24c 100644 --- a/modules/playground/src/web_workers/images/BUILD.bazel +++ b/modules/playground/src/web_workers/images/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/web_workers/input/BUILD.bazel b/modules/playground/src/web_workers/input/BUILD.bazel index e14da9b2b8..20fdd641ca 100644 --- a/modules/playground/src/web_workers/input/BUILD.bazel +++ b/modules/playground/src/web_workers/input/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/web_workers/kitchen_sink/BUILD.bazel b/modules/playground/src/web_workers/kitchen_sink/BUILD.bazel index ee1fe9059f..dfc299b6cf 100644 --- a/modules/playground/src/web_workers/kitchen_sink/BUILD.bazel +++ b/modules/playground/src/web_workers/kitchen_sink/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/web_workers/message_broker/BUILD.bazel b/modules/playground/src/web_workers/message_broker/BUILD.bazel index da0e8ead12..8c032975ca 100644 --- a/modules/playground/src/web_workers/message_broker/BUILD.bazel +++ b/modules/playground/src/web_workers/message_broker/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/web_workers/router/BUILD.bazel b/modules/playground/src/web_workers/router/BUILD.bazel index 4b1a727154..62bd1ed1c5 100644 --- a/modules/playground/src/web_workers/router/BUILD.bazel +++ b/modules/playground/src/web_workers/router/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/web_workers/todo/BUILD.bazel b/modules/playground/src/web_workers/todo/BUILD.bazel index 7afbcfd6cf..a6c873df0f 100644 --- a/modules/playground/src/web_workers/todo/BUILD.bazel +++ b/modules/playground/src/web_workers/todo/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/zippy_component/BUILD.bazel b/modules/playground/src/zippy_component/BUILD.bazel index e80bf6141e..22cc107de6 100644 --- a/modules/playground/src/zippy_component/BUILD.bazel +++ b/modules/playground/src/zippy_component/BUILD.bazel @@ -1,5 +1,5 @@ load("//tools:defaults.bzl", "ng_module") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/package.json b/package.json index 1cca60cdef..ebe83dbb09 100644 --- a/package.json +++ b/package.json @@ -35,8 +35,8 @@ "@angular-devkit/build-optimizer": "^0.12.2", "@angular-devkit/core": "^7.0.4", "@angular-devkit/schematics": "^7.3.0-rc.0", - "@bazel/karma": "0.23.2", - "@bazel/typescript": "0.23.2", + "@bazel/karma": "0.25.1", + "@bazel/typescript": "0.25.1", "@schematics/angular": "^7.0.4", "@types/angular": "^1.6.47", "@types/base64-js": "1.2.5", diff --git a/packages/BUILD.bazel b/packages/BUILD.bazel index e418573b1a..65ff743075 100644 --- a/packages/BUILD.bazel +++ b/packages/BUILD.bazel @@ -5,7 +5,7 @@ exports_files([ "tsconfig.json", ]) -load("@build_bazel_rules_typescript//:defs.bzl", "ts_config") +load("@npm_bazel_typescript//:defs.bzl", "ts_config") load("//tools:defaults.bzl", "ts_library") ts_library( diff --git a/packages/bazel/package.json b/packages/bazel/package.json index 6199bb110b..6a518f1b55 100644 --- a/packages/bazel/package.json +++ b/packages/bazel/package.json @@ -21,7 +21,7 @@ "@angular-devkit/architect": "^0.10.6", "@angular-devkit/core": "^7.0.4", "@angular-devkit/schematics": "^7.3.0-rc.0", - "@bazel/typescript": "^0.23.2", + "@bazel/typescript": "^0.25.1", "@schematics/angular": "^7.0.4", "@types/node": "6.0.84", "semver": "^5.6.0", diff --git a/packages/bazel/src/esm5.bzl b/packages/bazel/src/esm5.bzl index 43c6ff03fe..57d2157ca3 100644 --- a/packages/bazel/src/esm5.bzl +++ b/packages/bazel/src/esm5.bzl @@ -157,7 +157,7 @@ esm5_outputs_aspect = aspect( cfg = "host", ), "_tsc_wrapped": attr.label( - default = Label("@build_bazel_rules_typescript//:@bazel/typescript/tsc_wrapped"), + default = Label("@npm//@bazel/typescript/bin:tsc_wrapped"), executable = True, cfg = "host", ), diff --git a/packages/bazel/src/external.bzl b/packages/bazel/src/external.bzl index a054142fa2..4922e2bc2f 100644 --- a/packages/bazel/src/external.bzl +++ b/packages/bazel/src/external.bzl @@ -2,11 +2,11 @@ """ load( - "@build_bazel_rules_typescript//internal:build_defs.bzl", + "@npm_bazel_typescript//internal:build_defs.bzl", _tsc_wrapped_tsconfig = "tsc_wrapped_tsconfig", ) load( - "@build_bazel_rules_typescript//internal:common/compilation.bzl", + "@npm_bazel_typescript//internal:common/compilation.bzl", _COMMON_ATTRIBUTES = "COMMON_ATTRIBUTES", _COMMON_OUTPUTS = "COMMON_OUTPUTS", _DEPS_ASPECTS = "DEPS_ASPECTS", diff --git a/packages/bazel/src/ng_package/BUILD.bazel b/packages/bazel/src/ng_package/BUILD.bazel index 737bdc2bd0..8cfc2cfab3 100644 --- a/packages/bazel/src/ng_package/BUILD.bazel +++ b/packages/bazel/src/ng_package/BUILD.bazel @@ -3,7 +3,7 @@ package(default_visibility = ["//visibility:public"]) load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary") # BEGIN-DEV-ONLY -load("@build_bazel_rules_typescript//:defs.bzl", "ts_library") +load("@npm_bazel_typescript//:defs.bzl", "ts_library") ts_library( name = "lib", diff --git a/packages/bazel/src/ngc-wrapped/BUILD.bazel b/packages/bazel/src/ngc-wrapped/BUILD.bazel index d7fcc0dbaa..81572daef1 100644 --- a/packages/bazel/src/ngc-wrapped/BUILD.bazel +++ b/packages/bazel/src/ngc-wrapped/BUILD.bazel @@ -1,5 +1,5 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_library") +load("@npm_bazel_typescript//:defs.bzl", "ts_library") ts_library( name = "ngc_lib", @@ -32,9 +32,9 @@ nodejs_binary( configuration_env_vars = ["compile"], data = [ ":ngc_lib", - "//packages/bazel/third_party/github.com/bazelbuild/bazel/src/main/protobuf:worker_protocol.proto", "@ngdeps//source-map-support", "@ngdeps//tslib", + "@npm_bazel_typescript//third_party/github.com/bazelbuild/bazel/src/main/protobuf:worker_protocol.proto", ], entry_point = "angular/packages/bazel/src/ngc-wrapped/index.js", visibility = ["//visibility:public"], diff --git a/packages/bazel/src/protractor/utils/BUILD.bazel b/packages/bazel/src/protractor/utils/BUILD.bazel index a575f4901e..fd461d9610 100644 --- a/packages/bazel/src/protractor/utils/BUILD.bazel +++ b/packages/bazel/src/protractor/utils/BUILD.bazel @@ -1,6 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("@build_bazel_rules_typescript//:defs.bzl", "ts_library") +load("@npm_bazel_typescript//:defs.bzl", "ts_library") ts_library( name = "utils", diff --git a/packages/bazel/src/schematics/bazel-workspace/files/WORKSPACE.template b/packages/bazel/src/schematics/bazel-workspace/files/WORKSPACE.template index e45adb8ce6..012a217fd3 100644 --- a/packages/bazel/src/schematics/bazel-workspace/files/WORKSPACE.template +++ b/packages/bazel/src/schematics/bazel-workspace/files/WORKSPACE.template @@ -53,7 +53,7 @@ yarn_install( load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies") install_bazel_dependencies() -load("@build_bazel_rules_karma//:package.bzl", "rules_karma_dependencies") +load("@npm_bazel_karma//:package.bzl", "rules_karma_dependencies") rules_karma_dependencies() load("@io_bazel_rules_webtesting//web:repositories.bzl", "browser_repositories", "web_test_repositories") @@ -63,7 +63,7 @@ browser_repositories( firefox = True, ) -load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace") +load("@npm_bazel_typescript//:defs.bzl", "ts_setup_workspace") ts_setup_workspace() <% if (sass) { %> load("@io_bazel_rules_sass//sass:sass_repositories.bzl", "sass_repositories") diff --git a/packages/bazel/src/schematics/bazel-workspace/files/e2e/BUILD.bazel.template b/packages/bazel/src/schematics/bazel-workspace/files/e2e/BUILD.bazel.template index 4afedbe958..0779f6d3f6 100644 --- a/packages/bazel/src/schematics/bazel-workspace/files/e2e/BUILD.bazel.template +++ b/packages/bazel/src/schematics/bazel-workspace/files/e2e/BUILD.bazel.template @@ -1,4 +1,4 @@ -load("@build_bazel_rules_typescript//:defs.bzl", "ts_library") +load("@npm_bazel_typescript//:defs.bzl", "ts_library") load("@angular//:index.bzl", "protractor_web_test_suite") ts_library( diff --git a/packages/bazel/src/schematics/bazel-workspace/files/src/BUILD.bazel.template b/packages/bazel/src/schematics/bazel-workspace/files/src/BUILD.bazel.template index 02f300093b..d07ff93f26 100644 --- a/packages/bazel/src/schematics/bazel-workspace/files/src/BUILD.bazel.template +++ b/packages/bazel/src/schematics/bazel-workspace/files/src/BUILD.bazel.template @@ -1,10 +1,10 @@ package(default_visibility = ["//visibility:public"]) load("@angular//:index.bzl", "ng_module") -load("@build_bazel_rules_karma//:defs.bzl", "ts_web_test_suite") +load("@npm_bazel_karma//:defs.bzl", "ts_web_test_suite") load("@build_bazel_rules_nodejs//:defs.bzl", "rollup_bundle", "history_server") load("@build_bazel_rules_nodejs//internal/web_package:web_package.bzl", "web_package") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver", "ts_library") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver", "ts_library") <% if (sass) { %>load("@io_bazel_rules_sass//:defs.bzl", "sass_binary") [ diff --git a/packages/bazel/src/schematics/ng-new/index.ts b/packages/bazel/src/schematics/ng-new/index.ts index e612e6e8c1..d1f7f34bbe 100755 --- a/packages/bazel/src/schematics/ng-new/index.ts +++ b/packages/bazel/src/schematics/ng-new/index.ts @@ -43,8 +43,8 @@ function addDevDependenciesToPackageJson(options: Schema) { // TODO(kyliau): Consider moving this to latest-versions.ts '@bazel/bazel': '^0.22.1', '@bazel/ibazel': '^0.9.0', - '@bazel/karma': '^0.23.2', - '@bazel/typescript': '^0.23.2', + '@bazel/karma': '^0.25.1', + '@bazel/typescript': '^0.25.1', }; const recorder = host.beginUpdate(packageJson); diff --git a/packages/bazel/test/ngc-wrapped/BUILD.bazel b/packages/bazel/test/ngc-wrapped/BUILD.bazel index afec3725fe..902a5a6fe8 100644 --- a/packages/bazel/test/ngc-wrapped/BUILD.bazel +++ b/packages/bazel/test/ngc-wrapped/BUILD.bazel @@ -32,7 +32,7 @@ jasmine_node_test( "//packages/bazel/test/ngc-wrapped/empty:empty_tsconfig.json", "//packages/bazel/test/ngc-wrapped/empty:tsconfig.json", "//packages/private/testing", - "@build_bazel_rules_typescript//third_party/github.com/bazelbuild/bazel/src/main/protobuf:worker_protocol.proto", + "@npm_bazel_typescript//third_party/github.com/bazelbuild/bazel/src/main/protobuf:worker_protocol.proto", ], ) diff --git a/packages/bazel/test/protractor-2/BUILD.bazel b/packages/bazel/test/protractor-2/BUILD.bazel index 69a06e435d..a9c99f87e1 100644 --- a/packages/bazel/test/protractor-2/BUILD.bazel +++ b/packages/bazel/test/protractor-2/BUILD.bazel @@ -1,5 +1,5 @@ load("//packages/bazel:index.bzl", "protractor_web_test_suite") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") load("@build_bazel_rules_nodejs//:defs.bzl", "rollup_bundle") load("//tools:defaults.bzl", "ts_library") load("//tools/http-server:http_server.bzl", "http_server") diff --git a/packages/compiler-cli/BUILD.bazel b/packages/compiler-cli/BUILD.bazel index 6b227390e1..6edfb274ef 100644 --- a/packages/compiler-cli/BUILD.bazel +++ b/packages/compiler-cli/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility = ["//visibility:public"]) load("//tools:defaults.bzl", "npm_package", "ts_library") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_config") +load("@npm_bazel_typescript//:defs.bzl", "ts_config") ts_config( name = "tsconfig", diff --git a/packages/compiler/src/core.ts b/packages/compiler/src/core.ts index 2b3081f46e..d2aa425157 100644 --- a/packages/compiler/src/core.ts +++ b/packages/compiler/src/core.ts @@ -282,16 +282,20 @@ export interface MetadataFactory { } function makeMetadataFactory(name: string, props?: (...args: any[]) => T): MetadataFactory { - const factory: any = (...args: any[]) => { + // This must be declared as a function, not a fat arrow, so that ES2015 devmode produces code + // that works with the static_reflector.ts in the ViewEngine compiler. + // In particular, `_registerDecoratorOrConstructor` assumes that the value returned here can be + // new'ed. + function factory(...args: any[]) { const values = props ? props(...args) : {}; return { ngMetadataName: name, ...values, }; - }; - factory.isTypeOf = (obj: any) => obj && obj.ngMetadataName === name; - factory.ngMetadataName = name; - return factory; + } + (factory as any).isTypeOf = (obj: any) => obj && obj.ngMetadataName === name; + (factory as any).ngMetadataName = name; + return factory as any; } export interface Route { diff --git a/packages/core/src/render3/i18n.ts b/packages/core/src/render3/i18n.ts index f0d6142ffd..784f9493ab 100644 --- a/packages/core/src/render3/i18n.ts +++ b/packages/core/src/render3/i18n.ts @@ -715,6 +715,9 @@ function readUpdateOpCodes( value += stringify(viewData[bindingsStartIndex - opCode]); } else { const nodeIndex = opCode >>> I18nUpdateOpCode.SHIFT_REF; + let tIcuIndex: number; + let tIcu: TIcu; + let icuTNode: TIcuContainerNode; switch (opCode & I18nUpdateOpCode.MASK_OPCODE) { case I18nUpdateOpCode.Attr: const attrName = updateOpCodes[++j] as string; @@ -725,9 +728,9 @@ function readUpdateOpCodes( textBinding(nodeIndex, value); break; case I18nUpdateOpCode.IcuSwitch: - let tIcuIndex = updateOpCodes[++j] as number; - let tIcu = icus ![tIcuIndex]; - let icuTNode = getTNode(nodeIndex, viewData) as TIcuContainerNode; + tIcuIndex = updateOpCodes[++j] as number; + tIcu = icus ![tIcuIndex]; + icuTNode = getTNode(nodeIndex, viewData) as TIcuContainerNode; // If there is an active case, delete the old nodes if (icuTNode.activeCaseIndex !== null) { const removeCodes = tIcu.remove[icuTNode.activeCaseIndex]; diff --git a/packages/core/test/bundling/todo/BUILD.bazel b/packages/core/test/bundling/todo/BUILD.bazel index b9be62dac6..4da7b5d454 100644 --- a/packages/core/test/bundling/todo/BUILD.bazel +++ b/packages/core/test/bundling/todo/BUILD.bazel @@ -3,7 +3,7 @@ package(default_visibility = ["//visibility:public"]) load("//tools:defaults.bzl", "jasmine_node_test", "ng_module", "ng_rollup_bundle", "ts_library") load("//tools/http-server:http_server.bzl", "http_server") load("//tools/symbol-extractor:index.bzl", "js_expected_symbol_test") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") ng_module( name = "todo", diff --git a/packages/core/test/bundling/todo_i18n/BUILD.bazel b/packages/core/test/bundling/todo_i18n/BUILD.bazel index fcde7f7f7b..807f517c38 100644 --- a/packages/core/test/bundling/todo_i18n/BUILD.bazel +++ b/packages/core/test/bundling/todo_i18n/BUILD.bazel @@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"]) load("//tools:defaults.bzl", "jasmine_node_test", "ng_module", "ng_rollup_bundle", "ts_library") load("//tools/http-server:http_server.bzl", "http_server") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") ng_module( name = "todo_i18n", diff --git a/packages/core/test/bundling/todo_r2/BUILD.bazel b/packages/core/test/bundling/todo_r2/BUILD.bazel index 027b9390d0..ac3123483b 100644 --- a/packages/core/test/bundling/todo_r2/BUILD.bazel +++ b/packages/core/test/bundling/todo_r2/BUILD.bazel @@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"]) load("//tools:defaults.bzl", "jasmine_node_test", "ng_module", "ng_rollup_bundle", "ts_library") load("//tools/http-server:http_server.bzl", "http_server") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") ng_module( name = "todo", diff --git a/packages/core/test/forward_ref_integration_spec.ts b/packages/core/test/forward_ref_integration_spec.ts index e8ae122a84..d81560fd79 100644 --- a/packages/core/test/forward_ref_integration_spec.ts +++ b/packages/core/test/forward_ref_integration_spec.ts @@ -11,6 +11,14 @@ import {Component, ContentChildren, Directive, Inject, NO_ERRORS_SCHEMA, NgModul import {TestBed} from '@angular/core/testing'; import {expect} from '@angular/platform-browser/testing/src/matchers'; +class Frame { + name: string = 'frame'; +} + +class ModuleFrame { + name: string = 'moduleFram'; +} + describe('forwardRef integration', function() { beforeEach(() => { TestBed.configureTestingModule({imports: [Module], declarations: [App]}); }); @@ -51,14 +59,6 @@ class Door { constructor(@Inject(forwardRef(() => Frame)) frame: Frame) { this.frame = frame; } } -class Frame { - name: string = 'frame'; -} - -class ModuleFrame { - name: string = 'moduleFram'; -} - @Directive({selector: 'lock'}) class Lock { name: string = 'lock'; diff --git a/packages/core/test/testing_internal_spec.ts b/packages/core/test/testing_internal_spec.ts index 9de173b199..fc29424e97 100644 --- a/packages/core/test/testing_internal_spec.ts +++ b/packages/core/test/testing_internal_spec.ts @@ -15,10 +15,6 @@ class TestObj { someComplexFunc(a: any) { return a; } } -class SpyTestObj extends SpyObject { - constructor() { super(TestObj); } -} - { describe('testing', () => { describe('should respect custom equality tester', () => { @@ -87,7 +83,7 @@ class SpyTestObj extends SpyObject { describe('spy objects', () => { let spyObj: any; - beforeEach(() => { spyObj = new SpyTestObj(); }); + beforeEach(() => { spyObj = new SpyObject(TestObj); }); it('should return a new spy func with no calls', () => { expect(spyObj.spy('someFunc')).not.toHaveBeenCalled(); }); @@ -100,6 +96,7 @@ class SpyTestObj extends SpyObject { }); it('should match multiple function calls', () => { + spyObj.spy('someFunc'); spyObj.someFunc(1, 2); spyObj.someFunc(3, 4); expect(spyObj.spy('someFunc')).toHaveBeenCalledWith(1, 2); @@ -107,11 +104,13 @@ class SpyTestObj extends SpyObject { }); it('should match null arguments', () => { + spyObj.spy('someFunc'); spyObj.someFunc(null, 'hello'); expect(spyObj.spy('someFunc')).toHaveBeenCalledWith(null, 'hello'); }); it('should match using deep equality', () => { + spyObj.spy('someComplexFunc'); spyObj.someComplexFunc([1]); expect(spyObj.spy('someComplexFunc')).toHaveBeenCalledWith([1]); }); @@ -122,8 +121,10 @@ class SpyTestObj extends SpyObject { expect(s.b()).toEqual(2); }); - it('should create spys for all methods', - () => { expect(() => spyObj.someFunc()).not.toThrow(); }); + it('should create spys for all methods', () => { + spyObj.spy('someFunc'); + expect(() => spyObj.someFunc()).not.toThrow(); + }); }); }); } diff --git a/packages/examples/common/BUILD.bazel b/packages/examples/common/BUILD.bazel index a00637acaa..b75c10dec1 100644 --- a/packages/examples/common/BUILD.bazel +++ b/packages/examples/common/BUILD.bazel @@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"]) load("//packages/bazel:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ts_library") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") ng_module( name = "common_examples", diff --git a/packages/examples/core/BUILD.bazel b/packages/examples/core/BUILD.bazel index 42f2b707cc..29868486cb 100644 --- a/packages/examples/core/BUILD.bazel +++ b/packages/examples/core/BUILD.bazel @@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"]) load("//packages/bazel:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "jasmine_node_test", "ng_module", "ts_library") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") ng_module( name = "core_examples", diff --git a/packages/examples/forms/BUILD.bazel b/packages/examples/forms/BUILD.bazel index 1678fd5f6d..81c35ccd09 100644 --- a/packages/examples/forms/BUILD.bazel +++ b/packages/examples/forms/BUILD.bazel @@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"]) load("//packages/bazel:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ts_library") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") ng_module( name = "forms_examples", diff --git a/packages/examples/upgrade/upgrade_example.bzl b/packages/examples/upgrade/upgrade_example.bzl index 29657531e5..471ef32bdd 100644 --- a/packages/examples/upgrade/upgrade_example.bzl +++ b/packages/examples/upgrade/upgrade_example.bzl @@ -1,6 +1,6 @@ load("//packages/bazel:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ts_library") -load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") """ Macro that can be used to create the Bazel targets for an "upgrade" example. Since the diff --git a/packages/platform-browser-dynamic/test/metadata_overrider_spec.ts b/packages/platform-browser-dynamic/test/metadata_overrider_spec.ts index 05367b167f..42933442a7 100644 --- a/packages/platform-browser-dynamic/test/metadata_overrider_spec.ts +++ b/packages/platform-browser-dynamic/test/metadata_overrider_spec.ts @@ -22,13 +22,16 @@ interface OtherMetadataType extends SomeMetadataType { class SomeMetadata implements SomeMetadataType { plainProp: string; private _getterProp: string; - get getterProp(): string { return this._getterProp; } arrayProp: any[]; constructor(options: SomeMetadataType) { this.plainProp = options.plainProp !; this._getterProp = options.getterProp !; this.arrayProp = options.arrayProp !; + Object.defineProperty(this, 'getterProp', { + enumerable: true, // getters are non-enumerable by default in es2015 + get: () => this._getterProp, + }); } } diff --git a/packages/tsconfig-build.json b/packages/tsconfig-build.json index 4979b6563f..4db639d949 100644 --- a/packages/tsconfig-build.json +++ b/packages/tsconfig-build.json @@ -27,6 +27,7 @@ "importHelpers": true }, "bazelOptions": { - "suppressTsconfigOverrideWarnings": true + "suppressTsconfigOverrideWarnings": true, + "devmodeTargetOverride": "es5" } } diff --git a/packages/tsconfig-test.json b/packages/tsconfig-test.json index da8860bf92..4a3d169d13 100644 --- a/packages/tsconfig-test.json +++ b/packages/tsconfig-test.json @@ -6,4 +6,8 @@ "compilerOptions": { "types": ["node", "jasmine"], }, + "bazelOptions": { + "suppressTsconfigOverrideWarnings": true, + "devmodeTargetOverride": "es5" + } } diff --git a/tools/BUILD.bazel b/tools/BUILD.bazel index f42efff9ef..905df3c90b 100644 --- a/tools/BUILD.bazel +++ b/tools/BUILD.bazel @@ -1,6 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("@build_bazel_rules_typescript//:defs.bzl", "ts_config") +load("@npm_bazel_typescript//:defs.bzl", "ts_config") exports_files(["tsconfig.json"]) diff --git a/tools/defaults.bzl b/tools/defaults.bzl index 12b753f7fd..b6e270e683 100644 --- a/tools/defaults.bzl +++ b/tools/defaults.bzl @@ -1,8 +1,8 @@ """Re-export of some bazel rules with repository-wide defaults.""" -load("@build_bazel_rules_karma//:defs.bzl", _ts_web_test_suite = "ts_web_test_suite") +load("@npm_bazel_karma//:defs.bzl", _ts_web_test_suite = "ts_web_test_suite") load("@build_bazel_rules_nodejs//:defs.bzl", _jasmine_node_test = "jasmine_node_test", _nodejs_binary = "nodejs_binary", _npm_package = "npm_package") -load("@build_bazel_rules_typescript//:defs.bzl", _ts_library = "ts_library") +load("@npm_bazel_typescript//:defs.bzl", _ts_library = "ts_library") load("//packages/bazel:index.bzl", _ng_module = "ng_module", _ng_package = "ng_package") load("//packages/bazel/src:ng_rollup_bundle.bzl", _ng_rollup_bundle = "ng_rollup_bundle") diff --git a/tools/npm_workspace/@bazel/typescript/BUILD.bazel b/tools/npm_workspace/@bazel/typescript/BUILD.bazel index b2d20fc950..0f51acdf28 100644 --- a/tools/npm_workspace/@bazel/typescript/BUILD.bazel +++ b/tools/npm_workspace/@bazel/typescript/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility = ["//visibility:public"]) # Alias here so that @npm//@bazel/typescript is a valid Bazel target -# which is reference in build_bazel_rules_typescript/BUILD.bazel +# which is reference in npm_bazel_typescript/BUILD.bazel alias( name = "typescript", actual = "@ngdeps//@bazel/typescript", diff --git a/tools/npm_workspace/@bazel/typescript/bin/BUILD.bazel b/tools/npm_workspace/@bazel/typescript/bin/BUILD.bazel new file mode 100644 index 0000000000..a37485571a --- /dev/null +++ b/tools/npm_workspace/@bazel/typescript/bin/BUILD.bazel @@ -0,0 +1,7 @@ +package(default_visibility = ["//visibility:public"]) + +# Alias here so that references actual in @ngdeps +alias( + name = "tsc_wrapped", + actual = "@ngdeps//@bazel/typescript/bin:tsc_wrapped", +) diff --git a/tools/ts-api-guardian/BUILD.bazel b/tools/ts-api-guardian/BUILD.bazel index d6dbdc3f07..191aa162e0 100644 --- a/tools/ts-api-guardian/BUILD.bazel +++ b/tools/ts-api-guardian/BUILD.bazel @@ -5,7 +5,7 @@ load( "nodejs_binary", "npm_package", ) -load("@build_bazel_rules_typescript//:defs.bzl", "ts_library") +load("@npm_bazel_typescript//:defs.bzl", "ts_library") exports_files(["bin/ts-api-guardian"]) diff --git a/yarn.lock b/yarn.lock index 8c53a3bc2e..e6f1c3e5ec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -143,10 +143,10 @@ resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.9.0.tgz#fd60023acd36313d304cc2f8c2e181b88b5445cd" integrity sha512-E31cefDcdJsx/oii6p/gqKZXSVw0kEg1O73DD2McFcSvnf/p1GYWcQtVgdRQmlviBEytJkJgdX8rtThitRvcow== -"@bazel/karma@0.23.2": - version "0.23.2" - resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.23.2.tgz#17421a61cbcc6c917902beaaef88d61f22471f11" - integrity sha512-aNujXKusUjJIkc6CF03LS8AS7ULwNE0MKEL2TlYvnGCZviQ3nKrpRiEtWFmZlT+GrTOeu7AM4t3l4pSdQx/jnw== +"@bazel/karma@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.25.1.tgz#246286299b6e96fa4a91d240d3c3d7386164adaf" + integrity sha512-e5qyZkeHdxEYTIcHg04pmPF1SR8jy8I1mQLgDxX6NJDVx3JT7iIFeISqlS8hjBiykyX/XZ0CsVzkKYU/sG3ilg== dependencies: jasmine-core "2.8.0" karma "^4.0.0" @@ -160,10 +160,10 @@ semver "5.6.0" tmp "0.0.33" -"@bazel/typescript@0.23.2": - version "0.23.2" - resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.23.2.tgz#a3ff199880855259d84216cb41644c1d9a0fad14" - integrity sha512-GrTyDW6Fvp/rgnxZGYampB5/QmDWvxtLEtUyMCPa/QXFR1OVxaMWeHxxuFEcES2UKJegqBDKAA8IzX21x4UbEw== +"@bazel/typescript@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.25.1.tgz#71564de50ff6976fb37d90f2f7a479e87b158943" + integrity sha512-QFitUUXIWQMfVk5EwI9J9d5iNPfT+kUjPbahiJbJVZz1Fz9zNZ8+CR6FESfnxuUKlZK3Oy0VWFcz7mlHaceL/Q== dependencies: jasmine-core "2.8.0" protobufjs "5.0.3"