diff --git a/packages/jasmine/BUILD.bazel b/packages/jasmine/BUILD.bazel index f04f260b1e..b4d04115cc 100644 --- a/packages/jasmine/BUILD.bazel +++ b/packages/jasmine/BUILD.bazel @@ -13,7 +13,7 @@ # limitations under the License. load("@bazel_skylib//:bzl_library.bzl", "bzl_library") -load("@build_bazel_rules_nodejs//:index.bzl", "copy_to_bin", "nodejs_test") +load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_test") load("@build_bazel_rules_nodejs//:tools/defaults.bzl", "pkg_npm") load("@build_bazel_rules_nodejs//internal/js_library:js_library.bzl", "js_library") load("@build_bazel_rules_nodejs//tools/stardoc:index.bzl", "stardoc") @@ -53,20 +53,15 @@ nodejs_test( ], ) -copy_to_bin( - name = "srcs", +js_library( + name = "jasmine", + package_name = "@bazel/jasmine", srcs = [ "index.js", "jasmine_runner.js", ], ) -js_library( - name = "jasmine", - package_name = "@bazel/jasmine", - srcs = [":srcs"], -) - # Ugly genrule depending on local linux environment to build the README out of skylark doc generation. # Only referenced when we do a release. # TODO: This ought to be possible with stardoc alone. Need to coordinate with Chris Parsons. diff --git a/packages/jasmine/test/BUILD.bazel b/packages/jasmine/test/BUILD.bazel index 10fabdd1fb..229d2d4951 100644 --- a/packages/jasmine/test/BUILD.bazel +++ b/packages/jasmine/test/BUILD.bazel @@ -1,4 +1,4 @@ -load("@build_bazel_rules_nodejs//:index.bzl", "copy_to_bin") +load("//:index.bzl", "copy_to_bin") load("//packages/jasmine:index.bzl", "jasmine_node_test") load("//packages/typescript:index.bzl", "ts_library") diff --git a/packages/rollup/test/integration/foo/BUILD.bazel b/packages/rollup/test/integration/foo/BUILD.bazel index 6870d8cf04..6de3a4570c 100644 --- a/packages/rollup/test/integration/foo/BUILD.bazel +++ b/packages/rollup/test/integration/foo/BUILD.bazel @@ -1,4 +1,3 @@ -load("@build_bazel_rules_nodejs//:index.bzl", "copy_to_bin") load("@build_bazel_rules_nodejs//internal/js_library:js_library.bzl", "js_library") load("//packages/typescript:index.bzl", "ts_project") load("//third_party/github.com/bazelbuild/bazel-skylib:rules/copy_file.bzl", "copy_file") @@ -19,17 +18,12 @@ ts_project( deps = ["@npm//date-fns"], ) -copy_to_bin( - name = "user_d_ts", - srcs = ["user.d.ts"], -) - js_library( name = "foo_lib", package_name = "@foo/lib", srcs = [ ":index.js", ":user.js", - ":user_d_ts", + "user.d.ts", ], ) diff --git a/packages/rollup/test/integration/fum/BUILD.bazel b/packages/rollup/test/integration/fum/BUILD.bazel index 07fdd5ce36..b1d9ebbe16 100644 --- a/packages/rollup/test/integration/fum/BUILD.bazel +++ b/packages/rollup/test/integration/fum/BUILD.bazel @@ -1,15 +1,9 @@ -load("@build_bazel_rules_nodejs//:index.bzl", "copy_to_bin") load("//internal/js_library:js_library.bzl", "js_library") package(default_visibility = ["//packages/rollup:__subpackages__"]) -copy_to_bin( - name = "index", - srcs = ["index.js"], -) - js_library( name = "fumlib", package_name = "fumlib", - srcs = [":index"], + srcs = ["index.js"], ) diff --git a/packages/typescript/test/ts_project/js_library/BUILD.bazel b/packages/typescript/test/ts_project/js_library/BUILD.bazel index 1724ce46ee..b13c485b91 100644 --- a/packages/typescript/test/ts_project/js_library/BUILD.bazel +++ b/packages/typescript/test/ts_project/js_library/BUILD.bazel @@ -1,20 +1,14 @@ -load("@build_bazel_rules_nodejs//:index.bzl", "copy_to_bin") load("//internal/js_library:js_library.bzl", "js_library") load("//packages/typescript:index.bzl", "ts_project") -copy_to_bin( - name = "srcs", +js_library( + name = "lib_a", srcs = [ "a.d.ts", "a.js", ], ) -js_library( - name = "lib_a", - srcs = [":srcs"], -) - ts_project( name = "tsconfig", srcs = ["b.ts"], diff --git a/scripts/vendor_npm.sh b/scripts/vendor_npm.sh index 0ccf6e5524..2753787dc9 100755 --- a/scripts/vendor_npm.sh +++ b/scripts/vendor_npm.sh @@ -94,7 +94,6 @@ rename() { # $1 - license file build_file_header() { echo """# Generated by /scripts/vendor_npm.sh -load(\"@build_bazel_rules_nodejs//:index.bzl\", \"copy_to_bin\") load(\"//internal/js_library:js_library.bzl\", \"js_library\") package(default_visibility = [\"//visibility:public\"]) @@ -104,14 +103,9 @@ licenses([\"notice\"]) # Vendored on ${DATE} from npm with /scripts/vendor_npm.sh exports_files([\"$1\"]) -copy_to_bin( - name = \"srcs\", - srcs = glob([\"**/*.js\"]), -) - js_library( name = \"$(basename ${PKG})\", - srcs = [\":srcs\"], + srcs = glob([\"**/*.js\"]), package_name = \"${PKG}\", ) """ > ${DST_DIR}/BUILD.bazel diff --git a/third_party/github.com/gjtorikian/isBinaryFile/BUILD.bazel b/third_party/github.com/gjtorikian/isBinaryFile/BUILD.bazel index 12818447fd..fa102916d6 100644 --- a/third_party/github.com/gjtorikian/isBinaryFile/BUILD.bazel +++ b/third_party/github.com/gjtorikian/isBinaryFile/BUILD.bazel @@ -5,7 +5,6 @@ licenses(["notice"]) exports_files(["LICENSE"]) load("@build_bazel_rules_nodejs//internal/js_library:js_library.bzl", "js_library") -load("@build_bazel_rules_nodejs//:index.bzl", "copy_to_bin") # BEGIN-INTERNAL load("//packages/typescript:index.bzl", "ts_project") @@ -16,16 +15,12 @@ ts_project( ) # END-INTERNAL -copy_to_bin( - name = "package_json_bin", - srcs = [ - "package.json", - ] -) - js_library( name = "isBinaryFile", - srcs = [":package_json_bin", "src/index.js"], + srcs = [ + "src/index.js", + "package.json", + ], package_name = "isbinaryfile", visibility = ["//visibility:public"], ) diff --git a/third_party/npm/node_modules/@babel/core/BUILD.bazel b/third_party/npm/node_modules/@babel/core/BUILD.bazel index e560c5055e..e68dbf4ad2 100644 --- a/third_party/npm/node_modules/@babel/core/BUILD.bazel +++ b/third_party/npm/node_modules/@babel/core/BUILD.bazel @@ -1,5 +1,4 @@ # Generated by /scripts/vendor_npm.sh -load("@build_bazel_rules_nodejs//:index.bzl", "copy_to_bin") load("//internal/js_library:js_library.bzl", "js_library") package(default_visibility = ["//visibility:public"]) @@ -9,14 +8,9 @@ licenses(["notice"]) # Vendored on Mon 12 Aug 2019 15:32:04 CDT from npm with /scripts/vendor_npm.sh exports_files(["LICENSE"]) -copy_to_bin( - name = "srcs", - srcs = glob(["**/*.js"]), -) - js_library( name = "core", - srcs = [":srcs"], + srcs = glob(["**/*.js"]), package_name = "@babel/core", ) diff --git a/third_party/npm/node_modules/@babel/plugin-transform-modules-commonjs/BUILD.bazel b/third_party/npm/node_modules/@babel/plugin-transform-modules-commonjs/BUILD.bazel index 21c5a80967..658b09fb2f 100644 --- a/third_party/npm/node_modules/@babel/plugin-transform-modules-commonjs/BUILD.bazel +++ b/third_party/npm/node_modules/@babel/plugin-transform-modules-commonjs/BUILD.bazel @@ -1,5 +1,4 @@ # Generated by /scripts/vendor_npm.sh -load("@build_bazel_rules_nodejs//:index.bzl", "copy_to_bin") load("//internal/js_library:js_library.bzl", "js_library") package(default_visibility = ["//visibility:public"]) @@ -9,14 +8,9 @@ licenses(["notice"]) # Vendored on Mon 12 Aug 2019 15:32:04 CDT from npm with /scripts/vendor_npm.sh exports_files(["LICENSE"]) -copy_to_bin( - name = "srcs", - srcs = glob(["**/*.js"]), -) - js_library( name = "plugin-transform-modules-commonjs", - srcs = [":srcs"], + srcs = glob(["**/*.js"]), package_name = "@babel/plugin-transform-modules-commonjs", ) diff --git a/third_party/npm/node_modules/babelify/BUILD.bazel b/third_party/npm/node_modules/babelify/BUILD.bazel index 5302f3035c..75384c788f 100644 --- a/third_party/npm/node_modules/babelify/BUILD.bazel +++ b/third_party/npm/node_modules/babelify/BUILD.bazel @@ -1,5 +1,4 @@ # Generated by /scripts/vendor_npm.sh -load("@build_bazel_rules_nodejs//:index.bzl", "copy_to_bin") load("//internal/js_library:js_library.bzl", "js_library") package(default_visibility = ["//visibility:public"]) @@ -9,14 +8,9 @@ licenses(["notice"]) # Vendored on Mon 12 Aug 2019 15:32:04 CDT from npm with /scripts/vendor_npm.sh exports_files(["LICENSE"]) -copy_to_bin( - name = "srcs", - srcs = glob(["**/*.js"]), -) - js_library( name = "babelify", - srcs = [":srcs"], + srcs = glob(["**/*.js"]), package_name = "babelify", ) diff --git a/third_party/npm/node_modules/base64-js/BUILD.bazel b/third_party/npm/node_modules/base64-js/BUILD.bazel index 2b36ca7d4b..c698080391 100644 --- a/third_party/npm/node_modules/base64-js/BUILD.bazel +++ b/third_party/npm/node_modules/base64-js/BUILD.bazel @@ -1,5 +1,4 @@ # Generated by /scripts/vendor_npm.sh -load("@build_bazel_rules_nodejs//:index.bzl", "copy_to_bin") load("//internal/js_library:js_library.bzl", "js_library") package(default_visibility = ["//visibility:public"]) @@ -9,14 +8,9 @@ licenses(["notice"]) # Vendored on Mon 12 Aug 2019 15:32:04 CDT from npm with /scripts/vendor_npm.sh exports_files(["LICENSE"]) -copy_to_bin( - name = "srcs", - srcs = glob(["**/*.js"]), -) - js_library( name = "base64-js", - srcs = [":srcs"], + srcs = glob(["**/*.js"]), package_name = "base64-js", ) diff --git a/third_party/npm/node_modules/browserify/BUILD.bazel b/third_party/npm/node_modules/browserify/BUILD.bazel index dc61603019..7149ab98f8 100644 --- a/third_party/npm/node_modules/browserify/BUILD.bazel +++ b/third_party/npm/node_modules/browserify/BUILD.bazel @@ -1,5 +1,4 @@ # Generated by /scripts/vendor_npm.sh -load("@build_bazel_rules_nodejs//:index.bzl", "copy_to_bin") load("//internal/js_library:js_library.bzl", "js_library") package(default_visibility = ["//visibility:public"]) @@ -9,14 +8,9 @@ licenses(["notice"]) # Vendored on Mon 12 Aug 2019 15:32:04 CDT from npm with /scripts/vendor_npm.sh exports_files(["LICENSE"]) -copy_to_bin( - name = "srcs", - srcs = glob(["**/*.js"]) -) - js_library( name = "browserify", - srcs = [ ":srcs" ], + srcs = glob(["**/*.js"]), package_name = "browserify", ) diff --git a/third_party/npm/node_modules/ieee754/BUILD.bazel b/third_party/npm/node_modules/ieee754/BUILD.bazel index d6b3e89242..24e915cb78 100644 --- a/third_party/npm/node_modules/ieee754/BUILD.bazel +++ b/third_party/npm/node_modules/ieee754/BUILD.bazel @@ -1,5 +1,4 @@ # Generated by /scripts/vendor_npm.sh -load("@build_bazel_rules_nodejs//:index.bzl", "copy_to_bin") load("//internal/js_library:js_library.bzl", "js_library") package(default_visibility = ["//visibility:public"]) @@ -9,14 +8,9 @@ licenses(["notice"]) # Vendored on Mon 12 Aug 2019 15:32:04 CDT from npm with /scripts/vendor_npm.sh exports_files(["LICENSE"]) -copy_to_bin( - name = "srcs", - srcs = glob(["**/*.js"]), -) - js_library( name = "ieee754", - srcs = [":srcs"], + srcs = glob(["**/*.js"]), package_name = "ieee754", ) diff --git a/third_party/npm/node_modules/named-amd/BUILD.bazel b/third_party/npm/node_modules/named-amd/BUILD.bazel index bd4312953d..3c762e1e0b 100644 --- a/third_party/npm/node_modules/named-amd/BUILD.bazel +++ b/third_party/npm/node_modules/named-amd/BUILD.bazel @@ -1,5 +1,4 @@ # Generated by /scripts/vendor_npm.sh -load("@build_bazel_rules_nodejs//:index.bzl", "copy_to_bin") load("//internal/js_library:js_library.bzl", "js_library") package(default_visibility = ["//visibility:public"]) @@ -9,14 +8,9 @@ licenses(["notice"]) # Vendored on Mon 12 Aug 2019 15:32:04 CDT from npm with /scripts/vendor_npm.sh exports_files(["LICENSE.md"]) -copy_to_bin( - name = "srcs", - srcs = glob(["**/*.js"]), -) - js_library( name = "named-amd", - srcs = [":srcs"], + srcs = glob(["**/*.js"]), package_name = "named-amd", )