From 2477e94ce0674db121b62c3b03420eef739c4975 Mon Sep 17 00:00:00 2001 From: Abner Oliveira Date: Fri, 23 Sep 2016 23:05:55 -0300 Subject: [PATCH] adding support to baseUrl and paths on imports - #fixes 1465 --- packages/angular-cli/models/webpack-build-common.ts | 7 ++++++- packages/angular-cli/models/webpack-build-test.js | 8 +++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/packages/angular-cli/models/webpack-build-common.ts b/packages/angular-cli/models/webpack-build-common.ts index 6de3b9d3f6c0..a2f00a6beb66 100644 --- a/packages/angular-cli/models/webpack-build-common.ts +++ b/packages/angular-cli/models/webpack-build-common.ts @@ -37,7 +37,12 @@ export function getWebpackCommonConfig( devtool: 'source-map', resolve: { extensions: ['', '.ts', '.js'], - root: appRoot + root: appRoot, + plugins: [ + new atl.TsConfigPathsPlugin({ + tsconfig: path.resolve(appRoot, appConfig.tsconfig) + }) + ] }, context: path.resolve(__dirname, './'), entry: entry, diff --git a/packages/angular-cli/models/webpack-build-test.js b/packages/angular-cli/models/webpack-build-test.js index dfb6deba34ff..fb6a93da02b4 100644 --- a/packages/angular-cli/models/webpack-build-test.js +++ b/packages/angular-cli/models/webpack-build-test.js @@ -2,6 +2,7 @@ const path = require('path'); const webpack = require('webpack'); +const atl = require('awesome-typescript-loader'); const getWebpackTestConfig = function (projectRoot, environment, appConfig) { @@ -12,7 +13,12 @@ const getWebpackTestConfig = function (projectRoot, environment, appConfig) { context: path.resolve(__dirname, './'), resolve: { extensions: ['', '.ts', '.js'], - root: appRoot + root: appRoot, + plugins: [ + new atl.TsConfigPathsPlugin({ + tsconfig: path.resolve(appRoot, appConfig.tsconfig) + }) + ] }, entry: { test: path.resolve(appRoot, appConfig.test)