Merge branch 'lb_separate_bundle'. Fix some unit test and change webp…

…ack config.
vue-generators · Feb 15, 2017 · 63268f4 · 63268f4
2 parents ade96b4 + 928da35
commit 63268f4
Showing 61 changed files with 124 additions and 702 deletions.
diff --git a/dev/full/data.js b/dev/full/data.js
@@ -1,5 +1,5 @@
 import Fakerator from "fakerator";
-import moment from "moment";
+import fecha from "fecha";
 
 let fakerator = new Fakerator();
 
@@ -26,8 +26,8 @@ module.exports = {
 			user.bio = fakerator.lorem.paragraph();
 			let dob = fakerator.date.past(40, "1998-01-01");
 			user.dob = dob.valueOf();
-			user.time = moment().format("hh:mm:ss");
-			user.age = moment().year() - moment(dob).year();
+			user.time = fecha.format(new Date(), "hh:mm:ss");
+			user.age = fecha.format(new Date().getFullYear() - dob, "YY");
 			user.rank = fakerator.random.number(1, 10);
 			user.role = fakerator.random.arrayElement(roles).id;
 			//user.mobile = fakerator.phone.phoneNumber();

diff --git a/dev/full/schema.js b/dev/full/schema.js
@@ -1,4 +1,4 @@
-import moment from "moment";
+import fecha from "fecha";
 
 import {
 	validators
@@ -352,7 +352,7 @@ module.exports = {
 			label: "Created (label field)",
 			model: "created",
 			get(model) {
-				return model && model.created ? moment(model.created).format("LLL") : "-";
+				// return model && model.created ? fecha.format(model.created,"MMMM  D YYYY H") : "-";
 			},
 			styleClasses: "half-width"
 		}, {
@@ -535,8 +535,8 @@ module.exports = {
 			model: "dob",
 			required: true,
 			placeholder: "User's birth of date",
-			min: moment("1900-01-01").toDate(),
-			max: moment("2018-01-01").toDate(),
+			min: fecha.parse("1900-01-01", "YYYY-MM-DD"),
+			max: fecha.parse("2018-01-01", "YYYY-MM-DD"),
 			validator: [
 				validators.date
 			],

diff --git a/package.json b/package.json
@@ -6,7 +6,9 @@
   "main": "dist/vue-form-generator.js",
   "scripts": {
     "prebuild": "npm run test",
-    "build": "webpack --progress --config webpack.build.config.js",
+    "build:core": "webpack --progress --config webpack.build.config.js --define process.env.FULL_BUNDLE=false --output-filename=vue-form-generator-core.js",
+    "build:full": "webpack --progress --config webpack.build.config.js --define process.env.FULL_BUNDLE=true",
+    "build": "npm run build:core && npm run build:full",
     "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",
@@ -34,6 +36,8 @@
   "files": [
     "dist/vue-form-generator.js",
     "dist/vue-form-generator.css",
+    "dist/vue-form-generator-core.js",
+    "dist/vue-form-generator-core.css",
     "src"
   ],
   "author": "Icebob",
@@ -79,7 +83,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,9 +7,9 @@
 
 <script>
 	/* global $ */
-	import abstractField from "./abstractField";
+	import abstractField from "../abstractField";
 	import { defaults } from "lodash";
-	import dateFieldHelper from "../utils/dateFieldHelper";
+	import dateFieldHelper from "../../utils/dateFieldHelper";
 
 	let inputFormat = "YYYY-MM-DD HH:mm:ss";
 

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,9 +3,9 @@
 </template>
 
 <script>
-	import abstractField from "./abstractField";
+	import abstractField from "../abstractField";
 	import { defaults } from "lodash";
-	import dateFieldHelper from "../utils/dateFieldHelper";	
+	import dateFieldHelper from "../../utils/dateFieldHelper";	
 
 	let inputFormat = "YYYY-MM-DD";
 

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],