Skip to content

Commit

Permalink
WIP prototype of symlinking user node_modules in yarn_install & npm_i…
Browse files Browse the repository at this point in the history
…nstall
  • Loading branch information
gregmagolan committed Apr 6, 2019
1 parent 59194f9 commit 3d3f654
Show file tree
Hide file tree
Showing 92 changed files with 13,664 additions and 1,476 deletions.
8 changes: 8 additions & 0 deletions .bazelignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
node_modules
examples/program/node_modules
internal/history-server/node_modules
internal/http-server/node_modules
internal/npm_install/test/package/node_modules
internal/npm_install/node_modules
internal/rollup/node_modules
internal/web_package/node_modules
dist
# Each e2e test is a nested workspace
e2e/
Expand All @@ -12,6 +17,9 @@ packages/
# TODO(gregmagolan): move these to /e2e
internal/e2e/bazel_workspaces
internal/e2e/bazel_workspaces_compat
internal/e2e/fine_grained_deps/npm/node_modules
internal/e2e/fine_grained_deps/yarn/node_modules
internal/e2e/fine_grained_no_bin/node_modules
internal/e2e/fine_grained_symlinks
internal/e2e/node_loader_no_preserve_symlinks
internal/e2e/node_loader_preserve_symlinks
Expand Down
3 changes: 2 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,8 @@ jobs:
- *attach_workspace
- *init_environment
- *init_bazel
- run: ./scripts/setup_examples_angular.sh
# TODO(gmagolan): put this back in once it works with user node_modules
# - run: ./scripts/setup_examples_angular.sh
# Some examples such as app require xvfb
- run: xvfb-run -a ./scripts/test_examples_all.sh ${CIRCLE_NODE_INDEX} ${CIRCLE_NODE_TOTAL}

Expand Down
8 changes: 4 additions & 4 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ yarn_install(
".json",
".proto",
],
package_json = "//internal/e2e/fine_grained_deps:package.json",
yarn_lock = "//internal/e2e/fine_grained_deps:yarn.lock",
package_json = "//internal/e2e/fine_grained_deps:yarn/package.json",
yarn_lock = "//internal/e2e/fine_grained_deps:yarn/yarn.lock",
)

npm_install(
Expand All @@ -130,8 +130,8 @@ npm_install(
".json",
".proto",
],
package_json = "//internal/e2e/fine_grained_deps:package.json",
package_lock_json = "//internal/e2e/fine_grained_deps:package-lock.json",
package_json = "//internal/e2e/fine_grained_deps:npm/package.json",
package_lock_json = "//internal/e2e/fine_grained_deps:npm/package-lock.json",
)

yarn_install(
Expand Down
1 change: 1 addition & 0 deletions e2e/bazel_bin/.bazelignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
4 changes: 4 additions & 0 deletions e2e/bazel_bin/yarn.lock
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
# yarn lockfile v1


"testy@file:./npm/testy":
version "0.0.1"
1 change: 1 addition & 0 deletions e2e/define_var/.bazelignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
1 change: 1 addition & 0 deletions e2e/jasmine/.bazelignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
4 changes: 2 additions & 2 deletions e2e/jasmine/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# yarn lockfile v1


"@bazel/jasmine@file:../../packages/jasmine/bazel-bin/npm_package":
version "0.0.0"
"@bazel/jasmine@file:../../dist/npm_bazel_jasmine$3535":
version "0.27.10-4-gca50827"
dependencies:
jasmine "~3.3.1"
v8-coverage "1.0.8"
Expand Down
1 change: 1 addition & 0 deletions e2e/karma/.bazelignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
Loading

0 comments on commit 3d3f654

Please sign in to comment.