Put @fine_grained_deps_yarn and @fine_grained_deps_npm package.json f…

…iles in separate folders (#667)

This is part of pre-factoring for switching to user node_modules in yarn_install & npm_install

WORKSPACE

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

internal/e2e/fine_grained_deps/package.json → internal/e2e/fine_grained_deps/npm/package.json

@@ -7,7 +7,6 @@
   "dependencies": {
     "@gregmagolan/test-a": "0.0.4",
     "@gregmagolan/test-b": "0.0.2",
-    "@bazel/bazel": "0.23.0",
     "ajv": "5.5.2",
     "chokidar": "2.0.4",
     "http-server": "github:alexeagle/http-server#97205e945b69091606ed83aa0c8489e9ce65d282",

internal/e2e/fine_grained_deps/yarn/package.json

@@ -0,0 +1,16 @@
+{
+  "description": "runtime dependencies fine_grained_deps e2e test",
+  "devDependencies": {
+    "jasmine": "3.3.0",
+    "typescript": "3.0.3"
+  },
+  "dependencies": {
+    "@gregmagolan/test-a": "0.0.4",
+    "@gregmagolan/test-b": "0.0.2",
+    "ajv": "5.5.2",
+    "chokidar": "2.0.4",
+    "http-server": "github:alexeagle/http-server#97205e945b69091606ed83aa0c8489e9ce65d282",
+    "klaw": "1.3.1",
+    "rxjs": "6.3.3"
+  }
+}

internal/e2e/fine_grained_deps/yarn.lock → internal/e2e/fine_grained_deps/yarn/yarn.lock

@@ -2,30 +2,6 @@
 # yarn lockfile v1
 
 
-"@bazel/[email protected]":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@bazel/bazel-darwin_x64/-/bazel-darwin_x64-0.19.0.tgz#333420555a0a0fd2b548ef0fbe4961bf1712585d"
-  integrity sha512-ht2IuKUaigL4qRpNuPBPT93gVtX/Hr3+YWNbtYXNl81w5WqFcF8XejZ4CYmKQou330kM8oFFs+qSqr69uJV4VQ==
-
-"@bazel/[email protected]":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@bazel/bazel-linux_x64/-/bazel-linux_x64-0.19.0.tgz#313b5d0cd5f443fa506f95cc69d2230fc5fcb0f2"
-  integrity sha512-tXA9/HZg9TT6yY8OyHIwqF1pCu6LWcvfKuesWDTayxxqZTbYlvKKI3+CJXCeFHmkMrmq9cQWYk3RJ7En37s0kQ==
-
-"@bazel/[email protected]":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@bazel/bazel-win32_x64/-/bazel-win32_x64-0.19.0.tgz#5c540535c703bc925caf95c4e1e19957bf0d79b3"
-  integrity sha512-fRCNl7Bmn8PXKRUIlMIddAhgBECc1IVqNIg8S3+n+FEAi53oPkqFkwCLOJD8X8PekhRcimkdT79qp1Oazae17w==
-
-"@bazel/[email protected]":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@bazel/bazel/-/bazel-0.19.0.tgz#b719bf07fe9bd97990481ed638f08b280433be70"
-  integrity sha512-9ldIQzy2P1gDmh7joXkzoFeK8kYfNNIfSd8vjrmGMJDZY+RaHvjLIQPms+pDr0SHurb6j9v4UkAgT99uesCxgQ==
-  optionalDependencies:
-    "@bazel/bazel-darwin_x64" "0.19.0"
-    "@bazel/bazel-linux_x64" "0.19.0"
-    "@bazel/bazel-win32_x64" "0.19.0"
-
 "@gregmagolan/[email protected]":
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/@gregmagolan/test-a/-/test-a-0.0.1.tgz#c90ebc0676f13b34400da8d1e55ffe5aa76655b4"