Skip to content

Commit 9733afd

Browse files
committed
Renames @npm to @rules_prerender_npm.
We can't generally claim the workspace name `@npm` since it is very likely that user code will want to declare that workspace for itself. Instead, we use `@rules_prerender_npm` which installs the `package.json` in the `@rules_prerender` repository. Users can define their own `@npm` which installs their own `package.json`. Unfortunately this means that local development in this repository is a bit confusing since the `@npm` workspace doesn't exist, though this is a small price to pay.
1 parent d15a7cc commit 9733afd

7 files changed

Lines changed: 14 additions & 12 deletions

File tree

BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ load("@aspect_rules_ts//ts:defs.bzl", "ts_config")
33
load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
44
load("@bazel_skylib//lib:dicts.bzl", "dicts")
55
load("@bazel_skylib//rules:build_test.bzl", "build_test")
6-
load("@npm//:defs.bzl", "npm_link_all_packages")
6+
load("@rules_prerender_npm//:defs.bzl", "npm_link_all_packages")
77
load("//tools/publish:npm_publish.bzl", "npm_publish")
88
load("//tools/stamping:stamp_package.bzl", "stamp_package")
99
load("//tools:typescript.bzl", "types_only")

WORKSPACE.bazel

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,17 @@ nodejs_register_toolchains(
4545
)
4646

4747
# Install NPM packages from the lockfile.
48+
# NOTE: We can't name this `@npm` because that name is very likely used by the
49+
# user's workspace, and we would conflict with that.
4850
load("@aspect_rules_js//npm:npm_import.bzl", "npm_translate_lock")
4951
npm_translate_lock(
50-
name = "npm",
52+
name = "rules_prerender_npm",
5153
pnpm_lock = "//:pnpm-lock.yaml",
5254
npmrc = "//:.npmrc",
5355
verify_node_modules_ignored = "//:.bazelignore",
5456
)
5557

56-
load("@npm//:repositories.bzl", "npm_repositories")
58+
load("@rules_prerender_npm//:repositories.bzl", "npm_repositories")
5759
npm_repositories()
5860

5961
http_archive(

examples/external/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ load("@aspect_rules_js//js:defs.bzl", "js_binary", "js_run_binary")
22
load("@aspect_rules_js//npm:defs.bzl", "npm_link_package")
33
load("@aspect_rules_ts//ts:defs.bzl", "ts_config", "ts_project")
44
load("@bazel_skylib//rules:build_test.bzl", "build_test")
5-
load("@npm_user//:defs.bzl", "npm_link_all_packages")
65
load(
76
"@rules_prerender//:index.bzl",
87
"link_prerender_component",
98
"prerender_pages",
109
"web_resources_devserver",
1110
)
11+
load("@rules_prerender_npm//:defs.bzl", "npm_link_all_packages")
1212

1313
npm_link_all_packages(name = "node_modules")
1414

examples/external/WORKSPACE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ nodejs_register_toolchains(
3333

3434
load("@aspect_rules_js//npm:npm_import.bzl", "npm_translate_lock")
3535
npm_translate_lock(
36-
name = "npm_user",
36+
name = "npm",
3737
pnpm_lock = "//:pnpm-lock.yaml",
3838
verify_node_modules_ignored = "//:.bazelignore",
3939
npmrc = "//:.npmrc",
4040
)
41-
load("@npm_user//:repositories.bzl", "npm_repositories")
41+
load("@npm//:repositories.bzl", "npm_repositories")
4242
npm_repositories()
4343

4444
# Load `@aspect_rules_ts` dependency.

npm_repositories.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
load("@jasmine//:npm_repositories.bzl", jasmine_npm_repositories = "npm_repositories")
2-
load("@npm//:repositories.bzl", js_npm_repositories = "npm_repositories")
32
load("@rollup//:npm_repositories.bzl", rollup_npm_repositories = "npm_repositories")
3+
load("@rules_prerender_npm//:repositories.bzl", js_npm_repositories = "npm_repositories")
44

55
def npm_repositories():
66
js_npm_repositories()

packages/rules_prerender/web_resources_devserver.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""Defines `web_resources_devserver()` functionality."""
22

33
load("@aspect_rules_js//js:defs.bzl", "js_run_devserver")
4-
load("@npm//:http-server/package_json.bzl", http_server_bin = "bin")
4+
load("@rules_prerender_npm//:http-server/package_json.bzl", http_server_bin = "bin")
55
load("//common:label.bzl", "absolute", "file_path_of")
66

77
def web_resources_devserver(

repositories.bzl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ load("@aspect_rules_ts//ts:repositories.bzl", "rules_ts_dependencies")
88
def rules_prerender_repositories():
99
rules_js_dependencies()
1010
npm_translate_lock(
11-
name = "npm",
12-
pnpm_lock = "@rules_prerender//:pnpm-lock.yaml",
13-
npmrc = "@rules_prerender//:.npmrc",
11+
name = "rules_prerender_npm",
12+
pnpm_lock = Label("//:pnpm-lock.yaml"),
13+
npmrc = Label("//:.npmrc"),
1414
)
1515

16-
rules_ts_dependencies(ts_version_from = "@rules_prerender//:package.json")
16+
rules_ts_dependencies(ts_version_from = Label("//:package.json"))
1717

1818
if "rollup" not in native.existing_rules():
1919
rules_rollup_dependencies()

0 commit comments

Comments
 (0)