From b70f520ebc59d123c114b76013a233c4250227e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Tue, 22 Nov 2022 20:09:30 +0100 Subject: fix: Make npm packages works with import maps (#16754) Co-authored-by: David Sherret --- cli/tsc/00_typescript.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'cli/tsc/00_typescript.js') diff --git a/cli/tsc/00_typescript.js b/cli/tsc/00_typescript.js index 01377c8b5..4f2a0c467 100644 --- a/cli/tsc/00_typescript.js +++ b/cli/tsc/00_typescript.js @@ -90846,7 +90846,7 @@ var ts; if (!text.startsWith("npm:")) { throw new Error("Not an npm specifier: ".concat(text)); } - text = text.replace(/^npm:/, ""); + text = text.replace(/^npm:\/?/, ""); var parts = text.split("/"); var namePartLen = text.startsWith("@") ? 2 : 1; if (parts.length < namePartLen) { @@ -90860,8 +90860,12 @@ var ts; versionReq = lastNamePart.substring(lastAtIndex + 1); nameParts[nameParts.length - 1] = lastNamePart.substring(0, lastAtIndex); } + var name = nameParts.join("/"); + if (name.length === 0) { + throw new Error("Npm specifier did not have a name: ".concat(text)); + } return { - name: nameParts.join("/"), + name: name, versionReq: versionReq, subPath: parts.length > nameParts.length ? parts.slice(nameParts.length).join("/") : undefined, }; -- cgit v1.2.3