From d16f6bd7048c665f097a766e4c1f227f1408fbb7 Mon Sep 17 00:00:00 2001
From: Herrington Darkholme <nonamesheep1@gmail.com>
Date: Fri, 17 Feb 2017 17:31:34 +0800
Subject: [PATCH 1/3] fix #433, ensure deps not cleared for HMR

further fix

accept new baseline

fix error

fix issue441

always show errors

fix issue372

fix json

fix

fix

ignore built

new baseline
---
 src/after-compile.ts                          | 66 +++++++++------
 src/index.ts                                  | 20 -----
 src/instances.ts                              |  2 +-
 src/interfaces.ts                             |  8 ++
 src/watch-run.ts                              | 13 ++-
 .../expectedOutput-2.1/output.txt             |  7 +-
 .../patch0/output.transpiled.txt              |  2 +-
 .../expectedOutput-2.1/patch0/output.txt      |  4 +-
 .../expectedOutput-2.1/output.transpiled.txt  |  2 +-
 .../expectedOutput-2.1/output.txt             |  2 +-
 .../expectedOutput-2.1/output.txt             |  6 +-
 .../expectedOutput-2.1/output.txt             |  2 +-
 .../expectedOutput-2.1/output.txt             |  2 +-
 .../expectedOutput-2.1/output.txt             |  4 +-
 .../expectedOutput-2.1/output.txt             |  2 +-
 .../basic/expectedOutput-2.1/output.txt       |  6 +-
 .../patch0/output.transpiled.txt              |  4 +-
 .../expectedOutput-2.1/patch0/output.txt      |  5 +-
 .../expectedOutput-2.1/patch1/output.txt      |  2 +-
 .../expectedOutput-2.1/output.txt             | 10 +--
 .../expectedOutput-2.1/output.txt             |  2 +-
 .../create-and-execute-test.js                |  3 +
 .../expectedOutput-2.1/output.transpiled.txt  |  2 +-
 .../expectedOutput-2.1/output.txt             |  5 +-
 .../expectedOutput-2.1/output.txt             |  4 +-
 .../expectedOutput-2.1/output.txt             |  4 +-
 .../expectedOutput-2.1/output.txt             | 12 +--
 .../patch0/output.transpiled.txt              |  2 +-
 .../expectedOutput-2.1/patch0/output.txt      |  4 +-
 .../expectedOutput-2.1/output.transpiled.txt  |  6 +-
 .../errors/expectedOutput-2.1/output.txt      |  9 +--
 .../expectedOutput-2.1/output.transpiled.txt  |  2 +-
 .../es3/expectedOutput-2.1/output.txt         |  5 +-
 .../expectedOutput-2.1/output.transpiled.txt  |  2 +-
 .../es5/expectedOutput-2.1/output.txt         |  5 +-
 .../es6/expectedOutput-2.1/output.txt         |  2 +-
 .../expectedOutput-2.1/output.txt             | 10 +--
 .../es6withCJS/expectedOutput-2.1/output.txt  |  2 +-
 .../externals/expectedOutput-2.1/output.txt   |  2 +-
 .../expectedOutput-2.1/output.transpiled.txt  | 10 +--
 .../expectedOutput-2.1/output.txt             | 10 +--
 .../expectedOutput-2.1/output.txt             |  5 +-
 .../expectedOutput-2.1/output.txt             |  2 +-
 .../expectedOutput-2.1/patch1/bundle.js       | 80 -------------------
 .../expectedOutput-2.1/patch1/output.txt      |  7 --
 .../expectedOutput-2.1/output.transpiled.txt  | 12 +--
 .../instance/expectedOutput-2.1/output.txt    |  8 +-
 .../issue372/expectedOutput-2.1/output.txt    |  6 +-
 .../patch0/output.transpiled.txt              |  6 ++
 .../expectedOutput-2.1/patch0/output.txt      |  2 +-
 .../issue441/expectedOutput-2.1/output.txt    |  2 +-
 .../expectedOutput-2.1/patch1/bundle.js       | 80 -------------------
 .../expectedOutput-2.1/patch1/output.txt      |  4 -
 .../issue71/expectedOutput-2.1/output.txt     |  6 +-
 .../jsx/expectedOutput-2.1/output.txt         |  2 +-
 .../large/expectedOutput-2.1/output.txt       | 30 +++----
 .../expectedOutput-2.1/output.transpiled.txt  |  2 +-
 .../expectedOutput-2.1/output.txt             | 10 +--
 .../expectedOutput-2.1/output.transpiled.txt  |  2 +-
 .../node/expectedOutput-2.1/output.txt        |  2 +-
 .../expectedOutput-2.1/output.transpiled.txt  |  4 +-
 .../expectedOutput-2.1/output.txt             | 10 +--
 .../expectedOutput-2.1/output.txt             |  4 +-
 .../expectedOutput-2.1/output.transpiled.txt  |  2 +-
 .../nolib/expectedOutput-2.1/output.txt       |  2 +-
 .../npmLink/expectedOutput-2.1/output.txt     |  4 +-
 .../replacement/expectedOutput-2.1/output.txt |  6 +-
 .../expectedOutput-2.1/output.txt             |  6 +-
 .../patch0/output.transpiled.txt              |  2 +-
 .../expectedOutput-2.1/patch0/output.txt      |  4 +-
 .../expectedOutput-2.1/patch1/output.txt      |  4 +-
 .../expectedOutput-2.1/output.transpiled.txt  |  2 +-
 .../sourceMaps/expectedOutput-2.1/output.txt  |  2 +-
 .../expectedOutput-2.1/output.txt             |  2 +-
 .../expectedOutput-2.1/output.transpiled.txt  |  2 +-
 .../expectedOutput-2.1/output.txt             |  6 +-
 .../expectedOutput-2.1/bundle.js              |  2 +-
 .../expectedOutput-2.1/bundle.transpiled.js   |  2 +-
 .../expectedOutput-2.1/output.transpiled.txt  |  6 +-
 .../expectedOutput-2.1/output.txt             |  8 +-
 .../expectedOutput-2.1/output.txt             |  4 +-
 .../expectedOutput-2.1/output.transpiled.txt  |  2 +-
 .../expectedOutput-2.1/output.txt             |  2 +-
 .../patch0/output.transpiled.txt              |  2 +-
 .../expectedOutput-2.1/patch0/output.txt      |  2 +-
 .../patch1/output.transpiled.txt              |  2 +-
 .../expectedOutput-2.1/patch1/output.txt      |  2 +-
 .../expectedOutput-2.1/output.txt             |  7 +-
 88 files changed, 233 insertions(+), 410 deletions(-)
 delete mode 100644 test/comparison-tests/importsWatch/expectedOutput-2.1/patch1/bundle.js
 delete mode 100644 test/comparison-tests/importsWatch/expectedOutput-2.1/patch1/output.txt
 create mode 100644 test/comparison-tests/issue372/expectedOutput-2.1/patch0/output.transpiled.txt
 delete mode 100644 test/comparison-tests/issue441/expectedOutput-2.1/patch1/bundle.js
 delete mode 100644 test/comparison-tests/issue441/expectedOutput-2.1/patch1/output.txt

diff --git a/src/after-compile.ts b/src/after-compile.ts
index 97db8dd39..5f1d14a80 100644
--- a/src/after-compile.ts
+++ b/src/after-compile.ts
@@ -19,6 +19,7 @@ function makeAfterCompile(
         }
 
         removeTSLoaderErrors(compilation.errors);
+        addWatchFileList(instance, compilation);
 
         provideCompilerOptionDiagnosticErrorsToWebpack(getCompilerOptionDiagnostics, compilation, instance, configFilePath);
         getCompilerOptionDiagnostics = false;
@@ -43,6 +44,13 @@ interface Modules {
     [modulePath: string]: interfaces.WebpackModule[];
 }
 
+// for modules without JS emission, we need to add it to watch list manually
+function addWatchFileList(instance: interfaces.TSInstance, compilation: interfaces.WebpackCompilation) {
+      var program = instance.languageService.getProgram()
+      var files = program.getSourceFiles().map(f => f.fileName)
+      Array.prototype.push.apply(compilation.fileDependencies, files.map(path.normalize));
+}
+
 /**
  * handle compiler option errors after the first compile
  */
