Remove link_deps & unlink_deps scripts (#795)

Now that yarn_install runs in the user's WORKSPACE we can use relative `file:../../dist/npm_package_foobar` references in nested workspace package.json. Add a touch_deps.sh script which goes through all nested workspaces and dirties them when a package is generated or re-generated.
bazel-contrib · May 28, 2019 · 6ed31eb · 6ed31eb
1 parent dfa7b99
commit 6ed31eb
Show file tree

Hide file tree

Showing 56 changed files with 210 additions and 280 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -206,7 +206,7 @@ jobs:
       - persist_to_workspace:
           root: ~/
           paths:
-            - ./rules_nodejs/dist/npm_bazel_typescript$*
+            - ./rules_nodejs/dist/npm_bazel_typescript
 
   build_karma_package:
     <<: *job_defaults
@@ -219,7 +219,7 @@ jobs:
       - persist_to_workspace:
           root: ~/
           paths:
-            - ./rules_nodejs/dist/npm_bazel_karma$*
+            - ./rules_nodejs/dist/npm_bazel_karma
 
   build_jasmine_package:
     <<: *job_defaults
@@ -232,7 +232,7 @@ jobs:
       - persist_to_workspace:
           root: ~/
           paths:
-            - ./rules_nodejs/dist/npm_bazel_jasmine$*
+            - ./rules_nodejs/dist/npm_bazel_jasmine
 
   build_labs_package:
     <<: *job_defaults
@@ -245,7 +245,7 @@ jobs:
       - persist_to_workspace:
           root: ~/
           paths:
-            - ./rules_nodejs/dist/npm_bazel_labs$*
+            - ./rules_nodejs/dist/npm_bazel_labs
 
   test_packages:
     <<: *job_defaults
@@ -320,7 +320,6 @@ jobs:
           name: Test angular-bazel-example
           command: |
             cd ./examples/angular
-            ../../scripts/link_deps.sh
             # Install Bazel from NPM
             yarn
             # Build and Test

diff --git a/e2e/jasmine/package.json b/e2e/jasmine/package.json
@@ -1,7 +1,7 @@
 {
   "name": "e2e-jasmine",
   "dependencies": {
-    "@bazel/jasmine": "bazel://@npm_bazel_jasmine//:npm_package",
+    "@bazel/jasmine": "file:../../dist/npm_bazel_jasmine",
     "zone.js": "0.8.29"
   },
   "//": "Include an incompatible jasmine as a devDependency to verify that jasmine_node_test works regardless",
@@ -10,7 +10,6 @@
     "jasmine-core": "2.5.2"
   },
   "scripts": {
-    "pretest": "../../scripts/link_deps.sh",
     "test": "bazel test ..."
   }
 }
diff --git a/e2e/jasmine/yarn.lock b/e2e/jasmine/yarn.lock
@@ -2,8 +2,8 @@
 # yarn lockfile v1
 
 
-"@bazel/jasmine@file:../../dist/npm_bazel_jasmine$6825":
-  version "0.29.0-7-g61d4b0a"
+"@bazel/jasmine@file:../../dist/npm_bazel_jasmine":
+  version "0.30.1-2-g5cc5c06"
   dependencies:
     jasmine "~3.3.1"
     jasmine-core "~3.3.0"

diff --git a/e2e/karma/package.json b/e2e/karma/package.json
@@ -1,10 +1,9 @@
 {
   "dependencies": {
-    "@bazel/karma": "bazel://@npm_bazel_karma//:npm_package",
+    "@bazel/karma": "file:../../dist/npm_bazel_karma",
     "karma": "3.0.0"
   },
   "scripts": {
-    "pretest": "../../scripts/link_deps.sh",
     "test": "bazel test ..."
   }
 }
diff --git a/e2e/karma/yarn.lock b/e2e/karma/yarn.lock
@@ -2,8 +2,8 @@
 # yarn lockfile v1
 
 
-"@bazel/karma@file:../../dist/npm_bazel_karma$2011":
-  version "0.29.0-7-g61d4b0a"
+"@bazel/karma@file:../../dist/npm_bazel_karma":
+  version "0.30.1-2-g5cc5c06"
   dependencies:
     jasmine-core "2.8.0"
     karma "^4.0.0"

diff --git a/e2e/karma_stack_trace/package.json b/e2e/karma_stack_trace/package.json
@@ -1,12 +1,11 @@
 {
   "dependencies": {
-    "@bazel/karma": "bazel://@npm_bazel_karma//:npm_package",
-    "@bazel/typescript": "bazel://@npm_bazel_typescript//:npm_package",
+    "@bazel/karma": "file:../../dist/npm_bazel_karma",
+    "@bazel/typescript": "file:../../dist/npm_bazel_typescript",
     "@types/jasmine": "2.8.2",
     "typescript": "3.1.x"
   },
   "scripts": {
-    "pretest": "../../scripts/link_deps.sh",
     "test": "bazel test ..."
   }
 }
