Prototype of symlinking user node_modules in yarn_install & npm_install

.
bazel-contrib · May 9, 2019 · 917d005 · 917d005
1 parent c00c2a0
commit 917d005
Show file tree

Hide file tree

Showing 45 changed files with 4,531 additions and 452 deletions.
diff --git a/.bazelignore b/.bazelignore
@@ -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/
@@ -11,6 +16,9 @@ packages/
 # A subset of legacy e2e tests are nested workspaces
 # TODO(gregmagolan): move these to /e2e
 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

diff --git a/.bazelrc b/.bazelrc
@@ -10,3 +10,8 @@ test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test
 # Turn off legacy external runfiles
 run --nolegacy_external_runfiles
 test --nolegacy_external_runfiles
+
+# Turn on managed_directories
+build --experimental_allow_incremental_repository_updates
+test --experimental_allow_incremental_repository_updates
+run --experimental_allow_incremental_repository_updates
diff --git a/WORKSPACE b/WORKSPACE
@@ -64,29 +64,6 @@ node_repositories(
 
 yarn_install(
     name = "npm",
-    data = [
-        "@build_bazel_rules_nodejs//:tools/npm_packages/hello/index.js",
-        "@build_bazel_rules_nodejs//:tools/npm_packages/hello/package.json",
-        "@build_bazel_rules_nodejs//:tools/npm_packages/node_resolve_index/index.js",
-        "@build_bazel_rules_nodejs//:tools/npm_packages/node_resolve_index_2/index.js",
-        "@build_bazel_rules_nodejs//:tools/npm_packages/node_resolve_index_2/package.json",
-        "@build_bazel_rules_nodejs//:tools/npm_packages/node_resolve_index_3/index.js",
-        "@build_bazel_rules_nodejs//:tools/npm_packages/node_resolve_index_3/package.json",
-        "@build_bazel_rules_nodejs//:tools/npm_packages/node_resolve_index_4/index.js",
-        "@build_bazel_rules_nodejs//:tools/npm_packages/node_resolve_index_4/package.json",
-        "@build_bazel_rules_nodejs//:tools/npm_packages/node_resolve_main/main.js",
-        "@build_bazel_rules_nodejs//:tools/npm_packages/node_resolve_main/package.json",
-        "@build_bazel_rules_nodejs//:tools/npm_packages/node_resolve_main_2/main.js",
-        "@build_bazel_rules_nodejs//:tools/npm_packages/node_resolve_main_2/package.json",
-        "@build_bazel_rules_nodejs//:tools/npm_packages/node_resolve_nested_main/nested/main.js",
-        "@build_bazel_rules_nodejs//:tools/npm_packages/node_resolve_nested_main/nested/package.json",
-        "@build_bazel_rules_nodejs//:tools/npm_packages/node_resolve_nested_main/package.json",
-        "@build_bazel_rules_nodejs//:tools/npm_packages/test_workspace/BUILD.bazel",
-        "@build_bazel_rules_nodejs//:tools/npm_packages/test_workspace/index.js",
-        "@build_bazel_rules_nodejs//:tools/npm_packages/test_workspace/package.json",
-        "@build_bazel_rules_nodejs//:tools/npm_packages/test_workspace/subdir/BUILD.bazel",
-        "@build_bazel_rules_nodejs//:tools/npm_packages/test_workspace/subdir/index.js",
-    ],
     package_json = "//:package.json",
     yarn_lock = "//:yarn.lock",
 )

diff --git a/e2e/bazel_bin/WORKSPACE b/e2e/bazel_bin/WORKSPACE
@@ -23,10 +23,6 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "yarn_install")
 
 yarn_install(
     name = "npm",
-    data = [
-        "@e2e_bazel_bin//:npm/testy/index.js",
-        "@e2e_bazel_bin//:npm/testy/package.json",
-    ],
     package_json = "//:package.json",
     yarn_lock = "//:yarn.lock",
 )
diff --git a/e2e/karma/.bazelrc b/e2e/karma/.bazelrc
@@ -7,3 +7,8 @@ test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test
 # Turn off legacy external runfiles
 run --nolegacy_external_runfiles
 test --nolegacy_external_runfiles
+
+# Turn on managed_directories
+build --experimental_allow_incremental_repository_updates
+test --experimental_allow_incremental_repository_updates
+run --experimental_allow_incremental_repository_updates
diff --git a/e2e/karma_stack_trace/.bazelrc b/e2e/karma_stack_trace/.bazelrc
@@ -7,3 +7,8 @@ test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test
 # Turn off legacy external runfiles
 run --nolegacy_external_runfiles
 test --nolegacy_external_runfiles
+
+# Turn on managed_directories
+build --experimental_allow_incremental_repository_updates
+test --experimental_allow_incremental_repository_updates
+run --experimental_allow_incremental_repository_updates
diff --git a/e2e/karma_typescript/.bazelrc b/e2e/karma_typescript/.bazelrc
@@ -7,3 +7,8 @@ test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test
 # Turn off legacy external runfiles
 run --nolegacy_external_runfiles
 test --nolegacy_external_runfiles
+
+# Turn on managed_directories
+build --experimental_allow_incremental_repository_updates
+test --experimental_allow_incremental_repository_updates
+run --experimental_allow_incremental_repository_updates