Skip to content

Commit 93878d5

Browse files
committed
chore: fix linter/import issues for server-core-integration
1 parent f1735f3 commit 93878d5

32 files changed

Lines changed: 121 additions & 96 deletions

packages/eslint.config.mjs

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,20 @@ extendedRules.push(
6262
files: ['webui/src/**/*', 'shared-lib/src/**/*', 'server-core-integration/src/**/*'],
6363
rules: {
6464
// Override default behaviour for ESM and verbatimModuleSyntax
65-
'n/no-missing-import': ['error', { ignoreTypeImport: true }],
65+
'n/no-missing-import': [
66+
'error',
67+
{
68+
ignoreTypeImport: true,
69+
resolverConfig: {
70+
// The default aliases drop the js version, breaking the /dist imports
71+
extensionAlias: {
72+
'.js': ['.ts', '.tsx', '.js'],
73+
'.cjs': ['.cts', '.cjs'],
74+
'.mjs': ['.mts', '.mjs'],
75+
},
76+
},
77+
},
78+
],
6679
'no-duplicate-imports': 'error',
6780
'@typescript-eslint/consistent-type-imports': ['error', { fixStyle: 'inline-type-imports' }],
6881
'@typescript-eslint/no-import-type-side-effects': 'error',

packages/live-status-gateway/src/collections/rundownContentHandlerBase.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ import { RundownId } from '@sofie-automation/corelib/dist/dataModel/Ids'
66
import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist'
77
import { CollectionHandlers } from '../liveStatusServer.js'
88
import { PickKeys } from '@sofie-automation/shared-lib/dist/lib/types'
9-
import { CollectionDocCheck } from '@sofie-automation/server-core-integration'
10-
import { ParametersOfFunctionOrNever } from '@sofie-automation/server-core-integration/dist/lib/subscriptions'
9+
import type { CollectionDocCheck, ParametersOfFunctionOrNever } from '@sofie-automation/server-core-integration'
1110

1211
const PLAYLIST_KEYS = ['currentPartInfo', 'nextPartInfo'] as const
1312
type Playlist = PickKeys<DBRundownPlaylist, typeof PLAYLIST_KEYS>

packages/live-status-gateway/src/coreHandler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import {
1212
PeripheralDevicePubSubTypes,
1313
SubscriptionId,
1414
stringifyError,
15+
ParametersOfFunctionOrNever,
1516
} from '@sofie-automation/server-core-integration'
1617
import { DeviceConfig } from './connector.js'
1718
import { Logger } from 'winston'
@@ -26,7 +27,6 @@ import { StatusCode } from '@sofie-automation/shared-lib/dist/lib/status'
2627
import { PeripheralDeviceCommand } from '@sofie-automation/shared-lib/dist/core/model/PeripheralDeviceCommand'
2728
import { LiveStatusGatewayConfig } from '@sofie-automation/shared-lib/dist/generated/LiveStatusGatewayOptionsTypes'
2829
import { CorelibPubSubTypes, CorelibPubSubCollections } from '@sofie-automation/corelib/dist/pubsub'
29-
import { ParametersOfFunctionOrNever } from '@sofie-automation/server-core-integration/dist/lib/subscriptions'
3030

3131
export interface CoreConfig {
3232
host: string

packages/live-status-gateway/src/publicationCollection.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import {
55
CollectionDocCheck,
66
PeripheralDevicePubSubCollections,
77
ProtectedString,
8+
ParametersOfFunctionOrNever,
89
} from '@sofie-automation/server-core-integration'
9-
import { ParametersOfFunctionOrNever } from '@sofie-automation/server-core-integration/dist/lib/subscriptions'
1010
import { Logger } from 'winston'
1111
import { CollectionBase, DEFAULT_THROTTLE_PERIOD_MS } from './collectionBase.js'
1212
import { CoreHandler } from './coreHandler.js'

packages/live-status-gateway/src/topics/__tests__/activePieces.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
makeTestShowStyleBase,
77
} from './utils.js'
88
import { ShowStyleBaseExt } from '../../collections/showStyleBaseHandler.js'
9-
import { protectString } from '@sofie-automation/server-core-integration/dist'
9+
import { protectString } from '@sofie-automation/server-core-integration'
1010
import { PartialDeep } from 'type-fest'
1111
import { literal } from '@sofie-automation/corelib/dist/lib'
1212
import { SelectedPieceInstances } from '../../collections/pieceInstancesHandler.js'

packages/live-status-gateway/src/topics/__tests__/activePlaylist.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
} from './utils.js'
99
import { ShowStyleBaseExt } from '../../collections/showStyleBaseHandler.js'
1010
import { SelectedPartInstances } from '../../collections/partInstancesHandler.js'
11-
import { protectString, unprotectString, unprotectStringArray } from '@sofie-automation/server-core-integration/dist'
11+
import { protectString, unprotectString, unprotectStringArray } from '@sofie-automation/server-core-integration'
1212
import { PartialDeep } from 'type-fest'
1313
import { literal } from '@sofie-automation/corelib/dist/lib'
1414
import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance'

packages/live-status-gateway/src/wsMetrics.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { MetricsGauge } from '@sofie-automation/server-core-integration/dist/lib/prometheus'
1+
import { MetricsGauge } from '@sofie-automation/server-core-integration'
22

33
export const wsConnectionsGauge = new MetricsGauge({
44
name: 'sofie_lsg_websocket_connections',

packages/mos-gateway/src/CoreMosDeviceHandler.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import {
55
Observer,
66
PeripheralDevicePubSub,
77
stringifyError,
8+
CoreConnectionChild,
9+
Queue,
810
} from '@sofie-automation/server-core-integration'
911
import {
1012
IMOSConnectionStatus,
@@ -33,8 +35,6 @@ import _ from 'underscore'
3335
import { MosHandler } from './mosHandler.js'
3436
import { PartialDeep } from 'type-fest'
3537
import type { CoreHandler } from './coreHandler.js'
36-
import { CoreConnectionChild } from '@sofie-automation/server-core-integration/dist/lib/CoreConnectionChild'
37-
import { Queue } from '@sofie-automation/server-core-integration/dist/lib/queue'
3838
import {
3939
mosDeviceConnectedGauge,
4040
mosMessagesFailedCounter,

packages/mos-gateway/src/mosMetrics.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
import {
2-
MetricsCounter,
3-
MetricsGauge,
4-
} from '@sofie-automation/server-core-integration/dist/lib/prometheus'
1+
import { MetricsCounter, MetricsGauge } from '@sofie-automation/server-core-integration'
52

63
export const mosDevicesTotalGauge = new MetricsGauge({
74
name: 'sofie_mos_gateway_devices_total',

packages/mos-gateway/src/mosStatus/handler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ import {
1515
PeripheralDevicePubSubCollectionsNames,
1616
stringifyError,
1717
SubscriptionId,
18+
Queue,
1819
} from '@sofie-automation/server-core-integration'
1920
import type { IngestRundownStatus } from '@sofie-automation/shared-lib/dist/ingest/rundownStatus'
2021
import type { RundownId } from '@sofie-automation/shared-lib/dist/core/model/Ids'
2122
import type * as winston from 'winston'
22-
import { Queue } from '@sofie-automation/server-core-integration/dist/lib/queue'
2323
import { diffStatuses } from './diff.js'
2424
import { mosStatusQueueDepthGauge, mosStatusSentCounter, mosStatusSkippedCounter } from '../mosMetrics.js'
2525

0 commit comments

Comments
 (0)