Skip to content

Commit ceb8efa

Browse files
committed
refactor: clean up some import paths
1 parent 6ff732a commit ceb8efa

File tree

11 files changed

+29
-26
lines changed

11 files changed

+29
-26
lines changed

src/editor/icons-suggestion.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import {
77
it,
88
vi,
99
} from 'vitest';
10-
import icon from '../lib/icon';
11-
import * as iconPackManager from '../icon-pack-manager';
12-
import * as util from '../util';
10+
import icon from '@lib/icon';
11+
import * as iconPackManager from '@app/icon-pack-manager';
12+
import * as util from '@app/util';
1313
import SuggestionIcon from './icons-suggestion';
1414

1515
vi.mock('obsidian', () => ({

src/editor/icons-suggestion.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import {
66
EditorSuggestContext,
77
EditorSuggestTriggerInfo,
88
} from 'obsidian';
9-
import { getAllLoadedIconNames } from '../icon-pack-manager';
10-
import icon from '../lib/icon';
11-
import emoji from '../emoji';
9+
import { getAllLoadedIconNames } from '@app/icon-pack-manager';
10+
import icon from '@app/lib/icon';
11+
import emoji from '@app/emoji';
1212
import { saveIconToIconPack } from '@app/util';
1313
import IconizePlugin from '@app/main';
1414

src/editor/live-preview/decorations/build-link-decorations.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { MarkdownView, editorInfoField } from 'obsidian';
44
import { RangeSetBuilder } from '@codemirror/state';
55
import { syntaxTree, tokenClassNodeProp } from '@codemirror/language';
66
import icon from '@lib/icon';
7-
import { IconInLinkWidget } from '../widgets';
7+
import { IconInLinkWidget } from '@app/editor/live-preview/widgets';
88
import { HeaderToken } from '@app/lib/util/text';
99

1010
export const buildLinkDecorations = (

src/lib/custom-rule.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { vi, it, describe, beforeEach, expect, MockInstance } from 'vitest';
22
import { Plugin, TAbstractFile } from 'obsidian';
3+
import { CustomRule } from '@app/settings/data';
4+
import config from '@app/config';
35
import dom from './util/dom';
4-
import { CustomRule } from '../settings/data';
56
import customRule, { CustomRuleFileType } from './custom-rule';
6-
import config from '../config';
77

88
describe('doesMatchFileType', () => {
99
let rule: CustomRule;

src/lib/custom-rule.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { Plugin, TAbstractFile } from 'obsidian';
2-
import IconizePlugin from '../main';
3-
import { CustomRule } from '../settings/data';
4-
import dom from './util/dom';
5-
import { getFileItemTitleEl } from '../util';
6-
import config from '../config';
7-
import { FileItem } from '../@types/obsidian';
2+
import IconizePlugin from '@app/main';
3+
import { CustomRule } from '@app/settings/data';
4+
import { getFileItemTitleEl } from '@app/util';
5+
import config from '@app/config';
6+
import { FileItem } from '@app/@types/obsidian';
87
import { IconCache } from './icon-cache';
8+
import dom from './util/dom';
99

1010
export type CustomRuleFileType = 'file' | 'folder';
1111

src/lib/util/dom.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { beforeEach, it, expect, describe, vi, MockInstance } from 'vitest';
2-
import * as iconPackManager from '../../icon-pack-manager';
2+
import * as iconPackManager from '@app/icon-pack-manager';
33
import dom from './dom';
44
import svg from './svg';
55
import style from './style';

src/lib/util/style.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
it,
88
vi,
99
} from 'vitest';
10-
import * as util from '../../util';
10+
import * as util from '@app/util';
1111
import svg from './svg';
1212
import style from './style';
1313

src/lib/util/style.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
// only include utility functions for setting styles for nodes or icons. The only
33
// dependency is the `svg` library.
44

5-
import emoji from '../../emoji';
6-
import IconizePlugin from '../../main';
5+
import emoji from '@app/emoji';
6+
import IconizePlugin from '@app/main';
7+
import { getFileItemTitleEl } from '@app/util';
78
import svg from './svg';
8-
import { getFileItemTitleEl } from '../../util';
99

1010
interface Margin {
1111
top: number;

src/settings/ui/customIconRule.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ import {
2020
import { CustomRule } from '../data';
2121
import customRule from '@lib/custom-rule';
2222
import iconTabs from '@lib/icon-tabs';
23-
import dom from '../../lib/util/dom';
24-
import svg from '../../lib/util/svg';
25-
import { getNormalizedName } from '../../icon-pack-manager';
26-
import { TabHeaderLeaf } from '../../@types/obsidian';
23+
import dom from '@lib/util/dom';
24+
import svg from '@lib/util/svg';
25+
import { getNormalizedName } from '@app/icon-pack-manager';
26+
import { TabHeaderLeaf } from '@app/@types/obsidian';
2727
import emoji from '@app/emoji';
2828

2929
export default class CustomIconRuleSetting extends IconFolderSetting {

src/settings/ui/toggleIconInTabs.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Setting } from 'obsidian';
22
import iconTabs from '@lib/icon-tabs';
3+
import { TabHeaderLeaf } from '@app/@types/obsidian';
34
import IconFolderSetting from './iconFolderSetting';
4-
import { TabHeaderLeaf } from '../../@types/obsidian';
55

66
export default class ToggleIconInTabs extends IconFolderSetting {
77
public display(): void {

0 commit comments

Comments
 (0)