feat(utils): wrap-up as ES6 module (#656)

* feat (utils, mixins) wrap-up as ES6 module * feat (utils, mixins) make use of new ES6 modules
bootstrap-vue · Jul 7, 2017 · b5f7cfc · b5f7cfc
1 parent 7a65721
commit b5f7cfc
Show file tree

Hide file tree

Showing 26 changed files with 52 additions and 46 deletions.
diff --git a/lib/components/alert.vue b/lib/components/alert.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script>
-    import warn from '../utils/warn';
+    import {warn} from '../utils';
 
     export default {
         data() {

diff --git a/lib/components/breadcrumb.vue b/lib/components/breadcrumb.vue
@@ -18,7 +18,7 @@
 <script>
 import bLink from './link.vue';
 import { props as linkProps } from '../mixins/link';
-import arrayIncludes from '../utils/arrayIncludes';
+import {arrayIncludes} from '../utils';
 
 const bLinkPropKeys = Object.keys(linkProps);
 

diff --git a/lib/components/collapse.vue b/lib/components/collapse.vue
@@ -20,10 +20,10 @@
 </style>
 
 <script>
-    import listenOnRoot from '../mixins/listen-on-root';
+    import {listenOnRootMixin} from '../mixins';
 
     export default {
-        mixins: [listenOnRoot],
+        mixins: [listenOnRootMixin],
         data() {
             return {
                 show: this.visible

diff --git a/lib/components/dropdown.vue b/lib/components/dropdown.vue
@@ -45,11 +45,11 @@
 </template>
 
 <script>
-    import dropdown from '../mixins/dropdown';
+    import {dropdownMixin} from '../mixins';
     import bButton from './button.vue';
 
     export default {
-        mixins: [dropdown],
+        mixins: [dropdownMixin],
         components: {bButton},
         props: {
             split: {

diff --git a/lib/components/form-checkbox.vue b/lib/components/form-checkbox.vue
@@ -21,12 +21,8 @@
 </template>
 
 <script>
-import formMixin from '../mixins/form';
+import {formMixin, formCustomMixin, formCheckBoxMixin} from '../mixins';
-import formCustomMixin from '../mixins/form-custom';
+import {arrayIncludes, isArray} from '../utils';
-import formCheckBoxMixin from '../mixins/form-checkbox';
-import arrayIncludes from '../utils/arrayIncludes';
-import isArray from '../utils/isArray';
-
 
 export default {
     mixins: [formMixin, formCustomMixin, formCheckBoxMixin],

diff --git a/lib/components/form-fieldset.vue b/lib/components/form-fieldset.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script>
-    import warn from '../utils/warn';
+    import {warn} from '../utils';
 
     export default {
         data() {

diff --git a/lib/components/form-file.vue b/lib/components/form-file.vue
@@ -84,8 +84,7 @@
 </style>
 
 <script>
-    import formMixin from '../mixins/form';
+    import {formCustomMixin, formMixin} from '../mixins';
-    import formCustomMixin from '../mixins/form-custom';
 
     export default {
         mixins: [formMixin, formCustomMixin],

diff --git a/lib/components/form-input.vue b/lib/components/form-input.vue
@@ -30,7 +30,7 @@
 </template>
 
 <script>
-    import formMixin from '../mixins/form';
+    import {formMixin} from '../mixins';
     import bFormInputStatic from './form-input-static.vue';
 
     export default {

diff --git a/lib/components/form-radio.vue b/lib/components/form-radio.vue
@@ -27,10 +27,7 @@
 </template>
 
 <script>
-    import formOptionsMixin from '../mixins/form-options';
+    import {formOptionsMixin, formMixin, formCustomMixin, formCheckBoxMixin} from '../mixins';
-    import formMixin from '../mixins/form';
-    import formCustomMixin from '../mixins/form-custom';
-    import formCheckBoxMixin from '../mixins/form-checkbox';
 
     export default {
         mixins: [formMixin, formCustomMixin, formCheckBoxMixin, formOptionsMixin],

diff --git a/lib/components/form-select.vue b/lib/components/form-select.vue
@@ -18,12 +18,10 @@
 </template>
 
 <script>
-    import formOptions from '../mixins/form-options';
+    import {formMixin, formOptionsMixin, formCustomMixin} from '../mixins';
-    import formMixin from '../mixins/form';
-    import formCustomMixin from '../mixins/form-custom';
 
     export default {
-        mixins: [formMixin, formCustomMixin, formOptions],
+        mixins: [formMixin, formCustomMixin, formOptionsMixin],
         data() {
             return {
                 localValue: this.value

diff --git a/lib/components/link.vue b/lib/components/link.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import linkMixin from '../mixins/link';
+import {linkMixin} from '../mixins';
 
 export default {
     mixins: [linkMixin]

diff --git a/lib/components/list-group-item.vue b/lib/components/list-group-item.vue
@@ -10,7 +10,7 @@
 <script>
 import bLink from './link.vue';
 import { props as originalLinkProps, computed, omitLinkProps } from '../mixins/link';
-import arrayIncludes from '../utils/arrayIncludes';
+import {arrayIncludes} from '../utils';
 // copy link props, but exclude defaults for 'href', 'to', & 'tag'
 // to ensure proper component tag computation
 const linkProps = Object.assign(omitLinkProps('href', 'to'), {

diff --git a/lib/components/modal.vue b/lib/components/modal.vue
@@ -92,7 +92,7 @@
 
 <script>
     import bBtn from './button.vue';
-    import listenOnRoot from '../mixins/listen-on-root';
+    import {listenOnRootMixin} from '../mixins';
 
     const FOCUS_SELECTOR = [
         'button:not([disabled])',
@@ -127,7 +127,7 @@
     }
 
     export default {
-        mixins: [listenOnRoot],
+        mixins: [listenOnRootMixin],
         components: {bBtn},
         data() {
             return {

diff --git a/lib/components/nav-toggle.vue b/lib/components/nav-toggle.vue
@@ -11,10 +11,10 @@
 </template>
 
 <script>
-import listenOnRoot from '../mixins/listen-on-root';
+import {listenOnRootMixin} from '../mixins';
 
 export default {
-    mixins: [listenOnRoot],
+    mixins: [listenOnRootMixin],
     computed: {
         classObject() {
             return [

diff --git a/lib/components/popover.vue b/lib/components/popover.vue
@@ -20,10 +20,10 @@
 </template>
 
 <script>
-    import popover from '../mixins/popover';
+    import {popoverMixin} from '../mixins';
 
     export default {
-        mixins: [popover],
+        mixins: [popoverMixin],
         props: {
             title: {
                 type: String,

diff --git a/lib/components/table.vue b/lib/components/table.vue
@@ -76,7 +76,7 @@
 </template>
 
 <script>
-    import warn from '../utils/warn';
+    import {warn} from '../utils';
 
     const toString = v => {
         if (!v) {

diff --git a/lib/components/tabs.vue b/lib/components/tabs.vue
@@ -52,7 +52,7 @@
 </template>
 
 <script>
-    import observeDom from '../utils/observe-dom';
+    import {observeDom} from '../utils';
 
     export default {
         data() {

diff --git a/lib/components/tooltip.vue b/lib/components/tooltip.vue
@@ -23,10 +23,10 @@
 </style>
 
 <script>
-    import popover from '../mixins/popover';
+    import {popoverMixin} from '../mixins';
 
     export default {
-        mixins: [popover],
+        mixins: [popoverMixin],
         props: {
             content: {
                 type: String,

diff --git a/lib/directives/scrollspy.js b/lib/directives/scrollspy.js
@@ -1,4 +1,4 @@
-import isArray from '../utils/isArray';
+import { isArray } from '../utils';
 const inBrowser = typeof window !== 'undefined';
 const isServer = !inBrowser;
 

diff --git a/lib/mixins/dropdown.js b/lib/mixins/dropdown.js
@@ -1,4 +1,4 @@
-import clickOut from './clickout';
+import clickOutMixin from './clickout';
 
 // Determine if an HTML element is visible - Faster than CSS check
 function isVisible(el) {
@@ -60,8 +60,8 @@ export default {
         // Hide when clicked on links
         this.$root.$on('clicked::link', listener);
     },
-    mounted: clickOut.mounted,
+    mounted: clickOutMixin.mounted,
-    destroyed: clickOut.destroyed,
+    destroyed: clickOutMixin.destroyed,
     watch: {
         visible(state, old) {
             if (state === old) {
@@ -98,7 +98,7 @@ export default {
         }
     },
     methods: {
-        ...clickOut.methods,
+        ...clickOutMixin.methods,
         noop() {
             // Do nothing event handler (used in visible watch)
         },

diff --git a/lib/mixins/form-options.js b/lib/mixins/form-options.js
@@ -1,4 +1,4 @@
-import isArray from '../utils/isArray';
+import { isArray }from '../utils';
 
 export default {
     computed: {

diff --git a/lib/mixins/index.js b/lib/mixins/index.js
@@ -0,0 +1,11 @@
+import clickOutMixin from './clickout';
+import dropdownMixin from './dropdown';
+import formMixin from './form';
+import formCheckBoxMixin from './form-checkbox';
+import formCustomMixin from './form-custom';
+import formOptionsMixin from './form-options';
+import linkMixin from './link';
+import listenOnRootMixin from './listen-on-root';
+import popoverMixin from './popover';
+
+export {clickOutMixin, dropdownMixin, formMixin, formCheckBoxMixin, formCustomMixin, formOptionsMixin, linkMixin, listenOnRootMixin, popoverMixin};
diff --git a/lib/mixins/link.js b/lib/mixins/link.js
@@ -1,5 +1,4 @@
-import warn from '../utils/warn';
+import {warn, arrayIncludes} from '../utils';
-import arrayIncludes from '../utils/arrayIncludes';
 // Props compatible with vue-router
 // https://github.com/vuejs/vue-router/blob/dev/src/components/link.js
 export const props = {

diff --git a/lib/mixins/listen-on-root.js b/lib/mixins/listen-on-root.js
@@ -1,4 +1,4 @@
-import isArray from "../utils/isArray"
+import { isArray } from "../utils"
 /**
  * Issue #569: collapse::toggle::state triggered too many times
  * @link https://github.com/bootstrap-vue/bootstrap-vue/issues/569

diff --git a/lib/mixins/popover.js b/lib/mixins/popover.js
@@ -1,5 +1,5 @@
 import Tether from 'tether';
-import isArray from '../utils/isArray';
+import { isArray } from '../utils';
 // Controls which events are mapped for each named trigger, and the expected popover behavior for each.
 const TRIGGER_LISTENERS = {
     click: {click: 'toggle'},

diff --git a/lib/utils/index.js b/lib/utils/index.js
@@ -0,0 +1,6 @@
+import arrayIncludes from './arrayIncludes';
+import isArray from './isArray';
+import observeDom from './observe-dom';
+import warn from './warn';
+
+export {arrayIncludes, isArray, observeDom, warn};