build: update to rules_typescript 0.25.1 (#28625)

Updated a spot in the compiler which assumed es5 downlevelling get ready for es2015 devmode in the future.

PR Close #28625
This commit is contained in:
Greg Magolan 2019-02-08 14:01:51 -08:00 committed by Igor Minar
parent 9ae14db343
commit ebffde7143
90 changed files with 174 additions and 1940 deletions

View File

@ -6,8 +6,6 @@ exports_files([
"tsconfig.json", "tsconfig.json",
"LICENSE", "LICENSE",
"protractor-perf.conf.js", "protractor-perf.conf.js",
# Copied into the @angular/bazel package
"browser_repositories.bzl",
]) ])
filegroup( filegroup(

View File

@ -8,7 +8,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
# path = "../rules_nodejs", # path = "../rules_nodejs",
#) #)
#local_repository( #local_repository(
# name = "build_bazel_rules_typescript", # name = "npm_bazel_typescript",
# path = "../rules_typescript", # path = "../rules_typescript",
#) #)
@ -67,7 +67,7 @@ load("//packages/bazel:package.bzl", "rules_angular_dev_dependencies")
rules_angular_dev_dependencies() rules_angular_dev_dependencies()
# Load karma 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() rules_karma_dependencies()
@ -78,12 +78,12 @@ web_test_repositories()
# Temporary work-around for https://github.com/angular/angular/issues/28681 # Temporary work-around for https://github.com/angular/angular/issues/28681
# TODO(gregmagolan): go back to @io_bazel_rules_webtesting browser_repositories # 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() browser_repositories()
# Setup the rules_typescript tooolchain # 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() ts_setup_workspace()

View File

@ -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",
],
)

View File

@ -22,7 +22,7 @@ You can access Bazel with the `yarn bazel` command
The `WORKSPACE` file indicates that our root directory is a The `WORKSPACE` file indicates that our root directory is a
Bazel project. It contains the version of the Bazel rules we 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 The sources on [GitHub] are published from Google's internal
repository (google3). repository (google3).

View File

@ -54,7 +54,7 @@ load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies")
install_bazel_dependencies() install_bazel_dependencies()
# Load karma 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() rules_karma_dependencies()
@ -65,12 +65,12 @@ web_test_repositories()
# Temporary work-around for https://github.com/angular/angular/issues/28681 # Temporary work-around for https://github.com/angular/angular/issues/28681
# TODO(gregmagolan): go back to @io_bazel_rules_webtesting browser_repositories # 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() browser_repositories()
# Setup the rules_typescript tooolchain # 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() ts_setup_workspace()

View File

@ -3,7 +3,7 @@ package(default_visibility = ["//visibility:public"])
load("@npm_angular_bazel//:index.bzl", "ng_module") 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//: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_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 # Allow targets under sub-packages to reference the tsconfig.json file
exports_files(["tsconfig.json"]) exports_files(["tsconfig.json"])

View File

@ -1,7 +1,7 @@
package(default_visibility = ["//visibility:public"]) package(default_visibility = ["//visibility:public"])
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_typescript//:defs.bzl", "ts_library") load("@npm_bazel_typescript//:defs.bzl", "ts_library")
load("@io_bazel_rules_sass//sass:sass.bzl", "sass_binary") load("@io_bazel_rules_sass//sass:sass.bzl", "sass_binary")
load("@npm_angular_bazel//:index.bzl", "ng_module", "ng_package") load("@npm_angular_bazel//:index.bzl", "ng_module", "ng_package")

View File

@ -18,8 +18,8 @@
"@angular/bazel": "packages-dist:bazel", "@angular/bazel": "packages-dist:bazel",
"@angular/compiler": "packages-dist:compiler", "@angular/compiler": "packages-dist:compiler",
"@angular/compiler-cli": "packages-dist:compiler-cli", "@angular/compiler-cli": "packages-dist:compiler-cli",
"@bazel/karma": "0.23.2", "@bazel/karma": "0.25.1",
"@bazel/typescript": "0.23.2", "@bazel/typescript": "0.25.1",
"@types/jasmine": "2.8.8", "@types/jasmine": "2.8.8",
"@types/source-map": "0.5.1", "@types/source-map": "0.5.1",
"protractor": "5.1.2", "protractor": "5.1.2",

View File