@@ -125,32 +133,44 @@ function provideErrorsToWebpack(
     instance: interfaces.TSInstance
 ) {
     const { compiler, languageService, files, loaderOptions } = instance;
-    Object.keys(filesToCheckForErrors)
-        .filter(filePath => !!filePath.match(constants.dtsTsTsxRegex))
-        .forEach(filePath => {
-            const errors = languageService.getSyntacticDiagnostics(filePath).concat(languageService.getSemanticDiagnostics(filePath));
-            if (errors.length > 0) {
-                filesWithErrors[filePath] = files[filePath];
-            }
 
-            // if we have access to a webpack module, use that
-            if (utils.hasOwnProperty(modules, filePath)) {
-                const associatedModules = modules[filePath];
+    const fileNames = Object.keys(filesToCheckForErrors);
 
-                associatedModules.forEach(module => {
-                    // remove any existing errors
-                    removeTSLoaderErrors(module.errors);
+    if (fileNames.some(fn => constants.dtsDtsxRegex.test(fn))) {
+          Object.keys(instance.files)
+               .filter(filePath => !!filePath.match(constants.dtsTsTsxRegex))
+              .forEach(addErrorToFile);
+          return;
+    }
 
-                    // append errors
-                    const formattedErrors = utils.formatErrors(errors, loaderOptions, compiler, { module });
-                    utils.registerWebpackErrors(module.errors, formattedErrors);
-                    utils.registerWebpackErrors(compilation.errors, formattedErrors);
-                });
-            } else {
-                // otherwise it's a more generic error
-                utils.registerWebpackErrors(compilation.errors, utils.formatErrors(errors, loaderOptions, compiler, { file: filePath }));
-            }
-        });
+    fileNames
+        .filter(filePath => !!filePath.match(constants.dtsTsTsxRegex))
+        .forEach(addErrorToFile);
+
+    function addErrorToFile(filePath: string) {
+        const errors = languageService.getSyntacticDiagnostics(filePath).concat(languageService.getSemanticDiagnostics(filePath));
+        if (errors.length > 0) {
+            filesWithErrors[filePath] = files[filePath];
+        }
+
+        // if we have access to a webpack module, use that
+        if (utils.hasOwnProperty(modules, filePath)) {
+            const associatedModules = modules[filePath];
+
+            associatedModules.forEach(module => {
+                // remove any existing errors
+                removeTSLoaderErrors(module.errors);
+
+                // append errors
+                const formattedErrors = utils.formatErrors(errors, loaderOptions, compiler, { module });
+                utils.registerWebpackErrors(module.errors, formattedErrors);
+                utils.registerWebpackErrors(compilation.errors, formattedErrors);
+            });
+        } else {
+            // otherwise it's a more generic error
+            utils.registerWebpackErrors(compilation.errors, utils.formatErrors(errors, loaderOptions, compiler, { file: filePath }));
+        }
+    }
 }
 
 /**
diff --git a/src/index.ts b/src/index.ts
index 84861ca6c..46cccef94 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -126,30 +126,10 @@ function getEmit(
 ) {
     // Emit Javascript
     const output = instance.languageService.getEmitOutput(filePath);
-
-    loader.clearDependencies();
-    loader.addDependency(filePath);
-
     const allDefinitionFiles = Object.keys(instance.files).filter(defFilePath => !!defFilePath.match(constants.dtsDtsxRegex));
 
-    // Make this file dependent on *all* definition files in the program
-    const addDependency = loader.addDependency.bind(loader);
-    allDefinitionFiles.forEach(addDependency);
-
-    /* - 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
-    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(addDependency);
-    }
 
     loader._module.meta.tsLoaderDefinitionFileVersions = allDefinitionFiles
         .concat(additionalDependencies)
diff --git a/src/instances.ts b/src/instances.ts
index 12a6d97ec..40d97785e 100644
--- a/src/instances.ts
+++ b/src/instances.ts
@@ -109,7 +109,7 @@ export function getTypeScriptInstance(
     instance.languageService = compiler.createLanguageService(servicesHost, compiler.createDocumentRegistry());
 
     loader._compiler.plugin("after-compile", afterCompile(instance, configFilePath));
-    loader._compiler.plugin("watch-run", watchRun(instance));
+    loader._compiler.plugin("watch-run", watchRun(instance, loader));
 
     return { instance };
 }
diff --git a/src/interfaces.ts b/src/interfaces.ts
index 2c4ed880b..be1e334ed 100644
--- a/src/interfaces.ts
+++ b/src/interfaces.ts
@@ -90,6 +90,13 @@ export interface Webpack {
         ts: {},
         resolve: Resolve;
     };
+    /**
+     * The output options
+     */
+    outputOptions?: {
+      json?: boolean
+    }
+
 }
 
 export interface Compiler {
@@ -112,6 +119,7 @@ export interface WebpackCompilation {
     compiler: WebpackCompiler;
     errors: WebpackError[];
     modules: WebpackModule[];
+    fileDependencies: string[];
     assets: {
         [index: string]: {
             size: () => number;
diff --git a/src/watch-run.ts b/src/watch-run.ts
index ad9169ad6..6b9510319 100644
--- a/src/watch-run.ts
+++ b/src/watch-run.ts
@@ -7,8 +7,19 @@ import constants = require('./constants');
  * Make function which will manually update changed files
  */
 function makeWatchRun(
-    instance: interfaces.TSInstance
+    instance: interfaces.TSInstance,
+    loader: interfaces.Webpack
 ) {
+    // always output stats
+    var lastHash: string;
+    const outputOptions = loader.outputOptions || {};
+    loader._compiler.plugin('done', (stats: any) => {
+        if (lastHash === stats.hash && !outputOptions.json)  {
+            process.stdout.write(stats.toString(outputOptions) + '\n');
+        }
+        lastHash = stats.hash;
+    });
+
     return (watching: interfaces.WebpackWatching, cb: () => void) => {
         const watcher = watching.compiler.watchFileSystem.watcher ||
             watching.compiler.watchFileSystem.wfs.watcher;
diff --git a/test/comparison-tests/aliasResolution/expectedOutput-2.1/output.txt b/test/comparison-tests/aliasResolution/expectedOutput-2.1/output.txt
index 51b5ac068..5c012971f 100644
--- a/test/comparison-tests/aliasResolution/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/aliasResolution/expectedOutput-2.1/output.txt
@@ -1,8 +1,5 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.74 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 139 bytes [entry] [rendered]
-    [0] ./.test/aliasResolution/common/components/myComponent.ts 46 bytes {0} [built]
-    [1] ./.test/aliasResolution/app.ts 93 bytes {0} [built] [1 error]
-
-ERROR in ./.test/aliasResolution/app.ts
-(2,31): error TS2307: Cannot find module 'components/myComponent2'.
\ No newline at end of file
+    [0] ./.test/aliasResolution/common/components/myComponent.ts 46 bytes {0} 
+    [1] ./.test/aliasResolution/app.ts 93 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/aliasResolution/expectedOutput-2.1/patch0/output.transpiled.txt b/test/comparison-tests/aliasResolution/expectedOutput-2.1/patch0/output.transpiled.txt
index fd59c8bed..fd8f0ebab 100644
--- a/test/comparison-tests/aliasResolution/expectedOutput-2.1/patch0/output.transpiled.txt
+++ b/test/comparison-tests/aliasResolution/expectedOutput-2.1/patch0/output.transpiled.txt
@@ -1,5 +1,5 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.74 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 138 bytes [entry] [rendered]
-    [0] ./.test/aliasResolution/common/components/myComponent.ts 45 bytes {0} [built]
+    [0] ./.test/aliasResolution/common/components/myComponent.ts 45 bytes {0} 
     [1] ./.test/aliasResolution/app.ts 93 bytes {0}
\ No newline at end of file
diff --git a/test/comparison-tests/aliasResolution/expectedOutput-2.1/patch0/output.txt b/test/comparison-tests/aliasResolution/expectedOutput-2.1/patch0/output.txt
index d8e82879d..7a989e9dc 100644
--- a/test/comparison-tests/aliasResolution/expectedOutput-2.1/patch0/output.txt
+++ b/test/comparison-tests/aliasResolution/expectedOutput-2.1/patch0/output.txt
@@ -1,8 +1,8 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.74 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 138 bytes [entry] [rendered]
-    [0] ./.test/aliasResolution/common/components/myComponent.ts 45 bytes {0} [built]
-    [1] ./.test/aliasResolution/app.ts 93 bytes {0} [built] [1 error]
+    [0] ./.test/aliasResolution/common/components/myComponent.ts 45 bytes {0} 
+    [1] ./.test/aliasResolution/app.ts 93 bytes {0} [1 error]
 
 ERROR in ./.test/aliasResolution/app.ts
 (2,31): error TS2307: Cannot find module 'components/myComponent2'.
\ No newline at end of file
diff --git a/test/comparison-tests/allowJs-entryFileIsJs/expectedOutput-2.1/output.transpiled.txt b/test/comparison-tests/allowJs-entryFileIsJs/expectedOutput-2.1/output.transpiled.txt
index 8b49e2d48..0a4f2a7be 100644
--- a/test/comparison-tests/allowJs-entryFileIsJs/expectedOutput-2.1/output.transpiled.txt
+++ b/test/comparison-tests/allowJs-entryFileIsJs/expectedOutput-2.1/output.transpiled.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.57 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 38 bytes [entry] [rendered]
-    [0] ./.test/allowJs-entryFileIsJs/src/index.js 38 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/allowJs-entryFileIsJs/src/index.js 38 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/allowJs-entryFileIsJs/expectedOutput-2.1/output.txt b/test/comparison-tests/allowJs-entryFileIsJs/expectedOutput-2.1/output.txt
index 2e6497022..099625013 100644
--- a/test/comparison-tests/allowJs-entryFileIsJs/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/allowJs-entryFileIsJs/expectedOutput-2.1/output.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.53 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 24 bytes [entry] [rendered]
-    [0] ./.test/allowJs-entryFileIsJs/src/index.js 24 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/allowJs-entryFileIsJs/src/index.js 24 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/appendSuffixTo/expectedOutput-2.1/output.txt b/test/comparison-tests/appendSuffixTo/expectedOutput-2.1/output.txt
index f0ff8f0c0..f731f4e93 100644
--- a/test/comparison-tests/appendSuffixTo/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/appendSuffixTo/expectedOutput-2.1/output.txt
@@ -1,6 +1,6 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  3.29 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 606 bytes [entry] [rendered]
-    [0] ./.test/appendSuffixTo/component.vue 154 bytes {0} [built]
-    [1] ./.test/appendSuffixTo/helper.ts 100 bytes {0} [built]
-    [2] ./.test/appendSuffixTo/index.vue 352 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/appendSuffixTo/component.vue 154 bytes {0} 
+    [1] ./.test/appendSuffixTo/helper.ts 100 bytes {0} 
+    [2] ./.test/appendSuffixTo/index.vue 352 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/babel-es6resolveParent/expectedOutput-2.1/output.txt b/test/comparison-tests/babel-es6resolveParent/expectedOutput-2.1/output.txt
index d435a46d5..0e0c0c545 100644
--- a/test/comparison-tests/babel-es6resolveParent/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/babel-es6resolveParent/expectedOutput-2.1/output.txt
@@ -1,4 +1,4 @@
     Asset  Size  Chunks             Chunk Names
 bundle.js  3 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 251 bytes [entry] [rendered]
-    [0] ./.test/babel-es6resolveParent/index.tsx 251 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/babel-es6resolveParent/index.tsx 251 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/babel-issue81/expectedOutput-2.1/output.txt b/test/comparison-tests/babel-issue81/expectedOutput-2.1/output.txt
index e795d8b8f..943cf83b7 100644
--- a/test/comparison-tests/babel-issue81/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/babel-issue81/expectedOutput-2.1/output.txt
@@ -2,4 +2,4 @@
     bundle.js  3.87 kB       0  [emitted]  main
 bundle.js.map  2.83 kB       0  [emitted]  main
 chunk    {0} bundle.js, bundle.js.map (main) 1.2 kB [entry] [rendered]
-    [0] ./.test/babel-issue81/a.ts 1.2 kB {0} [built]
\ No newline at end of file
+    [0] ./.test/babel-issue81/a.ts 1.2 kB {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/babel-issue92/expectedOutput-2.1/output.txt b/test/comparison-tests/babel-issue92/expectedOutput-2.1/output.txt
index 492547ed5..edbdfc231 100644
--- a/test/comparison-tests/babel-issue92/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/babel-issue92/expectedOutput-2.1/output.txt
@@ -1,5 +1,5 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  3.05 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 110 bytes [entry] [rendered]
-    [0] ./.test/babel-issue92/submodule/submodule.tsx 38 bytes {0} [built]
-    [1] ./.test/babel-issue92/app.ts 72 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/babel-issue92/submodule/submodule.tsx 38 bytes {0} 
+    [1] ./.test/babel-issue92/app.ts 72 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/babel-jsxPreserve/expectedOutput-2.1/output.txt b/test/comparison-tests/babel-jsxPreserve/expectedOutput-2.1/output.txt
index 0b0dcb8e7..a5602f1b7 100644
--- a/test/comparison-tests/babel-jsxPreserve/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/babel-jsxPreserve/expectedOutput-2.1/output.txt
@@ -2,4 +2,4 @@
 bundle.js  3.42 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 842 bytes [entry] [rendered]
     [0] external "react" 42 bytes {0} [not cacheable]
-    [1] ./.test/babel-jsxPreserve/app.tsx 800 bytes {0} [built]
\ No newline at end of file
+    [1] ./.test/babel-jsxPreserve/app.tsx 800 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/basic/expectedOutput-2.1/output.txt b/test/comparison-tests/basic/expectedOutput-2.1/output.txt
index 03a0bca62..0045db568 100644
--- a/test/comparison-tests/basic/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/basic/expectedOutput-2.1/output.txt
@@ -1,6 +1,6 @@
     Asset  Size  Chunks             Chunk Names
 bundle.js  3 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 346 bytes [entry] [rendered]
-    [0] ./.test/basic/lib/externalLib.js 55 bytes {0} [built]
-    [1] ./.test/basic/submodule/submodule.ts 149 bytes {0} [built]
-    [2] ./.test/basic/app.ts 142 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/basic/lib/externalLib.js 55 bytes {0} 
+    [1] ./.test/basic/submodule/submodule.ts 149 bytes {0} 
+    [2] ./.test/basic/app.ts 142 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/basic/expectedOutput-2.1/patch0/output.transpiled.txt b/test/comparison-tests/basic/expectedOutput-2.1/patch0/output.transpiled.txt
index 1baa7ed9a..74de124fd 100644
--- a/test/comparison-tests/basic/expectedOutput-2.1/patch0/output.transpiled.txt
+++ b/test/comparison-tests/basic/expectedOutput-2.1/patch0/output.transpiled.txt
@@ -1,6 +1,6 @@
     Asset  Size  Chunks             Chunk Names
 bundle.js  3 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 347 bytes [entry] [rendered]
-    [0] ./.test/basic/lib/externalLib.js 55 bytes {0}
-    [1] ./.test/basic/submodule/submodule.ts 149 bytes {0}
+    [0] ./.test/basic/lib/externalLib.js 55 bytes {0} [built]
+    [1] ./.test/basic/submodule/submodule.ts 149 bytes {0} [built]
     [2] ./.test/basic/app.ts 143 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/basic/expectedOutput-2.1/patch0/output.txt b/test/comparison-tests/basic/expectedOutput-2.1/patch0/output.txt
index 9569c0b67..0403e8a0c 100644
--- a/test/comparison-tests/basic/expectedOutput-2.1/patch0/output.txt
+++ b/test/comparison-tests/basic/expectedOutput-2.1/patch0/output.txt
@@ -3,7 +3,4 @@ bundle.js  3 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 347 bytes [entry] [rendered]
     [0] ./.test/basic/lib/externalLib.js 55 bytes {0}
     [1] ./.test/basic/submodule/submodule.ts 149 bytes {0}
-    [2] ./.test/basic/app.ts 143 bytes {0} [built] [1 error]
-
-ERROR in ./.test/basic/app.ts
-(3,13): error TS2339: Property 'doSomething2' does not exist on type 'typeof externalLib'.
\ No newline at end of file
+    [2] ./.test/basic/app.ts 143 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/basic/expectedOutput-2.1/patch1/output.txt b/test/comparison-tests/basic/expectedOutput-2.1/patch1/output.txt
index 36df789cf..88f1319b3 100644
--- a/test/comparison-tests/basic/expectedOutput-2.1/patch1/output.txt
+++ b/test/comparison-tests/basic/expectedOutput-2.1/patch1/output.txt
@@ -3,4 +3,4 @@ bundle.js  3 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 346 bytes [entry] [rendered]
     [0] ./.test/basic/lib/externalLib.js 55 bytes {0}
     [1] ./.test/basic/submodule/submodule.ts 149 bytes {0}
-    [2] ./.test/basic/app.ts 142 bytes {0} [built]
\ No newline at end of file
+    [2] ./.test/basic/app.ts 142 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/codeSplitting/expectedOutput-2.1/output.txt b/test/comparison-tests/codeSplitting/expectedOutput-2.1/output.txt
index 861cd5ba2..e6c4a5743 100644
--- a/test/comparison-tests/codeSplitting/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/codeSplitting/expectedOutput-2.1/output.txt
@@ -2,9 +2,9 @@
 0.bundle.js  249 bytes       0  [emitted]  
   bundle.js    6.46 kB       1  [emitted]  main
 chunk    {0} 0.bundle.js 72 bytes {1} [rendered]
-    [0] ./.test/codeSplitting/c.ts 36 bytes {0} [built]
-    [1] ./.test/codeSplitting/d.ts 36 bytes {0} [built]
+    [0] ./.test/codeSplitting/c.ts 36 bytes {0} 
+    [1] ./.test/codeSplitting/d.ts 36 bytes {0} 
 chunk    {1} bundle.js (main) 634 bytes [entry] [rendered]
-    [2] ./.test/codeSplitting/a.ts 36 bytes {1} [built]
-    [3] ./.test/codeSplitting/b.ts 36 bytes {1} [built]
-    [4] ./.test/codeSplitting/app.ts 562 bytes {1} [built]
\ No newline at end of file
+    [2] ./.test/codeSplitting/a.ts 36 bytes {1} 
+    [3] ./.test/codeSplitting/b.ts 36 bytes {1} 
+    [4] ./.test/codeSplitting/app.ts 562 bytes {1} 
\ No newline at end of file
diff --git a/test/comparison-tests/conditionalRequire/expectedOutput-2.1/output.txt b/test/comparison-tests/conditionalRequire/expectedOutput-2.1/output.txt
index 5fa28c62d..159720747 100644
--- a/test/comparison-tests/conditionalRequire/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/conditionalRequire/expectedOutput-2.1/output.txt
@@ -1,7 +1,7 @@
     Asset    Size  Chunks             Chunk Names
 bundle.js  1.5 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 285 bytes [entry] [rendered]
-    [0] ./.test/conditionalRequire/app.ts 285 bytes {0} [built]
+    [0] ./.test/conditionalRequire/app.ts 285 bytes {0} 
 
 WARNING in bundle.js from UglifyJs
 Condition always false [bundle.js:78,4]
diff --git a/test/comparison-tests/create-and-execute-test.js b/test/comparison-tests/create-and-execute-test.js
index 58b7d5c4b..e87b764df 100644
--- a/test/comparison-tests/create-and-execute-test.js
+++ b/test/comparison-tests/create-and-execute-test.js
@@ -259,8 +259,10 @@ function storeStats(stats, testState, paths, outputs, patch, options) {
             .replace(new RegExp(regexEscape(rootPath + path.sep), 'g'), '')
             .replace(new RegExp(regexEscape(rootPath), 'g'), '')
             .replace(new RegExp(regexEscape(rootPathWithIncorrectWindowsSeparator), 'g'), '')
+            .replace(/\[built\]/g, '')
             .replace(/\.transpile/g, '');
 
+            console.log(statsString)
         fs.writeFileSync(path.join(paths.actualOutput, statsFileName), statsString);
         if (saveOutputMode) {
             var patchedStatsFileName = patch + '/' + statsFileName;
@@ -390,6 +392,7 @@ function normaliseString(platformSpecificContent) {
         // Convert '/' to '\' and back to '/' so slashes are treated the same
         // whether running / generated on windows or *nix
         .replace(new RegExp(regexEscape('/'), 'g'), '\\')
+        .replace(/\[built\]/g, '')
         .replace(new RegExp(regexEscape('\\'), 'g'), '/');
 }
 
diff --git a/test/comparison-tests/declarationDeps/expectedOutput-2.1/output.transpiled.txt b/test/comparison-tests/declarationDeps/expectedOutput-2.1/output.transpiled.txt
index 17ad3b7a0..1e9f94bc6 100644
--- a/test/comparison-tests/declarationDeps/expectedOutput-2.1/output.transpiled.txt
+++ b/test/comparison-tests/declarationDeps/expectedOutput-2.1/output.transpiled.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.59 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 55 bytes [entry] [rendered]
-    [0] ./.test/declarationDeps/app.ts 55 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/declarationDeps/app.ts 55 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/declarationDeps/expectedOutput-2.1/output.txt b/test/comparison-tests/declarationDeps/expectedOutput-2.1/output.txt
index 733ce84c2..17106a04b 100644
--- a/test/comparison-tests/declarationDeps/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/declarationDeps/expectedOutput-2.1/output.txt
@@ -1,7 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.55 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 41 bytes [entry] [rendered]
-    [0] ./.test/declarationDeps/app.ts 41 bytes {0} [built] [1 error]
-
-ERROR in ./.test/declarationDeps/app.ts
-(2,7): error TS2339: Property 'sayHi' does not exist on type 'typeof Hello'.
\ No newline at end of file
+    [0] ./.test/declarationDeps/app.ts 41 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/declarationOutput/expectedOutput-2.1/output.txt b/test/comparison-tests/declarationOutput/expectedOutput-2.1/output.txt
index 507a540a9..8fc8d26ca 100644
--- a/test/comparison-tests/declarationOutput/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/declarationOutput/expectedOutput-2.1/output.txt
@@ -3,5 +3,5 @@
     app.d.ts  110 bytes          [emitted]  
 sub/dep.d.ts   63 bytes          [emitted]  
 chunk    {0} bundle.js (main) 737 bytes [entry] [rendered]
-    [0] ./.test/declarationOutput/sub/dep.ts 168 bytes {0} [built]
-    [1] ./.test/declarationOutput/app.ts 569 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/declarationOutput/sub/dep.ts 168 bytes {0} 
+    [1] ./.test/declarationOutput/app.ts 569 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/declarationWatch/expectedOutput-2.1/output.txt b/test/comparison-tests/declarationWatch/expectedOutput-2.1/output.txt
index ef97ea45b..9cf3c49e9 100644
--- a/test/comparison-tests/declarationWatch/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/declarationWatch/expectedOutput-2.1/output.txt
@@ -1,5 +1,5 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.75 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 140 bytes [entry] [rendered]
-    [0] ./.test/declarationWatch/dep.ts 59 bytes {0} [built]
-    [1] ./.test/declarationWatch/app.ts 81 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/declarationWatch/dep.ts 59 bytes {0} 
+    [1] ./.test/declarationWatch/app.ts 81 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/dependencyErrors/expectedOutput-2.1/output.txt b/test/comparison-tests/dependencyErrors/expectedOutput-2.1/output.txt
index b7fbfe407..0a6bb57ef 100644
--- a/test/comparison-tests/dependencyErrors/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/dependencyErrors/expectedOutput-2.1/output.txt
@@ -1,12 +1,6 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.94 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 246 bytes [entry] [rendered]
-    [0] ./.test/dependencyErrors/dep1.ts 76 bytes {0} [built]
-    [1] ./.test/dependencyErrors/dep2.ts 76 bytes {0} [built]
-    [2] ./.test/dependencyErrors/app.ts 94 bytes {0} [built] [2 errors]
-
-ERROR in ./.test/dependencyErrors/app.ts
-(4,6): error TS2345: Argument of type '""' is not assignable to parameter of type 'number'.
-
-ERROR in ./.test/dependencyErrors/app.ts
-(5,6): error TS2345: Argument of type '""' is not assignable to parameter of type 'number'.
\ No newline at end of file
+    [0] ./.test/dependencyErrors/dep1.ts 76 bytes {0} 
+    [1] ./.test/dependencyErrors/dep2.ts 76 bytes {0} 
+    [2] ./.test/dependencyErrors/app.ts 94 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/dependencyErrors/expectedOutput-2.1/patch0/output.transpiled.txt b/test/comparison-tests/dependencyErrors/expectedOutput-2.1/patch0/output.transpiled.txt
index 1cce9ba6e..bddbf4f2e 100644
--- a/test/comparison-tests/dependencyErrors/expectedOutput-2.1/patch0/output.transpiled.txt
+++ b/test/comparison-tests/dependencyErrors/expectedOutput-2.1/patch0/output.transpiled.txt
@@ -1,6 +1,6 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.94 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 246 bytes [entry] [rendered]
-    [0] ./.test/dependencyErrors/dep1.ts 76 bytes {0} [built]
+    [0] ./.test/dependencyErrors/dep1.ts 76 bytes {0} 
     [1] ./.test/dependencyErrors/dep2.ts 76 bytes {0}
     [2] ./.test/dependencyErrors/app.ts 94 bytes {0}
\ No newline at end of file
diff --git a/test/comparison-tests/dependencyErrors/expectedOutput-2.1/patch0/output.txt b/test/comparison-tests/dependencyErrors/expectedOutput-2.1/patch0/output.txt
index 74af0975c..d2d9140d2 100644
--- a/test/comparison-tests/dependencyErrors/expectedOutput-2.1/patch0/output.txt
+++ b/test/comparison-tests/dependencyErrors/expectedOutput-2.1/patch0/output.txt
@@ -1,9 +1,9 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.94 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 246 bytes [entry] [rendered]
-    [0] ./.test/dependencyErrors/dep1.ts 76 bytes {0} [built]
+    [0] ./.test/dependencyErrors/dep1.ts 76 bytes {0} 
     [1] ./.test/dependencyErrors/dep2.ts 76 bytes {0}
-    [2] ./.test/dependencyErrors/app.ts 94 bytes {0} [built] [1 error]
+    [2] ./.test/dependencyErrors/app.ts 94 bytes {0} [1 error]
 
 ERROR in ./.test/dependencyErrors/app.ts
 (5,6): error TS2345: Argument of type '""' is not assignable to parameter of type 'number'.
\ No newline at end of file
diff --git a/test/comparison-tests/errors/expectedOutput-2.1/output.transpiled.txt b/test/comparison-tests/errors/expectedOutput-2.1/output.transpiled.txt
index 7e308bef9..f26957dd4 100644
--- a/test/comparison-tests/errors/expectedOutput-2.1/output.transpiled.txt
+++ b/test/comparison-tests/errors/expectedOutput-2.1/output.transpiled.txt
@@ -1,7 +1,7 @@
     Asset     Size  Chunks             Chunk Names
-bundle.js  2.77 kB       0  [emitted]  main
-chunk    {0} bundle.js (main) 261 bytes [entry] [rendered]
-    [0] ./.test/errors/app.ts 261 bytes {0} [built] [failed] [2 errors]
+bundle.js  2.79 kB       0  [emitted]  main
+chunk    {0} bundle.js (main) 281 bytes [entry] [rendered]
+    [0] ./.test/errors/app.ts 281 bytes {0}  [failed] [2 errors]
 
 ERROR in ./.test/errors/app.ts
 (1,7): error TS1005: '=' expected.
diff --git a/test/comparison-tests/errors/expectedOutput-2.1/output.txt b/test/comparison-tests/errors/expectedOutput-2.1/output.txt
index f01b5ccab..7e47b20a5 100644
--- a/test/comparison-tests/errors/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/errors/expectedOutput-2.1/output.txt
@@ -1,10 +1,7 @@
     Asset     Size  Chunks             Chunk Names
-bundle.js  2.74 kB       0  [emitted]  main
-chunk    {0} bundle.js (main) 232 bytes [entry] [rendered]
-    [0] ./.test/errors/app.ts 232 bytes {0} [built] [failed] [2 errors]
-
-ERROR in ./.test/errors/app.ts
-(1,7): error TS1005: '=' expected.
+bundle.js  2.76 kB       0  [emitted]  main
+chunk    {0} bundle.js (main) 252 bytes [entry] [rendered]
+    [0] ./.test/errors/app.ts 252 bytes {0}  [failed] [1 error]
 
 ERROR in ./.test/errors/app.ts
 Module parse failed: index.js??ref--0!app.ts Unexpected token (1:9)
diff --git a/test/comparison-tests/es3/expectedOutput-2.1/output.transpiled.txt b/test/comparison-tests/es3/expectedOutput-2.1/output.transpiled.txt
index e6b275d1f..9cc6d1ff0 100644
--- a/test/comparison-tests/es3/expectedOutput-2.1/output.transpiled.txt
+++ b/test/comparison-tests/es3/expectedOutput-2.1/output.transpiled.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.57 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 43 bytes [entry] [rendered]
-    [0] ./.test/es3/app.ts 43 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/es3/app.ts 43 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/es3/expectedOutput-2.1/output.txt b/test/comparison-tests/es3/expectedOutput-2.1/output.txt
index 7c1aedfda..815a04cc4 100644
--- a/test/comparison-tests/es3/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/es3/expectedOutput-2.1/output.txt
@@ -1,7 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.54 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 29 bytes [entry] [rendered]
-    [0] ./.test/es3/app.ts 29 bytes {0} [built] [1 error]
-
-ERROR in ./.test/es3/app.ts
-(1,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
\ No newline at end of file
+    [0] ./.test/es3/app.ts 29 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/es5/expectedOutput-2.1/output.transpiled.txt b/test/comparison-tests/es5/expectedOutput-2.1/output.transpiled.txt
index 533578fbc..cbbdc8a03 100644
--- a/test/comparison-tests/es5/expectedOutput-2.1/output.transpiled.txt
+++ b/test/comparison-tests/es5/expectedOutput-2.1/output.transpiled.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.58 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 51 bytes [entry] [rendered]
-    [0] ./.test/es5/app.ts 51 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/es5/app.ts 51 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/es5/expectedOutput-2.1/output.txt b/test/comparison-tests/es5/expectedOutput-2.1/output.txt
index 8d84e8620..50a843a4e 100644
--- a/test/comparison-tests/es5/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/es5/expectedOutput-2.1/output.txt
@@ -1,7 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.55 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 37 bytes [entry] [rendered]
-    [0] ./.test/es5/app.ts 37 bytes {0} [built] [1 error]
-
-ERROR in ./.test/es5/app.ts
-(2,1): error TS2304: Cannot find name 'Symbol'.
\ No newline at end of file
+    [0] ./.test/es5/app.ts 37 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/es6/expectedOutput-2.1/output.txt b/test/comparison-tests/es6/expectedOutput-2.1/output.txt
index 10beb3a62..5604c88b2 100644
--- a/test/comparison-tests/es6/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/es6/expectedOutput-2.1/output.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.55 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 37 bytes [entry] [rendered]
-    [0] ./.test/es6/app.ts 37 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/es6/app.ts 37 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/es6codeSplitting/expectedOutput-2.1/output.txt b/test/comparison-tests/es6codeSplitting/expectedOutput-2.1/output.txt
index 543bf463d..ddf57256c 100644
--- a/test/comparison-tests/es6codeSplitting/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/es6codeSplitting/expectedOutput-2.1/output.txt
@@ -2,9 +2,9 @@
 0.bundle.js  377 bytes       0  [emitted]  
   bundle.js    6.98 kB       1  [emitted]  main
 chunk    {0} 0.bundle.js 200 bytes {1} [rendered]
-    [0] ./.test/es6codeSplitting/c.ts 100 bytes {0} [built]
-    [1] ./.test/es6codeSplitting/d.ts 100 bytes {0} [built]
+    [0] ./.test/es6codeSplitting/c.ts 100 bytes {0} 
+    [1] ./.test/es6codeSplitting/d.ts 100 bytes {0} 
 chunk    {1} bundle.js (main) 1.16 kB [entry] [rendered]
-    [2] ./.test/es6codeSplitting/a.ts 100 bytes {1} [built]
-    [3] ./.test/es6codeSplitting/b.ts 100 bytes {1} [built]
-    [4] ./.test/es6codeSplitting/app.ts 957 bytes {1} [built]
\ No newline at end of file
+    [2] ./.test/es6codeSplitting/a.ts 100 bytes {1} 
+    [3] ./.test/es6codeSplitting/b.ts 100 bytes {1} 
+    [4] ./.test/es6codeSplitting/app.ts 957 bytes {1} 
\ No newline at end of file
diff --git a/test/comparison-tests/es6withCJS/expectedOutput-2.1/output.txt b/test/comparison-tests/es6withCJS/expectedOutput-2.1/output.txt
index 60d3805cc..ec129b0c6 100644
--- a/test/comparison-tests/es6withCJS/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/es6withCJS/expectedOutput-2.1/output.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.63 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 100 bytes [entry] [rendered]
-    [0] ./.test/es6withCJS/app.ts 100 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/es6withCJS/app.ts 100 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/externals/expectedOutput-2.1/output.txt b/test/comparison-tests/externals/expectedOutput-2.1/output.txt
index c1fcb354a..dd65c2859 100644
--- a/test/comparison-tests/externals/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/externals/expectedOutput-2.1/output.txt
@@ -2,4 +2,4 @@
 bundle.js  2.69 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 121 bytes [entry] [rendered]
     [0] external "hello" 42 bytes {0} [not cacheable]
-    [1] ./.test/externals/app.ts 79 bytes {0} [built]
\ No newline at end of file
+    [1] ./.test/externals/app.ts 79 bytes {0} 
\ No newline at end of file
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
index 4dd6a57e4..310841cf4 100644
--- 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
@@ -2,12 +2,12 @@
  bundle.js    2.57 kB       0  [emitted]  main
 index.html  182 bytes          [emitted]  
 chunk    {0} bundle.js (main) 36 bytes [entry] [rendered]
-    [0] ./.test/html-webpack-plugin/app.ts 36 bytes {0} [built]
+    [0] ./.test/html-webpack-plugin/app.ts 36 bytes {0} 
 Child html-webpack-plugin for "index.html":
          Asset    Size  Chunks  Chunk Names
     index.html  544 kB       0  
     chunk    {0} index.html 541 kB [entry] [rendered]
-        [0] ./~/lodash/lodash.js 540 kB {0} [built]
-        [1] (webpack)/buildin/global.js 488 bytes {0} [built]
-        [2] (webpack)/buildin/module.js 495 bytes {0} [built]
-        [3] ./~/html-webpack-plugin/lib/loader.js!./~/html-webpack-plugin/default_index.ejs 540 bytes {0} [built]
\ No newline at end of file
+        [0] ./~/html-webpack-plugin/~/lodash/lodash.js 540 kB {0} 
+        [1] (webpack)/buildin/global.js 488 bytes {0} 
+        [2] (webpack)/buildin/module.js 495 bytes {0} 
+        [3] ./~/html-webpack-plugin/lib/loader.js!./~/html-webpack-plugin/default_index.ejs 550 bytes {0} 
\ No newline at end of file
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
index 75b114b5b..fe8d091ad 100644
--- a/test/comparison-tests/html-webpack-plugin/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/html-webpack-plugin/expectedOutput-2.1/output.txt
@@ -2,12 +2,12 @@
  bundle.js    2.53 kB       0  [emitted]  main
 index.html  182 bytes          [emitted]  
 chunk    {0} bundle.js (main) 22 bytes [entry] [rendered]
-    [0] ./.test/html-webpack-plugin/app.ts 22 bytes {0} [built]
+    [0] ./.test/html-webpack-plugin/app.ts 22 bytes {0} 
 Child html-webpack-plugin for "index.html":
          Asset    Size  Chunks  Chunk Names
     index.html  544 kB       0  
     chunk    {0} index.html 541 kB [entry] [rendered]
-        [0] ./~/lodash/lodash.js 540 kB {0} [built]
-        [1] (webpack)/buildin/global.js 488 bytes {0} [built]
-        [2] (webpack)/buildin/module.js 495 bytes {0} [built]
-        [3] ./~/html-webpack-plugin/lib/loader.js!./~/html-webpack-plugin/default_index.ejs 540 bytes {0} [built]
\ No newline at end of file
+        [0] ./~/html-webpack-plugin/~/lodash/lodash.js 540 kB {0} 
+        [1] (webpack)/buildin/global.js 488 bytes {0} 
+        [2] (webpack)/buildin/module.js 495 bytes {0} 
+        [3] ./~/html-webpack-plugin/lib/loader.js!./~/html-webpack-plugin/default_index.ejs 550 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/ignoreDiagnostics/expectedOutput-2.1/output.txt b/test/comparison-tests/ignoreDiagnostics/expectedOutput-2.1/output.txt
index 89acb1575..ac577f1d6 100644
--- a/test/comparison-tests/ignoreDiagnostics/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/ignoreDiagnostics/expectedOutput-2.1/output.txt
@@ -1,7 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.76 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 228 bytes [entry] [rendered]
-    [0] ./.test/ignoreDiagnostics/app.ts 228 bytes {0} [built] [1 error]
-
-ERROR in ./.test/ignoreDiagnostics/app.ts
-(9,5): error TS2322: Type '"b"' is not assignable to type 'Number'.
\ No newline at end of file
+    [0] ./.test/ignoreDiagnostics/app.ts 228 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/importsWatch/expectedOutput-2.1/output.txt b/test/comparison-tests/importsWatch/expectedOutput-2.1/output.txt
index a426b2bae..517178fcb 100644
--- a/test/comparison-tests/importsWatch/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/importsWatch/expectedOutput-2.1/output.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.57 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 43 bytes [entry] [rendered]
-    [0] ./.test/importsWatch/app.ts 43 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/importsWatch/app.ts 43 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/importsWatch/expectedOutput-2.1/patch1/bundle.js b/test/comparison-tests/importsWatch/expectedOutput-2.1/patch1/bundle.js
deleted file mode 100644
index 33cba6992..000000000
--- a/test/comparison-tests/importsWatch/expectedOutput-2.1/patch1/bundle.js
+++ /dev/null
@@ -1,80 +0,0 @@
-/******/ (function(modules) { // webpackBootstrap
-/******/ 	// The module cache
-/******/ 	var installedModules = {};
-
-/******/ 	// The require function
-/******/ 	function __webpack_require__(moduleId) {
-
-/******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId])
-/******/ 			return installedModules[moduleId].exports;
-
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = installedModules[moduleId] = {
-/******/ 			i: moduleId,
-/******/ 			l: false,
-/******/ 			exports: {}
-/******/ 		};
-
-/******/ 		// Execute the module function
-/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-
-/******/ 		// Flag the module as loaded
-/******/ 		module.l = true;
-
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
-
-
-/******/ 	// expose the modules object (__webpack_modules__)
-/******/ 	__webpack_require__.m = modules;
-
-/******/ 	// expose the module cache
-/******/ 	__webpack_require__.c = installedModules;
-
-/******/ 	// identity function for calling harmony imports with the correct context
-/******/ 	__webpack_require__.i = function(value) { return value; };
-
-/******/ 	// define getter function for harmony exports
-/******/ 	__webpack_require__.d = function(exports, name, getter) {
-/******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
-/******/ 		}
-/******/ 	};
-
-/******/ 	// getDefaultExport function for compatibility with non-harmony modules
-/******/ 	__webpack_require__.n = function(module) {
-/******/ 		var getter = module && module.__esModule ?
-/******/ 			function getDefault() { return module['default']; } :
-/******/ 			function getModuleExports() { return module; };
-/******/ 		__webpack_require__.d(getter, 'a', getter);
-/******/ 		return getter;
-/******/ 	};
-
-/******/ 	// Object.prototype.hasOwnProperty.call
-/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
-
-/******/ 	// __webpack_public_path__
-/******/ 	__webpack_require__.p = "";
-
-/******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 0);
-/******/ })
-/************************************************************************/
-/******/ ([
-/* 0 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var foo;
-foo.bar = 'foobar';
-
-
-/***/ })
-/******/ ]);
\ No newline at end of file
diff --git a/test/comparison-tests/importsWatch/expectedOutput-2.1/patch1/output.txt b/test/comparison-tests/importsWatch/expectedOutput-2.1/patch1/output.txt
deleted file mode 100644
index eef89deea..000000000
--- a/test/comparison-tests/importsWatch/expectedOutput-2.1/patch1/output.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-    Asset     Size  Chunks             Chunk Names
-bundle.js  2.57 kB       0  [emitted]  main
-chunk    {0} bundle.js (main) 43 bytes [entry] [rendered]
-    [0] ./.test/importsWatch/app.ts 43 bytes {0} [built] [1 error]
-
-ERROR in ./.test/importsWatch/app.ts
-(4,1): error TS2322: Type '"foobar"' is not assignable to type 'boolean'.
\ No newline at end of file
diff --git a/test/comparison-tests/instance/expectedOutput-2.1/output.transpiled.txt b/test/comparison-tests/instance/expectedOutput-2.1/output.transpiled.txt
index 258a8f2b4..5ea2fac74 100644
--- a/test/comparison-tests/instance/expectedOutput-2.1/output.transpiled.txt
+++ b/test/comparison-tests/instance/expectedOutput-2.1/output.transpiled.txt
@@ -1,9 +1,9 @@
-    Asset     Size  Chunks             Chunk Names
-bundle.js  2.69 kB       0  [emitted]  b
-chunk    {0} bundle.js (b) 177 bytes [entry] [rendered]
-    [1] ./.test/instance/b.ts 177 bytes {0} [built] [failed] [1 error]
-chunk    {1}  (a) 177 bytes [entry] [rendered]
-    [0] ./.test/instance/a.ts 177 bytes {1} [built] [failed] [1 error]
+    Asset    Size  Chunks             Chunk Names
+bundle.js  2.7 kB       0  [emitted]  b
+chunk    {0} bundle.js (b) 186 bytes [entry] [rendered]
+    [1] ./.test/instance/b.ts 186 bytes {0}  [failed] [1 error]
+chunk    {1}  (a) 186 bytes [entry] [rendered]
+    [0] ./.test/instance/a.ts 186 bytes {1}  [failed] [1 error]
 
 ERROR in ./.test/instance/a.ts
 Module build failed: A file specified in tsconfig.json could not be found: i-dont-exist
diff --git a/test/comparison-tests/instance/expectedOutput-2.1/output.txt b/test/comparison-tests/instance/expectedOutput-2.1/output.txt
index ae166bebb..905fb07f7 100644
--- a/test/comparison-tests/instance/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/instance/expectedOutput-2.1/output.txt
@@ -1,9 +1,9 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.69 kB       0  [emitted]  b
-chunk    {0} bundle.js (b) 167 bytes [entry] [rendered]
-    [1] ./.test/instance/b.ts 167 bytes {0} [built] [failed] [1 error]
-chunk    {1}  (a) 167 bytes [entry] [rendered]
-    [0] ./.test/instance/a.ts 167 bytes {1} [built] [failed] [1 error]
+chunk    {0} bundle.js (b) 176 bytes [entry] [rendered]
+    [1] ./.test/instance/b.ts 176 bytes {0}  [failed] [1 error]
+chunk    {1}  (a) 176 bytes [entry] [rendered]
+    [0] ./.test/instance/a.ts 176 bytes {1}  [failed] [1 error]
 
 ERROR in ./.test/instance/a.ts
 Module build failed: A file specified in tsconfig.json could not be found: i-dont-exist
diff --git a/test/comparison-tests/issue372/expectedOutput-2.1/output.txt b/test/comparison-tests/issue372/expectedOutput-2.1/output.txt
index 0bc041f06..eff6591e8 100644
--- a/test/comparison-tests/issue372/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/issue372/expectedOutput-2.1/output.txt
@@ -1,6 +1,6 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.85 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 167 bytes [entry] [rendered]
-    [0] ./.test/issue372/foo.ts 63 bytes {0} [built]
-    [1] ./.test/issue372/~/a/index.js 21 bytes {0} [built]
-    [2] ./.test/issue372/app.ts 83 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/issue372/foo.ts 63 bytes {0} 
+    [1] ./.test/issue372/~/a/index.js 21 bytes {0} 
+    [2] ./.test/issue372/app.ts 83 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/issue372/expectedOutput-2.1/patch0/output.transpiled.txt b/test/comparison-tests/issue372/expectedOutput-2.1/patch0/output.transpiled.txt
new file mode 100644
index 000000000..8d88be651
--- /dev/null
+++ b/test/comparison-tests/issue372/expectedOutput-2.1/patch0/output.transpiled.txt
@@ -0,0 +1,6 @@
+    Asset     Size  Chunks             Chunk Names
+bundle.js  2.85 kB       0  [emitted]  main
+chunk    {0} bundle.js (main) 174 bytes [entry] [rendered]
+    [0] ./.test/issue372/foo.ts 63 bytes {0} [built]
+    [1] ./.test/issue372/~/a/index.js 21 bytes {0} [built]
+    [2] ./.test/issue372/app.ts 90 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/issue372/expectedOutput-2.1/patch0/output.txt b/test/comparison-tests/issue372/expectedOutput-2.1/patch0/output.txt
index a23e2c869..749f1db94 100644
--- a/test/comparison-tests/issue372/expectedOutput-2.1/patch0/output.txt
+++ b/test/comparison-tests/issue372/expectedOutput-2.1/patch0/output.txt
@@ -3,4 +3,4 @@ bundle.js  2.85 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 174 bytes [entry] [rendered]
     [0] ./.test/issue372/foo.ts 63 bytes {0}
     [1] ./.test/issue372/~/a/index.js 21 bytes {0}
-    [2] ./.test/issue372/app.ts 90 bytes {0} [built]
\ No newline at end of file
+    [2] ./.test/issue372/app.ts 90 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/issue441/expectedOutput-2.1/output.txt b/test/comparison-tests/issue441/expectedOutput-2.1/output.txt
index 54e27c875..a431a8693 100644
--- a/test/comparison-tests/issue441/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/issue441/expectedOutput-2.1/output.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.57 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 43 bytes [entry] [rendered]
-    [0] ./.test/issue441/app.ts 43 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/issue441/app.ts 43 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/issue441/expectedOutput-2.1/patch1/bundle.js b/test/comparison-tests/issue441/expectedOutput-2.1/patch1/bundle.js
deleted file mode 100644
index 33cba6992..000000000
--- a/test/comparison-tests/issue441/expectedOutput-2.1/patch1/bundle.js
+++ /dev/null
@@ -1,80 +0,0 @@
-/******/ (function(modules) { // webpackBootstrap
-/******/ 	// The module cache
-/******/ 	var installedModules = {};
-
-/******/ 	// The require function
-/******/ 	function __webpack_require__(moduleId) {
-
-/******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId])
-/******/ 			return installedModules[moduleId].exports;
-
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = installedModules[moduleId] = {
-/******/ 			i: moduleId,
-/******/ 			l: false,
-/******/ 			exports: {}
-/******/ 		};
-
-/******/ 		// Execute the module function
-/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-
-/******/ 		// Flag the module as loaded
-/******/ 		module.l = true;
-
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
-
-
-/******/ 	// expose the modules object (__webpack_modules__)
-/******/ 	__webpack_require__.m = modules;
-
-/******/ 	// expose the module cache
-/******/ 	__webpack_require__.c = installedModules;
-
-/******/ 	// identity function for calling harmony imports with the correct context
-/******/ 	__webpack_require__.i = function(value) { return value; };
-
-/******/ 	// define getter function for harmony exports
-/******/ 	__webpack_require__.d = function(exports, name, getter) {
-/******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
-/******/ 		}
-/******/ 	};
-
-/******/ 	// getDefaultExport function for compatibility with non-harmony modules
-/******/ 	__webpack_require__.n = function(module) {
-/******/ 		var getter = module && module.__esModule ?
-/******/ 			function getDefault() { return module['default']; } :
-/******/ 			function getModuleExports() { return module; };
-/******/ 		__webpack_require__.d(getter, 'a', getter);
-/******/ 		return getter;
-/******/ 	};
-
-/******/ 	// Object.prototype.hasOwnProperty.call
-/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
-
-/******/ 	// __webpack_public_path__
-/******/ 	__webpack_require__.p = "";
-
-/******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 0);
-/******/ })
-/************************************************************************/
-/******/ ([
-/* 0 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var foo;
-foo.bar = 'foobar';
-
-
-/***/ })
-/******/ ]);
\ No newline at end of file
diff --git a/test/comparison-tests/issue441/expectedOutput-2.1/patch1/output.txt b/test/comparison-tests/issue441/expectedOutput-2.1/patch1/output.txt
deleted file mode 100644
index 54e27c875..000000000
--- a/test/comparison-tests/issue441/expectedOutput-2.1/patch1/output.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-    Asset     Size  Chunks             Chunk Names
-bundle.js  2.57 kB       0  [emitted]  main
-chunk    {0} bundle.js (main) 43 bytes [entry] [rendered]
-    [0] ./.test/issue441/app.ts 43 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/issue71/expectedOutput-2.1/output.txt b/test/comparison-tests/issue71/expectedOutput-2.1/output.txt
index 76361b420..10803eff1 100644
--- a/test/comparison-tests/issue71/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/issue71/expectedOutput-2.1/output.txt
@@ -1,6 +1,6 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.83 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 149 bytes [entry] [rendered]
-    [0] ./.test/issue71/b.ts 36 bytes {0} [built]
-    [1] ./.test/issue71/~/a/index.js 21 bytes {0} [built]
-    [2] ./.test/issue71/app.ts 92 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/issue71/b.ts 36 bytes {0} 
+    [1] ./.test/issue71/~/a/index.js 21 bytes {0} 
+    [2] ./.test/issue71/app.ts 92 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/jsx/expectedOutput-2.1/output.txt b/test/comparison-tests/jsx/expectedOutput-2.1/output.txt
index ed2a5b9da..17c13612d 100644
--- a/test/comparison-tests/jsx/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/jsx/expectedOutput-2.1/output.txt
@@ -2,4 +2,4 @@
 bundle.js  3.36 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 788 bytes [entry] [rendered]
     [0] external "react" 42 bytes {0} [not cacheable]
-    [1] ./.test/jsx/app.tsx 746 bytes {0} [built]
\ No newline at end of file
+    [1] ./.test/jsx/app.tsx 746 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/large/expectedOutput-2.1/output.txt b/test/comparison-tests/large/expectedOutput-2.1/output.txt
index 5ccd22ea7..51dd7d8df 100644
--- a/test/comparison-tests/large/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/large/expectedOutput-2.1/output.txt
@@ -1,19 +1,19 @@
     Asset   Size  Chunks             Chunk Names
 bundle.js  77 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 62.5 kB [entry] [rendered]
-    [0] ./.test/large/du.ts 283 bytes {0} [built]
-    [2] ./.test/large/dm.ts 763 bytes {0} [built]
-    [3] ./.test/large/dt.ts 343 bytes {0} [built]
-   [11] ./.test/large/di.ts 823 bytes {0} [built]
-   [12] ./.test/large/dl.ts 823 bytes {0} [built]
-   [13] ./.test/large/df.ts 823 bytes {0} [built]
-   [14] ./.test/large/db.ts 823 bytes {0} [built]
-   [18] ./.test/large/dg.ts 823 bytes {0} [built]
-   [35] ./.test/large/cg.ts 823 bytes {0} [built]
-   [36] ./.test/large/cx.ts 823 bytes {0} [built]
-   [43] ./.test/large/cp.ts 823 bytes {0} [built]
-   [70] ./.test/large/bb.ts 823 bytes {0} [built]
-   [71] ./.test/large/k.ts 820 bytes {0} [built]
-   [72] ./.test/large/t.ts 820 bytes {0} [built]
-   [79] ./.test/large/a.ts 817 bytes {0} [built]
+    [0] ./.test/large/du.ts 283 bytes {0} 
+    [2] ./.test/large/dm.ts 763 bytes {0} 
+    [3] ./.test/large/dt.ts 343 bytes {0} 
+   [11] ./.test/large/di.ts 823 bytes {0} 
+   [12] ./.test/large/dl.ts 823 bytes {0} 
+   [13] ./.test/large/df.ts 823 bytes {0} 
+   [14] ./.test/large/db.ts 823 bytes {0} 
+   [18] ./.test/large/dg.ts 823 bytes {0} 
+   [35] ./.test/large/cg.ts 823 bytes {0} 
+   [36] ./.test/large/cx.ts 823 bytes {0} 
+   [43] ./.test/large/cp.ts 823 bytes {0} 
+   [70] ./.test/large/bb.ts 823 bytes {0} 
+   [71] ./.test/large/k.ts 820 bytes {0} 
+   [72] ./.test/large/t.ts 820 bytes {0} 
+   [79] ./.test/large/a.ts 817 bytes {0} 
      + 65 hidden modules
\ No newline at end of file
diff --git a/test/comparison-tests/noErrorsPlugin/expectedOutput-2.1/output.transpiled.txt b/test/comparison-tests/noErrorsPlugin/expectedOutput-2.1/output.transpiled.txt
index fb26ae022..09b172ff5 100644
--- a/test/comparison-tests/noErrorsPlugin/expectedOutput-2.1/output.transpiled.txt
+++ b/test/comparison-tests/noErrorsPlugin/expectedOutput-2.1/output.transpiled.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.57 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 41 bytes [entry] [rendered]
-    [0] ./.test/noErrorsPlugin/app.ts 41 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/noErrorsPlugin/app.ts 41 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/noErrorsPlugin/expectedOutput-2.1/output.txt b/test/comparison-tests/noErrorsPlugin/expectedOutput-2.1/output.txt
index ff5ad34b2..6eaf2f7e7 100644
--- a/test/comparison-tests/noErrorsPlugin/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/noErrorsPlugin/expectedOutput-2.1/output.txt
@@ -1,11 +1,7 @@
-    Asset     Size  Chunks  Chunk Names
-bundle.js  2.54 kB       0  main
+    Asset     Size  Chunks             Chunk Names
+bundle.js  2.54 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 27 bytes [entry] [rendered]
-    [0] ./.test/noErrorsPlugin/app.ts 27 bytes {0} [built] [1 error]
+    [0] ./.test/noErrorsPlugin/app.ts 27 bytes {0} 
 
 WARNING in webpack: Using NoErrorsPlugin is deprecated.
 Use NoEmitOnErrorsPlugin instead.
-
-
-ERROR in ./.test/noErrorsPlugin/app.ts
-(4,1): error TS2322: Type 'string' is not assignable to type 'number'.
\ No newline at end of file
diff --git a/test/comparison-tests/node/expectedOutput-2.1/output.transpiled.txt b/test/comparison-tests/node/expectedOutput-2.1/output.transpiled.txt
index 3085895d0..fbb51d161 100644
--- a/test/comparison-tests/node/expectedOutput-2.1/output.transpiled.txt
+++ b/test/comparison-tests/node/expectedOutput-2.1/output.transpiled.txt
@@ -1,4 +1,4 @@
     Asset    Size  Chunks             Chunk Names
 bundle.js  2.6 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 73 bytes [entry] [rendered]
-    [0] ./.test/node/app.ts 73 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/node/app.ts 73 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/node/expectedOutput-2.1/output.txt b/test/comparison-tests/node/expectedOutput-2.1/output.txt
index d5d6479fd..ba2086dfa 100644
--- a/test/comparison-tests/node/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/node/expectedOutput-2.1/output.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.57 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 59 bytes [entry] [rendered]
-    [0] ./.test/node/app.ts 59 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/node/app.ts 59 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/nodeModulesMeaningfulErrorWhenImportingTs/expectedOutput-2.1/output.transpiled.txt b/test/comparison-tests/nodeModulesMeaningfulErrorWhenImportingTs/expectedOutput-2.1/output.transpiled.txt
index bfd45a586..2b87ccd8c 100644
--- a/test/comparison-tests/nodeModulesMeaningfulErrorWhenImportingTs/expectedOutput-2.1/output.transpiled.txt
+++ b/test/comparison-tests/nodeModulesMeaningfulErrorWhenImportingTs/expectedOutput-2.1/output.transpiled.txt
@@ -1,5 +1,5 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.74 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 123 bytes [entry] [rendered]
-    [0] ./.test/nodeModulesMeaningfulErrorWhenImportingTs/~/a/index.ts 71 bytes {0} [built]
-    [1] ./.test/nodeModulesMeaningfulErrorWhenImportingTs/app.ts 52 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/nodeModulesMeaningfulErrorWhenImportingTs/~/a/index.ts 71 bytes {0} 
+    [1] ./.test/nodeModulesMeaningfulErrorWhenImportingTs/app.ts 52 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/nodeModulesMeaningfulErrorWhenImportingTs/expectedOutput-2.1/output.txt b/test/comparison-tests/nodeModulesMeaningfulErrorWhenImportingTs/expectedOutput-2.1/output.txt
index 95ae1dbf8..1703e9f05 100644
--- a/test/comparison-tests/nodeModulesMeaningfulErrorWhenImportingTs/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/nodeModulesMeaningfulErrorWhenImportingTs/expectedOutput-2.1/output.txt
@@ -1,8 +1,8 @@
-    Asset    Size  Chunks             Chunk Names
-bundle.js  3.1 kB       0  [emitted]  main
-chunk    {0} bundle.js (main) 501 bytes [entry] [rendered]
-    [0] ./.test/nodeModulesMeaningfulErrorWhenImportingTs/~/a/index.ts 449 bytes {0} [built] [failed] [1 error]
-    [1] ./.test/nodeModulesMeaningfulErrorWhenImportingTs/app.ts 52 bytes {0} [built]
+    Asset     Size  Chunks             Chunk Names
+bundle.js  3.12 kB       0  [emitted]  main
+chunk    {0} bundle.js (main) 518 bytes [entry] [rendered]
+    [0] ./.test/nodeModulesMeaningfulErrorWhenImportingTs/~/a/index.ts 466 bytes {0}  [failed] [1 error]
+    [1] ./.test/nodeModulesMeaningfulErrorWhenImportingTs/app.ts 52 bytes {0} 
 
 ERROR in ./.test/nodeModulesMeaningfulErrorWhenImportingTs/~/a/index.ts
 Module build failed: Error: Typescript emitted no output for node_modules/a/index.ts.
diff --git a/test/comparison-tests/nodeResolution/expectedOutput-2.1/output.txt b/test/comparison-tests/nodeResolution/expectedOutput-2.1/output.txt
index 4ee2e527d..4d6d8e51e 100644
--- a/test/comparison-tests/nodeResolution/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/nodeResolution/expectedOutput-2.1/output.txt
@@ -1,5 +1,5 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.67 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 73 bytes [entry] [rendered]
-    [0] ./.test/nodeResolution/~/a/index.js 21 bytes {0} [built]
-    [1] ./.test/nodeResolution/app.ts 52 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/nodeResolution/~/a/index.js 21 bytes {0} 
+    [1] ./.test/nodeResolution/app.ts 52 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/nolib/expectedOutput-2.1/output.transpiled.txt b/test/comparison-tests/nolib/expectedOutput-2.1/output.transpiled.txt
index 5efdc654c..c38599cda 100644
--- a/test/comparison-tests/nolib/expectedOutput-2.1/output.transpiled.txt
+++ b/test/comparison-tests/nolib/expectedOutput-2.1/output.transpiled.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.56 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 30 bytes [entry] [rendered]
-    [0] ./.test/nolib/app.ts 30 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/nolib/app.ts 30 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/nolib/expectedOutput-2.1/output.txt b/test/comparison-tests/nolib/expectedOutput-2.1/output.txt
index 3c7a35920..f8fba1043 100644
--- a/test/comparison-tests/nolib/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/nolib/expectedOutput-2.1/output.txt
@@ -1,7 +1,7 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.52 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 16 bytes [entry] [rendered]
-    [0] ./.test/nolib/app.ts 16 bytes {0} [built] [1 error]
+    [0] ./.test/nolib/app.ts 16 bytes {0}  [1 error]
 
 ERROR in ./.test/nolib/app.ts
 (1,1): error TS2304: Cannot find name 'parseInt'.
diff --git a/test/comparison-tests/npmLink/expectedOutput-2.1/output.txt b/test/comparison-tests/npmLink/expectedOutput-2.1/output.txt
index 6f2b32e7b..8145ce708 100644
--- a/test/comparison-tests/npmLink/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/npmLink/expectedOutput-2.1/output.txt
@@ -1,5 +1,5 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.76 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 146 bytes [entry] [rendered]
-    [0] ./test/comparison-tests/testLib/foo.ts 69 bytes {0} [built]
-    [1] ./.test/npmLink/app.ts 77 bytes {0} [built]
\ No newline at end of file
+    [0] ./test/comparison-tests/testLib/foo.ts 69 bytes {0} 
+    [1] ./.test/npmLink/app.ts 77 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/replacement/expectedOutput-2.1/output.txt b/test/comparison-tests/replacement/expectedOutput-2.1/output.txt
index 8fc9f15f4..3534caaaa 100644
--- a/test/comparison-tests/replacement/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/replacement/expectedOutput-2.1/output.txt
@@ -1,6 +1,6 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.88 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 179 bytes [entry] [rendered]
-    [0] ./.test/replacement/a.ts 64 bytes {0} [built]
-    [1] ./.test/replacement/sub/dep.ts 61 bytes {0} [built]
-    [2] ./.test/replacement/app.ts 54 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/replacement/a.ts 64 bytes {0} 
+    [1] ./.test/replacement/sub/dep.ts 61 bytes {0} 
+    [2] ./.test/replacement/app.ts 54 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/simpleDependency/expectedOutput-2.1/output.txt b/test/comparison-tests/simpleDependency/expectedOutput-2.1/output.txt
index efdf79e03..d7e4e7ac8 100644
--- a/test/comparison-tests/simpleDependency/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/simpleDependency/expectedOutput-2.1/output.txt
@@ -1,6 +1,6 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.89 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 197 bytes [entry] [rendered]
-    [0] ./.test/simpleDependency/dep.ts 70 bytes {0} [built]
-    [1] ./.test/simpleDependency/deeperDep.ts 76 bytes {0} [built]
-    [2] ./.test/simpleDependency/app.ts 51 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/simpleDependency/dep.ts 70 bytes {0} 
+    [1] ./.test/simpleDependency/deeperDep.ts 76 bytes {0} 
+    [2] ./.test/simpleDependency/app.ts 51 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/simpleDependency/expectedOutput-2.1/patch0/output.transpiled.txt b/test/comparison-tests/simpleDependency/expectedOutput-2.1/patch0/output.transpiled.txt
index c78ed24fc..e653cb04f 100644
--- a/test/comparison-tests/simpleDependency/expectedOutput-2.1/patch0/output.transpiled.txt
+++ b/test/comparison-tests/simpleDependency/expectedOutput-2.1/patch0/output.transpiled.txt
@@ -2,5 +2,5 @@
 bundle.js  2.89 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 197 bytes [entry] [rendered]
     [0] ./.test/simpleDependency/dep.ts 70 bytes {0}
-    [1] ./.test/simpleDependency/deeperDep.ts 76 bytes {0} [built]
+    [1] ./.test/simpleDependency/deeperDep.ts 76 bytes {0} 
     [2] ./.test/simpleDependency/app.ts 51 bytes {0}
\ No newline at end of file
diff --git a/test/comparison-tests/simpleDependency/expectedOutput-2.1/patch0/output.txt b/test/comparison-tests/simpleDependency/expectedOutput-2.1/patch0/output.txt
index ff5ade661..a7f5249a8 100644
--- a/test/comparison-tests/simpleDependency/expectedOutput-2.1/patch0/output.txt
+++ b/test/comparison-tests/simpleDependency/expectedOutput-2.1/patch0/output.txt
@@ -1,8 +1,8 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.89 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 197 bytes [entry] [rendered]
-    [0] ./.test/simpleDependency/dep.ts 70 bytes {0} [built]
-    [1] ./.test/simpleDependency/deeperDep.ts 76 bytes {0} [built]
+    [0] ./.test/simpleDependency/dep.ts 70 bytes {0}
+    [1] ./.test/simpleDependency/deeperDep.ts 76 bytes {0} 
     [2] ./.test/simpleDependency/app.ts 51 bytes {0} [1 error]
 
 ERROR in ./.test/simpleDependency/app.ts
diff --git a/test/comparison-tests/simpleDependency/expectedOutput-2.1/patch1/output.txt b/test/comparison-tests/simpleDependency/expectedOutput-2.1/patch1/output.txt
index cd4330a0b..e653cb04f 100644
--- 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  2.89 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 197 bytes [entry] [rendered]
-    [0] ./.test/simpleDependency/dep.ts 70 bytes {0} [built]
-    [1] ./.test/simpleDependency/deeperDep.ts 76 bytes {0} [built]
+    [0] ./.test/simpleDependency/dep.ts 70 bytes {0}
+    [1] ./.test/simpleDependency/deeperDep.ts 76 bytes {0} 
     [2] ./.test/simpleDependency/app.ts 51 bytes {0}
\ No newline at end of file
diff --git a/test/comparison-tests/sourceMaps/expectedOutput-2.1/output.transpiled.txt b/test/comparison-tests/sourceMaps/expectedOutput-2.1/output.transpiled.txt
index a9be2ee4c..a90e5b968 100644
--- a/test/comparison-tests/sourceMaps/expectedOutput-2.1/output.transpiled.txt
+++ b/test/comparison-tests/sourceMaps/expectedOutput-2.1/output.transpiled.txt
@@ -2,4 +2,4 @@
     bundle.js  2.73 kB       0  [emitted]  main
 bundle.js.map  2.74 kB       0  [emitted]  main
 chunk    {0} bundle.js, bundle.js.map (main) 42 bytes [entry] [rendered]
-    [0] ./.test/sourceMaps/a.ts 42 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/sourceMaps/a.ts 42 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/sourceMaps/expectedOutput-2.1/output.txt b/test/comparison-tests/sourceMaps/expectedOutput-2.1/output.txt
index dc0c9b468..3ea0fbb86 100644
--- a/test/comparison-tests/sourceMaps/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/sourceMaps/expectedOutput-2.1/output.txt
@@ -2,4 +2,4 @@
     bundle.js  2.69 kB       0  [emitted]  main
 bundle.js.map  2.74 kB       0  [emitted]  main
 chunk    {0} bundle.js, bundle.js.map (main) 28 bytes [entry] [rendered]
-    [0] ./.test/sourceMaps/a.ts 28 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/sourceMaps/a.ts 28 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/tsconfigInvalid/expectedOutput-2.1/output.txt b/test/comparison-tests/tsconfigInvalid/expectedOutput-2.1/output.txt
index 0c76e4dd3..78fe261c5 100644
--- a/test/comparison-tests/tsconfigInvalid/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/tsconfigInvalid/expectedOutput-2.1/output.txt
@@ -1,7 +1,7 @@
     Asset    Size  Chunks             Chunk Names
 bundle.js  2.6 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 94 bytes [entry] [rendered]
-    [0] ./.test/tsconfigInvalid/app.ts 94 bytes {0} [built] [failed] [3 errors]
+    [0] ./.test/tsconfigInvalid/app.ts 94 bytes {0}  [failed] [3 errors]
 
 ERROR in tsconfig.json
 error TS6046: Argument for '--target' option must be: 'es3', 'es5', 'es6', 'es2015', 'es2016', 'es2017', 'esnext'
diff --git a/test/comparison-tests/tsconfigInvalidFile/expectedOutput-2.1/output.transpiled.txt b/test/comparison-tests/tsconfigInvalidFile/expectedOutput-2.1/output.transpiled.txt
index f6d52711f..3d7cf7bbf 100644
--- a/test/comparison-tests/tsconfigInvalidFile/expectedOutput-2.1/output.transpiled.txt
+++ b/test/comparison-tests/tsconfigInvalidFile/expectedOutput-2.1/output.transpiled.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.54 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 14 bytes [entry] [rendered]
-    [0] ./.test/tsconfigInvalidFile/app.ts 14 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/tsconfigInvalidFile/app.ts 14 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/tsconfigInvalidFile/expectedOutput-2.1/output.txt b/test/comparison-tests/tsconfigInvalidFile/expectedOutput-2.1/output.txt
index af05fbb1e..7300f76fb 100644
--- a/test/comparison-tests/tsconfigInvalidFile/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/tsconfigInvalidFile/expectedOutput-2.1/output.txt
@@ -1,7 +1,7 @@
     Asset     Size  Chunks             Chunk Names
-bundle.js  2.71 kB       0  [emitted]  main
-chunk    {0} bundle.js (main) 200 bytes [entry] [rendered]
-    [0] ./.test/tsconfigInvalidFile/app.ts 200 bytes {0} [built] [failed] [1 error]
+bundle.js  2.72 kB       0  [emitted]  main
+chunk    {0} bundle.js (main) 209 bytes [entry] [rendered]
+    [0] ./.test/tsconfigInvalidFile/app.ts 209 bytes {0}  [failed] [1 error]
 
 ERROR in ./.test/tsconfigInvalidFile/app.ts
 Module build failed: A file specified in tsconfig.json could not be found: i-am-a-file-what-does-not-exist.ts
\ No newline at end of file
diff --git a/test/comparison-tests/tsconfigNotReadable/expectedOutput-2.1/bundle.js b/test/comparison-tests/tsconfigNotReadable/expectedOutput-2.1/bundle.js
index ba8bd2916..bab374649 100644
--- a/test/comparison-tests/tsconfigNotReadable/expectedOutput-2.1/bundle.js
+++ b/test/comparison-tests/tsconfigNotReadable/expectedOutput-2.1/bundle.js
@@ -70,7 +70,7 @@
 /* 0 */
 /***/ (function(module, exports) {
 
-throw new Error("Module build failed: \u001b[31merror TS5014: Failed to parse file '/tsconfigNotReadable/tsconfig.json': Unexpected token . in JSON at position 41.\u001b[39m");
+throw new Error("Module build failed: \u001b[31merror TS5014: Failed to parse file '/tsconfigNotReadable/tsconfig.json': Unexpected token . in JSON at position 38.\u001b[39m");
 
 /***/ })
 /******/ ]);
\ No newline at end of file
diff --git a/test/comparison-tests/tsconfigNotReadable/expectedOutput-2.1/bundle.transpiled.js b/test/comparison-tests/tsconfigNotReadable/expectedOutput-2.1/bundle.transpiled.js
index 5a900acf3..24fe0903c 100644
--- a/test/comparison-tests/tsconfigNotReadable/expectedOutput-2.1/bundle.transpiled.js
+++ b/test/comparison-tests/tsconfigNotReadable/expectedOutput-2.1/bundle.transpiled.js
@@ -70,7 +70,7 @@
 /* 0 */
 /***/ (function(module, exports) {
 
-throw new Error("Module build failed: \u001b[31merror TS5014: Failed to parse file '/tsconfigNotReadable.transpile/tsconfig.json': Unexpected token . in JSON at position 41.\u001b[39m");
+throw new Error("Module build failed: \u001b[31merror TS5014: Failed to parse file '/tsconfigNotReadable.transpile/tsconfig.json': Unexpected token . in JSON at position 38.\u001b[39m");
 
 /***/ })
 /******/ ]);
\ No newline at end of file
diff --git a/test/comparison-tests/tsconfigNotReadable/expectedOutput-2.1/output.transpiled.txt b/test/comparison-tests/tsconfigNotReadable/expectedOutput-2.1/output.transpiled.txt
index 36aee1a83..3e45a452f 100644
--- a/test/comparison-tests/tsconfigNotReadable/expectedOutput-2.1/output.transpiled.txt
+++ b/test/comparison-tests/tsconfigNotReadable/expectedOutput-2.1/output.transpiled.txt
@@ -1,7 +1,7 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.73 kB       0  [emitted]  main
-chunk    {0} bundle.js (main) 216 bytes [entry] [rendered]
-    [0] ./.test/tsconfigNotReadable/app.ts 216 bytes {0} [built] [failed] [1 error]
+chunk    {0} bundle.js (main) 225 bytes [entry] [rendered]
+    [0] ./.test/tsconfigNotReadable/app.ts 225 bytes {0}  [failed] [1 error]
 
 ERROR in ./.test/tsconfigNotReadable/app.ts
-Module build failed: error TS5014: Failed to parse file 'tsconfig.json': Unexpected token . in JSON at position 41.
\ No newline at end of file
+Module build failed: error TS5014: Failed to parse file 'tsconfig.json': Unexpected token . in JSON at position 38.
\ No newline at end of file
diff --git a/test/comparison-tests/tsconfigNotReadable/expectedOutput-2.1/output.txt b/test/comparison-tests/tsconfigNotReadable/expectedOutput-2.1/output.txt
index f8c601ca9..12b4b35d6 100644
--- a/test/comparison-tests/tsconfigNotReadable/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/tsconfigNotReadable/expectedOutput-2.1/output.txt
@@ -1,7 +1,7 @@
     Asset     Size  Chunks             Chunk Names
-bundle.js  2.71 kB       0  [emitted]  main
-chunk    {0} bundle.js (main) 206 bytes [entry] [rendered]
-    [0] ./.test/tsconfigNotReadable/app.ts 206 bytes {0} [built] [failed] [1 error]
+bundle.js  2.72 kB       0  [emitted]  main
+chunk    {0} bundle.js (main) 215 bytes [entry] [rendered]
+    [0] ./.test/tsconfigNotReadable/app.ts 215 bytes {0}  [failed] [1 error]
 
 ERROR in ./.test/tsconfigNotReadable/app.ts
-Module build failed: error TS5014: Failed to parse file 'tsconfig.json': Unexpected token . in JSON at position 41.
\ No newline at end of file
+Module build failed: error TS5014: Failed to parse file 'tsconfig.json': Unexpected token . in JSON at position 38.
\ No newline at end of file
diff --git a/test/comparison-tests/tsconfigSearch/expectedOutput-2.1/output.txt b/test/comparison-tests/tsconfigSearch/expectedOutput-2.1/output.txt
index baecfb586..62f179c4a 100644
--- a/test/comparison-tests/tsconfigSearch/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/tsconfigSearch/expectedOutput-2.1/output.txt
@@ -1,5 +1,5 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.73 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 140 bytes [entry] [rendered]
-    [0] ./.test/tsconfigSearch/lib/externalLib.js 55 bytes {0} [built]
-    [1] ./.test/tsconfigSearch/src/app.ts 85 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/tsconfigSearch/lib/externalLib.js 55 bytes {0} 
+    [1] ./.test/tsconfigSearch/src/app.ts 85 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/output.transpiled.txt b/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/output.transpiled.txt
index ae51c3058..2998fece7 100644
--- a/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/output.transpiled.txt
+++ b/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/output.transpiled.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.74 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 212 bytes [entry] [rendered]
-    [0] ./.test/typeSystemWatch/app.ts 212 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/typeSystemWatch/app.ts 212 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/output.txt b/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/output.txt
index 1b8d6d2a8..7961a5888 100644
--- a/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/output.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.71 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 198 bytes [entry] [rendered]
-    [0] ./.test/typeSystemWatch/app.ts 198 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/typeSystemWatch/app.ts 198 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/patch0/output.transpiled.txt b/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/patch0/output.transpiled.txt
index ae51c3058..2998fece7 100644
--- a/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/patch0/output.transpiled.txt
+++ b/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/patch0/output.transpiled.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.74 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 212 bytes [entry] [rendered]
-    [0] ./.test/typeSystemWatch/app.ts 212 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/typeSystemWatch/app.ts 212 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/patch0/output.txt b/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/patch0/output.txt
index ea5e32528..4641ccbc2 100644
--- a/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/patch0/output.txt
+++ b/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/patch0/output.txt
@@ -1,7 +1,7 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.71 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 198 bytes [entry] [rendered]
-    [0] ./.test/typeSystemWatch/app.ts 198 bytes {0} [built] [1 error]
+    [0] ./.test/typeSystemWatch/app.ts 198 bytes {0}  [1 error]
 
 ERROR in ./.test/typeSystemWatch/app.ts
 (11,5): error TS2322: Type 'AType' is not assignable to type 'BType'.
diff --git a/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/patch1/output.transpiled.txt b/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/patch1/output.transpiled.txt
index ae51c3058..2998fece7 100644
--- a/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/patch1/output.transpiled.txt
+++ b/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/patch1/output.transpiled.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.74 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 212 bytes [entry] [rendered]
-    [0] ./.test/typeSystemWatch/app.ts 212 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/typeSystemWatch/app.ts 212 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/patch1/output.txt b/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/patch1/output.txt
index 1b8d6d2a8..7961a5888 100644
--- a/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/patch1/output.txt
+++ b/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/patch1/output.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.71 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 198 bytes [entry] [rendered]
-    [0] ./.test/typeSystemWatch/app.ts 198 bytes {0} [built]
\ No newline at end of file
+    [0] ./.test/typeSystemWatch/app.ts 198 bytes {0} 
\ No newline at end of file
diff --git a/test/comparison-tests/visualStudioErrorFormat/expectedOutput-2.1/output.txt b/test/comparison-tests/visualStudioErrorFormat/expectedOutput-2.1/output.txt
index 5b7b8cb82..33f9690d3 100644
--- a/test/comparison-tests/visualStudioErrorFormat/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/visualStudioErrorFormat/expectedOutput-2.1/output.txt
@@ -1,8 +1,5 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.74 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 139 bytes [entry] [rendered]
-    [0] ./.test/visualStudioErrorFormat/common/components/myComponent.ts 46 bytes {0} [built]
-    [1] ./.test/visualStudioErrorFormat/app.ts 93 bytes {0} [built] [1 error]
-
-ERROR in ./.test/visualStudioErrorFormat/app.ts
-app.ts(2,31): error TS2307: Cannot find module 'components/myComponent2'.
\ No newline at end of file
+    [0] ./.test/visualStudioErrorFormat/common/components/myComponent.ts 46 bytes {0} 
+    [1] ./.test/visualStudioErrorFormat/app.ts 93 bytes {0} 
\ No newline at end of file

From 340c9353831883caaab4915e1c59efee10711e67 Mon Sep 17 00:00:00 2001
From: Herrington Darkholme <nonamesheep1@gmail.com>
Date: Tue, 21 Feb 2017 18:24:47 +0800
Subject: [PATCH 2/3] Revert "fix #433, ensure deps not cleared for HMR"

This reverts commit d16f6bd7048c665f097a766e4c1f227f1408fbb7.
---
 src/after-compile.ts                          | 66 ++++++---------
 src/index.ts                                  | 20 +++++
 src/instances.ts                              |  2 +-
 src/interfaces.ts                             |  8 --
 src/watch-run.ts                              | 13 +--
 .../expectedOutput-2.1/output.txt             |  7 +-
 .../patch0/output.transpiled.txt              |  2 +-
 .../expectedOutput-2.1/patch0/output.txt      |  4 +-
 .../expectedOutput-2.1/output.transpiled.txt  |  2 +-
 .../expectedOutput-2.1/output.txt             |  2 +-
 .../expectedOutput-2.1/output.txt             |  6 +-
 .../expectedOutput-2.1/output.txt             |  2 +-
 .../expectedOutput-2.1/output.txt             |  2 +-
 .../expectedOutput-2.1/output.txt             |  4 +-
 .../expectedOutput-2.1/output.txt             |  2 +-
 .../basic/expectedOutput-2.1/output.txt       |  6 +-
 .../patch0/output.transpiled.txt              |  4 +-
 .../expectedOutput-2.1/patch0/output.txt      |  5 +-
 .../expectedOutput-2.1/patch1/output.txt      |  2 +-
 .../expectedOutput-2.1/output.txt             | 10 +--
 .../expectedOutput-2.1/output.txt             |  2 +-
 .../create-and-execute-test.js                |  3 -
 .../expectedOutput-2.1/output.transpiled.txt  |  2 +-
 .../expectedOutput-2.1/output.txt             |  5 +-
 .../expectedOutput-2.1/output.txt             |  4 +-
 .../expectedOutput-2.1/output.txt             |  4 +-
 .../expectedOutput-2.1/output.txt             | 12 ++-
 .../patch0/output.transpiled.txt              |  2 +-
 .../expectedOutput-2.1/patch0/output.txt      |  4 +-
 .../expectedOutput-2.1/output.transpiled.txt  |  6 +-
 .../errors/expectedOutput-2.1/output.txt      |  9 ++-
 .../expectedOutput-2.1/output.transpiled.txt  |  2 +-
 .../es3/expectedOutput-2.1/output.txt         |  5 +-
 .../expectedOutput-2.1/output.transpiled.txt  |  2 +-
 .../es5/expectedOutput-2.1/output.txt         |  5 +-
 .../es6/expectedOutput-2.1/output.txt         |  2 +-
 .../expectedOutput-2.1/output.txt             | 10 +--
 .../es6withCJS/expectedOutput-2.1/output.txt  |  2 +-
 .../externals/expectedOutput-2.1/output.txt   |  2 +-
 .../expectedOutput-2.1/output.transpiled.txt  | 10 +--
 .../expectedOutput-2.1/output.txt             | 10 +--
 .../expectedOutput-2.1/output.txt             |  5 +-
 .../expectedOutput-2.1/output.txt             |  2 +-
 .../expectedOutput-2.1/patch1/bundle.js       | 80 +++++++++++++++++++
 .../expectedOutput-2.1/patch1/output.txt      |  7 ++
 .../expectedOutput-2.1/output.transpiled.txt  | 12 +--
 .../instance/expectedOutput-2.1/output.txt    |  8 +-
 .../issue372/expectedOutput-2.1/output.txt    |  6 +-
 .../patch0/output.transpiled.txt              |  6 --
 .../expectedOutput-2.1/patch0/output.txt      |  2 +-
 .../issue441/expectedOutput-2.1/output.txt    |  2 +-
 .../expectedOutput-2.1/patch1/bundle.js       | 80 +++++++++++++++++++
 .../expectedOutput-2.1/patch1/output.txt      |  4 +
 .../issue71/expectedOutput-2.1/output.txt     |  6 +-
 .../jsx/expectedOutput-2.1/output.txt         |  2 +-
 .../large/expectedOutput-2.1/output.txt       | 30 +++----
 .../expectedOutput-2.1/output.transpiled.txt  |  2 +-
 .../expectedOutput-2.1/output.txt             | 10 ++-
 .../expectedOutput-2.1/output.transpiled.txt  |  2 +-
 .../node/expectedOutput-2.1/output.txt        |  2 +-
 .../expectedOutput-2.1/output.transpiled.txt  |  4 +-
 .../expectedOutput-2.1/output.txt             | 10 +--
 .../expectedOutput-2.1/output.txt             |  4 +-
 .../expectedOutput-2.1/output.transpiled.txt  |  2 +-
 .../nolib/expectedOutput-2.1/output.txt       |  2 +-
 .../npmLink/expectedOutput-2.1/output.txt     |  4 +-
 .../replacement/expectedOutput-2.1/output.txt |  6 +-
 .../expectedOutput-2.1/output.txt             |  6 +-
 .../patch0/output.transpiled.txt              |  2 +-
 .../expectedOutput-2.1/patch0/output.txt      |  4 +-
 .../expectedOutput-2.1/patch1/output.txt      |  4 +-
 .../expectedOutput-2.1/output.transpiled.txt  |  2 +-
 .../sourceMaps/expectedOutput-2.1/output.txt  |  2 +-
 .../expectedOutput-2.1/output.txt             |  2 +-
 .../expectedOutput-2.1/output.transpiled.txt  |  2 +-
 .../expectedOutput-2.1/output.txt             |  6 +-
 .../expectedOutput-2.1/bundle.js              |  2 +-
 .../expectedOutput-2.1/bundle.transpiled.js   |  2 +-
 .../expectedOutput-2.1/output.transpiled.txt  |  6 +-
 .../expectedOutput-2.1/output.txt             |  8 +-
 .../expectedOutput-2.1/output.txt             |  4 +-
 .../expectedOutput-2.1/output.transpiled.txt  |  2 +-
 .../expectedOutput-2.1/output.txt             |  2 +-
 .../patch0/output.transpiled.txt              |  2 +-
 .../expectedOutput-2.1/patch0/output.txt      |  2 +-
 .../patch1/output.transpiled.txt              |  2 +-
 .../expectedOutput-2.1/patch1/output.txt      |  2 +-
 .../expectedOutput-2.1/output.txt             |  7 +-
 88 files changed, 410 insertions(+), 233 deletions(-)
 create mode 100644 test/comparison-tests/importsWatch/expectedOutput-2.1/patch1/bundle.js
 create mode 100644 test/comparison-tests/importsWatch/expectedOutput-2.1/patch1/output.txt
 delete mode 100644 test/comparison-tests/issue372/expectedOutput-2.1/patch0/output.transpiled.txt
 create mode 100644 test/comparison-tests/issue441/expectedOutput-2.1/patch1/bundle.js
 create mode 100644 test/comparison-tests/issue441/expectedOutput-2.1/patch1/output.txt

diff --git a/src/after-compile.ts b/src/after-compile.ts
index 5f1d14a80..97db8dd39 100644
--- a/src/after-compile.ts
+++ b/src/after-compile.ts
@@ -19,7 +19,6 @@ function makeAfterCompile(
         }
 
         removeTSLoaderErrors(compilation.errors);
-        addWatchFileList(instance, compilation);
 
         provideCompilerOptionDiagnosticErrorsToWebpack(getCompilerOptionDiagnostics, compilation, instance, configFilePath);
         getCompilerOptionDiagnostics = false;
@@ -44,13 +43,6 @@ interface Modules {
     [modulePath: string]: interfaces.WebpackModule[];
 }
 
-// for modules without JS emission, we need to add it to watch list manually
-function addWatchFileList(instance: interfaces.TSInstance, compilation: interfaces.WebpackCompilation) {
-      var program = instance.languageService.getProgram()
-      var files = program.getSourceFiles().map(f => f.fileName)
-      Array.prototype.push.apply(compilation.fileDependencies, files.map(path.normalize));
-}
-
 /**
  * handle compiler option errors after the first compile
  */
@@ -133,44 +125,32 @@ function provideErrorsToWebpack(
     instance: interfaces.TSInstance
 ) {
     const { compiler, languageService, files, loaderOptions } = instance;
-
-    const fileNames = Object.keys(filesToCheckForErrors);
-
-    if (fileNames.some(fn => constants.dtsDtsxRegex.test(fn))) {
-          Object.keys(instance.files)
-               .filter(filePath => !!filePath.match(constants.dtsTsTsxRegex))
-              .forEach(addErrorToFile);
-          return;
-    }
-
-    fileNames
+    Object.keys(filesToCheckForErrors)
         .filter(filePath => !!filePath.match(constants.dtsTsTsxRegex))
-        .forEach(addErrorToFile);
+        .forEach(filePath => {
+            const errors = languageService.getSyntacticDiagnostics(filePath).concat(languageService.getSemanticDiagnostics(filePath));
+            if (errors.length > 0) {
+                filesWithErrors[filePath] = files[filePath];
+            }
 
-    function addErrorToFile(filePath: string) {
-        const errors = languageService.getSyntacticDiagnostics(filePath).concat(languageService.getSemanticDiagnostics(filePath));
-        if (errors.length > 0) {
-            filesWithErrors[filePath] = files[filePath];
-        }
+            // if we have access to a webpack module, use that
+            if (utils.hasOwnProperty(modules, filePath)) {
+                const associatedModules = modules[filePath];
 
-        // if we have access to a webpack module, use that
-        if (utils.hasOwnProperty(modules, filePath)) {
-            const associatedModules = modules[filePath];
-
-            associatedModules.forEach(module => {
-                // remove any existing errors
-                removeTSLoaderErrors(module.errors);
-
-                // append errors
-                const formattedErrors = utils.formatErrors(errors, loaderOptions, compiler, { module });
-                utils.registerWebpackErrors(module.errors, formattedErrors);
-                utils.registerWebpackErrors(compilation.errors, formattedErrors);
-            });
-        } else {
-            // otherwise it's a more generic error
-            utils.registerWebpackErrors(compilation.errors, utils.formatErrors(errors, loaderOptions, compiler, { file: filePath }));
-        }
-    }
+                associatedModules.forEach(module => {
+                    // remove any existing errors
+                    removeTSLoaderErrors(module.errors);
+
+                    // append errors
+                    const formattedErrors = utils.formatErrors(errors, loaderOptions, compiler, { module });
+                    utils.registerWebpackErrors(module.errors, formattedErrors);
+                    utils.registerWebpackErrors(compilation.errors, formattedErrors);
+                });
+            } else {
+                // otherwise it's a more generic error
+                utils.registerWebpackErrors(compilation.errors, utils.formatErrors(errors, loaderOptions, compiler, { file: filePath }));
+            }
+        });
 }
 
 /**
diff --git a/src/index.ts b/src/index.ts
index 46cccef94..84861ca6c 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -126,10 +126,30 @@ function getEmit(
 ) {
     // Emit Javascript
     const output = instance.languageService.getEmitOutput(filePath);
+
+    loader.clearDependencies();
+    loader.addDependency(filePath);
+
     const allDefinitionFiles = Object.keys(instance.files).filter(defFilePath => !!defFilePath.match(constants.dtsDtsxRegex));
 
+    // Make this file dependent on *all* definition files in the program
+    const addDependency = loader.addDependency.bind(loader);
+    allDefinitionFiles.forEach(addDependency);
+
+    /* - 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
+    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(addDependency);
+    }
 
     loader._module.meta.tsLoaderDefinitionFileVersions = allDefinitionFiles
         .concat(additionalDependencies)
diff --git a/src/instances.ts b/src/instances.ts
index 40d97785e..12a6d97ec 100644
--- a/src/instances.ts
+++ b/src/instances.ts
@@ -109,7 +109,7 @@ export function getTypeScriptInstance(
     instance.languageService = compiler.createLanguageService(servicesHost, compiler.createDocumentRegistry());
 
     loader._compiler.plugin("after-compile", afterCompile(instance, configFilePath));
-    loader._compiler.plugin("watch-run", watchRun(instance, loader));
+    loader._compiler.plugin("watch-run", watchRun(instance));
 
     return { instance };
 }
diff --git a/src/interfaces.ts b/src/interfaces.ts
index be1e334ed..2c4ed880b 100644
--- a/src/interfaces.ts
+++ b/src/interfaces.ts
@@ -90,13 +90,6 @@ export interface Webpack {
         ts: {},
         resolve: Resolve;
     };
-    /**
-     * The output options
-     */
-    outputOptions?: {
-      json?: boolean
-    }
-
 }
 
 export interface Compiler {
@@ -119,7 +112,6 @@ export interface WebpackCompilation {
     compiler: WebpackCompiler;
     errors: WebpackError[];
     modules: WebpackModule[];
-    fileDependencies: string[];
     assets: {
         [index: string]: {
             size: () => number;
diff --git a/src/watch-run.ts b/src/watch-run.ts
index 6b9510319..ad9169ad6 100644
--- a/src/watch-run.ts
+++ b/src/watch-run.ts
@@ -7,19 +7,8 @@ import constants = require('./constants');
  * Make function which will manually update changed files
  */
 function makeWatchRun(
-    instance: interfaces.TSInstance,
-    loader: interfaces.Webpack
+    instance: interfaces.TSInstance
 ) {
-    // always output stats
-    var lastHash: string;
-    const outputOptions = loader.outputOptions || {};
-    loader._compiler.plugin('done', (stats: any) => {
-        if (lastHash === stats.hash && !outputOptions.json)  {
-            process.stdout.write(stats.toString(outputOptions) + '\n');
-        }
-        lastHash = stats.hash;
-    });
-
     return (watching: interfaces.WebpackWatching, cb: () => void) => {
         const watcher = watching.compiler.watchFileSystem.watcher ||
             watching.compiler.watchFileSystem.wfs.watcher;
diff --git a/test/comparison-tests/aliasResolution/expectedOutput-2.1/output.txt b/test/comparison-tests/aliasResolution/expectedOutput-2.1/output.txt
index 5c012971f..51b5ac068 100644
--- a/test/comparison-tests/aliasResolution/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/aliasResolution/expectedOutput-2.1/output.txt
@@ -1,5 +1,8 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.74 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 139 bytes [entry] [rendered]
-    [0] ./.test/aliasResolution/common/components/myComponent.ts 46 bytes {0} 
-    [1] ./.test/aliasResolution/app.ts 93 bytes {0} 
\ No newline at end of file
+    [0] ./.test/aliasResolution/common/components/myComponent.ts 46 bytes {0} [built]
+    [1] ./.test/aliasResolution/app.ts 93 bytes {0} [built] [1 error]
+
+ERROR in ./.test/aliasResolution/app.ts
+(2,31): error TS2307: Cannot find module 'components/myComponent2'.
\ No newline at end of file
diff --git a/test/comparison-tests/aliasResolution/expectedOutput-2.1/patch0/output.transpiled.txt b/test/comparison-tests/aliasResolution/expectedOutput-2.1/patch0/output.transpiled.txt
index fd8f0ebab..fd59c8bed 100644
--- a/test/comparison-tests/aliasResolution/expectedOutput-2.1/patch0/output.transpiled.txt
+++ b/test/comparison-tests/aliasResolution/expectedOutput-2.1/patch0/output.transpiled.txt
@@ -1,5 +1,5 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.74 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 138 bytes [entry] [rendered]
-    [0] ./.test/aliasResolution/common/components/myComponent.ts 45 bytes {0} 
+    [0] ./.test/aliasResolution/common/components/myComponent.ts 45 bytes {0} [built]
     [1] ./.test/aliasResolution/app.ts 93 bytes {0}
\ No newline at end of file
diff --git a/test/comparison-tests/aliasResolution/expectedOutput-2.1/patch0/output.txt b/test/comparison-tests/aliasResolution/expectedOutput-2.1/patch0/output.txt
index 7a989e9dc..d8e82879d 100644
--- a/test/comparison-tests/aliasResolution/expectedOutput-2.1/patch0/output.txt
+++ b/test/comparison-tests/aliasResolution/expectedOutput-2.1/patch0/output.txt
@@ -1,8 +1,8 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.74 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 138 bytes [entry] [rendered]
-    [0] ./.test/aliasResolution/common/components/myComponent.ts 45 bytes {0} 
-    [1] ./.test/aliasResolution/app.ts 93 bytes {0} [1 error]
+    [0] ./.test/aliasResolution/common/components/myComponent.ts 45 bytes {0} [built]
+    [1] ./.test/aliasResolution/app.ts 93 bytes {0} [built] [1 error]
 
 ERROR in ./.test/aliasResolution/app.ts
 (2,31): error TS2307: Cannot find module 'components/myComponent2'.
\ No newline at end of file
diff --git a/test/comparison-tests/allowJs-entryFileIsJs/expectedOutput-2.1/output.transpiled.txt b/test/comparison-tests/allowJs-entryFileIsJs/expectedOutput-2.1/output.transpiled.txt
index 0a4f2a7be..8b49e2d48 100644
--- a/test/comparison-tests/allowJs-entryFileIsJs/expectedOutput-2.1/output.transpiled.txt
+++ b/test/comparison-tests/allowJs-entryFileIsJs/expectedOutput-2.1/output.transpiled.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.57 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 38 bytes [entry] [rendered]
-    [0] ./.test/allowJs-entryFileIsJs/src/index.js 38 bytes {0} 
\ No newline at end of file
+    [0] ./.test/allowJs-entryFileIsJs/src/index.js 38 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/allowJs-entryFileIsJs/expectedOutput-2.1/output.txt b/test/comparison-tests/allowJs-entryFileIsJs/expectedOutput-2.1/output.txt
index 099625013..2e6497022 100644
--- a/test/comparison-tests/allowJs-entryFileIsJs/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/allowJs-entryFileIsJs/expectedOutput-2.1/output.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.53 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 24 bytes [entry] [rendered]
-    [0] ./.test/allowJs-entryFileIsJs/src/index.js 24 bytes {0} 
\ No newline at end of file
+    [0] ./.test/allowJs-entryFileIsJs/src/index.js 24 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/appendSuffixTo/expectedOutput-2.1/output.txt b/test/comparison-tests/appendSuffixTo/expectedOutput-2.1/output.txt
index f731f4e93..f0ff8f0c0 100644
--- a/test/comparison-tests/appendSuffixTo/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/appendSuffixTo/expectedOutput-2.1/output.txt
@@ -1,6 +1,6 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  3.29 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 606 bytes [entry] [rendered]
-    [0] ./.test/appendSuffixTo/component.vue 154 bytes {0} 
-    [1] ./.test/appendSuffixTo/helper.ts 100 bytes {0} 
-    [2] ./.test/appendSuffixTo/index.vue 352 bytes {0} 
\ No newline at end of file
+    [0] ./.test/appendSuffixTo/component.vue 154 bytes {0} [built]
+    [1] ./.test/appendSuffixTo/helper.ts 100 bytes {0} [built]
+    [2] ./.test/appendSuffixTo/index.vue 352 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/babel-es6resolveParent/expectedOutput-2.1/output.txt b/test/comparison-tests/babel-es6resolveParent/expectedOutput-2.1/output.txt
index 0e0c0c545..d435a46d5 100644
--- a/test/comparison-tests/babel-es6resolveParent/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/babel-es6resolveParent/expectedOutput-2.1/output.txt
@@ -1,4 +1,4 @@
     Asset  Size  Chunks             Chunk Names
 bundle.js  3 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 251 bytes [entry] [rendered]
-    [0] ./.test/babel-es6resolveParent/index.tsx 251 bytes {0} 
\ No newline at end of file
+    [0] ./.test/babel-es6resolveParent/index.tsx 251 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/babel-issue81/expectedOutput-2.1/output.txt b/test/comparison-tests/babel-issue81/expectedOutput-2.1/output.txt
index 943cf83b7..e795d8b8f 100644
--- a/test/comparison-tests/babel-issue81/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/babel-issue81/expectedOutput-2.1/output.txt
@@ -2,4 +2,4 @@
     bundle.js  3.87 kB       0  [emitted]  main
 bundle.js.map  2.83 kB       0  [emitted]  main
 chunk    {0} bundle.js, bundle.js.map (main) 1.2 kB [entry] [rendered]
-    [0] ./.test/babel-issue81/a.ts 1.2 kB {0} 
\ No newline at end of file
+    [0] ./.test/babel-issue81/a.ts 1.2 kB {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/babel-issue92/expectedOutput-2.1/output.txt b/test/comparison-tests/babel-issue92/expectedOutput-2.1/output.txt
index edbdfc231..492547ed5 100644
--- a/test/comparison-tests/babel-issue92/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/babel-issue92/expectedOutput-2.1/output.txt
@@ -1,5 +1,5 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  3.05 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 110 bytes [entry] [rendered]
-    [0] ./.test/babel-issue92/submodule/submodule.tsx 38 bytes {0} 
-    [1] ./.test/babel-issue92/app.ts 72 bytes {0} 
\ No newline at end of file
+    [0] ./.test/babel-issue92/submodule/submodule.tsx 38 bytes {0} [built]
+    [1] ./.test/babel-issue92/app.ts 72 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/babel-jsxPreserve/expectedOutput-2.1/output.txt b/test/comparison-tests/babel-jsxPreserve/expectedOutput-2.1/output.txt
index a5602f1b7..0b0dcb8e7 100644
--- a/test/comparison-tests/babel-jsxPreserve/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/babel-jsxPreserve/expectedOutput-2.1/output.txt
@@ -2,4 +2,4 @@
 bundle.js  3.42 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 842 bytes [entry] [rendered]
     [0] external "react" 42 bytes {0} [not cacheable]
-    [1] ./.test/babel-jsxPreserve/app.tsx 800 bytes {0} 
\ No newline at end of file
+    [1] ./.test/babel-jsxPreserve/app.tsx 800 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/basic/expectedOutput-2.1/output.txt b/test/comparison-tests/basic/expectedOutput-2.1/output.txt
index 0045db568..03a0bca62 100644
--- a/test/comparison-tests/basic/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/basic/expectedOutput-2.1/output.txt
@@ -1,6 +1,6 @@
     Asset  Size  Chunks             Chunk Names
 bundle.js  3 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 346 bytes [entry] [rendered]
-    [0] ./.test/basic/lib/externalLib.js 55 bytes {0} 
-    [1] ./.test/basic/submodule/submodule.ts 149 bytes {0} 
-    [2] ./.test/basic/app.ts 142 bytes {0} 
\ No newline at end of file
+    [0] ./.test/basic/lib/externalLib.js 55 bytes {0} [built]
+    [1] ./.test/basic/submodule/submodule.ts 149 bytes {0} [built]
+    [2] ./.test/basic/app.ts 142 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/basic/expectedOutput-2.1/patch0/output.transpiled.txt b/test/comparison-tests/basic/expectedOutput-2.1/patch0/output.transpiled.txt
index 74de124fd..1baa7ed9a 100644
--- a/test/comparison-tests/basic/expectedOutput-2.1/patch0/output.transpiled.txt
+++ b/test/comparison-tests/basic/expectedOutput-2.1/patch0/output.transpiled.txt
@@ -1,6 +1,6 @@
     Asset  Size  Chunks             Chunk Names
 bundle.js  3 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 347 bytes [entry] [rendered]
-    [0] ./.test/basic/lib/externalLib.js 55 bytes {0} [built]
-    [1] ./.test/basic/submodule/submodule.ts 149 bytes {0} [built]
+    [0] ./.test/basic/lib/externalLib.js 55 bytes {0}
+    [1] ./.test/basic/submodule/submodule.ts 149 bytes {0}
     [2] ./.test/basic/app.ts 143 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/basic/expectedOutput-2.1/patch0/output.txt b/test/comparison-tests/basic/expectedOutput-2.1/patch0/output.txt
index 0403e8a0c..9569c0b67 100644
--- a/test/comparison-tests/basic/expectedOutput-2.1/patch0/output.txt
+++ b/test/comparison-tests/basic/expectedOutput-2.1/patch0/output.txt
@@ -3,4 +3,7 @@ bundle.js  3 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 347 bytes [entry] [rendered]
     [0] ./.test/basic/lib/externalLib.js 55 bytes {0}
     [1] ./.test/basic/submodule/submodule.ts 149 bytes {0}
-    [2] ./.test/basic/app.ts 143 bytes {0} 
\ No newline at end of file
+    [2] ./.test/basic/app.ts 143 bytes {0} [built] [1 error]
+
+ERROR in ./.test/basic/app.ts
+(3,13): error TS2339: Property 'doSomething2' does not exist on type 'typeof externalLib'.
\ No newline at end of file
diff --git a/test/comparison-tests/basic/expectedOutput-2.1/patch1/output.txt b/test/comparison-tests/basic/expectedOutput-2.1/patch1/output.txt
index 88f1319b3..36df789cf 100644
--- a/test/comparison-tests/basic/expectedOutput-2.1/patch1/output.txt
+++ b/test/comparison-tests/basic/expectedOutput-2.1/patch1/output.txt
@@ -3,4 +3,4 @@ bundle.js  3 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 346 bytes [entry] [rendered]
     [0] ./.test/basic/lib/externalLib.js 55 bytes {0}
     [1] ./.test/basic/submodule/submodule.ts 149 bytes {0}
-    [2] ./.test/basic/app.ts 142 bytes {0} 
\ No newline at end of file
+    [2] ./.test/basic/app.ts 142 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/codeSplitting/expectedOutput-2.1/output.txt b/test/comparison-tests/codeSplitting/expectedOutput-2.1/output.txt
index e6c4a5743..861cd5ba2 100644
--- a/test/comparison-tests/codeSplitting/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/codeSplitting/expectedOutput-2.1/output.txt
@@ -2,9 +2,9 @@
 0.bundle.js  249 bytes       0  [emitted]  
   bundle.js    6.46 kB       1  [emitted]  main
 chunk    {0} 0.bundle.js 72 bytes {1} [rendered]
-    [0] ./.test/codeSplitting/c.ts 36 bytes {0} 
-    [1] ./.test/codeSplitting/d.ts 36 bytes {0} 
+    [0] ./.test/codeSplitting/c.ts 36 bytes {0} [built]
+    [1] ./.test/codeSplitting/d.ts 36 bytes {0} [built]
 chunk    {1} bundle.js (main) 634 bytes [entry] [rendered]
-    [2] ./.test/codeSplitting/a.ts 36 bytes {1} 
-    [3] ./.test/codeSplitting/b.ts 36 bytes {1} 
-    [4] ./.test/codeSplitting/app.ts 562 bytes {1} 
\ No newline at end of file
+    [2] ./.test/codeSplitting/a.ts 36 bytes {1} [built]
+    [3] ./.test/codeSplitting/b.ts 36 bytes {1} [built]
+    [4] ./.test/codeSplitting/app.ts 562 bytes {1} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/conditionalRequire/expectedOutput-2.1/output.txt b/test/comparison-tests/conditionalRequire/expectedOutput-2.1/output.txt
index 159720747..5fa28c62d 100644
--- a/test/comparison-tests/conditionalRequire/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/conditionalRequire/expectedOutput-2.1/output.txt
@@ -1,7 +1,7 @@
     Asset    Size  Chunks             Chunk Names
 bundle.js  1.5 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 285 bytes [entry] [rendered]
-    [0] ./.test/conditionalRequire/app.ts 285 bytes {0} 
+    [0] ./.test/conditionalRequire/app.ts 285 bytes {0} [built]
 
 WARNING in bundle.js from UglifyJs
 Condition always false [bundle.js:78,4]
diff --git a/test/comparison-tests/create-and-execute-test.js b/test/comparison-tests/create-and-execute-test.js
index e87b764df..58b7d5c4b 100644
--- a/test/comparison-tests/create-and-execute-test.js
+++ b/test/comparison-tests/create-and-execute-test.js
@@ -259,10 +259,8 @@ function storeStats(stats, testState, paths, outputs, patch, options) {
             .replace(new RegExp(regexEscape(rootPath + path.sep), 'g'), '')
             .replace(new RegExp(regexEscape(rootPath), 'g'), '')
             .replace(new RegExp(regexEscape(rootPathWithIncorrectWindowsSeparator), 'g'), '')
-            .replace(/\[built\]/g, '')
             .replace(/\.transpile/g, '');
 
-            console.log(statsString)
         fs.writeFileSync(path.join(paths.actualOutput, statsFileName), statsString);
         if (saveOutputMode) {
             var patchedStatsFileName = patch + '/' + statsFileName;
@@ -392,7 +390,6 @@ function normaliseString(platformSpecificContent) {
         // Convert '/' to '\' and back to '/' so slashes are treated the same
         // whether running / generated on windows or *nix
         .replace(new RegExp(regexEscape('/'), 'g'), '\\')
-        .replace(/\[built\]/g, '')
         .replace(new RegExp(regexEscape('\\'), 'g'), '/');
 }
 
diff --git a/test/comparison-tests/declarationDeps/expectedOutput-2.1/output.transpiled.txt b/test/comparison-tests/declarationDeps/expectedOutput-2.1/output.transpiled.txt
index 1e9f94bc6..17ad3b7a0 100644
--- a/test/comparison-tests/declarationDeps/expectedOutput-2.1/output.transpiled.txt
+++ b/test/comparison-tests/declarationDeps/expectedOutput-2.1/output.transpiled.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.59 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 55 bytes [entry] [rendered]
-    [0] ./.test/declarationDeps/app.ts 55 bytes {0} 
\ No newline at end of file
+    [0] ./.test/declarationDeps/app.ts 55 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/declarationDeps/expectedOutput-2.1/output.txt b/test/comparison-tests/declarationDeps/expectedOutput-2.1/output.txt
index 17106a04b..733ce84c2 100644
--- a/test/comparison-tests/declarationDeps/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/declarationDeps/expectedOutput-2.1/output.txt
@@ -1,4 +1,7 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.55 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 41 bytes [entry] [rendered]
-    [0] ./.test/declarationDeps/app.ts 41 bytes {0} 
\ No newline at end of file
+    [0] ./.test/declarationDeps/app.ts 41 bytes {0} [built] [1 error]
+
+ERROR in ./.test/declarationDeps/app.ts
+(2,7): error TS2339: Property 'sayHi' does not exist on type 'typeof Hello'.
\ No newline at end of file
diff --git a/test/comparison-tests/declarationOutput/expectedOutput-2.1/output.txt b/test/comparison-tests/declarationOutput/expectedOutput-2.1/output.txt
index 8fc8d26ca..507a540a9 100644
--- a/test/comparison-tests/declarationOutput/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/declarationOutput/expectedOutput-2.1/output.txt
@@ -3,5 +3,5 @@
     app.d.ts  110 bytes          [emitted]  
 sub/dep.d.ts   63 bytes          [emitted]  
 chunk    {0} bundle.js (main) 737 bytes [entry] [rendered]
-    [0] ./.test/declarationOutput/sub/dep.ts 168 bytes {0} 
-    [1] ./.test/declarationOutput/app.ts 569 bytes {0} 
\ No newline at end of file
+    [0] ./.test/declarationOutput/sub/dep.ts 168 bytes {0} [built]
+    [1] ./.test/declarationOutput/app.ts 569 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/declarationWatch/expectedOutput-2.1/output.txt b/test/comparison-tests/declarationWatch/expectedOutput-2.1/output.txt
index 9cf3c49e9..ef97ea45b 100644
--- a/test/comparison-tests/declarationWatch/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/declarationWatch/expectedOutput-2.1/output.txt
@@ -1,5 +1,5 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.75 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 140 bytes [entry] [rendered]
-    [0] ./.test/declarationWatch/dep.ts 59 bytes {0} 
-    [1] ./.test/declarationWatch/app.ts 81 bytes {0} 
\ No newline at end of file
+    [0] ./.test/declarationWatch/dep.ts 59 bytes {0} [built]
+    [1] ./.test/declarationWatch/app.ts 81 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/dependencyErrors/expectedOutput-2.1/output.txt b/test/comparison-tests/dependencyErrors/expectedOutput-2.1/output.txt
index 0a6bb57ef..b7fbfe407 100644
--- a/test/comparison-tests/dependencyErrors/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/dependencyErrors/expectedOutput-2.1/output.txt
@@ -1,6 +1,12 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.94 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 246 bytes [entry] [rendered]
-    [0] ./.test/dependencyErrors/dep1.ts 76 bytes {0} 
-    [1] ./.test/dependencyErrors/dep2.ts 76 bytes {0} 
-    [2] ./.test/dependencyErrors/app.ts 94 bytes {0} 
\ No newline at end of file
+    [0] ./.test/dependencyErrors/dep1.ts 76 bytes {0} [built]
+    [1] ./.test/dependencyErrors/dep2.ts 76 bytes {0} [built]
+    [2] ./.test/dependencyErrors/app.ts 94 bytes {0} [built] [2 errors]
+
+ERROR in ./.test/dependencyErrors/app.ts
+(4,6): error TS2345: Argument of type '""' is not assignable to parameter of type 'number'.
+
+ERROR in ./.test/dependencyErrors/app.ts
+(5,6): error TS2345: Argument of type '""' is not assignable to parameter of type 'number'.
\ No newline at end of file
diff --git a/test/comparison-tests/dependencyErrors/expectedOutput-2.1/patch0/output.transpiled.txt b/test/comparison-tests/dependencyErrors/expectedOutput-2.1/patch0/output.transpiled.txt
index bddbf4f2e..1cce9ba6e 100644
--- a/test/comparison-tests/dependencyErrors/expectedOutput-2.1/patch0/output.transpiled.txt
+++ b/test/comparison-tests/dependencyErrors/expectedOutput-2.1/patch0/output.transpiled.txt
@@ -1,6 +1,6 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.94 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 246 bytes [entry] [rendered]
-    [0] ./.test/dependencyErrors/dep1.ts 76 bytes {0} 
+    [0] ./.test/dependencyErrors/dep1.ts 76 bytes {0} [built]
     [1] ./.test/dependencyErrors/dep2.ts 76 bytes {0}
     [2] ./.test/dependencyErrors/app.ts 94 bytes {0}
\ No newline at end of file
diff --git a/test/comparison-tests/dependencyErrors/expectedOutput-2.1/patch0/output.txt b/test/comparison-tests/dependencyErrors/expectedOutput-2.1/patch0/output.txt
index d2d9140d2..74af0975c 100644
--- a/test/comparison-tests/dependencyErrors/expectedOutput-2.1/patch0/output.txt
+++ b/test/comparison-tests/dependencyErrors/expectedOutput-2.1/patch0/output.txt
@@ -1,9 +1,9 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.94 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 246 bytes [entry] [rendered]
-    [0] ./.test/dependencyErrors/dep1.ts 76 bytes {0} 
+    [0] ./.test/dependencyErrors/dep1.ts 76 bytes {0} [built]
     [1] ./.test/dependencyErrors/dep2.ts 76 bytes {0}
-    [2] ./.test/dependencyErrors/app.ts 94 bytes {0} [1 error]
+    [2] ./.test/dependencyErrors/app.ts 94 bytes {0} [built] [1 error]
 
 ERROR in ./.test/dependencyErrors/app.ts
 (5,6): error TS2345: Argument of type '""' is not assignable to parameter of type 'number'.
\ No newline at end of file
diff --git a/test/comparison-tests/errors/expectedOutput-2.1/output.transpiled.txt b/test/comparison-tests/errors/expectedOutput-2.1/output.transpiled.txt
index f26957dd4..7e308bef9 100644
--- a/test/comparison-tests/errors/expectedOutput-2.1/output.transpiled.txt
+++ b/test/comparison-tests/errors/expectedOutput-2.1/output.transpiled.txt
@@ -1,7 +1,7 @@
     Asset     Size  Chunks             Chunk Names
-bundle.js  2.79 kB       0  [emitted]  main
-chunk    {0} bundle.js (main) 281 bytes [entry] [rendered]
-    [0] ./.test/errors/app.ts 281 bytes {0}  [failed] [2 errors]
+bundle.js  2.77 kB       0  [emitted]  main
+chunk    {0} bundle.js (main) 261 bytes [entry] [rendered]
+    [0] ./.test/errors/app.ts 261 bytes {0} [built] [failed] [2 errors]
 
 ERROR in ./.test/errors/app.ts
 (1,7): error TS1005: '=' expected.
diff --git a/test/comparison-tests/errors/expectedOutput-2.1/output.txt b/test/comparison-tests/errors/expectedOutput-2.1/output.txt
index 7e47b20a5..f01b5ccab 100644
--- a/test/comparison-tests/errors/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/errors/expectedOutput-2.1/output.txt
@@ -1,7 +1,10 @@
     Asset     Size  Chunks             Chunk Names
-bundle.js  2.76 kB       0  [emitted]  main
-chunk    {0} bundle.js (main) 252 bytes [entry] [rendered]
-    [0] ./.test/errors/app.ts 252 bytes {0}  [failed] [1 error]
+bundle.js  2.74 kB       0  [emitted]  main
+chunk    {0} bundle.js (main) 232 bytes [entry] [rendered]
+    [0] ./.test/errors/app.ts 232 bytes {0} [built] [failed] [2 errors]
+
+ERROR in ./.test/errors/app.ts
+(1,7): error TS1005: '=' expected.
 
 ERROR in ./.test/errors/app.ts
 Module parse failed: index.js??ref--0!app.ts Unexpected token (1:9)
diff --git a/test/comparison-tests/es3/expectedOutput-2.1/output.transpiled.txt b/test/comparison-tests/es3/expectedOutput-2.1/output.transpiled.txt
index 9cc6d1ff0..e6b275d1f 100644
--- a/test/comparison-tests/es3/expectedOutput-2.1/output.transpiled.txt
+++ b/test/comparison-tests/es3/expectedOutput-2.1/output.transpiled.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.57 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 43 bytes [entry] [rendered]
-    [0] ./.test/es3/app.ts 43 bytes {0} 
\ No newline at end of file
+    [0] ./.test/es3/app.ts 43 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/es3/expectedOutput-2.1/output.txt b/test/comparison-tests/es3/expectedOutput-2.1/output.txt
index 815a04cc4..7c1aedfda 100644
--- a/test/comparison-tests/es3/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/es3/expectedOutput-2.1/output.txt
@@ -1,4 +1,7 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.54 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 29 bytes [entry] [rendered]
-    [0] ./.test/es3/app.ts 29 bytes {0} 
\ No newline at end of file
+    [0] ./.test/es3/app.ts 29 bytes {0} [built] [1 error]
+
+ERROR in ./.test/es3/app.ts
+(1,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
\ No newline at end of file
diff --git a/test/comparison-tests/es5/expectedOutput-2.1/output.transpiled.txt b/test/comparison-tests/es5/expectedOutput-2.1/output.transpiled.txt
index cbbdc8a03..533578fbc 100644
--- a/test/comparison-tests/es5/expectedOutput-2.1/output.transpiled.txt
+++ b/test/comparison-tests/es5/expectedOutput-2.1/output.transpiled.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.58 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 51 bytes [entry] [rendered]
-    [0] ./.test/es5/app.ts 51 bytes {0} 
\ No newline at end of file
+    [0] ./.test/es5/app.ts 51 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/es5/expectedOutput-2.1/output.txt b/test/comparison-tests/es5/expectedOutput-2.1/output.txt
index 50a843a4e..8d84e8620 100644
--- a/test/comparison-tests/es5/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/es5/expectedOutput-2.1/output.txt
@@ -1,4 +1,7 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.55 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 37 bytes [entry] [rendered]
-    [0] ./.test/es5/app.ts 37 bytes {0} 
\ No newline at end of file
+    [0] ./.test/es5/app.ts 37 bytes {0} [built] [1 error]
+
+ERROR in ./.test/es5/app.ts
+(2,1): error TS2304: Cannot find name 'Symbol'.
\ No newline at end of file
diff --git a/test/comparison-tests/es6/expectedOutput-2.1/output.txt b/test/comparison-tests/es6/expectedOutput-2.1/output.txt
index 5604c88b2..10beb3a62 100644
--- a/test/comparison-tests/es6/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/es6/expectedOutput-2.1/output.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.55 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 37 bytes [entry] [rendered]
-    [0] ./.test/es6/app.ts 37 bytes {0} 
\ No newline at end of file
+    [0] ./.test/es6/app.ts 37 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/es6codeSplitting/expectedOutput-2.1/output.txt b/test/comparison-tests/es6codeSplitting/expectedOutput-2.1/output.txt
index ddf57256c..543bf463d 100644
--- a/test/comparison-tests/es6codeSplitting/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/es6codeSplitting/expectedOutput-2.1/output.txt
@@ -2,9 +2,9 @@
 0.bundle.js  377 bytes       0  [emitted]  
   bundle.js    6.98 kB       1  [emitted]  main
 chunk    {0} 0.bundle.js 200 bytes {1} [rendered]
-    [0] ./.test/es6codeSplitting/c.ts 100 bytes {0} 
-    [1] ./.test/es6codeSplitting/d.ts 100 bytes {0} 
+    [0] ./.test/es6codeSplitting/c.ts 100 bytes {0} [built]
+    [1] ./.test/es6codeSplitting/d.ts 100 bytes {0} [built]
 chunk    {1} bundle.js (main) 1.16 kB [entry] [rendered]
-    [2] ./.test/es6codeSplitting/a.ts 100 bytes {1} 
-    [3] ./.test/es6codeSplitting/b.ts 100 bytes {1} 
-    [4] ./.test/es6codeSplitting/app.ts 957 bytes {1} 
\ No newline at end of file
+    [2] ./.test/es6codeSplitting/a.ts 100 bytes {1} [built]
+    [3] ./.test/es6codeSplitting/b.ts 100 bytes {1} [built]
+    [4] ./.test/es6codeSplitting/app.ts 957 bytes {1} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/es6withCJS/expectedOutput-2.1/output.txt b/test/comparison-tests/es6withCJS/expectedOutput-2.1/output.txt
index ec129b0c6..60d3805cc 100644
--- a/test/comparison-tests/es6withCJS/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/es6withCJS/expectedOutput-2.1/output.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.63 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 100 bytes [entry] [rendered]
-    [0] ./.test/es6withCJS/app.ts 100 bytes {0} 
\ No newline at end of file
+    [0] ./.test/es6withCJS/app.ts 100 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/externals/expectedOutput-2.1/output.txt b/test/comparison-tests/externals/expectedOutput-2.1/output.txt
index dd65c2859..c1fcb354a 100644
--- a/test/comparison-tests/externals/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/externals/expectedOutput-2.1/output.txt
@@ -2,4 +2,4 @@
 bundle.js  2.69 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 121 bytes [entry] [rendered]
     [0] external "hello" 42 bytes {0} [not cacheable]
-    [1] ./.test/externals/app.ts 79 bytes {0} 
\ No newline at end of file
+    [1] ./.test/externals/app.ts 79 bytes {0} [built]
\ No newline at end of file
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
index 310841cf4..4dd6a57e4 100644
--- 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
@@ -2,12 +2,12 @@
  bundle.js    2.57 kB       0  [emitted]  main
 index.html  182 bytes          [emitted]  
 chunk    {0} bundle.js (main) 36 bytes [entry] [rendered]
-    [0] ./.test/html-webpack-plugin/app.ts 36 bytes {0} 
+    [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  544 kB       0  
     chunk    {0} index.html 541 kB [entry] [rendered]
-        [0] ./~/html-webpack-plugin/~/lodash/lodash.js 540 kB {0} 
-        [1] (webpack)/buildin/global.js 488 bytes {0} 
-        [2] (webpack)/buildin/module.js 495 bytes {0} 
-        [3] ./~/html-webpack-plugin/lib/loader.js!./~/html-webpack-plugin/default_index.ejs 550 bytes {0} 
\ No newline at end of file
+        [0] ./~/lodash/lodash.js 540 kB {0} [built]
+        [1] (webpack)/buildin/global.js 488 bytes {0} [built]
+        [2] (webpack)/buildin/module.js 495 bytes {0} [built]
+        [3] ./~/html-webpack-plugin/lib/loader.js!./~/html-webpack-plugin/default_index.ejs 540 bytes {0} [built]
\ No newline at end of file
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
index fe8d091ad..75b114b5b 100644
--- a/test/comparison-tests/html-webpack-plugin/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/html-webpack-plugin/expectedOutput-2.1/output.txt
@@ -2,12 +2,12 @@
  bundle.js    2.53 kB       0  [emitted]  main
 index.html  182 bytes          [emitted]  
 chunk    {0} bundle.js (main) 22 bytes [entry] [rendered]
-    [0] ./.test/html-webpack-plugin/app.ts 22 bytes {0} 
+    [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  544 kB       0  
     chunk    {0} index.html 541 kB [entry] [rendered]
-        [0] ./~/html-webpack-plugin/~/lodash/lodash.js 540 kB {0} 
-        [1] (webpack)/buildin/global.js 488 bytes {0} 
-        [2] (webpack)/buildin/module.js 495 bytes {0} 
-        [3] ./~/html-webpack-plugin/lib/loader.js!./~/html-webpack-plugin/default_index.ejs 550 bytes {0} 
\ No newline at end of file
+        [0] ./~/lodash/lodash.js 540 kB {0} [built]
+        [1] (webpack)/buildin/global.js 488 bytes {0} [built]
+        [2] (webpack)/buildin/module.js 495 bytes {0} [built]
+        [3] ./~/html-webpack-plugin/lib/loader.js!./~/html-webpack-plugin/default_index.ejs 540 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/ignoreDiagnostics/expectedOutput-2.1/output.txt b/test/comparison-tests/ignoreDiagnostics/expectedOutput-2.1/output.txt
index ac577f1d6..89acb1575 100644
--- a/test/comparison-tests/ignoreDiagnostics/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/ignoreDiagnostics/expectedOutput-2.1/output.txt
@@ -1,4 +1,7 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.76 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 228 bytes [entry] [rendered]
-    [0] ./.test/ignoreDiagnostics/app.ts 228 bytes {0} 
\ No newline at end of file
+    [0] ./.test/ignoreDiagnostics/app.ts 228 bytes {0} [built] [1 error]
+
+ERROR in ./.test/ignoreDiagnostics/app.ts
+(9,5): error TS2322: Type '"b"' is not assignable to type 'Number'.
\ No newline at end of file
diff --git a/test/comparison-tests/importsWatch/expectedOutput-2.1/output.txt b/test/comparison-tests/importsWatch/expectedOutput-2.1/output.txt
index 517178fcb..a426b2bae 100644
--- a/test/comparison-tests/importsWatch/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/importsWatch/expectedOutput-2.1/output.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.57 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 43 bytes [entry] [rendered]
-    [0] ./.test/importsWatch/app.ts 43 bytes {0} 
\ No newline at end of file
+    [0] ./.test/importsWatch/app.ts 43 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/importsWatch/expectedOutput-2.1/patch1/bundle.js b/test/comparison-tests/importsWatch/expectedOutput-2.1/patch1/bundle.js
new file mode 100644
index 000000000..33cba6992
--- /dev/null
+++ b/test/comparison-tests/importsWatch/expectedOutput-2.1/patch1/bundle.js
@@ -0,0 +1,80 @@
+/******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId])
+/******/ 			return installedModules[moduleId].exports;
+
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
+/******/ 		};
+
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+
+/******/ 		// Flag the module as loaded
+/******/ 		module.l = true;
+
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+
+
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+
+/******/ 	// identity function for calling harmony imports with the correct context
+/******/ 	__webpack_require__.i = function(value) { return value; };
+
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, {
+/******/ 				configurable: false,
+/******/ 				enumerable: true,
+/******/ 				get: getter
+/******/ 			});
+/******/ 		}
+/******/ 	};
+
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(__webpack_require__.s = 0);
+/******/ })
+/************************************************************************/
+/******/ ([
+/* 0 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var foo;
+foo.bar = 'foobar';
+
+
+/***/ })
+/******/ ]);
\ No newline at end of file
diff --git a/test/comparison-tests/importsWatch/expectedOutput-2.1/patch1/output.txt b/test/comparison-tests/importsWatch/expectedOutput-2.1/patch1/output.txt
new file mode 100644
index 000000000..eef89deea
--- /dev/null
+++ b/test/comparison-tests/importsWatch/expectedOutput-2.1/patch1/output.txt
@@ -0,0 +1,7 @@
+    Asset     Size  Chunks             Chunk Names
+bundle.js  2.57 kB       0  [emitted]  main
+chunk    {0} bundle.js (main) 43 bytes [entry] [rendered]
+    [0] ./.test/importsWatch/app.ts 43 bytes {0} [built] [1 error]
+
+ERROR in ./.test/importsWatch/app.ts
+(4,1): error TS2322: Type '"foobar"' is not assignable to type 'boolean'.
\ No newline at end of file
diff --git a/test/comparison-tests/instance/expectedOutput-2.1/output.transpiled.txt b/test/comparison-tests/instance/expectedOutput-2.1/output.transpiled.txt
index 5ea2fac74..258a8f2b4 100644
--- a/test/comparison-tests/instance/expectedOutput-2.1/output.transpiled.txt
+++ b/test/comparison-tests/instance/expectedOutput-2.1/output.transpiled.txt
@@ -1,9 +1,9 @@
-    Asset    Size  Chunks             Chunk Names
-bundle.js  2.7 kB       0  [emitted]  b
-chunk    {0} bundle.js (b) 186 bytes [entry] [rendered]
-    [1] ./.test/instance/b.ts 186 bytes {0}  [failed] [1 error]
-chunk    {1}  (a) 186 bytes [entry] [rendered]
-    [0] ./.test/instance/a.ts 186 bytes {1}  [failed] [1 error]
+    Asset     Size  Chunks             Chunk Names
+bundle.js  2.69 kB       0  [emitted]  b
+chunk    {0} bundle.js (b) 177 bytes [entry] [rendered]
+    [1] ./.test/instance/b.ts 177 bytes {0} [built] [failed] [1 error]
+chunk    {1}  (a) 177 bytes [entry] [rendered]
+    [0] ./.test/instance/a.ts 177 bytes {1} [built] [failed] [1 error]
 
 ERROR in ./.test/instance/a.ts
 Module build failed: A file specified in tsconfig.json could not be found: i-dont-exist
diff --git a/test/comparison-tests/instance/expectedOutput-2.1/output.txt b/test/comparison-tests/instance/expectedOutput-2.1/output.txt
index 905fb07f7..ae166bebb 100644
--- a/test/comparison-tests/instance/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/instance/expectedOutput-2.1/output.txt
@@ -1,9 +1,9 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.69 kB       0  [emitted]  b
-chunk    {0} bundle.js (b) 176 bytes [entry] [rendered]
-    [1] ./.test/instance/b.ts 176 bytes {0}  [failed] [1 error]
-chunk    {1}  (a) 176 bytes [entry] [rendered]
-    [0] ./.test/instance/a.ts 176 bytes {1}  [failed] [1 error]
+chunk    {0} bundle.js (b) 167 bytes [entry] [rendered]
+    [1] ./.test/instance/b.ts 167 bytes {0} [built] [failed] [1 error]
+chunk    {1}  (a) 167 bytes [entry] [rendered]
+    [0] ./.test/instance/a.ts 167 bytes {1} [built] [failed] [1 error]
 
 ERROR in ./.test/instance/a.ts
 Module build failed: A file specified in tsconfig.json could not be found: i-dont-exist
diff --git a/test/comparison-tests/issue372/expectedOutput-2.1/output.txt b/test/comparison-tests/issue372/expectedOutput-2.1/output.txt
index eff6591e8..0bc041f06 100644
--- a/test/comparison-tests/issue372/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/issue372/expectedOutput-2.1/output.txt
@@ -1,6 +1,6 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.85 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 167 bytes [entry] [rendered]
-    [0] ./.test/issue372/foo.ts 63 bytes {0} 
-    [1] ./.test/issue372/~/a/index.js 21 bytes {0} 
-    [2] ./.test/issue372/app.ts 83 bytes {0} 
\ No newline at end of file
+    [0] ./.test/issue372/foo.ts 63 bytes {0} [built]
+    [1] ./.test/issue372/~/a/index.js 21 bytes {0} [built]
+    [2] ./.test/issue372/app.ts 83 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/issue372/expectedOutput-2.1/patch0/output.transpiled.txt b/test/comparison-tests/issue372/expectedOutput-2.1/patch0/output.transpiled.txt
deleted file mode 100644
index 8d88be651..000000000
--- a/test/comparison-tests/issue372/expectedOutput-2.1/patch0/output.transpiled.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-    Asset     Size  Chunks             Chunk Names
-bundle.js  2.85 kB       0  [emitted]  main
-chunk    {0} bundle.js (main) 174 bytes [entry] [rendered]
-    [0] ./.test/issue372/foo.ts 63 bytes {0} [built]
-    [1] ./.test/issue372/~/a/index.js 21 bytes {0} [built]
-    [2] ./.test/issue372/app.ts 90 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/issue372/expectedOutput-2.1/patch0/output.txt b/test/comparison-tests/issue372/expectedOutput-2.1/patch0/output.txt
index 749f1db94..a23e2c869 100644
--- a/test/comparison-tests/issue372/expectedOutput-2.1/patch0/output.txt
+++ b/test/comparison-tests/issue372/expectedOutput-2.1/patch0/output.txt
@@ -3,4 +3,4 @@ bundle.js  2.85 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 174 bytes [entry] [rendered]
     [0] ./.test/issue372/foo.ts 63 bytes {0}
     [1] ./.test/issue372/~/a/index.js 21 bytes {0}
-    [2] ./.test/issue372/app.ts 90 bytes {0} 
\ No newline at end of file
+    [2] ./.test/issue372/app.ts 90 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/issue441/expectedOutput-2.1/output.txt b/test/comparison-tests/issue441/expectedOutput-2.1/output.txt
index a431a8693..54e27c875 100644
--- a/test/comparison-tests/issue441/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/issue441/expectedOutput-2.1/output.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.57 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 43 bytes [entry] [rendered]
-    [0] ./.test/issue441/app.ts 43 bytes {0} 
\ No newline at end of file
+    [0] ./.test/issue441/app.ts 43 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/issue441/expectedOutput-2.1/patch1/bundle.js b/test/comparison-tests/issue441/expectedOutput-2.1/patch1/bundle.js
new file mode 100644
index 000000000..33cba6992
--- /dev/null
+++ b/test/comparison-tests/issue441/expectedOutput-2.1/patch1/bundle.js
@@ -0,0 +1,80 @@
+/******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId])
+/******/ 			return installedModules[moduleId].exports;
+
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
+/******/ 		};
+
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+
+/******/ 		// Flag the module as loaded
+/******/ 		module.l = true;
+
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+
+
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+
+/******/ 	// identity function for calling harmony imports with the correct context
+/******/ 	__webpack_require__.i = function(value) { return value; };
+
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, {
+/******/ 				configurable: false,
+/******/ 				enumerable: true,
+/******/ 				get: getter
+/******/ 			});
+/******/ 		}
+/******/ 	};
+
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(__webpack_require__.s = 0);
+/******/ })
+/************************************************************************/
+/******/ ([
+/* 0 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var foo;
+foo.bar = 'foobar';
+
+
+/***/ })
+/******/ ]);
\ No newline at end of file
diff --git a/test/comparison-tests/issue441/expectedOutput-2.1/patch1/output.txt b/test/comparison-tests/issue441/expectedOutput-2.1/patch1/output.txt
new file mode 100644
index 000000000..54e27c875
--- /dev/null
+++ b/test/comparison-tests/issue441/expectedOutput-2.1/patch1/output.txt
@@ -0,0 +1,4 @@
+    Asset     Size  Chunks             Chunk Names
+bundle.js  2.57 kB       0  [emitted]  main
+chunk    {0} bundle.js (main) 43 bytes [entry] [rendered]
+    [0] ./.test/issue441/app.ts 43 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/issue71/expectedOutput-2.1/output.txt b/test/comparison-tests/issue71/expectedOutput-2.1/output.txt
index 10803eff1..76361b420 100644
--- a/test/comparison-tests/issue71/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/issue71/expectedOutput-2.1/output.txt
@@ -1,6 +1,6 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.83 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 149 bytes [entry] [rendered]
-    [0] ./.test/issue71/b.ts 36 bytes {0} 
-    [1] ./.test/issue71/~/a/index.js 21 bytes {0} 
-    [2] ./.test/issue71/app.ts 92 bytes {0} 
\ No newline at end of file
+    [0] ./.test/issue71/b.ts 36 bytes {0} [built]
+    [1] ./.test/issue71/~/a/index.js 21 bytes {0} [built]
+    [2] ./.test/issue71/app.ts 92 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/jsx/expectedOutput-2.1/output.txt b/test/comparison-tests/jsx/expectedOutput-2.1/output.txt
index 17c13612d..ed2a5b9da 100644
--- a/test/comparison-tests/jsx/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/jsx/expectedOutput-2.1/output.txt
@@ -2,4 +2,4 @@
 bundle.js  3.36 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 788 bytes [entry] [rendered]
     [0] external "react" 42 bytes {0} [not cacheable]
-    [1] ./.test/jsx/app.tsx 746 bytes {0} 
\ No newline at end of file
+    [1] ./.test/jsx/app.tsx 746 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/large/expectedOutput-2.1/output.txt b/test/comparison-tests/large/expectedOutput-2.1/output.txt
index 51dd7d8df..5ccd22ea7 100644
--- a/test/comparison-tests/large/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/large/expectedOutput-2.1/output.txt
@@ -1,19 +1,19 @@
     Asset   Size  Chunks             Chunk Names
 bundle.js  77 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 62.5 kB [entry] [rendered]
-    [0] ./.test/large/du.ts 283 bytes {0} 
-    [2] ./.test/large/dm.ts 763 bytes {0} 
-    [3] ./.test/large/dt.ts 343 bytes {0} 
-   [11] ./.test/large/di.ts 823 bytes {0} 
-   [12] ./.test/large/dl.ts 823 bytes {0} 
-   [13] ./.test/large/df.ts 823 bytes {0} 
-   [14] ./.test/large/db.ts 823 bytes {0} 
-   [18] ./.test/large/dg.ts 823 bytes {0} 
-   [35] ./.test/large/cg.ts 823 bytes {0} 
-   [36] ./.test/large/cx.ts 823 bytes {0} 
-   [43] ./.test/large/cp.ts 823 bytes {0} 
-   [70] ./.test/large/bb.ts 823 bytes {0} 
-   [71] ./.test/large/k.ts 820 bytes {0} 
-   [72] ./.test/large/t.ts 820 bytes {0} 
-   [79] ./.test/large/a.ts 817 bytes {0} 
+    [0] ./.test/large/du.ts 283 bytes {0} [built]
+    [2] ./.test/large/dm.ts 763 bytes {0} [built]
+    [3] ./.test/large/dt.ts 343 bytes {0} [built]
+   [11] ./.test/large/di.ts 823 bytes {0} [built]
+   [12] ./.test/large/dl.ts 823 bytes {0} [built]
+   [13] ./.test/large/df.ts 823 bytes {0} [built]
+   [14] ./.test/large/db.ts 823 bytes {0} [built]
+   [18] ./.test/large/dg.ts 823 bytes {0} [built]
+   [35] ./.test/large/cg.ts 823 bytes {0} [built]
+   [36] ./.test/large/cx.ts 823 bytes {0} [built]
+   [43] ./.test/large/cp.ts 823 bytes {0} [built]
+   [70] ./.test/large/bb.ts 823 bytes {0} [built]
+   [71] ./.test/large/k.ts 820 bytes {0} [built]
+   [72] ./.test/large/t.ts 820 bytes {0} [built]
+   [79] ./.test/large/a.ts 817 bytes {0} [built]
      + 65 hidden modules
\ No newline at end of file
diff --git a/test/comparison-tests/noErrorsPlugin/expectedOutput-2.1/output.transpiled.txt b/test/comparison-tests/noErrorsPlugin/expectedOutput-2.1/output.transpiled.txt
index 09b172ff5..fb26ae022 100644
--- a/test/comparison-tests/noErrorsPlugin/expectedOutput-2.1/output.transpiled.txt
+++ b/test/comparison-tests/noErrorsPlugin/expectedOutput-2.1/output.transpiled.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.57 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 41 bytes [entry] [rendered]
-    [0] ./.test/noErrorsPlugin/app.ts 41 bytes {0} 
\ No newline at end of file
+    [0] ./.test/noErrorsPlugin/app.ts 41 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/noErrorsPlugin/expectedOutput-2.1/output.txt b/test/comparison-tests/noErrorsPlugin/expectedOutput-2.1/output.txt
index 6eaf2f7e7..ff5ad34b2 100644
--- a/test/comparison-tests/noErrorsPlugin/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/noErrorsPlugin/expectedOutput-2.1/output.txt
@@ -1,7 +1,11 @@
-    Asset     Size  Chunks             Chunk Names
-bundle.js  2.54 kB       0  [emitted]  main
+    Asset     Size  Chunks  Chunk Names
+bundle.js  2.54 kB       0  main
 chunk    {0} bundle.js (main) 27 bytes [entry] [rendered]
-    [0] ./.test/noErrorsPlugin/app.ts 27 bytes {0} 
+    [0] ./.test/noErrorsPlugin/app.ts 27 bytes {0} [built] [1 error]
 
 WARNING in webpack: Using NoErrorsPlugin is deprecated.
 Use NoEmitOnErrorsPlugin instead.
+
+
+ERROR in ./.test/noErrorsPlugin/app.ts
+(4,1): error TS2322: Type 'string' is not assignable to type 'number'.
\ No newline at end of file
diff --git a/test/comparison-tests/node/expectedOutput-2.1/output.transpiled.txt b/test/comparison-tests/node/expectedOutput-2.1/output.transpiled.txt
index fbb51d161..3085895d0 100644
--- a/test/comparison-tests/node/expectedOutput-2.1/output.transpiled.txt
+++ b/test/comparison-tests/node/expectedOutput-2.1/output.transpiled.txt
@@ -1,4 +1,4 @@
     Asset    Size  Chunks             Chunk Names
 bundle.js  2.6 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 73 bytes [entry] [rendered]
-    [0] ./.test/node/app.ts 73 bytes {0} 
\ No newline at end of file
+    [0] ./.test/node/app.ts 73 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/node/expectedOutput-2.1/output.txt b/test/comparison-tests/node/expectedOutput-2.1/output.txt
index ba2086dfa..d5d6479fd 100644
--- a/test/comparison-tests/node/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/node/expectedOutput-2.1/output.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.57 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 59 bytes [entry] [rendered]
-    [0] ./.test/node/app.ts 59 bytes {0} 
\ No newline at end of file
+    [0] ./.test/node/app.ts 59 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/nodeModulesMeaningfulErrorWhenImportingTs/expectedOutput-2.1/output.transpiled.txt b/test/comparison-tests/nodeModulesMeaningfulErrorWhenImportingTs/expectedOutput-2.1/output.transpiled.txt
index 2b87ccd8c..bfd45a586 100644
--- a/test/comparison-tests/nodeModulesMeaningfulErrorWhenImportingTs/expectedOutput-2.1/output.transpiled.txt
+++ b/test/comparison-tests/nodeModulesMeaningfulErrorWhenImportingTs/expectedOutput-2.1/output.transpiled.txt
@@ -1,5 +1,5 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.74 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 123 bytes [entry] [rendered]
-    [0] ./.test/nodeModulesMeaningfulErrorWhenImportingTs/~/a/index.ts 71 bytes {0} 
-    [1] ./.test/nodeModulesMeaningfulErrorWhenImportingTs/app.ts 52 bytes {0} 
\ No newline at end of file
+    [0] ./.test/nodeModulesMeaningfulErrorWhenImportingTs/~/a/index.ts 71 bytes {0} [built]
+    [1] ./.test/nodeModulesMeaningfulErrorWhenImportingTs/app.ts 52 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/nodeModulesMeaningfulErrorWhenImportingTs/expectedOutput-2.1/output.txt b/test/comparison-tests/nodeModulesMeaningfulErrorWhenImportingTs/expectedOutput-2.1/output.txt
index 1703e9f05..95ae1dbf8 100644
--- a/test/comparison-tests/nodeModulesMeaningfulErrorWhenImportingTs/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/nodeModulesMeaningfulErrorWhenImportingTs/expectedOutput-2.1/output.txt
@@ -1,8 +1,8 @@
-    Asset     Size  Chunks             Chunk Names
-bundle.js  3.12 kB       0  [emitted]  main
-chunk    {0} bundle.js (main) 518 bytes [entry] [rendered]
-    [0] ./.test/nodeModulesMeaningfulErrorWhenImportingTs/~/a/index.ts 466 bytes {0}  [failed] [1 error]
-    [1] ./.test/nodeModulesMeaningfulErrorWhenImportingTs/app.ts 52 bytes {0} 
+    Asset    Size  Chunks             Chunk Names
+bundle.js  3.1 kB       0  [emitted]  main
+chunk    {0} bundle.js (main) 501 bytes [entry] [rendered]
+    [0] ./.test/nodeModulesMeaningfulErrorWhenImportingTs/~/a/index.ts 449 bytes {0} [built] [failed] [1 error]
+    [1] ./.test/nodeModulesMeaningfulErrorWhenImportingTs/app.ts 52 bytes {0} [built]
 
 ERROR in ./.test/nodeModulesMeaningfulErrorWhenImportingTs/~/a/index.ts
 Module build failed: Error: Typescript emitted no output for node_modules/a/index.ts.
