Skip to content

Commit 362664d

Browse files
committed
fixup! build: update aspect_rules_js to 3.0.2
1 parent 3c37e71 commit 362664d

File tree

10 files changed

+14
-26
lines changed

10 files changed

+14
-26
lines changed

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ bazel_dep(name = "aspect_rules_js", version = "3.0.2")
1111
bazel_dep(name = "aspect_rules_ts", version = "3.8.5")
1212
bazel_dep(name = "rules_pkg", version = "1.2.0")
1313
bazel_dep(name = "rules_cc", version = "0.2.17")
14-
bazel_dep(name = "aspect_bazel_lib", version = "2.22.5")
14+
bazel_dep(name = "jq.bzl", version = "0.4.0")
1515
bazel_dep(name = "bazel_lib", version = "3.2.2")
1616
bazel_dep(name = "bazel_skylib", version = "1.9.0")
1717
bazel_dep(name = "aspect_rules_esbuild", version = "0.25.0")

goldens/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin")
1+
load("@bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin")
22

33
package(default_visibility = ["//visibility:public"])
44

packages/angular/ssr/test/npm_package/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@aspect_bazel_lib//lib:write_source_files.bzl", "write_source_file")
1+
load("@bazel_lib//lib:write_source_files.bzl", "write_source_file")
22
load("//tools:defaults.bzl", "jasmine_test", "ts_project")
33

44
ts_project(

packages/angular_devkit/schematics_cli/bin/schematics.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import { parseArgs, styleText } from 'node:util';
3030
* @return {{collection: string, schematic: (string)}}
3131
*/
3232
function parseSchematicName(str: string | null): { collection: string; schematic: string | null } {
33-
let collection = '@angular-devkit/schematics-cli';
33+
let collection = path.join(__dirname, '..');
3434

3535
let schematic = str;
3636
if (schematic?.includes(':')) {
Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
load("@aspect_rules_js//npm:defs.bzl", "npm_link_package")
21
load("//tools:defaults.bzl", "jasmine_test", "ts_project")
32

43
ts_project(
@@ -10,21 +9,10 @@ ts_project(
109
],
1110
)
1211

13-
# Note: Link the schematics CLI package into node modules for testing. Notably, tests
14-
# of a package typically don't use the npm package, to e.g. allow for relative
15-
# imports, but here this is an exception as the package needs to be resolvable at runtime.
16-
npm_link_package(
17-
name = "node_modules/@angular-devkit/schematics-cli",
18-
src = "//packages/angular_devkit/schematics_cli:pkg",
19-
package = "@angular-devkit/schematics-cli",
20-
)
21-
2212
jasmine_test(
2313
name = "test",
2414
data = [
2515
":schematics_cli_test_lib",
26-
# The npm package itself is needed for the test at runtime, so we
27-
# link it into this folder as `node_modules/@angular-devkit/schematics-cli`.
28-
":node_modules/@angular-devkit/schematics-cli",
16+
"//packages/angular_devkit/schematics_cli",
2917
],
3018
)

tests/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@aspect_bazel_lib//lib:directory_path.bzl", "directory_path")
1+
load("@bazel_lib//lib:directory_path.bzl", "directory_path")
22
load("@npm//:@rollup/wasm-node/package_json.bzl", rollup = "bin")
33
load("@npm//:defs.bzl", "npm_link_all_packages")
44
load("//tools:defaults.bzl", "ts_project")

tools/bazel/npm_package.bzl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin")
2-
load("@aspect_bazel_lib//lib:expand_template.bzl", "expand_template")
3-
load("@aspect_bazel_lib//lib:jq.bzl", "jq")
4-
load("@aspect_bazel_lib//lib:utils.bzl", "to_label")
51
load("@aspect_rules_js//npm:defs.bzl", _npm_package = "npm_package")
2+
load("@bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin")
3+
load("@bazel_lib//lib:expand_template.bzl", "expand_template")
4+
load("@bazel_lib//lib:utils.bzl", "to_label")
5+
load("@jq.bzl//jq:jq.bzl", "jq")
66
load("@rules_pkg//:pkg.bzl", "pkg_tar")
77
load("//tools:link_package_json_to_tarballs.bzl", "link_package_json_to_tarballs")
88
load("//tools:snapshot_repo_filter.bzl", "SNAPSHOT_REPO_JQ_FILTER")

tools/defaults.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
load("@aspect_bazel_lib//lib:copy_to_bin.bzl", _copy_to_bin = "copy_to_bin")
21
load("@aspect_rules_jasmine//jasmine:defs.bzl", _jasmine_test = "jasmine_test")
32
load("@aspect_rules_js//js:defs.bzl", _js_binary = "js_binary")
3+
load("@bazel_lib//lib:copy_to_bin.bzl", _copy_to_bin = "copy_to_bin")
44
load("@devinfra//bazel/ts_project:index.bzl", "strict_deps_test")
55
load("@rules_angular//src/ng_examples_db:index.bzl", _ng_examples_db = "ng_examples_db")
66
load("@rules_angular//src/ng_package:index.bzl", _ng_package = "ng_package")

tools/link_package_json_to_tarballs.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#
33
# Use of this source code is governed by an MIT-style license that can be
44
# found in the LICENSE file at https://angular.dev/license
5-
load("@aspect_bazel_lib//lib:jq.bzl", "jq")
6-
load("@aspect_bazel_lib//lib:utils.bzl", "to_label")
5+
load("@bazel_lib//lib:utils.bzl", "to_label")
6+
load("@jq.bzl//jq:jq.bzl", "jq")
77

88
def link_package_json_to_tarballs(name, src, pkg_deps, out):
99
"""Substitute tar paths into a package.json file for the packages it depends on.

tools/test/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
load("@aspect_bazel_lib//lib:jq.bzl", "jq")
21
load("@bazel_skylib//rules:diff_test.bzl", "diff_test")
2+
load("@jq.bzl//jq:jq.bzl", "jq")
33

44
jq(
55
name = "final_package_json",

0 commit comments

Comments
 (0)