3.6 was missing from Travis / AppVeyor build matrices. (#1011)

* Update .travis.yml

* Update appveyor.yml

* update comparison tests

* update to TS 3.6.3

* make comparison test tolerant of different spaces

* Fix when config includes referenced project sources and outputs as well

* Always run comparison test without transpile

* ignore case when matching file paths

* Update CHANGELOG.md

Author: johnnyreilly

.travis.yml

@@ -14,9 +14,10 @@ install:
   - yarn lint
   - yarn add $TYPESCRIPT
 env:
+  - [email protected]
+  - TYPESCRIPT=typescript@next
   - [email protected]
   - [email protected]
-  - TYPESCRIPT=typescript@next
   - [email protected]
   - [email protected]
   - [email protected]
@@ -27,4 +28,4 @@ env:
   - [email protected]
   - [email protected]
   - [email protected]
- 
+ 

CHANGELOG.md

@@ -1,7 +1,7 @@
 # Changelog
 
 ## v6.1.1
-* [Fix SolutionBuilder watches](https://github.com/TypeStrong/ts-loader/pull/1003) (#998) - thanks @sheetalkamat!
+* [Fix SolutionBuilder watches](https://github.com/TypeStrong/ts-loader/pull/1003) and [related fixes](https://github.com/TypeStrong/ts-loader/pull/1011) (#998) - thanks @sheetalkamat!
 * [fix: no errors reported if flagged with @ts-check](https://github.com/TypeStrong/ts-loader/pull/1008) (#1004) - thanks @reinholdk!
 
 ## v6.1.0

appveyor.yml

@@ -3,9 +3,10 @@ environment:
   FORCE_COLOR: 1
   nodejs_version: "10"
   matrix:
+  - TYPESCRIPT: [email protected]
+  - TYPESCRIPT: typescript@next
   - TYPESCRIPT: [email protected]
   - TYPESCRIPT: [email protected]
-  - TYPESCRIPT: typescript@next
   - TYPESCRIPT: [email protected]
   - TYPESCRIPT: [email protected]
   - TYPESCRIPT: [email protected]

src/after-compile.ts

@@ -72,9 +72,8 @@ export function makeAfterCompile(
     provideTsBuildInfoFilesToWebpack(instance, compilation);
 
     instance.filesWithErrors = filesWithErrors;
-    instance.modifiedFiles = null;
+    instance.modifiedFiles = undefined;
     instance.projectsMissingSourceMaps = new Set();
-
     callback();
   };
 }
@@ -90,7 +89,6 @@ function provideCompilerOptionDiagnosticErrorsToWebpack(
 ) {
   if (getCompilerOptionDiagnostics) {
     const { languageService, loaderOptions, compiler, program } = instance;
-
     const errorsToAdd = formatErrors(
       program === undefined
         ? languageService!.getCompilerOptionsDiagnostics()

src/index.ts

@@ -432,7 +432,7 @@ function updateFileInCache(
   }
 
   // push this file to modified files hash.
-  if (instance.modifiedFiles === null || instance.modifiedFiles === undefined) {
+  if (!instance.modifiedFiles) {
     instance.modifiedFiles = new Map<string, TSFile>();
   }
   instance.modifiedFiles.set(filePath, file);

src/instances.ts

@@ -276,7 +276,6 @@ function successfulTypeScriptInstance(
     transformers: {} as typescript.CustomTransformers, // this is only set temporarily, custom transformers are created further down
     dependencyGraph: {},
     reverseDependencyGraph: {},
-    modifiedFiles: null,
     colors
   });
 

src/interfaces.ts

@@ -103,7 +103,7 @@ export interface TSInstance {
   /**
    * contains the modified files - cleared each time after-compile is called
    */
-  modifiedFiles?: TSFiles | null;
+  modifiedFiles?: TSFiles;
   /**
    * Paths to project references that are missing source maps.
    * Cleared each time after-compile is called. Used to dedupe

src/servicesHost.ts

@@ -13,6 +13,7 @@ import {
   ResolveSync,
   SolutionBuilderWithWatchHost,
   SolutionDiagnostics,
+  TSFile,
   TSInstance,
   WatchCallbacks,
   WatchFactory,
@@ -385,7 +386,10 @@ export function updateFileWithText(
       file.text = newText;
       file.version++;
       instance.version!++;
-      instance.modifiedFiles!.set(nFilePath, file);
+      if (!instance.modifiedFiles) {
+        instance.modifiedFiles = new Map<string, TSFile>();
+      }
+      instance.modifiedFiles.set(nFilePath, file);
       if (instance.watchHost !== undefined) {
         instance.watchHost.invokeFileWatcher(
           nFilePath,

src/watch-run.ts

@@ -1,7 +1,7 @@
 import * as webpack from 'webpack';
 
 import * as constants from './constants';
-import { TSFile, TSInstance } from './interfaces';
+import { TSInstance } from './interfaces';
 import { updateFileWithText } from './servicesHost';
 import { readFile } from './utils';
 
@@ -14,10 +14,6 @@ export function makeWatchRun(instance: TSInstance) {
   const startTime = 0;
 
   return (compiler: webpack.Compiler, callback: () => void) => {
-    if (null === instance.modifiedFiles) {
-      instance.modifiedFiles = new Map<string, TSFile>();
-    }
-
     const times = compiler.fileTimestamps;
     for (const [filePath, date] of times) {
       if (

test/comparison-tests/create-and-execute-test.js

@@ -52,10 +52,8 @@ if (fs.statSync(testPath).isDirectory() &&
 
     // @ts-ignore
     describe(`${testToRun}${extraOption ? ` - ${extraOption}: true` : ''}`, function () {
-        if (testToRun !== 'projectReferencesOutDir' || require('os').platform() !== 'win32') {
-            // @ts-ignore
-            it('should have the correct output', createTest(testToRun, testPath, {}));
-        }
+        // @ts-ignore
+        it('should have the correct output', createTest(testToRun, testPath, {}));
 
         if (testToRun === 'declarationOutput' ||
             testToRun === 'declarationOutputWithMaps' ||
@@ -390,7 +388,6 @@ function getNormalisedFileContent(file, location) {
     /** @type {string} */
     let fileContent;
     const filePath = path.join(location, file);
-
     try {
         const originalContent = fs.readFileSync(filePath).toString();
         fileContent = (file.indexOf('output.') === 0
@@ -402,9 +399,9 @@ function getNormalisedFileContent(file, location) {
                 .replace(/Module build failed \(from \//gm, 'Module build failed (from ')
                 .replace(/Module Warning \(from \//gm, 'Module Warning (from ')
                 // We don't want a difference in the number of kilobytes to fail the build
-                .replace(/[\d]+([.][\d]*)? KiB/g, 'A-NUMBER-OF KiB')
+                .replace(/\s+[\d]+([.][\d]*)? KiB\s+/g, ' A-NUMBER-OF KiB ')
                 // We also don't want a difference in the number of bytes to fail the build
-                .replace(/ \d+ bytes /g, ' A-NUMBER-OF bytes ')
+                .replace(/\s+\d+ bytes\s+/g, ' A-NUMBER-OF bytes ')
                 // Ignore whitespace between:     Asset     Size  Chunks             Chunk Names
                 .replace(/\s+Asset\s+Size\s+Chunks\s+Chunk Names/, '    Asset     Size  Chunks             Chunk Names')
                 .replace(/ test\/comparison-tests\//,' /test/comparison-tests/')
@@ -422,11 +419,11 @@ function getNormalisedFileContent(file, location) {
                 return 'at ' + remainingPathAndColon + 'irrelevant-line-number' + colon + 'irrelevant-column-number';
             })
             // strip C:/projects/ts-loader/.test/
-            .replace(/(C\:\/)?[\w|\/]*\/(ts-loader|workspace)\/\.test/g, '')
-            .replace(/webpack:\/\/(C:\/)?[\w|\/|-]*\/comparison-tests\//g, 'webpack://comparison-tests/')
-            .replace(/WEBPACK FOOTER\/n\/ (C:\/)?[\w|\/|-]*\/comparison-tests\//g, 'WEBPACK FOOTER/n/ /ts-loader/test/comparison-tests/')
-            .replace(/!\** (C\:\/)?[\w|\/|-]*\/comparison-tests\//g, '!*** /ts-loader/test/comparison-tests/')
-            .replace(/\/ (C\:\/)?[\w|\/|-]*\/comparison-tests\//g, '/ /ts-loader/test/comparison-tests/')
+            .replace(/(C\:\/)?[\w|\/]*\/(ts-loader|workspace)\/\.test/ig, '')
+            .replace(/webpack:\/\/(C:\/)?[\w|\/|-]*\/comparison-tests\//ig, 'webpack://comparison-tests/')
+            .replace(/WEBPACK FOOTER\/n\/ (C:\/)?[\w|\/|-]*\/comparison-tests\//ig, 'WEBPACK FOOTER/n/ /ts-loader/test/comparison-tests/')
+            .replace(/!\** (C\:\/)?[\w|\/|-]*\/comparison-tests\//ig, '!*** /ts-loader/test/comparison-tests/')
+            .replace(/\/ (C\:\/)?[\w|\/|-]*\/comparison-tests\//ig, '/ /ts-loader/test/comparison-tests/')
             // with webpack 4 there are different numbers of *s on Windows and on Linux
             .replace(/\*{10}\**/g, '**********');
     } catch (e) {