Merge branch 'v3' into v3_update

# Conflicts:
#	.travis.yml
#	dist/vfg-core.css
#	dist/vfg-core.js
#	dist/vfg.css
#	dist/vfg.js
#	package-lock.json
#	package.json
#	src/fields/core/fieldInput.vue
#	src/fields/core/fieldSubmit.vue
#	src/fields/core/fieldUpload.vue
#	src/fields/optional/fieldSwitch.vue
#	src/formGenerator.vue

Author: Lionel Bijaoui

.babelrc

@@ -1,5 +1,18 @@
 {
-  "presets": ["es2015", "stage-2"],
-  "plugins": ["transform-runtime", "lodash"],
-  "comments": false
-}
+	"presets": [
+		[
+			"env",
+			{
+				"modules": false,
+				"useBuiltIns": "entry"
+			}
+		],
+		"stage-2"
+	],
+	"plugins": ["transform-runtime", "lodash"],
+	"env": {
+		"test": {
+			"plugins": ["istanbul"]
+		}
+	}
+}

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+indent_style = tab
+indent_size = 4
+trim_trailing_whitespace = true

.eslintignore

@@ -0,0 +1,4 @@
+dist/*.js
+build/*.js
+config/*.js
+!.eslintrc.js

.eslintrc.js

@@ -1,45 +1,27 @@
 module.exports = {
-    root: true,
-    "env": {
-        "browser": true,
-        "commonjs": true,
-        "es6": true,
-        "jquery": false,
-        "mocha": true
-    },
-    "extends": "eslint:recommended",
-    "parserOptions": {
-        "sourceType": "module",
-        "ecmaVersion": 6,
-        "ecmaFeatures": {
-            "experimentalObjectRestSpread": true
-        }
-    },
-    "plugins": [
-        "html"
-    ],
-    "rules": {
-        "indent": [
-            "warn",
-            "tab",
-            { SwitchCase: 1 }
-        ],
-        "quotes": [
-            "warn",
-            "double"
-        ],
-        "semi": [
-            "error",
-            "always"
-        ],
-        "no-var": [
-            "error"
-        ],
-        "no-console": [
-            "off"
-        ],
-        "no-unused-vars": [
-            "warn"
-        ]
-    }
-};
+	root: true,
+	parser: "vue-eslint-parser",
+	parserOptions: {
+		sourceType: "module",
+		parser: "babel-eslint"
+	},
+	env: {
+		browser: true,
+		commonjs: true
+	},
+	globals: {
+		process: true
+	},
+	extends: ["eslint:recommended", "plugin:vue/essential"],
+	plugins: ["prettier"],
+	rules: {
+		indent: [1, "tab", { SwitchCase: 1 }],
+		quotes: [1, "double", { allowTemplateLiterals: true }],
+		semi: [2, "always"],
+		"no-var": [2],
+		"no-console": [0],
+		"no-unused-vars": [1],
+		"no-throw-literal": 0,
+		eqeqeq: [2, "smart"]
+	}
+};

.gitignore

@@ -1,11 +1,10 @@
 .DS_Store
 node_modules/
-coverage/
 docs/_book/
 npm-debug.log
 selenium-debug.log
 test/unit/coverage
 test/e2e/reports
 stats.json
 typings/
-typings.json
+typings.json

.jsbeautifyrc

@@ -0,0 +1,63 @@
+let path = require("path");
+let ExtractTextPlugin = require("extract-text-webpack-plugin");
+
+exports.cssLoaders = function(options) {
+	options = options || {};
+
+	let cssLoader = {
+		loader: "css-loader",
+		options: {
+			minimize: process.env.NODE_ENV === "production",
+			sourceMap: options.sourceMap
+		}
+	};
+
+	// generate loader string to be used with extract text plugin
+	function generateLoaders(loader, loaderOptions) {
+		let loaders = [cssLoader];
+		if (loader) {
+			loaders.push({
+				loader: loader + "-loader",
+				options: Object.assign({}, loaderOptions, {
+					sourceMap: options.sourceMap
+				})
+			});
+		}
+
+		// Extract CSS when that option is specified
+		// (which is the case during production build)
+		if (options.extract) {
+			return ExtractTextPlugin.extract({
+				use: loaders,
+				fallback: "vue-style-loader"
+			});
+		} else {
+			return ["vue-style-loader"].concat(loaders);
+		}
+	}
+
+	// https://vue-loader.vuejs.org/en/configurations/extract-css.html
+	return {
+		css: generateLoaders(),
+		postcss: generateLoaders(),
+		less: generateLoaders("less"),
+		sass: generateLoaders("sass", { indentedSyntax: true }),
+		scss: generateLoaders("sass"),
+		stylus: generateLoaders("stylus"),
+		styl: generateLoaders("stylus")
+	};
+};
+
+// Generate loaders for standalone style files (outside of .vue)
+exports.styleLoaders = function(options) {
+	let output = [];
+	let loaders = exports.cssLoaders(options);
+	for (let extension in loaders) {
+		let loader = loaders[extension];
+		output.push({
+			test: new RegExp("\\." + extension + "$"),
+			use: loader
+		});
+	}
+	return output;
+};

build/utils.js

@@ -0,0 +1,10 @@
+let utils = require("./utils");
+let isProduction = process.env.NODE_ENV === "production";
+
+module.exports = {
+	esModule: false,
+	loaders: utils.cssLoaders({
+		sourceMap: false,
+		extract: isProduction
+	})
+};

build/vue-loader.conf.js

@@ -0,0 +1,104 @@
+const path = require("path");
+const webpack = require("webpack");
+const utils = require("./utils");
+const version = require("../package.json").version;
+const banner =
+	"/**\n" +
+	" * vue-form-generator v" +
+	version +
+	"\n" +
+	" * https://github.com/icebob/vue-form-generator\n" +
+	" * Released under the MIT License.\n" +
+	" */\n";
+const ExtractTextPlugin = require("extract-text-webpack-plugin");
+const StatsPlugin = require("stats-webpack-plugin");
+const vueLoaderConfig = require("./vue-loader.conf");
+
+let rules = [
+	{
+		test: /\.(js|vue)$/,
+		loader: "eslint-loader",
+		enforce: "pre",
+		include: [path.resolve("src")],
+		options: {
+			formatter: require("eslint-friendly-formatter")
+		}
+	},
+	{
+		test: /\.vue$/,
+		loader: "vue-loader",
+		include: [path.resolve("src")],
+		exclude: /node_modules/,
+		options: vueLoaderConfig
+	},
+	{
+		test: /\.js$/,
+		loader: "babel-loader",
+		include: [path.resolve("src")],
+		exclude: /node_modules/
+	},
+	{
+		test: /\.(woff2?|svg)$/,
+		loader: "url-loader",
+		include: [path.resolve("src")]
+	},
+	{
+		test: /\.(ttf|eot)$/,
+		loader: "url-loader",
+		include: [path.resolve("src")]
+	}
+];
+
+let cssFileName;
+if (process.env.FULL_BUNDLE !== "false") {
+	cssFileName = "vfg.css";
+} else {
+	cssFileName = "vfg-core.css";
+}
+
+module.exports = [
+	{
+		entry: "./src/index.js",
+		output: {
+			path: path.resolve("dist"),
+			filename: "vfg.js",
+			library: "VueFormGenerator",
+			libraryTarget: "umd"
+		},
+
+		plugins: [
+			new webpack.DefinePlugin({
+				"process.env": {
+					NODE_ENV: JSON.stringify("production")
+				}
+			}),
+			new webpack.optimize.UglifyJsPlugin({
+				compress: {
+					warnings: false
+				}
+			}),
+			new webpack.BannerPlugin({
+				banner,
+				raw: true
+			}),
+			new ExtractTextPlugin(cssFileName, { allChunks: true }),
+			new StatsPlugin("../stats.json", {
+				chunkModules: true
+				//exclude: [/node_modules[\\\/]react/]
+			})
+		],
+
+		module: {
+			rules
+		},
+
+		resolve: {
+			aliasFields: ["browser"],
+			extensions: [".js", ".vue", ".json"],
+			alias: {
+				vue$: "vue/dist/vue.esm.js",
+				"@": path.resolve("src")
+			}
+		}
+	}
+];

