Evan You 9 vuotta sitten
vanhempi
commit
2d4a1fd763
4 muutettua tiedostoa jossa 17 lisäystä ja 182 poistoa
  1. 2 173
      .eslintrc
  2. 7 3
      package.json
  3. 3 1
      src/index.js
  4. 5 5
      src/middlewares/logger.js

+ 2 - 173
.eslintrc

@@ -1,177 +1,6 @@
 {
 {
-  "env": {
-    "browser": true,
-    "node": true
-  },
-
-  "ecmaFeatures": {
-    "arrowFunctions": true,
-    "destructuring": true,
-    "classes": true,
-    "defaultParams": true,
-    "blockBindings": true,
-    "modules": true,
-    "objectLiteralComputedProperties": true,
-    "objectLiteralShorthandMethods": true,
-    "objectLiteralShorthandProperties": true,
-    "restParams": true,
-    "spread": true,
-    "templateStrings": true
-  },
-
+  "extends": "standard",
   "rules": {
   "rules": {
-    "accessor-pairs": 2,
-    "array-bracket-spacing": 0,
-    "block-scoped-var": 0,
-    "brace-style": [2, "1tbs", { "allowSingleLine": true }],
-    "camelcase": 0,
-    "comma-dangle": [2, "never"],
-    "comma-spacing": [2, { "before": false, "after": true }],
-    "comma-style": [2, "last"],
-    "complexity": 0,
-    "computed-property-spacing": 0,
-    "consistent-return": 0,
-    "consistent-this": 0,
-    "constructor-super": 2,
-    "curly": [2, "multi-line"],
-    "default-case": 0,
-    "dot-location": [2, "property"],
-    "dot-notation": 0,
-    "eol-last": 2,
-    "eqeqeq": [2, "allow-null"],
-    "func-names": 0,
-    "func-style": 0,
-    "generator-star-spacing": [2, { "before": true, "after": true }],
-    "guard-for-in": 0,
-    "handle-callback-err": [2, "^(err|error)$" ],
-    "indent": [2, 2, { "SwitchCase": 1 }],
-    "key-spacing": [2, { "beforeColon": false, "afterColon": true }],
-    "linebreak-style": 0,
-    "lines-around-comment": 0,
-    "max-nested-callbacks": 0,
-    "new-cap": [2, { "newIsCap": true, "capIsNew": false }],
-    "new-parens": 2,
-    "newline-after-var": 0,
-    "no-alert": 0,
-    "no-array-constructor": 2,
-    "no-caller": 2,
-    "no-catch-shadow": 0,
-    "no-cond-assign": 2,
-    "no-console": 0,
-    "no-constant-condition": 0,
-    "no-continue": 0,
-    "no-control-regex": 2,
-    "no-debugger": 2,
-    "no-delete-var": 2,
-    "no-div-regex": 0,
-    "no-dupe-args": 2,
-    "no-dupe-keys": 2,
-    "no-duplicate-case": 2,
-    "no-else-return": 0,
-    "no-empty": 0,
-    "no-empty-character-class": 2,
-    "no-empty-label": 2,
-    "no-eq-null": 0,
-    "no-eval": 2,
-    "no-ex-assign": 2,
-    "no-extend-native": 2,
-    "no-extra-bind": 2,
-    "no-extra-boolean-cast": 2,
-    "no-extra-parens": 0,
-    "no-extra-semi": 0,
-    "no-fallthrough": 2,
-    "no-floating-decimal": 2,
-    "no-func-assign": 2,
-    "no-implied-eval": 2,
-    "no-inline-comments": 0,
-    "no-inner-declarations": [2, "functions"],
-    "no-invalid-regexp": 2,
-    "no-irregular-whitespace": 2,
-    "no-iterator": 2,
-    "no-label-var": 2,
-    "no-labels": 2,
-    "no-lone-blocks": 2,
-    "no-lonely-if": 0,
-    "no-loop-func": 0,
-    "no-mixed-requires": 0,
-    "no-mixed-spaces-and-tabs": 2,
-    "no-multi-spaces": 2,
-    "no-multi-str": 2,
-    "no-multiple-empty-lines": [2, { "max": 1 }],
-    "no-native-reassign": 2,
-    "no-negated-in-lhs": 2,
-    "no-nested-ternary": 0,
-    "no-new": 0,
-    "no-new-func": 0,
-    "no-new-object": 2,
-    "no-new-require": 2,
-    "no-new-wrappers": 2,
-    "no-obj-calls": 2,
-    "no-octal": 2,
-    "no-octal-escape": 2,
-    "no-param-reassign": 0,
-    "no-path-concat": 0,
-    "no-process-env": 0,
-    "no-process-exit": 0,
-    "no-proto": 0,
-    "no-redeclare": 2,
-    "no-regex-spaces": 2,
-    "no-restricted-modules": 0,
-    "no-return-assign": 2,
-    "no-script-url": 0,
-    "no-self-compare": 2,
-    "no-sequences": 2,
-    "no-shadow": 0,
-    "no-shadow-restricted-names": 2,
-    "no-spaced-func": 2,
-    "no-sparse-arrays": 2,
-    "no-sync": 0,
-    "no-ternary": 0,
-    "no-this-before-super": 2,
-    "no-throw-literal": 2,
-    "no-trailing-spaces": 2,
-    "no-undef": 2,
-    "no-undef-init": 2,
-    "no-undefined": 0,
-    "no-underscore-dangle": 0,
-    "no-unexpected-multiline": 2,
-    "no-unneeded-ternary": 2,
-    "no-unreachable": 2,
-    "no-unused-expressions": 0,
-    "no-unused-vars": [2, { "vars": "all", "args": "none" }],
-    "no-use-before-define": 0,
-    "no-var": 0,
-    "no-void": 0,
-    "no-warning-comments": 0,
-    "no-with": 2,
-    "object-curly-spacing": 0,
-    "object-shorthand": 0,
-    "one-var": [2, { "initialized": "never" }],
-    "operator-assignment": 0,
-    "operator-linebreak": [2, "after", { "overrides": { "?": "before", ":": "before" } }],
-    "padded-blocks": 0,
-    "prefer-const": 0,
-    "quote-props": 0,
-    "quotes": [2, "single", "avoid-escape"],
-    "radix": 2,
-    "semi": [2, "never"],
-    "semi-spacing": 0,
-    "sort-vars": 0,
-    "space-after-keywords": [2, "always"],
-    "space-before-blocks": [2, "always"],
-    "space-before-function-paren": [2, "always"],
-    "space-in-parens": [2, "never"],
-    "space-infix-ops": 2,
-    "space-return-throw-case": 2,
-    "space-unary-ops": [2, { "words": true, "nonwords": false }],
-    "spaced-comment": [2, "always", { "markers": ["global", "globals", "eslint", "eslint-disable", "*package", "!"] }],
-    "strict": 0,
-    "use-isnan": 2,
-    "valid-jsdoc": 0,
-    "valid-typeof": 2,
-    "vars-on-top": 0,
-    "wrap-iife": [2, "any"],
-    "wrap-regex": 0,
-    "yoda": [2, "never"]
+    "arrow-parens": [2, "as-needed"]
   }
   }
 }
 }