diff --git a/e2e/karma_stack_trace/yarn.lock b/e2e/karma_stack_trace/yarn.lock
@@ -2,8 +2,8 @@
 # yarn lockfile v1
 
 
-"@bazel/karma@file:../../dist/npm_bazel_karma$2011":
-  version "0.29.0-7-g61d4b0a"
+"@bazel/karma@file:../../dist/npm_bazel_karma":
+  version "0.30.1-2-g5cc5c06"
   dependencies:
     jasmine-core "2.8.0"
     karma "^4.0.0"
@@ -17,8 +17,8 @@
     semver "5.6.0"
     tmp "0.0.33"
 
-"@bazel/typescript@file:../../dist/npm_bazel_typescript$7423":
-  version "0.29.0-7-g61d4b0a"
+"@bazel/typescript@file:../../dist/npm_bazel_typescript":
+  version "0.30.1-2-g5cc5c06"
   dependencies:
     protobufjs "6.8.8"
     semver "5.6.0"

diff --git a/e2e/karma_typescript/package.json b/e2e/karma_typescript/package.json
@@ -1,14 +1,13 @@
 {
   "dependencies": {
-    "@bazel/karma": "bazel://@npm_bazel_karma//:npm_package",
-    "@bazel/typescript": "bazel://@npm_bazel_typescript//:npm_package",
+    "@bazel/karma": "file:../../dist/npm_bazel_karma",
+    "@bazel/typescript": "file:../../dist/npm_bazel_typescript",
     "@types/jasmine": "^3.3.12",
     "jasmine": "^3.4.0",
     "rxjs": "^6.4.0",
     "typescript": "2.9.2"
   },
   "scripts": {
-    "pretest": "../../scripts/link_deps.sh",
     "test": "bazel test ..."
   }
 }
diff --git a/e2e/karma_typescript/yarn.lock b/e2e/karma_typescript/yarn.lock
@@ -2,8 +2,8 @@
 # yarn lockfile v1
 
 
-"@bazel/karma@file:../../dist/npm_bazel_karma$2011":
-  version "0.29.0-7-g61d4b0a"
+"@bazel/karma@file:../../dist/npm_bazel_karma":
+  version "0.30.1-2-g5cc5c06"
   dependencies:
     jasmine-core "2.8.0"
     karma "^4.0.0"
@@ -17,8 +17,8 @@
     semver "5.6.0"
     tmp "0.0.33"
 
-"@bazel/typescript@file:../../dist/npm_bazel_typescript$7423":
-  version "0.29.0-7-g61d4b0a"
+"@bazel/typescript@file:../../dist/npm_bazel_typescript":
+  version "0.30.1-2-g5cc5c06"
   dependencies:
     protobufjs "6.8.8"
     semver "5.6.0"

diff --git a/e2e/ts_auto_deps/package.json b/e2e/ts_auto_deps/package.json
@@ -1,10 +1,10 @@
 {
   "dependencies": {
-    "@bazel/typescript": "bazel://@npm_bazel_typescript//:npm_package",
+    "@bazel/typescript": "file:../../dist/npm_bazel_typescript",
     "typescript": "2.9.2"
   },
   "scripts": {
-    "pretest": "../../scripts/link_deps.sh && bazel run @nodejs//:yarn",
+    "pretest": "bazel run @nodejs//:yarn",
     "test": "cd simple && ts_auto_deps && bazel build simple"
   }
 }
diff --git a/e2e/ts_auto_deps/yarn.lock b/e2e/ts_auto_deps/yarn.lock
@@ -2,8 +2,8 @@
 # yarn lockfile v1
 
 
-"@bazel/typescript@file:../../dist/npm_bazel_typescript$7423":
-  version "0.29.0-7-g61d4b0a"
+"@bazel/typescript@file:../../dist/npm_bazel_typescript":
+  version "0.30.1-2-g5cc5c06"
   dependencies:
     protobufjs "6.8.8"
     semver "5.6.0"

diff --git a/e2e/ts_devserver/package.json b/e2e/ts_devserver/package.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "@bazel/typescript": "bazel://@npm_bazel_typescript//:npm_package",
+    "@bazel/typescript": "file:../../dist/npm_bazel_typescript",
     "@types/jasmine": "2.8.2",
     "@types/node": "7.0.18",
     "concurrently": "^3.5.1",
