Merge branch 'dev'

Author: James-Quigley

.github/workflows/electron.yaml

@@ -0,0 +1,110 @@
+name: Electron build
+on:
+  push:
+    tags:
+      - client-*
+jobs:
+  build-linux:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+          cache: 'yarn'
+      - run: 'yarn'
+      - run: yarn build-electron && yarn dist
+        working-directory: ./client
+      - uses: actions/upload-artifact@v3
+        with:
+          name: release-linux
+          path: ./client/release/*/*.snap
+  build-windows:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+          cache: 'yarn'
+      - run: 'yarn'
+      - run: yarn build-electron && yarn dist
+        working-directory: ./client
+        shell: bash
+      - uses: actions/upload-artifact@v3
+        with:
+          name: release-windows
+          path: ./client/release/*/*.exe
+  build-mac:
+    runs-on: macos-latest
+    env:
+      CSC_LINK: ${{ secrets.CSC_LINK }}
+      CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
+      APPLEID: ${{ secrets.APPLEID }}
+      APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
+      APPLETEAMID: ${{ secrets.APPLETEAMID }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+          cache: 'yarn'
+      - run: 'yarn'
+      - run: yarn build-electron && yarn dist
+        working-directory: ./client
+      - uses: actions/upload-artifact@v3
+        with:
+          name: release-mac
+          path: ./client/release/*/*.dmg
+
+  upload:
+    runs-on: ubuntu-latest
+    needs:
+      - build-linux
+      - build-mac
+      - build-windows
+    steps:
+      - uses: actions/download-artifact@v3
+      - run: |
+          mkdir -p build
+          cp release-mac/**/*.dmg build/
+          cp release-linux/**/*.snap build/
+          cp release-windows/**/*.exe build/
+
+          ls build
+      - run: |
+          export TAG=$(echo $GITHUB_REF_NAME | sed 's/client-//')
+          echo "TAG=$TAG" >> $GITHUB_ENV
+      - uses: manleydev/butler-publish-itchio-action@master
+        env:
+          BUTLER_CREDENTIALS: ${{ secrets.BUTLER_CREDENTIALS }}
+          CHANNEL: windows
+          ITCH_GAME: buzzwords
+          ITCH_USER: chuckdries
+          PACKAGE: build-windows
+          VERSION: $TAG
+      - uses: manleydev/butler-publish-itchio-action@master
+        env:
+          BUTLER_CREDENTIALS: ${{ secrets.BUTLER_CREDENTIALS }}
+          CHANNEL: linux
+          ITCH_GAME: buzzwords
+          ITCH_USER: chuckdries
+          PACKAGE: build-linux
+          VERSION: $TAG
+      - uses: manleydev/butler-publish-itchio-action@master
+        env:
+          BUTLER_CREDENTIALS: ${{ secrets.BUTLER_CREDENTIALS }}
+          CHANNEL: osx
+          ITCH_GAME: buzzwords
+          ITCH_USER: chuckdries
+          PACKAGE: build-mac
+          VERSION: $TAG
+      - name: Release
+        uses: fnkr/github-action-ghr@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        env:
+          GHR_COMPRESS: zip
+          GHR_PATH: build/
+          GHR_DELETE: false
+          GHR_REPLACE: false
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

client/electron-builder.json5

@@ -30,12 +30,18 @@
         arch: ["x64"],
       },
       {
-        target: "msi",
-        arch: ["x64"]
-      }
+        target: "nsis",
+        arch: ["x64"],
+      },
     ],
     artifactName: "${productName}_${version}_${arch}.${ext}",
   },
+  nsis: {
+    artifactName: "${productName}_${version}_${arch}_installer.${ext}",
+  },
+  portable: {
+    artifactName: "${productName}_${version}_${arch}_portable.${ext}",
+  },
   // nsis: {
   //   oneClick: false,
   //   perMachine: false,

client/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.1.0",
+  "version": "1.1.1",
   "name": "buzzwords-client",
   "productName": "Buzzwords",
   "author": {
@@ -34,9 +34,6 @@
     "@react-three/postprocessing": "^2.1.2",
     "@reduxjs/toolkit": "^1.7.1",
     "@reecelucas/react-use-hotkeys": "^1.3.1",
-    "@types/react": "^18.0.17",
-    "@types/react-dom": "^18.0.6",
-    "@types/three": "^0.143.0",
     "@use-gesture/react": "^10.0.0-beta.14",
     "axios": "^0.24.0",
     "buzzwords-shared": "1.0.0",
@@ -67,9 +64,9 @@
   },
   "devDependencies": {
     "@types/ramda": "^0.27.60",
-    "@types/react": "^17.0.0",
-    "@types/react-dom": "^17.0.0",
-    "@types/three": "^0.129.1",
+    "@types/react": "^18.0.17",
+    "@types/react-dom": "^18.0.6",
+    "@types/three": "^0.143.0",
     "@types/url-join": "^4.0.1",
     "@types/yup": "^0.29.13",
     "@types/zdog": "^1.1.1",
@@ -93,4 +90,4 @@
     "vite": "^2.3.8",
     "vite-plugin-electron": "^0.8.3"
   }
-}
+}

client/scripts/notarize.js

@@ -1,21 +1,24 @@
 // https://kilianvalkhof.com/2019/electron/notarizing-your-electron-application/
-require('dotenv').config();
-const { notarize } = require('electron-notarize');
+require("dotenv").config();
+const { notarize } = require("electron-notarize");
 
 exports.default = async function notarizing(context) {
-  const { electronPlatformName, appOutDir } = context;  
-  if (electronPlatformName !== 'darwin') {
+  if (!(process.env.CSC_NAME || process.env.CSC_LINK)) {
+    return;
+  }
+  const { electronPlatformName, appOutDir } = context;
+  if (electronPlatformName !== "darwin") {
     return;
   }
 
   const appName = context.packager.appInfo.productFilename;
 
   return await notarize({
-    tool: 'notarytool',
-    appBundleId: 'com.gg.buzzwords.desktop',
+    tool: "notarytool",
+    appBundleId: "com.gg.buzzwords.desktop",
     appPath: `${appOutDir}/${appName}.app`,
     appleId: process.env.APPLEID,
     appleIdPassword: process.env.APPLEIDPASS,
-    teamId:  process.env.APPLETEAMID
+    teamId: process.env.APPLETEAMID,
   });
 };