Merge remote-tracking branch 'vuejs-templates/master'

* vuejs-templates/master: Merge some small fixes (vuejs-templates#900) Update vue-loader link (vuejs-templates#886) match vue-template-compiler version revert: vuejs-templates#759 Revert vuejs-templates#688, fix vuejs-templates#879 fix vuejs-templates#877 chore(package): rm unused lolex dependency(dev) (vuejs-templates#803) Add support for linked modules (vuejs-templates#688) add HashedModuleIdsPlugin when build (vuejs-templates#870) Specify the address to listen on (vuejs-templates#759) bump vue & vue-router dependencies fixed vue-router dependency(need vue-loader@^13.0.0) (vuejs-templates#876) Removing Vue.config.debug usage from documentation (vuejs-templates#871) fix ci build faild (vuejs-templates#857) fix standard eslint config link (vuejs-templates#834) Return exit code 1 when npm run build fails (vuejs-templates#854) load webpack.prod.conf when NODE_ENV=production (vuejs-templates#864) Remove unnecessary space and comma (vuejs-templates#866) Move Chat: Gitter -> Discord (vuejs-templates#869) # Conflicts: # template/package.json
neonblack-at · Sep 13, 2017 · 62e7e60 · 62e7e60
2 parents ca8d1f8 + 313c5ad
commit 62e7e60
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 16 deletions.
diff --git a/circle.yml b/circle.yml
@@ -1,6 +1,12 @@
 machine:
   node:
-    version: 6
+    version: stable
+
+dependencies:
+  pre:
+    - sudo sh -c 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list'
+    - sudo apt-get update
+    - sudo apt-get install google-chrome-stable
 
 test:
   override:

diff --git a/docs/README.md b/docs/README.md
@@ -1,6 +1,6 @@
 # Introduction
 
-This boilerplate is targeted towards large, serious projects and assumes you are somewhat familiar with Webpack and `vue-loader`. Make sure to also read [`vue-loader`'s documentation](http://vuejs.github.io/vue-loader/index.html) for common workflow recipes.
+This boilerplate is targeted towards large, serious projects and assumes you are somewhat familiar with Webpack and `vue-loader`. Make sure to also read [`vue-loader`'s documentation](https://vue-loader.vuejs.org/) for common workflow recipes.
 
 If you just want to try out `vue-loader` or whip out a quick prototype, use the [webpack-simple](https://github.com/vuejs-templates/webpack-simple) template instead.
 

diff --git a/docs/env.md b/docs/env.md
@@ -42,10 +42,10 @@ So, the environment variables are:
 
 As we can see, `test.env` inherits the `dev.env` and the `dev.env` inherits the `prod.env`.
 
-### Usage
+### Usage		
 
-It is simple to use the environment variables in your code. For example:
+It is simple to use the environment variables in your code. For example:		
 
-```js
-Vue.config.debug = process.env.DEBUG_MODE
-```
+```js		
+Vue.config.productionTip = process.env.NODE_ENV === 'production'		
+```
diff --git a/template/.eslintrc.js b/template/.eslintrc.js
@@ -13,7 +13,7 @@ module.exports = {
   extends: 'neonblack',
   {{/if_eq}}
   {{#if_eq lintConfig "standard"}}
-  // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
+  // https://github.com/standard/standard/blob/master/docs/RULES-en.md
   extends: 'standard',
   {{/if_eq}}
   {{#if_eq lintConfig "airbnb"}}

diff --git a/template/build/build.js b/template/build/build.js
@@ -26,6 +26,11 @@ rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
       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'))
     console.log(chalk.yellow(
       '  Tip: built files are meant to be served over an HTTP server.\n' +

diff --git a/template/build/check-versions.js b/template/build/check-versions.js
@@ -11,7 +11,7 @@ var versionRequirements = [
     name: 'node',
     currentVersion: semver.clean(process.version),
     versionRequirement: packageConfig.engines.node
-  },
+  }
 ]
 
 if (shell.which('npm')) {

diff --git a/template/build/dev-server.js b/template/build/dev-server.js
@@ -10,7 +10,7 @@ var path = require('path')
 var express = require('express')
 var webpack = require('webpack')
 var proxyMiddleware = require('http-proxy-middleware')
-var webpackConfig = {{#if_or unit e2e}}process.env.NODE_ENV === 'testing'
+var webpackConfig = {{#if_or unit e2e}}(process.env.NODE_ENV === 'testing' || process.env.NODE_ENV === 'production')
   ? require('./webpack.prod.conf')
   : {{/if_or}}require('./webpack.dev.conf')
 

diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
@@ -24,7 +24,7 @@ module.exports = {
       {{#if_eq build "standalone"}}
       'vue$': 'vue/dist/vue.esm.js',
       {{/if_eq}}
-      '@': resolve('src')
+      '@': resolve('src'),
     }
   },
   module: {

diff --git a/template/build/webpack.prod.conf.js b/template/build/webpack.prod.conf.js
@@ -68,6 +68,8 @@ var webpackConfig = merge(baseWebpackConfig, {
       // necessary to consistently work with multiple chunks via CommonsChunkPlugin
       chunksSortMode: 'dependency'
     }),
+    // keep module.id stable when vender modules does not change
+    new webpack.HashedModuleIdsPlugin(),
     // split vendor js into its own file
     new webpack.optimize.CommonsChunkPlugin({
       name: 'vendor',

diff --git a/template/build/webpack.test.conf.js b/template/build/webpack.test.conf.js
@@ -13,7 +13,7 @@ var webpackConfig = merge(baseConfig, {
   devtool: '#inline-source-map',
   resolveLoader: {
     alias: {
-      // necessary to to make lang="scss" work in test when using vue-loader's ?inject option 
+      // necessary to to make lang="scss" work in test when using vue-loader's ?inject option
       // see discussion at https://github.com/vuejs/vue-loader/issues/724
       'scss-loader': 'sass-loader'
     }

diff --git a/template/package.json b/template/package.json
@@ -79,7 +79,6 @@
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.31",
     "karma-webpack": "^2.0.2",
-    "lolex": "^1.5.2",
     "mocha": "^3.2.0",
     "chai": "^3.5.0",
     "sinon": "^2.1.0",
@@ -106,9 +105,9 @@
     "url-loader": "^0.5.8",
     "vue-loader": "^13.0.4",
     "vue-style-loader": "^3.0.1",
-    "vue-template-compiler": "^2.3.3",
+    "vue-template-compiler": "^2.4.2",
     "webpack": "^3.4.1",
-    "webpack-dev-middleware": "~1.11.0",
+    "webpack-dev-middleware": "^1.10.0",
     "webpack-hot-middleware": "^2.18.0",
     "webpack-merge": "^4.1.0"
   },

diff --git a/template/src/components/Hello.vue b/template/src/components/Hello.vue
@@ -5,7 +5,7 @@
     <ul>
       <li><a href="https://vuejs.org" target="_blank">Core Docs</a></li>
       <li><a href="https://forum.vuejs.org" target="_blank">Forum</a></li>
-      <li><a href="https://gitter.im/vuejs/vue" target="_blank">Gitter Chat</a></li>
+      <li><a href="https://chat.vuejs.org" target="_blank">Community Chat</a></li>
       <li><a href="https://twitter.com/vuejs" target="_blank">Twitter</a></li>
       <br>
       <li><a href="http://vuejs-templates.github.io/webpack/" target="_blank">Docs for This Template</a></li>