Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat!: update electron to v34.0.1 #21

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/create-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
node_modules
dist
config.json

.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/version

1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: node-modules
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
23 changes: 13 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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",
Expand All @@ -35,22 +36,23 @@
"@types/koa-bodyparser": "^4.3.10",
"@types/koa-router": "^7.4.5",
"@types/koa__cors": "^4.0.3",
"@types/node": "^20.11.25",
"@types/underscore": "^1.11.9",
"@types/url-join": "^4.0.1",
"@types/ws": "^8.5.6",
"concurrently": "^8.2.1",
"electron": "^31.0.0",
"concurrently": "^9.1.2",
"electron": "^34.0.1",
"electron-builder": "^24.6.4",
"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",
Expand Down Expand Up @@ -96,5 +98,6 @@
"dist/**/*",
"static/**/*"
]
}
}
},
"packageManager": "[email protected]+sha512.d432ab8b22b89cb8b46649ebaf196159b0c1870904224771d75fdf8b55490aaa5de4d9f028deb0425f1513bff7843e97b9d117103795a23b12d2e7c1cedcf50f"
}
2 changes: 1 addition & 1 deletion src/helpers/APIHelper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading