Skip to content

Commit 4e3ded2

Browse files
author
Markus Oberlehner
committed
Merge branch 'release/1.1.3'
2 parents f92c634 + 4ed02cf commit 4e3ded2

File tree

7 files changed

+1613
-1039
lines changed

7 files changed

+1613
-1039
lines changed

.babelrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"presets": [
33
[
4-
"env",
4+
"@babel/preset-env",
55
{
66
"modules": false
77
}
@@ -10,7 +10,7 @@
1010
"env": {
1111
"test": {
1212
"presets": [
13-
"env"
13+
"@babel/preset-env"
1414
]
1515
}
1616
}

.eslintrc-md.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"plugins": ["markdown"],
3+
"extends": ".eslintrc",
4+
"rules": {
5+
"quotes": [2, "single", { "avoidEscape": true }],
6+
"import/extensions": false,
7+
"import/no-extraneous-dependencies": false,
8+
"import/no-unresolved": false
9+
}
10+
}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ By default, mutations and getters inside modules are registered under the global
302302
import Vue from 'vue';
303303
import Vuex from 'vuex';
304304

305-
import { getField, updateFiled } from 'vuex-map-fields';
305+
import { getField, updateField } from 'vuex-map-fields';
306306

307307
Vue.use(Vuex);
308308

package-lock.json

Lines changed: 1576 additions & 1020 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vuex-map-fields",
3-
"version": "1.1.2",
3+
"version": "1.1.3",
44
"description": "Enable two-way data binding for form fields saved in a Vuex store",
55
"keywords": [
66
"vue",
@@ -17,29 +17,34 @@
1717
"scripts": "npm run scripts:umd && npm run scripts:es && npm run scripts:minify",
1818
"build": "npm run scripts",
1919
"fake-publish": "npm run build && sh test/utils/fake-publish.sh",
20-
"lint": "npm run fake-publish && eslint --ignore-path .gitignore .",
20+
"lint:scripts": "npm run fake-publish && eslint --ignore-path .gitignore .",
21+
"lint:scripts-md": "eslint --config .eslintrc-md.json --ext md --ignore-path .gitignore .",
22+
"lint": "npm run lint:scripts && npm run lint:scripts-md",
2123
"coveralls": "npm run test:coverage && cat coverage/lcov.info | coveralls",
2224
"test:unit": "jest src",
2325
"test:integration": "npm run fake-publish && jest test",
2426
"test:coverage": "npm run fake-publish && jest --coverage --maxWorkers=4",
2527
"test": "npm run test:unit && npm run test:integration",
26-
"prepublishOnly": "npm test && npm run build"
28+
"prepublishOnly": "npm run lint && npm test && npm run build"
2729
},
2830
"devDependencies": {
29-
"@avalanche/eslint-config": "^1.0.2",
31+
"@avalanche/eslint-config": "^2.0.0",
32+
"@babel/core": "^7.0.0-beta.40",
33+
"@babel/preset-env": "^7.0.0-beta.40",
3034
"@vue/test-utils": "^1.0.0-beta.12",
31-
"babel-preset-env": "^1.6.1",
35+
"babel-core": "^7.0.0-bridge.0",
36+
"babel-jest": "^22.4.1",
3237
"coveralls": "^3.0.0",
33-
"eslint": "^4.18.1",
38+
"eslint": "^4.18.2",
3439
"eslint-plugin-compat": "^2.2.0",
35-
"eslint-plugin-import": "^2.8.0",
36-
"jest": "^22.4.0",
37-
"rollup": "^0.56.2",
38-
"rollup-plugin-babel": "^3.0.3",
39-
"rollup-plugin-node-resolve": "^3.0.3",
40+
"eslint-plugin-import": "^2.9.0",
41+
"eslint-plugin-markdown": "^1.0.0-beta.6",
42+
"jest": "^22.4.2",
43+
"rollup": "^0.56.5",
44+
"rollup-plugin-babel": "^4.0.0-beta.0",
4045
"uglify-es": "^3.3.9",
41-
"vue": "^2.5.13",
42-
"vue-template-compiler": "^2.5.13",
46+
"vue": "^2.5.16",
47+
"vue-template-compiler": "^2.5.16",
4348
"vuex": "^3.0.1"
4449
},
4550
"main": "dist/index.js",

rollup.config.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import babel from 'rollup-plugin-babel';
2-
import resolve from 'rollup-plugin-node-resolve';
32

43
export default {
54
plugins: [
65
babel(),
7-
resolve(),
86
],
97
};

test/packaged.test.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,12 @@ localVue.use(Vuex);
5151
mapFields: mapFieldsRoot,
5252
updateField: updateFieldRoot,
5353
},
54-
].forEach(({ dir, getField, mapFields, updateField }) => {
54+
].forEach(({
55+
dir,
56+
getField,
57+
mapFields,
58+
updateField,
59+
}) => {
5560
const Component = componentFactory({ mapFields });
5661

5762
describe(`Component initialized with functions from \`${dir}\`.`, () => {

0 commit comments

Comments
 (0)