fix(workspace): support wildcard packages (#26568)

This commit adds support for wildcard packages in `workspace` configuration option in `deno.json`. This is now supported: ``` { "workspace": [ "./packages/*" ] } ``` Closes #25783
denoland · Nov 5, 2024 · 69879d8 · 69879d8
1 parent 331f101
commit 69879d8
Show file tree

Hide file tree

Showing 14 changed files with 73 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -70,7 +70,7 @@ winres.workspace = true
 [dependencies]
 deno_ast = { workspace = true, features = ["bundler", "cjs", "codegen", "proposal", "react", "sourcemap", "transforms", "typescript", "view", "visit"] }
 deno_cache_dir = { workspace = true }
-deno_config = { version = "=0.37.2", features = ["workspace", "sync"] }
+deno_config = { version = "=0.38.2", features = ["workspace", "sync"] }
 deno_core = { workspace = true, features = ["include_js_files_for_snapshotting"] }
 deno_doc = { version = "0.156.0", default-features = false, features = ["rust", "html", "syntect"] }
 deno_graph = { version = "=0.84.1" }

diff --git a/tests/specs/run/workspaces/wildcard/__test__.jsonc b/tests/specs/run/workspaces/wildcard/__test__.jsonc
@@ -0,0 +1,5 @@
+{
+  "args": "run -L debug -A main.ts",
+  "output": "main.out",
+  "tempDir": true
+}
diff --git a/tests/specs/run/workspaces/wildcard/deno.json b/tests/specs/run/workspaces/wildcard/deno.json
@@ -0,0 +1,8 @@
+{
+  "workspace": [
+    "./packages/*"
+  ],
+  "imports": {
+    "chalk": "npm:chalk"
+  }
+}
diff --git a/tests/specs/run/workspaces/wildcard/main.out b/tests/specs/run/workspaces/wildcard/main.out
@@ -0,0 +1,22 @@
+[WILDCARD]Workspace config generated this import map {
+  "imports": {
+    "chalk": "npm:chalk",
+    "chalk/": "npm:/chalk/"
+  },
+  "scopes": {
+    "./packages/bar/": {
+      "@/": "./packages/bar/",
+      "secret_mod/": "./packages/bar/some_mod/"
+    },
+    "./packages/foo/": {
+      "~/": "./packages/foo/",
+      "foo/": "./packages/foo/bar/"
+    }
+  }
+}
+[WILDCARD]
+hello from foo
+buzz from foo
+hello from bar
+buzz from bar
+[Function: chalk][WILDCARD]
diff --git a/tests/specs/run/workspaces/wildcard/main.ts b/tests/specs/run/workspaces/wildcard/main.ts
@@ -0,0 +1,5 @@
+import chalk from "chalk";
+import "./packages/foo/mod.ts";
+import "./packages/bar/mod.ts";
+
+console.log(chalk);
diff --git a/tests/specs/run/workspaces/wildcard/packages/bar/deno.json b/tests/specs/run/workspaces/wildcard/packages/bar/deno.json
@@ -0,0 +1,8 @@
+{
+  "name": "asdfasdfasdf",
+  "version": "0.0.0",
+  "imports": {
+    "@/": "./",
+    "secret_mod/": "./some_mod/"
+  }
+}
diff --git a/tests/specs/run/workspaces/wildcard/packages/bar/fizz/buzz.ts b/tests/specs/run/workspaces/wildcard/packages/bar/fizz/buzz.ts
@@ -0,0 +1 @@
+export const buzz = "buzz from bar";
diff --git a/tests/specs/run/workspaces/wildcard/packages/bar/mod.ts b/tests/specs/run/workspaces/wildcard/packages/bar/mod.ts
@@ -0,0 +1,5 @@
+import { hello } from "secret_mod/hello.ts";
+import { buzz } from "@/fizz/buzz.ts";
+
+console.log(hello);
+console.log(buzz);
diff --git a/tests/specs/run/workspaces/wildcard/packages/bar/some_mod/hello.ts b/tests/specs/run/workspaces/wildcard/packages/bar/some_mod/hello.ts
@@ -0,0 +1 @@
+export const hello = "hello from bar";
diff --git a/tests/specs/run/workspaces/wildcard/packages/foo/bar/hello.ts b/tests/specs/run/workspaces/wildcard/packages/foo/bar/hello.ts
@@ -0,0 +1 @@
+export const hello = "hello from foo";
diff --git a/tests/specs/run/workspaces/wildcard/packages/foo/deno.json b/tests/specs/run/workspaces/wildcard/packages/foo/deno.json
@@ -0,0 +1,8 @@
+{
+  "name": "qwerqwer",
+  "version": "0.0.0",
+  "imports": {
+    "~/": "./",
+    "foo/": "./bar/"
+  }
+}
diff --git a/tests/specs/run/workspaces/wildcard/packages/foo/fizz/buzz.ts b/tests/specs/run/workspaces/wildcard/packages/foo/fizz/buzz.ts
@@ -0,0 +1 @@
+export const buzz = "buzz from foo";
diff --git a/tests/specs/run/workspaces/wildcard/packages/foo/mod.ts b/tests/specs/run/workspaces/wildcard/packages/foo/mod.ts
@@ -0,0 +1,5 @@
+import { hello } from "foo/hello.ts";
+import { buzz } from "~/fizz/buzz.ts";
+
+console.log(hello);
+console.log(buzz);