Skip to content

Commit 7bcf956

Browse files
committed
build: update load statements to load dev-infra via @npm// workspace
Loading the dev-infra rules via the @npm// workspace as the private @npm_dev_infra_private repo is no longer published.
1 parent 255328a commit 7bcf956

File tree

35 files changed

+751
-67
lines changed

35 files changed

+751
-67
lines changed

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
12.14.1

WORKSPACE

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ http_archive(
1111
sha256 = "dd4dc46066e2ce034cba0c81aa3e862b27e8e8d95871f567359f7a534cccb666",
1212
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/3.1.0/rules_nodejs-3.1.0.tar.gz"],
1313
)
14+
1415
# Add sass rules
1516
http_archive(
1617
name = "io_bazel_rules_sass",
@@ -28,19 +29,8 @@ load("@build_bazel_rules_nodejs//:index.bzl", "check_bazel_version", "node_repos
2829
check_bazel_version("4.0.0")
2930

3031
node_repositories(
31-
node_repositories = {
32-
"12.9.1-darwin_amd64": ("node-v12.9.1-darwin-x64.tar.gz", "node-v12.9.1-darwin-x64", "9aaf29d30056e2233fd15dfac56eec12e8342d91bb6c13d54fb5e599383dddb9"),
33-
"12.9.1-linux_amd64": ("node-v12.9.1-linux-x64.tar.xz", "node-v12.9.1-linux-x64", "680a1263c9f5f91adadcada549f0a9c29f1b26d09658d2b501c334c3f63719e5"),
34-
"12.9.1-windows_amd64": ("node-v12.9.1-win-x64.zip", "node-v12.9.1-win-x64", "6a4e54bda091bd02dbd8ff1b9f6671e036297da012a53891e3834d4bf4bed297"),
35-
},
36-
node_urls = ["https://nodejs.org/dist/v{version}/{filename}"],
37-
node_version = "12.9.1",
38-
# We do not need to define a specific yarn version as bazel will respect the .yarnrc file
39-
# and run the version of yarn defined at the set-path value.
40-
# Since bazel runs yarn from the working directory of the package.json, and our .yarnrc
41-
# file is in the same directory, it correctly discovers and respects it. Additionally,
42-
# it ensures that the yarn environment variable to detect if yarn has already followed
43-
# the set-path value is reset.
32+
node_version = "12.14.1",
33+
package_json = ["//:package.json"],
4434
)
4535

4636
yarn_install(
@@ -53,16 +43,13 @@ yarn_install(
5343
],
5444
package_json = "//:package.json",
5545
quiet = False,
56-
strict_visibility = False,
5746
yarn_lock = "//:yarn.lock",
5847
)
5948

60-
6149
load("@npm//@bazel/protractor:package.bzl", "npm_bazel_protractor_dependencies")
6250

6351
npm_bazel_protractor_dependencies()
6452

65-
6653
# Setup web testing. We need to setup a browser because the web testing rules for TypeScript need
6754
# a reference to a registered browser (ideally that's a hermetic version of a browser)
6855
load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories")
@@ -115,6 +102,6 @@ rbe_autoconfig(
115102
# TODO(wagnermaciel): deduplicate browsers - this will load another version of chromium in the
116103
# repository. We probably want to use the chromium version loaded here (from dev-infra) as that
117104
# one has RBE improvements.
118-
load("@npm_angular_dev_infra_private//browsers:browser_repositories.bzl", _dev_infra_browser_repositories = "browser_repositories")
105+
load("@npm//@angular/dev-infra-private/browsers:browser_repositories.bzl", _dev_infra_browser_repositories = "browser_repositories")
119106

120107
_dev_infra_browser_repositories()

package.json

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,62 @@
7171
"zone.js": "~0.11.3"
7272
},
7373
"devDependencies": {
74+
"diff": "^3.5.0",
75+
"reflect-metadata": "^0.1.3",
76+
"@material/animation": "^10.0.0",
77+
"@material/auto-init": "^10.0.0",
78+
"@material/banner": "^10.0.0",
79+
"@material/base": "^10.0.0",
80+
"@material/button": "^10.0.0",
81+
"@material/card": "^10.0.0",
82+
"@material/checkbox": "^10.0.0",
83+
"@material/chips": "^10.0.0",
84+
"@material/circular-progress": "^10.0.0",
85+
"@material/data-table": "^10.0.0",
86+
"@material/density": "^10.0.0",
87+
"@material/dialog": "^10.0.0",
88+
"@material/dom": "^10.0.0",
89+
"@material/drawer": "^10.0.0",
90+
"@material/elevation": "^10.0.0",
91+
"@material/fab": "^10.0.0",
92+
"@material/feature-targeting": "^10.0.0",
93+
"@material/floating-label": "^10.0.0",
94+
"@material/form-field": "^10.0.0",
95+
"@material/icon-button": "^10.0.0",
96+
"@material/image-list": "^10.0.0",
97+
"@material/layout-grid": "^10.0.0",
98+
"@material/line-ripple": "^10.0.0",
99+
"@material/linear-progress": "^10.0.0",
100+
"@material/list": "^10.0.0",
101+
"@material/menu": "^10.0.0",
102+
"@material/menu-surface": "^10.0.0",
103+
"@material/notched-outline": "^10.0.0",
104+
"@material/radio": "^10.0.0",
105+
"@material/ripple": "^10.0.0",
106+
"@material/rtl": "^10.0.0",
107+
"@material/segmented-button": "^10.0.0",
108+
"@material/select": "^10.0.0",
109+
"@material/shape": "^10.0.0",
110+
"@material/slider": "^10.0.0",
111+
"@material/snackbar": "^10.0.0",
112+
"@material/switch": "^10.0.0",
113+
"@material/tab": "^10.0.0",
114+
"@material/tab-bar": "^10.0.0",
115+
"@material/tab-indicator": "^10.0.0",
116+
"@material/tab-scroller": "^10.0.0",
117+
"@material/textfield": "^10.0.0",
118+
"@material/theme": "^10.0.0",
119+
"@material/tooltip": "^10.0.0",
120+
"@material/top-app-bar": "^10.0.0",
121+
"@material/touch-target": "^10.0.0",
122+
"@material/typography": "^10.0.0",
74123
"@angular-devkit/build-optimizer": "^0.1200.0-next.0",
75124
"@angular-devkit/core": "^12.0.0-next.0",
76125
"@angular-devkit/schematics": "^12.0.0-next.0",
77126
"@angular/bazel": "^12.0.0-next.0",
78127
"@angular/benchpress": "^0.2.1",
79128
"@angular/compiler-cli": "^12.0.0-next.0",
80-
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#71d57c29a10c03d07f889581608e3a2315a1dc7e",
129+
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#a8dbb0d8cd8de1e86a4ec4ea66b5bd89a47d4876",
81130
"@angular/platform-browser-dynamic": "^12.0.0-next.0",
82131
"@angular/platform-server": "^12.0.0-next.0",
83132
"@angular/router": "^12.0.0-next.0",

src/material-experimental/mdc-helpers/BUILD.bazel

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,28 @@ filegroup(
1010

1111
npm_sass_library(
1212
name = "mdc_scss_deps_lib",
13-
deps = ["@npm//material-components-web"],
13+
deps = [
14+
"@npm//@material/card",
15+
"@npm//@material/checkbox",
16+
"@npm//@material/chips",
17+
"@npm//@material/circular-progress",
18+
"@npm//@material/data-table",
19+
"@npm//@material/dialog",
20+
"@npm//@material/fab",
21+
"@npm//@material/form-field",
22+
"@npm//@material/linear-progress",
23+
"@npm//@material/list",
24+
"@npm//@material/menu-surface",
25+
"@npm//@material/radio",
26+
"@npm//@material/snackbar",
27+
"@npm//@material/switch",
28+
"@npm//@material/tab",
29+
"@npm//@material/tab-bar",
30+
"@npm//@material/tab-indicator",
31+
"@npm//@material/textfield",
32+
"@npm//@material/tooltip",
33+
"@npm//material-components-web",
34+
],
1435
)
1536

1637
sass_library(

src/universal-app/BUILD.bazel

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,10 @@ nodejs_test(
5959
":server",
6060
":theme_scss",
6161
],
62-
62+
entry_point = ":prerender.ts",
6363
templated_args = [
64-
# TODO(josephperrott): update dependency usages to no longer need bazel patch module resolver
65-
# See: https://github.com/bazelbuild/rules_nodejs/wiki#--bazel_patch_module_resolver-now-defaults-to-false-2324
66-
"--bazel_patch_module_resolver",
64+
# TODO(josephperrott): update dependency usages to no longer need bazel patch module resolver
65+
# See: https://github.com/bazelbuild/rules_nodejs/wiki#--bazel_patch_module_resolver-now-defaults-to-false-2324
66+
"--bazel_patch_module_resolver",
6767
],
68-
entry_point = ":prerender.ts",
6968
)

test/benchmarks/cdk/testing/component-harness/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
1+
load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
22
load("//tools:defaults.bzl", "ng_test_library", "ng_web_test_suite", "ts_library")
33

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

test/benchmarks/material/button/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
1+
load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
22

33
# TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
44
# stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/material/card/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
1+
load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
22

33
# TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
44
# stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/material/checkbox/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
1+
load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
22

33
# TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
44
# stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/material/chips/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
1+
load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
22

33
# TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
44
# stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/material/form-field/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
1+
load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
22

33
# TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
44
# stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/material/menu/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
1+
load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
22

33
# TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
44
# stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/material/radio/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
1+
load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
22

33
# TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
44
# stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/material/slide-toggle/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
1+
load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
22

33
# TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
44
# stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/material/table/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
1+
load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
22

33
component_benchmark(
44
name = "benchmark",

test/benchmarks/material/tabs/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
1+
load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
22

33
# TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
44
# stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/mdc/button/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
1+
load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
22

33
# TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
44
# stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/mdc/card/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
1+
load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
22

33
# TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
44
# stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/mdc/checkbox/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
1+
load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
22

33
# TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
44
# stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/mdc/chips/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
1+
load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
22

33
# TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
44
# stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/mdc/form-field/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
1+
load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
22

33
# TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
44
# stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/mdc/menu/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
1+
load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
22

33
# TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
44
# stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/mdc/radio/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
1+
load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
22

33
# TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
44
# stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/mdc/slide-toggle/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
1+
load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
22

33
# TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
44
# stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/mdc/table/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
1+
load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
22

33
component_benchmark(
44
name = "benchmark",

test/benchmarks/mdc/tabs/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
1+
load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
22

33
# TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
44
# stylesUrls inside the components once `component_benchmark` supports asset injection.

tools/defaults.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ def karma_web_test_suite(name, **kwargs):
165165
kwargs["browsers"] = [
166166
# Note: when changing the browser names here, also update the "yarn test"
167167
# script to reflect the new browser names.
168-
"@npm_angular_dev_infra_private//browsers/chromium:chromium",
169-
"@npm_angular_dev_infra_private//browsers/firefox:firefox",
168+
"@npm//@angular/dev-infra-private/browsers/chromium:chromium",
169+
"@npm//@angular/dev-infra-private/browsers/firefox:firefox",
170170
]
171171

172172
for opt_name in kwargs.keys():
@@ -200,7 +200,7 @@ def karma_web_test_suite(name, **kwargs):
200200

201201
def protractor_web_test_suite(**kwargs):
202202
_protractor_web_test_suite(
203-
browsers = ["@npm_angular_dev_infra_private//browsers/chromium:chromium"],
203+
browsers = ["@npm//@angular/dev-infra-private/browsers/chromium:chromium"],
204204
**kwargs
205205
)
206206

tools/dev-server/BUILD.bazel

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ ts_library(
2525

2626
nodejs_binary(
2727
name = "dev-server_bin",
28-
templated_args = ["--bazel_patch_module_resolver"],
2928
data = [
3029
":dev-server_lib",
3130
],
3231
entry_point = ":main.ts",
32+
# TODO(josephperrott): update dependency usages to no longer need bazel patch module resolver
33+
# See: https://github.com/bazelbuild/rules_nodejs/wiki#--bazel_patch_module_resolver-now-defaults-to-false-2324
34+
templated_args = ["--bazel_patch_module_resolver"],
3335
)

tools/dgeni/BUILD.bazel

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@ package(default_visibility = ["//visibility:public"])
55

66
nodejs_binary(
77
name = "dgeni",
8-
templated_args = ["--bazel_patch_module_resolver"],
98
data = [
109
":sources",
1110
"@npm//dgeni",
1211
"@npm//dgeni-packages",
1312
],
1413
entry_point = ":bazel-bin.ts",
14+
# TODO(josephperrott): update dependency usages to no longer need bazel patch module resolver
15+
# See: https://github.com/bazelbuild/rules_nodejs/wiki#--bazel_patch_module_resolver-now-defaults-to-false-2324
16+
templated_args = ["--bazel_patch_module_resolver"],
1517
)
1618

1719
ts_library(

tools/example-module/BUILD.bazel

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@ ts_library(
1515

1616
nodejs_binary(
1717
name = "bazel-bin",
18-
templated_args = ["--bazel_patch_module_resolver"],
1918
data = [
2019
":example-module.template",
2120
":example-module-lib",
2221
"@npm//typescript",
2322
],
2423
entry_point = ":bazel-bin.ts",
24+
# TODO(josephperrott): update dependency usages to no longer need bazel patch module resolver
25+
# See: https://github.com/bazelbuild/rules_nodejs/wiki#--bazel_patch_module_resolver-now-defaults-to-false-2324
26+
templated_args = ["--bazel_patch_module_resolver"],
2527
)

tools/highlight-files/BUILD.bazel

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ ts_library(
1010
deps = [
1111
"//tools/region-parser",
1212
"@npm//@types/fs-extra",
13-
"@npm//fs-extra",
1413
"@npm//@types/node",
14+
"@npm//fs-extra",
1515
],
1616
)
1717

@@ -22,10 +22,10 @@ nodejs_binary(
2222
"@npm//fs-extra",
2323
"@npm//highlight.js",
2424
],
25+
entry_point = ":highlight-files.ts",
2526
templated_args = [
26-
# TODO(josephperrott): update dependency usages to no longer need bazel patch module resolver
27-
# See: https://github.com/bazelbuild/rules_nodejs/wiki#--bazel_patch_module_resolver-now-defaults-to-false-2324
28-
"--bazel_patch_module_resolver",
27+
# TODO(josephperrott): update dependency usages to no longer need bazel patch module resolver
28+
# See: https://github.com/bazelbuild/rules_nodejs/wiki#--bazel_patch_module_resolver-now-defaults-to-false-2324
29+
"--bazel_patch_module_resolver",
2930
],
30-
entry_point = ":highlight-files.ts",
3131
)

0 commit comments

Comments
 (0)