Separation of the bundle into "core" fields and "optional" fields

vue-generators · Feb 15, 2017 · e98e23e · e98e23e
1 parent 3e05e14
commit e98e23e
Show file tree

Hide file tree

Showing 58 changed files with 75 additions and 670 deletions.
diff --git a/package.json b/package.json
@@ -6,7 +6,8 @@
   "main": "dist/vue-form-generator.js",
   "scripts": {
     "prebuild": "npm run test",
-    "build": "webpack --progress --config webpack.build.config.js",
+    "build": "webpack --progress --config webpack.build.config.js --define process.env.FULL_BUNDLE=true",
+    "buildcore": "webpack --progress --config webpack.build.config.js --define process.env.FULL_BUNDLE=false --output-filename=vue-form-generator-core.js",
     "dev": "webpack-dev-server --config webpack.dev.config.js --inline --hot --content-base dev/",
     "lint": "eslint --ext=.js,.vue src test/unit/specs",
     "coverall": "cat ./test/unit/coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
@@ -33,8 +34,7 @@
   },
   "files": [
     "dist/vue-form-generator.js",
-    "dist/vue-form-generator.css",
-    "src"
+    "dist/vue-form-generator.css"
   ],
   "author": "Icebob",
   "license": "MIT",
@@ -79,7 +79,6 @@
     "mocha": "2.5.3",
     "mocha-generators": "1.2.0",
     "mocha-loader": "0.7.1",
-    "moment": "2.17.1",
     "node-sass": "3.10.1",
     "phantomjs-prebuilt": "2.1.14",
     "sass-loader": "3.2.0",

