Rolled back re-exported const enums no longer break emit in watch mod…

…e as performance cost was too high - resolves #393
TypeStrong · Dec 8, 2016 · 47ec74d · 47ec74d
1 parent c55cec3
commit 47ec74d
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.3.1
+
+- [Rolled back re-exported const enums no longer break emit in watch mode as performance cost was too high](https://github.com/TypeStrong/ts-loader/pull/406) resolves #393
+
 ## v1.3.0
 
 - [Introduce meaningful error when importing TypeScript from `node_modules`](https://github.com/TypeStrong/ts-loader/pull/399)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ts-loader",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "TypeScript loader for webpack",
   "main": "index.js",
   "scripts": {

diff --git a/src/index.ts b/src/index.ts
@@ -114,9 +114,17 @@ function getEmit(
     const allDefinitionFiles = Object.keys(instance.files).filter(fp => definitionFileRegex.test(fp));
     allDefinitionFiles.forEach(loader.addDependency.bind(loader));
 
+    /* - alternative approach to the below which is more correct but has a heavy performance cost
+         see https://github.com/TypeStrong/ts-loader/issues/393
+         with this approach constEnumReExportWatch test will pass; without it, not.
+
     // Additionally make this file dependent on all imported files as well
     // as any deeper recursive dependencies
-    let additionalDependencies = utils.collectAllDependencies(instance.dependencyGraph, filePath);
+    const additionalDependencies = utils.collectAllDependencies(instance.dependencyGraph, filePath);
+    */
+
+    // Additionally make this file dependent on all imported files
+    const additionalDependencies = instance.dependencyGraph[filePath];
     if (additionalDependencies) {
         additionalDependencies.forEach(loader.addDependency.bind(loader));
     }

diff --git a/test/comparison-tests/constEnumReExportWatch/README.md b/test/comparison-tests/constEnumReExportWatch/README.md
@@ -0,0 +1,3 @@
+This test has been disabled as the extra correctness required for it to pass comes at the cost of too much performance loss.
+
+https://github.com/TypeStrong/ts-loader/issues/393
diff --git a/test/comparison-tests/constEnumReExportWatch/_FLAKY_ b/test/comparison-tests/constEnumReExportWatch/_FLAKY_
diff --git a/test/comparison-tests/instance/tsconfig.json b/test/comparison-tests/instance/tsconfig.json
@@ -2,6 +2,6 @@
 	"compilerOptions": {
 	},
 	"files": [
-		"a.ts"
+		"i-dont-exist"
 	]
 }
diff --git a/test/comparison-tests/simpleDependency/expectedOutput-2.0/patch0/output.txt b/test/comparison-tests/simpleDependency/expectedOutput-2.0/patch0/output.txt
@@ -1,7 +1,7 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  1.75 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 197 bytes [rendered]
-    [0] ./.test/simpleDependency/app.ts 51 bytes {0} [built] [1 error]
+    [0] ./.test/simpleDependency/app.ts 51 bytes {0} [1 error]
     [1] ./.test/simpleDependency/dep.ts 70 bytes {0} [built]
     [2] ./.test/simpleDependency/deeperDep.ts 76 bytes {0} [built]
 

diff --git a/test/comparison-tests/simpleDependency/expectedOutput-2.0/patch1/output.txt b/test/comparison-tests/simpleDependency/expectedOutput-2.0/patch1/output.txt
@@ -1,6 +1,6 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  1.75 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 197 bytes [rendered]
-    [0] ./.test/simpleDependency/app.ts 51 bytes {0} [built]
+    [0] ./.test/simpleDependency/app.ts 51 bytes {0}
     [1] ./.test/simpleDependency/dep.ts 70 bytes {0} [built]
     [2] ./.test/simpleDependency/deeperDep.ts 76 bytes {0} [built]
diff --git a/test/comparison-tests/simpleDependency/expectedOutput-2.1/patch0/output.txt b/test/comparison-tests/simpleDependency/expectedOutput-2.1/patch0/output.txt
@@ -1,7 +1,7 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  1.75 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 197 bytes [rendered]
-    [0] ./.test/simpleDependency/app.ts 51 bytes {0} [built] [1 error]
+    [0] ./.test/simpleDependency/app.ts 51 bytes {0} [1 error]
     [1] ./.test/simpleDependency/dep.ts 70 bytes {0} [built]
     [2] ./.test/simpleDependency/deeperDep.ts 76 bytes {0} [built]
 

diff --git a/test/comparison-tests/simpleDependency/expectedOutput-2.1/patch1/output.txt b/test/comparison-tests/simpleDependency/expectedOutput-2.1/patch1/output.txt
@@ -1,6 +1,6 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  1.75 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 197 bytes [rendered]
-    [0] ./.test/simpleDependency/app.ts 51 bytes {0} [built]
+    [0] ./.test/simpleDependency/app.ts 51 bytes {0}
     [1] ./.test/simpleDependency/dep.ts 70 bytes {0} [built]
     [2] ./.test/simpleDependency/deeperDep.ts 76 bytes {0} [built]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		This test has been disabled as the extra correctness required for it to pass comes at the cost of too much performance loss.

		https://github.com/TypeStrong/ts-loader/issues/393