Skip to content

Commit

Permalink
Merge branch 'release/1.1.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
Markus Oberlehner committed Mar 14, 2018
2 parents f92c634 + 4ed02cf commit 4e3ded2
Show file tree
Hide file tree
Showing 7 changed files with 1,613 additions and 1,039 deletions.
4 changes: 2 additions & 2 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"presets": [
[
"env",
"@babel/preset-env",
{
"modules": false
}
Expand All @@ -10,7 +10,7 @@
"env": {
"test": {
"presets": [
"env"
"@babel/preset-env"
]
}
}
Expand Down
10 changes: 10 additions & 0 deletions .eslintrc-md.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"plugins": ["markdown"],
"extends": ".eslintrc",
"rules": {
"quotes": [2, "single", { "avoidEscape": true }],
"import/extensions": false,
"import/no-extraneous-dependencies": false,
"import/no-unresolved": false
}
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ By default, mutations and getters inside modules are registered under the global
import Vue from 'vue';
import Vuex from 'vuex';

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

Vue.use(Vuex);

Expand Down
2,596 changes: 1,576 additions & 1,020 deletions package-lock.json

Large diffs are not rendered by default.

31 changes: 18 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vuex-map-fields",
"version": "1.1.2",
"version": "1.1.3",
"description": "Enable two-way data binding for form fields saved in a Vuex store",
"keywords": [
"vue",
Expand All @@ -17,29 +17,34 @@
"scripts": "npm run scripts:umd && npm run scripts:es && npm run scripts:minify",
"build": "npm run scripts",
"fake-publish": "npm run build && sh test/utils/fake-publish.sh",
"lint": "npm run fake-publish && eslint --ignore-path .gitignore .",
"lint:scripts": "npm run fake-publish && eslint --ignore-path .gitignore .",
"lint:scripts-md": "eslint --config .eslintrc-md.json --ext md --ignore-path .gitignore .",
"lint": "npm run lint:scripts && npm run lint:scripts-md",
"coveralls": "npm run test:coverage && cat coverage/lcov.info | coveralls",
"test:unit": "jest src",
"test:integration": "npm run fake-publish && jest test",
"test:coverage": "npm run fake-publish && jest --coverage --maxWorkers=4",
"test": "npm run test:unit && npm run test:integration",
"prepublishOnly": "npm test && npm run build"
"prepublishOnly": "npm run lint && npm test && npm run build"
},
"devDependencies": {
"@avalanche/eslint-config": "^1.0.2",
"@avalanche/eslint-config": "^2.0.0",
"@babel/core": "^7.0.0-beta.40",
"@babel/preset-env": "^7.0.0-beta.40",
"@vue/test-utils": "^1.0.0-beta.12",
"babel-preset-env": "^1.6.1",
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "^22.4.1",
"coveralls": "^3.0.0",
"eslint": "^4.18.1",
"eslint": "^4.18.2",
"eslint-plugin-compat": "^2.2.0",
"eslint-plugin-import": "^2.8.0",
"jest": "^22.4.0",
"rollup": "^0.56.2",
"rollup-plugin-babel": "^3.0.3",
"rollup-plugin-node-resolve": "^3.0.3",
"eslint-plugin-import": "^2.9.0",
"eslint-plugin-markdown": "^1.0.0-beta.6",
"jest": "^22.4.2",
"rollup": "^0.56.5",
"rollup-plugin-babel": "^4.0.0-beta.0",
"uglify-es": "^3.3.9",
"vue": "^2.5.13",
"vue-template-compiler": "^2.5.13",
"vue": "^2.5.16",
"vue-template-compiler": "^2.5.16",
"vuex": "^3.0.1"
},
"main": "dist/index.js",
Expand Down
2 changes: 0 additions & 2 deletions rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import babel from 'rollup-plugin-babel';
import resolve from 'rollup-plugin-node-resolve';

export default {
plugins: [
babel(),
resolve(),
],
};
7 changes: 6 additions & 1 deletion test/packaged.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,12 @@ localVue.use(Vuex);
mapFields: mapFieldsRoot,
updateField: updateFieldRoot,
},
].forEach(({ dir, getField, mapFields, updateField }) => {
].forEach(({
dir,
getField,
mapFields,
updateField,
}) => {
const Component = componentFactory({ mapFields });

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

0 comments on commit 4e3ded2

Please sign in to comment.