Also remove symlink_node_modules = True usage

bazel-contrib · Jun 9, 2022 · ab7f6ea · ab7f6ea
1 parent 8966685
commit ab7f6ea
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 126 deletions.
diff --git a/e2e/BUILD.bazel b/e2e/BUILD.bazel
@@ -75,13 +75,6 @@ e2e_integration_test(
     "4.0.x",
 ]]
 
-e2e_integration_test(
-    name = "e2e_node_loader_no_preserve_symlinks",
-    # TODO: figure out why this fails on Windows since setting
-    # symlink_node_modules to False in the test WORKSPACE
-    tags = ["no-bazelci-windows"],
-)
-
 e2e_integration_test(
     name = "e2e_node_loader_preserve_symlinks",
     # TODO: figure out why this fails on Windows since setting

diff --git a/e2e/node_loader_no_preserve_symlinks/.bazelignore b/e2e/node_loader_no_preserve_symlinks/.bazelignore
diff --git a/e2e/node_loader_no_preserve_symlinks/.bazelrc b/e2e/node_loader_no_preserve_symlinks/.bazelrc
diff --git a/e2e/node_loader_no_preserve_symlinks/BUILD.bazel b/e2e/node_loader_no_preserve_symlinks/BUILD.bazel
diff --git a/e2e/node_loader_no_preserve_symlinks/WORKSPACE b/e2e/node_loader_no_preserve_symlinks/WORKSPACE
diff --git a/e2e/node_loader_no_preserve_symlinks/node_loader_test.spec.js b/e2e/node_loader_no_preserve_symlinks/node_loader_test.spec.js
diff --git a/e2e/node_loader_no_preserve_symlinks/package.json b/e2e/node_loader_no_preserve_symlinks/package.json
diff --git a/e2e/node_loader_no_preserve_symlinks/yarn.lock b/e2e/node_loader_no_preserve_symlinks/yarn.lock
diff --git a/examples/cypress/WORKSPACE b/examples/cypress/WORKSPACE
@@ -12,7 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-workspace(name = "examples_cypress")
+workspace(
+    name = "examples_cypress",
+    managed_directories = {"@yarn": ["node_modules"]},
+)
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 

diff --git a/npm_deps.bzl b/npm_deps.bzl
@@ -80,8 +80,6 @@ js_library(
     visibility = ["//very_testy:__pkg__"],
 )
 """,
-        # symlink_node_modules needed for running e2e & example integration tests on Windows CI
-        symlink_node_modules = True,
         # exports_directories_only needs to be disabled for @npm to support some legacy tests
         exports_directories_only = False,
     )
@@ -470,7 +468,6 @@ filegroup(
         patch_args = ["-p0"],
         patch_tool = "patch",
         post_install_patches = ["//internal/npm_install/test/patches_yarn_symlinked:semver+1.0.0.patch"],
-        symlink_node_modules = True,
         yarn_lock = "//internal/npm_install/test/patches_yarn_symlinked:yarn.lock",
         quiet = False,
     )
@@ -482,7 +479,6 @@ filegroup(
         patch_args = ["-p0"],
         patch_tool = "patch",
         post_install_patches = ["//internal/npm_install/test/patches_npm_symlinked:semver+1.0.0.patch"],
-        symlink_node_modules = True,
         quiet = False,
     )
 
@@ -546,8 +542,6 @@ filegroup(
         name = "cypress_deps",
         package_json = "//packages/cypress/test:package.json",
         yarn_lock = "//packages/cypress/test:yarn.lock",
-        # TODO: get cypress rule working with symlink_node_modules = False
-        symlink_node_modules = True,
         # TODO: get cypress rule working with exports_directories_only = True
         exports_directories_only = False,
     )