cleanup

Author: hansl

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

@@ -3,21 +3,20 @@ import * as CopyWebpackPlugin from 'copy-webpack-plugin';
 import * as HtmlWebpackPlugin from 'html-webpack-plugin';
 import * as webpack from 'webpack';
 import * as atl from 'awesome-typescript-loader';
-import { CliConfig } from './config';
 
 import {findLazyModules} from './find-lazy-modules';
 
-export function getWebpackCommonConfig(projectRoot: string, sourceDir: string) {
-  const sourceRoot = path.resolve(projectRoot, `./${sourceDir}`);
 
-  let outputPath: string = path.resolve(projectRoot, outputDir);
+export function getWebpackCommonConfig(projectRoot: string, sourceDir: string, outputDir: string) {
+  const sourceRoot = path.resolve(projectRoot, sourceDir);
+  const outputPath = path.resolve(projectRoot, outputDir);
   const lazyModules = findLazyModules(path.resolve(projectRoot, sourceDir));
 
   return {
     devtool: 'source-map',
     resolve: {
       extensions: ['', '.ts', '.js'],
-      root: path.resolve(projectRoot, `./${sourceDir}`)
+      root: sourceRoot
     },
     context: path.resolve(__dirname, './'),
     entry: {
@@ -29,6 +28,15 @@ export function getWebpackCommonConfig(projectRoot: string, sourceDir: string) {
       filename: '[name].bundle.js'
     },
     module: {
+      preLoaders: [
+        {
+          test: /\.js$/,
+          loader: 'source-map-loader',
+          exclude: [
+            /node_modules/
+          ]
+        }
+      ],
       loaders: [
         {
           test: /\.ts$/,
@@ -37,7 +45,7 @@ export function getWebpackCommonConfig(projectRoot: string, sourceDir: string) {
               loader: 'awesome-typescript-loader',
               query: {
                 useForkChecker: true,
-                tsconfig: path.resolve(projectRoot, `./${sourceDir}/tsconfig.json`)
+                tsconfig: path.resolve(sourceRoot, 'tsconfig.json')
               }
             }, {
               loader: 'angular2-template-loader'
@@ -58,7 +66,7 @@ export function getWebpackCommonConfig(projectRoot: string, sourceDir: string) {
       new webpack.ContextReplacementPlugin(/.*/, sourceRoot, lazyModules),
       new atl.ForkCheckerPlugin(),
       new HtmlWebpackPlugin({
-        template: path.resolve(projectRoot, `./${sourceDir}/index.html`),
+        template: path.resolve(sourceRoot, 'index.html'),
         chunksSortMode: 'dependency'
       }),
       new webpack.optimize.CommonsChunkPlugin({