Skip to content

Commit

Permalink
Test for npm_install remove removeNPMAbsolutePaths target cycle regre…
Browse files Browse the repository at this point in the history
…ssion (#763)

This failure only shows up in downstream workspaces so we should use npm_install in a subset of nested workspaces. Changing /examples/parcel & /e2e/bazel_bin to npm_install here.
  • Loading branch information
gregmagolan authored and alexeagle committed May 28, 2019
1 parent 04212de commit dfa7b99
Show file tree
Hide file tree
Showing 10 changed files with 7,253 additions and 5,256 deletions.
6 changes: 3 additions & 3 deletions e2e/bazel_bin/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ local_repository(
path = "../../dist/build_bazel_rules_nodejs/release",
)

load("@build_bazel_rules_nodejs//:defs.bzl", "yarn_install")
load("@build_bazel_rules_nodejs//:defs.bzl", "npm_install")

yarn_install(
npm_install(
name = "npm",
package_json = "//:package.json",
yarn_lock = "//:yarn.lock",
package_lock_json = "//:package-lock.json",
)
Empty file modified e2e/bazel_bin/npm/testy/index.js
100644 → 100755
Empty file.
9 changes: 9 additions & 0 deletions e2e/bazel_bin/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion e2e/bazel_bin/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"dependencies": {
"testy": "file:./npm/testy"
"testy": "file:./npm/testy"
},
"scripts": {
"test": "bazel test :test --define=some_env=world"
Expand Down
6 changes: 0 additions & 6 deletions e2e/bazel_bin/yarn.lock

This file was deleted.

6 changes: 3 additions & 3 deletions examples/parcel/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ local_repository(
path = "../../dist/build_bazel_rules_nodejs/release",
)

load("@build_bazel_rules_nodejs//:defs.bzl", "yarn_install")
load("@build_bazel_rules_nodejs//:defs.bzl", "npm_install")

yarn_install(
npm_install(
name = "npm",
package_json = "//:package.json",
yarn_lock = "//:yarn.lock",
package_lock_json = "//:package-lock.json",
)
7,234 changes: 7,234 additions & 0 deletions examples/parcel/package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions examples/parcel/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"private": true,
"devDependencies": {
"jasmine": "^3.3.1",
"parcel-bundler": "^1.11.0"
"jasmine": "3.4.0",
"parcel-bundler": "1.12.3"
},
"scripts": {
"test": "bazel run @npm//parcel-bundler/bin:parcel -- --help && bazel test //..."
Expand Down
2 changes: 1 addition & 1 deletion examples/parcel/parcel.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ parcel = rule(
},
outputs = {
"bundle": "%{name}.js",
"sourcemap": "%{name}.map",
"sourcemap": "%{name}.js.map",
},
)
5,240 changes: 0 additions & 5,240 deletions examples/parcel/yarn.lock

This file was deleted.

0 comments on commit dfa7b99

Please sign in to comment.