Release 52

.github/workflows/node.yaml

@@ -184,11 +184,18 @@ jobs:
         run: |
           cd meteor
           yarn inject-git-hash
+      - name: Prepare webui for meteor build
+        if: steps.check-build-and-push.outputs.enable == 'true'
+        run: |
+          rm -Rf meteor/public
+          cp -R packages/webui/dist meteor/public
       - name: Meteor Build
         if: steps.check-build-and-push.outputs.enable == 'true'
         run: |
           cd meteor
           NODE_OPTIONS="--max-old-space-size=4096" METEOR_DEBUG_BUILD=1 meteor build --allow-superuser --directory .
+          mv bundle/programs/web.browser/assets/ bundle/programs/web.browser/app/assets/ || true
+
       - name: Meteor Bundle NPM Build
         if: steps.check-build-and-push.outputs.enable == 'true'
         run: |
@@ -426,9 +433,11 @@ jobs:
           - mos-gateway
           - corelib
           - shared-lib
+          - meteor-lib
           - job-worker
           - openapi
           - live-status-gateway
+          - webui
 
     steps:
       - uses: actions/checkout@v4
@@ -471,7 +480,7 @@ jobs:
           - blueprints-integration
           - server-core-integration
           - shared-lib
-        node-version: [14.x, 16.x, 18.x, 20.x]
+        node-version: [14.x, 18.x, 20.x, 22.x]
         include:
           # include additional configs, to run certain packages only for a certain version of node
           - node-version: 14.x
@@ -481,19 +490,28 @@ jobs:
             package-name: job-worker
             send-coverage: true
           # manual openapi to avoid testing for 14.x
-          - node-version: 16.x
-            package-name: openapi
           - node-version: 18.x
             package-name: openapi
           - node-version: 20.x
             package-name: openapi
+          - node-version: 22.x
+            package-name: openapi
           # No tests for the gateways yet
           # - node-version: 18.x
           #   package-name: playout-gateway
           # - node-version: 18.x
           #   package-name: mos-gateway
           - node-version: 18.x
             package-name: live-status-gateway
+            send-coverage: true
+          - node-version: 18.x
+            package-name: webui
+          # manual meteor-lib as it only needs a couple of versions
+          - node-version: 18.x
+            package-name: meteor-lib
+            send-coverage: true
+          - node-version: 14.x
+            package-name: meteor-lib
 
     steps:
       - uses: actions/checkout@v4
@@ -524,7 +542,7 @@ jobs:
         env:
           CI: true
       - name: Send coverage
-        if: (matrix.node-version == '16.x' || matrix.send-coverage == true) && ((github.event_name == 'pull_request') && ((!startsWith(github.head_ref, 'release'))) || ((github.event_name == 'push') && (!startsWith(github.ref_name, 'release'))))
+        if: (matrix.node-version == '18.x' || matrix.send-coverage == true) && ((github.event_name == 'pull_request') && ((!startsWith(github.head_ref, 'release'))) || ((github.event_name == 'push') && (!startsWith(github.ref_name, 'release'))))
         uses: codecov/codecov-action@v4
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/prerelease-libs.yml

@@ -53,7 +53,7 @@ jobs:
           - blueprints-integration
           - server-core-integration
           - shared-lib
-        node-version: [14.x, 16.x, 18.x, 20.x]
+        node-version: [14.x, 18.x, 20.x, 22.x]
 
     steps:
       - uses: actions/checkout@v4

.vscode/settings.json.default

@@ -9,7 +9,8 @@
         "packages/shared-lib",
         "packages/job-worker",
         "packages/openapi",
-        "packages/live-status-gateway"
+        "packages/live-status-gateway",
+		"packages/webui"
     ],
     "prettier.enable": true,
     "sonarlint.connectedMode.project": { "projectKey": "nrkno_sofie-core" },

DEVELOPER.md

@@ -36,6 +36,8 @@ yarn start
 
 > 💡 First startup may take a while, especially on Windows. To speed things up, consider adding `%LOCALAPPDATA%\.meteor` and the directory where you cloned `server-core` to your Windows Defender virus protection exclusions.
 
