From bc8ee3ecf2383bf0b1026c94ad81d3f005767347 Mon Sep 17 00:00:00 2001
From: daishi <daishi@axlight.com>
Date: Thu, 7 Dec 2023 09:47:42 +0900
Subject: [PATCH] revert some changes

---
 packages/waku/src/lib/middleware/rsc/ssr.ts | 16 +++++-----------
 packages/waku/src/lib/rsc/renderer.ts       |  6 +-----
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/packages/waku/src/lib/middleware/rsc/ssr.ts b/packages/waku/src/lib/middleware/rsc/ssr.ts
index 83b10c6f3..b3829c4cc 100644
--- a/packages/waku/src/lib/middleware/rsc/ssr.ts
+++ b/packages/waku/src/lib/middleware/rsc/ssr.ts
@@ -153,7 +153,6 @@ const loadServerFile = async (
     return import(fileURL);
   }
   const vite = await getViteServer();
-  console.log('fileURL', fileURL);
   return vite.ssrLoadModule(fileURLToFilePath(fileURL));
 };
 
@@ -396,27 +395,22 @@ export const renderHtml = async <Context>(
           {},
           {
             get(_target, name: string) {
-              console.log('get', filePath, name);
-              const file = filePath.startsWith('/@id/')
-                ? filePath
-                : filePath.slice(config.basePath.length);
+              const file = filePath.slice(config.basePath.length);
               if (command === 'dev') {
-                const resolvedFilePath = file.startsWith('@fs/')
+                const filePath = file.startsWith('@fs/')
                   ? decodeFilePathFromAbsolute(file.slice('@fs'.length))
                   : joinPath(config.rootDir, file);
                 const wakuDist = joinPath(
                   fileURLToFilePath(import.meta.url),
                   '../../../..',
                 );
-                if (resolvedFilePath.startsWith(wakuDist)) {
+                if (filePath.startsWith(wakuDist)) {
                   const id =
                     'waku' +
-                    resolvedFilePath
-                      .slice(wakuDist.length)
-                      .replace(/\.\w+$/, '');
+                    filePath.slice(wakuDist.length).replace(/\.\w+$/, '');
                   return { id, chunks: [id], name };
                 }
-                const id = filePathToFileURL(resolvedFilePath) + '#dev';
+                const id = filePathToFileURL(filePath) + '#dev';
                 return { id, chunks: [id], name };
               }
               // command !== 'dev'
diff --git a/packages/waku/src/lib/rsc/renderer.ts b/packages/waku/src/lib/rsc/renderer.ts
index d82d17c62..e20bff85b 100644
--- a/packages/waku/src/lib/rsc/renderer.ts
+++ b/packages/waku/src/lib/rsc/renderer.ts
@@ -61,9 +61,7 @@ const resolveClientEntry = (
     return config.basePath + '@fs' + encodeFilePathToAbsolute(filePath);
   }
   if (!filePath.startsWith(root)) {
-    throw new Error(
-      'Resolving client module outside root is not supported.',
-    );
+    throw new Error('Resolving client module outside root is not supported.');
   }
   return config.basePath + relativePath(root, filePath);
 };
@@ -139,7 +137,6 @@ export async function renderRSC(
 
   const rsfPrefix =
     joinPath(config.rootDir, isDev ? config.srcDir : config.distDir) + '/';
-  console.log(rsfPrefix);
 
   const render = async (renderContext: RenderContext, input: string) => {
     const elements = await renderEntries.call(renderContext, input);
@@ -159,7 +156,6 @@ export async function renderRSC(
     {
       get(_target, encodedId: string) {
         const [file, name] = encodedId.split('#') as [string, string];
-        console.log('file', file, name);
         const id = resolveClientEntry(file, config, isDev);
         moduleIdCallback?.(id);
         return { id, chunks: [id], name, async: true };