diff --git a/src/fields/fieldCheckbox.vue → src/fields/core/fieldCheckbox.vue b/src/fields/fieldCheckbox.vue → src/fields/core/fieldCheckbox.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script>
-	import abstractField from "./abstractField";
+	import abstractField from "../abstractField";
 	
 	export default {
 		mixins: [ abstractField ]

diff --git a/src/fields/fieldChecklist.vue → src/fields/core/fieldChecklist.vue b/src/fields/fieldChecklist.vue → src/fields/core/fieldChecklist.vue
@@ -20,7 +20,7 @@
 
 <script>
 	import {isObject, isNil} from "lodash";
-	import abstractField from "./abstractField";
+	import abstractField from "../abstractField";
 	
 	export default {
 		mixins: [ abstractField ],

diff --git a/src/fields/fieldInput.vue → src/fields/core/fieldInput.vue b/src/fields/fieldInput.vue → src/fields/core/fieldInput.vue
@@ -36,19 +36,22 @@
 </template>
 
 <script>
-	import abstractField from "./abstractField";
+	import abstractField from "../abstractField";
 	import fecha from "fecha";
 
 	export default {
 		mixins: [ abstractField ],
 		methods: {
 			formatValueToField(value) {
-				if (value != null) {
+				console.info(value);
+				if (typeof value === "undefined") {
+					return value;
+				}else{
 					switch(this.schema.inputType){
 					case "date":
 						return fecha.format(value, "YYYY-MM-DD");
 					case "datetime":
-						return fecha.format(value);
+						return fecha.format(value, "YYYY-MM-DD HH:mm:ss");
 					case "datetime-local":
 						return fecha.format(value, "YYYY-MM-DDTHH:mm:ss");
 					default:

diff --git a/src/fields/fieldLabel.vue → src/fields/core/fieldLabel.vue b/src/fields/fieldLabel.vue → src/fields/core/fieldLabel.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script>
-	import abstractField from "./abstractField";
+	import abstractField from "../abstractField";
 
 	export default {
 		mixins: [ abstractField ]

diff --git a/src/fields/fieldRadios.vue → src/fields/core/fieldRadios.vue b/src/fields/fieldRadios.vue → src/fields/core/fieldRadios.vue
@@ -8,7 +8,7 @@
 
 <script>
 	import {isObject} from "lodash";
-	import abstractField from "./abstractField";
+	import abstractField from "../abstractField";
 	
 	export default {
 		mixins: [ abstractField ],

diff --git a/src/fields/fieldSelect.vue → src/fields/core/fieldSelect.vue b/src/fields/fieldSelect.vue → src/fields/core/fieldSelect.vue
@@ -6,7 +6,7 @@
 
 <script>
 	import {isObject} from "lodash";
-	import abstractField from "./abstractField";
+	import abstractField from "../abstractField";
 	
 	export default {
 		mixins: [ abstractField ],

diff --git a/src/fields/fieldSubmit.vue → src/fields/core/fieldSubmit.vue b/src/fields/fieldSubmit.vue → src/fields/core/fieldSubmit.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script>
-	import abstractField from "./abstractField";
+	import abstractField from "../abstractField";
 	import { isFunction } from "lodash";
 
 	export default {

diff --git a/src/fields/fieldTextArea.vue → src/fields/core/fieldTextArea.vue b/src/fields/fieldTextArea.vue → src/fields/core/fieldTextArea.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script>
-	import abstractField from "./abstractField";
+	import abstractField from "../abstractField";
 
 	export default {
 		mixins: [ abstractField ]

diff --git a/src/fields/fieldColor.vue b/src/fields/fieldColor.vue
diff --git a/src/fields/fieldEmail.vue b/src/fields/fieldEmail.vue
diff --git a/src/fields/fieldNumber.vue b/src/fields/fieldNumber.vue
diff --git a/src/fields/fieldPassword.vue b/src/fields/fieldPassword.vue
diff --git a/src/fields/fieldRange.vue b/src/fields/fieldRange.vue
diff --git a/src/fields/fieldText.vue b/src/fields/fieldText.vue
diff --git a/src/fields/fieldCleave.vue → src/fields/optional/fieldCleave.vue b/src/fields/fieldCleave.vue → src/fields/optional/fieldCleave.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import abstractField from "./abstractField";
+import abstractField from "../abstractField";
 import { defaults } from "lodash";
 
 export default {

diff --git a/src/fields/fieldDateTimePicker.vue → src/fields/optional/fieldDateTimePicker.vue b/src/fields/fieldDateTimePicker.vue → src/fields/optional/fieldDateTimePicker.vue
@@ -7,7 +7,7 @@
 
 <script>
 	/* global $ */
-	import abstractField from "./abstractField";
+	import abstractField from "../abstractField";
 	import fecha from "fecha";
 	import { defaults } from "lodash";
 

diff --git a/src/fields/fieldGoogleAddress.vue → src/fields/optional/fieldGoogleAddress.vue b/src/fields/fieldGoogleAddress.vue → src/fields/optional/fieldGoogleAddress.vue
@@ -8,7 +8,7 @@
 	 * https://github.com/gocanto/google-autocomplete
 	 */
 
-	import abstractField from "./abstractField";
+	import abstractField from "../abstractField";
 	import { isFunction } from "lodash";
 
 	/* global google */

diff --git a/src/fields/fieldImage.vue → src/fields/optional/fieldImage.vue b/src/fields/fieldImage.vue → src/fields/optional/fieldImage.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script>
-	import abstractField from "./abstractField";
+	import abstractField from "../abstractField";
 
 	export default {
 		mixins: [ abstractField ],

diff --git a/src/fields/fieldMasked.vue → src/fields/optional/fieldMasked.vue b/src/fields/fieldMasked.vue → src/fields/optional/fieldMasked.vue
@@ -4,7 +4,7 @@
 
 <script>
 	/* global $ */
-	import abstractField from "./abstractField";
+	import abstractField from "../abstractField";
 
 	export default {
 		mixins: [ abstractField ],

diff --git a/src/fields/fieldNoUiSlider.vue → src/fields/optional/fieldNoUiSlider.vue b/src/fields/fieldNoUiSlider.vue → src/fields/optional/fieldNoUiSlider.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script>
-	import abstractField from "./abstractField";
+	import abstractField from "../abstractField";
 	import { isArray, defaults } from "lodash";
 
 	export default {

diff --git a/src/fields/fieldPikaday.vue → src/fields/optional/fieldPikaday.vue b/src/fields/fieldPikaday.vue → src/fields/optional/fieldPikaday.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script>
-	import abstractField from "./abstractField";
+	import abstractField from "../abstractField";
 	import fecha from "fecha";
 	import { defaults } from "lodash";
 

diff --git a/src/fields/fieldRangeSlider.vue → src/fields/optional/fieldRangeSlider.vue b/src/fields/fieldRangeSlider.vue → src/fields/optional/fieldRangeSlider.vue
@@ -4,7 +4,7 @@
 
 <script>
 	/* global $ */
-	import abstractField from "./abstractField";
+	import abstractField from "../abstractField";
 	import { defaults, isArray } from "lodash";
 
 	export default {

diff --git a/src/fields/fieldSelectEx.vue → src/fields/optional/fieldSelectEx.vue b/src/fields/fieldSelectEx.vue → src/fields/optional/fieldSelectEx.vue
@@ -7,7 +7,7 @@
 <script>
 	/* global $ */
 	import {isObject} from "lodash";
-	import abstractField from "./abstractField";
+	import abstractField from "../abstractField";
 
 	export default {
 		mixins: [ abstractField ],

diff --git a/src/fields/fieldSpectrum.vue → src/fields/optional/fieldSpectrum.vue b/src/fields/fieldSpectrum.vue → src/fields/optional/fieldSpectrum.vue
@@ -4,7 +4,7 @@
 
 <script>
 	/* global $ */
-	import abstractField from "./abstractField";
+	import abstractField from "../abstractField";
 	import { defaults } from "lodash";
 	export default {
 		mixins: [ abstractField ],

diff --git a/src/fields/fieldStaticMap.vue → src/fields/optional/fieldStaticMap.vue b/src/fields/fieldStaticMap.vue → src/fields/optional/fieldStaticMap.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script>
-	import abstractField from "./abstractField";
+	import abstractField from "../abstractField";
 	import { defaults } from "lodash";
 
 	export default {

diff --git a/src/fields/fieldSwitch.vue → src/fields/optional/fieldSwitch.vue b/src/fields/fieldSwitch.vue → src/fields/optional/fieldSwitch.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script>
-	import abstractField from "./abstractField";
+	import abstractField from "../abstractField";
 	
 	export default {
 		mixins: [ abstractField ],

diff --git a/src/fields/fieldVueMultiSelect.vue → src/fields/optional/fieldVueMultiSelect.vue b/src/fields/fieldVueMultiSelect.vue → src/fields/optional/fieldVueMultiSelect.vue
@@ -40,7 +40,7 @@
 	)
 </template>
 <script>
-	import abstractField from "./abstractField";
+	import abstractField from "../abstractField";
 
 	export default {
 		mixins: [abstractField],

diff --git a/src/formGenerator.vue b/src/formGenerator.vue
@@ -22,13 +22,25 @@ div
 	import {each, isFunction, isNil, isArray, isString} from "lodash";
 
 	// Load all fields from '../fields' folder
-	let Fields = require.context("./fields/", false, /^\.\/field([\w-_]+)\.vue$/);
 	let fieldComponents = {};
-	each(Fields.keys(), (key) => {
+
+	let coreFields = require.context("./fields/core", false, /^\.\/field([\w-_]+)\.vue$/);
+				
+	each(coreFields.keys(), (key) => {
 		let compName = key.replace(/^\.\//, "").replace(/\.vue/, "");
-		fieldComponents[compName] = Fields(key);
+		fieldComponents[compName] = coreFields(key);
 	});
 
+	if (process.env.FULL_BUNDLE) {  // eslint-disable-line
+		let Fields = require.context("./fields/optional", false, /^\.\/field([\w-_]+)\.vue$/);
+				
+		each(Fields.keys(), (key) => {
+			let compName = key.replace(/^\.\//, "").replace(/\.vue/, "");
+			fieldComponents[compName] = Fields(key);
+		});
+	}
+
+
 
 	export default {
 		components: fieldComponents,

diff --git a/test/unit/specs/fields/fieldCheckbox.spec.js b/test/unit/specs/fields/fieldCheckbox.spec.js
@@ -2,7 +2,7 @@ import { expect } from "chai";
 import { createVueField, trigger, checkAttribute } from "../util";
 
 import Vue from "vue";
-import FieldCheckbox from "src/fields/fieldCheckbox.vue";
+import FieldCheckbox from "src/fields/core/fieldCheckbox.vue";
 
 Vue.component("FieldCheckbox", FieldCheckbox);
 

diff --git a/test/unit/specs/fields/fieldChecklist.spec.js b/test/unit/specs/fields/fieldChecklist.spec.js
@@ -2,7 +2,7 @@ import { expect } from "chai";
 import { createVueField, trigger } from "../util";
 
 import Vue from "vue";
-import FieldChecklist from "src/fields/fieldChecklist.vue";
+import FieldChecklist from "src/fields/core/fieldChecklist.vue";
 
 Vue.component("FieldChecklist", FieldChecklist);