+ 7 - 3
package.json

@@ -29,6 +29,7 @@
   },
   },
   "homepage": "https://github.com/vuejs/vuex#readme",
   "homepage": "https://github.com/vuejs/vuex#readme",
   "devDependencies": {
   "devDependencies": {
+    "babel-cli": "^6.6.0",
     "babel-core": "^6.2.1",
     "babel-core": "^6.2.1",
     "babel-loader": "^6.2.0",
     "babel-loader": "^6.2.0",
     "babel-plugin-add-module-exports": "^0.1.1",
     "babel-plugin-add-module-exports": "^0.1.1",
@@ -38,15 +39,18 @@
     "babel-preset-stage-2": "^6.1.18",
     "babel-preset-stage-2": "^6.1.18",
     "babel-runtime": "^5.8.0",
     "babel-runtime": "^5.8.0",
     "chai": "^3.4.1",
     "chai": "^3.4.1",
-    "css-loader": "^0.21.0",
-    "eslint": "^1.10.2",
+    "css-loader": "^0.23.1",
+    "eslint": "^2.2.0",
+    "eslint-config-standard": "^5.1.0",
+    "eslint-plugin-promise": "^1.0.8",
+    "eslint-plugin-standard": "^1.3.2",
     "mocha": "^2.3.4",
     "mocha": "^2.3.4",
     "style-loader": "^0.13.0",
     "style-loader": "^0.13.0",
     "todomvc-app-css": "^2.0.3",
     "todomvc-app-css": "^2.0.3",
     "vue": "^1.0.8",
     "vue": "^1.0.8",
     "vue-hot-reload-api": "^1.2.1",
     "vue-hot-reload-api": "^1.2.1",
     "vue-html-loader": "^1.0.0",
     "vue-html-loader": "^1.0.0",
-    "vue-loader": "^7.2.0",
+    "vue-loader": "^8.2.0",
     "webpack": "^1.12.8",
     "webpack": "^1.12.8",
     "webpack-dev-server": "^1.12.1"
     "webpack-dev-server": "^1.12.1"
   }
   }

