Merge pull request #6 from bigspaceship/feature/kenburns-refactor

Feature/kenburns refactor

Author: Nick Hess

template/.babelrc

@@ -1,5 +1,11 @@
 {
-  "presets": ["es2015", "stage-2"],
-  "plugins": ["transform-runtime"],
+  "presets": [
+    ["babel-preset-env", {
+      "targets": {
+        "browsers": ["last 2 versions", "safari >= 7"]
+      }
+    }]
+  ],
+  "plugins": ["transform-runtime", "syntax-dynamic-import"],
   "comments": false
 }

template/.eslintrc.js

@@ -4,18 +4,15 @@ module.exports = {
   parserOptions: {
     sourceType: 'module'
   },
-  {{#if_eq lintConfig "standard"}}
-  // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
-  extends: 'standard',
-  {{/if_eq}}
-  {{#if_eq lintConfig "airbnb"}}
-  extends: 'airbnb-base',
-  {{/if_eq}}
+  env: {
+    browser: true
+  }
+  extends: ['airbnb-base', 'prettier'],
   // required to lint *.vue files
   plugins: [
-    'html'
+    'html',
+    'prettier'
   ],
-  {{#if_eq lintConfig "airbnb"}}
   // check if imports actually resolve
   'settings': {
     'import/resolver': {
@@ -24,23 +21,31 @@ module.exports = {
       }
     }
   },
-  {{/if_eq}}
   // add your custom rules here
-  'rules': {
-    {{#if_eq lintConfig "standard"}}
-    // allow paren-less arrow functions
-    'arrow-parens': 0,
-    // allow async-await
-    'generator-star-spacing': 0,
-    {{/if_eq}}
-    {{#if_eq lintConfig "airbnb"}}
+  rules: {
+    'import/no-unresolved': 0,
+    'no-param-reassign': 0,
+    'arrow-body-style': 0,
+    'no-lonely-if': 0,
+    'no-prototype-builtins': 0,
+    'prefer-default-export': 0,
+    'consistent-return': 0,
+    'import/prefer-default-export': 0,
     // don't require .vue extension when importing
     'import/extensions': ['error', 'always', {
       'js': 'never',
       'vue': 'never'
     }],
-    {{/if_eq}}
     // allow debugger during development
-    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
+    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
+    'prettier/prettier': [
+      'error',
+      {
+        semi: true,
+        trailingComma: 'es5',
+        singleQuote: true,
+        printWidth: 100
+      }
+    ]
   }
-}
+};

template/build/build.js

@@ -1,36 +1,42 @@
 // https://github.com/shelljs/shelljs
 require('./check-versions')()
-require('shelljs/global')
-env.NODE_ENV = 'production'
-
-var path = require('path')
-var config = require('../config')
-var ora = require('ora')
-var webpack = require('webpack')
-var webpackConfig = require('./webpack.prod.conf')
-
-console.log(
-  '  Tip:\n' +
-  '  Built files are meant to be served over an HTTP server.\n' +
-  '  Opening index.html over file:// won\'t work.\n'
-)
-
-var spinner = ora('building for production...')
-spinner.start()
-
-var assetsPath = path.join(config.build.assetsRoot, config.build.assetsSubDirectory)
-rm('-rf', assetsPath)
-mkdir('-p', assetsPath)
-cp('-R', 'static/*', assetsPath)
-
-webpack(webpackConfig, function (err, stats) {
-  spinner.stop()
-  if (err) throw err
-  process.stdout.write(stats.toString({
-    colors: true,
-    modules: false,
-    children: false,
-    chunks: false,
-    chunkModules: false
-  }) + '\n')
-})
+
+process.env.NODE_ENV = 'production';
+
+const ora = require('ora');
+const rm = require('rimraf');
+const path = require('path');
+const chalk = require('chalk');
+const webpack = require('webpack');
+const config = require('../config');
+const clientConfig = require('./webpack.client.config');
+const serverConfig = require('./webpack.server.config');
+
+const spinner = ora('building for production...');
+spinner.start();
+
+rm (config.build.path, err => {
+  if (err) throw err;
+
+  function build(err, state) {
+  };
+
+  webpack([clientConfig, serverConfig], (err, stats) => {
+    spinner.stop();
+    if (err) throw err;
+    process.stdout.write(stats.toString({
+      colors: true,
+      modules: false,
+      children: true,
+      chunks: false,
+      chunkModules: false,
+    }) + '\n\n');
+
+    if (stats.hasErrors()) {
+      console.log(chalk.red(' Build failed with errors.\n'));
+      process.exit(1);
+    }
+
+    console.log(chalk.cyan(' Build complete.\n'));
+  });
+});

template/build/check-versions.js

@@ -1,28 +1,35 @@
-var semver = require('semver')
-var chalk = require('chalk')
-var packageConfig = require('../package.json')
-var exec = function (cmd) {
+'use strict';
+const chalk = require('chalk');
+const semver = require('semver');
+const packageConfig = require('../package.json');
+const shell = require('shelljs');
+
+function exec (cmd) {
   return require('child_process')
     .execSync(cmd).toString().trim()
 }
 
-var versionRequirements = [
+const versionRequirements = [
   {
     name: 'node',
     currentVersion: semver.clean(process.version),
     versionRequirement: packageConfig.engines.node
-  },
-  {
+  }
+]
+
+if (shell.which('npm')) {
+  versionRequirements.push({
     name: 'npm',
     currentVersion: exec('npm --version'),
     versionRequirement: packageConfig.engines.npm
-  }
-]
+  });
+}
 
 module.exports = function () {
   var warnings = []
-  for (var i = 0; i < versionRequirements.length; i++) {
-    var mod = versionRequirements[i]
+  for (let i = 0; i < versionRequirements.length; i++) {
+    const mod = versionRequirements[i];
+
     if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) {
       warnings.push(mod.name + ': ' +
         chalk.red(mod.currentVersion) + ' should be ' +
@@ -35,8 +42,8 @@ module.exports = function () {
     console.log('')
     console.log(chalk.yellow('To use this template, you must update following to modules:'))
     console.log()
-    for (var i = 0; i < warnings.length; i++) {
-      var warning = warnings[i]
+    for (let i = 0; i < warnings.length; i++) {
+      const warning = warnings[i]
       console.log('  ' + warning)
     }
     console.log()