Change remaining things for scaffolding

lib/assets/test/spec/new-dashboard/unit/jest.conf.js

@@ -21,10 +21,7 @@ module.exports = {
   setupFiles: [`<rootDir>/${testPathFromRoot}/unit/setup`],
   coverageDirectory: `<rootDir>/${testPathFromRoot}/unit/coverage`,
   collectCoverageFrom: [
-    'src/**/*.{js,vue}',
-    '!src/main.js',
-    '!src/router/index.js',
-    '!**/node_modules/**'
+    `${projectPathFromRoot}/components/**/*.{js,vue}`
   ],
   roots: [
     `<rootDir>/${testPathFromRoot}/unit/specs`

package.json

@@ -88,6 +88,7 @@
     "eslint-plugin-promise": "~3.5.0",
     "eslint-plugin-standard": "~3.0.1",
     "exports-loader": "0.6.4",
+    "extract-text-webpack-plugin": "^3.0.2",
     "file-loader": "^1.1.11",
     "fs-extra": "2.0.0",
     "git-rev": "0.2.1",

webpack/new-dashboard/utils.js

@@ -1,27 +1,28 @@
 'use strict';
 const path = require('path');
 const { name } = require('../../package.json');
+const ExtractTextPlugin = require('extract-text-webpack-plugin');
 
 exports.cssLoaders = function (options) {
-  options = options || {}
+  options = options || {};
 
   const cssLoader = {
     loader: 'css-loader',
     options: {
       sourceMap: options.sourceMap
     }
-  }
+  };
 
   const postcssLoader = {
     loader: 'postcss-loader',
     options: {
       sourceMap: options.sourceMap
     }
-  }
+  };
 
   // generate loader string to be used with extract text plugin
   function generateLoaders (loader, loaderOptions) {
-    const loaders = options.usePostCSS ? [cssLoader, postcssLoader] : [cssLoader]
+    const loaders = options.usePostCSS ? [cssLoader, postcssLoader] : [cssLoader];
 
     if (loader) {
       loaders.push({
@@ -29,19 +30,19 @@ exports.cssLoaders = function (options) {
         options: Object.assign({}, loaderOptions, {
           sourceMap: options.sourceMap
         })
-      })
+      });
     }
 
     // Extract CSS when that option is specified
     // (which is the case during production build)
-    // if (options.extract) {
-    //   return ExtractTextPlugin.extract({
-    //     use: loaders,
-    //     fallback: 'vue-style-loader'
-    //   })
-    // } else {
-    return ['vue-style-loader'].concat(loaders);
-    // }
+    if (options.extract) {
+      return ExtractTextPlugin.extract({
+        use: loaders,
+        fallback: 'vue-style-loader'
+      });
+    } else {
+      return ['vue-style-loader'].concat(loaders);
+    }
   }
 
   // https://vue-loader.vuejs.org/en/configurations/extract-css.html
@@ -53,39 +54,39 @@ exports.cssLoaders = function (options) {
     scss: generateLoaders('sass'),
     stylus: generateLoaders('stylus'),
     styl: generateLoaders('stylus')
-  }
-}
+  };
+};
 
 // Generate loaders for standalone style files (outside of .vue)
 exports.styleLoaders = function (options) {
-  const output = []
-  const loaders = exports.cssLoaders(options)
+  const output = [];
+  const loaders = exports.cssLoaders(options);
 
   for (const extension in loaders) {
-    const loader = loaders[extension]
+    const loader = loaders[extension];
     output.push({
       test: new RegExp('\\.' + extension + '$'),
       use: loader
-    })
+    });
   }
 
-  return output
-}
+  return output;
+};
 
 exports.createNotifierCallback = () => {
-  const notifier = require('node-notifier')
+  const notifier = require('node-notifier');
 
   return (severity, errors) => {
     if (severity !== 'error') return;
 
-    const error = errors[0]
-    const filename = error.file && error.file.split('!').pop()
+    const error = errors[0];
+    const filename = error.file && error.file.split('!').pop();
 
     notifier.notify({
       title: name,
       message: severity + ': ' + error.name,
       subtitle: filename || '',
       icon: path.join(__dirname, 'logo.png')
-    })
-  }
-}
+    });
+  };
+};

webpack/new-dashboard/vue-loader.conf.js

@@ -1,4 +1,4 @@
-'use strict'
+'use strict';
 
 const utils = require('./utils');
 const isProduction = process.env.NODE_ENV === 'production';
@@ -10,11 +10,10 @@ module.exports = {
     extract: isProduction
   }),
   cssSourceMap: sourceMapEnabled,
-  // cacheBusting: config.dev.cacheBusting,
   transformToRequire: {
     video: ['src', 'poster'],
     source: 'src',
     img: 'src',
     image: 'xlink:href'
   }
-}
+};