Skip to content

Commit 9a824ac

Browse files
gregmagolanalexeagle
authored andcommitted
chore: remove old rollup_bundle
BREAKING CHANGE: internal/rollup_bundle rule is removed. see https://github.com/bazelbuild/rules_nodejs/wiki for migration instructions Fixes #740
1 parent 76d9b68 commit 9a824ac

17 files changed

Lines changed: 14 additions & 3074 deletions

BUILD.bazel

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,12 @@ bzl_library(
5050
"//internal/linker:bzl",
5151
"//internal/npm_package:bzl",
5252
"//internal/providers:bzl",
53-
"//internal/rollup:bzl",
5453
"//toolchains/node:bzl",
5554
],
5655
)
5756

5857
# Empty node_modules filegroup used for the default
5958
# value of the node_modules attribute in nodejs_binary
60-
# and rollup_bundle
6159
filegroup(
6260
name = "node_modules_none",
6361
srcs = [],
@@ -77,10 +75,23 @@ npm_package(
7775
replace_with_version = "",
7876
replacements = COMMON_REPLACEMENTS,
7977
deps = [
78+
"//internal:package_contents",
79+
"//internal/bazel_integration_test:package_contents",
80+
"//internal/common:package_contents",
81+
"//internal/copy_repository:package_contents",
82+
"//internal/golden_file_test:package_contents",
83+
"//internal/jasmine_node_test:package_contents",
84+
"//internal/js_library:package_contents",
85+
"//internal/linker:package_contents",
86+
"//internal/node:package_contents",
87+
"//internal/npm_install:package_contents",
88+
"//internal/npm_package:package_contents",
89+
"//internal/providers:package_contents",
90+
"//internal/web_package:package_contents",
8091
"//third_party/github.com/bazelbuild/bazel-skylib:package_contents",
8192
"//third_party/github.com/buffer-from:package_contents",
82-
"//third_party/github.com/inikulin/parse5:package_contents",
8393
"//third_party/github.com/gjtorikian/isBinaryFile:package_contents",
94+
"//third_party/github.com/inikulin/parse5:package_contents",
8495
"//third_party/github.com/juanjoDiaz/removeNPMAbsolutePaths:package_contents",
8596
"//third_party/github.com/source-map:package_contents",
8697
"//third_party/github.com/source-map-support:package_contents",
@@ -91,21 +102,6 @@ npm_package(
91102
"//third_party/npm/node_modules/browserify:package_contents",
92103
"//third_party/npm/node_modules/ieee754:package_contents",
93104
"//third_party/npm/node_modules/named-amd:package_contents",
94-
"//internal:package_contents",
95-
"//internal/bazel_integration_test:package_contents",
96-
"//internal/golden_file_test:package_contents",
97-
"//internal/common:package_contents",
98-
"//internal/copy_repository:package_contents",
99-
"//internal/jasmine_node_test:package_contents",
100-
"//internal/js_library:package_contents",
101-
"//internal/linker:package_contents",
102-
# TODO(alexeagle): distribute separately as @bazel/rollup
103-
"//internal/rollup:package_contents",
104-
"//internal/node:package_contents",
105-
"//internal/npm_install:package_contents",
106-
"//internal/npm_package:package_contents",
107-
"//internal/web_package:package_contents",
108-
"//internal/providers:package_contents",
109105
"//toolchains/node:package_contents",
110106
],
111107
)

defs.bzl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,13 @@ load("//internal/node:node_repositories.bzl", _node_repositories = "node_reposit
2929
load("//internal/node:npm_package_bin.bzl", _npm_bin = "npm_package_bin")
3030
load("//internal/npm_install:npm_install.bzl", _npm_install = "npm_install", _yarn_install = "yarn_install")
3131
load("//internal/npm_package:npm_package.bzl", _npm_package = "npm_package")
32-
load("//internal/rollup:rollup_bundle.bzl", _rollup_bundle = "rollup_bundle")
3332
load(":index.bzl", "VERSION")
3433

3534
check_bazel_version = _check_bazel_version
3635
nodejs_binary = _nodejs_binary
3736
nodejs_test = _nodejs_test
3837
node_repositories = _node_repositories
3938
jasmine_node_test = _jasmine_node_test
40-
rollup_bundle = _rollup_bundle
4139
npm_package = _npm_package
4240
npm_package_bin = _npm_bin
4341
# ANY RULES ADDED HERE SHOULD BE DOCUMENTED, see index.for_docs.bzl

index.bzl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,12 @@ load("//internal/node:node_repositories.bzl", _node_repositories = "node_reposit
2929
load("//internal/node:npm_package_bin.bzl", _npm_bin = "npm_package_bin")
3030
load("//internal/npm_install:npm_install.bzl", _npm_install = "npm_install", _yarn_install = "yarn_install")
3131
load("//internal/npm_package:npm_package.bzl", _npm_package = "npm_package")
32-
load("//internal/rollup:rollup_bundle.bzl", _rollup_bundle = "rollup_bundle")
3332

3433
check_bazel_version = _check_bazel_version
3534
nodejs_binary = _nodejs_binary
3635
nodejs_test = _nodejs_test
3736
node_repositories = _node_repositories
3837
jasmine_node_test = _jasmine_node_test
39-
rollup_bundle = _rollup_bundle
4038
npm_package = _npm_package
4139
npm_package_bin = _npm_bin
4240
# ANY RULES ADDED HERE SHOULD BE DOCUMENTED, see index.for_docs.bzl

index.for_docs.bzl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,11 @@ load("//internal/node:node_repositories.bzl", _node_repositories = "node_reposit
2222
load("//internal/node:npm_package_bin.bzl", _npm_bin = "npm_package_bin")
2323
load("//internal/npm_install:npm_install.bzl", _npm_install = "npm_install", _yarn_install = "yarn_install")
2424
load("//internal/npm_package:npm_package.bzl", _npm_package = "npm_package")
25-
load("//internal/rollup:rollup_bundle.bzl", _rollup_bundle = "rollup_bundle")
2625

2726
check_bazel_version = _check_bazel_version
2827
nodejs_binary = _nodejs_binary
2928
nodejs_test = _nodejs_test
3029
node_repositories = _node_repositories
31-
rollup_bundle = _rollup_bundle
3230
npm_package = _npm_package
3331
npm_install = _npm_install
3432
yarn_install = _yarn_install

internal/common/collect_es6_sources.bzl

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

internal/node/node_repositories.bzl

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ See https://docs.bazel.build/versions/master/skylark/repository_rules.html
2121
load("//internal/common:check_bazel_version.bzl", "check_bazel_version")
2222
load("//internal/common:check_version.bzl", "check_version")
2323
load("//internal/common:os_name.bzl", "OS_ARCH_NAMES", "is_windows_os", "os_name")
24-
load("//internal/npm_install:npm_install.bzl", "yarn_install")
2524
load("//third_party/github.com/bazelbuild/bazel-skylib:lib/paths.bzl", "paths")
2625
load("//toolchains/node:node_toolchain_configure.bzl", "node_toolchain_configure")
2726

@@ -703,18 +702,6 @@ def node_repositories(**kwargs):
703702
vendored_node = vendored_node,
704703
)
705704

706-
_maybe(
707-
yarn_install,
708-
name = "build_bazel_rules_nodejs_rollup_deps",
709-
package_json = "@build_bazel_rules_nodejs//internal/rollup:package.json",
710-
yarn_lock = "@build_bazel_rules_nodejs//internal/rollup:yarn.lock",
711-
data = ["@build_bazel_rules_nodejs//internal/rollup:postinstall-patches.js"],
712-
# Do not symlink node_modules as when used in downstream repos we should not create
713-
# node_modules folders in the @build_bazel_rules_nodejs external repository. This is
714-
# not supported by managed_directories.
715-
symlink_node_modules = False,
716-
)
717-
718705
def _maybe(repo_rule, name, **kwargs):
719706
if name not in native.existing_rules():
720707
repo_rule(name = name, **kwargs)

internal/rollup/BUILD.bazel

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

internal/rollup/no_explore.html

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

internal/rollup/package.json

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

0 commit comments

Comments
 (0)