#112 Get rid of Vue dependency in the code.

Use moment.min to reduce build size
vue-generators · Feb 13, 2017 · 01fa81b · 01fa81b
1 parent afe5e74
commit 01fa81b
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 26 deletions.
diff --git a/dist/vue-form-generator.js b/dist/vue-form-generator.js
diff --git a/src/fields/fieldDateTimePicker.vue b/src/fields/fieldDateTimePicker.vue
@@ -8,7 +8,7 @@
 <script>
 	/* global $ */
 	import abstractField from "./abstractField";
-	import moment from "moment";
+	import moment from "moment/min/moment.min";
 	import { defaults } from "lodash";
 
 	let inputFormat = "YYYY-MM-DD HH:mm:ss";

diff --git a/src/fields/fieldInput.vue b/src/fields/fieldInput.vue
@@ -37,7 +37,7 @@
 
 <script>
 	import abstractField from "./abstractField";
-	import moment from "moment";
+	import moment from "moment/min/moment.min";
 
 	export default {
 		mixins: [ abstractField ],

diff --git a/src/fields/fieldPikaday.vue b/src/fields/fieldPikaday.vue
@@ -4,7 +4,7 @@
 
 <script>
 	import abstractField from "./abstractField";
-	import moment from "moment";
+	import moment from "moment/min/moment.min";
 	import { defaults } from "lodash";
 
 	let inputFormat = "YYYY-MM-DD";

diff --git a/src/fields/fieldVueMultiSelect.vue b/src/fields/fieldVueMultiSelect.vue
@@ -40,7 +40,6 @@
 	)
 </template>
 <script>
-	import Vue from "vue";
 	import abstractField from "./abstractField";
 
 	export default {
@@ -96,10 +95,8 @@
 			}
 		},
 		created() {
-			// Check if the component is loaded
-			if (window.VueMultiselect) {
-				Vue.component("multiselect", window.VueMultiselect.default ? window.VueMultiselect.default : window.VueMultiselect);
-			} else {
+			// Check if the component is loaded globally
+			if (!this.$root.$options.components["multiselect"]) {
 				console.error("'vue-multiselect' is missing. Please download from https://github.com/monterail/vue-multiselect and load the script in the HTML head section!");
 			}
 		}

diff --git a/src/utils/validators.js b/src/utils/validators.js
@@ -1,5 +1,5 @@
 import { isNil, isNumber, isString, isArray } from "lodash";
-import moment from "moment";
+import moment from "moment/min/moment.min";
 
 function checkEmpty(value, required) {
 	if (isNil(value) || value === "") {

diff --git a/test/unit/specs/fields/fieldVueMultiSelect.spec.js b/test/unit/specs/fields/fieldVueMultiSelect.spec.js
@@ -3,8 +3,10 @@ import { createVueField, trigger } from "../util";
 
 import Vue from "vue";
 import fieldVueMultiSelect from "src/fields/fieldVueMultiSelect.vue";
+import VueMultiSelect from "vue-multiselect";
 
 Vue.component("fieldVueMultiSelect", fieldVueMultiSelect);
+Vue.component("multiselect", VueMultiSelect);
 
 // eslint-disable-next-line
 let el, vm, field;