+ 3 - 1
src/index.js

@@ -94,7 +94,7 @@ export class Store {
         }
         }
       })
       })
     } else {
     } else {
-      console.warn(`[vuex] Unknown mutation: ${ type }`)
+      console.warn(`[vuex] Unknown mutation: ${type}`)
     }
     }
   }
   }
 
 
@@ -185,6 +185,7 @@ export class Store {
     const unwatch = this._vm.$watch('__vuex__', a => a)
     const unwatch = this._vm.$watch('__vuex__', a => a)
     const Watcher = this._vm._watchers[0].constructor
     const Watcher = this._vm._watchers[0].constructor
     unwatch()
     unwatch()
+    /* eslint-disable no-new */
     new Watcher(this._vm, '$data', () => {
     new Watcher(this._vm, '$data', () => {
       if (!this._dispatching) {
       if (!this._dispatching) {
         throw new Error(
         throw new Error(
@@ -192,6 +193,7 @@ export class Store {
         )
         )
       }
       }
     }, { deep: true, sync: true })
     }, { deep: true, sync: true })
+    /* eslint-enable no-new */
   }
   }
 
 
   /**
   /**

+ 5 - 5
src/middlewares/logger.js

@@ -26,14 +26,14 @@ export default function createLogger ({
         console.log(message)
         console.log(message)
       }
       }
 
 
-      console.log(`%c prev state`, `color: #9E9E9E; font-weight: bold`, prevState)
-      console.log(`%c mutation`, `color: #03A9F4; font-weight: bold`, formattedMutation)
-      console.log(`%c next state`, `color: #4CAF50; font-weight: bold`, nextState)
+      console.log('%c prev state', 'color: #9E9E9E; font-weight: bold', prevState)
+      console.log('%c mutation', 'color: #03A9F4; font-weight: bold', formattedMutation)
+      console.log('%c next state', 'color: #4CAF50; font-weight: bold', nextState)
 
 
       try {
       try {
         console.groupEnd()
         console.groupEnd()
       } catch (e) {
       } catch (e) {
-        console.log(`—— log end ——`)
+        console.log('—— log end ——')
       }
       }
     }
     }
   }
   }
@@ -44,5 +44,5 @@ function repeat (str, times) {
 }
 }
 
 
 function pad (num, maxLength) {
 function pad (num, maxLength) {
-  return repeat(`0`, maxLength - num.toString().length) + num
+  return repeat('0', maxLength - num.toString().length) + num
 }
 }