Merge pull request #3346 from Thorium-Sim/develop

Release

.github/workflows/deploy.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Install Node.js, NPM and Yarn
         uses: actions/setup-node@v1
         with:
-          node-version: 14
+          node-version: 16
       - name: Cache node modules
         uses: actions/cache@v1
         env:
@@ -29,7 +29,8 @@ jobs:
             ${{ runner.os }}-build-${{ env.cache-name }}-
             ${{ runner.os }}-build-
             ${{ runner.os }}-
-
+      - name: Install libs
+        run: sudo apt-get install libudev-dev
       - name: Install Dependencies
         run: yarn
 
@@ -57,7 +58,7 @@ jobs:
       - name: Install Node.js, NPM and Yarn
         uses: actions/setup-node@v1
         with:
-          node-version: 14
+          node-version: 16
       - uses: actions/setup-python@v4
         if: startsWith(matrix.os, 'macos')
         with:

.github/workflows/test.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Install Node.js, NPM and Yarn
         uses: actions/setup-node@v1
         with:
-          node-version: 14
+          node-version: 16
       - name: Cache node modules
         uses: actions/cache@v1
         env:
@@ -26,7 +26,8 @@ jobs:
             ${{ runner.os }}-build-${{ env.cache-name }}-
             ${{ runner.os }}-build-
             ${{ runner.os }}-
-
+      - name: Install libs
+        run: sudo apt-get install libudev-dev
       - name: Install Dependencies
         run: yarn
       - name: TypeScript Check

.nvmrc

@@ -1 +1 @@
-14
+16

.tool-versions

@@ -0,0 +1,2 @@
+nodejs 16.20.2
+yarn 1.22.22

package.json

@@ -27,7 +27,7 @@
     "start:client": "react-app-rewired start",
     "start:server": "ts-node-dev --project server/tsconfig.json server/index.ts",
     "watch:electron": "wait-on http://localhost:3000 && electron .",
-    "start:electron": "BROWSER=none npm-run-all --parallel -l start:client watch:server watch:electron",
+    "start:electron": "BROWSER=none npm-run-all --parallel -l start:client start:server watch:electron",
     "build": "cross-env NODE_ENV=production npm-run-all build:*",
     "build:client": "react-app-rewired --max_old_space_size=4096 build",
     "build:server": "tsc -p server",
@@ -242,6 +242,7 @@
     "react-use-gesture": "^7.0.4",
     "request": "^2.88.0",
     "rng": "^0.2.2",
+    "sass": "^1.77.2",
     "simplex-noise": "^2.4.0",
     "subscriptions-transport-ws": "^0.9.16",
     "three": "^0.116.1",
@@ -312,11 +313,11 @@
     "babel-preset-react": "^6.24.1",
     "babel-preset-react-app": "^9.0.2",
     "bodymovin": "^4.13.0",
-    "bootstrap": "^4.3.1",
-    "canvas": "^2.6.0",
+    "bootstrap": "^4.6.0",
+    "canvas": "^2.11.2",
     "centered-pan-zoom": "^2.0.0",
     "cross-env": "^7.0.0",
-    "electron": "^9.0.4",
+    "electron": "^11.0.0",
     "electron-builder": "23.0.2",
     "electron-builder-notarize": "^1.1.2",
     "electron-notarize": "^1.0.0",
@@ -332,7 +333,6 @@
     "lint-staged": "^10.2.4",
     "match-sorter": "^4.0.2",
     "midimessage": "^1.0.5",
-    "node-sass": "^4.12.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.0.5",
     "rc-menu": "^8.0.0-alpha.1",
@@ -385,6 +385,8 @@
     "param-case": "3.0.3",
     "@babel/preset-env": "^7.8.7"
   },
-  "volta": { "node": "14.21.3" },
+  "volta": {
+    "node": "16.20.2"
+  },
   "packageManager": "yarn@1.22.1"
 }

public/electron/helpers/multiWindow.js

@@ -37,8 +37,9 @@ function addWindow({main, x, y, loadedUrl, server}) {
     kiosk: false,
     webPreferences: {
       contextIsolation: true,
-      nodeIntegration: false,
+      nodeIntegration: true,
       sandbox: true,
+      enableRemoteModule: true
     },
   };
   if (server) {

server/bootstrap/apollo.ts

@@ -118,7 +118,7 @@ function responseForOperation(requestContext) {
       opName,
       requestContext.context,
     );
-    timeout = setTimeout(() => resolve({error: "fail"}), 500);
+    timeout = setTimeout(() => { resolve({ error: "fail", data: {} }) }, 500);
   });
 }