diff options
| author | Bartek Iwańczuk <biwanczuk@gmail.com> | 2024-07-11 17:43:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-11 16:43:28 +0000 |
| commit | 4f15aada02450824a0a6e2602dde2fffdd9fd90a (patch) | |
| tree | 510a1785b9e34ce2ba8d0fcc9152a68a8b9f54a6 | |
| parent | f950f599833172048cbbc6d64d3c2fc50b3b3e9a (diff) | |
fix(workspace): allow using --import-map flag with workspace (#24527)
This is a temporary fix, which is not perfect - specifying
`--import-map`
will break resolution of packages defined in `workspace` setting, but
erroring on `--import-map` currently causes regression in code that
worked fine in v1.44.x.
| -rw-r--r-- | Cargo.lock | 4 | ||||
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | tests/specs/run/workspaces/explicit_import_map/__test__.jsonc | 5 | ||||
| -rw-r--r-- | tests/specs/run/workspaces/explicit_import_map/import_map.json | 5 | ||||
| -rw-r--r-- | tests/specs/run/workspaces/explicit_import_map/main.out | 2 | ||||
| -rw-r--r-- | tests/specs/run/workspaces/explicit_import_map/main.ts | 3 | ||||
| -rw-r--r-- | tests/specs/run/workspaces/explicit_import_map/package.json | 3 |
7 files changed, 21 insertions, 3 deletions
diff --git a/Cargo.lock b/Cargo.lock index c00aa2226..8d5865d69 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1308,9 +1308,9 @@ dependencies = [ [[package]] name = "deno_config" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47d457bbaff2200897ab1f635863c477f10524412a1f568535ea26763b96d5c9" +checksum = "c2df23da1c85522dd6cb23372d7953ecf576ec416c5d517b046aeeca281ca5a4" dependencies = [ "anyhow", "deno_semver", diff --git a/Cargo.toml b/Cargo.toml index 8f3fccef6..e26ccc84f 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.21.0", default-features = false } +deno_config = { version = "=0.21.1", 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/run/workspaces/explicit_import_map/__test__.jsonc b/tests/specs/run/workspaces/explicit_import_map/__test__.jsonc new file mode 100644 index 000000000..2bd0d3bcc --- /dev/null +++ b/tests/specs/run/workspaces/explicit_import_map/__test__.jsonc @@ -0,0 +1,5 @@ +{ + "args": "run -A --import-map=./import_map.json main.ts", + "output": "main.out", + "tempDir": true +} diff --git a/tests/specs/run/workspaces/explicit_import_map/import_map.json b/tests/specs/run/workspaces/explicit_import_map/import_map.json new file mode 100644 index 000000000..a2827b171 --- /dev/null +++ b/tests/specs/run/workspaces/explicit_import_map/import_map.json @@ -0,0 +1,5 @@ +{ + "imports": { + "chalk": "npm:chalk" + } +} diff --git a/tests/specs/run/workspaces/explicit_import_map/main.out b/tests/specs/run/workspaces/explicit_import_map/main.out new file mode 100644 index 000000000..c420c1853 --- /dev/null +++ b/tests/specs/run/workspaces/explicit_import_map/main.out @@ -0,0 +1,2 @@ +[WILDCARD] +hello diff --git a/tests/specs/run/workspaces/explicit_import_map/main.ts b/tests/specs/run/workspaces/explicit_import_map/main.ts new file mode 100644 index 000000000..56dcea678 --- /dev/null +++ b/tests/specs/run/workspaces/explicit_import_map/main.ts @@ -0,0 +1,3 @@ +import chalk from "chalk"; + +console.log(chalk.green("hello")); diff --git a/tests/specs/run/workspaces/explicit_import_map/package.json b/tests/specs/run/workspaces/explicit_import_map/package.json new file mode 100644 index 000000000..e5e2f6f5d --- /dev/null +++ b/tests/specs/run/workspaces/explicit_import_map/package.json @@ -0,0 +1,3 @@ +{ + "workspaces": ["packages/*"] +} |