Skip to content

Commit bdb1953

Browse files
committed
changed to use the TsConfigPathsPlugin
1 parent 828d42c commit bdb1953

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

packages/angular-cli/models/webpack-build-common.ts

+5-6
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,16 @@ export function getWebpackCommonConfig(
3333
if (appConfig.styles.length > 0) { entry['styles'] = styles; }
3434
if (appConfig.scripts.length > 0) { entry['scripts'] = scripts; }
3535

36-
let aliasConfig: any = {
37-
'app': path.join(appRoot, 'app')
38-
};
39-
aliasConfig['@' + appConfig.prefix] = path.join(appRoot, 'app');
40-
4136
return {
4237
devtool: 'source-map',
4338
resolve: {
4439
extensions: ['', '.ts', '.js'],
4540
root: appRoot,
46-
alias: aliasConfig
41+
plugins: [
42+
new atl.TsConfigPathsPlugin({
43+
tsconfig: path.resolve(appRoot, appConfig.tsconfig)
44+
})
45+
]
4746
},
4847
context: path.resolve(__dirname, './'),
4948
entry: entry,

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

+7-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
const path = require('path');
44
const webpack = require('webpack');
5-
5+
const atl = require('awesome-typescript-loader');
66
const getWebpackTestConfig = function (projectRoot, environment, appConfig) {
77

88
const appRoot = path.resolve(projectRoot, appConfig.root);
@@ -12,7 +12,12 @@ const getWebpackTestConfig = function (projectRoot, environment, appConfig) {
1212
context: path.resolve(__dirname, './'),
1313
resolve: {
1414
extensions: ['', '.ts', '.js'],
15-
root: appRoot
15+
root: appRoot,
16+
plugins: [
17+
new atl.TsConfigPathsPlugin({
18+
tsconfig: path.resolve(appRoot, appConfig.tsconfig)
19+
})
20+
]
1621
},
1722
entry: {
1823
test: path.resolve(appRoot, appConfig.test)

0 commit comments

Comments
 (0)