fix: rework versionExtended flow to be done via meteor runtime_config

Author: Julusian

meteor/server/api/rest/koa.ts

@@ -8,6 +8,7 @@ import _ from 'underscore'
 import { public_dir } from '../../lib'
 import staticServe from 'koa-static'
 import { logger } from '../../logging'
+import { PackageInfo } from '../../coreSystem'
 
 declare module 'http' {
 	interface IncomingMessage {
@@ -55,8 +56,13 @@ Meteor.startup(() => {
 
 	// Serve the meteor runtime config
 	rootRouter.get('/meteor-runtime-config.js', async (ctx) => {
-		// @ts-expect-error missing types for internal meteor detail
-		ctx.body = `window.__meteor_runtime_config__ = (${JSON.stringify(__meteor_runtime_config__)})`
+		const versionExtended: string = PackageInfo.versionExtended || PackageInfo.version // package version
+
+		ctx.body = `window.__meteor_runtime_config__ = (${JSON.stringify({
+			// @ts-expect-error missing types for internal meteor detail
+			...__meteor_runtime_config__,
+			sofieVersionExtended: versionExtended,
+		})})`
 	})
 
 	koaApp.use(rootRouter.routes()).use(rootRouter.allowedMethods())

packages/webui/src/client/lib/Settings.ts

@@ -17,3 +17,5 @@ const MeteorInjectedSettings: any = window.__meteor_runtime_config__
 if (MeteorInjectedSettings?.PUBLIC_SETTINGS) {
 	Settings = _.extend(Settings, MeteorInjectedSettings.PUBLIC_SETTINGS)
 }
+
+export const APP_VERSION_EXTENDED: string | undefined = MeteorInjectedSettings?.sofieVersionExtended

packages/webui/src/client/lib/lib.tsx

@@ -231,7 +231,7 @@ export function catchError(context: string): (...errs: any[]) => void {
 }
 
 export function hashSingleUseToken(token: string): string {
-	// nocommit - a hack because the crypto polyfill doesn't work for some reason
+	// Future: it would be nice for this to use a better webcrypto/better library, but this works
 	return shajs('sha1')
 		.update(SINGLE_USE_TOKEN_SALT + token)
 		.digest('base64')

packages/webui/src/client/ui/RundownList/RundownListFooter.tsx

@@ -6,6 +6,7 @@ import { TOOLTIP_DEFAULT_DELAY } from '../../lib/lib'
 import { useTranslation } from 'react-i18next'
 import { MeteorCall } from '../../lib/meteorApi'
 import { NoticeLevel, Notification, NotificationCenter } from '../../lib/notifications/notifications'
+import { APP_VERSION_EXTENDED } from '../../lib/Settings'
 
 export function RundownListFooter(): JSX.Element {
 	const { t } = useTranslation()
@@ -40,7 +41,7 @@ export function RundownListFooter(): JSX.Element {
 	}, [])
 
 	const version = __APP_VERSION__ || 'UNSTABLE'
-	const versionExtended = __APP_VERSION_EXTENDED__ || version
+	const versionExtended = APP_VERSION_EXTENDED || version
 
 	return (
 		<div className="mtl gutter version-info">

packages/webui/src/vite-env.d.ts

@@ -1,4 +1,3 @@
 /// <reference types="vite/client" />
 
 declare const __APP_VERSION__: string
-declare const __APP_VERSION_EXTENDED__: string

packages/webui/vite.config.mts

@@ -52,7 +52,6 @@ export default defineConfig({
 
 	define: {
 		__APP_VERSION__: JSON.stringify(process.env.npm_package_version),
-		__APP_VERSION_EXTENDED__: JSON.stringify(process.env.npm_package_version), // nocommit do this properly
 	},
 
 	server: {