Merge pull request #406 from johnnyreilly/master

johnnyreilly · web-flow · commit b74b7e3feba5 · 2016-12-08T20:19:02.000Z
Regenerate test data for TypeScript 2.1
diff --git a/.travis.yml b/.travis.yml
@@ -14,5 +14,5 @@ env:
   - TYPESCRIPT=typescript@1.7.5
   - TYPESCRIPT=typescript@1.8.2
   - TYPESCRIPT=typescript@2.0.9
-  - TYPESCRIPT=typescript@2.1.1
+  - TYPESCRIPT=typescript@2.1.4
   - TYPESCRIPT=typescript@next
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/appveyor.yml b/appveyor.yml
@@ -5,7 +5,7 @@ environment:
   - TYPESCRIPT: typescript@1.7.5
   - TYPESCRIPT: typescript@1.8.2
   - TYPESCRIPT: typescript@2.0.9
-  - TYPESCRIPT: typescript@2.1.1
+  - TYPESCRIPT: typescript@2.1.4
   - TYPESCRIPT: typescript@next
 install:
   - ps: Install-Product node $env:nodejs_version
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/babel-issue81/expectedOutput-2.1/bundle.js.map b/test/comparison-tests/babel-issue81/expectedOutput-2.1/bundle.js.map
diff --git a/test/comparison-tests/babel-issue92/tsconfig.json b/test/comparison-tests/babel-issue92/tsconfig.json
@@ -1,5 +1,6 @@
 {
 	"compilerOptions": {
+		"jsx": "react",
 		"target": "es6"
 	}
 }
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/constEnumReExportWatch/expectedOutput-2.1/bundle.transpiled.js b/test/comparison-tests/constEnumReExportWatch/expectedOutput-2.1/bundle.transpiled.js
@@ -63,10 +63,10 @@
 /***/ function(module, exports) {
 
 	"use strict";
+	var BarEnum;
 	(function (BarEnum) {
 	    BarEnum[BarEnum["Bar"] = 1] = "Bar";
-	})(exports.BarEnum || (exports.BarEnum = {}));
-	var BarEnum = exports.BarEnum;
+	})(BarEnum = exports.BarEnum || (exports.BarEnum = {}));
 	;
 
 
diff --git a/test/comparison-tests/constEnumReExportWatch/expectedOutput-2.1/output.transpiled.txt b/test/comparison-tests/constEnumReExportWatch/expectedOutput-2.1/output.transpiled.txt
@@ -1,6 +1,6 @@
     Asset     Size  Chunks             Chunk Names
-bundle.js  1.87 kB       0  [emitted]  main
-chunk    {0} bundle.js (main) 310 bytes [rendered]
+bundle.js  1.86 kB       0  [emitted]  main
+chunk    {0} bundle.js (main) 302 bytes [rendered]
     [0] ./.test/constEnumReExportWatch/app.ts 76 bytes {0} [built]
     [1] ./.test/constEnumReExportWatch/foo.ts 77 bytes {0} [built]
-    [2] ./.test/constEnumReExportWatch/bar.ts 157 bytes {0} [built]
+    [2] ./.test/constEnumReExportWatch/bar.ts 149 bytes {0} [built]
diff --git a/test/comparison-tests/constEnumReExportWatch/expectedOutput-2.1/patch0/bundle.transpiled.js b/test/comparison-tests/constEnumReExportWatch/expectedOutput-2.1/patch0/bundle.transpiled.js
@@ -63,10 +63,10 @@
 /***/ function(module, exports) {
 
 	"use strict";
+	var BarEnum;
 	(function (BarEnum) {
 	    BarEnum[BarEnum["Bar"] = 2] = "Bar";
-	})(exports.BarEnum || (exports.BarEnum = {}));
-	var BarEnum = exports.BarEnum;
+	})(BarEnum = exports.BarEnum || (exports.BarEnum = {}));
 	;
 
 
diff --git a/test/comparison-tests/constEnumReExportWatch/expectedOutput-2.1/patch0/output.transpiled.txt b/test/comparison-tests/constEnumReExportWatch/expectedOutput-2.1/patch0/output.transpiled.txt
@@ -1,6 +1,6 @@
     Asset     Size  Chunks             Chunk Names
-bundle.js  1.87 kB       0  [emitted]  main
-chunk    {0} bundle.js (main) 310 bytes [rendered]
+bundle.js  1.86 kB       0  [emitted]  main
+chunk    {0} bundle.js (main) 302 bytes [rendered]
     [0] ./.test/constEnumReExportWatch/app.ts 76 bytes {0}
     [1] ./.test/constEnumReExportWatch/foo.ts 77 bytes {0}
