Google Git Google Git
Sign in
pigweed/third_party/github/bazel-contrib/rules_nodejs/refs/heads/upstream/ts_starlark_module^!/.
commit
6269f0ecda7b03f671d5dad9341e67f58fa8bbf8
[log]
author
Alex Eagle <alex@aspect.dev>
Sun Jan 09 17:01:23 2022 -0800
committer
Alex Eagle <alex@aspect.dev>
Sun Jan 09 17:01:23 2022 -0800
tree
173b846b6268eb90e38e064d199bf2e465694e3b
parent
c17c472e80ff5ecf5826a486e78678e515c84f2f [diff] 
chore: fix tests after typescript rules moved

diff --git a/examples/from_source/index.bzl b/examples/from_source/index.bzl
index de2ae24..535dfd8 100644
--- a/examples/from_source/index.bzl
+++ b/examples/from_source/index.bzl

@@ -1,6 +1,6 @@
 """Example package for generating stardoc from rules_nodejs at source"""
 
-load("@build_bazel_rules_nodejs//packages/typescript:index.bzl", "ts_project")
+load("@build_bazel_rules_nodejs//ts:ts_project.bzl", "ts_project")
 
 def custom_ts_project(name, deps = [], **kwargs):
     """

diff --git a/internal/coverage/BUILD.bazel b/internal/coverage/BUILD.bazel
index 9da8434..1e03c06 100644
--- a/internal/coverage/BUILD.bazel
+++ b/internal/coverage/BUILD.bazel

@@ -1,7 +1,7 @@
 load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary")
 
 # BEGIN-INTERNAL
-load("//packages/typescript:checked_in_ts_project.bzl", "checked_in_ts_project")
+load("//ts/private:checked_in_ts_project.bzl", "checked_in_ts_project")
 
 checked_in_ts_project(
     name = "lcov_merger_js_lib",

diff --git a/internal/js_library/test/transitive/BUILD.bazel b/internal/js_library/test/transitive/BUILD.bazel
index 43ecbd8..5d3e73a 100644
--- a/internal/js_library/test/transitive/BUILD.bazel
+++ b/internal/js_library/test/transitive/BUILD.bazel

@@ -1,6 +1,6 @@
 load("//:index.bzl", "js_library")
 load(":transitive_declarations_test.bzl", "transitive_declarations_test_suite")
-load("//packages/typescript:index.bzl", "ts_project")
+load("//ts:ts_project.bzl", "ts_project")
 
 js_library(
     name = "c",

diff --git a/internal/linker/BUILD.bazel b/internal/linker/BUILD.bazel
index 80580b8..f40ec54 100644
--- a/internal/linker/BUILD.bazel
+++ b/internal/linker/BUILD.bazel

@@ -2,7 +2,7 @@
 
 # BEGIN-INTERNAL
 load("//:index.bzl", "js_library")
-load("//packages/typescript:checked_in_ts_project.bzl", "checked_in_ts_project")
+load("//ts/private:checked_in_ts_project.bzl", "checked_in_ts_project")
 
 # We can't bootstrap the ts_library rule using the linker itself,
 # because the implementation of ts_library depends on the linker so that would be a cycle.

diff --git a/internal/linker/test/multi_linker/BUILD.bazel b/internal/linker/test/multi_linker/BUILD.bazel
index 295e8e6..9a5dc21 100644
--- a/internal/linker/test/multi_linker/BUILD.bazel
+++ b/internal/linker/test/multi_linker/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//packages/jasmine:index.bzl", "jasmine_node_test")
-load("//packages/typescript:checked_in_ts_project.bzl", "checked_in_ts_project")
+load("//ts/private:checked_in_ts_project.bzl", "checked_in_ts_project")
 
 checked_in_ts_project(
     name = "checked_in_test",

diff --git a/internal/node/test/directory_artifacts_ts_project/BUILD.bazel b/internal/node/test/directory_artifacts_ts_project/BUILD.bazel
index 5fd18a8..e91117d 100644
--- a/internal/node/test/directory_artifacts_ts_project/BUILD.bazel
+++ b/internal/node/test/directory_artifacts_ts_project/BUILD.bazel

@@ -1,10 +1,9 @@
-load("//packages/typescript:index.bzl", "ts_project")
+load("//ts:ts_project.bzl", "ts_project")
 
 ts_project(
     name = "tsconfig",
     srcs = ["main.ts"],
     tags = ["requires-runfiles"],
     tsc = "@npm_directory_artifacts//typescript/bin:tsc",
-    typescript_package = "@npm_directory_artifacts//typescript",
     deps = ["@npm_directory_artifacts//@types/node"],
 )

diff --git a/internal/node/test/lib2/BUILD.bazel b/internal/node/test/lib2/BUILD.bazel
index 6b14af8..c3e9e65 100644
--- a/internal/node/test/lib2/BUILD.bazel
+++ b/internal/node/test/lib2/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//:index.bzl", "js_library")
-load("//packages/typescript:index.bzl", "ts_project")
+load("//ts:ts_project.bzl", "ts_project")
 
 package(default_visibility = ["//internal:__subpackages__"])
 

diff --git a/internal/npm_install/BUILD.bazel b/internal/npm_install/BUILD.bazel
index 54c7dcd..d106ab7 100644
--- a/internal/npm_install/BUILD.bazel
+++ b/internal/npm_install/BUILD.bazel

@@ -3,7 +3,7 @@
 
 # BEGIN-INTERNAL
 # avoid leaking a ts dependency
-load("//packages/typescript:checked_in_ts_project.bzl", "checked_in_ts_project")
+load("//ts/private:checked_in_ts_project.bzl", "checked_in_ts_project")
 
 # Using checked in ts library like the linker
 # To update index.js run:

diff --git a/packages/concatjs/BUILD.bazel b/packages/concatjs/BUILD.bazel
index 490a9f4..85e10c2 100644
--- a/packages/concatjs/BUILD.bazel
+++ b/packages/concatjs/BUILD.bazel

@@ -16,7 +16,7 @@
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
 load("@build_bazel_rules_nodejs//:tools/defaults.bzl", "pkg_npm")
-load("@build_bazel_rules_nodejs//packages/typescript:index.bzl", "ts_project")
+load("@build_bazel_rules_nodejs//ts:ts_project.bzl", "ts_project")
 load("@build_bazel_rules_nodejs//tools/stardoc:index.bzl", "stardoc")
 load("//third_party/github.com/bazelbuild/bazel-skylib:rules/copy_file.bzl", "copy_file")
 

diff --git a/packages/esbuild/index.docs.bzl b/packages/esbuild/index.docs.bzl
index 6dd6ad1..d487181 100644
--- a/packages/esbuild/index.docs.bzl
+++ b/packages/esbuild/index.docs.bzl

@@ -50,7 +50,7 @@
 
 ```python
 load("//packages/esbuild:index.bzl", "esbuild")
-load("//packages/typescript:index.bzl", "ts_project")
+load("//ts:ts_project.bzl", "ts_project")
 
 ts_project(
     name = "lib",
@@ -70,7 +70,7 @@
 
 ```python
 load("//packages/esbuild:index.bzl", "esbuild")
-load("//packages/typescript:index.bzl", "ts_project")
+load("//ts:ts_project.bzl", "ts_project")
 
 ts_project(
     name = "lib",

diff --git a/packages/esbuild/test/ts_library/ts_as_srcs/questions/BUILD.bazel b/packages/esbuild/test/ts_library/ts_as_srcs/questions/BUILD.bazel
index 5444d39..b8d7732 100644
--- a/packages/esbuild/test/ts_library/ts_as_srcs/questions/BUILD.bazel
+++ b/packages/esbuild/test/ts_library/ts_as_srcs/questions/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//internal/js_library:js_library.bzl", "js_library")
-load("//packages/typescript:index.bzl", "ts_project")
+load("//ts:ts_project.bzl", "ts_project")
 
 ts_project(
     name = "lib",

diff --git a/packages/esbuild/test/ts_project/module-dynamic/BUILD.bazel b/packages/esbuild/test/ts_project/module-dynamic/BUILD.bazel
index f700cf6..38ec590 100644
--- a/packages/esbuild/test/ts_project/module-dynamic/BUILD.bazel
+++ b/packages/esbuild/test/ts_project/module-dynamic/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//internal/js_library:js_library.bzl", "js_library")
-load("//packages/typescript:index.bzl", "ts_project")
+load("//ts:ts_project.bzl", "ts_project")
 
 package(default_visibility = ["//packages/esbuild/test:__subpackages__"])
 

diff --git a/packages/esbuild/test/ts_project/module-one/BUILD.bazel b/packages/esbuild/test/ts_project/module-one/BUILD.bazel
index f32464c..19e516b 100644
--- a/packages/esbuild/test/ts_project/module-one/BUILD.bazel
+++ b/packages/esbuild/test/ts_project/module-one/BUILD.bazel

@@ -1,5 +1,5 @@
 load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
-load("//packages/typescript:index.bzl", "ts_project")
+load("//ts:ts_project.bzl", "ts_project")
 
 package(default_visibility = ["//packages/esbuild/test:__subpackages__"])
 

diff --git a/packages/esbuild/test/ts_project/module-two/BUILD.bazel b/packages/esbuild/test/ts_project/module-two/BUILD.bazel
index 3cb024f..209e364 100644
--- a/packages/esbuild/test/ts_project/module-two/BUILD.bazel
+++ b/packages/esbuild/test/ts_project/module-two/BUILD.bazel

@@ -1,5 +1,5 @@
 load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
-load("//packages/typescript:index.bzl", "ts_project")
+load("//ts:ts_project.bzl", "ts_project")
 
 package(default_visibility = ["//packages/esbuild/test:__subpackages__"])
 

diff --git a/packages/esbuild/test/ts_project/relative-module/BUILD.bazel b/packages/esbuild/test/ts_project/relative-module/BUILD.bazel
index 98ffcd7..e83c09e 100644
--- a/packages/esbuild/test/ts_project/relative-module/BUILD.bazel
+++ b/packages/esbuild/test/ts_project/relative-module/BUILD.bazel

@@ -1,4 +1,4 @@
-load("//packages/typescript:index.bzl", "ts_project")
+load("//ts:ts_project.bzl", "ts_project")
 
 package(default_visibility = ["//packages/esbuild/test:__subpackages__"])
 

diff --git a/packages/jasmine/test/BUILD.bazel b/packages/jasmine/test/BUILD.bazel
index f0024f3..212449d 100644
--- a/packages/jasmine/test/BUILD.bazel
+++ b/packages/jasmine/test/BUILD.bazel

@@ -1,7 +1,7 @@
 load("//:index.bzl", "js_library")
 load("//internal/common:copy_to_bin.bzl", "copy_to_bin")
 load("//packages/jasmine:index.bzl", "jasmine_node_test")
-load("//packages/typescript:index.bzl", "ts_project")
+load("//ts:ts_project.bzl", "ts_project")
 
 jasmine_node_test(
     name = "underscore_spec_test",

diff --git a/packages/rollup/test/integration/far/a/BUILD.bazel b/packages/rollup/test/integration/far/a/BUILD.bazel
index ba1d69b..627bde6 100644
--- a/packages/rollup/test/integration/far/a/BUILD.bazel
+++ b/packages/rollup/test/integration/far/a/BUILD.bazel

@@ -1,5 +1,5 @@
 load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
-load("//packages/typescript:index.bzl", "ts_project")
+load("//ts:ts_project.bzl", "ts_project")
 
 package(default_visibility = ["//packages/rollup:__subpackages__"])
 

diff --git a/packages/rollup/test/integration/far/a/b/c/BUILD.bazel b/packages/rollup/test/integration/far/a/b/c/BUILD.bazel
index 1ff62b8..37b8488 100644
--- a/packages/rollup/test/integration/far/a/b/c/BUILD.bazel
+++ b/packages/rollup/test/integration/far/a/b/c/BUILD.bazel

@@ -1,5 +1,5 @@
 load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
-load("//packages/typescript:index.bzl", "ts_project")
+load("//ts:ts_project.bzl", "ts_project")
 
 package(default_visibility = ["//packages/rollup:__subpackages__"])
 

diff --git a/packages/rollup/test/integration/foo/BUILD.bazel b/packages/rollup/test/integration/foo/BUILD.bazel
index 4fd5edc..d2b94fa 100644
--- a/packages/rollup/test/integration/foo/BUILD.bazel
+++ b/packages/rollup/test/integration/foo/BUILD.bazel

@@ -1,5 +1,5 @@
 load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
-load("//packages/typescript:index.bzl", "ts_project")
+load("//ts:ts_project.bzl", "ts_project")
 load("//third_party/github.com/bazelbuild/bazel-skylib:rules/copy_file.bzl", "copy_file")
 
 package(default_visibility = ["//packages/rollup:__subpackages__"])

diff --git a/packages/rollup/test/integration/foo_a/BUILD.bazel b/packages/rollup/test/integration/foo_a/BUILD.bazel
index eddbee1..2c9d0f0 100644
--- a/packages/rollup/test/integration/foo_a/BUILD.bazel
+++ b/packages/rollup/test/integration/foo_a/BUILD.bazel

@@ -1,5 +1,5 @@
 load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
-load("//packages/typescript:index.bzl", "ts_project")
+load("//ts:ts_project.bzl", "ts_project")
 
 package(default_visibility = ["//packages/rollup:__subpackages__"])
 

diff --git a/packages/rollup/test/integration/foo_aaa/BUILD.bazel b/packages/rollup/test/integration/foo_aaa/BUILD.bazel
index 1989c2a..a53dbeb 100644
--- a/packages/rollup/test/integration/foo_aaa/BUILD.bazel
+++ b/packages/rollup/test/integration/foo_aaa/BUILD.bazel

@@ -1,5 +1,5 @@
 load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
-load("//packages/typescript:index.bzl", "ts_project")
+load("//ts:ts_project.bzl", "ts_project")
 
 package(default_visibility = ["//packages/rollup:__subpackages__"])
 

diff --git a/packages/rollup/test/multi_linker/BUILD.bazel b/packages/rollup/test/multi_linker/BUILD.bazel
index b1ec31e..6dcd1b5 100644
--- a/packages/rollup/test/multi_linker/BUILD.bazel
+++ b/packages/rollup/test/multi_linker/BUILD.bazel

@@ -1,6 +1,6 @@
 load("@build_bazel_rules_nodejs//:index.bzl", "generated_file_test")
 load("//packages/rollup:index.bzl", "rollup_bundle")
-load("//packages/typescript:index.bzl", "ts_project")
+load("//ts:ts_project.bzl", "ts_project")
 
 ts_project(
     name = "tsconfig",

diff --git a/packages/rollup/test/ts_project/module-dynamic/BUILD.bazel b/packages/rollup/test/ts_project/module-dynamic/BUILD.bazel
index ac84944..e5db0c8 100644
--- a/packages/rollup/test/ts_project/module-dynamic/BUILD.bazel
+++ b/packages/rollup/test/ts_project/module-dynamic/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//internal/js_library:js_library.bzl", "js_library")
-load("//packages/typescript:index.bzl", "ts_project")
+load("//ts:ts_project.bzl", "ts_project")
 
 package(default_visibility = ["//packages/rollup/test:__subpackages__"])
 

diff --git a/packages/rollup/test/ts_project/module-one/BUILD.bazel b/packages/rollup/test/ts_project/module-one/BUILD.bazel
index f04014f..7ea5884 100644
--- a/packages/rollup/test/ts_project/module-one/BUILD.bazel
+++ b/packages/rollup/test/ts_project/module-one/BUILD.bazel

@@ -1,5 +1,5 @@
 load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
-load("//packages/typescript:index.bzl", "ts_project")
+load("//ts:ts_project.bzl", "ts_project")
 
 package(default_visibility = ["//packages/rollup/test:__subpackages__"])
 

diff --git a/packages/rollup/test/ts_project/module-two/BUILD.bazel b/packages/rollup/test/ts_project/module-two/BUILD.bazel
index a163211..4334799 100644
--- a/packages/rollup/test/ts_project/module-two/BUILD.bazel
+++ b/packages/rollup/test/ts_project/module-two/BUILD.bazel

@@ -1,5 +1,5 @@
 load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
-load("//packages/typescript:index.bzl", "ts_project")
+load("//ts:ts_project.bzl", "ts_project")
 
 package(default_visibility = ["//packages/rollup/test:__subpackages__"])
 

diff --git a/packages/rollup/test/ts_project/relative-module/BUILD.bazel b/packages/rollup/test/ts_project/relative-module/BUILD.bazel
index 51e08ca..d91c6d3 100644
--- a/packages/rollup/test/ts_project/relative-module/BUILD.bazel
+++ b/packages/rollup/test/ts_project/relative-module/BUILD.bazel

@@ -1,4 +1,4 @@
-load("//packages/typescript:index.bzl", "ts_project")
+load("//ts:ts_project.bzl", "ts_project")
 
 package(default_visibility = ["//packages/rollup/test:__subpackages__"])
 

diff --git a/packages/runfiles/BUILD.bazel b/packages/runfiles/BUILD.bazel
index bccfddc..ff1daef 100644
--- a/packages/runfiles/BUILD.bazel
+++ b/packages/runfiles/BUILD.bazel

@@ -1,6 +1,6 @@
 load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
 load("@build_bazel_rules_nodejs//:tools/defaults.bzl", "pkg_npm")
-load("//packages/typescript:index.bzl", "ts_project")
+load("//ts:ts_project.bzl", "ts_project")
 
 ts_project(
     name = "runfiles_lib",

diff --git a/packages/worker/BUILD.bazel b/packages/worker/BUILD.bazel
index 000eeb2..b1d5a2b 100644
--- a/packages/worker/BUILD.bazel
+++ b/packages/worker/BUILD.bazel

@@ -14,7 +14,8 @@
 
 load("@build_bazel_rules_nodejs//:tools/defaults.bzl", "pkg_npm")
 load("@build_bazel_rules_nodejs//:index.bzl", "generated_file_test", "js_library")
-load("//packages/typescript:index.bzl", "ts_config", "ts_project")
+load("//ts:ts_config.bzl", "ts_config")
+load("//ts:ts_project.bzl", "ts_project")
 
 # to update run: bazel run //packages/worker:copy_worker_protocol.update
 generated_file_test(

diff --git a/third_party/github.com/gjtorikian/isBinaryFile/BUILD.bazel b/third_party/github.com/gjtorikian/isBinaryFile/BUILD.bazel
index 448b779..234b2d7 100644
--- a/third_party/github.com/gjtorikian/isBinaryFile/BUILD.bazel
+++ b/third_party/github.com/gjtorikian/isBinaryFile/BUILD.bazel

@@ -9,7 +9,7 @@
 
 # BEGIN-INTERNAL
 # buildifier: disable=load-on-top
-load("//packages/typescript:index.bzl", "ts_project")
+load("//ts:ts_project.bzl", "ts_project")
 
 ts_project(
     name = "tsconfig",

diff --git a/ts/repositories.bzl b/ts/repositories.bzl
index cd7b0bd..6efa36a 100644
--- a/ts/repositories.bzl
+++ b/ts/repositories.bzl

@@ -32,13 +32,13 @@
     out = "tsc.js",
     content = [
         "const runfiles = require(process.env['BAZEL_NODE_RUNFILES_HELPER'])",
-        "require(runfiles.resolve('npm_typescript-{0}') + '/package/bin/tsc')",
+        "require(runfiles.resolve('typescript') + '/package/bin/tsc')",
     ],
 )
 
 nodejs_binary(
     name = "tsc",
-    data = ["@npm_typescript-{0}"],
+    data = ["@typescript//:npm_typescript-{0}"],
     entry_point = "tsc.js",
     visibility = ["//visibility:public"],
 )

diff --git a/ts/tests/simple/BUILD.bazel b/ts/tests/simple/BUILD.bazel
index 7e31fe2..1a58af3 100644
--- a/ts/tests/simple/BUILD.bazel
+++ b/ts/tests/simple/BUILD.bazel

@@ -1,5 +1,5 @@
 load("@build_bazel_rules_nodejs//:index.bzl", "generated_file_test")
-load("//packages/typescript:index.bzl", "ts_project")
+load("//ts:ts_project.bzl", "ts_project")
 
 # This uses defaults for all attributes.
 # It will find `index.ts` and produce `index.js`