Renames `build_bazel_rules_typescript` and `build_bazel_rules_karma` to `npm_bazel_typescript` and `npm_bazel_karma` respectively
BREAKING CHANGE:
Users will need to rename `build_bazel_rules_typescript` to `npm_bazel_typescript` and `build_bazel_rules_karma` to `npm_bazel_karma` in their projects
Closes #412
PiperOrigin-RevId: 233472013
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 5b60a2c..5d8f34e 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -21,7 +21,7 @@
- "@disable_tsetse_for_external_test//..."
# Run some targets again, but addressed as an external repo
# TODO(alexeagle): run all of them after fixing https://github.com/bazelbuild/rules_typescript/issues/243
- - "@build_bazel_rules_typescript//examples/some_library:lib"
+ - "@npm_bazel_typescript//examples/some_library:lib"
test_flags:
# TODO(gregmagolan): shared libs needed by chrome & firefox not available on ubuntu1604
- "--test_tag_filters=-browser:chromium-local,-browser:firefox-local"
diff --git a/BUILD.bazel b/BUILD.bazel
index 0551730..c47ed66 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -99,7 +99,7 @@
)
# Produces the release we publish to GitHub. Users download this starlark package
-# to get the @build_bazel_rules_typescript workspace.
+# to get the @npm_bazel_typescript workspace.
# FIXME(gregmagolan): strip the npm_package prefix from within the generated archive
# pkg_tar(
# name = "release",
diff --git a/DEVELOPING.md b/DEVELOPING.md
index 8428d01..f45639b 100644
--- a/DEVELOPING.md
+++ b/DEVELOPING.md
@@ -4,13 +4,13 @@
## Testing changing downstream
-By default, downstream projects use both an `http_archive` of `build_bazel_rules_typescript` and the released `@bazel/typescript` and `@bazel/karma` npm packages. `postinstall` steps in these npm packages check that the version of the `build_bazel_rules_typescript` is compatible with the version of the npm package(s).
+By default, downstream projects use both an `http_archive` of `npm_bazel_typescript` and the released `@bazel/typescript` and `@bazel/karma` npm packages. `postinstall` steps in these npm packages check that the version of the `npm_bazel_typescript` is compatible with the version of the npm package(s).
For example, if a downstream `WORKSPACE` contain:
```python
http_archive(
- name = "build_bazel_rules_typescript",
+ name = "npm_bazel_typescript",
url = "https://github.com/bazelbuild/rules_typescript/archive/0.21.0.zip",
strip_prefix = "rules_typescript-0.21.0",
)
@@ -38,7 +38,7 @@
```python
"compiler": attr.label(
- default = Label("@build_bazel_rules_typescript//internal:tsc_wrapped_bin"),
+ default = Label("@npm_bazel_typescript//internal:tsc_wrapped_bin"),
```
The correct defaults to use so that you are not depending on the npm package downstream are in `/internal/defaults.bzl`. Note, your downstream
@@ -46,7 +46,7 @@
In the case of the `angular` workspace, some `@npm` dependencies in this repository will also need to be changed to `@ngdeps` since `angular` does not have
an `@npm` workspace with npm dependencies.
-Note, with this workflow the downstream version of `@npm//typescript` will be used to compile the `ts_library` targets in `build_bazel_rules_typescript`.
+Note, with this workflow the downstream version of `@npm//typescript` will be used to compile the `ts_library` targets in `npm_bazel_typescript`.
An example of this can be found under `internal/e2e/typescript_3.1`.
## Releasing
diff --git a/README.md b/README.md
index 074475b..d696a90 100644
--- a/README.md
+++ b/README.md
@@ -73,13 +73,13 @@
load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies")
install_bazel_dependencies()
-# Fetch transitive Bazel dependencies of build_bazel_rules_karma
+# Fetch transitive Bazel dependencies of npm_bazel_karma
# ONLY REQUIRED if you are using the @bazel/karma npm package
-load("@build_bazel_rules_karma//:package.bzl", "rules_karma_dependencies")
+load("@npm_bazel_karma//:package.bzl", "rules_karma_dependencies")
rules_karma_dependencies()
# Setup TypeScript toolchain
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")
+load("@npm_bazel_typescript//:defs.bzl", "ts_setup_workspace")
ts_setup_workspace()
# Setup web testing, choose browsers we can test on
@@ -168,7 +168,7 @@
```python
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 = "my_code",
@@ -250,7 +250,7 @@
point to your `ts_library` target(s):
```python
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver", "ts_library")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver", "ts_library")
ts_library(
name = "app",
diff --git a/WORKSPACE b/WORKSPACE
index 2f8b991..f7cfc7d 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -12,11 +12,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-workspace(name = "build_bazel_rules_typescript")
+workspace(name = "npm_bazel_typescript")
-# Load nested build_bazel_rules_karma repository
+# Load nested npm_bazel_karma repository
local_repository(
- name = "build_bazel_rules_karma",
+ name = "npm_bazel_karma",
path = "internal/karma",
)
@@ -26,7 +26,7 @@
rules_typescript_dev_dependencies()
# Load rules_karma dependencies
-load("@build_bazel_rules_karma//:package.bzl", "rules_karma_dependencies")
+load("@npm_bazel_karma//:package.bzl", "rules_karma_dependencies")
rules_karma_dependencies()
diff --git a/devserver/devserver/devserver_test.go b/devserver/devserver/devserver_test.go
index 0c0ba56..1fa9129 100644
--- a/devserver/devserver/devserver_test.go
+++ b/devserver/devserver/devserver_test.go
@@ -47,9 +47,9 @@
handler := CreateFileHandler("/app.js", "manifest.MF", []string{
// This verifies that we can resolve relatively to the current package. Usually the
// devserver Bazel rule adds the current package here.
- "build_bazel_rules_typescript/devserver/devserver",
+ "npm_bazel_typescript/devserver/devserver",
// Verifies that we can specify subfolders of workspaces
- "build_bazel_rules_typescript/devserver/devserver/test",
+ "npm_bazel_typescript/devserver/devserver/test",
// Verifies that we can specify external workspaces as root dirs.
"devserver_test_workspace",
// Verifies that we can specify subfolders from external workspaces.
diff --git a/docs/BUILD.bazel b/docs/BUILD.bazel
index c8c686b..edd7143 100644
--- a/docs/BUILD.bazel
+++ b/docs/BUILD.bazel
@@ -8,9 +8,9 @@
"//internal:ts_repositories.bzl",
"//internal/devserver:ts_devserver.bzl",
"//internal/protobufjs:ts_proto_library.bzl",
- # TODO(gregmagolan): fix docs for build_bazel_rules_karma
- # "@build_bazel_rules_karma//:karma_web_test.bzl",
- # "@build_bazel_rules_karma//:ts_web_test.bzl",
+ # TODO(gregmagolan): fix docs for npm_bazel_karma
+ # "@npm_bazel_karma//:karma_web_test.bzl",
+ # "@npm_bazel_karma//:ts_web_test.bzl",
],
format = "html",
# The site is served at http://tsetse.info so the URL doesn't include a
diff --git a/examples/bar.ts b/examples/bar.ts
index ab6ce26..d363ae3 100644
--- a/examples/bar.ts
+++ b/examples/bar.ts
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-import {Greeter} from 'build_bazel_rules_typescript/examples/foo';
-import {a} from 'build_bazel_rules_typescript/examples/generated_ts/foo';
+import {Greeter} from 'npm_bazel_typescript/examples/foo';
+import {a} from 'npm_bazel_typescript/examples/generated_ts/foo';
// Repro for #31, should automatically discover @types/node
import * as fs from 'fs';
import {cool} from 'some-lib';
diff --git a/examples/devmode_consumer/devmode_consumer_test.sh b/examples/devmode_consumer/devmode_consumer_test.sh
index 096f4d5..eb51180 100755
--- a/examples/devmode_consumer/devmode_consumer_test.sh
+++ b/examples/devmode_consumer/devmode_consumer_test.sh
@@ -27,9 +27,9 @@
fi
# --- end runfiles.bash initialization ---
-readonly LIBRARY_JS=$(cat $(rlocation "build_bazel_rules_typescript/examples/some_library/library.js"))
-readonly BAR_JS=$(cat $(rlocation "build_bazel_rules_typescript/examples/bar.js"))
-readonly FOO_JS=$(cat $(rlocation "build_bazel_rules_typescript/examples/foo.js"))
+readonly LIBRARY_JS=$(cat $(rlocation "npm_bazel_typescript/examples/some_library/library.js"))
+readonly BAR_JS=$(cat $(rlocation "npm_bazel_typescript/examples/bar.js"))
+readonly FOO_JS=$(cat $(rlocation "npm_bazel_typescript/examples/foo.js"))
# should produce named UMD modules
if [[ "$LIBRARY_JS" != *"define(\"some-lib\""* ]]; then
@@ -39,14 +39,14 @@
fi
# should produce named UMD modules
-if [[ "$BAR_JS" != *"define(\"build_bazel_rules_typescript/examples/bar\""* ]]; then
+if [[ "$BAR_JS" != *"define(\"npm_bazel_typescript/examples/bar\""* ]]; then
echo "Expected bar.js to declare named module, but was"
echo "$BAR_JS"
exit 1
fi
# should give a name to required modules
-if [[ "$BAR_JS" != *"require(\"build_bazel_rules_typescript/examples/foo\")"* ]]; then
+if [[ "$BAR_JS" != *"require(\"npm_bazel_typescript/examples/foo\")"* ]]; then
echo "Expected bar.js to require named module foo, but was"
echo "$BAR_JS"
exit 1
@@ -60,7 +60,7 @@
fi
# should give a name to required generated modules without bazel-bin
-if [[ "$BAR_JS" != *"require(\"build_bazel_rules_typescript/examples/generated_ts/foo\")"* ]]; then
+if [[ "$BAR_JS" != *"require(\"npm_bazel_typescript/examples/generated_ts/foo\")"* ]]; then
echo "Expected bar.js to require generated named module foo, but was"
echo "$BAR_JS"
exit 1
@@ -74,7 +74,7 @@
fi
# should produce named UMD modules
-if [[ "$FOO_JS" != *"define(\"build_bazel_rules_typescript/examples/foo\""* ]]; then
+if [[ "$FOO_JS" != *"define(\"npm_bazel_typescript/examples/foo\""* ]]; then
echo "Expected foo.js to declare named module, but was"
echo "$FOO_JS"
exit 1
diff --git a/examples/devserver/BUILD.bazel b/examples/devserver/BUILD.bazel
index efa1f62..249e728 100644
--- a/examples/devserver/BUILD.bazel
+++ b/examples/devserver/BUILD.bazel
@@ -14,7 +14,7 @@
name = "devserver",
additional_root_paths = [
"npm/node_modules/tslib",
- "build_bazel_rules_typescript/examples/devserver/",
+ "npm_bazel_typescript/examples/devserver/",
],
port = 80,
serving_path = "/bundle.js",
diff --git a/examples/es6_output/es6_output_test.sh b/examples/es6_output/es6_output_test.sh
index 81ba1f1..c6a0102 100755
--- a/examples/es6_output/es6_output_test.sh
+++ b/examples/es6_output/es6_output_test.sh
@@ -27,9 +27,9 @@
fi
# --- end runfiles.bash initialization ---
-readonly FOO_JS=$(cat $(rlocation "build_bazel_rules_typescript/examples/es6_output/es6_output.es6/examples/foo.js"))
-readonly BAR_JS=$(cat $(rlocation "build_bazel_rules_typescript/examples/es6_output/es6_output.es6/examples/bar.js"))
-readonly LIBRARY_JS=$(cat $(rlocation "build_bazel_rules_typescript/examples/es6_output/es6_output.es6/examples/some_library/library.js"))
+readonly FOO_JS=$(cat $(rlocation "npm_bazel_typescript/examples/es6_output/es6_output.es6/examples/foo.js"))
+readonly BAR_JS=$(cat $(rlocation "npm_bazel_typescript/examples/es6_output/es6_output.es6/examples/bar.js"))
+readonly LIBRARY_JS=$(cat $(rlocation "npm_bazel_typescript/examples/es6_output/es6_output.es6/examples/some_library/library.js"))
# should not down-level ES2015 syntax, eg. `class`
if [[ "$FOO_JS" != *"class Greeter"* ]]; then
diff --git a/examples/googmodule/googmodule_output_test.js b/examples/googmodule/googmodule_output_test.js
index b3b4d40..82d9e20 100644
--- a/examples/googmodule/googmodule_output_test.js
+++ b/examples/googmodule/googmodule_output_test.js
@@ -4,13 +4,13 @@
let output;
beforeAll(() => {
output = require.resolve(
- 'build_bazel_rules_typescript/examples/googmodule/a.js');
+ 'npm_bazel_typescript/examples/googmodule/a.js');
});
it('should have goog module syntax in devmode', () => {
expect(fs.readFileSync(output, {encoding: 'utf-8'}))
.toContain(
- `goog.module('build_bazel_rules_typescript.examples.googmodule.a')`);
+ `goog.module('npm_bazel_typescript.examples.googmodule.a')`);
});
it('should have tsickle type annotations', () => {
expect(fs.readFileSync(output, {
diff --git a/examples/protocol_buffers/BUILD.bazel b/examples/protocol_buffers/BUILD.bazel
index 16452de..4594ffe 100644
--- a/examples/protocol_buffers/BUILD.bazel
+++ b/examples/protocol_buffers/BUILD.bazel
@@ -1,7 +1,7 @@
-load("@build_bazel_rules_karma//:defaults.bzl", "ts_web_test_suite")
load("@build_bazel_rules_nodejs//:defs.bzl", "http_server", "rollup_bundle")
load("@io_bazel_rules_go//go:def.bzl", "go_library")
load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@npm_bazel_karma//:defaults.bzl", "ts_web_test_suite")
load(
"//:defs.bzl",
"ts_devserver",
@@ -44,7 +44,7 @@
ts_web_test_suite(
name = "test",
- bootstrap = ["@build_bazel_rules_typescript//:protobufjs_bootstrap_scripts"],
+ bootstrap = ["@npm_bazel_typescript//:protobufjs_bootstrap_scripts"],
browsers = [
"@io_bazel_rules_webtesting//browsers:chromium-local",
"@io_bazel_rules_webtesting//browsers:firefox-local",
@@ -60,8 +60,8 @@
ts_devserver(
name = "devserver",
- bootstrap = ["@build_bazel_rules_typescript//:protobufjs_bootstrap_scripts"],
- entry_module = "build_bazel_rules_typescript/examples/protocol_buffers/app",
+ bootstrap = ["@npm_bazel_typescript//:protobufjs_bootstrap_scripts"],
+ entry_module = "npm_bazel_typescript/examples/protocol_buffers/app",
port = 8080,
deps = [":bundle"],
)
diff --git a/examples/some_module/BUILD.bazel b/examples/some_module/BUILD.bazel
index a6ff1bf..ecd8224 100644
--- a/examples/some_module/BUILD.bazel
+++ b/examples/some_module/BUILD.bazel
@@ -39,7 +39,7 @@
":main",
":some_module",
],
- entry_point = "build_bazel_rules_typescript/examples/some_module/main.js",
+ entry_point = "npm_bazel_typescript/examples/some_module/main.js",
)
sh_test(
diff --git a/examples/some_module/module_load_test.sh b/examples/some_module/module_load_test.sh
index 68cd275..752979a 100755
--- a/examples/some_module/module_load_test.sh
+++ b/examples/some_module/module_load_test.sh
@@ -27,7 +27,7 @@
fi
# --- end runfiles.bash initialization ---
-readonly OUT=$($(rlocation "build_bazel_rules_typescript/examples/some_module/bin"))
+readonly OUT=$($(rlocation "npm_bazel_typescript/examples/some_module/bin"))
if [ "$OUT" != "hello world" ]; then
echo "Expected output 'hello world' but was $OUT"
diff --git a/examples/testing/BUILD.bazel b/examples/testing/BUILD.bazel
index 287a3b9..133ee68 100644
--- a/examples/testing/BUILD.bazel
+++ b/examples/testing/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@build_bazel_rules_karma//:defaults.bzl", "karma_web_test_suite", "ts_web_test_suite")
+load("@npm_bazel_karma//:defaults.bzl", "karma_web_test_suite", "ts_web_test_suite")
load("//internal:defaults.bzl", "ts_library")
ts_library(
diff --git a/examples/testing/static_script.spec.ts b/examples/testing/static_script.spec.ts
index ebc6cbc..6651308 100644
--- a/examples/testing/static_script.spec.ts
+++ b/examples/testing/static_script.spec.ts
@@ -1,6 +1,6 @@
const someGlobal = new Promise<string>((resolve, reject) => {
const script = document.createElement('script');
- script.src = `base/build_bazel_rules_typescript/examples/testing/static_script.js`;
+ script.src = `base/npm_bazel_typescript/examples/testing/static_script.js`;
script.onerror = reject;
script.onload = () => {
document.body.removeChild(script);
diff --git a/internal/BUILD.bazel b/internal/BUILD.bazel
index 6417455..e9baf8e 100644
--- a/internal/BUILD.bazel
+++ b/internal/BUILD.bazel
@@ -85,7 +85,7 @@
"@npm//tsutils",
"@npm//typescript",
],
- entry_point = "build_bazel_rules_typescript/internal/tsc_wrapped/tsc_wrapped.js",
+ entry_point = "npm_bazel_typescript/internal/tsc_wrapped/tsc_wrapped.js",
visibility = ["//visibility:public"],
)
diff --git a/internal/defaults.bzl b/internal/defaults.bzl
index 1823e30..9ef73e2 100644
--- a/internal/defaults.bzl
+++ b/internal/defaults.bzl
@@ -15,14 +15,14 @@
"Defaults for rules_typescript repository not meant to be used downstream"
load(
- "@build_bazel_rules_typescript//:defs.bzl",
+ "@npm_bazel_typescript//:defs.bzl",
_ts_library = "ts_library",
)
# We can't use the defaults for ts_library compiler and ts_web_test_suite karma
# internally because the defaults are .js dependencies on the npm packages that are
# published and internally we are building the things themselves to publish to npm
-INTERNAL_TS_LIBRARY_COMPILER = "@build_bazel_rules_typescript//internal:tsc_wrapped_bin"
+INTERNAL_TS_LIBRARY_COMPILER = "@npm_bazel_typescript//internal:tsc_wrapped_bin"
def ts_library(compiler = INTERNAL_TS_LIBRARY_COMPILER, **kwargs):
_ts_library(compiler = compiler, **kwargs)
diff --git a/internal/e2e/disable_tsetse_for_external/BUILD.bazel b/internal/e2e/disable_tsetse_for_external/BUILD.bazel
index b626aaa..ccdb610 100644
--- a/internal/e2e/disable_tsetse_for_external/BUILD.bazel
+++ b/internal/e2e/disable_tsetse_for_external/BUILD.bazel
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-load("@build_bazel_rules_typescript//internal:defaults.bzl", "ts_library")
+load("@npm_bazel_typescript//internal:defaults.bzl", "ts_library")
package(default_visibility = ["//visibility:public"])
diff --git a/internal/e2e/npm_packages/karma/BUILD.bazel b/internal/e2e/npm_packages/karma/BUILD.bazel
index 85122f3..e401902 100644
--- a/internal/e2e/npm_packages/karma/BUILD.bazel
+++ b/internal/e2e/npm_packages/karma/BUILD.bazel
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-load("@build_bazel_rules_karma//:defs.bzl", "ts_web_test_suite")
+load("@npm_bazel_karma//:defs.bzl", "ts_web_test_suite")
ts_web_test_suite(
name = "testing",
diff --git a/internal/e2e/npm_packages/karma/WORKSPACE b/internal/e2e/npm_packages/karma/WORKSPACE
index 6545390..e86f320 100644
--- a/internal/e2e/npm_packages/karma/WORKSPACE
+++ b/internal/e2e/npm_packages/karma/WORKSPACE
@@ -36,7 +36,7 @@
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()
diff --git a/internal/e2e/npm_packages/karma/yarn.lock b/internal/e2e/npm_packages/karma/yarn.lock
index 00bda13..392dea6 100644
--- a/internal/e2e/npm_packages/karma/yarn.lock
+++ b/internal/e2e/npm_packages/karma/yarn.lock
@@ -2,7 +2,7 @@
# yarn lockfile v1
-"@bazel/karma@file:../../../../../../../../../private/var/tmp/_bazel_greg/8018d2bc8e133e0b44c274b6423215ba/execroot/build_bazel_rules_karma/bazel-out/darwin-fastbuild/bin/npm_package":
+"@bazel/karma@file:../../../../../../../../../private/var/tmp/_bazel_greg/8018d2bc8e133e0b44c274b6423215ba/execroot/npm_bazel_karma/bazel-out/darwin-fastbuild/bin/npm_package":
version "0.0.0"
dependencies:
jasmine-core "2.8.0"
diff --git a/internal/e2e/npm_packages/karma_stack_trace/BUILD.bazel b/internal/e2e/npm_packages/karma_stack_trace/BUILD.bazel
index 6a0ed24..63535a4 100644
--- a/internal/e2e/npm_packages/karma_stack_trace/BUILD.bazel
+++ b/internal/e2e/npm_packages/karma_stack_trace/BUILD.bazel
@@ -12,8 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-load("@build_bazel_rules_karma//:defs.bzl", "ts_web_test_suite")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_karma//:defs.bzl", "ts_web_test_suite")
+load("@npm_bazel_typescript//:defs.bzl", "ts_library")
package(default_visibility = ["//visibility:public"])
diff --git a/internal/e2e/npm_packages/karma_stack_trace/WORKSPACE b/internal/e2e/npm_packages/karma_stack_trace/WORKSPACE
index 20b5d21..2a3dcc9 100644
--- a/internal/e2e/npm_packages/karma_stack_trace/WORKSPACE
+++ b/internal/e2e/npm_packages/karma_stack_trace/WORKSPACE
@@ -36,7 +36,7 @@
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()
@@ -49,6 +49,6 @@
firefox = True,
)
-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/internal/e2e/npm_packages/karma_stack_trace/test_folder/BUILD.bazel b/internal/e2e/npm_packages/karma_stack_trace/test_folder/BUILD.bazel
index 6ffe7a7..100ddf2 100644
--- a/internal/e2e/npm_packages/karma_stack_trace/test_folder/BUILD.bazel
+++ b/internal/e2e/npm_packages/karma_stack_trace/test_folder/BUILD.bazel
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:defs.bzl", "ts_library")
package(default_visibility = ["//visibility:public"])
diff --git a/internal/e2e/npm_packages/karma_stack_trace/yarn.lock b/internal/e2e/npm_packages/karma_stack_trace/yarn.lock
index 7436e47..c6588b2 100644
--- a/internal/e2e/npm_packages/karma_stack_trace/yarn.lock
+++ b/internal/e2e/npm_packages/karma_stack_trace/yarn.lock
@@ -2,7 +2,7 @@
# yarn lockfile v1
-"@bazel/karma@file:../../../../../../../../../private/var/tmp/_bazel_greg/8018d2bc8e133e0b44c274b6423215ba/execroot/build_bazel_rules_karma/bazel-out/darwin-fastbuild/bin/npm_package":
+"@bazel/karma@file:../../../../../../../../../private/var/tmp/_bazel_greg/8018d2bc8e133e0b44c274b6423215ba/execroot/npm_bazel_karma/bazel-out/darwin-fastbuild/bin/npm_package":
version "0.0.0"
dependencies:
jasmine-core "2.8.0"
@@ -17,7 +17,7 @@
semver "5.6.0"
tmp "0.0.33"
-"@bazel/typescript@file:../../../../../../../../../private/var/tmp/_bazel_greg/837d12dda6835e241d9d3083438c6bb6/execroot/build_bazel_rules_typescript/bazel-out/darwin-fastbuild/bin/npm_package":
+"@bazel/typescript@file:../../../../../../../../../private/var/tmp/_bazel_greg/837d12dda6835e241d9d3083438c6bb6/execroot/npm_bazel_typescript/bazel-out/darwin-fastbuild/bin/npm_package":
version "0.22.1-41-gc1f5737"
dependencies:
jasmine-core "2.8.0"
diff --git a/internal/e2e/npm_packages/karma_typescript/BUILD.bazel b/internal/e2e/npm_packages/karma_typescript/BUILD.bazel
index c42feee..e2311f1 100644
--- a/internal/e2e/npm_packages/karma_typescript/BUILD.bazel
+++ b/internal/e2e/npm_packages/karma_typescript/BUILD.bazel
@@ -12,8 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-load("@build_bazel_rules_karma//:defs.bzl", "ts_web_test_suite")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_karma//:defs.bzl", "ts_web_test_suite")
+load("@npm_bazel_typescript//:defs.bzl", "ts_library")
ts_library(
name = "lib",
diff --git a/internal/e2e/npm_packages/karma_typescript/WORKSPACE b/internal/e2e/npm_packages/karma_typescript/WORKSPACE
index 07b7100..cdf3cac 100644
--- a/internal/e2e/npm_packages/karma_typescript/WORKSPACE
+++ b/internal/e2e/npm_packages/karma_typescript/WORKSPACE
@@ -36,7 +36,7 @@
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()
@@ -49,6 +49,6 @@
firefox = True,
)
-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/internal/e2e/npm_packages/karma_typescript/yarn.lock b/internal/e2e/npm_packages/karma_typescript/yarn.lock
index d6c3344..e72c0ff 100644
--- a/internal/e2e/npm_packages/karma_typescript/yarn.lock
+++ b/internal/e2e/npm_packages/karma_typescript/yarn.lock
@@ -2,7 +2,7 @@
# yarn lockfile v1
-"@bazel/karma@file:../../../../../../../../../private/var/tmp/_bazel_greg/8018d2bc8e133e0b44c274b6423215ba/execroot/build_bazel_rules_karma/bazel-out/darwin-fastbuild/bin/npm_package":
+"@bazel/karma@file:../../../../../../../../../private/var/tmp/_bazel_greg/8018d2bc8e133e0b44c274b6423215ba/execroot/npm_bazel_karma/bazel-out/darwin-fastbuild/bin/npm_package":
version "0.0.0"
dependencies:
jasmine-core "2.8.0"
@@ -17,7 +17,7 @@
semver "5.6.0"
tmp "0.0.33"
-"@bazel/typescript@file:../../../../../../../../../private/var/tmp/_bazel_greg/837d12dda6835e241d9d3083438c6bb6/execroot/build_bazel_rules_typescript/bazel-out/darwin-fastbuild/bin/npm_package":
+"@bazel/typescript@file:../../../../../../../../../private/var/tmp/_bazel_greg/837d12dda6835e241d9d3083438c6bb6/execroot/npm_bazel_typescript/bazel-out/darwin-fastbuild/bin/npm_package":
version "0.22.1-41-gc1f5737"
dependencies:
jasmine-core "2.8.0"
diff --git a/internal/e2e/npm_packages/ts_auto_deps/WORKSPACE b/internal/e2e/npm_packages/ts_auto_deps/WORKSPACE
index be2a4db..3dddfc8 100644
--- a/internal/e2e/npm_packages/ts_auto_deps/WORKSPACE
+++ b/internal/e2e/npm_packages/ts_auto_deps/WORKSPACE
@@ -36,6 +36,6 @@
install_bazel_dependencies()
-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/internal/e2e/npm_packages/ts_auto_deps/yarn.lock b/internal/e2e/npm_packages/ts_auto_deps/yarn.lock
index cff6e8d..6a6c9f2 100644
--- a/internal/e2e/npm_packages/ts_auto_deps/yarn.lock
+++ b/internal/e2e/npm_packages/ts_auto_deps/yarn.lock
@@ -2,7 +2,7 @@
# yarn lockfile v1
-"@bazel/typescript@file:../../../../../../../../../private/var/tmp/_bazel_greg/837d12dda6835e241d9d3083438c6bb6/execroot/build_bazel_rules_typescript/bazel-out/darwin-fastbuild/bin/npm_package":
+"@bazel/typescript@file:../../../../../../../../../private/var/tmp/_bazel_greg/837d12dda6835e241d9d3083438c6bb6/execroot/npm_bazel_typescript/bazel-out/darwin-fastbuild/bin/npm_package":
version "0.22.1-41-gc1f5737"
dependencies:
jasmine-core "2.8.0"
diff --git a/internal/e2e/npm_packages/ts_devserver/BUILD.bazel b/internal/e2e/npm_packages/ts_devserver/BUILD.bazel
index 0b4ec01..dd6eeef 100644
--- a/internal/e2e/npm_packages/ts_devserver/BUILD.bazel
+++ b/internal/e2e/npm_packages/ts_devserver/BUILD.bazel
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver", "ts_library")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver", "ts_library")
ts_library(
name = "app",
diff --git a/internal/e2e/npm_packages/ts_devserver/WORKSPACE b/internal/e2e/npm_packages/ts_devserver/WORKSPACE
index 703cac1..95df734 100644
--- a/internal/e2e/npm_packages/ts_devserver/WORKSPACE
+++ b/internal/e2e/npm_packages/ts_devserver/WORKSPACE
@@ -36,6 +36,6 @@
install_bazel_dependencies()
-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/internal/e2e/npm_packages/ts_devserver/yarn.lock b/internal/e2e/npm_packages/ts_devserver/yarn.lock
index 0f87dee..6404337 100644
--- a/internal/e2e/npm_packages/ts_devserver/yarn.lock
+++ b/internal/e2e/npm_packages/ts_devserver/yarn.lock
@@ -2,7 +2,7 @@
# yarn lockfile v1
-"@bazel/typescript@file:../../../../../../../../../private/var/tmp/_bazel_greg/837d12dda6835e241d9d3083438c6bb6/execroot/build_bazel_rules_typescript/bazel-out/darwin-fastbuild/bin/npm_package":
+"@bazel/typescript@file:../../../../../../../../../private/var/tmp/_bazel_greg/837d12dda6835e241d9d3083438c6bb6/execroot/npm_bazel_typescript/bazel-out/darwin-fastbuild/bin/npm_package":
version "0.22.1-41-gc1f5737"
dependencies:
jasmine-core "2.8.0"
diff --git a/internal/e2e/npm_packages/typescript_2.7/BUILD.bazel b/internal/e2e/npm_packages/typescript_2.7/BUILD.bazel
index e7cccf4..0f08b30 100644
--- a/internal/e2e/npm_packages/typescript_2.7/BUILD.bazel
+++ b/internal/e2e/npm_packages/typescript_2.7/BUILD.bazel
@@ -13,7 +13,7 @@
# limitations under the License.
load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:defs.bzl", "ts_library")
ts_library(
name = "main",
@@ -36,7 +36,7 @@
name = "test",
data = [
# Verify that worker_protocol.proto can be referenced as a target in the generated npm bazel workspace
- "@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",
],
deps = [
":test_lib",
diff --git a/internal/e2e/npm_packages/typescript_2.7/WORKSPACE b/internal/e2e/npm_packages/typescript_2.7/WORKSPACE
index 7cdc694..edbf762 100644
--- a/internal/e2e/npm_packages/typescript_2.7/WORKSPACE
+++ b/internal/e2e/npm_packages/typescript_2.7/WORKSPACE
@@ -36,6 +36,6 @@
install_bazel_dependencies()
-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/internal/e2e/npm_packages/typescript_2.7/yarn.lock b/internal/e2e/npm_packages/typescript_2.7/yarn.lock
index 00b356b..3ccf2bf 100644
--- a/internal/e2e/npm_packages/typescript_2.7/yarn.lock
+++ b/internal/e2e/npm_packages/typescript_2.7/yarn.lock
@@ -2,7 +2,7 @@
# yarn lockfile v1
-"@bazel/typescript@file:../../../../../../../../../private/var/tmp/_bazel_greg/837d12dda6835e241d9d3083438c6bb6/execroot/build_bazel_rules_typescript/bazel-out/darwin-fastbuild/bin/npm_package":
+"@bazel/typescript@file:../../../../../../../../../private/var/tmp/_bazel_greg/837d12dda6835e241d9d3083438c6bb6/execroot/npm_bazel_typescript/bazel-out/darwin-fastbuild/bin/npm_package":
version "0.22.1-41-gc1f5737"
dependencies:
jasmine-core "2.8.0"
diff --git a/internal/e2e/npm_packages/typescript_2.8/BUILD.bazel b/internal/e2e/npm_packages/typescript_2.8/BUILD.bazel
index e7cccf4..0f08b30 100644
--- a/internal/e2e/npm_packages/typescript_2.8/BUILD.bazel
+++ b/internal/e2e/npm_packages/typescript_2.8/BUILD.bazel
@@ -13,7 +13,7 @@
# limitations under the License.
load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:defs.bzl", "ts_library")
ts_library(
name = "main",
@@ -36,7 +36,7 @@
name = "test",
data = [
# Verify that worker_protocol.proto can be referenced as a target in the generated npm bazel workspace
- "@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",
],
deps = [
":test_lib",
diff --git a/internal/e2e/npm_packages/typescript_2.8/WORKSPACE b/internal/e2e/npm_packages/typescript_2.8/WORKSPACE
index ca44e45..55c47cc 100644
--- a/internal/e2e/npm_packages/typescript_2.8/WORKSPACE
+++ b/internal/e2e/npm_packages/typescript_2.8/WORKSPACE
@@ -36,6 +36,6 @@
install_bazel_dependencies()
-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/internal/e2e/npm_packages/typescript_2.8/yarn.lock b/internal/e2e/npm_packages/typescript_2.8/yarn.lock
index 0f79fc4..b5348dc 100644
--- a/internal/e2e/npm_packages/typescript_2.8/yarn.lock
+++ b/internal/e2e/npm_packages/typescript_2.8/yarn.lock
@@ -2,7 +2,7 @@
# yarn lockfile v1
-"@bazel/typescript@file:../../../../../../../../../private/var/tmp/_bazel_greg/837d12dda6835e241d9d3083438c6bb6/execroot/build_bazel_rules_typescript/bazel-out/darwin-fastbuild/bin/npm_package":
+"@bazel/typescript@file:../../../../../../../../../private/var/tmp/_bazel_greg/837d12dda6835e241d9d3083438c6bb6/execroot/npm_bazel_typescript/bazel-out/darwin-fastbuild/bin/npm_package":
version "0.22.1-41-gc1f5737"
dependencies:
jasmine-core "2.8.0"
diff --git a/internal/e2e/npm_packages/typescript_2.9/BUILD.bazel b/internal/e2e/npm_packages/typescript_2.9/BUILD.bazel
index e7cccf4..0f08b30 100644
--- a/internal/e2e/npm_packages/typescript_2.9/BUILD.bazel
+++ b/internal/e2e/npm_packages/typescript_2.9/BUILD.bazel
@@ -13,7 +13,7 @@
# limitations under the License.
load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:defs.bzl", "ts_library")
ts_library(
name = "main",
@@ -36,7 +36,7 @@
name = "test",
data = [
# Verify that worker_protocol.proto can be referenced as a target in the generated npm bazel workspace
- "@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",
],
deps = [
":test_lib",
diff --git a/internal/e2e/npm_packages/typescript_2.9/WORKSPACE b/internal/e2e/npm_packages/typescript_2.9/WORKSPACE
index 5631a12..a01a0f0 100644
--- a/internal/e2e/npm_packages/typescript_2.9/WORKSPACE
+++ b/internal/e2e/npm_packages/typescript_2.9/WORKSPACE
@@ -36,6 +36,6 @@
install_bazel_dependencies()
-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/internal/e2e/npm_packages/typescript_2.9/yarn.lock b/internal/e2e/npm_packages/typescript_2.9/yarn.lock
index 36885d1..8ac413b 100644
--- a/internal/e2e/npm_packages/typescript_2.9/yarn.lock
+++ b/internal/e2e/npm_packages/typescript_2.9/yarn.lock
@@ -2,7 +2,7 @@
# yarn lockfile v1
-"@bazel/typescript@file:../../../../../../../../../private/var/tmp/_bazel_greg/837d12dda6835e241d9d3083438c6bb6/execroot/build_bazel_rules_typescript/bazel-out/darwin-fastbuild/bin/npm_package":
+"@bazel/typescript@file:../../../../../../../../../private/var/tmp/_bazel_greg/837d12dda6835e241d9d3083438c6bb6/execroot/npm_bazel_typescript/bazel-out/darwin-fastbuild/bin/npm_package":
version "0.22.1-41-gc1f5737"
dependencies:
jasmine-core "2.8.0"
diff --git a/internal/e2e/npm_packages/typescript_3.0/BUILD.bazel b/internal/e2e/npm_packages/typescript_3.0/BUILD.bazel
index e7cccf4..0f08b30 100644
--- a/internal/e2e/npm_packages/typescript_3.0/BUILD.bazel
+++ b/internal/e2e/npm_packages/typescript_3.0/BUILD.bazel
@@ -13,7 +13,7 @@
# limitations under the License.
load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:defs.bzl", "ts_library")
ts_library(
name = "main",
@@ -36,7 +36,7 @@
name = "test",
data = [
# Verify that worker_protocol.proto can be referenced as a target in the generated npm bazel workspace
- "@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",
],
deps = [
":test_lib",
diff --git a/internal/e2e/npm_packages/typescript_3.0/WORKSPACE b/internal/e2e/npm_packages/typescript_3.0/WORKSPACE
index 6a741b6..55c7081 100644
--- a/internal/e2e/npm_packages/typescript_3.0/WORKSPACE
+++ b/internal/e2e/npm_packages/typescript_3.0/WORKSPACE
@@ -36,6 +36,6 @@
install_bazel_dependencies()
-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/internal/e2e/npm_packages/typescript_3.0/yarn.lock b/internal/e2e/npm_packages/typescript_3.0/yarn.lock
index 88ed70c..887715e 100644
--- a/internal/e2e/npm_packages/typescript_3.0/yarn.lock
+++ b/internal/e2e/npm_packages/typescript_3.0/yarn.lock
@@ -2,7 +2,7 @@
# yarn lockfile v1
-"@bazel/typescript@file:../../../../../../../../../private/var/tmp/_bazel_greg/837d12dda6835e241d9d3083438c6bb6/execroot/build_bazel_rules_typescript/bazel-out/darwin-fastbuild/bin/npm_package":
+"@bazel/typescript@file:../../../../../../../../../private/var/tmp/_bazel_greg/837d12dda6835e241d9d3083438c6bb6/execroot/npm_bazel_typescript/bazel-out/darwin-fastbuild/bin/npm_package":
version "0.22.1-41-gc1f5737"
dependencies:
jasmine-core "2.8.0"
diff --git a/internal/e2e/npm_packages/typescript_3.1/BUILD.bazel b/internal/e2e/npm_packages/typescript_3.1/BUILD.bazel
index e7cccf4..0f08b30 100644
--- a/internal/e2e/npm_packages/typescript_3.1/BUILD.bazel
+++ b/internal/e2e/npm_packages/typescript_3.1/BUILD.bazel
@@ -13,7 +13,7 @@
# limitations under the License.
load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:defs.bzl", "ts_library")
ts_library(
name = "main",
@@ -36,7 +36,7 @@
name = "test",
data = [
# Verify that worker_protocol.proto can be referenced as a target in the generated npm bazel workspace
- "@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",
],
deps = [
":test_lib",
diff --git a/internal/e2e/npm_packages/typescript_3.1/WORKSPACE b/internal/e2e/npm_packages/typescript_3.1/WORKSPACE
index 6a741b6..55c7081 100644
--- a/internal/e2e/npm_packages/typescript_3.1/WORKSPACE
+++ b/internal/e2e/npm_packages/typescript_3.1/WORKSPACE
@@ -36,6 +36,6 @@
install_bazel_dependencies()
-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/internal/e2e/npm_packages/typescript_3.1/yarn.lock b/internal/e2e/npm_packages/typescript_3.1/yarn.lock
index 2b15616..be3dbed 100644
--- a/internal/e2e/npm_packages/typescript_3.1/yarn.lock
+++ b/internal/e2e/npm_packages/typescript_3.1/yarn.lock
@@ -2,7 +2,7 @@
# yarn lockfile v1
-"@bazel/typescript@file:../../../../../../../../../private/var/tmp/_bazel_greg/837d12dda6835e241d9d3083438c6bb6/execroot/build_bazel_rules_typescript/bazel-out/darwin-fastbuild/bin/npm_package":
+"@bazel/typescript@file:../../../../../../../../../private/var/tmp/_bazel_greg/837d12dda6835e241d9d3083438c6bb6/execroot/npm_bazel_typescript/bazel-out/darwin-fastbuild/bin/npm_package":
version "0.22.1-41-gc1f5737"
dependencies:
jasmine-core "2.8.0"
diff --git a/internal/e2e/typescript_3.1/BUILD.bazel b/internal/e2e/typescript_3.1/BUILD.bazel
index 042f546..693fc5f 100644
--- a/internal/e2e/typescript_3.1/BUILD.bazel
+++ b/internal/e2e/typescript_3.1/BUILD.bazel
@@ -13,19 +13,19 @@
# limitations under the License.
load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:defs.bzl", "ts_library")
ts_library(
name = "main",
srcs = ["main.ts"],
- compiler = "@build_bazel_rules_typescript//internal:tsc_wrapped_bin",
+ compiler = "@npm_bazel_typescript//internal:tsc_wrapped_bin",
)
ts_library(
name = "test_lib",
testonly = True,
srcs = glob(["*.spec.ts"]),
- compiler = "@build_bazel_rules_typescript//internal:tsc_wrapped_bin",
+ compiler = "@npm_bazel_typescript//internal:tsc_wrapped_bin",
deps = [
":main",
"@npm//@types/jasmine",
diff --git a/internal/e2e/typescript_3.1/WORKSPACE b/internal/e2e/typescript_3.1/WORKSPACE
index ab0e7c3..d53e1b5 100644
--- a/internal/e2e/typescript_3.1/WORKSPACE
+++ b/internal/e2e/typescript_3.1/WORKSPACE
@@ -15,11 +15,11 @@
workspace(name = "typescript_31")
local_repository(
- name = "build_bazel_rules_typescript",
+ name = "npm_bazel_typescript",
path = "../../..",
)
-load("@build_bazel_rules_typescript//:package.bzl", "rules_typescript_dev_dependencies")
+load("@npm_bazel_typescript//:package.bzl", "rules_typescript_dev_dependencies")
rules_typescript_dev_dependencies()
@@ -33,6 +33,6 @@
yarn_lock = "//:yarn.lock",
)
-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/internal/karma/BUILD.bazel b/internal/karma/BUILD.bazel
index 7fcc0b8..2c1cfc3 100644
--- a/internal/karma/BUILD.bazel
+++ b/internal/karma/BUILD.bazel
@@ -16,8 +16,8 @@
# Parts of this BUILD file only necessary when building within the bazelbuild/rules_typescript repo.
# The generated `@bazel/karma` npm package contains a trimmed BUILD file using # DEV-ONLY fences.
load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary", "npm_package")
-load("@build_bazel_rules_typescript//:version.bzl", "COMPAT_VERSION")
-load("@build_bazel_rules_typescript//internal:defaults.bzl", "ts_library")
+load("@npm_bazel_typescript//:version.bzl", "COMPAT_VERSION")
+load("@npm_bazel_typescript//internal:defaults.bzl", "ts_library")
package(default_visibility = ["//visibility:public"])
@@ -60,7 +60,7 @@
genrule(
name = "license_copy",
- srcs = ["@build_bazel_rules_typescript//:LICENSE"],
+ srcs = ["@npm_bazel_typescript//:LICENSE"],
outs = ["LICENSE"],
cmd = "cp $< $@",
)
diff --git a/internal/karma/WORKSPACE b/internal/karma/WORKSPACE
index 3e166d8..a2a3401 100644
--- a/internal/karma/WORKSPACE
+++ b/internal/karma/WORKSPACE
@@ -12,16 +12,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-workspace(name = "build_bazel_rules_karma")
+workspace(name = "npm_bazel_karma")
-# Load nested build_bazel_rules_typescript repository
+# Load nested npm_bazel_typescript repository
local_repository(
- name = "build_bazel_rules_typescript",
+ name = "npm_bazel_typescript",
path = "../..",
)
# Load our dependencies
-load("@build_bazel_rules_typescript//:package.bzl", "rules_typescript_dev_dependencies")
+load("@npm_bazel_typescript//:package.bzl", "rules_typescript_dev_dependencies")
rules_typescript_dev_dependencies()
@@ -49,6 +49,6 @@
gazelle_dependencies()
# Setup typescript toolchain
-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/internal/karma/defaults.bzl b/internal/karma/defaults.bzl
index 7e891dd..954a991 100644
--- a/internal/karma/defaults.bzl
+++ b/internal/karma/defaults.bzl
@@ -15,14 +15,14 @@
"Defaults for rules_karma repository not meant to be used downstream"
load(
- "@build_bazel_rules_karma//:defs.bzl",
+ "@npm_bazel_karma//:defs.bzl",
_karma_web_test = "karma_web_test",
_karma_web_test_suite = "karma_web_test_suite",
_ts_web_test = "ts_web_test",
_ts_web_test_suite = "ts_web_test_suite",
)
-INTERNAL_KARMA_BIN = "@build_bazel_rules_karma//:karma_bin"
+INTERNAL_KARMA_BIN = "@npm_bazel_karma//:karma_bin"
def karma_web_test(karma = INTERNAL_KARMA_BIN, **kwargs):
_karma_web_test(karma = karma, **kwargs)
diff --git a/internal/karma/karma_web_test.bzl b/internal/karma/karma_web_test.bzl
index b1bab2d..2002fd2 100644
--- a/internal/karma/karma_web_test.bzl
+++ b/internal/karma/karma_web_test.bzl
@@ -43,7 +43,7 @@
doc = """Arbitrary files which are available to be served on request.
Files are served at:
`/base/<WORKSPACE_NAME>/<path-to-file>`, e.g.
- `/base/build_bazel_rules_typescript/examples/testing/static_script.js`""",
+ `/base/npm_bazel_typescript/examples/testing/static_script.js`""",
allow_files = True,
),
"runtime_deps": attr.label_list(
@@ -332,7 +332,7 @@
static_files: Arbitrary files which are available to be served on request.
Files are served at:
`/base/<WORKSPACE_NAME>/<path-to-file>`, e.g.
- `/base/build_bazel_rules_typescript/examples/testing/static_script.js`
+ `/base/npm_bazel_typescript/examples/testing/static_script.js`
config_file: User supplied Karma configuration file. Bazel will override
certain attributes of this configuration file. Attributes that are
overridden will be outputted to the test log.
diff --git a/internal/karma/package.bzl b/internal/karma/package.bzl
index 1d0832c..ed31fee 100644
--- a/internal/karma/package.bzl
+++ b/internal/karma/package.bzl
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-"""Package file which defines build_bazel_rules_karma dependencies
+"""Package file which defines npm_bazel_karma dependencies
"""
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
diff --git a/internal/karma/package.json b/internal/karma/package.json
index 9f04bff..5f71978 100644
--- a/internal/karma/package.json
+++ b/internal/karma/package.json
@@ -38,7 +38,7 @@
"jasmine-core": "2.8.0"
},
"bazelWorkspaces": {
- "build_bazel_rules_karma": {
+ "npm_bazel_karma": {
"version": "0.0.0-PLACEHOLDER",
"compatVersion": "0.0.0-COMPAT_VERSION",
"rootPath": "."
diff --git a/internal/karma/ts_web_test.bzl b/internal/karma/ts_web_test.bzl
index 9189076..ab5329b 100644
--- a/internal/karma/ts_web_test.bzl
+++ b/internal/karma/ts_web_test.bzl
@@ -86,7 +86,7 @@
static_files: Arbitrary files which are available to be served on request.
Files are served at:
`/base/<WORKSPACE_NAME>/<path-to-file>`, e.g.
- `/base/build_bazel_rules_typescript/examples/testing/static_script.js`
+ `/base/npm_bazel_typescript/examples/testing/static_script.js`
tags: Standard Bazel tags, this macro adds tags for ibazel support as well as
`browser:chromium-system` to allow for filtering on systems with no
system Chrome.
diff --git a/internal/protobufjs/ts_proto_library.bzl b/internal/protobufjs/ts_proto_library.bzl
index 7c6e58e..807dea0 100644
--- a/internal/protobufjs/ts_proto_library.bzl
+++ b/internal/protobufjs/ts_proto_library.bzl
@@ -144,7 +144,7 @@
Example:
```
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library", "ts_proto_library")
+load("@npm_bazel_typescript//:defs.bzl", "ts_library", "ts_proto_library")
proto_library(
name = "car_proto",
@@ -172,18 +172,18 @@
The JavaScript produced by protobuf.js has a runtime dependency on a support library.
Under devmode (e.g. `ts_devserver`, `ts_web_test_suite`) you'll need to include these scripts
in the `bootstrap` phase (before Require.js loads). You can use the label
-`@build_bazel_rules_typescript//:protobufjs_bootstrap_scripts` to reference these scripts
+`@npm_bazel_typescript//:protobufjs_bootstrap_scripts` to reference these scripts
in the `bootstrap` attribute of `ts_web_test_suite` or `ts_devserver`.
To complete the example above, you could write a `ts_web_test_suite`:
```
-load("@build_bazel_rules_karma//:defs.bzl", "ts_web_test_suite")
+load("@npm_bazel_karma//:defs.bzl", "ts_web_test_suite")
ts_web_test_suite(
name = "test",
deps = ["test_lib"],
- bootstrap = ["@build_bazel_rules_typescript//:protobufjs_bootstrap_scripts"],
+ bootstrap = ["@npm_bazel_typescript//:protobufjs_bootstrap_scripts"],
browsers = [
"@io_bazel_rules_webtesting//browsers:chromium-local",
"@io_bazel_rules_webtesting//browsers:firefox-local",
diff --git a/internal/ts_repositories.bzl b/internal/ts_repositories.bzl
index 2a90a70..16c3e40 100644
--- a/internal/ts_repositories.bzl
+++ b/internal/ts_repositories.bzl
@@ -40,20 +40,20 @@
# @build_bazel_rules_typescript_tsc_wrapped_deps is not used locally.
yarn_install(
name = "build_bazel_rules_typescript_tsc_wrapped_deps",
- package_json = "@build_bazel_rules_typescript//internal:tsc_wrapped/package.json",
- yarn_lock = "@build_bazel_rules_typescript//internal:tsc_wrapped/yarn.lock",
+ package_json = "@npm_bazel_typescript//internal:tsc_wrapped/package.json",
+ yarn_lock = "@npm_bazel_typescript//internal:tsc_wrapped/yarn.lock",
)
yarn_install(
name = "build_bazel_rules_typescript_devserver_deps",
- package_json = "@build_bazel_rules_typescript//internal/devserver:package.json",
- yarn_lock = "@build_bazel_rules_typescript//internal/devserver:yarn.lock",
+ package_json = "@npm_bazel_typescript//internal/devserver:package.json",
+ yarn_lock = "@npm_bazel_typescript//internal/devserver:yarn.lock",
)
yarn_install(
name = "build_bazel_rules_typescript_protobufs_compiletime_deps",
- package_json = "@build_bazel_rules_typescript//internal/protobufjs:package.json",
- yarn_lock = "@build_bazel_rules_typescript//internal/protobufjs:yarn.lock",
+ package_json = "@npm_bazel_typescript//internal/protobufjs:package.json",
+ yarn_lock = "@npm_bazel_typescript//internal/protobufjs:yarn.lock",
)
# BEGIN-DEV-ONLY
diff --git a/package.bzl b/package.bzl
index be88028..900d106 100644
--- a/package.bzl
+++ b/package.bzl
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-"""Package file which defines build_bazel_rules_typescript dependencies
+"""Package file which defines npm_bazel_typescript dependencies
"""
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
@@ -22,7 +22,7 @@
rules_typescript_dependencies is no longer needed, and will be removed in a future release.
We assume you will fetch rules_nodejs in your WORKSPACE file, and no other dependencies remain here.
Simply remove any calls to this function and the corresponding call to
- load("@build_bazel_rules_typescript//:package.bzl", "rules_typescript_dependencies")
+ load("@npm_bazel_typescript//:package.bzl", "rules_typescript_dependencies")
""")
def rules_typescript_dev_dependencies():
@@ -83,7 +83,7 @@
# io_bazel_rules_webtesting depends on bazel_skylib. It is installed by
# web_test_repositories() but we depend on it here in case users don't call
# web_test_repositories(). This will get cleaned up by https://github.com/bazelbuild/rules_typescript/pull/374
- # which introduces build_bazel_rules_karma with its own defs.bzl file
+ # which introduces npm_bazel_karma with its own defs.bzl file
# that will allow this dep to be removed from rules_typescript_dependencies()
_maybe(
http_archive,
diff --git a/package.json b/package.json
index 8b9df61..ba5d33d 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
"which": "~1.0.5"
},
"bazelWorkspaces": {
- "build_bazel_rules_typescript": {
+ "npm_bazel_typescript": {
"version": "0.0.0-PLACEHOLDER",
"compatVersion": "0.0.0-COMPAT_VERSION",
"rootPath": "."
diff --git a/ts_auto_deps/updater/updater.go b/ts_auto_deps/updater/updater.go
index f4f9a5e..44e6492 100644
--- a/ts_auto_deps/updater/updater.go
+++ b/ts_auto_deps/updater/updater.go
@@ -867,7 +867,7 @@
}
const (
- tsSkylarkLabel = "@build_bazel_rules_typescript//:defs.bzl"
+ tsSkylarkLabel = "@npm_bazel_typescript//:defs.bzl"
ngSkylarkLabel = "@angular//:index.bzl"
)
diff --git a/version.bzl b/version.bzl
index 1f97561..42b13de 100644
--- a/version.bzl
+++ b/version.bzl
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-"""Package file which defines build_bazel_rules_typescript version in skylark
+"""Package file which defines npm_bazel_typescript version in skylark
"""
load("@build_bazel_rules_nodejs//internal/common:check_version.bzl", "check_version")
@@ -26,9 +26,9 @@
def check_rules_typescript_version(version_string):
"""
- Verify that a compatible build_bazel_rules_typescript is loaded a WORKSPACE.
+ Verify that a compatible npm_bazel_typescript is loaded a WORKSPACE.
- Where COMPAT_VERSION and VERSION come from the build_bazel_rules_typescript that
+ Where COMPAT_VERSION and VERSION come from the npm_bazel_typescript that
is loaded in a WORKSPACE, this function will check:
VERSION >= version_string >= COMPAT_VERSION
@@ -38,18 +38,18 @@
```
# in WORKSPACE:
- load("@build_bazel_rules_typescript//:defs.bzl", "check_rules_typescript_version")
+ load("@npm_bazel_typescript//:defs.bzl", "check_rules_typescript_version")
check_rules_typescript_version(version_string = "0.22.0")
```
Args:
version_string: A version string to check for compatibility with the loaded version
- of build_bazel_rules_typescript. The version check performed is
+ of npm_bazel_typescript. The version check performed is
`VERSION >= version_string >= COMPAT_VERSION` where VERSION and COMPAT_VERSION
- come from the loaded version of build_bazel_rules_typescript.
+ come from the loaded version of npm_bazel_typescript.
"""
if not check_version(VERSION, version_string) or not check_version(version_string, COMPAT_VERSION):
- fail("\nLoaded build_bazel_rules_typescript version {} with mimimum compat version of {} is not compatible with checked version {}!\n\n".format(
+ fail("\nLoaded npm_bazel_typescript version {} with mimimum compat version of {} is not compatible with checked version {}!\n\n".format(
VERSION,
COMPAT_VERSION,
version_string,