diff --git a/test/comparison-tests/nodeResolution/expectedOutput-2.1/output.txt b/test/comparison-tests/nodeResolution/expectedOutput-2.1/output.txt
index 4d6d8e51e..4ee2e527d 100644
--- a/test/comparison-tests/nodeResolution/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/nodeResolution/expectedOutput-2.1/output.txt
@@ -1,5 +1,5 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.67 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 73 bytes [entry] [rendered]
-    [0] ./.test/nodeResolution/~/a/index.js 21 bytes {0} 
-    [1] ./.test/nodeResolution/app.ts 52 bytes {0} 
\ No newline at end of file
+    [0] ./.test/nodeResolution/~/a/index.js 21 bytes {0} [built]
+    [1] ./.test/nodeResolution/app.ts 52 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/nolib/expectedOutput-2.1/output.transpiled.txt b/test/comparison-tests/nolib/expectedOutput-2.1/output.transpiled.txt
index c38599cda..5efdc654c 100644
--- a/test/comparison-tests/nolib/expectedOutput-2.1/output.transpiled.txt
+++ b/test/comparison-tests/nolib/expectedOutput-2.1/output.transpiled.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.56 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 30 bytes [entry] [rendered]
-    [0] ./.test/nolib/app.ts 30 bytes {0} 
\ No newline at end of file
+    [0] ./.test/nolib/app.ts 30 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/nolib/expectedOutput-2.1/output.txt b/test/comparison-tests/nolib/expectedOutput-2.1/output.txt
index f8fba1043..3c7a35920 100644
--- a/test/comparison-tests/nolib/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/nolib/expectedOutput-2.1/output.txt
@@ -1,7 +1,7 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.52 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 16 bytes [entry] [rendered]
-    [0] ./.test/nolib/app.ts 16 bytes {0}  [1 error]
+    [0] ./.test/nolib/app.ts 16 bytes {0} [built] [1 error]
 
 ERROR in ./.test/nolib/app.ts
 (1,1): error TS2304: Cannot find name 'parseInt'.
