Merge branch 'main' into Merged-Downstream

# Conflicts:
#	apps/client/package.json
#	apps/client/src/features/editor/extensions/extensions.ts
#	apps/client/src/pages/auth/login.tsx
#	apps/server/package.json
#	apps/server/src/integrations/environment/environment.service.ts
#	packages/editor-ext/src/index.ts
#	pnpm-lock.yaml
This commit is contained in:
PALMER
2025-01-16 07:38:37 +10:00
224 changed files with 10495 additions and 4403 deletions
+3 -1
View File
@@ -6,12 +6,14 @@ import { VitePWA } from 'vite-plugin-pwa'
export const envPath = path.resolve(process.cwd(), "..", "..");
export default defineConfig(({ mode }) => {
const { APP_URL } = loadEnv(mode, envPath, "");
const { APP_URL, FILE_UPLOAD_SIZE_LIMIT, DRAWIO_URL } = loadEnv(mode, envPath, "");
return {
define: {
"process.env": {
APP_URL,
FILE_UPLOAD_SIZE_LIMIT,
DRAWIO_URL
},
'APP_VERSION': JSON.stringify(process.env.npm_package_version),
},