Merge pull request #21 from nrkno/chore/update-electron

Author: jstarpl

.github/workflows/create-release.yaml

@@ -27,10 +27,10 @@ jobs:
     needs: create-release
     steps:
       - uses: actions/checkout@v4
-      - name: Use Node.js 20
+      - name: Use Node.js 22
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
       - name: restore node_modules
         uses: actions/cache@v4
         with:
@@ -39,6 +39,7 @@ jobs:
           key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
       - name: Prepare Environment
         run: |
+          corepack enable
           yarn --ignore-engines --frozen-lockfile --network-timeout 1000000
       - name: Build
         run: |
@@ -56,10 +57,10 @@ jobs:
     needs: create-release
     steps:
       - uses: actions/checkout@v4
-      - name: Use Node.js 20
+      - name: Use Node.js 22
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
       - name: Install Snapcraft
         uses: samuelmeuli/action-snapcraft@v3
       - name: restore node_modules

.github/workflows/node.yaml

@@ -18,10 +18,10 @@ jobs:
         uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - name: Use Node.js 20.x
+      - name: Use Node.js 22.x
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
       - name: restore node_modules
         uses: actions/cache@v4
         with:
@@ -30,7 +30,8 @@ jobs:
           key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
       - name: Prepare Environment
         run: |
-          yarn install
+          corepack enable
+          yarn
       - name: Run typecheck
         run: |
           yarn build

.gitignore

@@ -1,3 +1,12 @@
 node_modules
 dist
 config.json
+
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/version
+

.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 All notable changes to this project will be documented in this file. See [Convential Commits](https://www.conventionalcommits.org/en/v1.0.0/#specification) for commit guidelines.
 
+## [0.4.1](https://github.com/nrkno/sofie-chef/compare/v0.4.0...v0.4.1) (Fri Jan 24 2025)
+
+
 ## [0.4.0](https://github.com/nrkno/sofie-chef/compare/v0.3.5...v0.4.0) (Thu Aug 08 2024)
 
 

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sofie-chef",
-	"version": "0.4.0",
+	"version": "0.4.1",
 	"description": "Sofie Chef - Disrupting the industry & stirring pots",
 	"author": {
 		"name": "NRK"
@@ -10,12 +10,13 @@
 		"build": "tsc",
 		"watch:build": "tsc -w",
 		"watch:electron": "nodemon --exec npm start",
-		"lint": "eslint . --ext .js,.jsx,.ts,.tsx",
+		"lint": "run -T g:eslint . --ext .js,.jsx,.ts,.tsx",
 		"start": "electron ./dist/main.js",
 		"build:binary": "electron-builder",
 		"dev": "yarn && yarn build && concurrently --kill-others \"yarn watch:build\" \"yarn watch:electron\"",
 		"release:release": "sofie-version",
-		"release": "yarn release:release"
+		"release": "yarn release:release",
+		"g:eslint": "cd $INIT_CWD && \"$PROJECT_CWD/node_modules/.bin/eslint\""
 	},
 	"repository": "https://github.com/nrkno/sofie-chef",
 	"homepage": "https://github.com/nrkno/sofie-chef#readme",
@@ -35,22 +36,23 @@
 		"@types/koa-bodyparser": "^4.3.10",
 		"@types/koa-router": "^7.4.5",
 		"@types/koa__cors": "^4.0.3",
+		"@types/node": "22.15.19",
 		"@types/underscore": "^1.11.9",
 		"@types/url-join": "^4.0.1",
 		"@types/ws": "^8.5.6",
-		"concurrently": "^8.2.1",
-		"electron": "^31.0.0",
-		"electron-builder": "^24.6.4",
+		"concurrently": "^9.1.2",
+		"electron": "^36.2.1",
+		"electron-builder": "^26.0.15",
 		"jest": "^29.7.0",
 		"nodemon": "^3.0.1",
 		"typescript": "~4.9"
 	},
 	"dependencies": {
-		"@koa/cors": "^4.0.0",
-		"chokidar": "^3.5.3",
+		"@koa/cors": "^5.0.0",
+		"chokidar": "^4.0.3",
 		"koa": "^2.14.2",
 		"koa-bodyparser": "^4.4.1",
-		"koa-router": "^12.0.0",
+		"koa-router": "^13.0.1",
 		"underscore": "^1.13.6",
 		"url-join": "^4.0.1",
 		"winston": "^3.10.0",
@@ -96,5 +98,6 @@
 			"dist/**/*",
 			"static/**/*"
 		]
-	}
+	},
+	"packageManager": "yarn@3.6.3+sha512.d432ab8b22b89cb8b46649ebaf196159b0c1870904224771d75fdf8b55490aaa5de4d9f028deb0425f1513bff7843e97b9d117103795a23b12d2e7c1cedcf50f"
 }

src/helpers/APIHelper.ts

@@ -89,7 +89,7 @@ export class APIHelper {
 			}
 		})
 
-		router.all('(.*)', async (ctx, next) => {
+		router.all(/.*/, async (ctx, next) => {
 			// Intercept and authenticate:
 			const requestApiKey: string | undefined =
 				firstInArray(ctx.request.query?.apiKey) || // Querystring parameter