test: demonstrate dev dependencies between workspace projects

aspect-build · Jan 12, 2025 · 1686081 · 1686081
1 parent 6cf2dc8
commit 1686081
Show file tree

Hide file tree

Showing 22 changed files with 309 additions and 23 deletions.
diff --git a/e2e/pnpm_lockfiles/.bazelignore b/e2e/pnpm_lockfiles/.bazelignore
@@ -1,6 +1,7 @@
 node_modules/
 cases/node_modules
 projects/a/node_modules
+projects/a-types/node_modules
 projects/b/node_modules
 projects/c/node_modules
 projects/d/node_modules

diff --git a/e2e/pnpm_lockfiles/lockfile-test.bzl b/e2e/pnpm_lockfiles/lockfile-test.bzl
@@ -33,17 +33,20 @@ WKSP_FILES = {
     "repositories.bzl": "@REPO_NAME//:repositories.bzl",
 }
 
-def lockfile_test(name = None):
+def lockfile_test(npm_link_all_packages, name = None):
     """
     Tests for a lockfile and associated targets + files generated by rules_js.
 
     Args:
         name: the lockfile version name
+        npm_link_all_packages: the npm_link_all_packages function
     """
 
     lock_version = name if name else native.package_name()
     lock_repo = "lock-%s" % lock_version
 
+    npm_link_all_packages(name = "node_modules")
+
     # Copy each test to this lockfile dir
     for test in ["patched-dependencies-test.js", "aliases-test.js"]:
         copy_file(

diff --git a/e2e/pnpm_lockfiles/projects/a-types/BUILD.bazel b/e2e/pnpm_lockfiles/projects/a-types/BUILD.bazel
@@ -0,0 +1,10 @@
+load("@aspect_rules_js//js:defs.bzl", "js_library")
+
+js_library(
+    name = "pkg",
+    srcs = [
+        "a.d.ts",
+        "package.json",
+    ],
+    visibility = ["//visibility:public"],
+)
diff --git a/e2e/pnpm_lockfiles/projects/a-types/a.d.ts b/e2e/pnpm_lockfiles/projects/a-types/a.d.ts
@@ -0,0 +1 @@
+export const A: number
diff --git a/e2e/pnpm_lockfiles/projects/a-types/package.json b/e2e/pnpm_lockfiles/projects/a-types/package.json
@@ -0,0 +1,7 @@
+{
+    "name": "a-types",
+    "private": true,
+    "dependencies": {
+        "@types/node": "16.18.11"
+    }
+}
diff --git a/e2e/pnpm_lockfiles/projects/b/package.json b/e2e/pnpm_lockfiles/projects/b/package.json
@@ -3,5 +3,9 @@
     "private": true,
     "dependencies": {
         "@scoped/a": "workspace:*"
+    },
+    "devDependencies": {
+        "@types/node": "16.18.11",
+        "a-types": "workspace:*"
     }
 }
diff --git a/e2e/pnpm_lockfiles/v54/BUILD.bazel b/e2e/pnpm_lockfiles/v54/BUILD.bazel
@@ -1,6 +1,4 @@
 load("@lock-v54//:defs.bzl", "npm_link_all_packages")
 load("//:lockfile-test.bzl", "lockfile_test")
 
-npm_link_all_packages()
-
-lockfile_test()
+lockfile_test(npm_link_all_packages = npm_link_all_packages)
diff --git a/e2e/pnpm_lockfiles/v54/pnpm-lock.yaml b/e2e/pnpm_lockfiles/v54/pnpm-lock.yaml
diff --git a/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl
diff --git a/e2e/pnpm_lockfiles/v54/snapshots/repositories.bzl b/e2e/pnpm_lockfiles/v54/snapshots/repositories.bzl
diff --git a/e2e/pnpm_lockfiles/v60/BUILD.bazel b/e2e/pnpm_lockfiles/v60/BUILD.bazel
@@ -1,6 +1,4 @@
 load("@lock-v60//:defs.bzl", "npm_link_all_packages")
 load("//:lockfile-test.bzl", "lockfile_test")
 
-npm_link_all_packages()
-
-lockfile_test()
+lockfile_test(npm_link_all_packages = npm_link_all_packages)
diff --git a/e2e/pnpm_lockfiles/v60/pnpm-lock.yaml b/e2e/pnpm_lockfiles/v60/pnpm-lock.yaml
diff --git a/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl
diff --git a/e2e/pnpm_lockfiles/v60/snapshots/repositories.bzl b/e2e/pnpm_lockfiles/v60/snapshots/repositories.bzl
diff --git a/e2e/pnpm_lockfiles/v61/BUILD.bazel b/e2e/pnpm_lockfiles/v61/BUILD.bazel
@@ -1,6 +1,4 @@
 load("@lock-v61//:defs.bzl", "npm_link_all_packages")
 load("//:lockfile-test.bzl", "lockfile_test")
 
-npm_link_all_packages()
-
-lockfile_test()
+lockfile_test(npm_link_all_packages = npm_link_all_packages)
diff --git a/e2e/pnpm_lockfiles/v61/pnpm-lock.yaml b/e2e/pnpm_lockfiles/v61/pnpm-lock.yaml