Skip to content

Commit 14bad34

Browse files
committed
Merge remote-tracking branch 'origin/release52' into bbc-release52
2 parents c267d55 + a0fe909 commit 14bad34

File tree

31 files changed

+913
-675
lines changed

31 files changed

+913
-675
lines changed

meteor/CHANGELOG.md

Lines changed: 122 additions & 0 deletions
Large diffs are not rendered by default.

meteor/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "automation-core",
3-
"version": "1.52.0-in-development",
3+
"version": "1.52.0-in-testing.0",
44
"private": true,
55
"engines": {
66
"node": ">=22.11"

meteor/server/api/rest/v0/__tests__/rest.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ import { MeteorMethodSignatures } from '../../../../methods'
55
import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
66
import { callKoaRoute } from '../../../../../__mocks__/koa-util'
77
import { createLegacyApiRouter } from '..'
8-
import '../../../userActions.ts' // required to get the UserActionsAPI methods populated
8+
import '../../../userActions' // required to get the UserActionsAPI methods populated
99

1010
// we don't want the deviceTriggers observer to start up at this time
1111
jest.mock('../../../deviceTriggers/observer')
1212

13-
import '../index.ts'
13+
import '../index'
1414

1515
describe('REST API', () => {
1616
describe('UNSTABLE v0', () => {

0 commit comments

Comments
 (0)