-    [2] ./.test/constEnumReExportWatch/bar.ts 157 bytes {0} [built]
+    [2] ./.test/constEnumReExportWatch/bar.ts 149 bytes {0} [built]
diff --git a/test/comparison-tests/errors/expectedOutput-2.1/output.transpiled.txt b/test/comparison-tests/errors/expectedOutput-2.1/output.transpiled.txt
@@ -26,7 +26,7 @@ SyntaxError: Unexpected token (2:9)
     at nextLoader (node_modules\webpack-core\lib\NormalModuleMixin.js:275:25)
     at node_modules\webpack-core\lib\NormalModuleMixin.js:292:15
     at context.callback (node_modules\webpack-core\lib\NormalModuleMixin.js:148:14)
-    at Object.loader (dist\index.js:34:5)
+    at Object.loader (dist\index.js:37:5)
     at WEBPACK_CORE_LOADER_EXECUTION (node_modules\webpack-core\lib\NormalModuleMixin.js:155:71)
     at runSyncOrAsync (node_modules\webpack-core\lib\NormalModuleMixin.js:155:93)
     at nextLoader (node_modules\webpack-core\lib\NormalModuleMixin.js:290:3)
diff --git a/test/comparison-tests/errors/expectedOutput-2.1/output.txt b/test/comparison-tests/errors/expectedOutput-2.1/output.txt
@@ -26,7 +26,7 @@ SyntaxError: Unexpected token (1:9)
     at nextLoader (node_modules\webpack-core\lib\NormalModuleMixin.js:275:25)
     at node_modules\webpack-core\lib\NormalModuleMixin.js:292:15
     at context.callback (node_modules\webpack-core\lib\NormalModuleMixin.js:148:14)
-    at Object.loader (dist\index.js:34:5)
+    at Object.loader (dist\index.js:37:5)
     at WEBPACK_CORE_LOADER_EXECUTION (node_modules\webpack-core\lib\NormalModuleMixin.js:155:71)
     at runSyncOrAsync (node_modules\webpack-core\lib\NormalModuleMixin.js:155:93)
     at nextLoader (node_modules\webpack-core\lib\NormalModuleMixin.js:290:3)
diff --git a/test/comparison-tests/html-webpack-plugin/expectedOutput-2.1/output.transpiled.txt b/test/comparison-tests/html-webpack-plugin/expectedOutput-2.1/output.transpiled.txt
@@ -5,8 +5,8 @@ chunk    {0} bundle.js (main) 36 bytes [rendered]
     [0] ./.test/html-webpack-plugin/app.ts 36 bytes {0} [built]
 Child html-webpack-plugin for "index.html":
          Asset    Size  Chunks       Chunk Names
-    index.html  556 kB       0       
-    chunk    {0} index.html 538 kB [rendered]
+    index.html  557 kB       0       
+    chunk    {0} index.html 540 kB [rendered]
         [0] ./~/html-webpack-plugin/lib/loader.js!./~/html-webpack-plugin/default_index.ejs 540 bytes {0} [built]
-        [1] ./~/lodash/lodash.js 537 kB {0} [built]
+        [1] ./~/lodash/lodash.js 539 kB {0} [built]
         [2] (webpack)/buildin/module.js 241 bytes {0} [built]
diff --git a/test/comparison-tests/html-webpack-plugin/expectedOutput-2.1/output.txt b/test/comparison-tests/html-webpack-plugin/expectedOutput-2.1/output.txt
@@ -5,8 +5,8 @@ chunk    {0} bundle.js (main) 22 bytes [rendered]
     [0] ./.test/html-webpack-plugin/app.ts 22 bytes {0} [built]
 Child html-webpack-plugin for "index.html":
          Asset    Size  Chunks       Chunk Names
-    index.html  556 kB       0       
-    chunk    {0} index.html 538 kB [rendered]
+    index.html  557 kB       0       
+    chunk    {0} index.html 540 kB [rendered]
         [0] ./~/html-webpack-plugin/lib/loader.js!./~/html-webpack-plugin/default_index.ejs 540 bytes {0} [built]
-        [1] ./~/lodash/lodash.js 537 kB {0} [built]
+        [1] ./~/lodash/lodash.js 539 kB {0} [built]
         [2] (webpack)/buildin/module.js 241 bytes {0} [built]
diff --git a/test/comparison-tests/ignoreDiagnostics/expectedOutput-2.1/bundle.js b/test/comparison-tests/ignoreDiagnostics/expectedOutput-2.1/bundle.js
@@ -50,7 +50,6 @@
 	    }
 	    return Foo;
 	}());
