From f8a34c14e1f9a749db42c3beb165781c612b6a77 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Sat, 18 Mar 2017 23:30:01 +0000
Subject: [PATCH] fix(@angular/cli): fix test typings

Blocked by #5500 (fix is included in this PR so that CI will run).

Our unit test webpack config was erroneously sending in entry points to karma-webpack, who should receive no entry points.

This in turn was hiding errors related to typeRoots lookups.

It was also causing unit tests compilation to behave weirdly: unit test errors would not stop compilation, because other entries would still compile.

This might also have contributed to the overall slowness of unit tests in #5423.

Related to TypeStrong/ts-node#283
Fix #5332
Fix #5351
---
 .../ng/files/__path__/tsconfig.spec.json      | 20 ++++++++++---------
 .../blueprints/ng/files/__path__/typings.d.ts |  5 +++--
 .../cli/models/webpack-test-config.ts         |  1 +
 .../webpack/src/extract_i18n_plugin.ts        |  3 ++-
 packages/@ngtools/webpack/src/plugin.ts       |  3 ++-
 5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/packages/@angular/cli/blueprints/ng/files/__path__/tsconfig.spec.json b/packages/@angular/cli/blueprints/ng/files/__path__/tsconfig.spec.json
index 5dc8eeb57474..f59801cbe6d7 100644
--- a/packages/@angular/cli/blueprints/ng/files/__path__/tsconfig.spec.json
+++ b/packages/@angular/cli/blueprints/ng/files/__path__/tsconfig.spec.json
@@ -8,7 +8,8 @@
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "lib": [
-      "es2016"
+      "es2016",
+      "dom"
     ],<% } %>
     "outDir": "<%= relativeRootPath %>/out-tsc/spec",
     "module": "commonjs",
@@ -17,12 +18,13 @@
     "types": [
       "jasmine",
       "node"
-    ]
-  },
-  "files": [
-    "test.ts"
-  ],
-  "include": [
-    "**/*.spec.ts"
-  ]
+    ],
+   "files": [
+     "test.ts"
+   ],
+   "include": [
+     "**/*.spec.ts",
+     "**/*.d.ts"
+   ]
+  }
 }
diff --git a/packages/@angular/cli/blueprints/ng/files/__path__/typings.d.ts b/packages/@angular/cli/blueprints/ng/files/__path__/typings.d.ts
index edc2f1e52bd4..ef5c7bd62057 100644
--- a/packages/@angular/cli/blueprints/ng/files/__path__/typings.d.ts
+++ b/packages/@angular/cli/blueprints/ng/files/__path__/typings.d.ts
@@ -1,4 +1,5 @@
 /* SystemJS module definition */
-declare var module: {
+declare var module: NodeModule;
+interface NodeModule {
   id: string;
-};
+}
diff --git a/packages/@angular/cli/models/webpack-test-config.ts b/packages/@angular/cli/models/webpack-test-config.ts
index d7d3e81b7dd1..a5b9049f62db 100644
--- a/packages/@angular/cli/models/webpack-test-config.ts
+++ b/packages/@angular/cli/models/webpack-test-config.ts
@@ -28,6 +28,7 @@ export class WebpackTestConfig extends NgCliWebpackConfig {
     ];
 
     this.config = webpackMerge(webpackConfigs);
+    delete this.config.entry;
 
     // Remove any instance of CommonsChunkPlugin, not needed with karma-webpack.
     this.config.plugins = this.config.plugins.filter((plugin: any) =>
diff --git a/packages/@ngtools/webpack/src/extract_i18n_plugin.ts b/packages/@ngtools/webpack/src/extract_i18n_plugin.ts
index 06168b9b3f24..be7ec112beb3 100644
--- a/packages/@ngtools/webpack/src/extract_i18n_plugin.ts
+++ b/packages/@ngtools/webpack/src/extract_i18n_plugin.ts
@@ -46,7 +46,8 @@ export class ExtractI18nPlugin implements Tapable {
     if (!options.hasOwnProperty('tsConfigPath')) {
       throw new Error('Must specify "tsConfigPath" in the configuration of @ngtools/webpack.');
     }
-    this._tsConfigPath = options.tsConfigPath;
+    // TS represents paths internally with '/' and expects the tsconfig path to be in this format
+    this._tsConfigPath = options.tsConfigPath.replace(/\\/g, '/');
 
     // Check the base path.
     const maybeBasePath = path.resolve(process.cwd(), this._tsConfigPath);
diff --git a/packages/@ngtools/webpack/src/plugin.ts b/packages/@ngtools/webpack/src/plugin.ts
index 2addb6a29018..055c675ccee3 100644
--- a/packages/@ngtools/webpack/src/plugin.ts
+++ b/packages/@ngtools/webpack/src/plugin.ts
@@ -96,7 +96,8 @@ export class AotPlugin implements Tapable {
     if (!options.hasOwnProperty('tsConfigPath')) {
       throw new Error('Must specify "tsConfigPath" in the configuration of @ngtools/webpack.');
     }
-    this._tsConfigPath = options.tsConfigPath;
+    // TS represents paths internally with '/' and expects the tsconfig path to be in this format
+    this._tsConfigPath = options.tsConfigPath.replace(/\\/g, '/');
 
     // Check the base path.
     const maybeBasePath = path.resolve(process.cwd(), this._tsConfigPath);