diff --git a/test/comparison-tests/npmLink/expectedOutput-2.1/output.txt b/test/comparison-tests/npmLink/expectedOutput-2.1/output.txt
index 8145ce708..6f2b32e7b 100644
--- a/test/comparison-tests/npmLink/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/npmLink/expectedOutput-2.1/output.txt
@@ -1,5 +1,5 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.76 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 146 bytes [entry] [rendered]
-    [0] ./test/comparison-tests/testLib/foo.ts 69 bytes {0} 
-    [1] ./.test/npmLink/app.ts 77 bytes {0} 
\ No newline at end of file
+    [0] ./test/comparison-tests/testLib/foo.ts 69 bytes {0} [built]
+    [1] ./.test/npmLink/app.ts 77 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/replacement/expectedOutput-2.1/output.txt b/test/comparison-tests/replacement/expectedOutput-2.1/output.txt
index 3534caaaa..8fc9f15f4 100644
--- a/test/comparison-tests/replacement/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/replacement/expectedOutput-2.1/output.txt
@@ -1,6 +1,6 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.88 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 179 bytes [entry] [rendered]
-    [0] ./.test/replacement/a.ts 64 bytes {0} 
-    [1] ./.test/replacement/sub/dep.ts 61 bytes {0} 
-    [2] ./.test/replacement/app.ts 54 bytes {0} 
\ No newline at end of file
+    [0] ./.test/replacement/a.ts 64 bytes {0} [built]
+    [1] ./.test/replacement/sub/dep.ts 61 bytes {0} [built]
+    [2] ./.test/replacement/app.ts 54 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/simpleDependency/expectedOutput-2.1/output.txt b/test/comparison-tests/simpleDependency/expectedOutput-2.1/output.txt
index d7e4e7ac8..efdf79e03 100644
--- a/test/comparison-tests/simpleDependency/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/simpleDependency/expectedOutput-2.1/output.txt
@@ -1,6 +1,6 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.89 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 197 bytes [entry] [rendered]
-    [0] ./.test/simpleDependency/dep.ts 70 bytes {0} 
-    [1] ./.test/simpleDependency/deeperDep.ts 76 bytes {0} 
-    [2] ./.test/simpleDependency/app.ts 51 bytes {0} 
\ No newline at end of file
+    [0] ./.test/simpleDependency/dep.ts 70 bytes {0} [built]
+    [1] ./.test/simpleDependency/deeperDep.ts 76 bytes {0} [built]
+    [2] ./.test/simpleDependency/app.ts 51 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/simpleDependency/expectedOutput-2.1/patch0/output.transpiled.txt b/test/comparison-tests/simpleDependency/expectedOutput-2.1/patch0/output.transpiled.txt
index e653cb04f..c78ed24fc 100644
--- a/test/comparison-tests/simpleDependency/expectedOutput-2.1/patch0/output.transpiled.txt
+++ b/test/comparison-tests/simpleDependency/expectedOutput-2.1/patch0/output.transpiled.txt
@@ -2,5 +2,5 @@
 bundle.js  2.89 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 197 bytes [entry] [rendered]
     [0] ./.test/simpleDependency/dep.ts 70 bytes {0}
