From e30ad77ffa471c4aa00c07cca49eb96bd6065612 Mon Sep 17 00:00:00 2001 From: David Sherret Date: Mon, 8 Jul 2024 20:23:45 -0400 Subject: [PATCH] feat: support wildcards in npm workspaces (#24471) Implemented in https://github.com/denoland/deno_config/pull/74 Closes https://github.com/denoland/deno/issues/24420 --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- tests/specs/npm/workspace_wildcards/__test__.jsonc | 4 ++++ tests/specs/npm/workspace_wildcards/main.out | 2 ++ tests/specs/npm/workspace_wildcards/main.ts | 5 +++++ tests/specs/npm/workspace_wildcards/package.json | 5 +++++ .../npm/workspace_wildcards/packages/package-a/mod.ts | 3 +++ .../workspace_wildcards/packages/package-a/package.json | 7 +++++++ .../npm/workspace_wildcards/packages/package-b/file.ts | 3 +++ .../workspace_wildcards/packages/package-b/package.json | 5 +++++ 10 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 tests/specs/npm/workspace_wildcards/__test__.jsonc create mode 100644 tests/specs/npm/workspace_wildcards/main.out create mode 100644 tests/specs/npm/workspace_wildcards/main.ts create mode 100644 tests/specs/npm/workspace_wildcards/package.json create mode 100644 tests/specs/npm/workspace_wildcards/packages/package-a/mod.ts create mode 100644 tests/specs/npm/workspace_wildcards/packages/package-a/package.json create mode 100644 tests/specs/npm/workspace_wildcards/packages/package-b/file.ts create mode 100644 tests/specs/npm/workspace_wildcards/packages/package-b/package.json diff --git a/Cargo.lock b/Cargo.lock index 04be7a90fc..b749a1b840 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1307,9 +1307,9 @@ dependencies = [ [[package]] name = "deno_config" -version = "0.20.1" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff203375858a92c7afa82324e89ff1f84c04fb456613135c4abccc6b8f31e8e5" +checksum = "acd69b394ee336e02ac28cf412a543f9e83d79c8e6584a530940712fa6c01885" dependencies = [ "anyhow", "deno_semver", diff --git a/Cargo.toml b/Cargo.toml index 439ec744aa..9df94cb105 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -101,7 +101,7 @@ console_static_text = "=0.8.1" data-encoding = "2.3.3" data-url = "=0.3.0" deno_cache_dir = "=0.10.0" -deno_config = { version = "=0.20.1", default-features = false } +deno_config = { version = "=0.20.2", default-features = false } dlopen2 = "0.6.1" ecb = "=0.1.2" elliptic-curve = { version = "0.13.4", features = ["alloc", "arithmetic", "ecdh", "std", "pem"] } diff --git a/tests/specs/npm/workspace_wildcards/__test__.jsonc b/tests/specs/npm/workspace_wildcards/__test__.jsonc new file mode 100644 index 0000000000..eeb1629ec0 --- /dev/null +++ b/tests/specs/npm/workspace_wildcards/__test__.jsonc @@ -0,0 +1,4 @@ +{ + "args": "run --node-modules-dir=false main.ts", + "output": "main.out" +} diff --git a/tests/specs/npm/workspace_wildcards/main.out b/tests/specs/npm/workspace_wildcards/main.out new file mode 100644 index 0000000000..dde5d5d017 --- /dev/null +++ b/tests/specs/npm/workspace_wildcards/main.out @@ -0,0 +1,2 @@ +3 +7 diff --git a/tests/specs/npm/workspace_wildcards/main.ts b/tests/specs/npm/workspace_wildcards/main.ts new file mode 100644 index 0000000000..a9a90ba126 --- /dev/null +++ b/tests/specs/npm/workspace_wildcards/main.ts @@ -0,0 +1,5 @@ +import { add } from "npm:@denotest/a"; +import { subtract } from "npm:@denotest/b"; + +console.log(add(1, 2)); +console.log(add(4, 3)); diff --git a/tests/specs/npm/workspace_wildcards/package.json b/tests/specs/npm/workspace_wildcards/package.json new file mode 100644 index 0000000000..c4ac3364a3 --- /dev/null +++ b/tests/specs/npm/workspace_wildcards/package.json @@ -0,0 +1,5 @@ +{ + "workspaces": [ + "packages/*" + ] +} diff --git a/tests/specs/npm/workspace_wildcards/packages/package-a/mod.ts b/tests/specs/npm/workspace_wildcards/packages/package-a/mod.ts new file mode 100644 index 0000000000..8d9b8a22a1 --- /dev/null +++ b/tests/specs/npm/workspace_wildcards/packages/package-a/mod.ts @@ -0,0 +1,3 @@ +export function add(a: number, b: number): number { + return a + b; +} diff --git a/tests/specs/npm/workspace_wildcards/packages/package-a/package.json b/tests/specs/npm/workspace_wildcards/packages/package-a/package.json new file mode 100644 index 0000000000..0b4b7cedc6 --- /dev/null +++ b/tests/specs/npm/workspace_wildcards/packages/package-a/package.json @@ -0,0 +1,7 @@ +{ + "name": "@denotest/a", + "version": "1.0.0", + "exports": { + ".": "./mod.ts" + } +} diff --git a/tests/specs/npm/workspace_wildcards/packages/package-b/file.ts b/tests/specs/npm/workspace_wildcards/packages/package-b/file.ts new file mode 100644 index 0000000000..b5bd2dfcf4 --- /dev/null +++ b/tests/specs/npm/workspace_wildcards/packages/package-b/file.ts @@ -0,0 +1,3 @@ +export function subtract(a: number, b: number): number { + return a - b; +} diff --git a/tests/specs/npm/workspace_wildcards/packages/package-b/package.json b/tests/specs/npm/workspace_wildcards/packages/package-b/package.json new file mode 100644 index 0000000000..e9cc07c383 --- /dev/null +++ b/tests/specs/npm/workspace_wildcards/packages/package-b/package.json @@ -0,0 +1,5 @@ +{ + "name": "@denotest/b", + "version": "1.0.0", + "main": "./file.ts" +}