'merge'

unknown · unknown · commit 981d331269bd · 2018-01-22T11:57:55.000+08:00
diff --git a/README.md b/README.md
@@ -1,25 +1,20 @@
-# vue-webpack-boilerplate
+# vue-init
 
-> A full-featured Webpack setup with hot-reload, lint-on-save, unit testing & css extraction.
-
-> This template is Vue 2.0 compatible. For Vue 1.x use this command: `vue init webpack#1.0 my-project`
-
-## Documentation
-
-- [For this template](http://vuejs-templates.github.io/webpack): common questions specific to this template are answered and each part is described in greater detail
-- [For Vue 2.0](http://vuejs.org/guide/): general information about how to work with Vue, not specific to this template
+> This respository is a fork from [vuejs-templates/webpack](https://github.com/vuejs-templates/webpack). You may want an official template there. 
+> This template is Vue 2.0 compatible only.
 
 ## Usage
 
 This is a project template for [vue-cli](https://github.com/vuejs/vue-cli). **It is recommended to use npm 3+ for a more efficient dependency tree.**
 
 ``` bash
 $ npm install -g vue-cli
-$ vue init webpack my-project
+$ vue init shangxinbo/vue-init my-project
 $ cd my-project
 $ npm install
 $ npm run dev
 ```
+If port 8080 is already in use on your machine you must change the port number in `/config/index.js`. Otherwise `npm run dev` will fail.
 
 This will scaffold the project using the `master` branch. If you wish to use the latest version of the webpack template, do the following instead:
 
@@ -31,6 +26,19 @@ $ vue init webpack#develop my-project
 
 The development server will run on port 8080 by default. If that port is already in use on your machine, the next free port will be used.
 
+## Docs And Features
+
+you may want to read docs [here](http://vuejs-templates.github.io/webpack/) because this template is exactly the same with vuejs-temlates/webpack. __except that:__
+
+* Add a mock server by express for data-mock (look in dirs named api and proxy). When `npm run dev`, it will start in a child process.
+* Use [mockjs](https://github.com/nuysoft/Mock/tree/refactoring) to mock random data 
+* Add `less-loader` and `less` 
+* Add [vuex](https://github.com/vuejs/vuex) for vue 
+* Add [vue-resource](https://github.com/pagekit/vue-resource) for ajax
+* Change editerconfig `indent_size = 4` 
+* Change eslint pick preset `none (eslint:recommended and config yourself)`. Detail in '.eslintrc.js'
+* Add src/router/index.js to eslintignore, beacause webpack2.0 use 'System.import' which is error for eslint 
+
 ## What's Included
 
 - `npm run dev`: first-in-class development experience.
@@ -40,6 +48,10 @@ The development server will run on port 8080 by default. If that port is already
   - Lint-on-save with ESLint
   - Source maps
 
+- `npm run proxy`: proxy request and response to integrate real restfull.
+  - change mock server to proxy real restful.
+  - proxy URL and PORT config in `config/dev.env.js`
+
 - `npm run build`: Production ready build.
   - JavaScript minified with [UglifyJS v3](https://github.com/mishoo/UglifyJS2/tree/harmony).
   - HTML minified with [html-minifier](https://github.com/kangax/html-minifier).
@@ -64,3 +76,15 @@ You can fork this repo to create your own boilerplate, and use it with `vue-cli`
 ``` bash
 vue init username/repo my-project
 ```
+
+### remarks
+``` bash
+$ git remote 
+  origin
+$ git remote add https://github.com/vuejs-templates/webpack.git
+$ git remote 
+  office
+  origin
+$ git fetch office
+$ git pull office master
+$ 解决冲突并提交
diff --git a/meta.js b/meta.js
@@ -95,7 +95,7 @@ module.exports = {
           short: 'Airbnb',
         },
         {
-          name: 'none (configure it yourself)',
+          name: 'none (eslint:recommended and config yourself)',
           value: 'none',
           short: 'none',
         },
diff --git a/template/.babelrc b/template/.babelrc
@@ -8,6 +8,9 @@
     }],
     "stage-2"
   ],
+  "ignore": [
+    "./src/assets/**/*.js"
+  ],
   "plugins": ["transform-vue-jsx", "transform-runtime"]{{#if_or unit e2e}},
   "env": {
     "test": {
diff --git a/template/.editorconfig b/template/.editorconfig
@@ -3,7 +3,7 @@ root = true
 [*]
 charset = utf-8
 indent_style = space
-indent_size = 2
+indent_size = 4
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
diff --git a/template/.eslintignore b/template/.eslintignore
@@ -1,3 +1,5 @@
+src/router/index.js
+src/assets/**/*.js
 /build/
 /config/
 /dist/
diff --git a/template/.eslintrc.js b/template/.eslintrc.js
@@ -25,7 +25,7 @@ module.exports = {
   {{#if_eq lintConfig "none"}}
   // https://github.com/vuejs/eslint-plugin-vue#priority-a-essential-error-prevention
   // consider switching to `plugin:vue/strongly-recommended` or `plugin:vue/recommended` for stricter rules.
-  extends: ['plugin:vue/essential'],
+  extends: ['plugin:vue/essential','eslint:recommended'],
   {{/if_eq}}
   // required to lint *.vue files
   plugins: [
@@ -68,6 +68,15 @@ module.exports = {
       optionalDependencies: ['test/unit/index.js']
     }],
     {{/if_eq}}
+    {{#if_eq lintConfig "none"}}
+    'no-implied-eval': 1,
+    'no-loop-func': 1,
+    'indent': ["warn", 4, { "SwitchCase": 1 }],
+    'no-mixed-spaces-and-tabs': 1,
+    'semi': ["error", "never"],
+    'no-console':0,
+    'no-unused-vars':0,
+    {{/if_eq}}
     // allow debugger during development
     'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
   }
diff --git a/template/README.md b/template/README.md
@@ -11,6 +11,9 @@ npm install
 # serve with hot reload at localhost:8080
 npm run dev
 
+# serve with proxy to use data from restful
+npm run proxy
+
 # build for production with minification
 npm run build
 
diff --git a/template/api/index.js b/template/api/index.js
@@ -0,0 +1,13 @@
+
+var Mock = require('mockjs')
+var Random = Mock.Random
+module.exports = function (req, res) {
+    return {
+        "user": {
+            "id": 1,
+            "username": "admin",
+            "nickname": "",
+            "phone": "13488888888"
+        }
+    }
+}
diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
@@ -22,6 +22,7 @@ function resolve (dir) {
 module.exports = {
   context: path.resolve(__dirname, '../'),
   entry: {
+    polyfill:'babel-polyfill',
     app: './src/main.js'
   },
   output: {
@@ -38,6 +39,9 @@ module.exports = {
       'vue$': 'vue/dist/vue.esm.js',
       {{/if_eq}}
       '@': resolve('src'),
+      'src': resolve('src'),
+      'assets': resolve('src/assets'),
+      'components': resolve('src/components')
     }
   },
   module: {
diff --git a/template/config/dev.env.js b/template/config/dev.env.js
@@ -3,5 +3,8 @@ const merge = require('webpack-merge')
 const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
+  MOCK_SERVER_PORT: '3009',
+  PROXY_HOST: 'https://shangxinbo.github.io/',
+  PROXY_PORT: '80',
   NODE_ENV: '"development"'
 })
diff --git a/template/config/index.js b/template/config/index.js
@@ -3,14 +3,35 @@
 // see http://vuejs-templates.github.io/webpack for documentation.
 
 const path = require('path')
+var mock_server_port = require('./dev.env').MOCK_SERVER_PORT
+var proxy = require('./dev.env')
+
+var proxy_argv = process.argv.slice(2).indexOf('--proxy')
+function getProxyRouter() {
+  if (proxy_argv >= 0) {
+    return {
+      target: proxy.PROXY_HOST + ':' + proxy.PROXY_PORT,
+      changeOrigin: true,
+      pathRewrite: {
+        '^/api/': '/'
+      }
+    }
+  } else {
+    return {
+      target: 'http://localhost:' + mock_server_port
+    }
+  }
+}
 
 module.exports = {
   dev: {
 
     // Paths
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
-    proxyTable: {},
+    proxyTable: {
+      '/api/**/**/*': getProxyRouter()
+    },
 
     // Various Dev Server settings
     host: 'localhost', // can be overwritten by process.env.HOST
diff --git a/template/index.html b/template/index.html
@@ -6,7 +6,18 @@
     <title>{{ name }}</title>
   </head>
   <body>
-    <div id="app"></div>
+    <div id="app">
+      <!--[if lte IE 9]>
+        <div style="margin-top:30px;text-align:center;">
+          <h1>您的浏览器不被支持，我们建议您尽快升级您的浏览器到最新版。</h1>
+          了解原因请点击
+            <a href="https://www.microsoft.com/zh-cn/WindowsForBusiness/End-of-IE-support?utm_source=jsgroup">
+              对 Internet Explorer 早期版本的支持将于2016 年 1 月 12 日结束
+            </a>。
+          或者使用其他现代浏览器如Chrome，Firefox等。
+        </div>
+      <![endif]-->
+    </div>
     <!-- built files will be auto injected -->
   </body>
 </html>
diff --git a/template/package.json b/template/package.json
@@ -7,6 +7,7 @@
   "scripts": {
     "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
     "start": "npm run dev",
+    "proxy": "node run dev --proxy",
     {{#if_eq runner "jest"}}
     "unit": "jest --config test/unit/jest.conf.js --coverage",
     {{/if_eq}}
@@ -25,10 +26,16 @@
     "build": "node build/build.js"
   },
   "dependencies": {
+    "vuex":"^2.1.2",
+    "axios":"^0.16.2",
+    "babel-polyfill": "^6.26.0",
     "vue": "^2.5.2"{{#router}},
     "vue-router": "^3.0.1"{{/router}}
   },
   "devDependencies": {
+    "less": "^2.7.2",
+    "less-loader": "^4.0.2",
+    "mockjs":"^1.0.1-beta3",
     {{#lint}}
     "babel-eslint": "^8.2.1",
     "eslint": "^4.15.0",
diff --git a/template/proxy/index.js b/template/proxy/index.js
@@ -0,0 +1,21 @@
+
+
+const fs = require('fs')
+const path = require('path')
+const fork = require('child_process').fork
+
+if (process.argv.slice(2).indexOf('--proxy') < 0) {
+    let ls = fork(path.join(__dirname, './start'))
+    let restarting = false
+    fs.watch(path.join(__dirname, '../api'), { recursive: true }, (eventType, filename) => {
+        if (!restarting) {
+            restarting = true
+            setTimeout(() => {
+                ls.kill()
+                ls = fork(path.join(__dirname, './start'))
+                restarting = false
+            }, 1000)
+        }
+    })
+}
+
diff --git a/template/proxy/start.js b/template/proxy/start.js
@@ -0,0 +1,27 @@
+
+const express = require('express')
+const path = require('path')
+const glob = require('glob')
+const request = require('request')
+const bodyParser = require('body-parser')
+const proxy_port = require('../config/dev.env').MOCK_SERVER_PORT
+const app = express()
+const fs = require('fs')
+app
+    .use(bodyParser.json())
+    .use(bodyParser.urlencoded({ extended: false }))
+    .use(function (req, res, next) {
+        var file = glob.sync(path.join(__dirname, '..' + req.path + '.js'))[0]
+        if (file) {
+            var data = require(file)
+            res.json({
+                code: 200,
+                message: "",
+                detail: data(req, res)
+            })
+        } else {
+            res.send('error')
+        }
+    })
+
+app.listen(proxy_port)
diff --git a/template/src/App.vue b/template/src/App.vue
@@ -15,10 +15,10 @@ import HelloWorld from './components/HelloWorld'
 
 {{/unless}}
 export default {
-  name: 'App'{{#router}}{{else}},
-  components: {
-    HelloWorld
-  }{{/router}}
+    name: 'App'{{#router}}{{else}},
+    components: {
+        HelloWorld
+    }{{/router}}
 }
 </script>
 
diff --git a/template/src/components/HelloWorld.vue b/template/src/components/HelloWorld.vue
@@ -85,12 +85,12 @@
 
 <script>
 export default {
-  name: 'HelloWorld',
-  data () {
-    return {
-      msg: 'Welcome to Your Vue.js App'
+    name: 'HelloWorld',
+    data () {
+        return {
+            msg: 'Welcome to Your Vue.js App'
+        }
     }
-  }
 }
 </script>
 
diff --git a/template/src/main.js b/template/src/main.js
@@ -4,23 +4,27 @@
 {{/if_eq}}
 import Vue from 'vue'
 import App from './App'
+import Ajax from './services/ajax'
+import store from './vuex/store'
 {{#router}}
 import router from './router'
 {{/router}}
 
+Vue.use(Ajax)
 Vue.config.productionTip = false
 
 /* eslint-disable no-new */
 new Vue({
-  el: '#app',
-  {{#router}}
-  router,
-  {{/router}}
-  {{#if_eq build "runtime"}}
-  render: h => h(App)
-  {{/if_eq}}
-  {{#if_eq build "standalone"}}
-  components: { App },
-  template: '<App/>'
-  {{/if_eq}}
+    el: '#app',
+    store,
+    {{#router}}
+    router,
+    {{/router}}
+    {{#if_eq build "runtime"}}
+    render: h => h(App)
+    {{/if_eq}}
+    {{#if_eq build "standalone"}}
+    components: { App },
+    template: '<App/>'
+    {{/if_eq}}
 })
diff --git a/template/src/services/ajax.js b/template/src/services/ajax.js
diff --git a/template/src/services/api.js b/template/src/services/api.js
diff --git a/template/src/services/functions.js b/template/src/services/functions.js
diff --git a/template/src/vuex/store.js b/template/src/vuex/store.js

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ module.exports = {`
`95`	`95`	`short: 'Airbnb',`
`96`	`96`	`},`
`97`	`97`	`{`
`98`		`- name: 'none (configure it yourself)',`
	`98`	`+ name: 'none (eslint:recommended and config yourself)',`
`99`	`99`	`value: 'none',`
`100`	`100`	`short: 'none',`
`101`	`101`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+src/router/index.js`
	`2`	`+src/assets/*/.js`
`1`	`3`	`/build/`
`2`	`4`	`/config/`
`3`	`5`	`/dist/`