Merge branch 'master' into dphang/locale-domain-redirects

Author: dphang

.github/dependabot.yml

@@ -22,6 +22,7 @@ updates:
       - dependency-name: "@aws-cdk/*"
         # FIXME: some issue with fs-extra for some users? https://github.com/serverless-nextjs/serverless-next.js/issues/1240
       - dependency-name: "fs-extra"
+      - dependency-name: "sharp" # This is manually built for Lambda Node.js 14.x runtime
     open-pull-requests-limit: 10
 
   - package-ecosystem: "github-actions"

CHANGELOG.md

@@ -3,6 +3,40 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.2.0-alpha.6](https://github.com/serverless-nextjs/serverless-next.js/compare/v3.2.0-alpha.5...v3.2.0-alpha.6) (2021-06-27)
+
+**Note:** Version bump only for package serverless-nextjs-monorepo
+
+# [3.2.0-alpha.5](https://github.com/serverless-nextjs/serverless-next.js/compare/v3.2.0-alpha.4...v3.2.0-alpha.5) (2021-06-27)
+
+**Note:** Version bump only for package serverless-nextjs-monorepo
+
+# [3.2.0-alpha.4](https://github.com/serverless-nextjs/serverless-next.js/compare/v3.2.0-alpha.3...v3.2.0-alpha.4) (2021-06-27)
+
+### Bug Fixes
+
+- update aws retry logic and fix dependencies ([#1306](https://github.com/serverless-nextjs/serverless-next.js/issues/1306)) ([e0cee9c](https://github.com/serverless-nextjs/serverless-next.js/commit/e0cee9c0d5d79314a7239c37e55438b5200d8bb2))
+
+# [3.2.0-alpha.3](https://github.com/serverless-nextjs/serverless-next.js/compare/v3.2.0-alpha.2...v3.2.0-alpha.3) (2021-06-27)
+
+**Note:** Version bump only for package serverless-nextjs-monorepo
+
+# [3.2.0-alpha.2](https://github.com/serverless-nextjs/serverless-next.js/compare/v3.2.0-alpha.1...v3.2.0-alpha.2) (2021-06-26)
+
+**Note:** Version bump only for package serverless-nextjs-monorepo
+
+# [3.2.0-alpha.1](https://github.com/serverless-nextjs/serverless-next.js/compare/v3.2.0-alpha.0...v3.2.0-alpha.1) (2021-06-26)
+
+### Features
+
+- **nextjs-component:** update default runtime to nodejs14.x ([#1301](https://github.com/serverless-nextjs/serverless-next.js/issues/1301)) ([52b902f](https://github.com/serverless-nextjs/serverless-next.js/commit/52b902f6035992d14ddd05195ffa1f35505bc7d6))
+
+# [3.2.0-alpha.0](https://github.com/serverless-nextjs/serverless-next.js/compare/v3.1.1-alpha.0...v3.2.0-alpha.0) (2021-06-26)
+
+### Features
+
+- **nextjs-component, aws-lambda:** support adding tags to lambdas ([#1300](https://github.com/serverless-nextjs/serverless-next.js/issues/1300)) ([74721c2](https://github.com/serverless-nextjs/serverless-next.js/commit/74721c28097ec3bb4227ad50e9d9c3db48848fb8))
+
 ## [3.1.1-alpha.0](https://github.com/serverless-nextjs/serverless-next.js/compare/v3.1.0...v3.1.1-alpha.0) (2021-06-26)
 
 ### Bug Fixes

README.md

@@ -87,7 +87,7 @@ Is there a feature that you want but is not yet supported? Please open a [new is
 - [x] [Custom Headers](https://nextjs.org/docs/api-reference/next.config.js/headers). Caveats: every route should be able to have custom headers except `_next/static/*` and `static/*`, since those cache behaviors do not have Lambda handlers attached to them. You also need to specify the S3 key as the source when redirecting any path mapped to an S3 file (see [PR](https://github.com/serverless-nextjs/serverless-next.js/pull/662) for more details).
 - [x] [Image Optimization](https://nextjs.org/docs/basic-features/image-optimization) Available in the latest 1.19 alpha version. Please try it out and let us know if there are any bugs.
 - [x] [Next.js 10 Localization](https://nextjs.org/blog/next-10). See: https://github.com/serverless-nextjs/serverless-next.js/issues/721 for more details and tips.
-- [x] [Incremental Static Regeneration](https://nextjs.org/docs/basic-features/data-fetching#incremental-static-regeneration). Requires SQS.SendMessage permissions on your Lambda role and various SQS/Lambda permissions (to be documented) on your deployment user. See https://github.com/serverless-nextjs/serverless-next.js/pull/1028 for more details, big thanks to @kirkness for this amazing work. **Available in latest alpha version only. Please try out and help report any issues!**
+- [x] [Incremental Static Regeneration](https://nextjs.org/docs/basic-features/data-fetching#incremental-static-regeneration). Requires SQS.SendMessage permissions on your Lambda role and various SQS/Lambda permissions (to be documented) on your deployment user. See https://github.com/serverless-nextjs/serverless-next.js/pull/1028 for more details, big thanks to @kirkness for this amazing work.
 
 ### Getting started
 
@@ -377,6 +377,9 @@ The exhaustive list of AWS actions required for a deployment:
   "lambda:PublishVersion",
   "lambda:UpdateFunctionCode",
   "lambda:UpdateFunctionConfiguration",
+  "lambda:ListTags",                  // for tagging lambdas
+  "lambda:TagResource",               // for tagging lambdas
+  "lambda:UntagResource",             // for tagging lambdas
   "route53:ChangeResourceRecordSets", // only for custom domains
   "route53:ListHostedZonesByName",
   "route53:ListResourceRecordSets",   // only for custom domains
@@ -424,7 +427,7 @@ myNextApplication:
       imageLambda: 2048
 ```
 
-The same pattern can be followed for specifying the Node.js runtime (nodejs12.x by default):
+The same pattern can be followed for specifying the Node.js runtime (nodejs14.x by default):
 
 ```yml
 # serverless.yml
@@ -433,9 +436,9 @@ myNextApplication:
   component: "@sls-next/serverless-component@{version_here}"
   inputs:
     runtime:
-      defaultLambda: "nodejs10.x"
-      apiLambda: "nodejs10.x"
-      imageLambda: "nodejs12.x" # Note that the sharp image library is built for NodeJS 12.x
+      defaultLambda: "nodejs14.x"
+      apiLambda: "nodejs14.x"
+      imageLambda: "nodejs14.x" # Note that the sharp image library is built for Lambda Node.js 14.x, although it will likely work fine on other runtimes
 ```
 
 Similarly, the timeout by default is 10 seconds. To customise you can:
@@ -468,6 +471,8 @@ myNextApplication:
       imageLambda: fooImageLambda
 ```
 
+There is a fourth **regeneration** lambda, which can be configured similarly and is used for Incremental Static Regeneration. However, it does not use Lamda@Edge and can, for example, have a longer timeout setting.
+
 ### Architecture
 
 ![architecture](./img/arch_no_grid.png)
@@ -501,8 +506,9 @@ The fourth cache behaviour handles next API requests `api/*`.
 | description              | `string`          | `*lambda-type*@Edge for Next CloudFront distribution`              | The description that will be used for both lambdas. Note that "(API)" will be appended to the API lambda description.                                                                                                                                                                                                                                                                                                                                                                 |
 | policy                   | `string\|object`  | `arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole` | The arn or inline policy that will be assigned to both lambdas.                                                                                                                                                                                                                                                                                                                                                                                                                       |
 | roleArn                  | `string\|object`  | null                                                               | The arn of role that will be assigned to both lambdas.                                                                                                                                                                                                                                                                                                                                                                                                                                |
-| runtime                  | `string\|object`  | `nodejs12.x`                                                       | When assigned a value, both the default and api lambdas will be assigned the runtime defined in the value. When assigned to an object, values for the default and api lambdas can be separately defined                                                                                                                                                                                                                                                                               |
+| runtime                  | `string\|object`  | `nodejs14.x`                                                       | When assigned a value, both the default and api lambdas will be assigned the runtime defined in the value. When assigned to an object, values for the default and api lambdas can be separately defined                                                                                                                                                                                                                                                                               |
 | memory                   | `number\|object`  | `512`                                                              | When assigned a number, both the default and api lambdas will be assigned memory of that value. When assigned to an object, values for the default and api lambdas can be separately defined                                                                                                                                                                                                                                                                                          |
+| tags                     | `object`          | `undefined`                                                        | Tags to assign to a Lambda. If undefined, the component will not update any tags. If set to an empty object, it will remove all tags.                                                                                                                                                                                                                                                                                                                                                 |
 | timeout                  | `number\|object`  | `10`                                                               | Same as above                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
 | handler                  | `string`          | `index.handler`                                                    | When assigned a value, overrides the default function handler to allow for configuration. Copies `handler.js` in route into the Lambda folders. Your handler MUST still call the `default-handler` afterwards or your function won't work with Next.JS                                                                                                                                                                                                                                |
 | name                     | `string\|object`  | /                                                                  | When assigned a string, both the default and api lambdas will assigned name of that value. When assigned to an object, values for the default and api lambdas can be separately defined                                                                                                                                                                                                                                                                                               |

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.1.1-alpha.0",
+  "version": "3.2.0-alpha.6",
   "npmClient": "yarn",
   "command": {
     "publish": {

package.json

@@ -20,8 +20,8 @@
     "packages-build": "lerna run build",
     "test:watch": "yarn test --watch --collect-coverage=false",
     "check-gh-token": ": \"${GH_TOKEN:?Please set GH_TOKEN to a GitHub personal token that can create releases.}\"",
-    "prerelease": "yarn check-gh-token && yarn install && lerna publish --conventional-commits --conventional-prerelease --exact --create-release github --dist-tag alpha",
-    "graduate": "yarn check-gh-token && yarn install && lerna version --conventional-commits --conventional-graduate --exact --create-release github && lerna publish from-git",
+    "prerelease": "yarn check-gh-token && lerna publish --conventional-commits --conventional-prerelease --exact --create-release github --dist-tag alpha",
+    "graduate": "yarn check-gh-token && lerna version --conventional-commits --conventional-graduate --exact --create-release github && lerna publish from-git",
     "lint": "eslint .",
     "integration": "jest --runInBand --config jest.integration.config.json --setupTestFrameworkScriptFile=./jest.integration.setup.js",
     "postinstall": "yarn packages-install && opencollective-postinstall",
@@ -86,7 +86,9 @@
       "/examples/",
       "/dist/",
       "/e2e-tests/",
-      "/tests/"
+      "/tests/",
+      "babel.config.js",
+      "jest.config.js"
     ],
     "watchPathIgnorePatterns": [
       "/fixture/",

packages/e2e-tests/next-app/serverless.yml

@@ -10,3 +10,12 @@ next-app:
       api/*:
         forward:
           headers: [Authorization]
+    tags:
+      defaultLambda:
+        tag1: val1
+      apiLambda:
+        tag2: val2
+      imageLambda:
+        tag3: val3
+      regenerationLambda:
+        tag4: val4

packages/libs/cloudfront/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.2.0-alpha.5](https://github.com/serverless-nextjs/serverless-next.js/compare/v3.2.0-alpha.4...v3.2.0-alpha.5) (2021-06-27)
+
+**Note:** Version bump only for package @sls-next/cloudfront
+
+# [3.2.0-alpha.4](https://github.com/serverless-nextjs/serverless-next.js/compare/v3.2.0-alpha.3...v3.2.0-alpha.4) (2021-06-27)
+
+### Bug Fixes
+
+- update aws retry logic and fix dependencies ([#1306](https://github.com/serverless-nextjs/serverless-next.js/issues/1306)) ([e0cee9c](https://github.com/serverless-nextjs/serverless-next.js/commit/e0cee9c0d5d79314a7239c37e55438b5200d8bb2))
+
+# [3.2.0-alpha.2](https://github.com/serverless-nextjs/serverless-next.js/compare/v3.2.0-alpha.1...v3.2.0-alpha.2) (2021-06-26)
+
+**Note:** Version bump only for package @sls-next/cloudfront
+
 # [3.1.0](https://github.com/serverless-nextjs/serverless-next.js/compare/v3.1.0-alpha.16...v3.1.0) (2021-06-25)
 
 **Note:** Version bump only for package @sls-next/cloudfront

packages/libs/cloudfront/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sls-next/cloudfront",
-  "version": "3.1.0",
+  "version": "3.2.0-alpha.5",
   "description": "Handles CloudFront invalidation",
   "publishConfig": {
     "access": "public"
@@ -16,8 +16,9 @@
     "directory": "packages/libs/cloudfront"
   },
   "scripts": {
-    "prepare": "yarn build",
-    "build": "tsc -p tsconfig.build.json"
+    "prepare": "yarn clean && yarn build",
+    "build": "tsc -p tsconfig.build.json",
+    "clean": "yarn rimraf dist"
   },
   "keywords": [
     "AWS",
@@ -36,6 +37,7 @@
   },
   "devDependencies": {
     "@types/node": "^15.12.2",
+    "rimraf": "^3.0.2",
     "typescript": "^4.3.4"
   }
 }

packages/libs/cloudfront/src/lib/cloudfront.ts

@@ -29,6 +29,13 @@ export type Credentials = {
 export default ({
   credentials
 }: CloudFrontClientFactoryOptions): CloudFrontClient => {
+  if (AWS?.config) {
+    AWS.config.update({
+      maxRetries: parseInt(process.env.SLS_NEXT_MAX_RETRIES ?? "10"),
+      retryDelayOptions: { base: 200 }
+    });
+  }
+
   const cloudFront = new AWS.CloudFront({ credentials });
 
   return {