Incremental static regeneration

README.md

@@ -774,7 +774,7 @@ Please see the [contributing](./CONTRIBUTING.md) guide.
 
 This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)].
 <a href="https://github.com/serverless-nextjs/serverless-next.js/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=serverless-nextjs/serverless-next.js" />
+<img src="https://contrib.rocks/image?repo=serverless-nextjs/serverless-next.js" />
 </a>
 
 Made with [contributors-img](https://contrib.rocks).

packages/deprecated/serverless-plugin/__mocks__/aws-sdk.js

@@ -1,5 +1,5 @@
-const promisify = (mockFunction) => {
-  const mockPromise = jest.fn(() => Promise.resolve());
+const promisify = (mockFunction, mockResolvedValue) => {
+  const mockPromise = jest.fn(() => Promise.resolve(mockResolvedValue));
   mockFunction.mockReturnValue({
     promise: mockPromise
   });
@@ -71,6 +71,23 @@ const {
 } = promisify(jest.fn());
 MockSTS.prototype.getCallerIdentity = mockGetCallerIdentity;
 
+const MockSQS = jest.fn();
+const {
+  mockFunction: mockGetQueueAttributes,
+  mockPromise: mockGetQueueAttributesPromise
+} = promisify(jest.fn());
+const {
+  mockFunction: mockCreateQueue,
+  mockPromise: mockCreateQueuePromise
+} = promisify(jest.fn());
+const {
+  mockFunction: mockDeleteQueue,
+  mockPromise: mockDeleteQueuePromise
+} = promisify(jest.fn());
+MockSQS.prototype.createQueue = mockCreateQueue;
+MockSQS.prototype.deleteQueue = mockDeleteQueue;
+MockSQS.prototype.getQueueAttributes = mockGetQueueAttributes;
+
 const MockAPIGateway = function () {};
 const {
   mockFunction: mockGetRestApis,
@@ -86,6 +103,9 @@ const mockMetadataRequest = jest
   .mockImplementation((path, cb) => cb(null, {}));
 MockMetadataService.prototype.request = mockMetadataRequest;
 
+const mockListEventSourceMappingsPromise = jest.fn();
+const mockCreateEventSourceMappingPromise = jest.fn();
+
 module.exports = {
   EnvironmentCredentials: MockEnvironmentCredentials,
   S3: jest.fn(() => {
@@ -97,10 +117,27 @@ module.exports = {
   CloudFormation: MockCloudFormation,
   CloudWatchLogs: MockCloudWatchLogs,
   STS: MockSTS,
+  SQS: MockSQS,
+  Lambda: jest.fn().mockImplementation(() => ({
+    listEventSourceMappings: jest.fn().mockReturnValue({
+      promise: mockListEventSourceMappingsPromise
+    }),
+    createEventSourceMapping: jest.fn().mockReturnValue({
+      promise: mockCreateEventSourceMappingPromise
+    })
+  })),
   APIGateway: MockAPIGateway,
   SharedIniFileCredentials: MockSharedIniFileCredentials,
   MetadataService: MockMetadataService,
 
+  mockDeleteQueue,
+  mockDeleteQueuePromise,
+  mockCreateQueue,
+  mockCreateQueuePromise,
+  mockGetQueueAttributes,
+  mockGetQueueAttributesPromise,
+  mockListEventSourceMappingsPromise,
+  mockCreateEventSourceMappingPromise,
   mockDescribeStacks,
   mockDescribeStacksPromise,
   mockCreateStack,

packages/e2e-tests/next-app-dynamic-routes/package.json

@@ -36,7 +36,7 @@
     "aws-sdk": "2.758.0",
     "babel-plugin-istanbul": "6.0.0",
     "babel-plugin-transform-class-properties": "6.24.1",
-    "cypress": "5.1.0",
+    "cypress": "7.2.0",
     "istanbul-lib-coverage": "3.0.0",
     "nyc": "15.1.0",
     "ts-node": "9.0.0",

packages/e2e-tests/next-app-using-serverless-trace/package.json

@@ -36,7 +36,7 @@
     "aws-sdk": "2.758.0",
     "babel-plugin-istanbul": "6.0.0",
     "babel-plugin-transform-class-properties": "6.24.1",
-    "cypress": "5.1.0",
+    "cypress": "7.2.0",
     "istanbul-lib-coverage": "3.0.0",
     "nyc": "15.1.0",
     "ts-node": "9.0.0",

packages/e2e-tests/next-app-with-base-path/package.json

@@ -36,7 +36,7 @@
     "aws-sdk": "2.758.0",
     "babel-plugin-istanbul": "6.0.0",
     "babel-plugin-transform-class-properties": "6.24.1",
-    "cypress": "5.1.0",
+    "cypress": "7.2.0",
     "istanbul-lib-coverage": "3.0.0",
     "nyc": "15.1.0",
     "ts-node": "9.0.0",

packages/e2e-tests/next-app-with-locales-using-serverless-trace/package.json

@@ -36,7 +36,7 @@
     "aws-sdk": "2.758.0",
     "babel-plugin-istanbul": "6.0.0",
     "babel-plugin-transform-class-properties": "6.24.1",
-    "cypress": "5.1.0",
+    "cypress": "7.2.0",
     "istanbul-lib-coverage": "3.0.0",
     "nyc": "15.1.0",
     "ts-node": "9.0.0",

packages/e2e-tests/next-app-with-locales/package.json

@@ -36,7 +36,7 @@
     "aws-sdk": "2.758.0",
     "babel-plugin-istanbul": "6.0.0",
     "babel-plugin-transform-class-properties": "6.24.1",
-    "cypress": "5.1.0",
+    "cypress": "7.2.0",
     "istanbul-lib-coverage": "3.0.0",
     "nyc": "15.1.0",
     "ts-node": "9.0.0",

packages/e2e-tests/next-app-with-trailing-slash/package.json

@@ -36,7 +36,7 @@
     "aws-sdk": "2.758.0",
     "babel-plugin-istanbul": "6.0.0",
     "babel-plugin-transform-class-properties": "6.24.1",
-    "cypress": "5.1.0",
+    "cypress": "7.2.0",
     "istanbul-lib-coverage": "3.0.0",
     "nyc": "15.1.0",
     "ts-node": "9.0.0",

packages/e2e-tests/next-app/cypress.json

@@ -3,7 +3,6 @@
   "supportFile": "cypress/support/index.ts",
   "responseTimeout": 15000,
   "requestTimeout": 15000,
-  "experimentalNetworkStubbing": true,
   "experimentalFetchPolyfill": true,
   "retries": 4
 }

packages/e2e-tests/next-app/cypress/integration/redirects.test.ts

@@ -42,7 +42,7 @@ describe("Redirects Tests", () => {
       {
         path: "//example.com/",
         expectedPath: "/example.com",
-        expectedStatus: 404
+        expectedStatus: 308
       }
     ].forEach(({ path, expectedPath, expectedStatus }) => {
       it(`does not redirect page ${path}`, () => {

packages/e2e-tests/next-app/cypress/integration/static-regeneration.test.ts

@@ -0,0 +1,54 @@
+describe("ISR Tests", () => {
+  before(() => {
+    cy.ensureAllRoutesNotErrored();
+  });
+
+  // We don't want this test to retry as the cache will not be expired between
+  // runs
+  describe("SSG page", { retries: 0 }, () => {
+    [
+      "/revalidated-ssg-page",
+      // Pre-rendered ISR page
+      "/revalidated-ssg-pages/101",
+      // Blocking dynamic generated page
+      "/revalidated-ssg-pages/105"
+    ].forEach((path) => {
+      it(`serves the cached re-rendered page "${path}" after 2 reloads`, () => {
+        // The initial load will have expired in the cache
+        cy.ensureRouteNotCached(path);
+        cy.visit(path);
+        cy.location("pathname").should("eq", path);
+
+        cy.get("[data-cy=date-text]")
+          .invoke("text")
+          .then((text1) => {
+            // When we reload again the page still should not be cached as this
+            // should be the first time its being served from the origin
+            cy.ensureRouteNotCached(path);
+            cy.reload();
+            cy.get("[data-cy=date-text]")
+              .invoke("text")
+              .then((text2) => {
+                // Check that the date text has changed since the initial page
+                // load
+                expect(text1).not.to.be.eq(text2);
+                // The new date should be greater than the original
+                expect(new Date(text2).getTime()).to.be.greaterThan(
+                  new Date(text1).getTime()
+                );
+                // Make sure the next load is cached
+                cy.ensureRouteCached(path);
+                // Be sure that the regeneration has run and uploaded the file
+                cy.wait(2000);
+                cy.reload();
+              });
+          });
+
+        // Wait for the cache to expire after the 10s
+        cy.wait(8000);
+        cy.ensureRouteNotCached(path);
+        cy.reload();
+      });
+    });
+  });
+});

packages/e2e-tests/next-app/package.json

@@ -36,7 +36,7 @@
     "aws-sdk": "2.758.0",
     "babel-plugin-istanbul": "6.0.0",
     "babel-plugin-transform-class-properties": "6.24.1",
-    "cypress": "5.1.0",
+    "cypress": "7.2.0",
     "istanbul-lib-coverage": "3.0.0",
     "nyc": "15.1.0",
     "ts-node": "9.0.0",

packages/e2e-tests/next-app/pages/revalidated-ssg-page.tsx

@@ -0,0 +1,27 @@
+import React from "react";
+import { GetStaticPropsResult } from "next";
+
+type SSGPageProps = {
+  date: string;
+};
+
+export default function RevalidatedSSGPage(props: SSGPageProps): JSX.Element {
+  return (
+    <React.Fragment>
+      <div>
+        <p data-cy="date-text">{props.date}</p>
+      </div>
+    </React.Fragment>
+  );
+}
+
+export async function getStaticProps(): Promise<
+  GetStaticPropsResult<SSGPageProps>
+> {
+  return {
+    revalidate: 10,
+    props: {
+      date: new Date().toJSON()
+    }
+  };
+}

packages/e2e-tests/next-app/pages/revalidated-ssg-pages/[id].tsx

@@ -0,0 +1,62 @@
+import React from "react";
+import {
+  GetStaticPaths,
+  GetStaticPropsContext,
+  GetStaticPropsResult
+} from "next";
+
+const sampleUserData = [
+  { id: 101, name: "Alice" },
+  { id: 102, name: "Bob" },
+  { id: 103, name: "Caroline" },
+  { id: 104, name: "Dave" }
+];
+
+const newUser = { id: 105, name: "Henry" };
+
+type SSGPageProps = {
+  date: string;
+  user?: typeof sampleUserData[number];
+};
+
+export default function RevalidatedSSGPage(props: SSGPageProps): JSX.Element {
+  return (
+    <React.Fragment>
+      <div>
+        <p data-cy="date-text">{props.date}</p>
+        <p data-cy="user-id-text">{props.user?.id ?? "No user found"}</p>
+      </div>
+    </React.Fragment>
+  );
+}
+
+export const getStaticPaths: GetStaticPaths = async () => {
+  // To simulate new data becoming available in a data source we only make the
+  // `newUser` available when rendering on AWS, rather than at build time.
+  const runningOnAws = !!process.env.AWS_LAMBDA_FUNCTION_NAME;
+  const paths = sampleUserData.map((user) => ({
+    params: { id: user.id.toString() }
+  }));
+
+  if (runningOnAws) {
+    paths.push({ params: { id: newUser.id.toString() } });
+  }
+
+  return { paths, fallback: "blocking" };
+};
+
+export async function getStaticProps(
+  context: GetStaticPropsContext<{ id: string }>
+): Promise<GetStaticPropsResult<SSGPageProps>> {
+  const users = [...sampleUserData, newUser];
+  const user = users.find(
+    ({ id }) => context.params?.id.toString() === id.toString()
+  );
+  return {
+    revalidate: 10,
+    props: {
+      date: new Date().toJSON(),
+      user
+    }
+  };
+}