Merge branch 'master' into fallback-blocking

serverless-nextjs · Apr 21, 2021 · 4471d99 · 4471d99
2 parents e5ee510 + 5eedc12
commit 4471d99
Show file tree

Hide file tree

Showing 13 changed files with 59 additions and 16 deletions.
diff --git a/packages/deprecated/serverless-plugin/CHANGELOG.md b/packages/deprecated/serverless-plugin/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.6.5-alpha.4](https://github.com/serverless-nextjs/serverless-next.js/compare/@sls-next/serverless-plugin@2.6.5-alpha.3...@sls-next/serverless-plugin@2.6.5-alpha.4) (2021-04-21)
+
+**Note:** Version bump only for package @sls-next/serverless-plugin
+
 ## [2.6.5-alpha.3](https://github.com/serverless-nextjs/serverless-next.js/compare/@sls-next/serverless-plugin@2.6.5-alpha.2...@sls-next/serverless-plugin@2.6.5-alpha.3) (2021-04-02)
 
 **Note:** Version bump only for package @sls-next/serverless-plugin

diff --git a/packages/deprecated/serverless-plugin/examples/app-basic/yarn.lock b/packages/deprecated/serverless-plugin/examples/app-basic/yarn.lock
@@ -9059,9 +9059,9 @@ sshpk@^1.7.0:
     tweetnacl "~0.14.0"
 
 ssri@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
-  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5"
+  integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==
   dependencies:
     figgy-pudding "^3.5.1"
 

diff --git a/packages/deprecated/serverless-plugin/package.json b/packages/deprecated/serverless-plugin/package.json
@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.6.5-alpha.3",
+  "version": "2.6.5-alpha.4",
   "description": "A serverless plugin for nextjs 8 serverless target",
   "main": "index.js",
   "keywords": [

diff --git a/packages/libs/lambda-at-edge/CHANGELOG.md b/packages/libs/lambda-at-edge/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.8.0-alpha.35](https://github.com/serverless-nextjs/serverless-next.js/compare/@sls-next/lambda-at-edge@1.8.0-alpha.34...@sls-next/lambda-at-edge@1.8.0-alpha.35) (2021-04-21)
+
+**Note:** Version bump only for package @sls-next/lambda-at-edge
+
+# [1.8.0-alpha.34](https://github.com/serverless-nextjs/serverless-next.js/compare/@sls-next/lambda-at-edge@1.8.0-alpha.33...@sls-next/lambda-at-edge@1.8.0-alpha.34) (2021-04-21)
+
+### Bug Fixes
+
+- **lambda-at-edge:** render 404 SSR page when there is no static 404 page during fallback response ([9f430dc](https://github.com/serverless-nextjs/serverless-next.js/commit/9f430dca6e88c7c99d560fbb78704de8a97acd16))
+- **lambda-at-edge, e2e-test:** fixes for fallback and fallback e2e tests ([#997](https://github.com/serverless-nextjs/serverless-next.js/issues/997)) ([aad8536](https://github.com/serverless-nextjs/serverless-next.js/commit/aad8536f21cc45a9ddb33a48cb2750d6265a8de1))
+
 # [1.8.0-alpha.33](https://github.com/serverless-nextjs/serverless-next.js/compare/@sls-next/lambda-at-edge@1.8.0-alpha.32...@sls-next/lambda-at-edge@1.8.0-alpha.33) (2021-04-16)
 
 ### Bug Fixes

diff --git a/packages/libs/lambda-at-edge/package.json b/packages/libs/lambda-at-edge/package.json
@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.0-alpha.33",
+  "version": "1.8.0-alpha.35",
   "description": "Provides handlers that can be used in CloudFront Lambda@Edge to deploy next.js applications to the edge",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/libs/lambda-at-edge/src/default-handler.ts b/packages/libs/lambda-at-edge/src/default-handler.ts
@@ -174,7 +174,7 @@ const router = (
       }
     }
 
-    // only use the 404 page if the project exports it
+    // Only use the 404 page if the project exports it
     if (html.nonDynamic["/404"] !== undefined) {
       return `pages${getLocalePrefixFromUri(uri, routesManifest)}/404.html`;
     }

diff --git a/packages/serverless-components/nextjs-cdk-construct/CHANGELOG.md b/packages/serverless-components/nextjs-cdk-construct/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.19.0-alpha.41](https://github.com/serverless-nextjs/serverless-next.js/compare/@sls-next/cdk-construct@1.19.0-alpha.40...@sls-next/cdk-construct@1.19.0-alpha.41) (2021-04-21)
+
+**Note:** Version bump only for package @sls-next/cdk-construct
+
+# [1.19.0-alpha.40](https://github.com/serverless-nextjs/serverless-next.js/compare/@sls-next/cdk-construct@1.19.0-alpha.39...@sls-next/cdk-construct@1.19.0-alpha.40) (2021-04-21)
+
+### Bug Fixes
+
+- **cdk-construct:** fix build error in cdk-construct ([d708265](https://github.com/serverless-nextjs/serverless-next.js/commit/d708265ddda808f7340e1257390097e8c1f2663d))
+
+# [1.19.0-alpha.39](https://github.com/serverless-nextjs/serverless-next.js/compare/@sls-next/cdk-construct@1.19.0-alpha.38...@sls-next/cdk-construct@1.19.0-alpha.39) (2021-04-21)
+
+### Features
+
+- **cdk-construct:** adding support for multiple domainNames ([#1009](https://github.com/serverless-nextjs/serverless-next.js/issues/1009)) ([c9e87fc](https://github.com/serverless-nextjs/serverless-next.js/commit/c9e87fc5b4bfb7207895f81557533f6eaf401208))
+
 # [1.19.0-alpha.38](https://github.com/serverless-nextjs/serverless-next.js/compare/@sls-next/cdk-construct@1.19.0-alpha.37...@sls-next/cdk-construct@1.19.0-alpha.38) (2021-04-16)
 
 **Note:** Version bump only for package @sls-next/cdk-construct

diff --git a/packages/serverless-components/nextjs-cdk-construct/__tests__/construct.test.ts b/packages/serverless-components/nextjs-cdk-construct/__tests__/construct.test.ts
@@ -134,7 +134,7 @@ describe("CDK Construct", () => {
       serverlessBuildOutDir: path.join(__dirname, "fixtures/next-boilerplate"),
       domain: {
         certificate,
-        domainName,
+        domainNames: [domainName],
         hostedZone
       }
     });

diff --git a/packages/serverless-components/nextjs-cdk-construct/package.json b/packages/serverless-components/nextjs-cdk-construct/package.json
@@ -4,7 +4,7 @@
     "access": "public"
   },
   "description": "Serverless Next.js powered by AWS CDK",
-  "version": "1.19.0-alpha.38",
+  "version": "1.19.0-alpha.41",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "Henry Kirkness <henry@planes.studio>",

diff --git a/packages/serverless-components/nextjs-cdk-construct/src/index.ts b/packages/serverless-components/nextjs-cdk-construct/src/index.ts
@@ -236,7 +236,7 @@ export class NextJSLambdaEdge extends cdk.Construct {
       {
         enableLogging: props.withLogging ? true : undefined,
         certificate: props.domain?.certificate,
-        domainNames: props.domain ? [props.domain.domainName] : undefined,
+        domainNames: props.domain ? props.domain.domainNames : undefined,
         defaultRootObject: "",
         defaultBehavior: {
           viewerProtocolPolicy:
@@ -375,10 +375,14 @@ export class NextJSLambdaEdge extends cdk.Construct {
     });
 
     if (props.domain) {
-      this.aRecord = new ARecord(this, "AliasRecord", {
-        recordName: props.domain.domainName,
-        zone: props.domain.hostedZone,
-        target: RecordTarget.fromAlias(new CloudFrontTarget(this.distribution))
+      props.domain.domainNames.forEach((domainName) => {
+        this.aRecord = new ARecord(this, "AliasRecord", {
+          recordName: domainName,
+          zone: props.domain!.hostedZone, // not sure why ! is needed here
+          target: RecordTarget.fromAlias(
+            new CloudFrontTarget(this.distribution)
+          )
+        });
       });
     }
   }

diff --git a/packages/serverless-components/nextjs-cdk-construct/src/props.ts b/packages/serverless-components/nextjs-cdk-construct/src/props.ts
@@ -18,12 +18,12 @@ export interface Props extends StackProps {
   serverlessBuildOutDir: string;
   /**
    * Is you'd like a custom domain for your site, you'll need to pass in a
-   * `hostedZone`, `certificate` and full `domainName`
+   * `hostedZone`, `certificate` and a list of full `domainNames`
    */
   domain?: {
     hostedZone: IHostedZone;
     certificate: ICertificate;
-    domainName: string;
+    domainNames: string[];
   };
   /**
    * Override props passed to the underlying s3 bucket

diff --git a/packages/serverless-components/nextjs-component/CHANGELOG.md b/packages/serverless-components/nextjs-component/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.19.0-alpha.47](https://github.com/serverless-nextjs/serverless-next.js/compare/@sls-next/serverless-component@1.19.0-alpha.46...@sls-next/serverless-component@1.19.0-alpha.47) (2021-04-21)
+
+**Note:** Version bump only for package @sls-next/serverless-component
+
+# [1.19.0-alpha.46](https://github.com/serverless-nextjs/serverless-next.js/compare/@sls-next/serverless-component@1.19.0-alpha.45...@sls-next/serverless-component@1.19.0-alpha.46) (2021-04-21)
+
+**Note:** Version bump only for package @sls-next/serverless-component
+
 # [1.19.0-alpha.45](https://github.com/serverless-nextjs/serverless-next.js/compare/@sls-next/serverless-component@1.19.0-alpha.44...@sls-next/serverless-component@1.19.0-alpha.45) (2021-04-16)
 
 ### Features

diff --git a/packages/serverless-components/nextjs-component/package.json b/packages/serverless-components/nextjs-component/package.json
@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.19.0-alpha.45",
+  "version": "1.19.0-alpha.47",
   "description": "Serverless Next.js powered by Serverless Components",
   "main": "./serverless.js",
   "types": "dist/component.d.ts",