@@ -10,7 +10,7 @@
     "typescript": "2.7.x"
   },
   "scripts": {
-    "pretest": "../../scripts/link_deps.sh && bazel run @nodejs//:yarn && webdriver-manager update --standalone false --gecko false $CHROMEDRIVER_VERSION_ARG",
+    "pretest": "bazel run @nodejs//:yarn && webdriver-manager update --standalone false --gecko false $CHROMEDRIVER_VERSION_ARG",
     "test_root": "concurrently \"bazel run //:devserver\" \"while ! nc -z 127.0.0.1 8080; do sleep 1; done && protractor --suite root\" --kill-others --success first",
     "test_subpackage": "concurrently \"bazel run //subpackage:devserver\" \"while ! nc -z 127.0.0.1 8080; do sleep 1; done && protractor --suite subpackage\" --kill-others --success first",
     "test_genrule": "concurrently \"bazel run //genrule:devserver\" \"while ! nc -z 127.0.0.1 8080; do sleep 1; done && protractor --suite genrule\" --kill-others --success first",

diff --git a/e2e/ts_devserver/yarn.lock b/e2e/ts_devserver/yarn.lock
@@ -2,8 +2,8 @@
 # yarn lockfile v1
 
 
-"@bazel/typescript@file:../../dist/npm_bazel_typescript$7423":
-  version "0.29.0-7-g61d4b0a"
+"@bazel/typescript@file:../../dist/npm_bazel_typescript":
+  version "0.30.1-2-g5cc5c06"
   dependencies:
     protobufjs "6.8.8"
     semver "5.6.0"

diff --git a/e2e/ts_library/package.json b/e2e/ts_library/package.json
@@ -1,8 +1,8 @@
 {
   "//": "When setting bazelOpts { tsickle: true }, you must also add a devDependency on the tsickle npm package",
   "dependencies": {
-    "@bazel/jasmine": "bazel://@npm_bazel_jasmine//:npm_package",
-    "@bazel/typescript": "bazel://@npm_bazel_typescript//:npm_package",
+    "@bazel/jasmine": "file:../../dist/npm_bazel_jasmine",
+    "@bazel/typescript": "file:../../dist/npm_bazel_typescript",
     "@types/hammerjs": "2.0.35",
     "@types/jasmine": "3.3.9",
     "@types/node": "11.11.2",
@@ -11,7 +11,7 @@
     "zone.js": "0.8.26"
   },
   "scripts": {
-    "pretest": "../../scripts/link_deps.sh && bazel run @nodejs//:yarn",
+    "pretest": "bazel run @nodejs//:yarn",
     "test": "bazel build ... && bazel test ... && bazel build @disable_tsetse_for_external_test//..."
   }
 }
diff --git a/e2e/ts_library/yarn.lock b/e2e/ts_library/yarn.lock
@@ -2,15 +2,15 @@
 # yarn lockfile v1
 
 
-"@bazel/jasmine@file:../../dist/npm_bazel_jasmine$6825":
-  version "0.29.0-7-g61d4b0a"
+"@bazel/jasmine@file:../../dist/npm_bazel_jasmine":
+  version "0.30.1-2-g5cc5c06"
   dependencies:
     jasmine "~3.3.1"
     jasmine-core "~3.3.0"
     v8-coverage "1.0.9"
 
-"@bazel/typescript@file:../../dist/npm_bazel_typescript$7423":
-  version "0.29.0-7-g61d4b0a"
+"@bazel/typescript@file:../../dist/npm_bazel_typescript":
+  version "0.30.1-2-g5cc5c06"
   dependencies:
     protobufjs "6.8.8"
     semver "5.6.0"

diff --git a/e2e/tsconfig_extends/package.json b/e2e/tsconfig_extends/package.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "@bazel/typescript": "bazel://@npm_bazel_typescript//:npm_package",
+    "@bazel/typescript": "file:../../dist/npm_bazel_typescript",
     "typescript": "^3.3.1"
   },
   "scripts": {

diff --git a/e2e/tsconfig_extends/yarn.lock b/e2e/tsconfig_extends/yarn.lock
@@ -2,8 +2,8 @@
 # yarn lockfile v1
 
 
-"@bazel/typescript@file:../../dist/npm_bazel_typescript$7423":
-  version "0.29.0-7-g61d4b0a"
+"@bazel/typescript@file:../../dist/npm_bazel_typescript":
+  version "0.30.1-2-g5cc5c06"
   dependencies:
     protobufjs "6.8.8"
     semver "5.6.0"

diff --git a/e2e/typescript_2.7/package.json b/e2e/typescript_2.7/package.json
@@ -1,13 +1,12 @@
 {
   "dependencies": {
-    "@bazel/jasmine": "bazel://@npm_bazel_jasmine//:npm_package",
-    "@bazel/typescript": "bazel://@npm_bazel_typescript//:npm_package",
+    "@bazel/jasmine": "file:../../dist/npm_bazel_jasmine",
+    "@bazel/typescript": "file:../../dist/npm_bazel_typescript",
     "@types/jasmine": "2.8.2",
     "@types/node": "7.0.18",
     "typescript": "2.7.x"
   },
   "scripts": {
-    "pretest": "../../scripts/link_deps.sh",
     "test": "bazel test ..."
   }
 }
diff --git a/e2e/typescript_2.7/yarn.lock b/e2e/typescript_2.7/yarn.lock
@@ -2,15 +2,15 @@
 # yarn lockfile v1
 
 
-"@bazel/jasmine@file:../../dist/npm_bazel_jasmine$6825":
-  version "0.29.0-7-g61d4b0a"
+"@bazel/jasmine@file:../../dist/npm_bazel_jasmine":
+  version "0.30.1-2-g5cc5c06"
   dependencies:
     jasmine "~3.3.1"
     jasmine-core "~3.3.0"
     v8-coverage "1.0.9"
 
-"@bazel/typescript@file:../../dist/npm_bazel_typescript$7423":
-  version "0.29.0-7-g61d4b0a"
+"@bazel/typescript@file:../../dist/npm_bazel_typescript":
+  version "0.30.1-2-g5cc5c06"
   dependencies:
     protobufjs "6.8.8"
     semver "5.6.0"

diff --git a/e2e/typescript_2.8/package.json b/e2e/typescript_2.8/package.json
@@ -1,13 +1,12 @@
 {
   "dependencies": {
-    "@bazel/jasmine": "bazel://@npm_bazel_jasmine//:npm_package",
-    "@bazel/typescript": "bazel://@npm_bazel_typescript//:npm_package",
+    "@bazel/jasmine": "file:../../dist/npm_bazel_jasmine",
+    "@bazel/typescript": "file:../../dist/npm_bazel_typescript",
     "@types/jasmine": "2.8.2",
     "@types/node": "7.0.18",
     "typescript": "2.8.x"
   },
   "scripts": {
-    "pretest": "../../scripts/link_deps.sh",
     "test": "bazel test ..."
   }
 }
diff --git a/e2e/typescript_2.8/yarn.lock b/e2e/typescript_2.8/yarn.lock
@@ -2,15 +2,15 @@
 # yarn lockfile v1
 
 
-"@bazel/jasmine@file:../../dist/npm_bazel_jasmine$6825":
-  version "0.29.0-7-g61d4b0a"
+"@bazel/jasmine@file:../../dist/npm_bazel_jasmine":
+  version "0.30.1-2-g5cc5c06"
   dependencies:
     jasmine "~3.3.1"
     jasmine-core "~3.3.0"
     v8-coverage "1.0.9"
 
-"@bazel/typescript@file:../../dist/npm_bazel_typescript$7423":
-  version "0.29.0-7-g61d4b0a"
+"@bazel/typescript@file:../../dist/npm_bazel_typescript":
+  version "0.30.1-2-g5cc5c06"
   dependencies:
     protobufjs "6.8.8"
     semver "5.6.0"

diff --git a/e2e/typescript_2.9/package.json b/e2e/typescript_2.9/package.json
@@ -1,13 +1,12 @@
 {
   "dependencies": {
-    "@bazel/jasmine": "bazel://@npm_bazel_jasmine//:npm_package",
-    "@bazel/typescript": "bazel://@npm_bazel_typescript//:npm_package",
+    "@bazel/jasmine": "file:../../dist/npm_bazel_jasmine",
+    "@bazel/typescript": "file:../../dist/npm_bazel_typescript",
     "@types/jasmine": "2.8.2",
     "@types/node": "7.0.18",
     "typescript": "2.9.x"
   },
   "scripts": {
-    "pretest": "../../scripts/link_deps.sh",
     "test": "bazel test ..."
   }
 }
diff --git a/e2e/typescript_2.9/yarn.lock b/e2e/typescript_2.9/yarn.lock
@@ -2,15 +2,15 @@
 # yarn lockfile v1
 
 
-"@bazel/jasmine@file:../../dist/npm_bazel_jasmine$6825":
-  version "0.29.0-7-g61d4b0a"
+"@bazel/jasmine@file:../../dist/npm_bazel_jasmine":
+  version "0.30.1-2-g5cc5c06"
   dependencies:
     jasmine "~3.3.1"
     jasmine-core "~3.3.0"
     v8-coverage "1.0.9"
 
-"@bazel/typescript@file:../../dist/npm_bazel_typescript$7423":
-  version "0.29.0-7-g61d4b0a"
+"@bazel/typescript@file:../../dist/npm_bazel_typescript":
+  version "0.30.1-2-g5cc5c06"
   dependencies:
     protobufjs "6.8.8"
     semver "5.6.0"