summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Sherret <dsherret@users.noreply.github.com>2024-05-07 17:53:17 -0400
committerGitHub <noreply@github.com>2024-05-07 21:53:17 +0000
commit5379bb0289faaf39df9d3ce8e02c1d2f631e2696 (patch)
tree80188f7d3b4868de41f325e0fe31430aaa98ce1d
parent25fcfe5d79850b6969f2756415fc01e2234850c9 (diff)
fix(jsr): panic when importing jsr package with deps via https (#23728)
Closes #23644
-rw-r--r--Cargo.lock4
-rw-r--r--cli/Cargo.toml2
-rw-r--r--tests/specs/jsr/import_jsr_via_https/main.check.out4
-rw-r--r--tests/specs/jsr/import_jsr_via_https/main.info.out13
-rw-r--r--tests/specs/jsr/import_jsr_via_https/main.out13
-rw-r--r--tests/specs/jsr/import_jsr_via_https/main.ts4
6 files changed, 23 insertions, 17 deletions
diff --git a/Cargo.lock b/Cargo.lock
index c21efbbc8..c5340cb07 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1483,9 +1483,9 @@ dependencies = [
[[package]]
name = "deno_graph"
-version = "0.74.4"
+version = "0.74.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d70d7b300e5a4863d817db6fdcd914b57ff5165b481b4288437fe63d48757765"
+checksum = "9b7078d584a4ff53349ec8f7909826dffe2a0c2ccb61b9b6549ea38d996d5a61"
dependencies = [
"anyhow",
"async-trait",
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index a82b2045b..d1a47e468 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -69,7 +69,7 @@ deno_config = "=0.16.3"
deno_core = { workspace = true, features = ["include_js_files_for_snapshotting"] }
deno_doc = { version = "=0.129.0", features = ["html", "syntect"] }
deno_emit = "=0.40.2"
-deno_graph = { version = "=0.74.4", features = ["tokio_executor"] }
+deno_graph = { version = "=0.74.5", features = ["tokio_executor"] }
deno_lint = { version = "=0.58.4", features = ["docs"] }
deno_lockfile.workspace = true
deno_npm = "=0.18.0"
diff --git a/tests/specs/jsr/import_jsr_via_https/main.check.out b/tests/specs/jsr/import_jsr_via_https/main.check.out
index 923e54e7e..eabb94e49 100644
--- a/tests/specs/jsr/import_jsr_via_https/main.check.out
+++ b/tests/specs/jsr/import_jsr_via_https/main.check.out
@@ -1,3 +1,3 @@
error: Failed resolving types. Importing JSR packages via HTTPS specifiers for type checking is not supported for performance reasons. If you would like types, import via a `jsr:` specifier instead or else use a non-statically analyzable dynamic import.
- Importing: http://127.0.0.1:4250/@denotest/add/1.0.0/mod.ts
- at file:///[WILDLINE]/import_jsr_via_https/main.ts:1:21
+ Importing: http://127.0.0.1:4250/@denotest/deps/1.0.0/mod.ts
+ at file:///[WILDLINE]/import_jsr_via_https/main.ts:1:18
diff --git a/tests/specs/jsr/import_jsr_via_https/main.info.out b/tests/specs/jsr/import_jsr_via_https/main.info.out
index f9f19f112..e06511590 100644
--- a/tests/specs/jsr/import_jsr_via_https/main.info.out
+++ b/tests/specs/jsr/import_jsr_via_https/main.info.out
@@ -1,10 +1,9 @@
-local: [WILDLINE]
-emit: [WILDLINE]
-type: TypeScript
-dependencies: [WILDLINE]
-size: [WILDLINE]
+[WILDCARD]
file:///[WILDLINE]/main.ts ([WILDLINE])
-├── http://127.0.0.1:4250/@denotest/add/1.0.0/mod.ts ([WILDLINE])
+├─┬ http://127.0.0.1:4250/@denotest/deps/1.0.0/mod.ts ([WILDLINE])
+│ ├── http://127.0.0.1:4250/@denotest/module-graph/1.4.0/other.ts ([WILDLINE])
+│ └─┬ http://127.0.0.1:4250/@denotest/no-module-graph/0.1.1/mod.ts ([WILDLINE])
+│ └── http://127.0.0.1:4250/@denotest/no-module-graph/0.1.1/TestClass.ts ([WILDLINE])
└── Importing JSR packages via HTTPS specifiers for type checking is not supported for performance reasons. If you would like types, import via a `jsr:` specifier instead or else use a non-statically analyzable dynamic import.
- Importing: http://127.0.0.1:4250/@denotest/add/1.0.0/mod.ts (resolve error)
+ Importing: http://127.0.0.1:4250/@denotest/deps/1.0.0/mod.ts (resolve error)
diff --git a/tests/specs/jsr/import_jsr_via_https/main.out b/tests/specs/jsr/import_jsr_via_https/main.out
index 374af34f9..cb4c27fb0 100644
--- a/tests/specs/jsr/import_jsr_via_https/main.out
+++ b/tests/specs/jsr/import_jsr_via_https/main.out
@@ -1,3 +1,10 @@
-Download http://127.0.0.1:4250/@denotest/add/1.0.0_meta.json
-Download http://127.0.0.1:4250/@denotest/add/1.0.0/mod.ts
-3
+Download http://127.0.0.1:4250/@denotest/deps/1.0.0_meta.json
+Download http://127.0.0.1:4250/@denotest/deps/1.0.0/mod.ts
+Download http://127.0.0.1:4250/@denotest/module-graph/meta.json
+Download http://127.0.0.1:4250/@denotest/no-module-graph/meta.json
+Download http://127.0.0.1:4250/@denotest/module-graph/1.4.0_meta.json
+Download http://127.0.0.1:4250/@denotest/no-module-graph/0.1.1_meta.json
+Download http://127.0.0.1:4250/@denotest/no-module-graph/0.1.1/mod.ts
+Download http://127.0.0.1:4250/@denotest/no-module-graph/0.1.1/TestClass.ts
+Download http://127.0.0.1:4250/@denotest/module-graph/1.4.0/other.ts
+0.1.1
diff --git a/tests/specs/jsr/import_jsr_via_https/main.ts b/tests/specs/jsr/import_jsr_via_https/main.ts
index 2378bb42a..63c9ec9f4 100644
--- a/tests/specs/jsr/import_jsr_via_https/main.ts
+++ b/tests/specs/jsr/import_jsr_via_https/main.ts
@@ -1,3 +1,3 @@
-import { add } from "http://127.0.0.1:4250/@denotest/add/1.0.0/mod.ts";
+import deps from "http://127.0.0.1:4250/@denotest/deps/1.0.0/mod.ts";
-console.log(add(1, 2));
+console.log(deps.version);