upgrade vite to v6 (#1626)

apps/client/package.json

@@ -72,7 +72,7 @@
     "@types/react-dom": "^18.0.10",
     "@typescript-eslint/eslint-plugin": "catalog:",
     "@typescript-eslint/parser": "catalog:",
-    "@vitejs/plugin-react": "^4.2.1",
+    "@vitejs/plugin-react": "4.5.1",
     "eslint": "catalog:",
     "eslint-config-prettier": "catalog:",
     "eslint-plugin-jest": "^28.6.0",
@@ -86,10 +86,10 @@
     "prettier": "catalog:",
     "sass": "^1.57.1",
     "typescript": "catalog:",
-    "vite": "^5.2.11",
-    "vite-plugin-compression2": "^1.3.3",
-    "vite-plugin-svgr": "^4.2.0",
-    "vite-tsconfig-paths": "^4.3.1",
+    "vite": "6.3.1",
+    "vite-plugin-compression2": "1.4.0",
+    "vite-plugin-svgr": "4.3.0",
+    "vite-tsconfig-paths": "5.1.4",
     "vitest": "catalog:"
   }
 }

apps/client/src/common/utils/__tests__/__snapshots__/styleUtils.test.ts.snap

@@ -2,4 +2,4 @@
 
 exports[`cx() > ignores falsy values 1`] = `""`;
 
-exports[`cx() > merges styles 1`] = `"_test_98a1e0 _another_98a1e0"`;
+exports[`cx() > merges styles 1`] = `"_test_d5d33f _another_d5d33f"`;

apps/client/vite.config.js

