Skip to content

Commit c0055f9

Browse files
committed
feat: remove the ability to customize node_modules path
Fix #2196
1 parent 1213b76 commit c0055f9

File tree

68 files changed

+3442
-3764
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+3442
-3764
lines changed

BUILD.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ load("//npm:defs.bzl", "npm_link_package")
1111
# manual /WORKSPACE npm_import rules to bazel-bin/node_modules as well as the package store
1212
# bazel-bin/node_modules/.aspect_rules_js since /pnpm-lock.yaml is the root of the pnpm workspace
1313
npm_link_all_packages(
14-
name = "node_modules",
1514
imported_links = [
1615
npm_link_acorn,
1716
npm_link_pnpm,
@@ -27,7 +26,6 @@ build_test(
2726

2827
# buildifier: disable=duplicated-name
2928
NODE_MODULES = npm_link_targets(
30-
name = "node_modules",
3129
package = package_name(),
3230
) + [
3331
"//:node_modules/acorn",

docs/npm_import.md

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/npm_link_all_packages.md

Lines changed: 2 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2e/gyp_no_install_script/snapshots/bzlmod/segfault-handler_defs.bzl

Lines changed: 206 additions & 213 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2e/gyp_no_install_script/snapshots/wksp/segfault-handler_defs.bzl

Lines changed: 206 additions & 213 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2e/npm_translate_lock_disable_hooks/snapshots/aspect_test_c_links_defs.bzl

Lines changed: 5 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2e/npm_translate_lock_disable_hooks/snapshots/defs.bzl

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2e/pnpm_lockfiles/MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ npm = use_extension(
9393

9494
[
9595
npm.npm_translate_lock(
96-
name = lockfile.replace(".yaml", ""),
96+
name = lockfile,
9797
pnpm_lock = "//cases/%s:pnpm-lock.yaml" % lockfile,
9898
verify_node_modules_ignored = "//:.bazelignore",
9999
)
@@ -103,7 +103,7 @@ npm = use_extension(
103103
[
104104
use_repo(
105105
npm,
106-
lockfile.replace(".yaml", ""),
106+
lockfile,
107107
)
108108
for lockfile in PNPM_LOCK_TEST_CASES
109109
]

e2e/pnpm_lockfiles/WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ npm_repositories_v90()
5959

6060
[
6161
npm_translate_lock(
62-
name = lockfile.replace(".yaml", ""),
62+
name = lockfile,
6363
pnpm_lock = "//cases/%s:pnpm-lock.yaml" % lockfile,
6464
verify_node_modules_ignored = "//:.bazelignore",
6565
)

e2e/pnpm_lockfiles/lockfile-test.bzl

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def lockfile_test(npm_link_all_packages, name = None):
4545
lock_version = name if name else native.package_name()
4646
lock_repo = "lock-%s" % lock_version
4747

48-
npm_link_all_packages(name = "node_modules")
48+
npm_link_all_packages()
4949

5050
# Copy each test to this lockfile dir
5151
for test in ["patched-dependencies-test.js", "aliases-test.js"]:
@@ -134,8 +134,8 @@ def lockfile_test(npm_link_all_packages, name = None):
134134

135135
# Packages involving overrides
136136
":node_modules/is-odd",
137-
":.aspect_rules_js/node_modules/[email protected]",
138-
":.aspect_rules_js/node_modules/[email protected]",
137+
":.aspect_rules_js/[email protected]",
138+
":.aspect_rules_js/[email protected]",
139139

140140
# Odd git/http versions
141141
":node_modules/debug",
@@ -162,46 +162,46 @@ def lockfile_test(npm_link_all_packages, name = None):
162162
":node_modules/is-odd-v1",
163163
":node_modules/is-odd-v2",
164164
":node_modules/is-odd-v3",
165-
":.aspect_rules_js/node_modules/[email protected]",
166-
":.aspect_rules_js/node_modules/[email protected]",
167-
":.aspect_rules_js/node_modules/[email protected]",
168-
":.aspect_rules_js/node_modules/[email protected]",
165+
":.aspect_rules_js/[email protected]",
166+
":.aspect_rules_js/[email protected]",
167+
":.aspect_rules_js/[email protected]",
168+
":.aspect_rules_js/[email protected]",
169169

170170
# npm: alias to package not listed elsewhere
171171
":node_modules/alias-only-sizzle",
172-
":.aspect_rules_js/node_modules/@[email protected]",
172+
":.aspect_rules_js/@[email protected]",
173173
"@%s__at_types_sizzle__2.3.9//:pkg" % lock_repo,
174174

175175
# Targets within the virtual store...
176176
# Direct dep targets
177-
":.aspect_rules_js/node_modules/@[email protected]",
178-
":.aspect_rules_js/node_modules/@[email protected]/dir",
179-
":.aspect_rules_js/node_modules/@[email protected]/pkg",
180-
":.aspect_rules_js/node_modules/@[email protected]/ref",
177+
":.aspect_rules_js/@[email protected]",
178+
":.aspect_rules_js/@[email protected]/dir",
179+
":.aspect_rules_js/@[email protected]/pkg",
180+
":.aspect_rules_js/@[email protected]/ref",
181181

182182
# Direct deps with lifecycles
183-
":.aspect_rules_js/node_modules/@[email protected]/lc",
184-
":.aspect_rules_js/node_modules/@[email protected]/pkg_lc",
183+
":.aspect_rules_js/@[email protected]/lc",
184+
":.aspect_rules_js/@[email protected]/pkg_lc",
185185

186186
# link:, workspace:, file:, ./rel/path
187-
":.aspect_rules_js/node_modules/@[email protected]",
188-
":.aspect_rules_js/node_modules/@[email protected]",
189-
":.aspect_rules_js/node_modules/@[email protected]",
190-
":.aspect_rules_js/node_modules/@[email protected]",
191-
":.aspect_rules_js/node_modules/[email protected]",
192-
":.aspect_rules_js/node_modules/[email protected]",
193-
":.aspect_rules_js/node_modules/[email protected]",
194-
":.aspect_rules_js/node_modules/[email protected]/dir",
187+
":.aspect_rules_js/@[email protected]",
188+
":.aspect_rules_js/@[email protected]",
189+
":.aspect_rules_js/@[email protected]",
190+
":.aspect_rules_js/@[email protected]",
191+
":.aspect_rules_js/[email protected]",
192+
":.aspect_rules_js/[email protected]",
193+
":.aspect_rules_js/[email protected]",
194+
":.aspect_rules_js/[email protected]/dir",
195195

196196
# Patched dependencies
197-
":.aspect_rules_js/node_modules/[email protected]_o3deharooos255qt5xdujc3cuq",
197+
":.aspect_rules_js/[email protected]_o3deharooos255qt5xdujc3cuq",
198198
"@%s__meaning-of-life__1.0.0_o3deharooos255qt5xdujc3cuq//:pkg" % lock_repo,
199199

200200
# Direct deps from custom registry
201-
":.aspect_rules_js/node_modules/@[email protected]",
201+
":.aspect_rules_js/@[email protected]",
202202

203203
# Direct deps with peers
204-
":.aspect_rules_js/node_modules/@[email protected]_at_aspect-test_c_2.0.2",
204+
":.aspect_rules_js/@[email protected]_at_aspect-test_c_2.0.2",
205205
"@%s__at_aspect-test_d__2.0.0_at_aspect-test_c_2.0.2//:pkg" % lock_repo,
206206
],
207207
)

0 commit comments

Comments
 (0)