From 06bd9e9e1640150f98857a74fea0cc1a3b3386a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Fri, 11 Nov 2022 18:20:13 +0100
Subject: [PATCH] fix(npm): disable npm specifiers in import.meta.resolve()
 (#16599)

---
 cli/tests/testdata/run/import_meta/main.out |  2 ++
 cli/tests/testdata/run/import_meta/main.ts  |  5 +++++
 core/bindings.rs                            | 10 ++++++++--
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/cli/tests/testdata/run/import_meta/main.out b/cli/tests/testdata/run/import_meta/main.out
index 89aeddaf32..1b51f1cdfe 100644
--- a/cli/tests/testdata/run/import_meta/main.out
+++ b/cli/tests/testdata/run/import_meta/main.out
@@ -7,3 +7,5 @@ Resolving without a value from import map https://example.com/PASS-undefined
 Resolving 1 from import map https://example.com/PASS-1
 Resolving null from import map https://example.com/PASS-null
 Resolving object from import map https://example.com/PASS-object
+TypeError: "npm:" specifiers are currently not supported in import.meta.resolve()
+    at file:///[WILDCARD]testdata/run/import_meta/main.ts:36:15
diff --git a/cli/tests/testdata/run/import_meta/main.ts b/cli/tests/testdata/run/import_meta/main.ts
index 02f0a1c589..0d7cb96dae 100644
--- a/cli/tests/testdata/run/import_meta/main.ts
+++ b/cli/tests/testdata/run/import_meta/main.ts
@@ -32,3 +32,8 @@ assertThrows(() => {
 assertThrows(() => {
   import.meta.resolve("://malformed/url?asdf");
 }, TypeError);
+try {
+  import.meta.resolve("npm:cowsay");
+} catch (e) {
+  console.log(e);
+}
diff --git a/core/bindings.rs b/core/bindings.rs
index 82cce71025..a28618571a 100644
--- a/core/bindings.rs
+++ b/core/bindings.rs
@@ -363,8 +363,14 @@ fn import_meta_resolve(
     let module_map = module_map_rc.borrow();
     module_map.loader.clone()
   };
-  match loader.resolve(&specifier.to_rust_string_lossy(scope), &referrer, false)
-  {
+  let specifier_str = specifier.to_rust_string_lossy(scope);
+
+  if specifier_str.starts_with("npm:") {
+    throw_type_error(scope, "\"npm:\" specifiers are currently not supported in import.meta.resolve()");
+    return;
+  }
+
+  match loader.resolve(&specifier_str, &referrer, false) {
     Ok(resolved) => {
       let resolved_val = serde_v8::to_v8(scope, resolved.as_str()).unwrap();
       rv.set(resolved_val);