Skip to content
This repository was archived by the owner on Sep 16, 2021. It is now read-only.

Commit 2205863

Browse files
gregmagolanKeen Yee Liau
authored andcommitted
Update handling of rules_nodejs transitive deps
BREAKING CHANGES: rules_typescript_dependencies() will no longer install transitive dependencies of build_bazel_rules_nodejs. User WORKSPACE files will now need to install rules_nodejs transitive deps directly: ``` load("@build_bazel_rules_nodejs//:package.bzl", "rules_nodejs_dependencies") rules_nodejs_dependencies() ``` Closes #328 PiperOrigin-RevId: 224072359
1 parent 676567c commit 2205863

File tree

3 files changed

+9
-14
lines changed

3 files changed

+9
-14
lines changed

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,14 @@ http_archive(
5050
strip_prefix = "rules_typescript-0.20.3",
5151
)
5252

53-
# Fetch our Bazel dependencies that aren't distributed on npm
53+
# Fetch transitive Bazel dependencies of build_bazel_rules_typescript
5454
load("@build_bazel_rules_typescript//:package.bzl", "rules_typescript_dependencies")
5555
rules_typescript_dependencies()
5656

57+
# Fetch transitive Bazel dependencies of build_bazel_rules_nodejs
58+
load("@build_bazel_rules_nodejs//:package.bzl", "rules_nodejs_dependencies")
59+
rules_nodejs_dependencies()
60+
5761
# Setup TypeScript toolchain
5862
load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")
5963
ts_setup_workspace()

WORKSPACE

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ load(
2323
rules_typescript_dependencies()
2424
rules_typescript_dev_dependencies()
2525

26+
load("@build_bazel_rules_nodejs//:package.bzl", "rules_nodejs_dependencies")
27+
28+
rules_nodejs_dependencies()
29+
2630
load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories", "yarn_install")
2731

2832
# Use a bazel-managed npm dependency, allowing us to test resolution to these paths

package.bzl

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -78,19 +78,6 @@ def rules_typescript_dependencies():
7878
sha256 = "9176a7df34dbed2cf5171eb56271868824560364e60644348219f852f593ae79",
7979
)
8080

81-
###############################################
82-
# Repeat the dependencies of rules_nodejs here!
83-
# We can't load() from rules_nodejs yet, because we've only just fetched it.
84-
# But we also don't want to make users load and call the rules_nodejs_dependencies
85-
# function because we can do that for them, mostly hiding the transitive dependency.
86-
_maybe(
87-
http_archive,
88-
name = "bazel_skylib",
89-
url = "https://github.com/bazelbuild/bazel-skylib/archive/0.5.0.zip",
90-
strip_prefix = "bazel-skylib-0.5.0",
91-
sha256 = "ca4e3b8e4da9266c3a9101c8f4704fe2e20eb5625b2a6a7d2d7d45e3dd4efffd",
92-
)
93-
9481
def rules_typescript_dev_dependencies():
9582
"""
9683
Fetch dependencies needed for local development, but not needed by users.

0 commit comments

Comments
 (0)