build/webpack.build.config.js

@@ -0,0 +1,81 @@
+const path = require("path");
+const webpack = require("webpack");
+const projectRoot = path.resolve(__dirname, "../");
+const vueLoaderConfig = require("./vue-loader.conf");
+
+let rules = [
+	{
+		test: /\.(js|vue)$/,
+		loader: "eslint-loader",
+		enforce: "pre",
+		include: [path.resolve("src"), path.resolve("dev")],
+		options: {
+			formatter: require("eslint-friendly-formatter")
+		}
+	},
+	{
+		test: /\.vue$/,
+		loader: "vue-loader",
+		include: [path.resolve("src"), path.resolve("dev")],
+		exclude: /node_modules/,
+		options: vueLoaderConfig
+	},
+	{
+		test: /\.js$/,
+		loader: "babel-loader",
+		include: [path.resolve("src"), path.resolve("dev")],
+		exclude: /node_modules/
+	},
+	{
+		test: /\.(woff2?|svg)$/,
+		loader: "url-loader",
+		include: [path.resolve("src"), path.resolve("dev")]
+	},
+	{
+		test: /\.(ttf|eot)$/,
+		loader: "url-loader",
+		include: [path.resolve("src"), path.resolve("dev")]
+	}
+];
+
+module.exports = {
+	devtool: "source-map",
+	devServer: {
+		contentBase: [path.resolve("dev/projects")]
+	},
+	entry: {
+		full: path.resolve("dev", "projects", "full", "main.js"),
+		basic: path.resolve("dev", "projects", "basic", "main.js"),
+		mselect: path.resolve("dev", "projects", "multiselect", "main.js"),
+		grouping: path.resolve("dev", "projects", "grouping", "main.js"),
+		checklist: path.resolve("dev", "projects", "checklist", "main.js"),
+		picker: path.resolve("dev", "projects", "picker", "main.js")
+	},
+
+	output: {
+		path: path.resolve("dev/projects"),
+		filename: "[name].js",
+		publicPath: "/"
+	},
+
+	plugins: [
+		new webpack.DefinePlugin({
+			"process.env": {
+				NODE_ENV: JSON.stringify("development"),
+				FULL_BUNDLE: true
+			}
+		})
+	],
+
+	module: {
+		rules
+	},
+
+	resolve: {
+		extensions: [".js", ".vue", ".json"],
+		alias: {
+			vue$: "vue/dist/vue.esm.js",
+			"@": path.resolve("src")
+		}
+	}
+};