New scaffolding

template/build/build.js → template/config/build/build.js

@@ -3,7 +3,7 @@ require('shelljs/global')
 env.NODE_ENV = 'production'
 
 var path = require('path')
-var config = require('../config/index')
+var config = require('../index')
 var ora = require('ora')
 var webpack = require('webpack')
 var webpackConfig = require('./webpack.prod.conf')
@@ -29,11 +29,6 @@ var spinner = ora({
 })
 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

template/build/dev-server.js → template/config/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var express = require('express')
 var webpack = require('webpack')
-var config = require('../config/index')
+var config = require('../index')
 var proxyMiddleware = require('http-proxy-middleware')
 var webpackConfig = require('./webpack.dev.conf')
 
@@ -50,10 +50,6 @@ app.use(devMiddleware)
 // compilation error display
 app.use(hotMiddleware)
 
-// serve pure static assets
-var staticPath = path.posix.join(config.build.assetsPublicPath, config.build.assetsSubDirectory)
-app.use(staticPath, express.static('./static'))
-
 module.exports = app.listen(port, function (err) {
   if (err) {
     console.log(err)

template/build/package-electron.js → template/config/build/package-electron.js

@@ -1,5 +1,5 @@
 var path = require('path')
-var config = require('../config/index')
+var config = require('../index')
 var packager = require('electron-packager')
 var program = require('commander')
 

template/build/utils.js → template/config/build/utils.js

@@ -1,11 +1,7 @@
 var path = require('path')
-var config = require('../config/index')
+var config = require('../index')
 var ExtractTextPlugin = require('extract-text-webpack-plugin')
 
-exports.assetsPath = function (_path) {
-  return path.posix.join(config.build.assetsSubDirectory, _path)
-}
-
 exports.cssLoaders = function (options) {
   options = options || {}
   // generate loader string to be used with extract text plugin

template/build/webpack.base.conf.js → template/config/build/webpack.base.conf.js

@@ -1,7 +1,7 @@
 var path = require('path')
-var config = require('../config/index')
+var config = require('../index')
 var utils = require('./utils')
-var projectRoot = path.resolve(__dirname, '../')
+var projectRoot = path.resolve(__dirname, '../../')
 
 var program = require('commander')
 program
@@ -10,7 +10,7 @@ program
 
 module.exports = {
   entry: {
-    app: './src/main.js'
+    app: './src/renderer/main.js'
   },
   output: {
     path: config.build.assetsRoot,
@@ -23,15 +23,15 @@ module.exports = {
   target: program.target || {{#if electron}}'electron-renderer'{{else}}'web'{{/if}},
   resolve: {
     extensions: ['', '.js', '.vue'],
-    fallback: [path.join(__dirname, '../node_modules')],
+    fallback: [path.join(__dirname, '../../node_modules')],
     alias: {
-      'src': path.resolve(__dirname, '../src'),
-      'assets': path.resolve(__dirname, '../src/assets'),
-      'components': path.resolve(__dirname, '../src/components')
+      'src': path.resolve(__dirname, '../src/renderer'),
+      'assets': path.resolve(__dirname, '../src/renderer/assets'),
+      'components': path.resolve(__dirname, '../src/renderer/components')
     }
   },
   resolveLoader: {
-    fallback: [path.join(__dirname, '../node_modules')]
+    fallback: [path.join(__dirname, '../../node_modules')]
   },
   vue: {
     autoprefixer: {
@@ -78,16 +78,14 @@ module.exports = {
         test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
         loader: 'url',
         query: {
-          limit: 10000,
-          name: utils.assetsPath('img/[name].[hash:7].[ext]')
+          limit: 10000
         }
       },
       {
         test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
         loader: 'url',
         query: {
-          limit: 10000,
-          name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
+          limit: 10000
         }
       }
     ]
@@ -102,8 +100,8 @@ module.exports = {
   },
   externals: [
     (function () {
-      var IGNORES = [
         'electron'
+        var IGNORES = [
       ];
       return function (context, request, callback) {
         if (IGNORES.indexOf(request) >= 0) {

template/build/webpack.dev.conf.js → template/config/build/webpack.dev.conf.js

@@ -1,4 +1,4 @@
-var config = require('../config/index')
+var config = require('../index')
 var webpack = require('webpack')
 var merge = require('webpack-merge')
 var utils = require('./utils')
@@ -7,7 +7,7 @@ var HtmlWebpackPlugin = require('html-webpack-plugin')
 
 // add hot-reload related code to entry chunks
 Object.keys(baseWebpackConfig.entry).forEach(function (name) {
-  baseWebpackConfig.entry[name] = ['./build/dev-client'].concat(baseWebpackConfig.entry[name])
+  baseWebpackConfig.entry[name] = ['./config/build/dev-client'].concat(baseWebpackConfig.entry[name])
 })
 
 module.exports = merge(baseWebpackConfig, {

template/build/webpack.prod.conf.js → template/config/build/webpack.prod.conf.js

@@ -1,5 +1,5 @@
 var path = require('path')
-var config = require('../config/index')
+var config = require('../index')
 var utils = require('./utils')
 var webpack = require('webpack')
 var merge = require('webpack-merge')
@@ -63,7 +63,7 @@ var webpackConfig = merge(baseWebpackConfig, {
           module.resource &&
           /\.js$/.test(module.resource) &&
           module.resource.indexOf(
-            path.join(__dirname, '../node_modules')
+            path.join(__dirname, '../../node_modules')
           ) === 0
         )
       }

template/config/index.js

@@ -7,7 +7,6 @@ module.exports = {
     env: require('./prod.env'),
     index: path.resolve(__dirname, '../dist/index.html'),
     assetsRoot: path.resolve(__dirname, '../dist'),
-    assetsSubDirectory: 'static',
     {{#if electron}}
     assetsPublicPath: path.resolve(__dirname, '../dist'),
     appRoot: path.resolve(__dirname, '../'),
@@ -16,17 +15,16 @@ module.exports = {
     packageDestination: path.resolve(__dirname, '../releases'),
     ignoredPaths: (() => {
       const paths = [
-        '^/src',
+        '^/src/renderer',
         '^/index.html',
-        '^/static',
         '^/.cache',
         '^/README.md',
         '^/releases',
         '^/.babelrc',
         '^/.editorconfig',
         '^/.eslint',
         '^/.gitignore',
-        '^/build'
+        '^/config/build'
       ]
 
       const regexps = paths.map((path) => {

template/package.json

@@ -6,25 +6,25 @@
   "private": true,
   "scripts": {
     "start": "npm run dev",
-    "dev": "node build/dev-server.js",
-    "build": "node build/build.js{{#electron}} && npm run package{{/electron}}",
+    "dev": "node config/build/dev-server.js",
+    "build": "node config/build/build.js{{#electron}} && npm run package{{/electron}}",
     {{#electron}}
-    "build:darwin": "node build/build.js && npm run package:darwin",
-    "build:linux": "node build/build.js && npm run package:linux",
-    "build:win32": "node build/build.js && npm run package:win32",
-    "build:all": "node build/build.js && npm run package:all",
-    "build:no-package": "node build/build.js",
-    "package": "node build/package-electron",
-    "package:darwin": "node build/package-electron -p darwin",
-    "package:linux": "node build/package-electron -p linux",
-    "package:win32": "node build/package-electron -p win32",
-    "package:all": "node build/package-electron -p all",
+    "build:darwin": "node config/build/build.js && npm run package:darwin",
+    "build:linux": "node config/build/build.js && npm run package:linux",
+    "build:win32": "node config/build/build.js && npm run package:win32",
+    "build:all": "node config/build/build.js && npm run package:all",
+    "build:no-package": "node config/build/build.js",
+    "package": "node config/build/package-electron",
+    "package:darwin": "node config/build/package-electron -p darwin",
+    "package:linux": "node config/build/package-electron -p linux",
+    "package:win32": "node config/build/package-electron -p win32",
+    "package:all": "node config/build/package-electron -p all",
     "electron": "export NODE_ENV=\"dev\"; ./node_modules/.bin/electron .",
     {{/electron}}
     "lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs"
   },
   {{#electron}}
-  "main": "electron/main.js",
+  "main": "src/electron/main.js",
   {{/electron}}
   "standard": {
     "globals": [

template/electron/main.js → template/src/electron/main.js

@@ -1,5 +1,5 @@
 const path = require('path')
-const config = require('../config/index')
+const config = require('../../config/index')
 
 const electron = require('electron')
 // Module to control application life.
@@ -64,7 +64,7 @@ function createWindow () {
     // Open dev tools and devtron in dev mode
     require('devtron').install()
 
-    BrowserWindow.addDevToolsExtension(path.join(__dirname, '../node_modules/devtron'))
+    BrowserWindow.addDevToolsExtension(path.join(__dirname, '../../node_modules/devtron'))
     let installExtension = require('electron-devtools-installer')
     installExtension.default(installExtension.VUEJS_DEVTOOLS)
       .then((name) => mainWindow.webContents.openDevTools())