@@ -70,9 +70,9 @@ export default defineConfig({
     preprocessorOptions: {
       scss: {
         additionalData: `
-        @use './src/theme/ontimeColours' as *;
-        @use './src/theme/ontimeStyles' as *;
-        @use './src/theme/mixins' as *;
+        @use '@/theme/ontimeColours' as *;
+        @use '@/theme/ontimeStyles' as *;
+        @use '@/theme/mixins' as *;
         `,
       },
     },

apps/server/src/adapters/OscAdapter.ts

@@ -5,7 +5,7 @@ import * as dgram from 'node:dgram';
 
 import { logger } from '../classes/Logger.js';
 import { dispatchFromAdapter } from '../api-integration/integration.controller.js';
-import { isOntimeCloud } from '../externals.js';
+import { isOntimeCloud } from '../setup/environment.js';
 
 import { integrationPayloadFromPath } from './utils/parse.js';
 import type { IAdapter } from './IAdapter.js';

apps/server/src/api-data/automation/automation.service.ts

@@ -12,7 +12,7 @@ import { getPropertyFromPath } from 'ontime-utils';
 
 import { logger } from '../../classes/Logger.js';
 import { getState, type RuntimeState } from '../../stores/runtimeState.js';
-import { isOntimeCloud } from '../../externals.js';
+import { isOntimeCloud } from '../../setup/environment.js';
 
 import { emitOSC } from './clients/osc.client.js';
 import { emitHTTP } from './clients/http.client.js';

apps/server/src/api-data/settings/settings.controller.ts

@@ -3,7 +3,7 @@ import { getErrorMessage, obfuscate } from 'ontime-utils';
 
 import type { Request, Response } from 'express';
 
-import { isDocker } from '../../externals.js';
+import { isDocker } from '../../setup/environment.js';
 import { failEmptyObjects } from '../../utils/routerUtils.js';
 import { getDataProvider } from '../../classes/data-provider/DataProvider.js';
 import * as appState from '../../services/app-state-service/AppStateService.js';

apps/server/src/app.ts

@@ -9,7 +9,8 @@ import cookieParser from 'cookie-parser';
 
 // import utils
 import { publicDir, srcDir } from './setup/index.js';
-import { environment, isProduction, updateRouterPrefix } from './externals.js';
+import { environment, isProduction } from './setup/environment.js';
+import { updateRouterPrefix } from './externals.js';
 import { ONTIME_VERSION } from './ONTIME_VERSION.js';
 import { consoleSuccess, consoleHighlight, consoleError } from './utils/console.js';
 

apps/server/src/classes/Logger.ts

@@ -4,7 +4,7 @@ import { generateId, millisToString } from 'ontime-utils';
 import { clock } from '../services/Clock.js';
 import { socket } from '../adapters/WebsocketAdapter.js';
 import { consoleSubdued, consoleError } from '../utils/console.js';
-import { isProduction } from '../externals.js';
+import { isProduction } from '../setup/environment.js';
 
 class Logger {
   private queue: Log[];

apps/server/src/classes/data-provider/DataProvider.ts

@@ -14,7 +14,7 @@ import { JSONFilePreset } from 'lowdb/node';
 
 import { isPath } from '../../utils/fileManagement.js';
 import { shouldCrashDev } from '../../utils/development.js';
-import { isTest } from '../../externals.js';
+import { isTest } from '../../setup/environment.js';
 
 import { safeMerge } from './DataProvider.utils.js';
 

apps/server/src/externals.ts

@@ -7,14 +7,6 @@ import { readFileSync, writeFileSync } from 'node:fs';
 import { srcFiles } from './setup/index.js';
 
 // =================================================
-// resolve running environment
-const env = process.env.NODE_ENV || 'production';
-
-export const isTest = Boolean(process.env.IS_TEST);
-export const environment = isTest ? 'test' : env;
-export const isDocker = env === 'docker';
-export const isProduction = isDocker || (env === 'production' && !isTest);
-export const isOntimeCloud = Boolean(process.env.IS_CLOUD);
 export const password = process.env.SESSION_PASSWORD;
 export const routerPrefix = process.env.ROUTER_PREFIX;
 

apps/server/src/services/app-state-service/AppStateService.ts

@@ -2,7 +2,7 @@ import { Low } from 'lowdb';
 import { JSONFile } from 'lowdb/node';
 
 import { publicFiles } from '../../setup/index.js';
-import { isTest } from '../../externals.js';
+import { isTest } from '../../setup/environment.js';
 import { isPath } from '../../utils/fileManagement.js';
 import { shouldCrashDev } from '../../utils/development.js';
 

apps/server/src/setup/environment.ts

@@ -0,0 +1,8 @@
+// resolve running environment
+const env = process.env.NODE_ENV || 'production';
+
+export const isTest = Boolean(process.env.IS_TEST);
+export const environment = isTest ? 'test' : env;
+export const isDocker = env === 'docker';
+export const isProduction = isDocker || (env === 'production' && !isTest);
+export const isOntimeCloud = Boolean(process.env.IS_CLOUD);

apps/server/src/setup/index.ts

@@ -10,7 +10,7 @@ import { dirname, join } from 'path';
 
 import { config } from './config.js';
 import { ensureDirectory } from '../utils/fileManagement.js';
-import { isProduction } from '../externals.js';
+import { isProduction } from './environment.js';
 
 /**
  * Returns public path depending on OS

apps/server/src/utils/development.ts

@@ -1,4 +1,4 @@
-import { isProduction } from '../externals.js';
+import { isProduction } from '../setup/environment.js';
 
 import { consoleError } from './console.js';
 

apps/server/src/utils/network.ts

@@ -4,7 +4,7 @@ import type { Server } from 'http';
 import { networkInterfaces } from 'os';
 import type { AddressInfo } from 'net';
 
-import { isDocker, isOntimeCloud, isProduction } from '../externals.js';
+import { isDocker, isOntimeCloud, isProduction } from '../setup/environment.js';
 import { logger } from '../classes/Logger.js';
 
 /**

pnpm-workspace.yaml

@@ -11,4 +11,4 @@ catalog:
   eslint: 8.56.0
   eslint-config-prettier: 9.1.0
   eslint-plugin-prettier: 5.1.3
-  vitest: 2.1.6
+  vitest: 3.2.1