namespace SSR page route entry points and route chunks

ProjectEvergreen · Mar 16, 2024 · 4592e6c · 4592e6c
1 parent 5612fa0
commit 4592e6c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/packages/cli/src/config/rollup.config.js b/packages/cli/src/config/rollup.config.js
@@ -400,8 +400,8 @@ const getRollupConfigForSsr = async (compilation, input) => {
     input: filepath,
     output: {
       dir: normalizePathnameForWindows(outputDir),
-      entryFileNames: '[name].route.js',
-      chunkFileNames: '[name].route.chunk.[hash].js'
+      entryFileNames: `${path.basename(filepath).split('.')[0]}.route.js`,
+      chunkFileNames: `${path.basename(filepath).split('.')[0]}.route.chunk.[hash].js`
     },
     plugins: [
       greenwoodResourceLoader(compilation),

diff --git a/packages/plugin-adapter-netlify/src/index.js b/packages/plugin-adapter-netlify/src/index.js
@@ -97,8 +97,8 @@ async function netlifyAdapter(compilation) {
     const { id } = page;
     const outputType = 'page';
     const outputRoot = new URL(`./${id}/`, adapterOutputUrl);
-    const files = (await fs.readdir(outputDir))
-      .filter(file => file.startsWith(`${id}.route.chunk.`) && file.endsWith('.js'));
+    const chunks = (await fs.readdir(outputDir))
+      .filter(file => file.startsWith(`${id}.route.chunk`) && file.endsWith('.js'));
 
     await setupOutputDirectory(id, outputRoot, outputType);
 
@@ -109,11 +109,11 @@ async function netlifyAdapter(compilation) {
       { recursive: true }
     );
 
-    // and the URL chunk for renderer plugin and executeRouteModule
-    for (const file of files) {
+    // and any (URL) chunks for the page
+    for (const chunk of chunks) {
       await fs.cp(
-        new URL(`./${file}`, outputDir),
-        new URL(`./${file}`, outputRoot),
+        new URL(`./${chunk}`, outputDir),
+        new URL(`./${chunk}`, outputRoot),
         { recursive: true }
       );
     }

diff --git a/packages/plugin-adapter-vercel/src/index.js b/packages/plugin-adapter-vercel/src/index.js
@@ -86,8 +86,8 @@ async function vercelAdapter(compilation) {
     const outputType = 'page';
     const { id } = page;
     const outputRoot = new URL(`./${basePath}/${id}.func/`, adapterOutputUrl);
-    const files = (await fs.readdir(outputDir))
-      .filter(file => file.indexOf('.route.chunk.') > 0 && file.endsWith('.js'));
+    const chunks = (await fs.readdir(outputDir))
+      .filter(file => file.startsWith(`${id}.route.chunk`) && file.endsWith('.js'));
 
     await setupFunctionBuildFolder(id, outputType, outputRoot);
 
@@ -98,11 +98,11 @@ async function vercelAdapter(compilation) {
       { recursive: true }
     );
 
-    // and the URL chunk for renderer plugin and executeRouteModule
-    for (const file of files) {
+    // and any (URL) chunks for the page
+    for (const chunk of chunks) {
       await fs.cp(
-        new URL(`./${file}`, outputDir),
-        new URL(`./${file}`, outputRoot),
+        new URL(`./${chunk}`, outputDir),
+        new URL(`./${chunk}`, outputRoot),
         { recursive: true }
       );
     }