-	exports.Foo = Foo;
 	var Bar = (function () {
 	    function Bar() {
 	    }
diff --git a/test/comparison-tests/ignoreDiagnostics/expectedOutput-2.1/output.transpiled.txt b/test/comparison-tests/ignoreDiagnostics/expectedOutput-2.1/output.transpiled.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
-bundle.js  1.65 kB       0  [emitted]  main
-chunk    {0} bundle.js (main) 247 bytes [rendered]
-    [0] ./.test/ignoreDiagnostics/app.ts 247 bytes {0} [built]
+bundle.js  1.63 kB       0  [emitted]  main
+chunk    {0} bundle.js (main) 228 bytes [rendered]
+    [0] ./.test/ignoreDiagnostics/app.ts 228 bytes {0} [built]
diff --git a/test/comparison-tests/ignoreDiagnostics/expectedOutput-2.1/output.txt b/test/comparison-tests/ignoreDiagnostics/expectedOutput-2.1/output.txt
@@ -1,7 +1,7 @@
     Asset     Size  Chunks             Chunk Names
-bundle.js  1.65 kB       0  [emitted]  main
-chunk    {0} bundle.js (main) 247 bytes [rendered]
-    [0] ./.test/ignoreDiagnostics/app.ts 247 bytes {0} [built] [1 error]
+bundle.js  1.63 kB       0  [emitted]  main
+chunk    {0} bundle.js (main) 228 bytes [rendered]
+    [0] ./.test/ignoreDiagnostics/app.ts 228 bytes {0} [built] [1 error]
 
 ERROR in ./.test/ignoreDiagnostics/app.ts
 [37m([39m[36m9[39m,[36m5[39m): [31merror TS2322: Type '"b"' is not assignable to type 'Number'.[39m
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]
diff --git a/test/comparison-tests/tsconfigInvalid/expectedOutput-2.1/output.txt b/test/comparison-tests/tsconfigInvalid/expectedOutput-2.1/output.txt
@@ -1,6 +1,6 @@
 
 ERROR in tsconfig.json
-[31merror TS6046: Argument for '--target' option must be: 'es3', 'es5', 'es6', 'es2015', 'es2016', 'es2017'[39m
+[31merror TS6046: Argument for '--target' option must be: 'es3', 'es5', 'es6', 'es2015', 'es2016', 'es2017', 'esnext'[39m
 
 ERROR in tsconfig.json
 [31merror TS5024: Compiler option 'sourceMap' requires a value of type boolean.[39m
diff --git a/test/comparison-tests/vue/expectedOutput-2.1/bundle.js b/test/comparison-tests/vue/expectedOutput-2.1/bundle.js
@@ -170,8 +170,8 @@
 /* 4 */
 /***/ function(module, exports, __webpack_require__) {
 
-	module.exports={render:function (){var _vm=this;
-	  return _vm._h('p', ["Hello from " + _vm._s(_vm.msg)])
+	module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;
+	  return _h('p', ["Hello from " + _vm._s(_vm.msg)])
 	},staticRenderFns: []}
 	if (false) {
 	  module.hot.accept()
@@ -195,8 +195,8 @@
 /* 6 */
 /***/ function(module, exports, __webpack_require__) {
 
-	module.exports={render:function (){var _vm=this;
-	  return _vm._h('p', ["hallo " + _vm._s(_vm.msg)])
+	module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;
+	  return _h('p', ["hallo " + _vm._s(_vm.msg)])
 	},staticRenderFns: []}
 	if (false) {
 	  module.hot.accept()
diff --git a/test/comparison-tests/vue/expectedOutput-2.1/bundle.transpiled.js b/test/comparison-tests/vue/expectedOutput-2.1/bundle.transpiled.js
@@ -170,8 +170,8 @@
 /* 4 */
 /***/ function(module, exports, __webpack_require__) {
 
-	module.exports={render:function (){var _vm=this;
-	  return _vm._h('p', ["Hello from " + _vm._s(_vm.msg)])
+	module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;
+	  return _h('p', ["Hello from " + _vm._s(_vm.msg)])
 	},staticRenderFns: []}
 	if (false) {
 	  module.hot.accept()
@@ -195,8 +195,8 @@
 /* 6 */
 /***/ function(module, exports, __webpack_require__) {
 
-	module.exports={render:function (){var _vm=this;
-	  return _vm._h('p', ["hallo " + _vm._s(_vm.msg)])
+	module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;
+	  return _h('p', ["hallo " + _vm._s(_vm.msg)])
 	},staticRenderFns: []}
 	if (false) {
 	  module.hot.accept()
diff --git a/test/comparison-tests/vue/expectedOutput-2.1/output.transpiled.txt b/test/comparison-tests/vue/expectedOutput-2.1/output.transpiled.txt
@@ -1,10 +1,10 @@
     Asset     Size  Chunks             Chunk Names
-bundle.js  5.95 kB       0  [emitted]  main
-chunk    {0} bundle.js (main) 4.35 kB [rendered]
+bundle.js  5.99 kB       0  [emitted]  main
+chunk    {0} bundle.js (main) 4.4 kB [rendered]
     [0] ./.test/vue/index.vue 1.59 kB {0} [built]
     [1] .!./~/vue-loader/lib/selector.js?type=script&index=0!./.test/vue/index.vue 355 bytes {0} [built]
     [2] ./.test/vue/component.vue 1.6 kB {0} [built]
     [3] .!./~/vue-loader/lib/selector.js?type=script&index=0!./.test/vue/component.vue 157 bytes {0} [built]
-    [4] ./~/vue-loader/lib/template-compiler.js?id=[hot-module-hash]!./~/vue-loader/lib/selector.js?type=template&index=0!./.test/vue/component.vue 277 bytes {0} [built]
+    [4] ./~/vue-loader/lib/template-compiler.js?id=[hot-module-hash]!./~/vue-loader/lib/selector.js?type=template&index=0!./.test/vue/component.vue 299 bytes {0} [built]
     [5] ./.test/vue/helper.ts 100 bytes {0} [built]
-    [6] ./~/vue-loader/lib/template-compiler.js?id=[hot-module-hash]!./~/vue-loader/lib/selector.js?type=template&index=0!./.test/vue/index.vue 272 bytes {0} [built]
+    [6] ./~/vue-loader/lib/template-compiler.js?id=[hot-module-hash]!./~/vue-loader/lib/selector.js?type=template&index=0!./.test/vue/index.vue 294 bytes {0} [built]
diff --git a/test/comparison-tests/vue/expectedOutput-2.1/output.txt b/test/comparison-tests/vue/expectedOutput-2.1/output.txt
@@ -1,10 +1,10 @@
     Asset     Size  Chunks             Chunk Names
-bundle.js  5.92 kB       0  [emitted]  main
-chunk    {0} bundle.js (main) 4.33 kB [rendered]
+bundle.js  5.97 kB       0  [emitted]  main
+chunk    {0} bundle.js (main) 4.38 kB [rendered]
     [0] ./.test/vue/index.vue 1.58 kB {0} [built]
     [1] .!./~/vue-loader/lib/selector.js?type=script&index=0!./.test/vue/index.vue 355 bytes {0} [built]
     [2] ./.test/vue/component.vue 1.59 kB {0} [built]
     [3] .!./~/vue-loader/lib/selector.js?type=script&index=0!./.test/vue/component.vue 157 bytes {0} [built]
-    [4] ./~/vue-loader/lib/template-compiler.js?id=[hot-module-hash]!./~/vue-loader/lib/selector.js?type=template&index=0!./.test/vue/component.vue 277 bytes {0} [built]
+    [4] ./~/vue-loader/lib/template-compiler.js?id=[hot-module-hash]!./~/vue-loader/lib/selector.js?type=template&index=0!./.test/vue/component.vue 299 bytes {0} [built]
     [5] ./.test/vue/helper.ts 100 bytes {0} [built]
-    [6] ./~/vue-loader/lib/template-compiler.js?id=[hot-module-hash]!./~/vue-loader/lib/selector.js?type=template&index=0!./.test/vue/index.vue 272 bytes {0} [built]
+    [6] ./~/vue-loader/lib/template-compiler.js?id=[hot-module-hash]!./~/vue-loader/lib/selector.js?type=template&index=0!./.test/vue/index.vue 294 bytes {0} [built]

-Original file line number
+Diff line change
   - [email protected]
   - [email protected]
   - [email protected]
 -  - [email protected].1
 +  - [email protected].4
   - TYPESCRIPT=typescript@next
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ts-loader",`
`3`		`- "version": "1.3.0",`
	`3`	`+ "version": "1.3.1",`
`4`	`4`	`"description": "TypeScript loader for webpack",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"compilerOptions": {`
	`3`	`+ "jsx": "react",`
`3`	`4`	`"target": "es6"`
`4`	`5`	`}`
`5`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+This test has been disabled as the extra correctness required for it to pass comes at the cost of too much performance loss.`
	`2`	`+`
	`3`	`+https://github.com/TypeStrong/ts-loader/issues/393`