Skip to content

Commit e2201a3

Browse files
authored
Merge pull request #1735 from SuperFlyTV/feat/package-esm-1
feat: convert shared-lib and server-core-integration to ESM
2 parents 3c43dfe + ba5cde7 commit e2201a3

90 files changed

Lines changed: 320 additions & 241 deletions

File tree

Some content is hidden

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

.github/actions/setup-meteor/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ description: "Setup Meteor"
33
runs:
44
using: "composite"
55
steps:
6-
- run: curl "https://install.meteor.com/?release=3.3.2" | sh
6+
- run: curl "https://install.meteor.com/?release=3.4.1" | sh
77
shell: bash

meteor/.meteor/packages

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88

99
# but you can also edit it by hand.
1010

11-
meteor@2.1.1
12-
webapp@2.0.7
11+
meteor@2.3.0
12+
webapp@2.1.2
1313
ddp@1.4.2
1414

15-
mongo@2.1.4 # The database Meteor supports right now
15+
mongo@2.3.0 # The database Meteor supports right now
1616

17-
ecmascript@0.16.13 # Enable ECMAScript2015+ syntax in app code
18-
typescript@5.6.6 # Enable TypeScript syntax in .ts and .tsx modules
17+
ecmascript@0.18.0 # Enable ECMAScript2015+ syntax in app code
18+
typescript@5.10.0 # Enable TypeScript syntax in .ts and .tsx modules
1919

2020
tracker@1.3.4 # Meteor's client-side reactive programming library
2121

meteor/.meteor/release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
METEOR@3.3.2
1+
METEOR@3.4.1

meteor/.meteor/versions

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
allow-deny@2.1.0
2-
babel-compiler@7.12.2
2+
babel-compiler@7.14.0
33
babel-runtime@1.5.2
44
base64@1.0.13
55
binary-heap@1.0.12
6-
boilerplate-generator@2.0.2
7-
callback-hook@1.6.1
8-
check@1.4.4
6+
boilerplate-generator@2.1.0
7+
callback-hook@1.7.0
8+
check@1.5.0
99
core-runtime@1.0.0
1010
ddp@1.4.2
11-
ddp-client@3.1.1
11+
ddp-client@3.2.0
1212
ddp-common@1.4.4
13-
ddp-server@3.1.2
13+
ddp-server@3.2.0
1414
diff-sequence@1.1.3
1515
dynamic-import@0.7.4
16-
ecmascript@0.16.13
16+
ecmascript@0.18.0
1717
ecmascript-runtime@0.8.3
18-
ecmascript-runtime-client@0.12.3
18+
ecmascript-runtime-client@0.13.0
1919
ecmascript-runtime-server@0.11.1
2020
ejson@1.1.5
2121
facts-base@1.0.2
@@ -24,26 +24,26 @@ geojson-utils@1.0.12
2424
id-map@1.2.0
2525
inter-process-messaging@0.1.2
2626
logging@1.3.6
27-
meteor@2.1.1
28-
minimongo@2.0.4
27+
meteor@2.3.0
28+
minimongo@2.1.0
2929
modern-browsers@0.2.3
3030
modules@0.20.3
3131
modules-runtime@0.13.2
32-
mongo@2.1.4
32+
mongo@2.3.0
3333
mongo-decimal@0.2.0
3434
mongo-dev-server@1.1.1
3535
mongo-id@1.0.9
3636
npm-mongo@6.16.1
3737
ordered-dict@1.2.0
3838
promise@1.0.0
3939
random@1.2.2
40-
react-fast-refresh@0.2.9
40+
react-fast-refresh@0.3.0
4141
reload@1.3.2
4242
retry@1.1.1
4343
routepolicy@1.1.2
4444
socket-stream-client@0.6.1
4545
tracker@1.3.4
46-
typescript@5.6.6
47-
webapp@2.0.7
46+
typescript@5.10.0
47+
webapp@2.1.2
4848
webapp-hashing@1.1.2
4949
zodern:types@1.0.13

meteor/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN yarn install && yarn build
1515

1616
# BUILD IMAGE
1717
FROM node:22
18-
RUN curl "https://install.meteor.com/?release=3.3.2" | sh
18+
RUN curl "https://install.meteor.com/?release=3.4.1" | sh
1919

2020
# Temporary change the NODE_ENV env variable, so that all libraries are installed:
2121
ENV NODE_ENV_TMP $NODE_ENV

