Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 6 commits into from
Oct 5, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a17b4b2
Merge pull request #1 from carbon-design-system/master
mrsideshowjack Oct 1, 2020
837613a
Merge pull request #2 from carbon-design-system/master
mrsideshowjack Oct 2, 2020
476d9f3
feat(mixins): add index for mixins and simplify imports
Oct 2, 2020
5192735
fix: fix linkMixin capitalization
Oct 2, 2020
9f05d7d
Merge branch 'master' into mixinIndexFile
mrsideshowjack Oct 2, 2020
5e6c3da
Merge branch 'master' into mixinIndexFile
lee-chase Oct 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/core/src/components/cv-accordion/_cv-accordion-item-skeleton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
5 changes: 1 addition & 4 deletions packages/core/src/components/cv-accordion/cv-accordion-item.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'] })],
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/components/cv-accordion/cv-accordion-skeleton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/components/cv-accordion/cv-accordion.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</template>

<script>
import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
import { carbonPrefixMixin } from '../../mixins';

export default {
name: 'CvAccordion',
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/components/cv-breadcrumb/_cv-breadcrumb-item-skeleton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</template>

<script>
import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
import { carbonPrefixMixin } from '../../mixins';
export default {
name: 'CvBreadcrumbItemSkeleton',
mixins: [carbonPrefixMixin],
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/components/cv-breadcrumb/cv-breadcrumb-item.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</template>

<script>
import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
import { carbonPrefixMixin } from '../../mixins';
export default {
name: 'CvBreadcrumbItem',
mixins: [carbonPrefixMixin],
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/components/cv-breadcrumb/cv-breadcrumb-skeleton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/components/cv-breadcrumb/cv-breadcrumb.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</template>

<script>
import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
import { carbonPrefixMixin } from '../../mixins';
export default {
name: 'CvBreadcrumb',
mixins: [carbonPrefixMixin],
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/components/cv-button/cv-button-set.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</template>

<script>
import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
import { carbonPrefixMixin } from '../../mixins';

export default {
name: 'CvButtonSet',
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/components/cv-button/cv-button.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/components/cv-button/cv-icon-button.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/components/cv-checkbox/cv-checkbox-skeleton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</template>

<script>
import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
import { carbonPrefixMixin } from '../../mixins';
export default {
name: 'CvCheckboxSkeleton',
mixins: [carbonPrefixMixin],
Expand Down
5 changes: 1 addition & 4 deletions packages/core/src/components/cv-checkbox/cv-checkbox.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
3 changes: 1 addition & 2 deletions packages/core/src/components/cv-code-snippet/_cv-code-snippet-inline.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
3 changes: 1 addition & 2 deletions packages/core/src/components/cv-code-snippet/_cv-code-snippet-multiline.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
3 changes: 1 addition & 2 deletions packages/core/src/components/cv-code-snippet/_cv-code-snippet-oneline.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/components/cv-code-snippet/cv-code-snippet-skeleton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</template>

<script>
import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
import { carbonPrefixMixin } from '../../mixins';

export default {
name: 'CvCodeSnippetSkeleton',
Expand Down
5 changes: 1 addition & 4 deletions packages/core/src/components/cv-combo-box/cv-combo-box.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
3 changes: 1 addition & 2 deletions packages/core/src/components/cv-content-switcher/cv-content-switcher-button.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/components/cv-content-switcher/cv-content-switcher.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/components/cv-data-table/_cv-data-table-row-inner.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/components/cv-data-table/cv-data-table-action.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down
3 changes: 1 addition & 2 deletions packages/core/src/components/cv-data-table/cv-data-table-heading.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
3 changes: 1 addition & 2 deletions packages/core/src/components/cv-data-table/cv-data-table-row.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
4 changes: 1 addition & 3 deletions packages/core/src/components/cv-data-table/cv-data-table.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
4 changes: 1 addition & 3 deletions packages/core/src/components/cv-date-picker/cv-date-picker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/components/cv-dropdown/cv-dropdown-item.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</template>

<script>
import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
import { carbonPrefixMixin } from '../../mixins';
export default {
name: 'CvDropdownItem',
mixins: [carbonPrefixMixin],
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/components/cv-dropdown/cv-dropdown-skeleton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</template>

<script>
import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
import { carbonPrefixMixin } from '../../mixins';
export default {
name: 'CvDropdownSkeleton',
mixins: [carbonPrefixMixin],
Expand Down
5 changes: 1 addition & 4 deletions packages/core/src/components/cv-dropdown/cv-dropdown.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/components/cv-feedback-button/_cv-feedback-button.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</template>

<script>
import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
import { carbonPrefixMixin } from '../../mixins';
const feedbackPhases = {
DEFAULT: 0,
FADE_IN: 1,
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/components/cv-file-uploader/cv-file-uploader-skeleton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
4 changes: 1 addition & 3 deletions packages/core/src/components/cv-file-uploader/cv-file-uploader.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/components/cv-form/cv-form-group.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</template>

<script>
import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
import { carbonPrefixMixin } from '../../mixins';
export default {
name: 'CvFormGroup',
mixins: [carbonPrefixMixin],
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/components/cv-form/cv-form-item.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</template>

<script>
import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
import { carbonPrefixMixin } from '../../mixins';
export default {
name: 'CvFormItem',
mixins: [carbonPrefixMixin],
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/components/cv-form/cv-form.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</template>

<script>
import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
import { carbonPrefixMixin } from '../../mixins';
export default {
name: 'CvForm',
mixins: [carbonPrefixMixin],
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/components/cv-inline-loading/cv-inline-loading.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
3 changes: 1 addition & 2 deletions packages/core/src/components/cv-inline-notification/cv-inline-notification.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
5 changes: 2 additions & 3 deletions packages/core/src/components/cv-link/cv-link.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
Expand Down
Loading