adding support to baseUrl and paths on imports - #fixes 1465

Author: abner

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

@@ -18,11 +18,11 @@ export function getWebpackCommonConfig(
   const appRoot = path.resolve(projectRoot, appConfig.root);
   const appMain = path.resolve(appRoot, appConfig.main);
   const styles = appConfig.styles
-               ? appConfig.styles.map((style: string) => path.resolve(appRoot, style))
-               : [];
+    ? appConfig.styles.map((style: string) => path.resolve(appRoot, style))
+    : [];
   const scripts = appConfig.scripts
-                ? appConfig.scripts.map((script: string) => path.resolve(appRoot, script))
-                : [];
+    ? appConfig.scripts.map((script: string) => path.resolve(appRoot, script))
+    : [];
   const lazyModules = findLazyModules(appRoot);
 
   let entry: { [key: string]: string[] } = {
@@ -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,
@@ -80,7 +85,8 @@ export function getWebpackCommonConfig(
         }, {
           exclude: styles,
           test: /\.styl$/,
-          loaders: ['raw-loader', 'postcss-loader', 'stylus-loader'] },
+          loaders: ['raw-loader', 'postcss-loader', 'stylus-loader']
+        },
         {
           exclude: styles,
           test: /\.less$/,
@@ -153,7 +159,7 @@ export function getWebpackCommonConfig(
       new CopyWebpackPlugin([{
         context: path.resolve(appRoot, appConfig.assets),
         from: { glob: '**/*', dot: true },
-        ignore: [ '.gitkeep' ],
+        ignore: ['.gitkeep'],
         to: path.resolve(projectRoot, appConfig.outDir, appConfig.assets)
       }])
     ],

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)
@@ -59,7 +65,7 @@ const getWebpackTestConfig = function (projectRoot, environment, appConfig) {
           exclude: [/\.e2e\.ts$/]
         },
         { test: /\.json$/, loader: 'json-loader' },
-        { test: /\.css$/,  loaders: ['raw-loader', 'postcss-loader'] },
+        { test: /\.css$/, loaders: ['raw-loader', 'postcss-loader'] },
         { test: /\.styl$/, loaders: ['raw-loader', 'postcss-loader', 'stylus-loader'] },
         { test: /\.less$/, loaders: ['raw-loader', 'postcss-loader', 'less-loader'] },
         { test: /\.scss$|\.sass$/, loaders: ['raw-loader', 'postcss-loader', 'sass-loader'] },