updates

Author: yyx990803

template/build/build.js

@@ -11,7 +11,7 @@ var webpackConfig = require('./webpack.prod.conf')
 var spinner = ora('building for production...')
 spinner.start()
 
-var assetsPath = path.join(config.build.assetsRoot, config.build.assetsPrefix)
+var assetsPath = path.join(config.build.assetsRoot, config.build.assetsSubDirectory)
 rm('-rf', assetsPath)
 mkdir('-p', assetsPath)
 cp('-R', 'static/', assetsPath)

template/build/dev-server.js

@@ -51,7 +51,7 @@ app.use(devMiddleware)
 app.use(hotMiddleware)
 
 // serve pure static assets
-var staticPath = path.join(config.build.assetsPublicPath, config.build.assetsPrefix)
+var staticPath = path.join(config.build.assetsPublicPath, config.build.assetsSubDirectory)
 app.use(staticPath, express.static('./static'))
 
 module.exports = app.listen(port, function (err) {

template/build/webpack.base.conf.js

@@ -61,7 +61,7 @@ module.exports = {
         loader: 'url',
         query: {
           limit: 10000,
-          name: path.join(config.build.assetsPrefix, '[name].[ext]?[hash:7]')
+          name: path.join(config.build.assetsSubDirectory, '[name].[ext]?[hash:7]')
         }
       }
     ]

template/build/webpack.prod.conf.js

@@ -11,8 +11,8 @@ module.exports = merge(baseWebpackConfig, {
   devtool: config.build.productionSourceMap ? '#source-map' : false,
   output: {
     path: config.build.assetsRoot,
-    filename: path.join(config.build.assetsPrefix, '[name].[chunkhash].js'),
-    chunkFilename: path.join(config.build.assetsPrefix, '[id].[chunkhash].js')
+    filename: path.join(config.build.assetsSubDirectory, '[name].[chunkhash].js'),
+    chunkFilename: path.join(config.build.assetsSubDirectory, '[id].[chunkhash].js')
   },
   vue: {
     loaders: cssLoaders({
@@ -34,7 +34,7 @@ module.exports = merge(baseWebpackConfig, {
     }),
     new webpack.optimize.OccurenceOrderPlugin(),
     // extract css into its own file
-    new ExtractTextPlugin(path.join(config.build.assetsPrefix, '[name].[contenthash].css')),
+    new ExtractTextPlugin(path.join(config.build.assetsSubDirectory, '[name].[contenthash].css')),
     // generate dist index.html with correct asset hash for caching.
     // you can customize output by editing /index.html
     // see https://github.com/ampedandwired/html-webpack-plugin

template/config.js

@@ -2,50 +2,14 @@ var path = require('path')
 
 module.exports = {
   build: {
-    // Where the index.html will be generated. Must be an absolute path.
-    // The generated file will have correct asset URLs auto-injected.
-    // If you are using this template with a backend-framework, you can set this
-    // to the backend view file (.php, .erb etc.) rendered for your app.
     index: path.resolve(__dirname, 'dist/index.html'),
-
-    // The root directory for your app's static assets. Must be an absolute path.
-    // If you are using this template with a backend-framework, set this to
-    // the framework's static assets directory, e.g. /path/to/project/public.
     assetsRoot: path.resolve(__dirname, 'dist'),
-
-    // Nest webpack-generated assets under this directory in `assetsRoot`, so
-    // that they are not mixed with other files you may have in `assetsRoot`.
-    //
-    // Files inside /static will be copied into this directory as-is. This means
-    // if you change this prefix, all your absolute URLs referencing files in
-    // /static will also need to be changed.
-    //
-    // This directory will be cleaned before each build.
-    assetsPrefix: 'static',
-
-    // This is where your `assetsRoot` will be served from over HTTP.
-    // Only change this if your backend framework serves static assets with
-    // a path prefix.
+    assetsSubDirectory: 'static',
     assetsPublicPath: '/',
-
-    // Whether to generate source map for production builds
     productionSourceMap: true
   },
-
   dev: {
-    // Dev server port
     port: 8080,
-
-    // Proxy requests to different backend during development.
-    // https://github.com/chimurai/http-proxy-middleware
-    proxyTable: {
-      // '/api': {
-      //   target: 'http://jsonplaceholder.typicode.com',
-      //   changeOrigin: true,
-      //   pathRewrite: {
-      //     '^/api': ''
-      //   }
-      // }
-    }
+    proxyTable: {}
   }
 }

template/src/App.vue

@@ -3,14 +3,16 @@
     <img class="logo" src="./assets/logo.png">
     <hello></hello>
     <p>
-      Welcome to your Vue.js app. To get started, take a look at the
-      <a href="https://github.com/vuejs-templates/webpack#folder-structure" target="_blank">README</a>
-      of this template. If you have any issues with the setup, please file an issue at this template's repository.
+      Welcome to your Vue.js app!
     </p>
     <p>
-      For advanced configurations, checkout the docs for
+      To get a better understanding of how this boilerplate works, check out
+      <a href="http://vuejs-templates.github.io/webpack" target="_blank">its documentation</a>.
+      It is also recommended to go through the docs for
       <a href="http://webpack.github.io/" target="_blank">Webpack</a> and
       <a href="http://vuejs.github.io/vue-loader/" target="_blank">vue-loader</a>.
+      If you have any issues with the setup, please file an issue at this boilerplate's
+      <a href="https://github.com/vuejs-templates/webpack" target="_blank">repository</a>.
     </p>
     <p>
       You may also want to checkout
@@ -43,12 +45,18 @@ body {
 }
 
 #app {
+  color: #2c3e50;
   margin-top: -100px;
   max-width: 600px;
-  font-family: Helvetica, sans-serif;
+  font-family: Source Sans Pro, Helvetica, sans-serif;
   text-align: center;
 }
 
+#app a {
+  color: #42b983;
+  text-decoration: none;
+}
+
 .logo {
   width: 100px;
   height: 100px

template/src/components/Hello.vue

@@ -21,6 +21,6 @@ export default {
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style scoped>
 h1 {
-  color: #4fc08d;
+  color: #42b983;
 }
 </style>

template/test/unit/.eslintrc

@@ -1,5 +1,9 @@
 {
   "env": {
-    "jasmine": true
+    "mocha": true
+  },
+  "globals": {
+    "expect": true,
+    "sinon": true
   }
 }

template/test/unit/karma.conf.js

@@ -22,6 +22,7 @@ var webpackConfig = merge(baseConfig, {
 delete webpackConfig.entry
 
 // make sure isparta loader is applied before eslint
+webpackConfig.module.preLoaders = webpackConfig.module.preLoaders || []
 webpackConfig.module.preLoaders.unshift({
   test: /\.js$/,
   loader: 'isparta',

template/test/unit/specs/Hello.spec.js

@@ -10,6 +10,3 @@ describe('Hello.vue', () => {
     expect(vm.$el.querySelector('.hello h1').textContent).to.contain('Hello World!')
   })
 })
-
-// also see example testing a component with mocks at
-// https://github.com/vuejs/vue-loader-example/blob/master/test/unit/a.spec.js#L24-L49