Also remove symlink_node_modules = True usage

bazel-contrib · May 25, 2022 · 6f57df2 · 6f57df2
1 parent 8966685
commit 6f57df2
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 32 deletions.
diff --git a/e2e/node_loader_no_preserve_symlinks/WORKSPACE b/e2e/node_loader_no_preserve_symlinks/WORKSPACE
@@ -21,7 +21,5 @@ load("@build_bazel_rules_nodejs//:index.bzl", "yarn_install")
 yarn_install(
     name = "npm",
     package_json = "//:package.json",
-    # TODO: figure out why this test fails with symlink_node_modules disabled
-    symlink_node_modules = True,
     yarn_lock = "//:yarn.lock",
 )
diff --git a/examples/cypress/WORKSPACE b/examples/cypress/WORKSPACE
@@ -44,30 +44,6 @@ yarn_install(
     # defined by /private/var/tmp/_bazel_buildkite/123/external/yarn/BUILD.bazel and referenced by '//:test'
     exports_directories_only = False,
     package_json = "//:package.json",
-    # TODO(danmuller): figure out why this failes when symlink_node_modules = False
-    #  Error: Cannot find module 'express'
-    # Require stack:
-    # - /home/circleci/.cache/bazel/_bazel_circleci/8c1060db33a2856d02a15a3b1eefa1bb/execroot/examples_cypress/bazel-out/k8-fastbuild/bin/plugin.js
-    # - /home/circleci/.cache/bazel/_bazel_circleci/8c1060db33a2856d02a15a3b1eefa1bb/execroot/examples_cypress/bazel-out/k8-fastbuild/bin/test_cypress_plugin_wrapper.js
-    # - /home/circleci/.cache/bazel/_bazel_circleci/8c1060db33a2856d02a15a3b1eefa1bb/external/cypress_linux/Cypress/resources/app/packages/server/lib/plugins/child/run_plugins.js
-    # - /home/circleci/.cache/bazel/_bazel_circleci/8c1060db33a2856d02a15a3b1eefa1bb/external/cypress_linux/Cypress/resources/app/packages/server/lib/plugins/child/index.js
-    #     at Function.Module._resolveFilename (internal/modules/cjs/loader.js:887:15)
-    #     at Module._load (internal/modules/cjs/loader.js:732:27)
-    #     at Function.f._load (electron/js2c/asar_bundle.js:5:12789)
-    #     at Module.require (internal/modules/cjs/loader.js:959:19)
-    #     at require (internal/modules/cjs/helpers.js:88:18)
-    #     at Object.<anonymous> (/home/circleci/.cache/bazel/_bazel_circleci/8c1060db33a2856d02a15a3b1eefa1bb/execroot/examples_cypress/bazel-out/k8-fastbuild/bin/plugin.js:3:15)
-    #     at Module._compile (internal/modules/cjs/loader.js:1078:30)
-    #     at Object.Module._extensions..js (internal/modules/cjs/loader.js:1108:10)
-    #     at Module.load (internal/modules/cjs/loader.js:935:32)
-    #     at Module._load (internal/modules/cjs/loader.js:776:14)
-    #     at Function.f._load (electron/js2c/asar_bundle.js:5:12789)
-    #     at Module.require (internal/modules/cjs/loader.js:959:19)
-    #     at require (internal/modules/cjs/helpers.js:88:18)
-    #     at Object.<anonymous> (/home/circleci/.cache/bazel/_bazel_circleci/8c1060db33a2856d02a15a3b1eefa1bb/execroot/examples_cypress/bazel-out/k8-fastbuild/bin/test_cypress_plugin_wrapper.js:10:20)
-    #     at Module._compile (internal/modules/cjs/loader.js:1078:30)
-    #     at Object.Module._extensions..js (internal/modules/cjs/loader.js:1108:10)
-    symlink_node_modules = True,
     yarn = "@yarnpkg//:bin/yarn",
     yarn_lock = "//:yarn.lock",
 )

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,
     )