Skip to content

Commit

Permalink
chore: remove old rollup_bundle
Browse files Browse the repository at this point in the history
BREAKING CHANGE:
internal/rollup_bundle rule is removed. see https://github.com/bazelbuild/rules_nodejs/wiki for migration instructions

Fixes bazel-contrib#740
  • Loading branch information
alexeagle committed Nov 15, 2019
1 parent 9fa4343 commit e8ee9ff
Show file tree
Hide file tree
Showing 16 changed files with 14 additions and 3,002 deletions.
32 changes: 14 additions & 18 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,12 @@ bzl_library(
"//internal/linker:bzl",
"//internal/npm_package:bzl",
"//internal/providers:bzl",
"//internal/rollup:bzl",
"//toolchains/node:bzl",
],
)

# Empty node_modules filegroup used for the default
# value of the node_modules attribute in nodejs_binary
# and rollup_bundle
filegroup(
name = "node_modules_none",
srcs = [],
Expand All @@ -77,10 +75,23 @@ npm_package(
replace_with_version = "",
replacements = COMMON_REPLACEMENTS,
deps = [
"//internal:package_contents",
"//internal/bazel_integration_test:package_contents",
"//internal/common:package_contents",
"//internal/copy_repository:package_contents",
"//internal/golden_file_test:package_contents",
"//internal/jasmine_node_test:package_contents",
"//internal/js_library:package_contents",
"//internal/linker:package_contents",
"//internal/node:package_contents",
"//internal/npm_install:package_contents",
"//internal/npm_package:package_contents",
"//internal/providers:package_contents",
"//internal/web_package:package_contents",
"//third_party/github.com/bazelbuild/bazel-skylib:package_contents",
"//third_party/github.com/buffer-from:package_contents",
"//third_party/github.com/inikulin/parse5:package_contents",
"//third_party/github.com/gjtorikian/isBinaryFile:package_contents",
"//third_party/github.com/inikulin/parse5:package_contents",
"//third_party/github.com/juanjoDiaz/removeNPMAbsolutePaths:package_contents",
"//third_party/github.com/source-map:package_contents",
"//third_party/github.com/source-map-support:package_contents",
Expand All @@ -91,21 +102,6 @@ npm_package(
"//third_party/npm/node_modules/browserify:package_contents",
"//third_party/npm/node_modules/ieee754:package_contents",
"//third_party/npm/node_modules/named-amd:package_contents",
"//internal:package_contents",
"//internal/bazel_integration_test:package_contents",
"//internal/golden_file_test:package_contents",
"//internal/common:package_contents",
"//internal/copy_repository:package_contents",
"//internal/jasmine_node_test:package_contents",
"//internal/js_library:package_contents",
"//internal/linker:package_contents",
# TODO(alexeagle): distribute separately as @bazel/rollup
"//internal/rollup:package_contents",
"//internal/node:package_contents",
"//internal/npm_install:package_contents",
"//internal/npm_package:package_contents",
"//internal/web_package:package_contents",
"//internal/providers:package_contents",
"//toolchains/node:package_contents",
],
)
Expand Down
2 changes: 0 additions & 2 deletions defs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,13 @@ load("//internal/node:node_repositories.bzl", _node_repositories = "node_reposit
load("//internal/node:npm_package_bin.bzl", _npm_bin = "npm_package_bin")
load("//internal/npm_install:npm_install.bzl", _npm_install = "npm_install", _yarn_install = "yarn_install")
load("//internal/npm_package:npm_package.bzl", _npm_package = "npm_package")
load("//internal/rollup:rollup_bundle.bzl", _rollup_bundle = "rollup_bundle")
load(":index.bzl", "VERSION")

check_bazel_version = _check_bazel_version
nodejs_binary = _nodejs_binary
nodejs_test = _nodejs_test
node_repositories = _node_repositories
jasmine_node_test = _jasmine_node_test
rollup_bundle = _rollup_bundle
npm_package = _npm_package
npm_package_bin = _npm_bin
# ANY RULES ADDED HERE SHOULD BE DOCUMENTED, see index.for_docs.bzl
Expand Down
2 changes: 0 additions & 2 deletions index.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,12 @@ load("//internal/node:node_repositories.bzl", _node_repositories = "node_reposit
load("//internal/node:npm_package_bin.bzl", _npm_bin = "npm_package_bin")
load("//internal/npm_install:npm_install.bzl", _npm_install = "npm_install", _yarn_install = "yarn_install")
load("//internal/npm_package:npm_package.bzl", _npm_package = "npm_package")
load("//internal/rollup:rollup_bundle.bzl", _rollup_bundle = "rollup_bundle")

check_bazel_version = _check_bazel_version
nodejs_binary = _nodejs_binary
nodejs_test = _nodejs_test
node_repositories = _node_repositories
jasmine_node_test = _jasmine_node_test
rollup_bundle = _rollup_bundle
npm_package = _npm_package
npm_package_bin = _npm_bin
# ANY RULES ADDED HERE SHOULD BE DOCUMENTED, see index.for_docs.bzl
Expand Down
2 changes: 0 additions & 2 deletions index.for_docs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ load("//internal/node:node_repositories.bzl", _node_repositories = "node_reposit
load("//internal/node:npm_package_bin.bzl", _npm_bin = "npm_package_bin")
load("//internal/npm_install:npm_install.bzl", _npm_install = "npm_install", _yarn_install = "yarn_install")
load("//internal/npm_package:npm_package.bzl", _npm_package = "npm_package")
load("//internal/rollup:rollup_bundle.bzl", _rollup_bundle = "rollup_bundle")

check_bazel_version = _check_bazel_version
nodejs_binary = _nodejs_binary
nodejs_test = _nodejs_test
node_repositories = _node_repositories
rollup_bundle = _rollup_bundle
npm_package = _npm_package
npm_install = _npm_install
yarn_install = _yarn_install
Expand Down
13 changes: 0 additions & 13 deletions internal/node/node_repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ See https://docs.bazel.build/versions/master/skylark/repository_rules.html
load("//internal/common:check_bazel_version.bzl", "check_bazel_version")
load("//internal/common:check_version.bzl", "check_version")
load("//internal/common:os_name.bzl", "OS_ARCH_NAMES", "is_windows_os", "os_name")
load("//internal/npm_install:npm_install.bzl", "yarn_install")
load("//third_party/github.com/bazelbuild/bazel-skylib:lib/paths.bzl", "paths")
load("//toolchains/node:node_toolchain_configure.bzl", "node_toolchain_configure")

Expand Down Expand Up @@ -699,18 +698,6 @@ def node_repositories(**kwargs):
vendored_node = vendored_node,
)

_maybe(
yarn_install,
name = "build_bazel_rules_nodejs_rollup_deps",
package_json = "@build_bazel_rules_nodejs//internal/rollup:package.json",
yarn_lock = "@build_bazel_rules_nodejs//internal/rollup:yarn.lock",
data = ["@build_bazel_rules_nodejs//internal/rollup:postinstall-patches.js"],
# Do not symlink node_modules as when used in downstream repos we should not create
# node_modules folders in the @build_bazel_rules_nodejs external repository. This is
# not supported by managed_directories.
symlink_node_modules = False,
)

def _maybe(repo_rule, name, **kwargs):
if name not in native.existing_rules():
repo_rule(name = name, **kwargs)
120 changes: 0 additions & 120 deletions internal/rollup/BUILD.bazel

This file was deleted.

4 changes: 0 additions & 4 deletions internal/rollup/no_explore.html

This file was deleted.

21 changes: 0 additions & 21 deletions internal/rollup/package.json

This file was deleted.

45 changes: 0 additions & 45 deletions internal/rollup/postinstall-patches.js

This file was deleted.

Loading

0 comments on commit e8ee9ff

Please sign in to comment.