Skip to content

Commit 7920c76

Browse files
JulusianJulusian
authored
Merge pull request Sofie-Automation#1635 from SuperFlyTV/chore/update-dependencies
chore: update many dependencies
2 parents aa62097 + 9bad643 commit 7920c76

File tree

83 files changed

+6213
-6436
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+6213
-6436
lines changed

‎.node-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.20.0
1+
22.22.0

‎meteor/package.json‎

Lines changed: 33 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -28,82 +28,77 @@
2828
"i18n-extract-pot": "node ./scripts/extract-i18next-pot.mjs -f \"{./lib/**/*.+(ts|tsx),./server/**/*.+(ts|tsx),../packages/job-worker/src/**/*.+(ts|tsx),../packages/corelib/src/**/*.+(ts|tsx),../packages/webui/src/**/*.+(ts|tsx)}\" -o i18n/template.pot",
2929
"i18n-compile-json": "node ./scripts/i18n-compile-json.mjs",
3030
"visualize": "meteor --production --extra-packages bundle-visualizer",
31-
"release": "standard-version --commit-all",
31+
"release": "commit-and-tag-version --commit-all",
3232
"prepareChangelog": "run release --prerelease --release-as patch",
3333
"validate:all-dependencies": "run validate:prod-dependencies && run validate:dev-dependencies && run license-validate",
3434
"validate:prod-dependencies": "yarn npm audit --environment production",
3535
"validate:dev-dependencies": "yarn npm audit --environment development --severity moderate"
3636
},
3737
"dependencies": {
38-
"@babel/runtime": "^7.26.7",
38+
"@babel/runtime": "^7.28.6",
3939
"@koa/cors": "^5.0.0",
40-
"@koa/router": "^13.1.0",
40+
"@koa/router": "^15.3.0",
4141
"@mos-connection/helper": "^5.0.0-alpha.0",
42-
"@slack/webhook": "^7.0.4",
42+
"@slack/webhook": "^7.0.6",
4343
"@sofie-automation/blueprints-integration": "portal:../packages/blueprints-integration",
4444
"@sofie-automation/corelib": "portal:../packages/corelib",
4545
"@sofie-automation/job-worker": "portal:../packages/job-worker",
4646
"@sofie-automation/meteor-lib": "portal:../packages/meteor-lib",
4747
"@sofie-automation/shared-lib": "portal:../packages/shared-lib",
48-
"app-root-path": "^3.1.0",
49-
"bcrypt": "^5.1.1",
50-
"body-parser": "^1.20.3",
48+
"bcrypt": "^6.0.0",
49+
"body-parser": "^1.20.4",
5150
"deep-extend": "0.6.0",
5251
"deepmerge": "^4.3.1",
53-
"elastic-apm-node": "^4.11.0",
52+
"elastic-apm-node": "^4.15.0",
5453
"i18next": "^21.10.0",
5554
"indexof": "0.0.1",
56-
"koa": "^2.15.3",
55+
"koa": "^3.1.1",
5756
"koa-bodyparser": "^4.4.1",
58-
"koa-mount": "^4.0.0",
57+
"koa-mount": "^4.2.0",
5958
"koa-static": "^5.0.0",
60-
"meteor-node-stubs": "^1.2.12",
59+
"meteor-node-stubs": "^1.2.25",
6160
"moment": "^2.30.1",
62-
"nanoid": "^3.3.8",
63-
"node-gyp": "^9.4.1",
61+
"nanoid": "^3.3.11",
6462
"ntp-client": "^0.5.3",
6563
"object-path": "^0.11.8",
6664
"p-lazy": "^3.1.0",
67-
"semver": "^7.6.3",
65+
"semver": "^7.7.3",
6866
"superfly-timeline": "9.2.0",
69-
"threadedclass": "^1.2.2",
67+
"threadedclass": "^1.3.0",
7068
"timecode": "0.0.4",
71-
"type-fest": "^4.33.0",
69+
"type-fest": "^4.41.0",
7270
"underscore": "^1.13.7",
73-
"winston": "^3.17.0"
71+
"winston": "^3.19.0"
7472
},
7573
"devDependencies": {
76-
"@babel/core": "^7.26.7",
77-
"@babel/plugin-transform-modules-commonjs": "^7.26.3",
74+
"@babel/core": "^7.29.0",
75+
"@babel/plugin-transform-modules-commonjs": "^7.28.6",
7876
"@shopify/jest-koa-mocks": "^5.3.1",
7977
"@sofie-automation/code-standard-preset": "^3.0.0",
80-
"@types/app-root-path": "^1.2.8",
81-
"@types/body-parser": "^1.19.5",
78+
"@types/body-parser": "^1.19.6",
8279
"@types/deep-extend": "^0.6.2",
83-
"@types/jest": "^29.5.14",
84-
"@types/koa": "^2.15.0",
85-
"@types/koa-bodyparser": "^4.3.12",
86-
"@types/koa-mount": "^4",
80+
"@types/jest": "^30.0.0",
81+
"@types/koa": "^3.0.1",
82+
"@types/koa-bodyparser": "^4.3.13",
83+
"@types/koa-mount": "^4.0.5",
8784
"@types/koa-static": "^4.0.4",
88-
"@types/koa__cors": "^5.0.0",
89-
"@types/koa__router": "^12.0.4",
90-
"@types/node": "^22.10.10",
91-
"@types/request": "^2.48.12",
92-
"@types/semver": "^7.5.8",
85+
"@types/koa__cors": "^5.0.1",
86+
"@types/node": "^22.19.8",
87+
"@types/semver": "^7.7.1",
9388
"@types/underscore": "^1.13.0",
94-
"babel-jest": "^29.7.0",
89+
"babel-jest": "^30.2.0",
90+
"commit-and-tag-version": "^12.6.1",
9591
"ejson": "^2.2.3",
96-
"eslint": "^9.18.0",
92+
"eslint": "^9.39.2",
9793
"fast-clone": "^1.5.13",
98-
"glob": "^11.0.1",
94+
"glob": "^13.0.1",
9995
"i18next-conv": "^10.2.0",
10096
"i18next-scanner": "^4.6.0",
101-
"jest": "^29.7.0",
97+
"jest": "^30.2.0",
10298
"legally": "^3.5.10",
10399
"open-cli": "^8.0.0",
104-
"prettier": "^3.4.2",
105-
"standard-version": "^9.5.0",
106-
"ts-jest": "^29.2.5",
100+
"prettier": "^3.8.1",
101+
"ts-jest": "^29.4.6",
107102
"typescript": "~5.7.3",
108103
"yargs": "^17.7.2"
109104
},
@@ -122,7 +117,7 @@
122117
"server": "server/main.ts"
123118
}
124119
},
125-
"standard-version": {
120+
"commit-and-tag-version": {
126121
"scripts": {
127122
"postbump": "yarn libs:syncVersionsAndChangelogs && yarn install && git add yarn.lock"
128123
}

‎meteor/scripts/babel-jest.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const babelJest = require('babel-jest')
22

3-
module.exports = babelJest.createTransformer({
3+
module.exports = babelJest.default.createTransformer({
44
plugins: ['@babel/plugin-transform-modules-commonjs'],
55
babelrc: false,
66
configFile: false,

‎meteor/server/api/blueprints/http.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ blueprintsRouter.post(
179179
}
180180
)
181181

182-
blueprintsRouter.get('/assets/(.*)', async (ctx) => {
182+
blueprintsRouter.get('/assets/*splat', async (ctx) => {
183183
logger.debug(`Blueprint Asset: ${ctx.socket.remoteAddress} GET "${ctx.url}"`)
184184
// TODO - some sort of user verification
185185
// for now just check it's a png to prevent snapshots being downloaded

‎meteor/server/api/rest/koa.ts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -196,11 +196,7 @@ function getClientAddrFromForwarded(forwardedVal: string | undefined): string |
196196
}
197197

198198
export const makeMeteorConnectionFromKoa = (
199-
ctx: Koa.ParameterizedContext<
200-
Koa.DefaultState,
201-
Koa.DefaultContext & KoaRouter.RouterParamContext<Koa.DefaultState, Koa.DefaultContext>,
202-
unknown
203-
>
199+
ctx: Koa.ParameterizedContext<Koa.DefaultState, Koa.DefaultContext, unknown>
204200
): Meteor.Connection => {
205201
return {
206202
id: getRandomString(),

‎meteor/server/api/rest/v1/index.ts‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,7 @@ import { APIFactory, ServerAPIContext } from './types'
2323
import { getSystemStatus } from '../../../systemStatus/systemStatus'
2424
import { Component, ExternalStatus } from '@sofie-automation/meteor-lib/dist/api/systemStatus'
2525

26-
function restAPIUserEvent(
27-
ctx: Koa.ParameterizedContext<
28-
Koa.DefaultState,
29-
Koa.DefaultContext & KoaRouter.RouterParamContext<Koa.DefaultState, Koa.DefaultContext>,
30-
unknown
31-
>
32-
): string {
26+
function restAPIUserEvent(ctx: Koa.ParameterizedContext<Koa.DefaultState, Koa.DefaultContext, unknown>): string {
3327
// the ctx.URL.pathname will contain `/v1.0`, but will not contain `/api`
3428
return `REST API: ${ctx.method} /api${ctx.URL.pathname} ${ctx.URL.origin}`
3529
}

0 commit comments

Comments
 (0)