Merge pull request #24 from F-loat/master

update: 更新依赖

Author: aOrz

template/package.json

@@ -14,94 +14,69 @@
     "lint": "eslint --ext .js,.vue src{{#unit}} test/unit/specs{{/unit}}{{#e2e}} test/e2e/specs{{/e2e}}"{{/lint}}
   },
   "dependencies": {
-    "mpvue": "^1.0.8"{{#vuex}},
-    "vuex": "^2.3.1"{{/vuex}}
+    "mpvue": "^1.0.11"{{#vuex}},
+    "vuex": "^3.0.1"{{/vuex}}
   },
   "devDependencies": {
-    "mpvue-loader": "^1.0.11",
+    "mpvue-loader": "^1.0.13",
     "mpvue-webpack-target": "^1.0.0",
-    "mpvue-template-compiler": "^1.0.8",
+    "mpvue-template-compiler": "^1.0.11",
     "portfinder": "^1.0.13",
     "postcss-mpvue-wxss": "^1.0.0",
     "px2rpx-loader": "^0.1.8",
-    "rimraf": "^2.6.2",
     "babel-core": "^6.22.1",
     "glob": "^7.1.2",
-    "webpack-mpvue-asset-plugin": "^0.0.1",
+    "webpack-mpvue-asset-plugin": "^0.0.2",
     {{#lint}}
-    "babel-eslint": "^7.1.1",
+    "babel-eslint": "^8.2.3",
     {{/lint}}
     "babel-loader": "^7.1.1",
     "babel-plugin-transform-runtime": "^6.22.0",
     "babel-preset-env": "^1.3.2",
     "babel-preset-stage-2": "^6.22.0",
     "babel-register": "^6.22.0",
-    "chalk": "^2.0.1",
+    "chalk": "^2.4.0",
     "connect-history-api-fallback": "^1.3.0",
-    "copy-webpack-plugin": "^4.0.1",
-    "css-loader": "^0.28.0",
+    "copy-webpack-plugin": "^4.5.1",
+    "css-loader": "^0.28.11",
     "cssnano": "^3.10.0",
     {{#lint}}
-    "eslint": "^3.19.0",
-    "eslint-friendly-formatter": "^3.0.0",
-    "eslint-loader": "^1.7.1",
-    "eslint-plugin-html": "^3.0.0",
+    "eslint": "^4.19.1",
+    "eslint-friendly-formatter": "^4.0.1",
+    "eslint-loader": "^2.0.0",
+    "eslint-plugin-import": "^2.11.0",
+    "eslint-plugin-node": "^6.0.1",
+    "eslint-plugin-html": "^4.0.3",
     {{#if_eq lintConfig "standard"}}
-    "eslint-config-standard": "^6.2.1",
+    "eslint-config-standard": "^11.0.0",
     "eslint-plugin-promise": "^3.4.0",
-    "eslint-plugin-standard": "^2.0.1",
+    "eslint-plugin-standard": "^3.0.1",
     {{/if_eq}}
     {{#if_eq lintConfig "airbnb"}}
-    "eslint-config-airbnb-base": "^11.1.3",
-    "eslint-import-resolver-webpack": "^0.8.1",
-    "eslint-plugin-import": "^2.2.0",
+    "eslint-config-airbnb-base": "^12.1.0",
+    "eslint-import-resolver-webpack": "^0.9.0",
     {{/if_eq}}
     {{/lint}}
     "eventsource-polyfill": "^0.9.6",
-    "express": "^4.14.1",
-    "extract-text-webpack-plugin": "^2.0.0",
-    "file-loader": "^0.11.1",
-    "friendly-errors-webpack-plugin": "^1.1.3",
-    "html-webpack-plugin": "^2.28.0",
-    "http-proxy-middleware": "^0.17.3",
+    "express": "^4.16.3",
+    "extract-text-webpack-plugin": "^3.0.2",
+    "file-loader": "^1.1.11",
+    "friendly-errors-webpack-plugin": "^1.7.0",
+    "html-webpack-plugin": "^3.2.0",
+    "http-proxy-middleware": "^0.18.0",
     "webpack-bundle-analyzer": "^2.2.1",
-    {{#unit}}
-    "cross-env": "^5.0.1",
-    "karma": "^1.4.1",
-    "karma-coverage": "^1.1.1",
-    "karma-mocha": "^1.3.0",
-    "karma-phantomjs-launcher": "^1.0.2",
-    "karma-phantomjs-shim": "^1.4.0",
-    "karma-sinon-chai": "^1.3.1",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.31",
-    "karma-webpack": "^2.0.2",
-    "mocha": "^3.2.0",
-    "chai": "^3.5.0",
-    "sinon": "^2.1.0",
-    "sinon-chai": "^2.8.0",
-    "inject-loader": "^3.0.0",
-    "babel-plugin-istanbul": "^4.1.1",
-    "phantomjs-prebuilt": "^2.1.14",
-    {{/unit}}
-    {{#e2e}}
-    "chromedriver": "^2.27.2",
-    "cross-spawn": "^5.0.1",
-    "nightwatch": "^0.9.12",
-    "selenium-server": "^3.0.1",
-    {{/e2e}}
     "semver": "^5.3.0",
-    "shelljs": "^0.7.6",
-    "uglifyjs-webpack-plugin": "^1.2.4",
-    "optimize-css-assets-webpack-plugin": "^2.0.0",
-    "ora": "^1.2.0",
+    "shelljs": "^0.8.1",
+    "uglifyjs-webpack-plugin": "^1.2.5",
+    "optimize-css-assets-webpack-plugin": "^3.2.0",
+    "ora": "^2.0.0",
     "rimraf": "^2.6.0",
-    "url-loader": "^0.5.8",
-    "vue-style-loader": "^3.0.1",
-    "webpack": "^2.6.1",
-    "webpack-dev-middleware-hard-disk": "^1.10.0",
+    "url-loader": "^1.0.1",
+    "vue-style-loader": "^4.1.0",
+    "webpack": "^3.11.0",
+    "webpack-dev-middleware-hard-disk": "^1.12.0",
     "webpack-merge": "^4.1.0",
-    "postcss-loader": "^2.0.6"
+    "postcss-loader": "^2.1.4"
   },
   "engines": {
     "node": ">= 4.0.0",

template/src/pages/counter/index.vue

@@ -29,8 +29,8 @@ export default {
     }{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
   }{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
 }{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
-
 </script>
+
 <style>
 .counter-warp {
   text-align: center;
@@ -43,5 +43,4 @@ export default {
   color: blue;
   border: 1px solid blue;
 }
-
 </style>

template/src/utils/index.js

@@ -18,9 +18,7 @@ export function formatTime{{#unless_eq lintConfig "airbnb"}} {{/unless_eq}}(date
   return `${t1} ${t2}`{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
 }
 
-{{#if_eq lintConfig "airbnb"}}
 export default {
   formatNumber,
-  formatTime,
-};
-{{/if_eq}}
+  formatTime{{#if_eq lintConfig "airbnb"}},{{/if_eq}}
+}{{#if_eq lintConfig "airbnb"}};{{/if_eq}}