Split ssr/client ssr/server

cher-ami · Feb 26, 2024 · c41b53a · c41b53a
1 parent ad51344
commit c41b53a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/apps/front/config/config.js b/apps/front/config/config.js
@@ -10,9 +10,9 @@ export default {
   // If this value is change, add this new path in .gitignore
   outDir: resolve("dist"),
   outDirScripts: resolve("dist/_scripts"),
-  outDirServer: resolve("dist/server"),
+  outDirSsrServer: resolve("dist/ssr/server"),
+  outDirSsrClient: resolve("dist/ssr/client"),
   outDirSpa: resolve("dist/spa"),
-  outDirSsr: resolve("dist/ssr"),
   outDirStatic: resolve("dist/static"),
 
   // Input entry files array

diff --git a/apps/front/package.json b/apps/front/package.json
@@ -5,12 +5,12 @@
   "type": "module",
   "scripts": {
     "dev": "node server.dev.js",
-    "build:ssr": "vite build --ssrManifest --outDir dist/ssr",
+    "build:ssr-client": "vite build --ssrManifest --outDir dist/ssr/client",
+    "build:ssr-server": "vite build --ssr src/index-server.tsx --outDir dist/ssr/server",
     "build:spa": "cross-env VITE_SPA=true vite build --ssrManifest --outDir dist/spa",
-    "build:server": "vite build --ssr src/index-server.tsx --outDir dist/server",
     "build:scripts": "vite build -c vite.scripts.config.ts",
     "build:static": "vite build --outDir dist/static --ssrManifest",
-    "build": "npm run build:server && npm run build:ssr && npm run build:spa && npm run build:scripts && npm run build:static",
+    "build": "npm run build:ssr-server && npm run build:ssr-client && npm run build:spa && npm run build:scripts && npm run build:static",
     "generate": "node dist/_scripts/exe-prerender.js",
     "preview": "serve dist/static",
     "start": "cross-env NODE_ENV=production node server.prod",

diff --git a/apps/front/server.prod.js b/apps/front/server.prod.js
@@ -10,8 +10,8 @@ const loadEnvVars = loadEnv(process.env.NODE_ENV, process.cwd(), "")
 const BASE = loadEnvVars.VITE_APP_BASE || process.env.VITE_APP_BASE || "/"
 const PORT = process.env.DOCKER_NODE_PORT ?? portFinderSync.getPort(5173)
 const MANIFEST_PARSER_PATH = `${config.outDirScripts}/ManifestParser.js`
-const VITE_MANIFEST_PATH = `${config.outDirSsr}/.vite/manifest.json`
-const INDEX_SERVER_PATH = `${config.outDirServer}/index-server.js`
+const VITE_MANIFEST_PATH = `${config.outDirSsrClient}/.vite/manifest.json`
+const INDEX_SERVER_PATH = `${config.outDirSsrServer}/index-server.js`
 
 ;(async () => {
   // --------------------------------------------------------------------------- SERVER
@@ -25,7 +25,7 @@ const INDEX_SERVER_PATH = `${config.outDirServer}/index-server.js`
     const compression = (await import("compression")).default
     const sirv = (await import("sirv")).default
     app.use(compression())
-    app.use(BASE, sirv(config.outDirSsr, { extensions: [] }))
+    app.use(BASE, sirv(config.outDirSsrClient, { extensions: [] }))
     app.use("*", async (req, res) => {
       try {
         // Prepare scripts to inject in template