Skip to content

Commit 2ba9aeb

Browse files
committed
Cleanup MODULE.bazel npm deps, add pnpm-workspace
To avoid pnpm discovering nested package.json files
1 parent 7ecf94d commit 2ba9aeb

File tree

4 files changed

+4
-838
lines changed

4 files changed

+4
-838
lines changed

BUILD.bazel

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
load("@tsickle__0.46.3__links//:defs.bzl", npm_link_tsickle = "npm_link_imported_package")
21
load("@aspect_rules_ts//ts:defs.bzl", "ts_config")
32
load("@npm_tsickle//:defs.bzl", "npm_link_all_packages")
43

54
npm_link_all_packages(
65
name = "node_modules",
7-
imported_links = [
8-
npm_link_tsickle,
9-
],
106
)
117

128
ts_config(

MODULE.bazel

Lines changed: 2 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -21,51 +21,15 @@ bazel_dep(name = "rules_nodejs", version = "6.5.0")
2121

2222
node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node", dev_dependency = False)
2323
node.toolchain(node_version = "22.14.0")
24-
2524
use_repo(node, "nodejs_toolchains")
2625

2726
npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm", dev_dependency = False)
28-
2927
npm.npm_translate_lock(
3028
name = "npm_tsickle",
3129
pnpm_lock = "//:pnpm-lock.yaml",
3230
verify_node_modules_ignored = "//:.bazelignore",
3331
)
34-
35-
use_repo(
36-
npm,
37-
"npm_tsickle",
38-
)
39-
40-
npm.npm_import(
41-
name = "tsickle__0.46.3",
42-
integrity = "sha512-9PDXxOrtn2AdpvDin6FLGveXVGg8ec3ga8fh8mPR5lz9KtitW6riVgxgagicdfF1rgiBxDeH+5hVowPXhmZbYQ==",
43-
package = "tsickle",
44-
root_package = "",
45-
version = "0.46.3",
46-
)
47-
use_repo(
48-
npm,
49-
"tsickle__0.46.3",
50-
"tsickle__0.46.3__links",
51-
)
52-
53-
# As an example, manually import a package using explicit coordinates.
54-
# Just a demonstration of the syntax de-sugaring.
55-
npm.npm_import(
56-
name = "acorn__8.4.0",
57-
bins = {"acorn": "./bin/acorn"},
58-
integrity = "sha512-ULr0LDaEqQrMFGyQ3bhJkLsbtrQ8QibAseGZeaSUiT/6zb9IvIkomWHJIvgvwad+hinRAgsI51JcWk2yvwyL+w==",
59-
package = "acorn",
60-
# Root package where to link the package store
61-
root_package = "",
62-
version = "8.4.0",
63-
)
64-
use_repo(
65-
npm,
66-
"acorn__8.4.0",
67-
"acorn__8.4.0__links",
68-
)
32+
use_repo(npm, "npm_tsickle")
6933

7034
pnpm = use_extension("@aspect_rules_js//npm:extensions.bzl", "pnpm")
7135
use_repo(pnpm, "pnpm")
@@ -74,7 +38,6 @@ use_repo(pnpm, "pnpm")
7438
# language ts configuration
7539
# --------------------------------------------------------------------------------
7640

77-
rules_ts_ext = use_extension("@aspect_rules_ts//ts:extensions.bzl", "ext", dev_dependency = False)
78-
41+
rules_ts_ext = use_extension("@aspect_rules_ts//ts:extensions.bzl", "ext")
7942
rules_ts_ext.deps(ts_version_from = "//:package.json")
8043
use_repo(rules_ts_ext, "npm_typescript")

0 commit comments

Comments
 (0)