#39 Changes for faster headless unit tests + better testing sourcemap…

…s on watch
gonzofish · Jun 22, 2017 · f2fe239 · f2fe239
1 parent cb0880f
commit f2fe239
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 60 deletions.
diff --git a/commands/initial/templates/karma.conf.js b/commands/initial/templates/karma.conf.js
@@ -31,7 +31,6 @@ module.exports = function (config) {
         autoWatch: true,
         browsers: ['Chrome', 'PhantomJS'],
         singleRun: false,
-        webpack: require('./webpack/webpack.test.js'),
         webpackServer: { noInfo: true }
     });
 };
diff --git a/commands/initial/templates/tasks/test.js b/commands/initial/templates/tasks/test.js
@@ -42,16 +42,17 @@ function getHeadlessConfig() {
 }
 
 function getWatchConfig() {
-    let config = getAllConfig();
+    let config = getAllConfig(true);
 
     config.browsers = ['Chrome'];
 
     return config;
 }
 
-function getAllConfig() {
+function getAllConfig(watch) {
     return {
-        configFile: path.resolve(process.cwd(), './karma.conf.js')
+        configFile: path.resolve(process.cwd(), './karma.conf.js'),
+        webpack: require('./webpack/webpack.test.js')(watch),
     };
 }
 

diff --git a/commands/initial/templates/tsconfig.test.json b/commands/initial/templates/tsconfig.test.json
@@ -3,12 +3,11 @@
     "compilerOptions": {
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true,
-        "inlineSourceMap": true,
         "lib": ["es6", "dom"],
         "module": "commonjs",
         "moduleResolution": "node",
         "removeComments": false,
-        "sourceMap": false,
+        "sourceMap": true,
         "target": "es5",
         "typeRoots": [
             "./node_modules/@types"

diff --git a/commands/initial/templates/webpack/webpack.test.js b/commands/initial/templates/webpack/webpack.test.js
@@ -9,59 +9,61 @@ const SourceMapDevToolPlugin = webpack.SourceMapDevToolPlugin;
 
 const rootDir = process.cwd();
 
-module.exports = {
-    devtool: 'inline-source-map',
-    module: {
-        loaders: [
-            {
-                exclude: /node_modules/,
-                test: /\.ts$/,
-                loaders: [
-                    'awesome-typescript-loader?configFileName=' + path.resolve(rootDir, 'tsconfig.test.json'),
-                    'angular2-template-loader?keepUrl=true'
-                ],
-            },
-            {
-                loaders: ['raw-loader', 'css-loader', 'sass-loader'],
-                test: /\.s?css$/
-            },
-            { loader: 'raw-loader', test: /\.html$/ },
-            {
-                enforce: 'pre',
-                exclude: /node_modules/,
-                loader: 'tslint-loader',
+module.exports = (watch) => {
+    return {
+        devtool: watch ? 'inline-source-map' : 'cheap-module-eval-source-map',
+        module: {
+            loaders: [
+                {
+                    exclude: /node_modules/,
+                    test: /\.ts$/,
+                    loaders: [
+                        'awesome-typescript-loader?configFileName=' + path.resolve(rootDir, 'tsconfig.test.json'),
+                        'angular2-template-loader?keepUrl=true'
+                    ],
+                },
+                {
+                    loaders: ['raw-loader', 'css-loader', 'sass-loader'],
+                    test: /\.s?css$/
+                },
+                { loader: 'raw-loader', test: /\.html$/ },
+                {
+                    enforce: 'pre',
+                    exclude: /node_modules/,
+                    loader: 'tslint-loader',
+                    test: /\.ts$/
+                },
+                {
+                    enforce: 'post',
+                    exclude: [
+                        /node_modules/,
+                        /\.(e2e|spec\.)ts$/
+                    ],
+                    loader: 'istanbul-instrumenter-loader?esModules=true',
+                    test: /\.ts$/
+                }
+            ]
+        },
+        performance: { hints: false },
+        plugins: [
+            new ContextReplacementPlugin(
+                /angular(\\|\/)core(\\|\/)((esm(\\|\/)src|src)(\\|\/)linker|@angular)/,
+                __dirname
+            ),
+            new LoaderOptionsPlugin({
+                options: {
+                    emitErrors: true
+                }
+            }),
+            new SourceMapDevToolPlugin({
+                filename: null,
                 test: /\.ts$/
-            },
-            {
-                enforce: 'post',
-                exclude: [
-                    /node_modules/,
-                    /\.(e2e|spec\.)ts$/
-                ],
-                loader: 'istanbul-instrumenter-loader?esModules=true',
-                test: /\.ts$/
-            }
-        ]
-    },
-    performance: { hints: false },
-    plugins: [
-        new ContextReplacementPlugin(
-            /angular(\\|\/)core(\\|\/)((esm(\\|\/)src|src)(\\|\/)linker|@angular)/,
-            __dirname
-        ),
-        new LoaderOptionsPlugin({
-            options: {
-                emitErrors: true
-            }
-        }),
-        new SourceMapDevToolPlugin({
-            filename: null,
-            test: /\.ts$/
-        })
-    ],
-    resolve: {
-        extensions: ['.js', '.ts'],
-        modules: [path.resolve('.', 'src'), path.resolve(rootDir, 'node_modules')],
-        moduleExtensions: ['-loader']
+            })
+        ],
+        resolve: {
+            extensions: ['.js', '.ts'],
+            modules: [path.resolve('.', 'src'), path.resolve(rootDir, 'node_modules')],
+            moduleExtensions: ['-loader']
+        }
     }
-};
+};