Skip to content

Commit

Permalink
fix: remove '@' loading for imports. Now uses '../..' instead
Browse files Browse the repository at this point in the history
  • Loading branch information
davidnixon committed Dec 26, 2022
1 parent 9ba2f77 commit a2a3aef
Show file tree
Hide file tree
Showing 17 changed files with 29 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ module.exports = {
maxEntrypointSize: 4194000,
maxAssetSize: 2097000,
};
config.resolve.alias['@'] = path.resolve(__dirname, '../src');
// config.resolve.alias['@'] = path.resolve(__dirname, '../src');

// Return the altered config
return config;
Expand Down
3 changes: 2 additions & 1 deletion src/components/CvBreadcrumb/__tests__/CvBreadcrumb.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
import { shallowMount } from '@vue/test-utils';
import { carbonPrefix } from '../../../global/settings';

import { CvBreadcrumb, CvBreadcrumbItem } from '@/components/CvBreadcrumb';
import CvBreadcrumb from '../CvBreadcrumb.vue';
import CvBreadcrumbItem from '../CvBreadcrumbItem.vue';

describe('CvBreadcrumb', () => {
it('CvBreadcrumb - default', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@
import { shallowMount } from '@vue/test-utils';
import { carbonPrefix } from '../../../global/settings';

import {
CvBreadcrumbSkeleton,
CvBreadcrumbSkeletonItem,
} from '@/components/CvBreadcrumb';

import CvBreadcrumbSkeleton from '../CvBreadcrumbSkeleton.vue';
import CvBreadcrumbSkeletonItem from '../CvBreadcrumbSkeletonItem.vue';
describe('CvBreadcrumbSkeleton', () => {
it('CvBreadcrumbSkeleton - default', () => {
const wrapper = shallowMount(CvBreadcrumbSkeleton);
Expand Down
4 changes: 2 additions & 2 deletions src/components/CvCheckbox/CvCheckbox.stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import {
sbCompPrefix,
storybookControlsFromProps,
storyParametersObject,
} from '@/global/storybook-utils';
} from '../../global/storybook-utils';

import { CvCheckbox } from '.';
import { action } from '@storybook/addon-actions';
import { props as propsCvCheck } from '@/use/cvCheck';
import { props as propsCvCheck } from '../../use/cvCheck';
import { ref } from 'vue';

export default {
Expand Down
5 changes: 4 additions & 1 deletion src/components/CvComboBox/CvComboBox.stories.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import { sbCompPrefix, storyParametersObject } from '@/global/storybook-utils';
import {
sbCompPrefix,
storyParametersObject,
} from '../../global/storybook-utils';

import { CvComboBox } from '.';
import { action } from '@storybook/addon-actions';
Expand Down
2 changes: 1 addition & 1 deletion src/components/CvComboBox/CvComboBox.vue
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ import {
useSlots,
} from 'vue';
import { carbonPrefix } from '../../global/settings';
import { props as propsCvId, useCvId } from '@/use/cvId';
import { props as propsCvId, useCvId } from '../../use/cvId';
import { WarningFilled16, Close16, ChevronDown16 } from '@carbon/icons-vue';
const props = defineProps({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import CvContentSwitcherButton from './CvContentSwitcherButton';
import CvContentSwitcherContent from './CvContentSwitcherContent';
import { IbmSecurity20 } from '@carbon/icons-vue';
import { action } from '@storybook/addon-actions';
import { sbCompPrefix, storyParametersObject } from '@/global/storybook-utils';
import { sbCompPrefix, storyParametersObject } from '../../global/storybook-utils';

<Meta title={`${sbCompPrefix}/CvContentSwitcher`} component={CvContentSwitcher} />

Expand Down
2 changes: 1 addition & 1 deletion src/components/CvContentSwitcher/CvContentSwitcher.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<script setup>
import { carbonPrefix } from '../../global/settings';
import { props as propsCvId, useCvId } from '@/use/cvId';
import { props as propsCvId, useCvId } from '../../use/cvId';
import { useIsLight, props as propsTheme } from '../../use/cvTheme';
import { onUnmounted, watch } from 'vue';
import store from './cvContentSwitcherStore';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
import { carbonPrefix } from '../../global/settings';
import CvSvg from '../CvSvg/_CvSvg';
import { computed, onMounted, watch } from 'vue';
import { props as propsCvId, useCvId } from '@/use/cvId';
import { props as propsCvId, useCvId } from '../../use/cvId';
import store from './cvContentSwitcherStore';
const props = defineProps({
Expand Down
5 changes: 4 additions & 1 deletion src/components/CvCopyButton/CvCopyButton.stories.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import CvCopyButton from '.';

import { action } from '@storybook/addon-actions';
import { sbCompPrefix, storyParametersObject } from '@/global/storybook-utils';
import {
sbCompPrefix,
storyParametersObject,
} from '../../global/storybook-utils';

export default {
title: `${sbCompPrefix}/CvCopyButton`,
Expand Down
5 changes: 4 additions & 1 deletion src/components/CvLoading/CvLoading.stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ import CvLoading from '.';

import { ref, computed } from 'vue';
import { action } from '@storybook/addon-actions';
import { sbCompPrefix, storyParametersObject } from '@/global/storybook-utils';
import {
sbCompPrefix,
storyParametersObject,
} from '../../global/storybook-utils';
import './CvLoading.stories.scss';

export default {
Expand Down
2 changes: 1 addition & 1 deletion src/components/CvOverflowMenu/CvOverflowMenu.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Canvas, Meta, Story } from '@storybook/addon-docs';
import { CvOverflowMenu } from '.';
import { sbCompPrefix } from '@/global/storybook-utils';
import { sbCompPrefix } from '../../global/storybook-utils';
import { action } from '@storybook/addon-actions';
import CvOverflowMenuItem from './CvOverflowMenuItem.vue';
import { Meter20 as MeterIcon } from '@carbon/icons-vue'
Expand Down
2 changes: 1 addition & 1 deletion src/components/CvOverflowMenu/CvOverflowMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@

<script setup>
import { carbonPrefix } from '../../global/settings';
import { props as propsCvId, useCvId } from '@/use/cvId';
import { props as propsCvId, useCvId } from '../../use/cvId';
import OverflowMenuVertical16 from '@carbon/icons-vue/es/overflow-menu--vertical/16';
import { computed, nextTick, onBeforeMount, onUnmounted, ref } from 'vue';
import { getBus, removeBus } from '../../global/component-utils/event-bus';
Expand Down
2 changes: 1 addition & 1 deletion src/components/CvOverflowMenu/CvOverflowMenuItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<script setup>
import { carbonPrefix } from '../../global/settings';
import { onMounted, ref, useAttrs } from 'vue';
import { getBus } from '@/global/component-utils/event-bus';
import { getBus } from '../../global/component-utils/event-bus';
defineProps({
primaryFocus: Boolean,
Expand Down
2 changes: 1 addition & 1 deletion src/components/CvPagination/CvPagination.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Canvas, Meta, Story } from '@storybook/addon-docs';
import { CvPagination } from '.';
import { sbCompPrefix } from '@/global/storybook-utils';
import { sbCompPrefix } from '../../global/storybook-utils';
import { action } from '@storybook/addon-actions';

<Meta title={`${sbCompPrefix}/CvPagination`} component={CvPagination} />
Expand Down
2 changes: 1 addition & 1 deletion src/components/CvSelect/CvSelect.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Canvas, Meta, Story } from '@storybook/addon-docs';
import { CvSelect } from '.';
import { sbCompPrefix } from '@/global/storybook-utils';
import { sbCompPrefix } from '../../global/storybook-utils';
import { action } from '@storybook/addon-actions';
import CvSelectOption from './CvSelectOption';
import CvSelectOptgroup from './CvSelectOptgroup';
Expand Down
2 changes: 1 addition & 1 deletion src/components/CvSelect/CvSelect.vue
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ import {
ChevronDown16 as ChevronDown,
WarningAltFilled16 as WarningAltFilled,
} from '@carbon/icons-vue';
import { props as propsCvId, useCvId } from '@/use/cvId';
import { props as propsCvId, useCvId } from '../../use/cvId';
import CvWrapper from '../CvWrapper/CvWrapper';
import { useIsLight, props as propsTheme } from '../../use/cvTheme';
Expand Down

0 comments on commit a2a3aef

Please sign in to comment.