From f7e8d2cc222d84ec3b8bb7d42896cd9522c8b108 Mon Sep 17 00:00:00 2001 From: tiddlygit-test Date: Sat, 23 Jan 2021 19:39:40 +0800 Subject: [PATCH] refactor: move preload/ out of /services --- src/{services => }/preload/common/authing-postmessage.ts | 2 +- src/{services => }/preload/common/i18n.ts | 2 +- src/{services => }/preload/common/require-nodejs.ts | 0 src/{services => }/preload/common/services.ts | 0 src/{services => }/preload/common/simple-context-menu.ts | 0 src/{services => }/preload/index.ts | 0 src/{services => }/preload/view.ts | 4 ++-- src/{services => }/preload/wiki-git-api.ts | 0 src/{services => }/preload/wiki-operation.ts | 0 9 files changed, 4 insertions(+), 4 deletions(-) rename src/{services => }/preload/common/authing-postmessage.ts (94%) rename src/{services => }/preload/common/i18n.ts (75%) rename src/{services => }/preload/common/require-nodejs.ts (100%) rename src/{services => }/preload/common/services.ts (100%) rename src/{services => }/preload/common/simple-context-menu.ts (100%) rename src/{services => }/preload/index.ts (100%) rename src/{services => }/preload/view.ts (98%) rename src/{services => }/preload/wiki-git-api.ts (100%) rename src/{services => }/preload/wiki-operation.ts (100%) diff --git a/src/services/preload/common/authing-postmessage.ts b/src/preload/common/authing-postmessage.ts similarity index 94% rename from src/services/preload/common/authing-postmessage.ts rename to src/preload/common/authing-postmessage.ts index 4d831615..e99db5ee 100644 --- a/src/services/preload/common/authing-postmessage.ts +++ b/src/preload/common/authing-postmessage.ts @@ -2,7 +2,7 @@ import { remote } from 'electron'; // on production build, if we try to redirect to http://localhost:3000 , we will reach chrome-error://chromewebdata/ , but we can easily get back // this happens when we are redirected by OAuth login -import { CHROME_ERROR_PATH, REACT_PATH } from '../../constants/paths'; +import { CHROME_ERROR_PATH, REACT_PATH } from '@services/constants/paths'; const CHECK_LOADED_INTERVAL = 500; function refresh() { diff --git a/src/services/preload/common/i18n.ts b/src/preload/common/i18n.ts similarity index 75% rename from src/services/preload/common/i18n.ts rename to src/preload/common/i18n.ts index 06b2d0e0..566d3e65 100644 --- a/src/services/preload/common/i18n.ts +++ b/src/preload/common/i18n.ts @@ -1,5 +1,5 @@ import { contextBridge, ipcRenderer } from 'electron'; -import { preloadBindings } from '../../libs/i18n/i18next-electron-fs-backend'; +import { preloadBindings } from '@/services/libs/i18n/i18next-electron-fs-backend'; contextBridge.exposeInMainWorld('i18n', { i18nextElectronBackend: preloadBindings(ipcRenderer), diff --git a/src/services/preload/common/require-nodejs.ts b/src/preload/common/require-nodejs.ts similarity index 100% rename from src/services/preload/common/require-nodejs.ts rename to src/preload/common/require-nodejs.ts diff --git a/src/services/preload/common/services.ts b/src/preload/common/services.ts similarity index 100% rename from src/services/preload/common/services.ts rename to src/preload/common/services.ts diff --git a/src/services/preload/common/simple-context-menu.ts b/src/preload/common/simple-context-menu.ts similarity index 100% rename from src/services/preload/common/simple-context-menu.ts rename to src/preload/common/simple-context-menu.ts diff --git a/src/services/preload/index.ts b/src/preload/index.ts similarity index 100% rename from src/services/preload/index.ts rename to src/preload/index.ts diff --git a/src/services/preload/view.ts b/src/preload/view.ts similarity index 98% rename from src/services/preload/view.ts rename to src/preload/view.ts index ff5e797f..8b3d8000 100644 --- a/src/services/preload/view.ts +++ b/src/preload/view.ts @@ -1,7 +1,7 @@ import { ipcRenderer, remote, webFrame } from 'electron'; import { enable as enableDarkMode, disable as disableDarkMode } from 'darkreader'; -import ContextMenuBuilder from '../libs/context-menu-builder'; -import i18next from '../libs/i18n'; +import ContextMenuBuilder from '@services/libs/context-menu-builder'; +import i18next from '@services/libs/i18n'; import './wiki-operation'; import './wiki-git-api'; diff --git a/src/services/preload/wiki-git-api.ts b/src/preload/wiki-git-api.ts similarity index 100% rename from src/services/preload/wiki-git-api.ts rename to src/preload/wiki-git-api.ts diff --git a/src/services/preload/wiki-operation.ts b/src/preload/wiki-operation.ts similarity index 100% rename from src/services/preload/wiki-operation.ts rename to src/preload/wiki-operation.ts