Skip to content

Commit 42df3a6

Browse files
committed
fix(git) Cleaned up issues with builds and tests that were caused by incorrectly squashing commits. This is stable.
1 parent 6e9e4ca commit 42df3a6

File tree

3 files changed

+2
-8
lines changed

3 files changed

+2
-8
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import {LoaderConfig} from '../utilities/ts-path-mappings-webpack-plugin';
33

44
const path = require('path');
55
const ForkCheckerPlugin = require('awesome-typescript-loader').ForkCheckerPlugin;
6-
const PathsPlugin = require('awesome-typescript-loader').TsConfigPathsPlugin;
76
const CopyWebpackPlugin = require('copy-webpack-plugin');
87
const HtmlWebpackPlugin = require('html-webpack-plugin');
98

@@ -20,7 +19,6 @@ export const getWebpackCommonConfig = function(projectRoot: string) {
2019
extensions: ['', '.ts', '.js'],
2120
root: path.resolve(projectRoot, './src'),
2221
plugins: [
23-
new PathsPlugin(awesomeTypescriptLoaderConfig)
2422
]
2523
},
2624
context: path.resolve(__dirname, './'),

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// .css'] => .scss']
88
// This allows for angular2-template-loader to transpile the sass correctly.
99
import * as webpack from 'webpack';
10-
import {PathsPlugin, LoaderConfig} from '../utilities/ts-path-mappings-webpack-plugin';
10+
import {LoaderConfig} from '../utilities/ts-path-mappings-webpack-plugin';
1111

1212
const path = require('path');
1313
const ForkCheckerPlugin = require('awesome-typescript-loader').ForkCheckerPlugin;
@@ -53,9 +53,7 @@ export const getWebpackMaterialConfig = function(projectRoot: string) {
5353
devtool: 'inline-source-map',
5454
resolve: {
5555
extensions: ['', '.webpack.js', '.web.js', '.ts', '.tsx', '.js', '.css', '.scss'],
56-
5756
plugins: [
58-
new PathsPlugin(awesomeTypescriptLoaderConfig)
5957
]
6058
// alias: aliasMap
6159
},
@@ -151,7 +149,6 @@ export const getWebpackMaterialE2EConfig = function(projectRoot: string) {
151149
extensions: ['', '.webpack.js', '.web.js', '.ts', '.tsx', '.js', '.css', '.scss'],
152150

153151
plugins: [
154-
new PathsPlugin(awesomeTypescriptLoaderConfig)
155152
]
156153
// alias: aliasMap
157154
},

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,8 @@
3535
"@types/lodash": "^4.0.25-alpha",
3636
"@types/rimraf": "0.0.25-alpha",
3737
"@types/webpack": "^1.12.22-alpha",
38-
"amdefine": "^1.0.0",
3938
"angular2-template-loader": "^0.4.0",
40-
"awesome-typescript-loader": "2.0.1",
39+
"awesome-typescript-loader": "1.1.1",
4140
"chalk": "^1.1.3",
4241
"compression-webpack-plugin": "^0.3.1",
4342
"copy-webpack-plugin": "^3.0.1",

0 commit comments

Comments
 (0)