From 92f2039bb36ce2e120bdf07685d2456419217acf Mon Sep 17 00:00:00 2001 From: Gil Tayar Date: Mon, 18 Jul 2022 09:06:38 +0300 Subject: [PATCH 1/2] support nodejs 18 and enable next loader in the chain to continue resolution --- lib/node-import-map-loader.js | 9 ++------- package.json | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/node-import-map-loader.js b/lib/node-import-map-loader.js index 16ed59c..bd58e78 100644 --- a/lib/node-import-map-loader.js +++ b/lib/node-import-map-loader.js @@ -11,13 +11,8 @@ export async function resolve(specifier, context, defaultResolve) { const { parentURL = null } = context; const importMap = await importMapPromise; const importMapUrl = resolveSpecifier(importMap, specifier, parentURL); - if (importMapUrl) { - return { - url: importMapUrl, - }; - } else { - return defaultResolve(specifier, context, defaultResolve); - } + + return defaultResolve(importMapUrl ?? specifier, context, defaultResolve); } async function getImportMapPromise() { diff --git a/package.json b/package.json index 92209e2..4b43b0e 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "husky": "^4.3.0", "left-pad": "^1.3.0", "mocha": "^8.1.3", - "prettier": "^2.1.2", + "prettier": "^2.4.1", "pretty-quick": "^3.0.2" } } From f1a79c42fc8936f54af8d5e7737283edbdf9efef Mon Sep 17 00:00:00 2001 From: Joel Denning Date: Mon, 18 Jul 2022 17:40:24 -0600 Subject: [PATCH 2/2] Undo package.json change --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4b43b0e..92209e2 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "husky": "^4.3.0", "left-pad": "^1.3.0", "mocha": "^8.1.3", - "prettier": "^2.4.1", + "prettier": "^2.1.2", "pretty-quick": "^3.0.2" } }