wip

Author: Julusian

meteor/server/api/rest/koa.ts

@@ -83,7 +83,7 @@ Meteor.startup(() => {
 	const webuiServer = staticServe(public_dir, {
 		index: false, // Performed manually
 	})
-	koaApp.use(KoaMount(getRootSubpath(), webuiServer))
+	koaApp.use(KoaMount(getRootSubpath() || '/', webuiServer))
 	logger.debug(`Serving static files from ${public_dir}`)
 
 	if (Meteor.isDevelopment) {

packages/webui/src/client/ui/App.tsx

@@ -39,7 +39,7 @@ import { DocumentTitleProvider } from '../lib/DocumentTitleProvider'
 import { catchError, firstIfArray, isRunningInPWA } from '../lib/lib'
 import { protectString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
 import { useUserPermissions, UserPermissionsContext } from './UserPermissions'
-import { ROOT_URL_PATH_PREFIX } from '../url'
+import { relativeToSiteRootUrl, ROOT_URL_PATH_PREFIX } from '../url'
 
 const NullComponent = () => null
 

packages/webui/vite.config.mts

@@ -26,15 +26,15 @@ await Promise.all([
 	findCommonJsPathsForLibrary('@sofie-automation/meteor-lib/dist', '../meteor-lib/dist'),
 ])
 
-const basePath = process.env.SOFIE_BASE_PATH || '/'
+const basePath = process.env.SOFIE_BASE_PATH || ''
 
 // https://vitejs.dev/config/
 export default defineConfig(({ command }) => ({
 	plugins: [react(), tsconfigPaths(), nodePolyfills()],
 
 	// In production, build relative so that paths inside the scss files are correct. This makes a mess in the html, but we can fix that on the fly
 	// In dev, use the specified base path
-	base: command === 'build' ? '' : basePath,
+	base: command === 'build' ? '' : basePath || '/',
 
 	optimizeDeps: {
 		include: [

scripts/run.mjs

@@ -70,7 +70,7 @@ function watchMeteor() {
 			name: "VITE",
 			prefixColor: "yellow",
 			env: {
-				SOFIE_BASE_PATH: rootUrl.pathname.length > 1 ? rootUrl.pathname : '',
+				SOFIE_BASE_PATH: rootUrl && rootUrl.pathname.length > 1 ? rootUrl.pathname : '',
 			},
 		},
 	];