meteor/jest.config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ const path = require('path')
33
const commonConfig = {
44
modulePaths: ['<rootDir>/node_modules/'],
55
moduleNameMapper: {
6+
'^@sofie-automation/shared-lib/dist/(.+)\\.js$': '<rootDir>/../packages/shared-lib/src/$1',
7+
'^@sofie-automation/shared-lib/dist/(.+)$': '<rootDir>/../packages/shared-lib/src/$1',
68
// Ensure libraries that would match the extension rule are still resolved
79
'bignumber.js': 'bignumber.js',
810
// Drop file extensions in imports

meteor/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
"open-cli": "^9.0.0",
9999
"prettier": "^3.8.3",
100100
"ts-jest": "^29.4.9",
101-
"typescript": "~5.7.3",
101+
"typescript": "~5.9.3",
102102
"yargs": "^17.7.2"
103103
},
104104
"prettier": "@sofie-automation/code-standard-preset/.prettierrc.json",

meteor/tsconfig-meteor.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{
55
"compilerOptions": {
66
/* Basic Options */
7-
"target": "es2018",
7+
"target": "es2024",
88
"module": "es2015",
99
"lib": ["esnext"],
1010
"allowJs": true,

meteor/yarn.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2926,7 +2926,7 @@ __metadata:
29262926
timecode: "npm:0.0.4"
29272927
ts-jest: "npm:^29.4.9"
29282928
type-fest: "npm:^4.41.0"
2929-
typescript: "npm:~5.7.3"
2929+
typescript: "npm:~5.9.3"
29302930
underscore: "npm:^1.13.8"
29312931
winston: "npm:^3.19.0"
29322932
yargs: "npm:^17.7.2"
@@ -10596,23 +10596,23 @@ __metadata:
1059610596
languageName: node
1059710597
linkType: hard
1059810598

10599-
"typescript@npm:~5.7.3":
10600-
version: 5.7.3
10601-
resolution: "typescript@npm:5.7.3"
10599+
"typescript@npm:~5.9.3":
10600+
version: 5.9.3
10601+
resolution: "typescript@npm:5.9.3"
1060210602
bin:
1060310603
tsc: bin/tsc
1060410604
tsserver: bin/tsserver
10605-
checksum: 10/6a7e556de91db3d34dc51cd2600e8e91f4c312acd8e52792f243c7818dfadb27bae677175fad6947f9c81efb6c57eb6b2d0c736f196a6ee2f1f7d57b74fc92fa
10605+
checksum: 10/c089d9d3da2729fd4ac517f9b0e0485914c4b3c26f80dc0cffcb5de1719a17951e92425d55db59515c1a7ddab65808466debb864d0d56dcf43f27007d0709594
1060610606
languageName: node
1060710607
linkType: hard
1060810608

10609-
"typescript@patch:typescript@npm%3A~5.7.3#optional!builtin<compat/typescript>":
10610-
version: 5.7.3
10611-
resolution: "typescript@patch:typescript@npm%3A5.7.3#optional!builtin<compat/typescript>::version=5.7.3&hash=5786d5"
10609+
"typescript@patch:typescript@npm%3A~5.9.3#optional!builtin<compat/typescript>":
10610+
version: 5.9.3
10611+
resolution: "typescript@patch:typescript@npm%3A5.9.3#optional!builtin<compat/typescript>::version=5.9.3&hash=5786d5"
1061210612
bin:
1061310613
tsc: bin/tsc
1061410614
tsserver: bin/tsserver
10615-
checksum: 10/dc58d777eb4c01973f7fbf1fd808aad49a0efdf545528dab9b07d94fdcb65b8751742804c3057e9619a4627f2d9cc85547fdd49d9f4326992ad0181b49e61d81
10615+
checksum: 10/696e1b017bc2635f4e0c94eb4435357701008e2f272f553d06e35b494b8ddc60aa221145e286c28ace0c89ee32827a28c2040e3a69bdc108b1a5dc8fb40b72e3
1061610616
languageName: node
1061710617
linkType: hard
1061810618

packages/blueprints-integration/jest.config.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,19 @@ module.exports = {
99
diagnostics: {
1010
ignoreCodes: [
1111
151002, // hybrid module kind (Node16/18/Next)
12+
2823, // Import attributes not supported in CJS mode (ts-jest forces CJS, emits require() anyway)
1213
],
1314
},
1415
},
1516
],
1617
},
1718
moduleNameMapper: {
19+
'^@sofie-automation/shared-lib/dist/(.+)\\.js$': '<rootDir>/../shared-lib/src/$1',
20+
'^@sofie-automation/shared-lib/dist/(.+)$': '<rootDir>/../shared-lib/src/$1',
1821
'(.+)\\.js$': '$1',
1922
},
2023
testMatch: ['**/__tests__/**/*.spec.(ts|js)'],
21-
testPathIgnorePatterns: ['integrationTests'],
24+
testPathIgnorePatterns: ['integrationTests', 'dist'],
2225
testEnvironment: 'node',
2326
coverageThreshold: {
2427
global: {

0 commit comments

Comments
 (0)