ADD fullComponentPath to render multiple, minor changes in serverjs &…

… webpack
hepsiburada · Apr 20, 2022 · 75a8df4 · 75a8df4
1 parent acb1752
commit 75a8df4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/renderMultiple.js b/src/renderMultiple.js
@@ -40,14 +40,15 @@ function getRenderer(name, req) {
 
   if (routeInfo) {
     const urlWithPath = url.replace('/', path);
+    const fullComponentPath = `/components/${req.params.components ?? ''}`;
 
     const context = {
       path,
       query,
       cookies,
       url: urlWithPath,
       userAgent,
-      componentPath,
+      componentPath: fullComponentPath,
       ...renderOptions
     };
 
@@ -207,6 +208,7 @@ async function getResponses(renderers) {
 async function getPreview(responses, requestCount, req) {
   const layoutName = getPreviewLayout(req.query);
   const { layouts = {} } = previewPages?.default || {};
+  const componentNames = Object.keys(responses);
   let PreviewFile = Preview;
 
   if (layouts[layoutName]) {
@@ -218,7 +220,7 @@ async function getPreview(responses, requestCount, req) {
     return getLayoutWithClass(componentName, responses[name].fullHtml);
   });
 
-  return PreviewFile([...content].join('\n'), `${requestCount} request!`);
+  return PreviewFile([...content].join('\n'), `${requestCount} request!`, componentNames);
 }
 
 const DEFAULT_PARTIALS = ['RequestDispatcher'];

diff --git a/src/server.js b/src/server.js
@@ -3,12 +3,16 @@ import http from 'http';
 import voltranConfig from '../voltran.config';
 import { hiddie, composedMiddlewares, prepareMiddlewares } from './middleware';
 
+const isDebug = voltranConfig.dev;
+const customServer = voltranConfig.entry.server;
+const canStartServer = process.env.NODE_ENV === 'production' && (!customServer || isDebug);
+
 const launchServer = () => {
   prepareMiddlewares();
   http.createServer(hiddie.run).listen(voltranConfig.port);
 };
 
-if (process.env.NODE_ENV === 'production' && !voltranConfig.entry.server) {
+if (canStartServer) {
   launchServer();
 }
 

diff --git a/webpack.server.config.js b/webpack.server.config.js
@@ -25,7 +25,8 @@ const voltranServerConfigPath = voltranConfig.webpackConfiguration.server;
 const voltranServerConfig = voltranServerConfigPath
   ? require(voltranConfig.webpackConfiguration.server)
   : '';
-const voltranCustomServer = voltranConfig.entry.server || 'src/server.js';
+const voltranCustomServer =
+  voltranConfig.entry.server && !isDebug ? voltranConfig.entry.server : 'src/server.js';
 
 const voltranServer = path.resolve(__dirname, isDebug ? voltranCustomServer : 'src/main.js');