Skip to content

Commit b8b5eaf

Browse files
committed
fix(build): Changes to fix linux AppImage build and dependency upgrades.
1 parent 8f331da commit b8b5eaf

File tree

8 files changed

+31878
-2856
lines changed

8 files changed

+31878
-2856
lines changed

.vscode/tasks.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
{
55
"isBackground": true,
66
"type": "npm",
7-
"script": "build:react",
7+
"script": "dev:react",
88
"label": "Run:vite-dev-server",
99
},
1010
{
1111
"isBackground": true,
1212
"type": "npm",
13-
"script": "build:electron",
13+
"script": "dev:electron",
1414
"label": "Run:electron-watcher",
1515
}
1616
]

electron/main.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { ARK_FOLDER_PATH } from "./utils/constants";
99

1010
(async function main() {
1111
try {
12-
app.allowRendererProcessReuse = true;
1312

1413
await app.whenReady();
1514

@@ -33,11 +32,11 @@ import { ARK_FOLDER_PATH } from "./utils/constants";
3332
});
3433

3534
if (process.env.ARK_ENABLE_DEV_TOOLS && process.env.ARK_DEV_TOOLS_PATH)
36-
await enableDevTools(process.env.ARK_DEV_TOOLS_PATH);
35+
await enableDevTools(window, process.env.ARK_DEV_TOOLS_PATH);
3736

3837
const loadURL =
3938
process.env.ARK_ENTRY_URL ||
40-
`file://${path.join(__dirname, "../index.html")}`;
39+
`file://${path.join(__dirname, "../../index.html")}`;
4140

4241
await window.loadURL(loadURL);
4342
} catch (e) {

electron/modules/ipc.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ function IPC() {
350350

351351
const { fullpath } = storedScript;
352352

353-
await fs.promises.writeFile(fullpath, code);
353+
await fs.promises.writeFile(fullpath, code || '');
354354

355355
return storedScript;
356356
} else if (data.action === "save_as") {
@@ -366,7 +366,7 @@ function IPC() {
366366
: 'untitled-ark-script.js'
367367
);
368368

369-
await fs.promises.writeFile(fullpath, code);
369+
await fs.promises.writeFile(fullpath, code || '');
370370

371371

372372
const id = nanoid();

electron/modules/window.ts

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ function createWindow(
77
) {
88
const window = new BrowserWindow(windowOptions);
99
window.removeMenu();
10-
window.webContents.openDevTools();
1110
return window;
1211
}
1312

electron/utils/dev.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
import { session } from "electron";
1+
import { session, BrowserWindow } from "electron";
22
import path from "path";
33
import os from "os";
44

5-
export const enableDevTools = async (extensionPath: string): Promise<void> => {
5+
export const enableDevTools = async (window: BrowserWindow, extensionPath: string): Promise<void> => {
66
const reactDevToolsPath = path.join(os.homedir(), extensionPath);
77

88
await session.defaultSession.loadExtension(reactDevToolsPath);
9+
10+
window.webContents.openDevTools();
911
};

0 commit comments

Comments
 (0)