diff --git a/apps/client/vite.config.ts b/apps/client/vite.config.ts index 2caf61127..d5c17cc15 100644 --- a/apps/client/vite.config.ts +++ b/apps/client/vite.config.ts @@ -2,12 +2,14 @@ import { join } from 'path'; import { defineConfig } from 'vite'; import { viteStaticCopy } from 'vite-plugin-static-copy' +import asset_path from './src/asset_path'; const assets = [ "assets", "stylesheets", "libraries", "fonts", "translations" ]; export default defineConfig(() => ({ root: __dirname, cacheDir: '../../node_modules/.vite/apps/client', + base: "/" + asset_path, server: { port: 4200, host: 'localhost', diff --git a/apps/server/src/services/app_path.ts b/apps/server/src/services/app_path.ts index 5e14722bf..06d42a2cc 100644 --- a/apps/server/src/services/app_path.ts +++ b/apps/server/src/services/app_path.ts @@ -1,4 +1,3 @@ import assetPath from "./asset_path.js"; -import { isDev } from "./utils.js"; -export default isDev ? assetPath + "/src" : assetPath + "/app-dist"; +export default assetPath + "/src"; diff --git a/apps/server/src/services/asset_path.ts b/apps/server/src/services/asset_path.ts index 014f04f84..c5d4764e9 100644 --- a/apps/server/src/services/asset_path.ts +++ b/apps/server/src/services/asset_path.ts @@ -1,6 +1,6 @@ import packageJson from "../../package.json" with { type: "json" }; import { isDev } from "./utils"; -const assetPath = isDev ? `http://localhost:4200` : `assets/v${packageJson.version}`; +const assetPath = isDev ? `http://localhost:4200/assets/v${packageJson.version}` : `assets/v${packageJson.version}`; export default assetPath;