Merge branch 'bump'

.github/workflows/docusaurus.yml

@@ -34,7 +34,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version: "16"
+          node-version: 18
           cache: npm
       - name: Setup Pages
         id: pages

.github/workflows/electron-build.yml

@@ -14,7 +14,8 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
+          cache: npm
       - run: npm install
       - if: matrix.os == 'windows-latest'
         uses: microsoft/setup-msbuild@v1.1

.github/workflows/electron-test-build.yml

@@ -24,8 +24,9 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
-      - run: npm install
+          node-version: 18
+          cache: npm
+      - run: npm install    
       - if: matrix.os == 'windows-latest'
         uses: microsoft/setup-msbuild@v1.1
       - run: npm run make

.vscode/launch.json

@@ -5,13 +5,18 @@
 	"version": "0.2.0",
 	"configurations": [
 		{
-			"command": "npm start",
 			"name": "Run npm start",
+			"type": "node",
 			"request": "launch",
-			"type": "node-terminal",
+			"cwd": "${workspaceRoot}",
+			"runtimeExecutable": "npm",
+			"runtimeArgs": [
+					"run-script", "start"
+			],
 			"env": {
         "DEV_MODE": "true"
-      }
+      },
+			"console": "integratedTerminal",
 		}
 	]
 }

forge.config.ts

@@ -0,0 +1,63 @@
+import type { ForgeConfig } from '@electron-forge/shared-types'
+import { MakerSquirrel } from '@electron-forge/maker-squirrel'
+import { MakerZIP } from '@electron-forge/maker-zip'
+import { MakerDeb } from '@electron-forge/maker-deb'
+import { WebpackPlugin } from '@electron-forge/plugin-webpack'
+
+import { mainConfig } from './webpack.main.config'
+import { rendererConfig } from './webpack.renderer.config'
+import MakerDMG from '@electron-forge/maker-dmg'
+import PublisherGithub from '@electron-forge/publisher-github'
+
+const config: ForgeConfig = {
+	packagerConfig: {},
+	rebuildConfig: {},
+	makers: [
+		new MakerSquirrel({}),
+		new MakerZIP({}, ['darwin']),
+		new MakerDeb({
+			options: {
+				maintainer: 'James Bithell',
+				homepage: 'https://github.com/Jbithell/ParadisePi',
+				icon: 'icon/favicon.ico',
+				name: 'Paradise Pi',
+			},
+		}),
+		new MakerDMG({
+			icon: 'icon/favicon.ico',
+			name: 'Paradise Pi',
+		}),
+	],
+	publishers: [
+		new PublisherGithub({
+			repository: {
+				owner: 'Paradise-Pi',
+				name: 'ParadisePi',
+			},
+			draft: true,
+		}),
+	],
+	plugins: [
+		new WebpackPlugin({
+			mainConfig,
+			renderer: {
+				config: rendererConfig,
+				nodeIntegration: false,
+				jsonStats: true,
+				entryPoints: [
+					{
+						nodeIntegration: false,
+						html: './src/app/index.html',
+						js: './src/app/app.tsx',
+						name: 'main_window',
+						preload: {
+							js: './src/electron/preload.ts',
+						},
+					},
+				],
+			},
+		}),
+	],
+}
+
+export default config