feat(mixins): add index for mixins and simplify imports (#1036)

* feat(mixins): add index for mixins and simplify imports * fix: fix linkMixin capitalization Co-authored-by: Jack Mason <jack.mason1@ibm.com> Co-authored-by: Lee Chase <leechase@live.com>
carbon-design-system · Oct 5, 2020 · a0a57d7 · a0a57d7
1 parent 8717791
commit a0a57d7
Show file tree

Hide file tree

Showing 110 changed files with 129 additions and 199 deletions.
diff --git a/packages/core/src/components/cv-accordion/_cv-accordion-item-skeleton.vue b/packages/core/src/components/cv-accordion/_cv-accordion-item-skeleton.vue
@@ -13,7 +13,7 @@
 <script>
 import CvSkeletonText from '../cv-skeleton-text/cv-skeleton-text';
 import ChevronRight16 from '@carbon/icons-vue/es/chevron--right/16';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvAccordionItemSkeleton',

diff --git a/packages/core/src/components/cv-accordion/cv-accordion-item.vue b/packages/core/src/components/cv-accordion/cv-accordion-item.vue
@@ -39,10 +39,7 @@
 
 <script>
 import ChevronRight16 from '@carbon/icons-vue/es/chevron--right/16';
-import uidMixin from '../../mixins/uid-mixin';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
-import methodsMixin from '../../mixins/methods-mixin';
-
+import { uidMixin, carbonPrefixMixin, methodsMixin } from '../../mixins';
 export default {
   name: 'CvAccordionItem',
   mixins: [uidMixin, carbonPrefixMixin, methodsMixin({ button: ['blur', 'focus'] })],

diff --git a/packages/core/src/components/cv-accordion/cv-accordion-skeleton.vue b/packages/core/src/components/cv-accordion/cv-accordion-skeleton.vue
@@ -14,7 +14,7 @@
 <script>
 import CvSkeletonText from '../cv-skeleton-text/cv-skeleton-text';
 import CvAccordionItemSkeleton from './_cv-accordion-item-skeleton';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvAccordionSkeleton',

diff --git a/packages/core/src/components/cv-accordion/cv-accordion.vue b/packages/core/src/components/cv-accordion/cv-accordion.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvAccordion',

diff --git a/packages/core/src/components/cv-breadcrumb/_cv-breadcrumb-item-skeleton.vue b/packages/core/src/components/cv-breadcrumb/_cv-breadcrumb-item-skeleton.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvBreadcrumbItemSkeleton',
   mixins: [carbonPrefixMixin],

diff --git a/packages/core/src/components/cv-breadcrumb/cv-breadcrumb-item.vue b/packages/core/src/components/cv-breadcrumb/cv-breadcrumb-item.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvBreadcrumbItem',
   mixins: [carbonPrefixMixin],

diff --git a/packages/core/src/components/cv-breadcrumb/cv-breadcrumb-skeleton.vue b/packages/core/src/components/cv-breadcrumb/cv-breadcrumb-skeleton.vue
@@ -8,7 +8,7 @@
 
 <script>
 import CvBreadcrumbItemSkeleton from './_cv-breadcrumb-item-skeleton';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvBreadcrumbSkeleton',

diff --git a/packages/core/src/components/cv-breadcrumb/cv-breadcrumb.vue b/packages/core/src/components/cv-breadcrumb/cv-breadcrumb.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvBreadcrumb',
   mixins: [carbonPrefixMixin],

diff --git a/packages/core/src/components/cv-button/cv-button-set.vue b/packages/core/src/components/cv-button/cv-button-set.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvButtonSet',

diff --git a/packages/core/src/components/cv-button/cv-button.vue b/packages/core/src/components/cv-button/cv-button.vue
@@ -8,7 +8,7 @@
 
 <script>
 import buttonMixin from './button-mixin';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 import CvSvg from '../cv-svg/_cv-svg';
 
 export default {

diff --git a/packages/core/src/components/cv-button/cv-icon-button.vue b/packages/core/src/components/cv-button/cv-icon-button.vue
@@ -19,7 +19,7 @@
 
 <script>
 import buttonMixin from './button-mixin';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 import CvSvg from '../cv-svg/_cv-svg';
 
 export default {

diff --git a/packages/core/src/components/cv-checkbox/cv-checkbox-skeleton.vue b/packages/core/src/components/cv-checkbox/cv-checkbox-skeleton.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvCheckboxSkeleton',
   mixins: [carbonPrefixMixin],

diff --git a/packages/core/src/components/cv-checkbox/cv-checkbox.vue b/packages/core/src/components/cv-checkbox/cv-checkbox.vue
@@ -33,10 +33,7 @@
 </template>
 
 <script>
-import checkMixin from '../../mixins/check-mixin';
-import uidMixin from '../../mixins/uid-mixin';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
-import methodsMixin from '../../mixins/methods-mixin';
+import { checkMixin, uidMixin, carbonPrefixMixin, methodsMixin } from '../../mixins';
 
 export default {
   name: 'CvCheckbox',

diff --git a/packages/core/src/components/cv-code-snippet/_cv-code-snippet-inline.vue b/packages/core/src/components/cv-code-snippet/_cv-code-snippet-inline.vue
@@ -17,8 +17,7 @@
 
 <script>
 import CvFeedbackButton from '../cv-feedback-button/_cv-feedback-button';
-import themeMixin from '../../mixins/theme-mixin';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { themeMixin, carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvCodeSnippetInline',

diff --git a/packages/core/src/components/cv-code-snippet/_cv-code-snippet-multiline.vue b/packages/core/src/components/cv-code-snippet/_cv-code-snippet-multiline.vue
@@ -36,8 +36,7 @@ import CvButton from '../cv-button/cv-button';
 
 import Copy16 from '@carbon/icons-vue/es/copy/16';
 import ChevronDown16 from '@carbon/icons-vue/es/chevron--down/16';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
-import themeMixin from '../../mixins/theme-mixin';
+import { carbonPrefixMixin, themeMixin } from '../../mixins';
 
 export default {
   name: 'CvCodeSnippetMultiline',

diff --git a/packages/core/src/components/cv-code-snippet/_cv-code-snippet-oneline.vue b/packages/core/src/components/cv-code-snippet/_cv-code-snippet-oneline.vue
@@ -19,8 +19,7 @@
 </template>
 
 <script>
-import themeMixin from '../../mixins/theme-mixin';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { themeMixin, carbonPrefixMixin } from '../../mixins';
 import CvFeedbackButton from '../cv-feedback-button/_cv-feedback-button';
 import Copy16 from '@carbon/icons-vue/es/copy/16';
 

diff --git a/packages/core/src/components/cv-code-snippet/cv-code-snippet-skeleton.vue b/packages/core/src/components/cv-code-snippet/cv-code-snippet-skeleton.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvCodeSnippetSkeleton',

diff --git a/packages/core/src/components/cv-combo-box/cv-combo-box.vue b/packages/core/src/components/cv-combo-box/cv-combo-box.vue
@@ -113,13 +113,10 @@
 </template>
 
 <script>
-import themeMixin from '../../mixins/theme-mixin';
+import { themeMixin, uidMixin, carbonPrefixMixin, methodsMixin } from '../../mixins';
 import WarningFilled16 from '@carbon/icons-vue/es/warning--filled/16';
 import ChevronDown16 from '@carbon/icons-vue/es/chevron--down/16';
 import Close16 from '@carbon/icons-vue/es/close/16';
-import uidMixin from '../../mixins/uid-mixin';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
-import methodsMixin from '../../mixins/methods-mixin';
 
 export default {
   name: 'CvComboBox',

diff --git a/packages/core/src/components/cv-content-switcher/cv-content-switcher-button.vue b/packages/core/src/components/cv-content-switcher/cv-content-switcher-button.vue
@@ -34,9 +34,8 @@
 </template>
 
 <script>
-import uidMixin from '../../mixins/uid-mixin';
+import { uidMixin, carbonPrefixMixin } from '../../mixins';
 import CvSvg from '../cv-svg/_cv-svg';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
 
 export default {
   name: 'CvContentSwitcherButton',

diff --git a/packages/core/src/components/cv-content-switcher/cv-content-switcher.vue b/packages/core/src/components/cv-content-switcher/cv-content-switcher.vue
@@ -6,7 +6,7 @@
 
 <script>
 import store from './cv-content-switcher-store';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 
 const toggleContent = (selector, on) => {
   // hide content

diff --git a/packages/core/src/components/cv-data-table/_cv-data-table-row-inner.vue b/packages/core/src/components/cv-data-table/_cv-data-table-row-inner.vue
@@ -54,7 +54,7 @@ import CvCheckbox from '../cv-checkbox/cv-checkbox';
 import CvOverflowMenu from '../cv-overflow-menu/cv-overflow-menu';
 import CvOverflowMenuItem from '../cv-overflow-menu/cv-overflow-menu-item';
 import ChevronRight16 from '@carbon/icons-vue/es/chevron--right/16';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvDataTableRowInner',

diff --git a/packages/core/src/components/cv-data-table/cv-data-table-action.vue b/packages/core/src/components/cv-data-table/cv-data-table-action.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'cv-data-table-action',
   mixins: [carbonPrefixMixin],

diff --git a/packages/core/src/components/cv-data-table/cv-data-table-heading.vue b/packages/core/src/components/cv-data-table/cv-data-table-heading.vue
@@ -30,8 +30,7 @@
 import ArrowDown16 from '@carbon/icons-vue/es/arrow--down/16';
 import Arrows16 from '@carbon/icons-vue/es/arrows/16';
 import CvWrapper from '../cv-wrapper/_cv-wrapper';
-import uidMixin from '../../mixins/uid-mixin';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { uidMixin, carbonPrefixMixin } from '../../mixins';
 
 const nextOrder = {
   ascending: 'descending',

diff --git a/packages/core/src/components/cv-data-table/cv-data-table-row.vue b/packages/core/src/components/cv-data-table/cv-data-table-row.vue
@@ -30,8 +30,7 @@
 
 <script>
 import CvDataTableRowInner from './_cv-data-table-row-inner';
-import uidMixin from '../../mixins/uid-mixin';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { uidMixin, carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvDataTableRow',

diff --git a/packages/core/src/components/cv-data-table/cv-data-table.vue b/packages/core/src/components/cv-data-table/cv-data-table.vue
@@ -187,12 +187,10 @@ import CvButton from '../cv-button/cv-button';
 import CvCheckbox from '../cv-checkbox/cv-checkbox';
 import CvPagination from '../cv-pagination/cv-pagination';
 import CvWrapper from '../cv-wrapper/_cv-wrapper';
-import uidMixin from '../../mixins/uid-mixin';
+import { uidMixin, carbonPrefixMixin } from '../../mixins';
 import Search16 from '@carbon/icons-vue/es/search/16';
 import Close16 from '@carbon/icons-vue/es/close/16';
 import ChevronRight16 from '@carbon/icons-vue/es/chevron--right/16';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
-
 export default {
   name: 'CvDataTable',
   components: {

diff --git a/packages/core/src/components/cv-date-picker/cv-date-picker.vue b/packages/core/src/components/cv-date-picker/cv-date-picker.vue
@@ -77,11 +77,9 @@ import carbonFlatpickrFixEventsPlugin from './plugins/fixEventsPlugin';
 import carbonFlatpickrRangePlugin from './plugins/rangePlugin';
 import carbonFlatpickrMonthSelectPlugin from './plugins/monthSelectPlugin';
 
-import uidMixin from '../../mixins/uid-mixin';
-import themeMixin from '../../mixins/theme-mixin';
+import { uidMixin, themeMixin, carbonPrefixMixin } from '../../mixins';
 import Calendar16 from '@carbon/icons-vue/es/calendar/16';
 import CvWrapper from '../cv-wrapper/_cv-wrapper';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
 
 // Weekdays shorthand for english locale
 l10n.en.weekdays.shorthand.forEach((day, index) => {

diff --git a/packages/core/src/components/cv-dropdown/cv-dropdown-item.vue b/packages/core/src/components/cv-dropdown/cv-dropdown-item.vue
@@ -32,7 +32,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvDropdownItem',
   mixins: [carbonPrefixMixin],

diff --git a/packages/core/src/components/cv-dropdown/cv-dropdown-skeleton.vue b/packages/core/src/components/cv-dropdown/cv-dropdown-skeleton.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvDropdownSkeleton',
   mixins: [carbonPrefixMixin],

diff --git a/packages/core/src/components/cv-dropdown/cv-dropdown.vue b/packages/core/src/components/cv-dropdown/cv-dropdown.vue
@@ -114,13 +114,10 @@
 </template>
 
 <script>
-import themeMixin from '../../mixins/theme-mixin';
-import uidMixin from '../../mixins/uid-mixin';
-import methodsMixin from '../../mixins/methods-mixin';
+import { themeMixin, uidMixin, methodsMixin, carbonPrefixMixin } from '../../mixins';
 import CvDropdownItem from './cv-dropdown-item';
 import WarningFilled16 from '@carbon/icons-vue/es/warning--filled/16';
 import ChevronDown16 from '@carbon/icons-vue/es/chevron--down/16';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
 import clickout from '../../directives/clickout';
 
 export default {

diff --git a/packages/core/src/components/cv-feedback-button/_cv-feedback-button.vue b/packages/core/src/components/cv-feedback-button/_cv-feedback-button.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 const feedbackPhases = {
   DEFAULT: 0,
   FADE_IN: 1,

diff --git a/packages/core/src/components/cv-file-uploader/cv-file-uploader-skeleton.vue b/packages/core/src/components/cv-file-uploader/cv-file-uploader-skeleton.vue
@@ -9,7 +9,7 @@
 <script>
 import CvSkeletonText from '../cv-skeleton-text/cv-skeleton-text';
 import CvButtonSkeleton from '../cv-button/cv-button-skeleton';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvFileUploaderSkeleton',

diff --git a/packages/core/src/components/cv-file-uploader/cv-file-uploader.vue b/packages/core/src/components/cv-file-uploader/cv-file-uploader.vue
@@ -110,15 +110,13 @@
 </template>
 
 <script>
-import uidMixin from '../../mixins/uid-mixin';
+import { uidMixin, carbonPrefixMixin, methodsMixin } from '../../mixins';
 import CvFormItem from '../cv-form/cv-form-item';
 import CheckmarkFilled16 from '@carbon/icons-vue/es/checkmark--filled/16';
 import WarningFilled16 from '@carbon/icons-vue/es/warning--filled/16';
 import Close16 from '@carbon/icons-vue/es/close/16';
 import CvWrapper from '../cv-wrapper/_cv-wrapper';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
 import { STATES, KINDS } from './consts.js';
-import methodsMixin from '../../mixins/methods-mixin';
 
 export default {
   name: 'CvFileUploader',

diff --git a/packages/core/src/components/cv-form/cv-form-group.vue b/packages/core/src/components/cv-form/cv-form-group.vue
@@ -8,7 +8,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvFormGroup',
   mixins: [carbonPrefixMixin],

diff --git a/packages/core/src/components/cv-form/cv-form-item.vue b/packages/core/src/components/cv-form/cv-form-item.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvFormItem',
   mixins: [carbonPrefixMixin],

diff --git a/packages/core/src/components/cv-form/cv-form.vue b/packages/core/src/components/cv-form/cv-form.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvForm',
   mixins: [carbonPrefixMixin],

diff --git a/packages/core/src/components/cv-inline-loading/cv-inline-loading.vue b/packages/core/src/components/cv-inline-loading/cv-inline-loading.vue
@@ -29,7 +29,7 @@
 import { STATES } from './consts';
 import ErrorFilled16 from '@carbon/icons-vue/lib/error--filled/16';
 import CheckmarkFilled16 from '@carbon/icons-vue/lib/checkmark--filled/16';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvInlineLoading',

diff --git a/packages/core/src/components/cv-inline-notification/cv-inline-notification.vue b/packages/core/src/components/cv-inline-notification/cv-inline-notification.vue
@@ -46,13 +46,12 @@
 </template>
 
 <script>
-import notificationMixin from '../../mixins/notification-mixin';
+import { notificationMixin, carbonPrefixMixin } from '../../mixins';
 import ErrorFilled20 from '@carbon/icons-vue/es/error--filled/20';
 import CheckmarkFilled20 from '@carbon/icons-vue/es/checkmark--filled/20';
 import WarningFilled20 from '@carbon/icons-vue/es/warning--filled/20';
 import Close20 from '@carbon/icons-vue/es/close/20';
 import InformationFilled20 from '@carbon/icons-vue/es/information--filled/20';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
 
 export default {
   name: 'CvInlineNotification',

diff --git a/packages/core/src/components/cv-link/cv-link.vue b/packages/core/src/components/cv-link/cv-link.vue
@@ -11,12 +11,11 @@
 </template>
 
 <script>
-import LinkMixin from '../../mixins/link-mixin';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { linkMixin, carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvLink',
-  mixins: [LinkMixin, carbonPrefixMixin],
+  mixins: [linkMixin, carbonPrefixMixin],
   props: {
     inline: Boolean,
   },