From ca5efde659fb3d6970e83b4981dd94e6097089ee Mon Sep 17 00:00:00 2001 From: ktsn Date: Fri, 30 Dec 2016 18:34:09 +0900 Subject: [PATCH 1/4] bump eslint-config-vue --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 3d6f82255..855df73b1 100644 --- a/package.json +++ b/package.json @@ -48,8 +48,8 @@ "cross-spawn": "^4.0.0", "css-loader": "^0.25.0", "eslint": "^3.5.0", - "eslint-config-vue": "^1.0.0", - "eslint-plugin-html": "^1.5.2", + "eslint-config-vue": "^2.0.1", + "eslint-plugin-vue": "^1.0.0", "express": "^4.14.0", "jasmine": "2.4.1", "jasmine-core": "2.4.1", From d006ab07d757af9b357dccf54dca4841ce952e90 Mon Sep 17 00:00:00 2001 From: ktsn Date: Fri, 30 Dec 2016 18:35:20 +0900 Subject: [PATCH 2/4] rename .eslintrc --- .eslintrc => .eslintrc.json | 0 test/unit/{.eslintrc => .eslintrc.json} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename .eslintrc => .eslintrc.json (100%) rename test/unit/{.eslintrc => .eslintrc.json} (100%) diff --git a/.eslintrc b/.eslintrc.json similarity index 100% rename from .eslintrc rename to .eslintrc.json diff --git a/test/unit/.eslintrc b/test/unit/.eslintrc.json similarity index 100% rename from test/unit/.eslintrc rename to test/unit/.eslintrc.json From 94a8a5222fc171aa8d3caa1573028a738cc257de Mon Sep 17 00:00:00 2001 From: ktsn Date: Fri, 30 Dec 2016 18:37:22 +0900 Subject: [PATCH 3/4] enable lint checking for test codes and fix some errors --- package.json | 3 ++- test/e2e/runner.js | 1 - test/e2e/specs/todomvc.js | 2 +- test/unit/modules.spec.js | 3 +-- test/unit/store.spec.js | 4 ++-- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 855df73b1..4770ef7b8 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,8 @@ "build": "npm run build:main && npm run build:logger", "build:main": "rollup -c build/rollup.config.js && uglifyjs dist/vuex.js -cm --comments -o dist/vuex.min.js", "build:logger": "rollup -c build/rollup.logger.config.js", - "test": "eslint src && npm run test:types && npm run test:unit && npm run test:e2e", + "lint": "eslint src test", + "test": "npm run lint && npm run test:types && npm run test:unit && npm run test:e2e", "test:unit": "rollup -c build/rollup.config.js && jasmine JASMINE_CONFIG_PATH=test/unit/jasmine.json", "test:e2e": "node test/e2e/runner.js", "test:types": "tsc -p types/test", diff --git a/test/e2e/runner.js b/test/e2e/runner.js index 453fc2f6f..1619f92ff 100644 --- a/test/e2e/runner.js +++ b/test/e2e/runner.js @@ -1,4 +1,3 @@ -var path = require('path') var spawn = require('cross-spawn') var args = process.argv.slice(2) diff --git a/test/e2e/specs/todomvc.js b/test/e2e/specs/todomvc.js index d8e841441..3693e0e79 100644 --- a/test/e2e/specs/todomvc.js +++ b/test/e2e/specs/todomvc.js @@ -82,7 +82,7 @@ module.exports = { .assert.count('.todo', 1) .assert.count('.todo.completed', 0) // add item with filter active - createNewItem('test') + createNewItem('test') .assert.count('.todo', 2) // complted filter diff --git a/test/unit/modules.spec.js b/test/unit/modules.spec.js index eda8011be..79d08398e 100644 --- a/test/unit/modules.spec.js +++ b/test/unit/modules.spec.js @@ -1,4 +1,3 @@ -import Vue from 'vue/dist/vue.common.js' import Vuex from '../../dist/vuex.js' const TEST = 'TEST' @@ -298,7 +297,7 @@ describe('Modules', () => { b: createModule('b', false, { // a/b - does not add namespace c: createModule('c', true) // a/c/c }), - d: createModule('d', true), // a/d/d + d: createModule('d', true) // a/d/d }) } diff --git a/test/unit/store.spec.js b/test/unit/store.spec.js index 9fcfd396f..ce6cc67fc 100644 --- a/test/unit/store.spec.js +++ b/test/unit/store.spec.js @@ -210,9 +210,9 @@ describe('Store', () => { const store = new Vuex.Store({ mutations: { [TEST] () {} - }, + } }) - store.commit(TEST, {}, { silent: true }); + store.commit(TEST, {}, { silent: true }) expect(console.warn).toHaveBeenCalledWith( `[vuex] mutation type: ${TEST}. Silent option has been removed. ` + From 16904058bba499c2f99981bb803b3f24b86f727a Mon Sep 17 00:00:00 2001 From: ktsn Date: Sat, 4 Feb 2017 21:08:34 +0900 Subject: [PATCH 4/4] bump vue related eslint plugins --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 4770ef7b8..67104f121 100644 --- a/package.json +++ b/package.json @@ -49,8 +49,8 @@ "cross-spawn": "^4.0.0", "css-loader": "^0.25.0", "eslint": "^3.5.0", - "eslint-config-vue": "^2.0.1", - "eslint-plugin-vue": "^1.0.0", + "eslint-config-vue": "^2.0.2", + "eslint-plugin-vue": "^2.0.1", "express": "^4.14.0", "jasmine": "2.4.1", "jasmine-core": "2.4.1",