@ -65,12 +65,21 @@
tslib "^1.9.0" tslib "^1.9.0"
"@angular/bazel@file:../angular/dist/packages-dist/bazel": "@angular/bazel@file:../angular/dist/packages-dist/bazel":
<<<<<<< HEAD
version "0.0.0" version "0.0.0"
dependencies: dependencies:
"@angular-devkit/architect" "^0.10.6" "@angular-devkit/architect" "^0.10.6"
"@angular-devkit/core" "^7.0.4" "@angular-devkit/core" "^7.0.4"
"@angular-devkit/schematics" "^7.0.4" "@angular-devkit/schematics" "^7.0.4"
"@bazel/typescript" "^0.21.0" "@bazel/typescript" "^0.21.0"
=======
version "8.0.0-beta.3"
dependencies:
"@angular-devkit/architect" "^0.10.6"
"@angular-devkit/core" "^7.0.4"
"@angular-devkit/schematics" "^7.3.0-rc.0"
"@bazel/typescript" "^0.24.1"
>>>>>>> b052dfada9... build: update to rules_typescript 0.24.1
"@schematics/angular" "^7.0.4" "@schematics/angular" "^7.0.4"
"@types/node" "6.0.84" "@types/node" "6.0.84"
semver "^5.6.0" semver "^5.6.0"
@ -83,7 +92,11 @@
tslib "^1.9.0" tslib "^1.9.0"
"@angular/compiler-cli@file:../angular/dist/packages-dist/compiler-cli": "@angular/compiler-cli@file:../angular/dist/packages-dist/compiler-cli":
<<<<<<< HEAD
version "0.0.0" version "0.0.0"
=======
version "8.0.0-beta.3"
>>>>>>> b052dfada9... build: update to rules_typescript 0.24.1
dependencies: dependencies:
canonical-path "1.0.0" canonical-path "1.0.0"
chokidar "^1.4.2" chokidar "^1.4.2"
@ -98,6 +111,7 @@
yargs "9.0.1" yargs "9.0.1"
"@angular/compiler@file:../angular/dist/packages-dist/compiler": "@angular/compiler@file:../angular/dist/packages-dist/compiler":
<<<<<<< HEAD
version "0.0.0" version "0.0.0"
dependencies: dependencies:
tslib "^1.9.0" tslib "^1.9.0"
@ -114,13 +128,16 @@
"@angular/platform-browser@file:../angular/dist/packages-dist/platform-browser": "@angular/platform-browser@file:../angular/dist/packages-dist/platform-browser":
version "0.0.0" version "0.0.0"
=======
version "8.0.0-beta.3"
>>>>>>> b052dfada9... build: update to rules_typescript 0.24.1
dependencies: dependencies:
tslib "^1.9.0" tslib "^1.9.0"
"@bazel/karma@0.23.2": "@bazel/karma@0.24.1":
version "0.23.2" version "0.24.1"
resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.23.2.tgz#17421a61cbcc6c917902beaaef88d61f22471f11" resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.24.1.tgz#eeeec30e0f16cc70283f1b818c80fd8d473066de"
integrity sha512-aNujXKusUjJIkc6CF03LS8AS7ULwNE0MKEL2TlYvnGCZviQ3nKrpRiEtWFmZlT+GrTOeu7AM4t3l4pSdQx/jnw== integrity sha512-nBTLTUtRKoV1zM8TeJXHyRthC93Ug+iWc3VAI67WKzJaTzH2NmgTaGBesEPvPd/HJTZi1Zi6tKPIVpu0hOaZVA==
dependencies: dependencies:
jasmine-core "2.8.0" jasmine-core "2.8.0"
karma "^4.0.0" karma "^4.0.0"
@ -134,10 +151,17 @@
semver "5.6.0" semver "5.6.0"
tmp "0.0.33" tmp "0.0.33"
<<<<<<< HEAD
"@bazel/typescript@0.23.2": "@bazel/typescript@0.23.2":
version "0.23.2" version "0.23.2"
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.23.2.tgz#a3ff199880855259d84216cb41644c1d9a0fad14" resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.23.2.tgz#a3ff199880855259d84216cb41644c1d9a0fad14"
integrity sha512-GrTyDW6Fvp/rgnxZGYampB5/QmDWvxtLEtUyMCPa/QXFR1OVxaMWeHxxuFEcES2UKJegqBDKAA8IzX21x4UbEw== integrity sha512-GrTyDW6Fvp/rgnxZGYampB5/QmDWvxtLEtUyMCPa/QXFR1OVxaMWeHxxuFEcES2UKJegqBDKAA8IzX21x4UbEw==
=======
"@bazel/typescript@0.24.1", "@bazel/typescript@^0.24.1":
version "0.24.1"
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.24.1.tgz#3efdc085c122939b2dd161b7ff589454c50edffc"
integrity sha512-tvdgUlqA5EkSQmQ656G/Dc3LX4ZvqPucOGfQ/ls9fYnG4ZWIh1KgwZq99NbjMS5MAJ+47hQBH+gL6dcRfHOGUg==
>>>>>>> b052dfada9... build: update to rules_typescript 0.24.1
dependencies: dependencies:
jasmine-core "2.8.0" jasmine-core "2.8.0"
protobufjs "5.0.3" protobufjs "5.0.3"

