WIP prototype of symlinking user node_modules in yarn_install & npm_i…

…nstall

.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/
@@ -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

.circleci/config.yml

@@ -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}
 

WORKSPACE

@@ -64,24 +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",
-    ],
     package_json = "//:package.json",
     yarn_lock = "//:yarn.lock",
 )

e2e/bazel_bin/.bazelignore

@@ -0,0 +1 @@
+node_modules

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

e2e/define_var/.bazelignore

@@ -0,0 +1 @@
+node_modules

e2e/jasmine/.bazelignore

@@ -0,0 +1 @@
+node_modules

e2e/karma/.bazelignore

@@ -0,0 +1 @@
+node_modules

e2e/karma_stack_trace/.bazelignore

@@ -0,0 +1 @@
+node_modules

e2e/karma_typescript/.bazelignore

@@ -0,0 +1 @@
+node_modules

e2e/tsconfig_extends/.bazelignore

@@ -0,0 +1 @@
+node_modules

e2e/typescript_2.7/.bazelignore

@@ -0,0 +1 @@
+node_modules

e2e/typescript_2.8/.bazelignore

@@ -0,0 +1 @@
+node_modules

e2e/typescript_2.9/.bazelignore

@@ -0,0 +1 @@
+node_modules

e2e/typescript_3.0/.bazelignore

@@ -0,0 +1 @@
+node_modules

e2e/typescript_3.1/.bazelignore

@@ -0,0 +1 @@
+node_modules

examples/bazel_managed_deps/.bazelignore

@@ -0,0 +1 @@
+node_modules

examples/parcel/.bazelignore

@@ -0,0 +1 @@
+node_modules

examples/program/WORKSPACE

@@ -23,8 +23,4 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories")
 #   bazel run @nodejs//:yarn
 # or
 #   bazel run @nodejs//:npm
-node_repositories(
-    node_version = "8.11.1",
-    package_json = ["//:package.json"],
-    yarn_version = "1.5.1",
-)
+node_repositories(package_json = ["//:package.json"])

examples/vendored_node/.bazelignore

@@ -0,0 +1 @@
+node_modules

examples/web_testing/.bazelignore

@@ -0,0 +1 @@
+node_modules

examples/webapp/.bazelignore

@@ -0,0 +1 @@
+node_modules

internal/e2e/bazel_workspaces/WORKSPACE

@@ -9,13 +9,6 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "yarn_install")
 
 yarn_install(
     name = "npm",
-    data = [
-        "@bazel_workspaces//:npm/test_workspace/WORKSPACE",
-        "@bazel_workspaces//:npm/test_workspace/package.json",
-        "@bazel_workspaces//:npm/test_workspace/src/BUILD.bazel",
-        "@bazel_workspaces//:npm/test_workspace/src/test.spec.js",
-        "@bazel_workspaces//:npm/test_workspace/yarn.lock",
-    ],
     package_json = "//:package.json",
     yarn_lock = "//:yarn.lock",
 )

internal/e2e/bazel_workspaces_compat/WORKSPACE

@@ -9,23 +9,6 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "yarn_install")
 
 yarn_install(
     name = "npm",
-    data = [
-        "@bazel_workspaces_compat//:npm/test_workspace_a/WORKSPACE",
-        "@bazel_workspaces_compat//:npm/test_workspace_a/package.json",
-        "@bazel_workspaces_compat//:npm/test_workspace_a/src/BUILD.bazel",
-        "@bazel_workspaces_compat//:npm/test_workspace_a/src/test.spec.js",
-        "@bazel_workspaces_compat//:npm/test_workspace_a/yarn.lock",
-        "@bazel_workspaces_compat//:npm/test_workspace_b/WORKSPACE",
-        "@bazel_workspaces_compat//:npm/test_workspace_b/package.json",
-        "@bazel_workspaces_compat//:npm/test_workspace_b/src/BUILD.bazel",
-        "@bazel_workspaces_compat//:npm/test_workspace_b/src/test.spec.js",
-        "@bazel_workspaces_compat//:npm/test_workspace_b/yarn.lock",
-        "@bazel_workspaces_compat//:npm/test_workspace_c/WORKSPACE",
-        "@bazel_workspaces_compat//:npm/test_workspace_c/package.json",
-        "@bazel_workspaces_compat//:npm/test_workspace_c/src/BUILD.bazel",
-        "@bazel_workspaces_compat//:npm/test_workspace_c/src/test.spec.js",
-        "@bazel_workspaces_compat//:npm/test_workspace_c/yarn.lock",
-    ],
     package_json = "//:package.json",
     yarn_lock = "//:yarn.lock",
 )

