fix: dynamic paths should regenerate

Author: kirkness

packages/libs/lambda-at-edge/src/build.ts

@@ -426,11 +426,6 @@ class Builder {
   async buildRegenerationHandler(
     buildManifest: OriginRequestDefaultHandlerManifest
   ): Promise<void> {
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const prerenderManifest = require(join(
-      this.dotNextDir,
-      "prerender-manifest.json"
-    ));
     await Promise.all([
       this.copyTraces(buildManifest),
       this.processAndCopyHandler(
@@ -442,22 +437,15 @@ class Builder {
         join(this.serverlessDir, "pages"),
         join(this.outputDir, REGENERATION_LAMBDA_CODE_DIR, "pages"),
         {
-          recursive: true,
           filter: (file: string) => {
             const isNotPrerenderedHTMLPage = path.extname(file) !== ".html";
             const isNotStaticPropsJSONFile = path.extname(file) !== ".json";
             const isNotApiPage = pathToPosix(file).indexOf("pages/api") === -1;
-            const isDirectory = fse.statSync(file).isDirectory();
-            const isPrerenderedJSFile = this.isPrerenderedJSFile(
-              prerenderManifest,
-              path.relative(join(this.serverlessDir, "pages"), file)
-            );
 
             return (
-              isNotApiPage &&
               isNotPrerenderedHTMLPage &&
               isNotStaticPropsJSONFile &&
-              (isPrerenderedJSFile || isDirectory)
+              isNotApiPage
             );
           }
         }

packages/libs/lambda-at-edge/src/default-handler.ts

@@ -623,7 +623,6 @@ const handleOriginResponse = async ({
       : null;
     if (typeof initialRevalidateSeconds === "number" && lastModifiedAt) {
       const createdAgo =
-        // LastModified should always be defined
         (Date.now() - (lastModifiedAt.getTime() || Date.now())) / 1000;
 
       const timeToRevalidate = Math.floor(

packages/libs/lambda-at-edge/src/regeneration-handler.ts

@@ -41,15 +41,17 @@ export const handler: AWSLambda.SQSHandler = async (event) => {
       );
 
       const baseKey = cloudFrontEventRequest.uri
-        .replace(/^\//, "")
         .replace(/\.(json|html)$/, "")
         .replace(/^_next\/data\/[^\/]*\//, "");
 
+      const ssgRoute = manifest.pages.ssg.nonDynamic[baseKey];
+      const srcPath = ssgRoute.srcRoute || baseKey;
+
       // eslint-disable-next-line @typescript-eslint/no-var-requires
-      const page = require(`./pages/${baseKey}`);
+      const page = require(`./pages${srcPath}`);
 
-      const jsonKey = `_next/data/${manifest.buildId}/${baseKey}.json`;
-      const htmlKey = `static-pages/${manifest.buildId}/${baseKey}.html`;
+      const jsonKey = `_next/data/${manifest.buildId}${baseKey}.json`;
+      const htmlKey = `static-pages/${manifest.buildId}${baseKey}.html`;
 
       const { renderOpts, html } = await page.renderReqToHTML(
         req,

packages/serverless-components/nextjs-cdk-construct/src/index.ts

@@ -99,6 +99,7 @@ export class NextJSLambdaEdge extends cdk.Construct {
       {
         handler: "index.handler",
         runtime: lambda.Runtime.NODEJS_14_X,
+        timeout: Duration.minutes(1),
         code: lambda.Code.fromAsset(
           path.join(this.props.serverlessBuildOutDir, "regeneration-lambda")
         )