Skip to content

Commit 8ff29bc

Browse files
committed
fixup! refactor(bazel): drop interop support for spec_bundling tooling
1 parent d70ca03 commit 8ff29bc

File tree

8 files changed

+47
-46
lines changed

8 files changed

+47
-46
lines changed

.bazelignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@ bazel/integration/tests/angular-cli/node_modules/
66
bazel/integration/tests/nested_bazel_workspaces/node_modules
77
bazel/integration/tests/package_mappings/node_modules/
88
bazel/integration/tests/playwright_chromium/node_modules
9+
10+
bazel/node_modules
11+
bazel/spec-bundling/test/node_modules

bazel/pnpm-lock.yaml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bazel/pnpm-workspace.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
packages:
22
- .
3-
- spec-bundling/
3+
- spec-bundling/test/

bazel/setup_dependencies_1.bzl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ def setup_dependencies_1():
66
data = [
77
"@devinfra//bazel:package.json",
88
"@devinfra//bazel:pnpm-workspace.yaml",
9-
"@devinfra//bazel/spec-bundling:package.json",
9+
"@devinfra//bazel/spec-bundling/test:package.json",
1010
],
11+
verify_node_modules_ignored = "//:.bazelignore",
1112
pnpm_lock = "@devinfra//bazel:pnpm-lock.yaml",
1213
)

bazel/spec-bundling/BUILD.bazel

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
load("@devinfra_npm//:defs.bzl", "npm_link_all_packages")
2-
31
package(default_visibility = ["//visibility:public"])
42

5-
npm_link_all_packages()
6-
73
# Make source files available for distribution via pkg_npm
84
filegroup(
95
name = "files",

bazel/spec-bundling/package.json

Lines changed: 0 additions & 15 deletions
This file was deleted.

bazel/spec-bundling/test/BUILD.bazel

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
load("@aspect_rules_jasmine//jasmine:defs.bzl", "jasmine_test")
22
load("@aspect_rules_ts//ts:defs.bzl", "ts_config", "ts_project")
3+
load("@devinfra_npm//:defs.bzl", "npm_link_all_packages")
34
load("//bazel/spec-bundling:index.bzl", "spec_bundle")
45

6+
npm_link_all_packages()
7+
58
ts_config(
69
name = "tsconfig",
710
src = "tsconfig.json",
811
deps = [
9-
"//bazel/spec-bundling:node_modules/@types/jasmine",
10-
"//bazel/spec-bundling:node_modules/@types/node",
12+
":node_modules/@types/jasmine",
13+
":node_modules/@types/node",
1114
],
1215
)
1316

@@ -17,8 +20,8 @@ ts_project(
1720
declaration = True,
1821
tsconfig = ":tsconfig",
1922
deps = [
20-
"//bazel/spec-bundling:node_modules/@types/jasmine",
21-
"//bazel/spec-bundling:node_modules/@types/node",
23+
":node_modules/@types/jasmine",
24+
":node_modules/@types/node",
2225
],
2326
)
2427

@@ -29,13 +32,13 @@ ts_project(
2932
declaration = True,
3033
tsconfig = ":tsconfig",
3134
deps = [
32-
"//bazel/spec-bundling:node_modules/@angular/core",
33-
"//bazel/spec-bundling:node_modules/@angular/platform-browser-dynamic",
34-
"//bazel/spec-bundling:node_modules/@types/jasmine",
35-
"//bazel/spec-bundling:node_modules/@types/jsdom",
36-
"//bazel/spec-bundling:node_modules/@types/node",
37-
"//bazel/spec-bundling:node_modules/jsdom",
38-
"//bazel/spec-bundling:node_modules/zone.js",
35+
":node_modules/@angular/core",
36+
":node_modules/@angular/platform-browser-dynamic",
37+
":node_modules/@types/jasmine",
38+
":node_modules/@types/jsdom",
39+
":node_modules/@types/node",
40+
":node_modules/jsdom",
41+
":node_modules/zone.js",
3942
],
4043
)
4144

@@ -46,9 +49,9 @@ ts_project(
4649
declaration = True,
4750
tsconfig = ":tsconfig",
4851
deps = [
52+
":node_modules/@types/jasmine",
53+
":node_modules/@types/node",
4954
":transitive_should_be_loaded",
50-
"//bazel/spec-bundling:node_modules/@types/jasmine",
51-
"//bazel/spec-bundling:node_modules/@types/node",
5255
],
5356
)
5457

@@ -59,9 +62,9 @@ ts_project(
5962
declaration = True,
6063
tsconfig = ":tsconfig",
6164
deps = [
62-
"//bazel/spec-bundling:node_modules/@angular/compiler",
63-
"//bazel/spec-bundling:node_modules/@angular/core",
64-
"//bazel/spec-bundling:node_modules/@types/jasmine",
65+
":node_modules/@angular/compiler",
66+
":node_modules/@angular/core",
67+
":node_modules/@types/jasmine",
6568
],
6669
)
6770

@@ -72,9 +75,9 @@ ts_project(
7275
declaration = True,
7376
tsconfig = ":tsconfig",
7477
deps = [
75-
"//bazel/spec-bundling:node_modules/@angular/compiler",
76-
"//bazel/spec-bundling:node_modules/@angular/core",
77-
"//bazel/spec-bundling:node_modules/@types/jasmine",
78+
":node_modules/@angular/compiler",
79+
":node_modules/@angular/core",
80+
":node_modules/@types/jasmine",
7881
],
7982
)
8083

@@ -114,7 +117,7 @@ jasmine_test(
114117
fixed_args = [
115118
"'**/*+(.|_)spec.js'",
116119
],
117-
node_modules = "//bazel/spec-bundling:node_modules",
120+
node_modules = ":node_modules",
118121
)
119122

120123
jasmine_test(
@@ -125,7 +128,7 @@ jasmine_test(
125128
fixed_args = [
126129
"'**/*+(.|_)spec.js'",
127130
],
128-
node_modules = "//bazel/spec-bundling:node_modules",
131+
node_modules = ":node_modules",
129132
)
130133

131134
jasmine_test(
@@ -136,17 +139,17 @@ jasmine_test(
136139
fixed_args = [
137140
"'**/*+(.|_)spec.js'",
138141
],
139-
node_modules = "//bazel/spec-bundling:node_modules",
142+
node_modules = ":node_modules",
140143
)
141144

142145
jasmine_test(
143146
name = "test_async_await",
144147
data = [
148+
":node_modules/jsdom",
145149
":test_bundle_async_await",
146-
"//bazel/spec-bundling:node_modules/jsdom",
147150
],
148151
fixed_args = [
149152
"'**/*+(.|_)spec.js'",
150153
],
151-
node_modules = "//bazel/spec-bundling:node_modules",
154+
node_modules = ":node_modules",
152155
)

bazel/spec-bundling/test/package.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
11
{
2+
"dependencies": {
3+
"@angular/compiler": "20.1.4",
4+
"@angular/core": "20.1.4",
5+
"@angular/platform-browser-dynamic": "20.1.4",
6+
"@types/jasmine": "5.1.8",
7+
"@types/jsdom": "21.1.7",
8+
"@types/node": "24.2.0",
9+
"jasmine-reporters": "2.5.2",
10+
"jasmine": "5.9.0",
11+
"jsdom": "26.1.0",
12+
"tinyglobby": "0.2.14",
13+
"zone.js": "0.15.1"
14+
},
215
"type": "module"
316
}

0 commit comments

Comments
 (0)