Skip to content

Commit 4642422

Browse files
committed
feat: remove the ability to customize node_modules path
Fix #2196
1 parent c878387 commit 4642422

File tree

80 files changed

+3401
-9020
lines changed

Some content is hidden

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

80 files changed

+3401
-9020
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/.bazelignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
node_modules/
2-
cases/node_modules
2+
cases/docusaurus-direct-peer-v6/node_modules
3+
cases/docusaurus-direct-peer-v9/node_modules
4+
cases/isaacs-cliui-v90/node_modules
5+
cases/override-with-alias-url-v9/node_modules
6+
cases/tarball-no-url-v54/node_modules
7+
cases/versionless-patch-v9/node_modules
38
projects/a/node_modules
49
projects/a-types/node_modules
510
projects/b/node_modules

e2e/pnpm_lockfiles/MODULE.bazel

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ PNPM_LOCK_VERSIONS = [
1414

1515
# Lockfiles with unique test cases
1616
PNPM_LOCK_TEST_CASES = [
17-
"tarball-no-url-v54.yaml",
18-
"override-with-alias-url-v9.yaml",
19-
"isaacs-cliui-v90.yaml",
20-
"docusaurus-direct-peer-v6.yaml",
21-
"docusaurus-direct-peer-v9.yaml",
22-
"versionless-patch-v9.yaml",
17+
"tarball-no-url-v54",
18+
"override-with-alias-url-v9",
19+
"isaacs-cliui-v90",
20+
"docusaurus-direct-peer-v6",
21+
"docusaurus-direct-peer-v9",
22+
"versionless-patch-v9",
2323
]
2424

2525
bazel_dep(name = "aspect_bazel_lib", version = "2.14.0")
@@ -93,8 +93,8 @@ npm = use_extension(
9393

9494
[
9595
npm.npm_translate_lock(
96-
name = lockfile.replace(".yaml", ""),
97-
pnpm_lock = "//cases:%s" % lockfile,
96+
name = lockfile,
97+
pnpm_lock = "//cases/%s:pnpm-lock.yaml" % lockfile,
9898
verify_node_modules_ignored = "//:.bazelignore",
9999
)
100100
for lockfile in PNPM_LOCK_TEST_CASES
@@ -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: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ PNPM_LOCK_VERSIONS = [
1313

1414
# Lockfiles with unique test cases
1515
PNPM_LOCK_TEST_CASES = [
16-
"tarball-no-url-v54.yaml",
17-
"override-with-alias-url-v9.yaml",
18-
"isaacs-cliui-v90.yaml",
19-
"docusaurus-direct-peer-v6.yaml",
20-
"docusaurus-direct-peer-v9.yaml",
21-
"versionless-patch-v9.yaml",
16+
"tarball-no-url-v54",
17+
"override-with-alias-url-v9",
18+
"isaacs-cliui-v90",
19+
"docusaurus-direct-peer-v6",
20+
"docusaurus-direct-peer-v9",
21+
"versionless-patch-v9",
2222
]
2323

2424
load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")
@@ -59,8 +59,8 @@ npm_repositories_v90()
5959

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

e2e/pnpm_lockfiles/cases/BUILD.bazel

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

0 commit comments

Comments
 (0)