internal/e2e/fine_grained_no_bin/package.json

@@ -2,4 +2,4 @@
   "dependencies": {
     "fs.realpath": "1.0.0"
   }
-}
+}

internal/e2e/packages/BUILD.bazel

@@ -9,7 +9,6 @@ filegroup(
 
 VARIANTS = [
     "npm_install",
-    "npm_no_lockfile",
     "yarn_install",
 ]
 

internal/e2e/packages/WORKSPACE

@@ -10,7 +10,7 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "check_rules_nodejs_version", "node
 # Test that check_rules_nodejs_version works as expected
 check_rules_nodejs_version(minimum_version_string = "0.11.2")
 
-node_repositories(package_json = ["//:package.json"])
+node_repositories()
 
 load(":setup_workspace.bzl", "packages_example_setup_workspace")
 

internal/e2e/packages/npm1/package.json

@@ -0,0 +1,12 @@
+{
+  "description": "runtime dependencies for packages example",
+  "dependencies": {
+    "jsesc": "~1.2.0",
+    "jasmine": "2.8.0"
+  },
+  "scripts": {
+    "postinstall": "node ../postinstall.js",
+    "pretest": "bazel run @nodejs//:yarn",
+    "test": "bazel test //..."
+  }
+}

internal/e2e/packages/npm2/package.json

@@ -0,0 +1,12 @@
+{
+  "description": "runtime dependencies for packages example",
+  "dependencies": {
+    "jsesc": "~1.2.0",
+    "jasmine": "2.8.0"
+  },
+  "scripts": {
+    "postinstall": "node ../postinstall.js",
+    "pretest": "bazel run @nodejs//:yarn",
+    "test": "bazel test //..."
+  }
+}

internal/e2e/packages/package.json

@@ -1,12 +1,6 @@
 {
-  "description": "runtime dependencies for packages example",
-  "dependencies": {
-    "jsesc": "~1.2.0",
-    "jasmine": "2.8.0"
-  },
   "scripts": {
     "postinstall": "node ./postinstall.js",
-    "pretest": "bazel run @nodejs//:yarn",
     "test": "bazel test //..."
   }
 }

internal/e2e/packages/setup_workspace.bzl

@@ -22,36 +22,26 @@ def packages_example_setup_workspace():
     """
     npm_install(
         name = "packages_example_npm_install",
-        package_json = "@packages_example//:package.json",
-        package_lock_json = "@packages_example//:package-lock.json",
-        data = ["@packages_example//:postinstall.js"],
+        package_json = "@packages_example//:npm1/package.json",
+        package_lock_json = "@packages_example//:npm1/package-lock.json",
         # Just here as a smoke test for this attribute
         prod_only = True,
     )
 
     npm_install(
         name = "packages_example_npm_install_duplicate_for_determinism_testing",
-        package_json = "@packages_example//:package.json",
-        package_lock_json = "@packages_example//:package-lock.json",
-        data = ["@packages_example//:postinstall.js"],
-    )
-
-    npm_install(
-        name = "packages_example_npm_no_lockfile",
-        package_json = "@packages_example//:package.json",
-        data = ["@packages_example//:postinstall.js"],
+        package_json = "@packages_example//:npm2/package.json",
+        package_lock_json = "@packages_example//:npm2/package-lock.json",
     )
 
     yarn_install(
         name = "packages_example_yarn_install",
-        package_json = "@packages_example//:package.json",
-        yarn_lock = "@packages_example//:yarn.lock",
-        data = ["@packages_example//:postinstall.js"],
+        package_json = "@packages_example//:yarn1/package.json",
+        yarn_lock = "@packages_example//:yarn1/yarn.lock",
     )
 
     yarn_install(
         name = "packages_example_yarn_install_duplicate_for_determinism_testing",
-        package_json = "@packages_example//:package.json",
-        yarn_lock = "@packages_example//:yarn.lock",
-        data = ["@packages_example//:postinstall.js"],
+        package_json = "@packages_example//:yarn2/package.json",
+        yarn_lock = "@packages_example//:yarn2/yarn.lock",
     )

internal/e2e/packages/yarn1/package.json

@@ -0,0 +1,12 @@
+{
+  "description": "runtime dependencies for packages example",
+  "dependencies": {
+    "jsesc": "~1.2.0",
+    "jasmine": "2.8.0"
+  },
+  "scripts": {
+    "postinstall": "node ../postinstall.js",
+    "pretest": "bazel run @nodejs//:yarn",
+    "test": "bazel test //..."
+  }
+}