fix: ensure full URLs for unnamed imports

lukeed · Apr 11, 2019 · 2314f61 · 2314f61
1 parent 2d23896
commit 2314f61
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/legacy.js b/src/legacy.js
@@ -24,12 +24,12 @@ function run(url, str) {
 
 	var txt = imports(
 			// Ensure full URLs & Gather static imports
-			str.replace(/(import\s*.*\s*from\s*)['"]([^'"]+)['"];?/gi, function (_, state, loc) {
-				loc = "'" + toURL(loc, url) + "'";
-				return state + (/\s*from\s*/.test(state) ? "'$dimport[" + (urls.push(loc) - 1) + "]';" : loc + ";");
+			str.replace(/(^|\s|;)(import\s*)(\(|.*from\s*|)['"]([^'"]+)['"];?/gi, function (_, pre, req, type, loc) {
+				loc = "'" + new URL(loc, url).href + "'";
+				return pre + req + type + (type == '(' ? loc : `'$dimport[${urls.push(loc) - 1}]';`);
 			})
 
-			// Attach ourself for dynamic imports
+			// Ensure we caught all dynamics (multi-line clause)
 			.replace(/(^|\s|;)(import)(?=\()/g, '$1window.dimport')
 
 			// Exports

diff --git a/src/module.js b/src/module.js
@@ -16,8 +16,8 @@ function toBlob(url, txt) {
 	return URL.createObjectURL(
 		new Blob([
 			// Ensure full URLs & rewrite dynamic imports
-			txt.replace(/(^|\s|;)(import\s*\(|import\s*.*\s*from\s*)['"]([^'"]+)['"]/gi, function (_, pre, req, loc) {
-				return pre + (/\s+from\s*/.test(req) ? req : 'window.dimport(') + "'" + new URL(loc, url) + "'";
+			txt.replace(/(^|\s|;)(import\s*)(\(|.*from\s*|)['"]([^'"]+)['"]/gi, function (_, pre, req, type, loc) {
+				return pre + (type == '(' ? 'window.dimport' : req) + type + "'" + new URL(loc, url) + "'";
 			})
 			// Ensure we caught all dynamics (multi-line clauses)
 			.replace(/(^|\s|;)(import)(?=\()/g, '$1window.dimport')

diff --git a/src/nomodule.js b/src/nomodule.js
@@ -14,12 +14,12 @@ function run(url, str) {
 
 	var txt = imports(
 			// Ensure full URLs & Gather static imports
-			str.replace(/(import\s*.*\s*from\s*)['"]([^'"]+)['"];?/gi, function (_, state, loc) {
+			str.replace(/(^|\s|;)(import\s*)(\(|.*from\s*|)['"]([^'"]+)['"];?/gi, function (_, pre, req, type, loc) {
 				loc = "'" + new URL(loc, url).href + "'";
-				return state + (/\s*from\s*/.test(state) ? "'$dimport[" + (urls.push(loc) - 1) + "]';" : loc + ";");
+				return pre + req + type + (type == '(' ? loc : `'$dimport[${urls.push(loc) - 1}]';`);
 			})
 
-			// Attach ourself for dynamic imports
+			// Ensure we caught all dynamics (multi-line clause)
 			.replace(/(^|\s|;)(import)(?=\()/g, '$1window.dimport')
 
 			// Exports