Merge pull request #1492 from stealjs/duplicate-import-error

Include filename in duplicate import error message
stealjs · Aug 1, 2019 · 226625c · 226625c
2 parents 6e1659a + c09a6b7
commit 226625c
Show file tree

Hide file tree

Showing 13 changed files with 63 additions and 11 deletions.
diff --git a/main.js b/main.js
@@ -1270,7 +1270,8 @@ addStealExtension(function addTreeShaking(loader) {
 				}
 				var code = babel.transform(load.source, {
 					plugins: babelPlugins,
-					compact: false
+					compact: false,
+					filename: load && load.address
 				}).code;
 
 				// If everything is tree shaken still mark as ES6

diff --git a/src/extension-tree-shaking.js b/src/extension-tree-shaking.js
@@ -326,7 +326,8 @@ addStealExtension(function addTreeShaking(loader) {
 				}
 				var code = babel.transform(load.source, {
 					plugins: babelPlugins,
-					compact: false
+					compact: false,
+					filename: load && load.address
 				}).code;
 
 				// If everything is tree shaken still mark as ES6

diff --git a/steal-with-promises.js b/steal-with-promises.js
@@ -7441,7 +7441,8 @@ addStealExtension(function addTreeShaking(loader) {
 				}
 				var code = babel.transform(load.source, {
 					plugins: babelPlugins,
-					compact: false
+					compact: false,
+					filename: load && load.address
 				}).code;
 
 				// If everything is tree shaken still mark as ES6

diff --git a/steal-with-promises.production.js b/steal-with-promises.production.js
diff --git a/steal.js b/steal.js
@@ -6171,7 +6171,8 @@ addStealExtension(function addTreeShaking(loader) {
 				}
 				var code = babel.transform(load.source, {
 					plugins: babelPlugins,
-					compact: false
+					compact: false,
+					filename: load && load.address
 				}).code;
 
 				// If everything is tree shaken still mark as ES6

diff --git a/steal.production.js b/steal.production.js
diff --git a/test/duplicate_import_warning/dev.html b/test/duplicate_import_warning/dev.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<meta http-equiv="X-UA-Compatible" content="ie=edge">
+	<title>Duplicate Import Warning</title>
+</head>
+<body>
+	<script src="../../steal.js" config="./package.json!npm">
+		var done = window.parent.done;
+		var assert = window.parent.assert;
+
+		if (assert) {
+			steal
+				.import("~/dups")
+				.then(function resolved() {
+					assert.ok(false, "it should not resolve");
+					done();
+				})
+				.catch(function rejected(err) {
+					assert.notOk(
+						/unknown:/.test(err.message),
+						"error should include the filename"
+					);
+					assert.ok(
+						/dups.js/.test(err.message),
+						"error should include the filename"
+					);
+					done();
+				});
+		}
+	</script>
+</body>
+</html>
diff --git a/test/duplicate_import_warning/dups.js b/test/duplicate_import_warning/dups.js
@@ -0,0 +1,2 @@
+import foo from "~/foo";
+import foo from "~/foo";
diff --git a/test/duplicate_import_warning/foo.js b/test/duplicate_import_warning/foo.js
@@ -0,0 +1 @@
+export default function foo() {}
diff --git a/test/duplicate_import_warning/package.json b/test/duplicate_import_warning/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "duplicate_imports",
+  "main": "dups.js",
+  "version": "0.0.1"
+}
diff --git a/test/steal-with-promises.js b/test/steal-with-promises.js
@@ -7441,7 +7441,8 @@ addStealExtension(function addTreeShaking(loader) {
 				}
 				var code = babel.transform(load.source, {
 					plugins: babelPlugins,
-					compact: false
+					compact: false,
+					filename: load && load.address
 				}).code;
 
 				// If everything is tree shaken still mark as ES6

diff --git a/test/steal-with-promises.production.js b/test/steal-with-promises.production.js
diff --git a/test/test.js b/test/test.js
@@ -264,6 +264,10 @@ if (hasConsole) {
 	QUnit.test("No 'loaded twice' warnings when there is a loading error", function(assert){
 		makeIframe("load_module_twice_false_positive/on-error.html", assert);
 	});
+
+	QUnit.test("Duplicate import error should include filename", function(assert) {
+		makeIframe("duplicate_import_warning/dev.html", assert);
+	});
 }
 
 QUnit.test("can add implicit deps to ES and CJS modules", function(assert) {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		import foo from "~/foo";
		import foo from "~/foo";