RSC: Clean up overly verbose logging (redwoodjs#10536)

Tobbe · May 3, 2024 · b862c6e · b862c6e
1 parent e1e9171
commit b862c6e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 19 deletions.
diff --git a/packages/vite/src/clientSsr.ts b/packages/vite/src/clientSsr.ts
@@ -61,10 +61,11 @@ function resolveClientEntryForProd(
   const absoluteClientEntries = Object.fromEntries(
     Object.entries(clientEntries).map(([key, val]) => {
       let fullKey = path.join(baseDir, key)
+
       if (process.platform === 'win32') {
         fullKey = fullKey.replaceAll('\\', '/')
       }
-      console.log('fullKey', fullKey, 'value', basePath + path.sep + val)
+
       return [fullKey, basePath + path.sep + val]
     }),
   )

diff --git a/packages/vite/src/rsc/rscBuildAnalyze.ts b/packages/vite/src/rsc/rscBuildAnalyze.ts
@@ -94,8 +94,6 @@ export async function rscBuildAnalyze() {
     }),
   )
 
-  console.log('clientEntryFileSet', Array.from(clientEntryFileSet))
-  console.log('serverEntryFileSet', Array.from(serverEntryFileSet))
   console.log('clientEntryFiles', clientEntryFiles)
   console.log('serverEntryFiles', serverEntryFiles)
 

diff --git a/packages/vite/src/rsc/rscBuildEntriesFile.ts b/packages/vite/src/rsc/rscBuildEntriesFile.ts
@@ -45,12 +45,10 @@ export async function rscBuildEntriesMappings(
       )?.fileName
 
     if (entryFile) {
-      console.log('entryFile', entryFile)
       if (process.platform === 'win32') {
         // Prevent errors on Windows like
         // Error: No client entry found for D:/a/redwood/rsc-project/web/dist/server/assets/rsc0.js
         const entryFileSlash = entryFile.replaceAll('\\', '/')
-        console.log('entryFileSlash', entryFileSlash)
         clientEntries[entryFileSlash] = fileName
       } else {
         clientEntries[entryFile] = fileName
@@ -61,7 +59,8 @@ export async function rscBuildEntriesMappings(
   console.log('clientEntries', clientEntries)
   await fs.appendFile(
     rwPaths.web.distRscEntries,
-    `// client component mapping (dist/rsc -> dist/client)\nexport const clientEntries = ${JSON.stringify(clientEntries, undefined, 2)};\n\n`,
+    '// client component mapping (dist/rsc -> dist/client)\n' +
+      `export const clientEntries = ${JSON.stringify(clientEntries, undefined, 2)};\n\n`,
   )
 
   // Server component names to RSC server asset mapping
@@ -80,6 +79,7 @@ export async function rscBuildEntriesMappings(
   console.log('serverEntries', serverEntries)
   await fs.appendFile(
     rwPaths.web.distRscEntries,
-    `// server component mapping (src -> dist/rsc)\nexport const serverEntries = ${JSON.stringify(serverEntries, undefined, 2)};\n\n`,
+    '// server component mapping (src -> dist/rsc)\n' +
+      `export const serverEntries = ${JSON.stringify(serverEntries, undefined, 2)};\n\n`,
   )
 }
diff --git a/packages/vite/src/rsc/rscBuildForServer.ts b/packages/vite/src/rsc/rscBuildForServer.ts
@@ -92,17 +92,12 @@ export async function rscBuildForServer(
             // HACK to bring directives to the front
             let code = ''
             const clientValues = Object.values(clientEntryFiles)
-            console.log('chunk.moduleIds', chunk.moduleIds)
-            console.log('clientValues', clientValues)
             if (chunk.moduleIds.some((id) => clientValues.includes(id))) {
-              console.log('adding "use client" to', chunk.fileName)
               code += '"use client";'
             }
 
             const serverValues = Object.values(serverEntryFiles)
-            console.log('serverValues', serverValues)
             if (chunk.moduleIds.some((id) => serverValues.includes(id))) {
-              console.log('adding "use server" to', chunk.fileName)
               code += '"use server";'
             }
             return code

diff --git a/packages/vite/src/rsc/rscWorker.ts b/packages/vite/src/rsc/rscWorker.ts
@@ -290,10 +290,11 @@ async function setClientEntries(): Promise<void> {
   absoluteClientEntries = Object.fromEntries(
     Object.entries(clientEntries).map(([key, val]) => {
       let fullKey = path.join(baseDir, key)
+
       if (process.platform === 'win32') {
         fullKey = fullKey.replaceAll('\\', '/')
       }
-      console.log('fullKey', fullKey, 'value', config.base + val)
+
       return [fullKey, config.base + val]
     }),
   )

diff --git a/packages/vite/src/runFeServer.ts b/packages/vite/src/runFeServer.ts
@@ -77,12 +77,6 @@ export async function runFeServer() {
     await import(clientBuildManifestUrl, { with: { type: 'json' } })
   ).default
 
-  if (rwConfig.experimental?.rsc?.enabled) {
-    console.log('='.repeat(80))
-    console.log('buildManifest', clientBuildManifest)
-    console.log('='.repeat(80))
-  }
-
   // @MARK: Surely there's a better way than this!
   const clientEntry = Object.values(clientBuildManifest).find(
     (manifestItem) => {