diff --git a/apps/desktop/tsconfig.app.json b/apps/desktop/tsconfig.app.json index dc261ef60..ccfe44104 100644 --- a/apps/desktop/tsconfig.app.json +++ b/apps/desktop/tsconfig.app.json @@ -17,9 +17,5 @@ "eslint.config.cjs", "eslint.config.mjs" ], - "references": [ - { - "path": "../server/tsconfig.app.json" - } - ] + "references": [] } diff --git a/apps/desktop/tsconfig.json b/apps/desktop/tsconfig.json index 38116a0b8..816e3f36f 100644 --- a/apps/desktop/tsconfig.json +++ b/apps/desktop/tsconfig.json @@ -3,9 +3,6 @@ "files": [], "include": [], "references": [ - { - "path": "../server" - }, { "path": "./tsconfig.app.json" } diff --git a/_regroup/images/google-logo.svg b/apps/server/src/assets/images/google-logo.svg similarity index 100% rename from _regroup/images/google-logo.svg rename to apps/server/src/assets/images/google-logo.svg diff --git a/_regroup/images/icon-black.svg b/apps/server/src/assets/images/icon-black.svg similarity index 100% rename from _regroup/images/icon-black.svg rename to apps/server/src/assets/images/icon-black.svg diff --git a/_regroup/images/icon-color.svg b/apps/server/src/assets/images/icon-color.svg similarity index 100% rename from _regroup/images/icon-color.svg rename to apps/server/src/assets/images/icon-color.svg diff --git a/_regroup/images/icon-installer.svg b/apps/server/src/assets/images/icon-installer.svg similarity index 100% rename from _regroup/images/icon-installer.svg rename to apps/server/src/assets/images/icon-installer.svg diff --git a/_regroup/images/icon-purple.svg b/apps/server/src/assets/images/icon-purple.svg similarity index 100% rename from _regroup/images/icon-purple.svg rename to apps/server/src/assets/images/icon-purple.svg diff --git a/_regroup/images/icon-white.svg b/apps/server/src/assets/images/icon-white.svg similarity index 100% rename from _regroup/images/icon-white.svg rename to apps/server/src/assets/images/icon-white.svg diff --git a/apps/server/src/routes/assets.ts b/apps/server/src/routes/assets.ts index 128efdb01..bf0a3991f 100644 --- a/apps/server/src/routes/assets.ts +++ b/apps/server/src/routes/assets.ts @@ -34,14 +34,15 @@ async function register(app: express.Application) { app.use(`/${assetPath}/libraries`, proxy(publicUrl, { proxyReqPathResolver: (req) => "/libraries" + req.url })); + app.use(`/${assetPath}/images`, persistentCacheStatic(path.join(srcRoot, "assets", "images"))); } else { app.use(`/${assetPath}/app`, persistentCacheStatic(path.join(srcRoot, "public/app"))); app.use(`/${assetPath}/app-dist`, persistentCacheStatic(path.join(srcRoot, "public/app-dist"))); app.use(`/${assetPath}/stylesheets`, persistentCacheStatic(path.join(srcRoot, "public/stylesheets"))); + app.use(`/${assetPath}/images`, persistentCacheStatic(path.join(srcRoot, "..", "images"))); } app.use(`/${assetPath}/fonts`, persistentCacheStatic(path.join(srcRoot, "public/fonts"))); app.use(`/assets/vX/fonts`, express.static(path.join(srcRoot, "public/fonts"))); - app.use(`/${assetPath}/images`, persistentCacheStatic(path.join(srcRoot, "..", "images"))); app.use(`/assets/vX/images`, express.static(path.join(srcRoot, "..", "images"))); app.use(`/assets/vX/stylesheets`, express.static(path.join(srcRoot, "public/stylesheets"))); app.use(`/${assetPath}/libraries`, persistentCacheStatic(path.join(srcRoot, "public/libraries"))); diff --git a/apps/server/webpack.config.cjs b/apps/server/webpack.config.cjs index bdec15d9e..cc57b5e18 100644 --- a/apps/server/webpack.config.cjs +++ b/apps/server/webpack.config.cjs @@ -24,11 +24,7 @@ module.exports = { { from: "node_modules/better-sqlite3/build/Release", to: join(outputDir, "Release") - }, - { - from: "../client/dist", - to: join(outputDir, "app") - } + }, ] }) ]