+The Sofie ui (served by Vite) can be accessed at `http://localhost:3005`. The meteor http server can be access directly at `http://localhost:3000`
+
 ### Slightly more Involved Start
 
 1. Clone the repository (for development, it is recommended to base your work on the latest unstable release branch)

meteor/.eslintrc.js

@@ -56,43 +56,20 @@ const tsBase = {
 }
 
 module.exports = {
-	extends: [...commonExtends, 'plugin:react/recommended'],
-	plugins: [...commonPlugins, 'react'],
+	extends: [...commonExtends],
+	plugins: [...commonPlugins],
 	rules: {
 		'prettier/prettier': 'error',
 	},
 	env: { es2017: true },
 	parserOptions: { sourceType: 'module', ecmaVersion: 2018 },
-	settings: {
-		react: {
-			version: 'detect', // Tells eslint-plugin-react to automatically detect the version of React to use
-		},
-	},
+	settings: {},
 	overrides: [
 		// Note: these replace the values defined above, so make sure to extend them if they are needed
 		{
 			files: ['*.ts'],
 			...tsBase,
 		},
-		{
-			files: ['*.tsx'],
-			...tsBase,
-			extends: [...tsBase.extends, 'plugin:react/recommended'],
-			parserOptions: {
-				...tsBase.parserOptions,
-				ecmaFeatures: {
-					jsx: true, // Allows for the parsing of JSX
-				},
-			},
-			rules: {
-				...tsBase.rules,
-				'node/no-extraneous-import': 'off', // because there are a lot of them as dev-dependencies
-				'node/no-missing-import': 'off', // erroring on every single import
-				'react/prop-types': 'off', // we don't use this
-				'@typescript-eslint/no-empty-interface': 'off', // many prop/state types are {}
-				'@typescript-eslint/promise-function-async': 'off', // event handlers can't be async
-			},
-		},
 		{
 			files: ['*.js'],
 			env: {

meteor/.gitignore

@@ -5,6 +5,7 @@ src/**/*.js.map
 coverage
 settings.json
 server/_force_restart.js
+public/
 
 # Ignore TV2-features:
 client/styles/tv2

meteor/.meteor/packages

@@ -9,24 +9,14 @@
 # but you can also edit it by hand.
 
 [email protected] # Packages every Meteor app needs to have
-[email protected] # Packages for a great mobile UX
 [email protected] # The database Meteor supports right now
 [email protected] # Reactive variable for tracker
 
-[email protected] # CSS minifier run for production mode
-[email protected] # JS minifier run for production mode
-[email protected] # ECMAScript 5 compatibility for older browsers
 [email protected] # Enable ECMAScript2015+ syntax in app code
 [email protected] # Enable TypeScript syntax in .ts and .tsx modules
 [email protected] # Server-side component of the `meteor shell` command
-[email protected] # Select when to allow use of the "modern" bundle
-
-[email protected] # Define static page content in .html files
-react-meteor-data # React higher-order component for reactively tracking Meteor data
 
 [email protected] # Meteor's client-side reactive programming library
-[email protected]
-fourseven:scss
 
 [email protected]
 ostrio:meteor-root

meteor/.meteor/versions

@@ -6,10 +6,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected]
 [email protected]
-[email protected]
-[email protected]
 [email protected]
 [email protected]
 [email protected]
@@ -27,25 +24,17 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-fourseven:[email protected]
 [email protected]
 [email protected]
-[email protected]
-[email protected]
 [email protected]
 [email protected]
 julusian:[email protected]
 kschingiz:[email protected]
-[email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected]
-[email protected]
 [email protected]
-[email protected]
-[email protected]
 [email protected]
 [email protected]
 [email protected]
@@ -60,21 +49,13 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected]
-[email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
 [email protected]
 [email protected]
 [email protected]

meteor/Dockerfile

@@ -1,4 +1,18 @@
 # syntax=docker/dockerfile:experimental
+
+# BUILD WEBUI
+FROM node:18
+COPY packages /opt/core/packages
+WORKDIR /opt/core/packages
+
+RUN rm -R *-gateway documentation openapi
+RUN corepack enable
+RUN yarn install && yarn build
+
+# Install production dependencies for the worker
+# HACK: 
+# RUN yarn workspaces focus --production @sofie-automation/job-worker @sofie-automation/corelib
+
 # BUILD IMAGE
 FROM meteor/node:14.21.4
 RUN curl "https://install.meteor.com/?release=2.13.3" | sh
@@ -9,17 +23,18 @@ ENV NODE_ENV anythingButProduction
 
 # Prepare the packages
 COPY package.json /opt/core/package.json
-COPY packages /opt/core/packages
-WORKDIR /opt/core/packages
-RUN rm -R *-gateway documentation openapi
-RUN corepack enable
-RUN yarn install && yarn build
+COPY --from=0 /opt/core/packages /opt/core/packages
 
 # Add the meteor source
 COPY meteor /opt/core/meteor
 COPY scripts /opt/core/scripts
 WORKDIR /opt/core/meteor
 
+# move the webui to the correct place
+RUN rm -Rf /opt/core/meteor/public
+RUN cp -R /opt/core/packages/webui/dist /opt/core/meteor/public
+RUN rm -R /opt/core/packages/webui
+
 # Force meteor to setup the runtime
 RUN meteor --version --allow-superuser
 RUN meteor corepack enable
@@ -31,9 +46,8 @@ RUN --mount=type=cache,target=/opt/core/meteor/.meteor/local NODE_OPTIONS="--max
 WORKDIR /opt/bundle/programs/server/
 RUN npm install
 
-# Install production dependencies for the worker
-WORKDIR /opt/core/packages
-RUN yarn workspaces focus --production @sofie-automation/job-worker @sofie-automation/corelib
+# meteor does something weird with these files
+RUN mv /opt/bundle/programs/web.browser/assets /opt/bundle/programs/web.browser/app/assets || true
 
 # DEPLOY IMAGE
 FROM alpine:3.19
@@ -60,11 +74,8 @@ ENV PATH $DIR_NODE/v$NODE_VERSION/bin:$PATH
 # confirm installation
 RUN node -v && npm -v
 
-COPY --from=0 /opt/bundle /opt/core
+COPY --from=1 /opt/bundle /opt/core
 COPY meteor/docker-entrypoint.sh /opt
 
-# Tell meteor where the worker code is located
-ENV WORKER_EXEC_DIR=/opt/packages/job-worker
-
 WORKDIR /opt/core/
 CMD ["/opt/docker-entrypoint.sh"]

meteor/__mocks__/_extendJest.ts

@@ -2,9 +2,8 @@ import { UserError, UserErrorMessage } from '@sofie-automation/corelib/dist/erro
 import { Meteor } from 'meteor/meteor'
 import { clone } from '@sofie-automation/corelib/dist/lib'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
-import '../server/api/logger'
 import _ from 'underscore'
-import { ClientAPI } from '../lib/api/client'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
 
 // Include this file in to get access to the extended functions
 

meteor/__mocks__/_setupMocks.ts

@@ -2,7 +2,7 @@ import { setLogLevel } from '../server/logging'
 import { Fiber } from './Fibers'
 import { resetRandomId } from './random'
 import { makeCompatible } from 'meteor-promise'
-import { LogLevel } from '../lib/lib'
+import { LogLevel } from '../server/lib/tempLib'
 import { SupressLogMessages } from './suppressLogging'
 
 // This file is run before all tests start.
@@ -34,8 +34,6 @@ jest.mock('meteor/webapp', (...args) => require('./webapp').setup(args), { virtu
 jest.mock('../server/api/integration/slack', (...args) => require('./slack').setup(args), { virtual: true })
 jest.mock('../server/worker/worker', (...args) => require('./worker').setup(args), { virtual: true })
 
-require('../server/api/logger.ts')
-
 SupressLogMessages.init()
 
 beforeEach(() => {