View File

@ -1,4 +1,4 @@
load("@build_bazel_rules_typescript//:defs.bzl", "ts_library") load("@npm_bazel_typescript//:defs.bzl", "ts_library")
load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite")
ts_library( ts_library(

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ng_module") 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") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
package(default_visibility = ["//modules/benchmarks:__subpackages__"]) package(default_visibility = ["//modules/benchmarks:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ts_library") 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") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
package(default_visibility = ["//modules/benchmarks:__subpackages__"]) package(default_visibility = ["//modules/benchmarks:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ts_library") 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") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
package(default_visibility = ["//modules/benchmarks:__subpackages__"]) package(default_visibility = ["//modules/benchmarks:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ts_library") 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") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
package(default_visibility = ["//modules/benchmarks:__subpackages__"]) package(default_visibility = ["//modules/benchmarks:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ng_module") 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") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
package(default_visibility = ["//modules/benchmarks:__subpackages__"]) package(default_visibility = ["//modules/benchmarks:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ng_module") 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") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
package(default_visibility = ["//modules/benchmarks:__subpackages__"]) package(default_visibility = ["//modules/benchmarks:__subpackages__"])

View File

@ -1,7 +1,7 @@
package(default_visibility = ["//visibility:public"]) package(default_visibility = ["//visibility:public"])
load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle") 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") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
ng_module( ng_module(

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ts_library") 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") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
package(default_visibility = ["//modules/benchmarks:__subpackages__"]) package(default_visibility = ["//modules/benchmarks:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ts_library") 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") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
package(default_visibility = ["//modules/benchmarks:__subpackages__"]) package(default_visibility = ["//modules/benchmarks:__subpackages__"])

View File

@ -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") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
package(default_visibility = ["//modules/benchmarks:__subpackages__"]) package(default_visibility = ["//modules/benchmarks:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ts_library") 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") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
package(default_visibility = ["//modules/benchmarks:__subpackages__"]) package(default_visibility = ["//modules/benchmarks:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ng_module") 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") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
package(default_visibility = ["//modules/benchmarks:__subpackages__"]) package(default_visibility = ["//modules/benchmarks:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ts_library") 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") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
package(default_visibility = ["//modules/benchmarks:__subpackages__"]) package(default_visibility = ["//modules/benchmarks:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ts_library") 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") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
package(default_visibility = ["//modules/benchmarks:__subpackages__"]) package(default_visibility = ["//modules/benchmarks:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ng_module") 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") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
package(default_visibility = ["//modules/benchmarks:__subpackages__"]) package(default_visibility = ["//modules/benchmarks:__subpackages__"])

View File

@ -1,7 +1,7 @@
package(default_visibility = ["//modules/benchmarks:__subpackages__"]) package(default_visibility = ["//modules/benchmarks:__subpackages__"])
load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle") 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") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
ng_module( ng_module(

View File

@ -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("//tools:defaults.bzl", "ts_library")
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ng_module") 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__"]) package(default_visibility = ["//modules/playground:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ng_module") 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__"]) package(default_visibility = ["//modules/playground:__subpackages__"])

View File

@ -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__"]) package(default_visibility = ["//modules/playground:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ng_module") 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__"]) package(default_visibility = ["//modules/playground:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ng_module") 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__"]) package(default_visibility = ["//modules/playground:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ng_module") 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__"]) package(default_visibility = ["//modules/playground:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ng_module") 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__"]) package(default_visibility = ["//modules/playground:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ng_module") 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__"]) package(default_visibility = ["//modules/playground:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ng_module") 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__"]) package(default_visibility = ["//modules/playground:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ng_module") 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__"]) package(default_visibility = ["//modules/playground:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ng_module") 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__"]) package(default_visibility = ["//modules/playground:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ng_module") 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__"]) package(default_visibility = ["//modules/playground:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ng_module") 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__"]) package(default_visibility = ["//modules/playground:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ng_module") 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__"]) package(default_visibility = ["//modules/playground:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ng_module") 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__"]) package(default_visibility = ["//modules/playground:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ng_module") 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__"]) package(default_visibility = ["//modules/playground:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ng_module") 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__"]) package(default_visibility = ["//modules/playground:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ts_library") 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__"]) package(default_visibility = ["//modules/playground:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ng_module") 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__"]) package(default_visibility = ["//modules/playground:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ng_module") 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__"]) package(default_visibility = ["//modules/playground:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ng_module") 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__"]) package(default_visibility = ["//modules/playground:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ng_module") 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__"]) package(default_visibility = ["//modules/playground:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ng_module") 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__"]) package(default_visibility = ["//modules/playground:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ng_module") 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__"]) package(default_visibility = ["//modules/playground:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ng_module") 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__"]) package(default_visibility = ["//modules/playground:__subpackages__"])

View File

@ -1,5 +1,5 @@
load("//tools:defaults.bzl", "ng_module") 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__"]) package(default_visibility = ["//modules/playground:__subpackages__"])

View File

@ -35,8 +35,8 @@
"@angular-devkit/build-optimizer": "^0.13.2", "@angular-devkit/build-optimizer": "^0.13.2",
"@angular-devkit/core": "^7.3.2", "@angular-devkit/core": "^7.3.2",
"@angular-devkit/schematics": "^7.3.2", "@angular-devkit/schematics": "^7.3.2",
"@bazel/karma": "0.23.2", "@bazel/karma": "0.25.1",
"@bazel/typescript": "0.23.2", "@bazel/typescript": "0.25.1",
"@microsoft/api-extractor": "^7.0.17", "@microsoft/api-extractor": "^7.0.17",
"@schematics/angular": "^7.3.2", "@schematics/angular": "^7.3.2",
"@types/angular": "^1.6.47", "@types/angular": "^1.6.47",

View File

@ -5,7 +5,7 @@ exports_files([
"tsconfig.json", "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") load("//tools:defaults.bzl", "ts_library")
ts_library( ts_library(

View File

@ -1,12 +1,5 @@
load("//tools:defaults.bzl", "npm_package") load("//tools:defaults.bzl", "npm_package")
genrule(
name = "copy_browser_repositories",
srcs = ["//:browser_repositories.bzl"],
outs = ["browser_repositories.bzl"],
cmd = "cp $< $@",
)
npm_package( npm_package(
name = "npm_package", name = "npm_package",
srcs = glob( srcs = glob(
@ -37,7 +30,6 @@ npm_package(
# Dependencies on the full npm_package cause long re-builds. # Dependencies on the full npm_package cause long re-builds.
visibility = ["//visibility:private"], visibility = ["//visibility:private"],
deps = [ deps = [
":copy_browser_repositories",
"//packages/bazel/src/api-extractor:lib", "//packages/bazel/src/api-extractor:lib",
"//packages/bazel/src/builders", "//packages/bazel/src/builders",
"//packages/bazel/src/ng_package:lib", "//packages/bazel/src/ng_package:lib",

View File

@ -21,7 +21,7 @@
"@angular-devkit/architect": "^0.10.6", "@angular-devkit/architect": "^0.10.6",
"@angular-devkit/core": "^7.0.4", "@angular-devkit/core": "^7.0.4",
"@angular-devkit/schematics": "^7.3.0-rc.0", "@angular-devkit/schematics": "^7.3.0-rc.0",
"@bazel/typescript": "^0.23.2", "@bazel/typescript": "^0.25.1",
"@microsoft/api-extractor": "^7.0.17", "@microsoft/api-extractor": "^7.0.17",
"@schematics/angular": "^7.0.4", "@schematics/angular": "^7.0.4",
"@types/node": "6.0.84", "@types/node": "6.0.84",

View File

@ -157,7 +157,7 @@ esm5_outputs_aspect = aspect(
cfg = "host", cfg = "host",
), ),
"_tsc_wrapped": attr.label( "_tsc_wrapped": attr.label(
default = Label("@build_bazel_rules_typescript//:@bazel/typescript/tsc_wrapped"), default = Label("@npm//@bazel/typescript/bin:tsc_wrapped"),
executable = True, executable = True,
cfg = "host", cfg = "host",
), ),

View File

@ -2,11 +2,11 @@
""" """
load( load(
"@build_bazel_rules_typescript//internal:build_defs.bzl", "@npm_bazel_typescript//internal:build_defs.bzl",
_tsc_wrapped_tsconfig = "tsc_wrapped_tsconfig", _tsc_wrapped_tsconfig = "tsc_wrapped_tsconfig",
) )
load( load(
"@build_bazel_rules_typescript//internal:common/compilation.bzl", "@npm_bazel_typescript//internal:common/compilation.bzl",
_COMMON_ATTRIBUTES = "COMMON_ATTRIBUTES", _COMMON_ATTRIBUTES = "COMMON_ATTRIBUTES",
_COMMON_OUTPUTS = "COMMON_OUTPUTS", _COMMON_OUTPUTS = "COMMON_OUTPUTS",
_DEPS_ASPECTS = "DEPS_ASPECTS", _DEPS_ASPECTS = "DEPS_ASPECTS",

View File

@ -3,7 +3,7 @@ package(default_visibility = ["//visibility:public"])
load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary") load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
# BEGIN-DEV-ONLY # BEGIN-DEV-ONLY
load("@build_bazel_rules_typescript//:defs.bzl", "ts_library") load("@npm_bazel_typescript//:defs.bzl", "ts_library")
ts_library( ts_library(
name = "lib", name = "lib",

View File

@ -1,5 +1,5 @@
load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary") 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( ts_library(
name = "ngc_lib", name = "ngc_lib",

View File

@ -1,6 +1,6 @@
package(default_visibility = ["//visibility:public"]) package(default_visibility = ["//visibility:public"])
load("@build_bazel_rules_typescript//:defs.bzl", "ts_library") load("@npm_bazel_typescript//:defs.bzl", "ts_library")
ts_library( ts_library(
name = "utils", name = "utils",

View File

@ -46,7 +46,7 @@ yarn_install(
load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies") load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies")
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() rules_karma_dependencies()
load("@io_bazel_rules_webtesting//web:repositories.bzl", "browser_repositories", "web_test_repositories") load("@io_bazel_rules_webtesting//web:repositories.bzl", "browser_repositories", "web_test_repositories")
@ -56,7 +56,7 @@ browser_repositories(
firefox = True, firefox = True,
) )
load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace") load("@npm_bazel_typescript//:defs.bzl", "ts_setup_workspace")
ts_setup_workspace() ts_setup_workspace()
<% if (sass) { %> <% if (sass) { %>
load("@io_bazel_rules_sass//sass:sass_repositories.bzl", "sass_repositories") load("@io_bazel_rules_sass//sass:sass_repositories.bzl", "sass_repositories")

View File

@ -1,4 +1,4 @@
load("@build_bazel_rules_typescript//:defs.bzl", "ts_library") load("@npm_bazel_typescript//:defs.bzl", "ts_library")
load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite")
ts_library( ts_library(

View File

@ -1,10 +1,10 @@
package(default_visibility = ["//visibility:public"]) package(default_visibility = ["//visibility:public"])
load("@npm_angular_bazel//:index.bzl", "ng_module") load("@npm_angular_bazel//: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//:defs.bzl", "rollup_bundle", "history_server")
load("@build_bazel_rules_nodejs//internal/web_package:web_package.bzl", "web_package") 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", "multi_sass_binary") <% if (sass) { %>load("@io_bazel_rules_sass//:defs.bzl", "multi_sass_binary")
multi_sass_binary( multi_sass_binary(

View File

@ -46,8 +46,8 @@ function addDevDependenciesToPackageJson(options: Schema) {
'@angular/upgrade': angularCoreVersion, '@angular/upgrade': angularCoreVersion,
'@bazel/bazel': '^0.22.1', '@bazel/bazel': '^0.22.1',
'@bazel/ibazel': '^0.9.0', '@bazel/ibazel': '^0.9.0',
'@bazel/karma': '^0.23.2', '@bazel/karma': '^0.25.1',
'@bazel/typescript': '^0.23.2', '@bazel/typescript': '^0.25.1',
}; };
const recorder = host.beginUpdate(packageJson); const recorder = host.beginUpdate(packageJson);

View File

@ -32,7 +32,7 @@ jasmine_node_test(
"//packages/bazel/test/ngc-wrapped/empty:empty_tsconfig.json", "//packages/bazel/test/ngc-wrapped/empty:empty_tsconfig.json",
"//packages/bazel/test/ngc-wrapped/empty:tsconfig.json", "//packages/bazel/test/ngc-wrapped/empty:tsconfig.json",
"//packages/private/testing", "//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",
], ],
) )

View File

@ -1,5 +1,5 @@
load("//packages/bazel:index.bzl", "protractor_web_test_suite") 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("@build_bazel_rules_nodejs//:defs.bzl", "rollup_bundle")
load("//tools:defaults.bzl", "ts_library") load("//tools:defaults.bzl", "ts_library")
load("//tools/http-server:http_server.bzl", "http_server") load("//tools/http-server:http_server.bzl", "http_server")

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
package(default_visibility = ["//visibility:public"]) package(default_visibility = ["//visibility:public"])
load("//tools:defaults.bzl", "npm_package", "ts_library") 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( ts_config(
name = "tsconfig", name = "tsconfig",

View File

@ -283,16 +283,20 @@ export interface MetadataFactory<T> {
} }
function makeMetadataFactory<T>(name: string, props?: (...args: any[]) => T): MetadataFactory<T> { function makeMetadataFactory<T>(name: string, props?: (...args: any[]) => T): MetadataFactory<T> {
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) : {}; const values = props ? props(...args) : {};
return { return {
ngMetadataName: name, ngMetadataName: name,
...values, ...values,
}; };
}; }
factory.isTypeOf = (obj: any) => obj && obj.ngMetadataName === name; (factory as any).isTypeOf = (obj: any) => obj && obj.ngMetadataName === name;
factory.ngMetadataName = name; (factory as any).ngMetadataName = name;
return factory; return factory as any;
} }
export interface Route { export interface Route {

View File

@ -811,6 +811,9 @@ function readUpdateOpCodes(
value += renderStringify(viewData[bindingsStartIndex - opCode]); value += renderStringify(viewData[bindingsStartIndex - opCode]);
} else { } else {
const nodeIndex = opCode >>> I18nUpdateOpCode.SHIFT_REF; const nodeIndex = opCode >>> I18nUpdateOpCode.SHIFT_REF;
let tIcuIndex: number;
let tIcu: TIcu;
let icuTNode: TIcuContainerNode;
switch (opCode & I18nUpdateOpCode.MASK_OPCODE) { switch (opCode & I18nUpdateOpCode.MASK_OPCODE) {
case I18nUpdateOpCode.Attr: case I18nUpdateOpCode.Attr:
const attrName = updateOpCodes[++j] as string; const attrName = updateOpCodes[++j] as string;
@ -821,9 +824,9 @@ function readUpdateOpCodes(
textBinding(nodeIndex, value); textBinding(nodeIndex, value);
break; break;
case I18nUpdateOpCode.IcuSwitch: case I18nUpdateOpCode.IcuSwitch:
let tIcuIndex = updateOpCodes[++j] as number; tIcuIndex = updateOpCodes[++j] as number;
let tIcu = icus ![tIcuIndex]; tIcu = icus ![tIcuIndex];
let icuTNode = getTNode(nodeIndex, viewData) as TIcuContainerNode; icuTNode = getTNode(nodeIndex, viewData) as TIcuContainerNode;
// If there is an active case, delete the old nodes // If there is an active case, delete the old nodes
if (icuTNode.activeCaseIndex !== null) { if (icuTNode.activeCaseIndex !== null) {
const removeCodes = tIcu.remove[icuTNode.activeCaseIndex]; const removeCodes = tIcu.remove[icuTNode.activeCaseIndex];

View File

@ -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:defaults.bzl", "jasmine_node_test", "ng_module", "ng_rollup_bundle", "ts_library")
load("//tools/http-server:http_server.bzl", "http_server") load("//tools/http-server:http_server.bzl", "http_server")
load("//tools/symbol-extractor:index.bzl", "js_expected_symbol_test") 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( ng_module(
name = "todo", name = "todo",

View File

@ -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:defaults.bzl", "jasmine_node_test", "ng_module", "ng_rollup_bundle", "ts_library")
load("//tools/http-server:http_server.bzl", "http_server") 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( ng_module(
name = "todo_i18n", name = "todo_i18n",

View File

@ -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:defaults.bzl", "jasmine_node_test", "ng_module", "ng_rollup_bundle", "ts_library")
load("//tools/http-server:http_server.bzl", "http_server") 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( ng_module(
name = "todo", name = "todo",

View File

@ -11,6 +11,14 @@ import {Component, ContentChildren, Directive, Inject, NO_ERRORS_SCHEMA, NgModul
import {TestBed} from '@angular/core/testing'; import {TestBed} from '@angular/core/testing';
import {expect} from '@angular/platform-browser/testing/src/matchers'; import {expect} from '@angular/platform-browser/testing/src/matchers';
class Frame {
name: string = 'frame';
}
class ModuleFrame {
name: string = 'moduleFram';
}
describe('forwardRef integration', function() { describe('forwardRef integration', function() {
beforeEach(() => { TestBed.configureTestingModule({imports: [Module], declarations: [App]}); }); beforeEach(() => { TestBed.configureTestingModule({imports: [Module], declarations: [App]}); });
@ -51,14 +59,6 @@ class Door {
constructor(@Inject(forwardRef(() => Frame)) frame: Frame) { this.frame = frame; } constructor(@Inject(forwardRef(() => Frame)) frame: Frame) { this.frame = frame; }
} }
class Frame {
name: string = 'frame';
}
class ModuleFrame {
name: string = 'moduleFram';
}
@Directive({selector: 'lock'}) @Directive({selector: 'lock'})
class Lock { class Lock {
name: string = 'lock'; name: string = 'lock';

View File

@ -15,10 +15,6 @@ class TestObj {
someComplexFunc(a: any) { return a; } someComplexFunc(a: any) { return a; }
} }
class SpyTestObj extends SpyObject {
constructor() { super(TestObj); }
}
{ {
describe('testing', () => { describe('testing', () => {
describe('should respect custom equality tester', () => { describe('should respect custom equality tester', () => {
@ -87,7 +83,7 @@ class SpyTestObj extends SpyObject {
describe('spy objects', () => { describe('spy objects', () => {
let spyObj: any; let spyObj: any;
beforeEach(() => { spyObj = new SpyTestObj(); }); beforeEach(() => { spyObj = new SpyObject(TestObj); });
it('should return a new spy func with no calls', it('should return a new spy func with no calls',
() => { expect(spyObj.spy('someFunc')).not.toHaveBeenCalled(); }); () => { expect(spyObj.spy('someFunc')).not.toHaveBeenCalled(); });
@ -100,6 +96,7 @@ class SpyTestObj extends SpyObject {
}); });
it('should match multiple function calls', () => { it('should match multiple function calls', () => {
spyObj.spy('someFunc');
spyObj.someFunc(1, 2); spyObj.someFunc(1, 2);
spyObj.someFunc(3, 4); spyObj.someFunc(3, 4);
expect(spyObj.spy('someFunc')).toHaveBeenCalledWith(1, 2); expect(spyObj.spy('someFunc')).toHaveBeenCalledWith(1, 2);
@ -107,11 +104,13 @@ class SpyTestObj extends SpyObject {
}); });
it('should match null arguments', () => { it('should match null arguments', () => {
spyObj.spy('someFunc');
spyObj.someFunc(null, 'hello'); spyObj.someFunc(null, 'hello');
expect(spyObj.spy('someFunc')).toHaveBeenCalledWith(null, 'hello'); expect(spyObj.spy('someFunc')).toHaveBeenCalledWith(null, 'hello');
}); });
it('should match using deep equality', () => { it('should match using deep equality', () => {
spyObj.spy('someComplexFunc');
spyObj.someComplexFunc([1]); spyObj.someComplexFunc([1]);
expect(spyObj.spy('someComplexFunc')).toHaveBeenCalledWith([1]); expect(spyObj.spy('someComplexFunc')).toHaveBeenCalledWith([1]);
}); });
@ -122,8 +121,10 @@ class SpyTestObj extends SpyObject {
expect(s.b()).toEqual(2); expect(s.b()).toEqual(2);
}); });
it('should create spys for all methods', it('should create spys for all methods', () => {
() => { expect(() => spyObj.someFunc()).not.toThrow(); }); spyObj.spy('someFunc');
expect(() => spyObj.someFunc()).not.toThrow();
});
}); });
}); });
} }

View File

@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"])
load("//packages/bazel:index.bzl", "protractor_web_test_suite") load("//packages/bazel:index.bzl", "protractor_web_test_suite")
load("//tools:defaults.bzl", "ng_module", "ts_library") 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( ng_module(
name = "common_examples", name = "common_examples",

View File

@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"])
load("//packages/bazel:index.bzl", "protractor_web_test_suite") load("//packages/bazel:index.bzl", "protractor_web_test_suite")
load("//tools:defaults.bzl", "jasmine_node_test", "ng_module", "ts_library") 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( ng_module(
name = "core_examples", name = "core_examples",

View File

@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"])
load("//packages/bazel:index.bzl", "protractor_web_test_suite") load("//packages/bazel:index.bzl", "protractor_web_test_suite")
load("//tools:defaults.bzl", "ng_module", "ts_library") 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( ng_module(
name = "forms_examples", name = "forms_examples",

View File

@ -1,6 +1,6 @@
load("//packages/bazel:index.bzl", "protractor_web_test_suite") load("//packages/bazel:index.bzl", "protractor_web_test_suite")
load("//tools:defaults.bzl", "ng_module", "ts_library") 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 Macro that can be used to create the Bazel targets for an "upgrade" example. Since the

View File

@ -22,13 +22,16 @@ interface OtherMetadataType extends SomeMetadataType {
class SomeMetadata implements SomeMetadataType { class SomeMetadata implements SomeMetadataType {
plainProp: string; plainProp: string;
private _getterProp: string; private _getterProp: string;
get getterProp(): string { return this._getterProp; }
arrayProp: any[]; arrayProp: any[];
constructor(options: SomeMetadataType) { constructor(options: SomeMetadataType) {
this.plainProp = options.plainProp !; this.plainProp = options.plainProp !;
this._getterProp = options.getterProp !; this._getterProp = options.getterProp !;
this.arrayProp = options.arrayProp !; this.arrayProp = options.arrayProp !;
Object.defineProperty(this, 'getterProp', {
enumerable: true, // getters are non-enumerable by default in es2015
get: () => this._getterProp,
});
} }
} }

View File

@ -27,6 +27,7 @@
"importHelpers": true "importHelpers": true
}, },
"bazelOptions": { "bazelOptions": {
"suppressTsconfigOverrideWarnings": true "suppressTsconfigOverrideWarnings": true,
"devmodeTargetOverride": "es5"
} }
} }

View File

@ -6,4 +6,8 @@
"compilerOptions": { "compilerOptions": {
"types": ["node", "jasmine"], "types": ["node", "jasmine"],
}, },
"bazelOptions": {
"suppressTsconfigOverrideWarnings": true,
"devmodeTargetOverride": "es5"
}
} }

View File

@ -1,6 +1,6 @@
package(default_visibility = ["//visibility:public"]) 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"]) exports_files(["tsconfig.json"])

View File

@ -1,8 +1,8 @@
"""Re-export of some bazel rules with repository-wide defaults.""" """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_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:index.bzl", _ng_module = "ng_module", _ng_package = "ng_package")
load("//packages/bazel/src:ng_rollup_bundle.bzl", _ng_rollup_bundle = "ng_rollup_bundle") load("//packages/bazel/src:ng_rollup_bundle.bzl", _ng_rollup_bundle = "ng_rollup_bundle")

View File

@ -1,7 +1,7 @@
package(default_visibility = ["//visibility:public"]) package(default_visibility = ["//visibility:public"])
# Alias here so that @npm//@bazel/typescript is a valid Bazel target # 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( alias(
name = "typescript", name = "typescript",
actual = "@ngdeps//@bazel/typescript", actual = "@ngdeps//@bazel/typescript",

View File

@ -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",
)

View File

@ -5,7 +5,7 @@ load(
"nodejs_binary", "nodejs_binary",
"npm_package", "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"]) exports_files(["bin/ts-api-guardian"])

View File

@ -105,10 +105,10 @@
resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.9.0.tgz#fd60023acd36313d304cc2f8c2e181b88b5445cd" resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.9.0.tgz#fd60023acd36313d304cc2f8c2e181b88b5445cd"
integrity sha512-E31cefDcdJsx/oii6p/gqKZXSVw0kEg1O73DD2McFcSvnf/p1GYWcQtVgdRQmlviBEytJkJgdX8rtThitRvcow== integrity sha512-E31cefDcdJsx/oii6p/gqKZXSVw0kEg1O73DD2McFcSvnf/p1GYWcQtVgdRQmlviBEytJkJgdX8rtThitRvcow==
"@bazel/karma@0.23.2": "@bazel/karma@0.25.1":
version "0.23.2" version "0.25.1"
resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.23.2.tgz#17421a61cbcc6c917902beaaef88d61f22471f11" resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.25.1.tgz#246286299b6e96fa4a91d240d3c3d7386164adaf"
integrity sha512-aNujXKusUjJIkc6CF03LS8AS7ULwNE0MKEL2TlYvnGCZviQ3nKrpRiEtWFmZlT+GrTOeu7AM4t3l4pSdQx/jnw== integrity sha512-e5qyZkeHdxEYTIcHg04pmPF1SR8jy8I1mQLgDxX6NJDVx3JT7iIFeISqlS8hjBiykyX/XZ0CsVzkKYU/sG3ilg==
dependencies: dependencies:
jasmine-core "2.8.0" jasmine-core "2.8.0"
karma "^4.0.0" karma "^4.0.0"
@ -122,10 +122,10 @@
semver "5.6.0" semver "5.6.0"
tmp "0.0.33" tmp "0.0.33"
"@bazel/typescript@0.23.2": "@bazel/typescript@0.25.1":
version "0.23.2" version "0.25.1"
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.23.2.tgz#a3ff199880855259d84216cb41644c1d9a0fad14" resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.25.1.tgz#71564de50ff6976fb37d90f2f7a479e87b158943"
integrity sha512-GrTyDW6Fvp/rgnxZGYampB5/QmDWvxtLEtUyMCPa/QXFR1OVxaMWeHxxuFEcES2UKJegqBDKAA8IzX21x4UbEw== integrity sha512-QFitUUXIWQMfVk5EwI9J9d5iNPfT+kUjPbahiJbJVZz1Fz9zNZ8+CR6FESfnxuUKlZK3Oy0VWFcz7mlHaceL/Q==
dependencies: dependencies:
jasmine-core "2.8.0" jasmine-core "2.8.0"
protobufjs "5.0.3" protobufjs "5.0.3"