Skip to content

Commit e4b3331

Browse files
committed
chore: enforce import order
1 parent dd96bfa commit e4b3331

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+107
-98
lines changed

eslint.config.mjs

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ import tsParser from '@typescript-eslint/parser';
1010
export default [
1111
prettier,
1212
js.configs.recommended,
13+
importX.flatConfigs.recommended,
14+
importX.flatConfigs.typescript,
1315
...ts.configs.recommended,
1416
...vue.configs['flat/recommended'],
1517
...vueI18n.configs['flat/recommended'],
1618
vuePrettier,
17-
importX.flatConfigs.recommended,
18-
importX.flatConfigs.typescript,
1919
{
2020
files: ['**/*.{vue,ts,js,mjs}'],
2121
languageOptions: {
@@ -35,7 +35,6 @@ export default [
3535
'vue/multi-word-component-names': 'off',
3636
'vue/require-default-prop': 'off',
3737
'vue/no-v-html': 'off',
38-
'import-x/no-unresolved': 'off',
3938
'no-console': 'error',
4039
'prettier/prettier': [
4140
'error',
@@ -45,6 +44,16 @@ export default [
4544
singleQuote: true,
4645
trailingComma: 'none'
4746
}
47+
],
48+
'import-x/no-unresolved': 'off',
49+
'import-x/order': [
50+
'error',
51+
{
52+
groups: ['index', 'sibling', 'parent', 'internal', 'external', 'builtin', 'object', 'type'],
53+
alphabetize: {
54+
order: 'asc'
55+
}
56+
}
4857
]
4958
}
5059
}

src/app/components/base/context-menu/ContextMenu.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
</template>
2323

2424
<script lang="ts" setup>
25+
import ContextMenuButton from './ContextMenuButton.vue';
2526
import {
2627
ContextMenuOption,
2728
ContextMenuOptionId,
@@ -32,7 +33,6 @@ import { useOutOfElementClick } from '@composables';
3233
import { createPopper, Modifier, Instance, Placement } from '@popperjs/core';
3334
import { ClassNames } from '@utils';
3435
import { computed, provide, ref, useCssModule, watch } from 'vue';
35-
import ContextMenuButton from './ContextMenuButton.vue';
3636
3737
const emit = defineEmits<{
3838
(e: 'select', option: ContextMenuOption): void;

src/app/components/base/draggable/Draggable.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
</template>
2727

2828
<script lang="ts" setup>
29+
import { ReorderEvent } from './Draggable.types';
30+
import { DraggableStore, store } from './store';
2931
import Button from '@components/base/button/Button.vue';
3032
import { RiDraggable, RiSkipDownLine, RiSkipUpLine } from '@remixicon/vue';
3133
import { computed, ref } from 'vue';
32-
import { ReorderEvent } from './Draggable.types';
33-
import { DraggableStore, store } from './store';
3434
import type { Component } from 'vue';
3535
3636
const emit = defineEmits<{

src/app/components/base/draggable/store.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { reactive } from 'vue';
21
import { DropOrder } from './Draggable.types';
2+
import { reactive } from 'vue';
33

44
export interface DraggableStore {
55
group?: string;

src/app/components/base/steps/Step.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
</template>
66

77
<script lang="ts" setup>
8+
import { ONBOARDING_STORE, OnboardingStore } from './Steps.types';
89
import { useIntristicSize } from '@composables';
910
import { ClassNames } from '@utils';
1011
import { computed, inject, onMounted, onUnmounted, ref } from 'vue';
11-
import { ONBOARDING_STORE, OnboardingStore } from './Steps.types';
1212
1313
const props = defineProps<{
1414
class?: ClassNames;

src/app/components/base/steps/Steps.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
</template>
66

77
<script lang="ts" setup>
8+
import { ONBOARDING_STORE, OnboardingStore, StepsExposed } from './Steps.types';
89
import { ClassNames, remove } from '@utils';
910
import { computed, provide, reactive, Ref, ref } from 'vue';
10-
import { ONBOARDING_STORE, OnboardingStore, StepsExposed } from './Steps.types';
1111
1212
const emit = defineEmits<{
1313
(e: 'finish'): void;

src/app/components/feature/BudgetGroups.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,19 +56,19 @@
5656
</template>
5757

5858
<script lang="ts" setup>
59+
import BudgetGroup from './BudgetGroup.vue';
5960
import Button from '@components/base/button/Button.vue';
6061
import Currency from '@components/base/currency/Currency.vue';
6162
import { ReorderEvent } from '@components/base/draggable/Draggable.types';
6263
import Draggable from '@components/base/draggable/Draggable.vue';
6364
import { DraggableStore } from '@components/base/draggable/store';
6465
import { useMonthNames } from '@composables';
6566
import { RiAddCircleLine, RiSkipDownLine } from '@remixicon/vue';
67+
import { useSettingsStore } from '@store/settings';
6668
import { useDataStore } from '@store/state';
6769
import { computed } from 'vue';
6870
import { useI18n } from 'vue-i18n';
69-
import BudgetGroup from './BudgetGroup.vue';
7071
import type { Component } from 'vue';
71-
import { useSettingsStore } from '@store/settings';
7272
7373
const props = defineProps<{
7474
type: 'expenses' | 'income';

src/app/components/feature/BudgetPane.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
</template>
1212

1313
<script lang="ts" setup>
14-
import { useDataStore } from '@store/state';
15-
import { totals } from '@store/state/utils/budgets';
16-
import { computed } from 'vue';
1714
import BudgetGroups from './BudgetGroups.vue';
1815
import Pane from './Pane.vue';
1916
import MiniChart from './mini-chart/MiniChart.vue';
17+
import { useDataStore } from '@store/state';
18+
import { totals } from '@store/state/utils/budgets';
19+
import { computed } from 'vue';
2020
2121
const props = defineProps<{
2222
title?: string;

src/app/components/feature/mini-chart/MiniChart.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<script lang="ts" setup>
66
import EChart from '@components/charts/echart/EChart.vue';
77
import { ClassNames } from '@utils';
8-
import { GridComponentOption, GridComponent } from 'echarts/components';
98
import { LineChart, LineSeriesOption } from 'echarts/charts';
9+
import { GridComponentOption, GridComponent } from 'echarts/components';
1010
import * as echarts from 'echarts/core';
1111
import { SVGRenderer } from 'echarts/renderers';
1212
import { computed } from 'vue';

src/app/pages/Frame.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,20 @@
4242
</template>
4343

4444
<script lang="ts" setup>
45+
import AdminButton from './navigation/admin/AdminButton.vue';
46+
import CloudButton from './navigation/auth/CloudButton.vue';
47+
import InfoButton from './navigation/info/InfoButton.vue';
48+
import SettingsButton from './navigation/settings/SettingsButton.vue';
49+
import ThemeButton from './navigation/theme/ThemeButton.vue';
50+
import ToolsButton from './navigation/tools/ToolsButton.vue';
51+
import ChangeYearButton from './navigation/year/ChangeYearButton.vue';
4552
import Link from '@components/base/link/Link.vue';
4653
import ComponentTransition from '@components/misc/component-transition/ComponentTransition.vue';
4754
import { useMediaQuery } from '@composables';
4855
import { RiDonutChartLine, RiHandCoinLine, RiShoppingBagLine } from '@remixicon/vue';
4956
import { useStorage } from '@storage/index';
5057
import { computed, ref } from 'vue';
5158
import { useI18n } from 'vue-i18n';
52-
import AdminButton from './navigation/admin/AdminButton.vue';
53-
import CloudButton from './navigation/auth/CloudButton.vue';
54-
import InfoButton from './navigation/info/InfoButton.vue';
55-
import ThemeButton from './navigation/theme/ThemeButton.vue';
56-
import ToolsButton from './navigation/tools/ToolsButton.vue';
57-
import ChangeYearButton from './navigation/year/ChangeYearButton.vue';
58-
import SettingsButton from './navigation/settings/SettingsButton.vue';
5959
import type { Component } from 'vue';
6060
6161
const menu = ref<HTMLDivElement>();

0 commit comments

Comments
 (0)