use encodeURI, per aladdin-add

iambumblehead · Dec 14, 2021 · 996ae9f · 996ae9f
1 parent f91a8e0
commit 996ae9f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
     "rewire"
   ],
   "dependencies": {
-    "resolvewithplus": "^0.5.0"
+    "resolvewithplus": "^0.5.1"
   },
   "devDependencies": {
     "uvu": "0.5.2",
@@ -56,7 +56,7 @@
     "sinon": "^12.0.1"
   },
   "scripts": {
-    "test-ava": "ava --node-arguments=\"--loader=./src/esmockLoader.mjs\" ./spec/ava/*spec.js",
+    "test-ava": "ava --node-arguments=\"--loader=./src/esmockLoader.mjs\" ./spec/ava/*.spec.js",
     "test-uvu": "node --no-warnings --loader=./src/esmockLoader.mjs ./node_modules/uvu/bin.js ./spec/uvu/",
     "test": "npm run test-ava && npm run test-uvu",
     "test-no-warn": "ava --node-arguments=\"--loader=./src/esmockLoader.mjs --no-warnings\"",

diff --git a/src/esmockLoader.mjs b/src/esmockLoader.mjs
@@ -19,7 +19,6 @@ const esmockGlobalsAndAfterRe = /\?esmockGlobals=.*/;
 const esMockGlobalsAndBeforeRe = /.*\?esmockGlobals=/;
 const esmockModuleKeysRe = /#esmockModuleKeys/;
 const exportNamesRe = /.*exportNames=(.*)/;
-const whitespaceRe = /%20/g;
 const esmockKeyRe = /esmockKey=\d*/;
 const withHashRe = /[^#]*#/;
 const isesmRe = /isesm=true/;
@@ -38,7 +37,7 @@ const resolve = async (specifier, context, defaultResolve) => {
     return defaultResolve(specifier, context, defaultResolve);
 
   const resolved = defaultResolve(specifier, context, defaultResolve);
-  const resolvedurl = resolved.url.replace(whitespaceRe, ' ');
+  const resolvedurl = decodeURI(resolved.url);
   const moduleKeyRe = new RegExp(
     '.*(' + resolvedurl + '\\?' + esmockKeyParam + '[^#]*).*');