chore: update to rules_js 0.10.0 (#34)

Author: gregmagolan

WORKSPACE

@@ -44,7 +44,7 @@ gazelle_dependencies()
 
 ###########################################
 # A pnpm workspace so we can test 3p deps
-load("@aspect_rules_js//js:npm_import.bzl", "translate_pnpm_lock")
+load("@aspect_rules_js//npm:npm_import.bzl", "translate_pnpm_lock")
 
 translate_pnpm_lock(
     name = "npm",

examples/BUILD.bazel

@@ -1,14 +1,14 @@
-load("@npm//:defs.bzl", "link_js_packages")
-load("@aspect_rules_js//js:defs.bzl", "link_js_package")
+load("@npm//:defs.bzl", "link_all_npm_packages")
+load("@aspect_rules_js//npm:defs.bzl", "link_npm_package")
 
 # Building this target results in bazel-bin/examples/node_modules/@myorg/js_lib, so that
 # TypeScript and other node programs beneath bazel-bin/examples are able to resolve its location.
-link_js_package(
-    name = "link_js_lib",
+link_npm_package(
+    name = "node_modules/@myorg/js_lib",
     src = "//examples/js_lib",
     root_package = "examples",
     visibility = ["//examples:__subpackages__"],
 )
 
-# This macro expands to a link_js_package for each third-party package in package.json
-link_js_packages()
+# This macro expands to a link_npm_package for each third-party package in package.json
+link_all_npm_packages(name = "node_modules")

examples/js_lib/BUILD.bazel

@@ -1,6 +1,6 @@
-load("@aspect_rules_js//js:defs.bzl", "js_package")
+load("@aspect_rules_js//npm:defs.bzl", "npm_package")
 
-js_package(
+npm_package(
     name = "js_lib",
     srcs = ["index.js"],
     package = "@myorg/js_lib",

examples/simple/BUILD.bazel

@@ -3,10 +3,8 @@ load("@bazel_skylib//rules:write_file.bzl", "write_file")
 
 # Dependencies for all targets in this package
 _DEPS = [
-    # For packages within the workspace, we use the link target in the node_modules tree:
-    "//examples:link_js_lib",
-    # Third-party packages from npm can be referenced directly:
-    "@npm//examples/@types/node",
+    "//examples:node_modules/@myorg/js_lib",
+    "//examples:node_modules/@types/node",
 ]
 
 # Type-checks, and emits output to

examples/transpiler/babel.bzl

@@ -32,7 +32,7 @@ def babel(name, srcs, js_outs, map_outs, **kwargs):
             name = "{}_{}".format(name, idx),
             srcs = [
                 src,
-                "@npm//examples/@babel/preset-typescript",
+                "//examples:node_modules/@babel/preset-typescript",
             ],
             chdir = "examples",
             outs = outs,

internal_deps.bzl

@@ -66,7 +66,7 @@ def rules_ts_internal_deps():
     maybe(
         http_archive,
         name = "aspect_rules_swc",
-        sha256 = "78f0f4a8916c52d1a46b3885129ac04fdad5e4c0fb454255ada2cf04ef7f0f04",
-        strip_prefix = "rules_swc-0.8.0",
-        url = "https://github.com/aspect-build/rules_swc/archive/refs/tags/v0.8.0.tar.gz",
+        sha256 = "24df246060f39294e3a4f8b9759d3e9cc382d01ddf8926beb5221992af194bc0",
+        strip_prefix = "rules_swc-0.9.0",
+        url = "https://github.com/aspect-build/rules_swc/archive/refs/tags/v0.9.0.tar.gz",
     )

ts/BUILD.typescript

@@ -1,30 +1,31 @@
 "BUILD file inserted into @npm_typescript repository"
-load("@aspect_rules_js//js:defs.bzl", "constants", "link_js_package", "js_package", "js_binary")
+load("@aspect_rules_js//js:defs.bzl", "js_binary")
+load("@aspect_rules_js//npm:defs.bzl", "link_npm_package", "npm_package")
 load("@aspect_bazel_lib//lib:directory_path.bzl", "directory_path")
 load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
 load("@bazel_skylib//rules:write_file.bzl", "write_file")
 
-js_package(
-    name = "_npm_typescript",
+npm_package(
+    name = "npm_typescript",
     src = "package",
     package = "typescript",
 )
 
-link_js_package(
-    name = "npm_typescript",
-    src = "_npm_typescript",
+link_npm_package(
+    name = "node_modules/typescript",
+    src = "npm_typescript",
     visibility = ["//visibility:public"],
 )
 
 directory_path(
     name = "tsc_entrypoint",
-    directory = ":npm_typescript{}".format(constants.dir_suffix),
+    directory = ":node_modules/typescript/dir",
     path = "bin/tsc",
 )
 
 js_binary(
     name = "tsc",
-    data = [":npm_typescript"],
+    data = [":node_modules/typescript"],
     entry_point = ":tsc_entrypoint",
     visibility = ["//visibility:public"],
 )
@@ -37,7 +38,7 @@ copy_file(
 
 js_binary(
     name = "validator",
-    data = ["npm_typescript"],
+    data = [":node_modules/typescript"],
     entry_point = "copy_validator",
     visibility = ["//visibility:public"],
 )

ts/repositories.bzl

@@ -9,7 +9,7 @@ load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 load("//ts/private:versions.bzl", TS_VERSIONS = "VERSIONS")
 
 versions = struct(
-    bazel_lib = "0.11.1",
+    bazel_lib = "0.12.1",
     rules_nodejs = "5.4.0",
     rules_js = "0.9.1",
 )
@@ -107,15 +107,15 @@ def rules_ts_dependencies(ts_version_from = None, ts_version = None, ts_integrit
     maybe(
         http_archive,
         name = "aspect_rules_js",
-        sha256 = "f01010e1f6bd49a8da6f7350c60992b7eb2eb62058cfe7aa6abd9e416bc2158b",
-        strip_prefix = "rules_js-" + versions.rules_js,
-        url = "https://github.com/aspect-build/rules_js/archive/refs/tags/v{}.tar.gz".format(versions.rules_js),
+        sha256 = "2db66bedabc30f2dfa87bd4845e42b0dbc80fa9344d2dfbaa2685cdced2f1e03",
+        strip_prefix = "rules_js-0.10.0",
+        url = "https://github.com/aspect-build/rules_js/archive/refs/tags/v0.10.0.tar.gz",
     )
 
     maybe(
         http_archive,
         name = "aspect_bazel_lib",
-        sha256 = "a8b47eeaf3c1bd41c4f4b633ef4c959daf83fdee343379495098b50571d4b3b8",
+        sha256 = "91aa7356b22ecdb87dcf5f1cc8a6a147e23a1ef425221bab75e5f857cd6b2716",
         strip_prefix = "bazel-lib-" + versions.bazel_lib,
         url = "https://github.com/aspect-build/bazel-lib/archive/refs/tags/v{}.tar.gz".format(versions.bazel_lib),
     )