removing a-t-l entirely

Author: hansl

package.json

@@ -47,7 +47,6 @@
     "@angular/tsc-wrapped": "0.4.0",
     "angular2-template-loader": "^0.5.0",
     "autoprefixer": "^6.5.3",
-    "awesome-typescript-loader": "^2.2.3",
     "chalk": "^1.1.3",
     "common-tags": "^1.3.1",
     "compression-webpack-plugin": "^0.3.2",
@@ -60,6 +59,7 @@
     "ember-cli-normalize-entity-name": "^1.0.0",
     "ember-cli-preprocess-registry": "^2.0.0",
     "ember-cli-string-utils": "^1.0.0",
+    "enhanced-resolve": "^2.3.0",
     "exists-sync": "0.0.3",
     "extract-text-webpack-plugin": "^2.0.0-beta.4",
     "file-loader": "^0.8.5",

packages/angular-cli/models/webpack-build-test.js

@@ -2,7 +2,14 @@
 
 const path = require('path');
 const webpack = require('webpack');
-const atl = require('awesome-typescript-loader');
+const ngtools = require('@ngtools/webpack');
+
+
+const g = global;
+const webpackLoader = g['angularCliIsLocal']
+  ? g.angularCliPackages['@ngtools/webpack'].main
+  : '@ngtools/webpack';
+
 
 const getWebpackTestConfig = function (projectRoot, environment, appConfig, testConfig) {
 
@@ -48,8 +55,8 @@ const getWebpackTestConfig = function (projectRoot, environment, appConfig, test
     resolve: {
       extensions: ['.ts', '.js'],
       plugins: [
-        new atl.TsConfigPathsPlugin({
-          tsconfig: path.resolve(appRoot, appConfig.tsconfig)
+        new ngtools.PathsPlugin({
+          tsConfigPath: path.resolve(appRoot, appConfig.tsconfig)
         })
       ]
     },
@@ -74,7 +81,7 @@ const getWebpackTestConfig = function (projectRoot, environment, appConfig, test
           test: /\.ts$/,
           loaders: [
             {
-              loader: 'awesome-typescript-loader',
+              loader: webpackLoader,
               query: {
                 tsconfig: path.resolve(appRoot, appConfig.tsconfig),
                 module: 'commonjs',

packages/angular-cli/package.json

@@ -32,7 +32,6 @@
     "@angular/core": "2.2.1",
     "@ngtools/webpack": "^1.0.0",
     "angular2-template-loader": "^0.5.0",
-    "awesome-typescript-loader": "^2.2.3",
     "chalk": "^1.1.3",
     "common-tags": "^1.3.1",
     "compression-webpack-plugin": "^0.3.2",
@@ -45,6 +44,7 @@
     "ember-cli-normalize-entity-name": "^1.0.0",
     "ember-cli-preprocess-registry": "^2.0.0",
     "ember-cli-string-utils": "^1.0.0",
+    "enhanced-resolve": "^2.3.0",
     "exists-sync": "0.0.3",
     "extract-text-webpack-plugin": "^2.0.0-beta.4",
     "file-loader": "^0.8.5",

packages/webpack/src/index.ts

@@ -1,4 +1,5 @@
 import 'reflect-metadata';
 
-export * from './plugin'
-export {ngcLoader as default} from './loader'
+export * from './plugin';
+export {ngcLoader as default} from './loader';
+export {PathsPlugin} from './paths-plugin';

packages/webpack/src/paths-plugin.ts

@@ -42,9 +42,15 @@ export class PathsPlugin implements Tapable {
 
   private _absoluteBaseUrl: string;
 
-  private static _loadOptionsFromTsConfig(tsConfigPath: string, host: ts.CompilerHost):
+  private static _loadOptionsFromTsConfig(tsConfigPath: string, host?: ts.CompilerHost):
       ts.CompilerOptions {
-    const tsConfig = ts.readConfigFile(tsConfigPath, (path: string) => host.readFile(path));
+    const tsConfig = ts.readConfigFile(tsConfigPath, (path: string) => {
+      if (host) {
+        return host.readFile(path);
+      } else {
+        return ts.sys.readFile(path);
+      }
+    });
     if (tsConfig.error) {
       throw tsConfig.error;
     }
@@ -58,16 +64,16 @@ export class PathsPlugin implements Tapable {
     }
     this._tsConfigPath = options.tsConfigPath;
 
-    if (options.hasOwnProperty('compilerHost')) {
-      this._host = options.compilerHost;
+    if (options.hasOwnProperty('compilerOptions')) {
+      this._compilerOptions = Object.assign({}, options.compilerOptions);
     } else {
-      this._host = ts.createCompilerHost(this._compilerOptions, false);
+      this._compilerOptions = PathsPlugin._loadOptionsFromTsConfig(this._tsConfigPath, null);
     }
 
-    if (options.hasOwnProperty('compilerOptions')) {
-      this._compilerOptions = Object.assign({}, options.compilerOptions);
+    if (options.hasOwnProperty('compilerHost')) {
+      this._host = options.compilerHost;
     } else {
-      this._compilerOptions = PathsPlugin._loadOptionsFromTsConfig(this._tsConfigPath, this._host);
+      this._host = ts.createCompilerHost(this._compilerOptions, false);
     }
 
     this.source = 'described-resolve';