Skip to content

Commit 64d0421

Browse files
icebobicebob
authored
Merge pull request #357 from lionel-bijaoui/v3
Update to Webpack 3. Almost all dependency are updated.
2 parents 244abb9 + e932b58 commit 64d0421

File tree

129 files changed

+21699
-17142
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+21699
-17142
lines changed

‎.babelrc

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
{
2-
"presets": ["es2015", "stage-2"],
3-
"plugins": ["transform-runtime", "lodash"],
4-
"comments": false
5-
}
2+
"presets": [
3+
[
4+
"env",
5+
{
6+
"modules": false,
7+
"useBuiltIns": "entry"
8+
}
9+
],
10+
"stage-2"
11+
],
12+
"plugins": ["transform-runtime", "lodash"],
13+
"env": {
14+
"test": {
15+
"plugins": ["istanbul"]
16+
}
17+
}
18+
}

‎.editorconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
root = true
2+
3+
[*]
4+
end_of_line = lf
5+
insert_final_newline = true
6+
charset = utf-8
7+
indent_style = tab
8+
indent_size = 4
9+
trim_trailing_whitespace = true

‎.eslintignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
dist/*.js
2+
build/*.js
3+
config/*.js
4+
!.eslintrc.js

‎.eslintrc.js

Lines changed: 26 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,27 @@
11
module.exports = {
2-
root: true,
3-
"env": {
4-
"browser": true,
5-
"commonjs": true,
6-
"es6": true,
7-
"jquery": false,
8-
"mocha": true
9-
},
10-
"extends": "eslint:recommended",
11-
"parserOptions": {
12-
"sourceType": "module",
13-
"ecmaVersion": 6,
14-
"ecmaFeatures": {
15-
"experimentalObjectRestSpread": true
16-
}
17-
},
18-
"plugins": [
19-
"html"
20-
],
21-
"rules": {
22-
"indent": [
23-
"warn",
24-
"tab",
25-
{ SwitchCase: 1 }
26-
],
27-
"quotes": [
28-
"warn",
29-
"double"
30-
],
31-
"semi": [
32-
"error",
33-
"always"
34-
],
35-
"no-var": [
36-
"error"
37-
],
38-
"no-console": [
39-
"off"
40-
],
41-
"no-unused-vars": [
42-
"warn"
43-
]
44-
}
45-
};
2+
root: true,
3+
parser: "vue-eslint-parser",
4+
parserOptions: {
5+
sourceType: "module",
6+
parser: "babel-eslint"
7+
},
8+
env: {
9+
browser: true,
10+
commonjs: true
11+
},
12+
globals: {
13+
process: true
14+
},
15+
extends: ["eslint:recommended", "plugin:vue/essential"],
16+
plugins: ["prettier"],
17+
rules: {
18+
indent: [1, "tab", { SwitchCase: 1 }],
19+
quotes: [1, "double", { allowTemplateLiterals: true }],
20+
semi: [2, "always"],
21+
"no-var": [2],
22+
"no-console": [0],
23+
"no-unused-vars": [1],
24+
"no-throw-literal": 0,
25+
eqeqeq: [2, "smart"]
26+
}
27+
};

‎.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
.DS_Store
22
node_modules/
3-
coverage/
43
docs/_book/
54
npm-debug.log
65
selenium-debug.log
76
test/unit/coverage
87
test/e2e/reports
98
stats.json
109
typings/
11-
typings.json
10+
typings.json

‎.jsbeautifyrc

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎.prettierrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"printWidth": 120,
3+
"tabWidth": 4,
4+
"singleQuote": false,
5+
"trailingComma": "none",
6+
"bracketSpacing": true,
7+
"semi": true,
8+
"useTabs": true
9+
}

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ node_js:
66
- "7"
77
- "6"
88
after_success:
9-
- npm run coverall
9+
- npm run coverage

‎CHANGELOG.md

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,54 @@
1+
<a name="2.2.0"></a>
2+
# 2.2.0 (2018-01-21)
3+
4+
* add console.log ([fa779bd](https://github.com/icebob/vue-form-generator/commit/fa779bd))
5+
* add console.log to debug ([d05818e](https://github.com/icebob/vue-form-generator/commit/d05818e))
6+
* add indent ([026439a](https://github.com/icebob/vue-form-generator/commit/026439a))
7+
* add unscape html for error message. ([20b8d9d](https://github.com/icebob/vue-form-generator/commit/20b8d9d))
8+
* added "getLabelClasses" and unit test, using the fieldClasses unit test as an example ([8c01307](https://github.com/icebob/vue-form-generator/commit/8c01307))
9+
* added labelClasses support ([acdbb6c](https://github.com/icebob/vue-form-generator/commit/acdbb6c))
10+
* added missing "id" attributes to checkbox, checklist, radios and submit ([09d44c1](https://github.com/icebob/vue-form-generator/commit/09d44c1))
11+
* added missing comma that failed in Travis ([32c7627](https://github.com/icebob/vue-form-generator/commit/32c7627))
12+
* added styleClasses support to groups ([8b6801b](https://github.com/icebob/vue-form-generator/commit/8b6801b))
13+
* addeds "styleClasses" to group schemas, reimplements #339 ([8e4b43d](https://github.com/icebob/vue-form-generator/commit/8e4b43d))
14+
* bumped vue version to 2.5.3 ([7d7c0c4](https://github.com/icebob/vue-form-generator/commit/7d7c0c4))
15+
* change the judgement ([d4bc27a](https://github.com/icebob/vue-form-generator/commit/d4bc27a))
16+
* check if field.type is undefined before appending the "field-undefined" class ([9993550](https://github.com/icebob/vue-form-generator/commit/9993550))
17+
* commit the built bundle ([45e1436](https://github.com/icebob/vue-form-generator/commit/45e1436))
18+
* commit the built dist ([12b3cf7](https://github.com/icebob/vue-form-generator/commit/12b3cf7))
19+
* commit without console.log ([79a77bd](https://github.com/icebob/vue-form-generator/commit/79a77bd))
20+
* delete console.log ([ed853a2](https://github.com/icebob/vue-form-generator/commit/ed853a2))
21+
* don't render labels when no label text is provided, proposed option 1 from #347 ([8ecc851](https://github.com/icebob/vue-form-generator/commit/8ecc851))
22+
* fix bower.json validation ([2afb4ac](https://github.com/icebob/vue-form-generator/commit/2afb4ac))
23+
* fixed null check ([7842b92](https://github.com/icebob/vue-form-generator/commit/7842b92))
24+
* fixed Vue version ([624ed92](https://github.com/icebob/vue-form-generator/commit/624ed92))
25+
* fixes #340 - "none" value set to `null`, formatValueToField checks for `isNil(value)` and returns `n ([5b42807](https://github.com/icebob/vue-form-generator/commit/5b42807)), closes [#340](https://github.com/icebob/vue-form-generator/issues/340)
26+
* fixes #341 - introduced debounce functionality into `formatValueToModel` ([a46fe31](https://github.com/icebob/vue-form-generator/commit/a46fe31)), closes [#341](https://github.com/icebob/vue-form-generator/issues/341)
27+
* fixes #345 - declare debouncedValidateFunc and set it when debouncedValidate() is called... vue 2.2. ([ee684f0](https://github.com/icebob/vue-form-generator/commit/ee684f0)), closes [#345](https://github.com/icebob/vue-form-generator/issues/345)
28+
* fixes #358 - support "validateBeforeSubmit" with async validators ([5a26ef1](https://github.com/icebob/vue-form-generator/commit/5a26ef1)), closes [#358](https://github.com/icebob/vue-form-generator/issues/358)
29+
* fixes #361 - use $event.target.valueAsNumber for number/range inputs, debounce `formatValueToModel` ([d1a8bcf](https://github.com/icebob/vue-form-generator/commit/d1a8bcf)), closes [#361](https://github.com/icebob/vue-form-generator/issues/361)
30+
* fixes #362 - `integer` validator now calls `number` validator, and returns `invalidIntegerl: "The va ([8d436be](https://github.com/icebob/vue-form-generator/commit/8d436be)), closes [#362](https://github.com/icebob/vue-form-generator/issues/362)
31+
* Groupped fields "tag" param fixed. ([9275a26](https://github.com/icebob/vue-form-generator/commit/9275a26))
32+
* moved unit test to formGenerator, as labels are managed by formGenerator and not the field component ([f102967](https://github.com/icebob/vue-form-generator/commit/f102967))
33+
* remove garbage ([17eeae5](https://github.com/icebob/vue-form-generator/commit/17eeae5))
34+
* remove the errorUnescaped property, add v-html on the error part ([ecd2ca5](https://github.com/icebob/vue-form-generator/commit/ecd2ca5))
35+
* remove uniqueId import ([c86d7dc](https://github.com/icebob/vue-form-generator/commit/c86d7dc))
36+
* removed commented out console.log statements ([e9bf285](https://github.com/icebob/vue-form-generator/commit/e9bf285))
37+
* removed console.log and fixed quotes ([025b541](https://github.com/icebob/vue-form-generator/commit/025b541))
38+
* removed indentation ([49f57b8](https://github.com/icebob/vue-form-generator/commit/49f57b8))
39+
* requested by @icebob ([2724809](https://github.com/icebob/vue-form-generator/commit/2724809))
40+
* reverted back to `schema.required` for "none selected" disabled state, per @icebob ([f562d7f](https://github.com/icebob/vue-form-generator/commit/f562d7f))
41+
* reverting back to original test ([4ba3d4a](https://github.com/icebob/vue-form-generator/commit/4ba3d4a))
42+
* Update badges ([705c6a7](https://github.com/icebob/vue-form-generator/commit/705c6a7))
43+
* Update formGenerator.vue ([3208446](https://github.com/icebob/vue-form-generator/commit/3208446))
44+
* update node-sass ([e3eee64](https://github.com/icebob/vue-form-generator/commit/e3eee64))
45+
* Update README.md ([f57faba](https://github.com/icebob/vue-form-generator/commit/f57faba))
46+
* Update README.md ([1092e01](https://github.com/icebob/vue-form-generator/commit/1092e01))
47+
* Update README.md ([9d9701b](https://github.com/icebob/vue-form-generator/commit/9d9701b))
48+
* updated tests for modified label logic ([f0c2281](https://github.com/icebob/vue-form-generator/commit/f0c2281))
49+
50+
51+
152
<a name="2.1.1"></a>
253
## 2.1.1 (2017-10-20)
354

‎README.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# vue-form-generator [![NPM version](https://img.shields.io/npm/v/vue-form-generator.svg)](https://www.npmjs.com/package/vue-form-generator) ![VueJS v2.x compatible](https://img.shields.io/badge/vue%202.x-compatible-green.svg)
22
A schema-based form generator component for Vue.js.
33

4-
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/912039aa815e40de8315032519aa7e6c)](https://www.codacy.com/app/mereg-norbert/vue-form-generator?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=icebob/vue-form-generator&amp;utm_campaign=Badge_Grade)
5-
[![Build Status](https://travis-ci.org/icebob/vue-form-generator.svg?branch=master)](https://travis-ci.org/icebob/vue-form-generator)
6-
[![Coverage Status](https://coveralls.io/repos/github/icebob/vue-form-generator/badge.svg?branch=master)](https://coveralls.io/github/icebob/vue-form-generator?branch=master)
4+
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/d27be05a35bf459b9292b8172e314a08)](https://www.codacy.com/app/mereg-norbert/vue-form-generator_2?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=vue-generators/vue-form-generator&amp;utm_campaign=Badge_Grade)
5+
[![Build Status](https://travis-ci.org/vue-generators/vue-form-generator.svg?branch=master)](https://travis-ci.org/vue-generators/vue-form-generator)
6+
[![Coverage Status](https://coveralls.io/repos/github/vue-generators/vue-form-generator/badge.svg?branch=master)](https://coveralls.io/github/vue-generators/vue-form-generator?branch=master)
77
[![NPMS.io score](https://badges.npms.io/vue-form-generator.svg)]()
88
[![Package Quality](http://npm.packagequality.com/shield/vue-form-generator.svg)](http://packagequality.com/#?package=vue-form-generator)
9-
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Ficebob%2Fvue-form-generator.svg?type=shield)](https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Ficebob%2Fvue-form-generator?ref=badge_shield)
9+
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fvue-generators%2Fvue-form-generator.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fvue-generators%2Fvue-form-generator?ref=badge_shield)
1010

11-
[![Dependency Status](https://david-dm.org/icebob/vue-form-generator.svg)](https://david-dm.org/icebob/vue-form-generator)
12-
[![devDependency Status](https://david-dm.org/icebob/vue-form-generator/dev-status.svg)](https://david-dm.org/icebob/vue-form-generator#info=devDependencies)
11+
[![Dependency Status](https://david-dm.org/vue-generators/vue-form-generator.svg)](https://david-dm.org/vue-generators/vue-form-generator)
12+
[![devDependency Status](https://david-dm.org/vue-generators/vue-form-generator/dev-status.svg)](https://david-dm.org/vue-generators/vue-form-generator#info=devDependencies)
1313
[![Downloads](https://img.shields.io/npm/dm/vue-form-generator.svg)](https://www.npmjs.com/package/vue-form-generator)
1414

1515
## Demo
@@ -205,6 +205,10 @@ VueFormGenerator supports custom fields. If you decide to release your custom fi
205205

206206
This way, it will be easier for everyone to find it. Thank you !
207207

208+
### Public Custom Fields
209+
210+
- [vue-tel-input](https://github.com/EducationLink/vue-tel-input) - International Telephone Input Boilerplate with Vue (integrated with VueFormGenerator).
211+
208212
## Contribution
209213
Please send pull requests improving the usage and fixing bugs, improving documentation and providing better examples, or providing some testing, because these things are important.
210214

‎bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-form-generator",
3-
"version": "2.1.1",
3+
"version": "2.2.0",
44
"homepage": "https://github.com/icebob/vue-form-generator",
55
"authors": [
66
"Icebob"

‎build/utils.js

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
let path = require("path");
2+
let ExtractTextPlugin = require("extract-text-webpack-plugin");
3+
4+
exports.cssLoaders = function(options) {
5+
options = options || {};
6+
7+
let cssLoader = {
8+
loader: "css-loader",
9+
options: {
10+
minimize: process.env.NODE_ENV === "production",
11+
sourceMap: options.sourceMap
12+
}
13+
};
14+
15+
// generate loader string to be used with extract text plugin
16+
function generateLoaders(loader, loaderOptions) {
17+
let loaders = [cssLoader];
18+
if (loader) {
19+
loaders.push({
20+
loader: loader + "-loader",
21+
options: Object.assign({}, loaderOptions, {
22+
sourceMap: options.sourceMap
23+
})
24+
});
25+
}
26+
27+
// Extract CSS when that option is specified
28+
// (which is the case during production build)
29+
if (options.extract) {
30+
return ExtractTextPlugin.extract({
31+
use: loaders,
32+
fallback: "vue-style-loader"
33+
});
34+
} else {
35+
return ["vue-style-loader"].concat(loaders);
36+
}
37+
}
38+
39+
// https://vue-loader.vuejs.org/en/configurations/extract-css.html
40+
return {
41+
css: generateLoaders(),
42+
postcss: generateLoaders(),
43+
less: generateLoaders("less"),
44+
sass: generateLoaders("sass", { indentedSyntax: true }),
45+
scss: generateLoaders("sass"),
46+
stylus: generateLoaders("stylus"),
47+
styl: generateLoaders("stylus")
48+
};
49+
};
50+
51+
// Generate loaders for standalone style files (outside of .vue)
52+
exports.styleLoaders = function(options) {
53+
let output = [];
54+
let loaders = exports.cssLoaders(options);
55+
for (let extension in loaders) {
56+
let loader = loaders[extension];
57+
output.push({
58+
test: new RegExp("\\." + extension + "$"),
59+
use: loader
60+
});
61+
}
62+
return output;
63+
};

‎build/vue-loader.conf.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
let utils = require("./utils");
2+
let isProduction = process.env.NODE_ENV === "production";
3+
4+
module.exports = {
5+
esModule: false,
6+
loaders: utils.cssLoaders({
7+
sourceMap: false,
8+
extract: isProduction
9+
})
10+
};

0 commit comments

Comments
 (0)