Merge branch 'master' into patch-2

vuejs-templates · Apr 10, 2017 · 90aad09 · 90aad09
2 parents fd1ec3c + f7e50be
commit 90aad09
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/docs/backend.md b/docs/backend.md
@@ -5,6 +5,7 @@ If you are building a purely-static app (one that is deployed separately from th
 Let's take a look at the default `config/index.js`:
 
 ``` js
+// config/index.js
 var path = require('path')
 
 module.exports = {

diff --git a/docs/linter.md b/docs/linter.md
@@ -7,6 +7,7 @@ If you are not happy with the default linting rules, you have several options:
 1. Overwrite individual rules in `.eslintrc.js`. For example, you can add the following rule to enforce semicolons instead of omitting them:
 
  ``` js
+ // .eslintrc.js
  "semi": [2, "always"]
  ```
 

diff --git a/docs/static.md b/docs/static.md
@@ -1,4 +1,4 @@
-# Handing Static Assets
+# Handling Static Assets
 
 You will notice in the project structure we have two directories for static assets: `src/assets` and `static/`. What is the difference between them?
 
@@ -41,7 +41,7 @@ In comparison, files in `static/` are not processed by Webpack at all: they are
 As an example, with the following default values:
 
 ``` js
-// config.js
+// config/index.js
 module.exports = {
  // ...
  build: {

diff --git a/template/build/check-versions.js b/template/build/check-versions.js
@@ -1,7 +1,7 @@
 var chalk = require('chalk')
 var semver = require('semver')
 var packageConfig = require('../package.json')
-
+var shell = require('shelljs')
 function exec (cmd) {
  return require('child_process').execSync(cmd).toString().trim()
 }
@@ -12,12 +12,15 @@ var versionRequirements = [
  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 = []

diff --git a/template/package.json b/template/package.json
@@ -6,6 +6,7 @@
  "private": true,
  "scripts": {
  "dev": "node build/dev-server.js",
+ "start": "node build/dev-server.js",
  "build": "node build/build.js"{{#unit}},
  "unit": "cross-env BABEL_ENV=test karma start test/unit/karma.conf.js --single-run"{{/unit}}{{#e2e}},
  "e2e": "node test/e2e/runner.js"{{/e2e}}{{#if_or unit e2e}},
@@ -82,11 +83,12 @@
  "selenium-server": "^3.0.1",
  {{/e2e}}
  "semver": "^5.3.0",
+ "shelljs": "^0.7.6",
  "opn": "^4.0.2",
  "optimize-css-assets-webpack-plugin": "^1.3.0",
  "ora": "^1.2.0",
  "rimraf": "^2.6.0",
- "url-loader": "^0.5.7",
+ "url-loader": "^0.5.8",
  "vue-loader": "^11.3.4",
  "vue-style-loader": "^2.0.5",
  "vue-template-compiler": "^2.2.6",