fix(git) Cleaned up issues with builds and tests that were caused by …

…incorrectly squashing commits. This is stable.

addon/ng2/models/webpack-build-common.ts

@@ -3,7 +3,6 @@ import {LoaderConfig} from '../utilities/ts-path-mappings-webpack-plugin';
 
 const path = require('path');
 const ForkCheckerPlugin = require('awesome-typescript-loader').ForkCheckerPlugin;
-const PathsPlugin = require('awesome-typescript-loader').TsConfigPathsPlugin;
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 
@@ -20,7 +19,6 @@ export const getWebpackCommonConfig = function(projectRoot: string) {
       extensions: ['', '.ts', '.js'],
       root: path.resolve(projectRoot, './src'),
       plugins: [
-        new PathsPlugin(awesomeTypescriptLoaderConfig)
       ]
     },
     context: path.resolve(__dirname, './'),

addon/ng2/models/webpack-build-material2.ts

@@ -7,7 +7,7 @@
 // .css'] => .scss']
 // This allows for angular2-template-loader to transpile the sass correctly.
 import * as webpack from 'webpack';
-import {PathsPlugin, LoaderConfig} from '../utilities/ts-path-mappings-webpack-plugin';
+import {LoaderConfig} from '../utilities/ts-path-mappings-webpack-plugin';
 
 const path = require('path');
 const ForkCheckerPlugin = require('awesome-typescript-loader').ForkCheckerPlugin;
@@ -53,9 +53,7 @@ export const getWebpackMaterialConfig = function(projectRoot: string) {
     devtool: 'inline-source-map',
     resolve: {
       extensions: ['', '.webpack.js', '.web.js', '.ts', '.tsx', '.js', '.css', '.scss'],
-
       plugins: [
-        new PathsPlugin(awesomeTypescriptLoaderConfig)
       ]
       // alias: aliasMap
     },
@@ -151,7 +149,6 @@ export const getWebpackMaterialE2EConfig = function(projectRoot: string) {
       extensions: ['', '.webpack.js', '.web.js', '.ts', '.tsx', '.js', '.css', '.scss'],
 
       plugins: [
-        new PathsPlugin(awesomeTypescriptLoaderConfig)
       ]
       // alias: aliasMap
     },

package.json

@@ -35,9 +35,8 @@
     "@types/lodash": "^4.0.25-alpha",
     "@types/rimraf": "0.0.25-alpha",
     "@types/webpack": "^1.12.22-alpha",
-    "amdefine": "^1.0.0",
     "angular2-template-loader": "^0.4.0",
-    "awesome-typescript-loader": "2.0.1",
+    "awesome-typescript-loader": "1.1.1",
     "chalk": "^1.1.3",
     "compression-webpack-plugin": "^0.3.1",
     "copy-webpack-plugin": "^3.0.1",