diff --git a/app/electron.js b/app/electron/main.js similarity index 92% rename from app/electron.js rename to app/electron/main.js index 22bc6c9..a6e4e75 100644 --- a/app/electron.js +++ b/app/electron/main.js @@ -6,12 +6,13 @@ function createWindow() { width: 800, height: 600, webPreferences: { - contextIsolation: true, + contextIsolation: false, + nodeIntegration: true, }, }); if (process.env.NODE_ENV === 'production') { - win.loadFile('./build/index.html'); + win.loadFile('./index.html'); } else { win.loadURL('http://localhost:8080'); } diff --git a/app/electron/package.json b/app/electron/package.json new file mode 100644 index 0000000..a603764 --- /dev/null +++ b/app/electron/package.json @@ -0,0 +1,3 @@ +{ + "main": "main.js" +} \ No newline at end of file diff --git a/app/package-lock.json b/app/package-lock.json index 480611c..a25b2a5 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -272,6 +272,15 @@ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "dev": true }, + "cross-env": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", + "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==", + "dev": true, + "requires": { + "cross-spawn": "^7.0.1" + } + }, "cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", diff --git a/app/package.json b/app/package.json index e605eca..b065d5d 100644 --- a/app/package.json +++ b/app/package.json @@ -1,18 +1,18 @@ { - "main": "electron.js", "scripts": { "start": "snowpack dev", "build": "snowpack build", "snowpack-dev": "snowpack dev --open none", "electron-dev": "concurrently \"npm run snowpack-dev\" \"npm run electron-start\"", - "electron-start": "electron .", - "electron-prod": "cross-env NODE_ENV=production electron ." + "electron-start": "electron ./build", + "electron-prod": "cross-env NODE_ENV=production electron ./build" }, "devDependencies": { "@snowpack/plugin-svelte": "^3.5.2", "@snowpack/plugin-typescript": "^1.2.1", "@tsconfig/svelte": "^1.0.10", "concurrently": "^5.3.0", + "cross-env": "^7.0.3", "electron": "^11.2.3", "snowpack": "^3.0.1", "svelte-preprocess": "^4.6.9", diff --git a/app/public/index.html b/app/public/index.html index b5053cc..72565c8 100644 --- a/app/public/index.html +++ b/app/public/index.html @@ -4,10 +4,10 @@ - +