-    [1] ./.test/simpleDependency/deeperDep.ts 76 bytes {0} 
+    [1] ./.test/simpleDependency/deeperDep.ts 76 bytes {0} [built]
     [2] ./.test/simpleDependency/app.ts 51 bytes {0}
\ No newline at end of file
diff --git a/test/comparison-tests/simpleDependency/expectedOutput-2.1/patch0/output.txt b/test/comparison-tests/simpleDependency/expectedOutput-2.1/patch0/output.txt
index a7f5249a8..ff5ade661 100644
--- a/test/comparison-tests/simpleDependency/expectedOutput-2.1/patch0/output.txt
+++ b/test/comparison-tests/simpleDependency/expectedOutput-2.1/patch0/output.txt
@@ -1,8 +1,8 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.89 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 197 bytes [entry] [rendered]
-    [0] ./.test/simpleDependency/dep.ts 70 bytes {0}
-    [1] ./.test/simpleDependency/deeperDep.ts 76 bytes {0} 
+    [0] ./.test/simpleDependency/dep.ts 70 bytes {0} [built]
+    [1] ./.test/simpleDependency/deeperDep.ts 76 bytes {0} [built]
     [2] ./.test/simpleDependency/app.ts 51 bytes {0} [1 error]
 
 ERROR in ./.test/simpleDependency/app.ts
diff --git a/test/comparison-tests/simpleDependency/expectedOutput-2.1/patch1/output.txt b/test/comparison-tests/simpleDependency/expectedOutput-2.1/patch1/output.txt
index e653cb04f..cd4330a0b 100644
--- 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  2.89 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 197 bytes [entry] [rendered]
-    [0] ./.test/simpleDependency/dep.ts 70 bytes {0}
-    [1] ./.test/simpleDependency/deeperDep.ts 76 bytes {0} 
+    [0] ./.test/simpleDependency/dep.ts 70 bytes {0} [built]
+    [1] ./.test/simpleDependency/deeperDep.ts 76 bytes {0} [built]
     [2] ./.test/simpleDependency/app.ts 51 bytes {0}
\ No newline at end of file
diff --git a/test/comparison-tests/sourceMaps/expectedOutput-2.1/output.transpiled.txt b/test/comparison-tests/sourceMaps/expectedOutput-2.1/output.transpiled.txt
index a90e5b968..a9be2ee4c 100644
--- a/test/comparison-tests/sourceMaps/expectedOutput-2.1/output.transpiled.txt
+++ b/test/comparison-tests/sourceMaps/expectedOutput-2.1/output.transpiled.txt
@@ -2,4 +2,4 @@
     bundle.js  2.73 kB       0  [emitted]  main
 bundle.js.map  2.74 kB       0  [emitted]  main
 chunk    {0} bundle.js, bundle.js.map (main) 42 bytes [entry] [rendered]
-    [0] ./.test/sourceMaps/a.ts 42 bytes {0} 
\ No newline at end of file
+    [0] ./.test/sourceMaps/a.ts 42 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/sourceMaps/expectedOutput-2.1/output.txt b/test/comparison-tests/sourceMaps/expectedOutput-2.1/output.txt
index 3ea0fbb86..dc0c9b468 100644
--- a/test/comparison-tests/sourceMaps/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/sourceMaps/expectedOutput-2.1/output.txt
@@ -2,4 +2,4 @@
     bundle.js  2.69 kB       0  [emitted]  main
 bundle.js.map  2.74 kB       0  [emitted]  main
 chunk    {0} bundle.js, bundle.js.map (main) 28 bytes [entry] [rendered]
-    [0] ./.test/sourceMaps/a.ts 28 bytes {0} 
\ No newline at end of file
+    [0] ./.test/sourceMaps/a.ts 28 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/tsconfigInvalid/expectedOutput-2.1/output.txt b/test/comparison-tests/tsconfigInvalid/expectedOutput-2.1/output.txt
index 78fe261c5..0c76e4dd3 100644
--- a/test/comparison-tests/tsconfigInvalid/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/tsconfigInvalid/expectedOutput-2.1/output.txt
@@ -1,7 +1,7 @@
     Asset    Size  Chunks             Chunk Names
 bundle.js  2.6 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 94 bytes [entry] [rendered]
-    [0] ./.test/tsconfigInvalid/app.ts 94 bytes {0}  [failed] [3 errors]
+    [0] ./.test/tsconfigInvalid/app.ts 94 bytes {0} [built] [failed] [3 errors]
 
 ERROR in tsconfig.json
 error TS6046: Argument for '--target' option must be: 'es3', 'es5', 'es6', 'es2015', 'es2016', 'es2017', 'esnext'
diff --git a/test/comparison-tests/tsconfigInvalidFile/expectedOutput-2.1/output.transpiled.txt b/test/comparison-tests/tsconfigInvalidFile/expectedOutput-2.1/output.transpiled.txt
index 3d7cf7bbf..f6d52711f 100644
--- a/test/comparison-tests/tsconfigInvalidFile/expectedOutput-2.1/output.transpiled.txt
+++ b/test/comparison-tests/tsconfigInvalidFile/expectedOutput-2.1/output.transpiled.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.54 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 14 bytes [entry] [rendered]
-    [0] ./.test/tsconfigInvalidFile/app.ts 14 bytes {0} 
\ No newline at end of file
+    [0] ./.test/tsconfigInvalidFile/app.ts 14 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/tsconfigInvalidFile/expectedOutput-2.1/output.txt b/test/comparison-tests/tsconfigInvalidFile/expectedOutput-2.1/output.txt
index 7300f76fb..af05fbb1e 100644
--- a/test/comparison-tests/tsconfigInvalidFile/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/tsconfigInvalidFile/expectedOutput-2.1/output.txt
@@ -1,7 +1,7 @@
     Asset     Size  Chunks             Chunk Names
-bundle.js  2.72 kB       0  [emitted]  main
-chunk    {0} bundle.js (main) 209 bytes [entry] [rendered]
-    [0] ./.test/tsconfigInvalidFile/app.ts 209 bytes {0}  [failed] [1 error]
+bundle.js  2.71 kB       0  [emitted]  main
+chunk    {0} bundle.js (main) 200 bytes [entry] [rendered]
+    [0] ./.test/tsconfigInvalidFile/app.ts 200 bytes {0} [built] [failed] [1 error]
 
 ERROR in ./.test/tsconfigInvalidFile/app.ts
 Module build failed: A file specified in tsconfig.json could not be found: i-am-a-file-what-does-not-exist.ts
\ No newline at end of file
diff --git a/test/comparison-tests/tsconfigNotReadable/expectedOutput-2.1/bundle.js b/test/comparison-tests/tsconfigNotReadable/expectedOutput-2.1/bundle.js
index bab374649..ba8bd2916 100644
--- a/test/comparison-tests/tsconfigNotReadable/expectedOutput-2.1/bundle.js
+++ b/test/comparison-tests/tsconfigNotReadable/expectedOutput-2.1/bundle.js
@@ -70,7 +70,7 @@
 /* 0 */
 /***/ (function(module, exports) {
 
-throw new Error("Module build failed: \u001b[31merror TS5014: Failed to parse file '/tsconfigNotReadable/tsconfig.json': Unexpected token . in JSON at position 38.\u001b[39m");
+throw new Error("Module build failed: \u001b[31merror TS5014: Failed to parse file '/tsconfigNotReadable/tsconfig.json': Unexpected token . in JSON at position 41.\u001b[39m");
 
 /***/ })
 /******/ ]);
\ No newline at end of file
diff --git a/test/comparison-tests/tsconfigNotReadable/expectedOutput-2.1/bundle.transpiled.js b/test/comparison-tests/tsconfigNotReadable/expectedOutput-2.1/bundle.transpiled.js
index 24fe0903c..5a900acf3 100644
--- a/test/comparison-tests/tsconfigNotReadable/expectedOutput-2.1/bundle.transpiled.js
+++ b/test/comparison-tests/tsconfigNotReadable/expectedOutput-2.1/bundle.transpiled.js
@@ -70,7 +70,7 @@
 /* 0 */
 /***/ (function(module, exports) {
 
-throw new Error("Module build failed: \u001b[31merror TS5014: Failed to parse file '/tsconfigNotReadable.transpile/tsconfig.json': Unexpected token . in JSON at position 38.\u001b[39m");
+throw new Error("Module build failed: \u001b[31merror TS5014: Failed to parse file '/tsconfigNotReadable.transpile/tsconfig.json': Unexpected token . in JSON at position 41.\u001b[39m");
 
 /***/ })
 /******/ ]);
\ No newline at end of file
diff --git a/test/comparison-tests/tsconfigNotReadable/expectedOutput-2.1/output.transpiled.txt b/test/comparison-tests/tsconfigNotReadable/expectedOutput-2.1/output.transpiled.txt
index 3e45a452f..36aee1a83 100644
--- a/test/comparison-tests/tsconfigNotReadable/expectedOutput-2.1/output.transpiled.txt
+++ b/test/comparison-tests/tsconfigNotReadable/expectedOutput-2.1/output.transpiled.txt
@@ -1,7 +1,7 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.73 kB       0  [emitted]  main
-chunk    {0} bundle.js (main) 225 bytes [entry] [rendered]
-    [0] ./.test/tsconfigNotReadable/app.ts 225 bytes {0}  [failed] [1 error]
+chunk    {0} bundle.js (main) 216 bytes [entry] [rendered]
+    [0] ./.test/tsconfigNotReadable/app.ts 216 bytes {0} [built] [failed] [1 error]
 
 ERROR in ./.test/tsconfigNotReadable/app.ts
-Module build failed: error TS5014: Failed to parse file 'tsconfig.json': Unexpected token . in JSON at position 38.
\ No newline at end of file
+Module build failed: error TS5014: Failed to parse file 'tsconfig.json': Unexpected token . in JSON at position 41.
\ No newline at end of file
diff --git a/test/comparison-tests/tsconfigNotReadable/expectedOutput-2.1/output.txt b/test/comparison-tests/tsconfigNotReadable/expectedOutput-2.1/output.txt
index 12b4b35d6..f8c601ca9 100644
--- a/test/comparison-tests/tsconfigNotReadable/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/tsconfigNotReadable/expectedOutput-2.1/output.txt
@@ -1,7 +1,7 @@
     Asset     Size  Chunks             Chunk Names
-bundle.js  2.72 kB       0  [emitted]  main
-chunk    {0} bundle.js (main) 215 bytes [entry] [rendered]
-    [0] ./.test/tsconfigNotReadable/app.ts 215 bytes {0}  [failed] [1 error]
+bundle.js  2.71 kB       0  [emitted]  main
+chunk    {0} bundle.js (main) 206 bytes [entry] [rendered]
+    [0] ./.test/tsconfigNotReadable/app.ts 206 bytes {0} [built] [failed] [1 error]
 
 ERROR in ./.test/tsconfigNotReadable/app.ts
-Module build failed: error TS5014: Failed to parse file 'tsconfig.json': Unexpected token . in JSON at position 38.
\ No newline at end of file
+Module build failed: error TS5014: Failed to parse file 'tsconfig.json': Unexpected token . in JSON at position 41.
\ No newline at end of file
diff --git a/test/comparison-tests/tsconfigSearch/expectedOutput-2.1/output.txt b/test/comparison-tests/tsconfigSearch/expectedOutput-2.1/output.txt
index 62f179c4a..baecfb586 100644
--- a/test/comparison-tests/tsconfigSearch/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/tsconfigSearch/expectedOutput-2.1/output.txt
@@ -1,5 +1,5 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.73 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 140 bytes [entry] [rendered]
-    [0] ./.test/tsconfigSearch/lib/externalLib.js 55 bytes {0} 
-    [1] ./.test/tsconfigSearch/src/app.ts 85 bytes {0} 
\ No newline at end of file
+    [0] ./.test/tsconfigSearch/lib/externalLib.js 55 bytes {0} [built]
+    [1] ./.test/tsconfigSearch/src/app.ts 85 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/output.transpiled.txt b/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/output.transpiled.txt
index 2998fece7..ae51c3058 100644
--- a/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/output.transpiled.txt
+++ b/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/output.transpiled.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.74 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 212 bytes [entry] [rendered]
-    [0] ./.test/typeSystemWatch/app.ts 212 bytes {0} 
\ No newline at end of file
+    [0] ./.test/typeSystemWatch/app.ts 212 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/output.txt b/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/output.txt
index 7961a5888..1b8d6d2a8 100644
--- a/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/output.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.71 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 198 bytes [entry] [rendered]
-    [0] ./.test/typeSystemWatch/app.ts 198 bytes {0} 
\ No newline at end of file
+    [0] ./.test/typeSystemWatch/app.ts 198 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/patch0/output.transpiled.txt b/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/patch0/output.transpiled.txt
index 2998fece7..ae51c3058 100644
--- a/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/patch0/output.transpiled.txt
+++ b/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/patch0/output.transpiled.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.74 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 212 bytes [entry] [rendered]
-    [0] ./.test/typeSystemWatch/app.ts 212 bytes {0} 
\ No newline at end of file
+    [0] ./.test/typeSystemWatch/app.ts 212 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/patch0/output.txt b/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/patch0/output.txt
index 4641ccbc2..ea5e32528 100644
--- a/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/patch0/output.txt
+++ b/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/patch0/output.txt
@@ -1,7 +1,7 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.71 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 198 bytes [entry] [rendered]
-    [0] ./.test/typeSystemWatch/app.ts 198 bytes {0}  [1 error]
+    [0] ./.test/typeSystemWatch/app.ts 198 bytes {0} [built] [1 error]
 
 ERROR in ./.test/typeSystemWatch/app.ts
 (11,5): error TS2322: Type 'AType' is not assignable to type 'BType'.
diff --git a/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/patch1/output.transpiled.txt b/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/patch1/output.transpiled.txt
index 2998fece7..ae51c3058 100644
--- a/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/patch1/output.transpiled.txt
+++ b/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/patch1/output.transpiled.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.74 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 212 bytes [entry] [rendered]
-    [0] ./.test/typeSystemWatch/app.ts 212 bytes {0} 
\ No newline at end of file
+    [0] ./.test/typeSystemWatch/app.ts 212 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/patch1/output.txt b/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/patch1/output.txt
index 7961a5888..1b8d6d2a8 100644
--- a/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/patch1/output.txt
+++ b/test/comparison-tests/typeSystemWatch/expectedOutput-2.1/patch1/output.txt
@@ -1,4 +1,4 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.71 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 198 bytes [entry] [rendered]
-    [0] ./.test/typeSystemWatch/app.ts 198 bytes {0} 
\ No newline at end of file
+    [0] ./.test/typeSystemWatch/app.ts 198 bytes {0} [built]
\ No newline at end of file
diff --git a/test/comparison-tests/visualStudioErrorFormat/expectedOutput-2.1/output.txt b/test/comparison-tests/visualStudioErrorFormat/expectedOutput-2.1/output.txt
index 33f9690d3..5b7b8cb82 100644
--- a/test/comparison-tests/visualStudioErrorFormat/expectedOutput-2.1/output.txt
+++ b/test/comparison-tests/visualStudioErrorFormat/expectedOutput-2.1/output.txt
@@ -1,5 +1,8 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  2.74 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 139 bytes [entry] [rendered]
-    [0] ./.test/visualStudioErrorFormat/common/components/myComponent.ts 46 bytes {0} 
-    [1] ./.test/visualStudioErrorFormat/app.ts 93 bytes {0} 
\ No newline at end of file
+    [0] ./.test/visualStudioErrorFormat/common/components/myComponent.ts 46 bytes {0} [built]
+    [1] ./.test/visualStudioErrorFormat/app.ts 93 bytes {0} [built] [1 error]
+
+ERROR in ./.test/visualStudioErrorFormat/app.ts
+app.ts(2,31): error TS2307: Cannot find module 'components/myComponent2'.
\ No newline at end of file

From bca9a6a8b3b9aee2c744879b3dbf93ea0ed9d0d0 Mon Sep 17 00:00:00 2001
From: Herrington Darkholme <nonamesheep1@gmail.com>
Date: Wed, 22 Feb 2017 11:17:10 +0800
Subject: [PATCH 3/3] test travis ci

---
 src/after-compile.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/after-compile.ts b/src/after-compile.ts
index 97db8dd39..b803aeaa9 100644
--- a/src/after-compile.ts
+++ b/src/after-compile.ts
@@ -4,6 +4,8 @@ import typescript = require('typescript');
 import utils = require('./utils');
 import constants = require('./constants');
 
+// toggle comment
+
 function makeAfterCompile(
     instance: interfaces.TSInstance,
     configFilePath: string