Skip to content

Commit

Permalink
refactor: add alias for paths
Browse files Browse the repository at this point in the history
  • Loading branch information
FlorianWoelki committed Mar 18, 2023
1 parent 8ef5aa9 commit d6d1ac0
Show file tree
Hide file tree
Showing 16 changed files with 60 additions and 28 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"devDependencies": {
"@commitlint/cli": "^13.2.1",
"@commitlint/config-conventional": "^13.2.0",
"@rollup/plugin-alias": "^4.0.3",
"@rollup/plugin-commonjs": "^18.1.0",
"@rollup/plugin-node-resolve": "^11.2.1",
"@rollup/plugin-typescript": "^8.5.0",
Expand Down
20 changes: 20 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import typescript from '@rollup/plugin-typescript';
import { nodeResolve } from '@rollup/plugin-node-resolve';
import commonjs from '@rollup/plugin-commonjs';
import alias from '@rollup/plugin-alias';
import copyFile from './copy-file';
import { obsidianExportPath } from './env';

Expand All @@ -24,6 +25,12 @@ export default {
},
external: ['obsidian'],
plugins: [
alias({
entries: {
'@app': 'src',
'@lib': 'src/lib',
},
}),
typescript(),
nodeResolve({ browser: true }),
commonjs(),
Expand Down
2 changes: 1 addition & 1 deletion src/@types/internalPluginInjector.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { TAbstractFile, View, WorkspaceLeaf } from 'obsidian';
import IconFolderPlugin from '../main';
import IconFolderPlugin from '@app/main';

interface FileExplorerWorkspaceLeaf extends WorkspaceLeaf {
containerEl: HTMLElement;
Expand Down
12 changes: 6 additions & 6 deletions src/internal-plugins/starred.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { around } from 'monkey-around';
import { View } from 'obsidian';
import InternalPluginInjector from '../@types/internalPluginInjector';
import { StarredFile } from '../@types/obsidian';
import dom from '../lib/util/dom';
import icon from '../lib/icon';
import IconFolderPlugin from '../main';
import MetaData from '../MetaData';
import InternalPluginInjector from '@app/@types/internalPluginInjector';
import { StarredFile } from '@app/@types/obsidian';
import dom from '@lib/util/dom';
import icon from '@lib/icon';
import IconFolderPlugin from '@app/main';
import MetaData from '@app/MetaData';

interface StarredView extends View {
itemLookup: WeakMap<Element, StarredFile>;
Expand Down
8 changes: 4 additions & 4 deletions src/settings/ui/customIconPack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import {
getIconPack,
getPath,
normalizeFileName,
} from '../../iconPackManager';
import IconFolderPlugin from '../../main';
import { readFileSync } from '../../util';
import dom from '../../lib/util/dom';
} from '@app/iconPackManager';
import IconFolderPlugin from '@app/main';
import { readFileSync } from '@app/util';
import dom from '@lib/util/dom';

export default class CustomIconPackSetting extends IconFolderSetting {
private textComponent: TextComponent;
Expand Down
10 changes: 5 additions & 5 deletions src/settings/ui/customIconRule.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { App, Notice, Setting, TextComponent, ColorComponent, ButtonComponent, Modal } from 'obsidian';
import IconFolderSetting from './iconFolderSetting';
import IconsPickerModal from '../../iconsPickerModal';
import IconFolderPlugin from '../../main';
import { getAllOpenedFiles } from '../../util';
import IconsPickerModal from '@app/iconsPickerModal';
import IconFolderPlugin from '@app/main';
import { getAllOpenedFiles } from '@app/util';
import { CustomRule } from '../data';
import customRule from '../../lib/customRule';
import iconTabs from '../../lib/iconTabs';
import customRule from '@lib/customRule';
import iconTabs from '@lib/iconTabs';

export default class CustomIconRuleSetting extends IconFolderSetting {
private app: App;
Expand Down
8 changes: 4 additions & 4 deletions src/settings/ui/emojiStyle.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Setting } from 'obsidian';
import emoji from '../../emoji';
import customRule from '../../lib/customRule';
import dom from '../../lib/util/dom';
import { FolderIconObject } from '../../main';
import emoji from '@app/emoji';
import customRule from '@lib/customRule';
import dom from '@lib/util/dom';
import { FolderIconObject } from '@app/main';
import IconFolderSetting from './iconFolderSetting';

export default class EmojiStyleSetting extends IconFolderSetting {
Expand Down
2 changes: 1 addition & 1 deletion src/settings/ui/extraMargin.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { DropdownComponent, Setting, SliderComponent } from 'obsidian';
import IconFolderSetting from './iconFolderSetting';
import { ExtraMarginSettings } from '../data';
import style from '../../lib/util/style';
import style from '@lib/util/style';

export default class ExtraMarginSetting extends IconFolderSetting {
public display(): void {
Expand Down
2 changes: 1 addition & 1 deletion src/settings/ui/iconColor.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Setting, ColorComponent } from 'obsidian';
import IconFolderSetting from './iconFolderSetting';
import style from '../../lib/util/style';
import style from '@lib/util/style';

export default class IconColorSetting extends IconFolderSetting {
public display(): void {
Expand Down
2 changes: 1 addition & 1 deletion src/settings/ui/iconFolderSetting.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import IconFolderPlugin from '../../main';
import IconFolderPlugin from '@app/main';

export default abstract class IconFolderSetting {
protected plugin: IconFolderPlugin;
Expand Down
2 changes: 1 addition & 1 deletion src/settings/ui/iconFontSize.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Setting } from 'obsidian';
import IconFolderSetting from './iconFolderSetting';
import { DEFAULT_SETTINGS } from '../data';
import style from '../../lib/util/style';
import style from '@lib/util/style';

export default class IconFontSizeSetting extends IconFolderSetting {
public display(): void {
Expand Down
2 changes: 1 addition & 1 deletion src/settings/ui/iconPacksPath.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Notice, Setting, TextComponent } from 'obsidian';
import IconFolderSetting from './iconFolderSetting';
import { createDefaultDirectory, moveIconPackDirectories, setPath } from '../../iconPackManager';
import { createDefaultDirectory, moveIconPackDirectories, setPath } from '@app/iconPackManager';

export default class IconPacksPathSetting extends IconFolderSetting {
private iconPacksSettingTextComp: TextComponent;
Expand Down
4 changes: 2 additions & 2 deletions src/settings/ui/predefinedIconPacks.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { App, Setting } from 'obsidian';
import IconFolderSetting from './iconFolderSetting';
import IconPackBrowserModal from '../../iconPackBrowserModal';
import IconFolderPlugin from '../../main';
import IconPackBrowserModal from '@app/iconPackBrowserModal';
import IconFolderPlugin from '@app/main';

export default class PredefinedIconPacksSetting extends IconFolderSetting {
private app: App;
Expand Down
2 changes: 1 addition & 1 deletion src/settings/ui/toggleIconInTabs.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Setting } from 'obsidian';
import iconTabs from '../../lib/iconTabs';
import iconTabs from '@lib/iconTabs';
import IconFolderSetting from './iconFolderSetting';

export default class ToggleIconInTabs extends IconFolderSetting {
Expand Down
4 changes: 4 additions & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{
"compilerOptions": {
"baseUrl": ".",
"paths": {
"@app/*": ["src/*"],
"@lib/*": ["src/lib/*"]
},
"inlineSourceMap": true,
"inlineSources": true,
"allowSyntheticDefaultImports": true,
Expand Down

0 comments on commit d6d1ac0

Please sign in to comment.