Merge pull request #1471 from stealjs/ts-clone

Make steal-clone work with tree-shaken trees
stealjs · Oct 25, 2018 · 56eb233 · 56eb233
2 parents 709a004 + 947e105
commit 56eb233
Show file tree

Hide file tree

Showing 12 changed files with 63 additions and 9 deletions.
diff --git a/ext/steal-clone.js b/ext/steal-clone.js
@@ -41,6 +41,14 @@ function cloneConfig(obj, isTopLevel) {
 		return clone;
 	}
 
+	if(obj instanceof Set) {
+		clone = new Set();
+		obj.forEach(function(item) {
+			clone.add(item);
+		});
+		return clone;
+	}
+
 	// instanceof fails to catch objects created with `null` as prototype
 	if (obj instanceof Object || toString.call(obj) === "[object Object]") {
 		clone = {};

diff --git a/test/test.js b/test/test.js
@@ -376,6 +376,10 @@ QUnit.test("Can disable tree shaking using treeShaking: false", function(assert)
 	makeIframe("tree_shake_reexport/tree-shaking-false.html", assert);
 });
 
+QUnit.test("Using steal-clone with a tree-shaken dep tree", function(assert){
+	makeIframe("tree_shake/steal-clone.html", assert);
+});
+
 QUnit.test("Can replace loads midway through the process", function(assert){
 	makeIframe("replace/site.html", assert);
 });

diff --git a/test/tree-shake-complex/site.html b/test/tree-shake-complex/site.html
@@ -11,7 +11,7 @@
 	</script>
 	<script
 		main="~/main"
-		src="../../../steal-with-promises.js"
+		src="../../steal-with-promises.js"
 		data-base-url="."
 		data-config="package.json!npm"></script>
 	<script>

diff --git a/test/tree_shake/anon.html b/test/tree_shake/anon.html
@@ -9,7 +9,7 @@
 		window.assert = window.parent.assert;
 		window.done = window.parent.done;
 	</script>
-	<script src="../../../steal-with-promises.js"
+	<script src="../../steal-with-promises.js"
 		data-base-url="."
 		data-config="package.json!npm"
 		data-main="@empty">

diff --git a/test/tree_shake/bundle.html b/test/tree_shake/bundle.html
@@ -10,7 +10,7 @@
 	window.done = window.parent.done;
 </script>
 <script
-	src="../../../steal-with-promises.js"
+	src="../../steal-with-promises.js"
 	data-main="@empty"
 	data-base-url="."
 	data-config="package.json!npm"></script>

diff --git a/test/tree_shake/dev.html b/test/tree_shake/dev.html
@@ -11,7 +11,7 @@
 	</script>
 	<script
 		main="~/main"
-		src="../../../steal-with-promises.js"
+		src="../../steal-with-promises.js"
 		data-base-url="."
 		data-config="package.json!npm"></script>
 	<script>

diff --git a/test/tree_shake/race.html b/test/tree_shake/race.html
@@ -9,7 +9,7 @@
 		window.assert = window.parent.assert;
 		window.done = window.parent.done;
 	</script>
-	<script src="../../../steal.js"
+	<script src="../../steal.js"
 		data-base-url="."
 		data-main="@empty"
 		data-config="package.json!npm"></script>

diff --git a/test/tree_shake/steal-clone.html b/test/tree_shake/steal-clone.html
@@ -0,0 +1,42 @@
+<!doctype html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title>Tree shaking with steal-clone</title>
+</head>
+<body>
+	<script>
+		window.assert = window.parent.assert;
+		window.done = window.parent.done;
+	</script>
+	<script
+		main="~/main"
+		src="../../steal-with-promises.js"
+		data-base-url="."
+		data-config="package.json!npm"></script>
+	<script>
+		function runTests() {
+			return steal.loader.import("steal-clone", { name: steal.loader.main })
+			.then(function(clone) {
+				return clone({})
+				.import(steal.loader.main)
+				.then(function() {
+					if(window.assert) {
+						window.assert.ok(true, "It loaded");
+					} else {
+						console.log("it loaded successfully");
+					}
+				})
+			});
+		}
+
+		steal.done()
+		.then(runTests)
+		.then(function(){
+			if(window.assert) {
+				window.done();
+			}
+		});
+	</script>
+</body>
+</html>
diff --git a/test/tree_shake_reexport/dev.html b/test/tree_shake_reexport/dev.html
@@ -11,7 +11,7 @@
 	</script>
 	<script
 		main="~/uses-core"
-		src="../../../steal-with-promises.js"
+		src="../../steal-with-promises.js"
 		data-base-url="."
 		data-config="package.json!npm"></script>
 	<script>

diff --git a/test/tree_shake_reexport/main.html b/test/tree_shake_reexport/main.html
@@ -11,7 +11,7 @@
 	</script>
 	<script
 		main="~/main"
-		src="../../../steal-with-promises.js"
+		src="../../steal-with-promises.js"
 		data-base-url="."
 		data-config="package.json!npm"></script>
 	<script>

diff --git a/test/tree_shake_reexport/no-tree-shaking.html b/test/tree_shake_reexport/no-tree-shaking.html
@@ -10,7 +10,7 @@
 		window.done = window.parent.done;
 	</script>
 	<script
-		src="../../../steal-with-promises.js"
+		src="../../steal-with-promises.js"
 		data-base-url="."
 		data-config="package.json!npm"
 		data-no-tree-shaking></script>

diff --git a/test/tree_shake_reexport/tree-shaking-false.html b/test/tree_shake_reexport/tree-shaking-false.html
@@ -10,7 +10,7 @@
 		window.done = window.parent.done;
 	</script>
 	<script
-		src="../../../steal-with-promises.js"
+		src="../../steal-with-promises.js"
 		data-base-url="."
 		data-config="package.json!npm"></script>
 	<script>