Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

runfix: Change preload dir #6677

Merged
merged 1 commit into from
May 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions electron/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ const APP_PATH = path.join(app.getAppPath(), config.electronDirectory);
const INDEX_HTML = path.join(APP_PATH, 'renderer/index.html');
const LOG_DIR = path.join(app.getPath('userData'), 'logs');
const LOG_FILE = path.join(LOG_DIR, 'electron.log');
const PRELOAD_JS = path.join(APP_PATH, 'dist/preload/preload-app.js');
const PRELOAD_RENDERER_JS = path.join(APP_PATH, 'dist/preload/preload-webview.js');
const PRELOAD_JS = path.join(APP_PATH, 'dist/electron/src/preload/preload-app.js');
const PRELOAD_RENDERER_JS = path.join(APP_PATH, 'dist/electron/src/preload/preload-webview.js');
const WRAPPER_CSS = path.join(APP_PATH, 'css/wrapper.css');
const WINDOW_SIZE = {
DEFAULT_HEIGHT: 768,
Expand Down
2 changes: 1 addition & 1 deletion electron/src/window/AboutWindow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const ABOUT_WINDOW_ALLOWLIST = [
pathToFileURL(path.join(APP_PATH, 'img/logo.256.png')).href,
pathToFileURL(path.join(APP_PATH, 'css/about.css')).href,
];
const PRELOAD_JS = path.join(APP_PATH, 'dist/preload/menu/preload-about.js');
const PRELOAD_JS = path.join(APP_PATH, 'dist/electron/src/preload/menu/preload-about.js');

const WINDOW_SIZE = {
HEIGHT: 256,
Expand Down
2 changes: 1 addition & 1 deletion electron/src/window/ProxyPromptWindow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const appPath = path.join(app.getAppPath(), config.electronDirectory);

const promptHtmlPath = pathToFileURL(path.join(appPath, 'html/proxy-prompt.html')).href;
const proxyPromptWindowAllowList = [promptHtmlPath, pathToFileURL(path.join(appPath, 'css/proxy-prompt.css'))];
const preloadPath = path.join(appPath, 'dist/preload/menu/preload-proxy-prompt.js');
const preloadPath = path.join(appPath, 'dist/electron/src/preload/menu/preload-proxy-prompt.js');

const windowSize = {
HEIGHT: 350,
Expand Down
Loading