Merge branch 'master' into dphang/minor-fix

.github/ISSUE_TEMPLATE/bug_report.md

@@ -21,10 +21,10 @@ assignees: ""
 <!-- Add steps to reproduce the actual behavior. -->
 
 ### Screenshots/Code/Logs
-<!-- If applicable, add screenshots or a minimal repro (e.g code or configuration snippet or repository) to help explain your problem. If you have a runtime issue, please check CloudWatch logs (from region closest to where you access Cloudfront) and stacktraces if possible. If you have a build or deploy issue, please run with serverless --debug and post the logs. Please also post your serverless.yml. -->
+<!-- If applicable, add screenshots or a minimal repro (e.g code or configuration snippet or repository) to help explain your problem. If you have a runtime issue from Lambda/CloudFront, please check CloudWatch logs (note that Lambda@Edge logs are in a region closest to where you access CloudFront - NOT necessarily in `us-east-1` where the original Lambda is created) and post any logs or stacktraces if possible. See here for how to check logs: https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/lambda-edge-testing-debugging.html#lambda-edge-identifying-function-errors. If you have a build or deploy issue, please run with serverless --debug and post the logs. Please also post your serverless.yml. -->
 
 ### Versions
-<!-- Please add your OS and @sls-next/serverless-component versions below. -->
+<!-- Please add your OS and @sls-next/serverless-component and Next.js versions below. Note that only the last two minor versions of Next.js are tested/officially supported -->
 
 - OS/Environment:
 - @sls-next/serverless-component version:
@@ -37,4 +37,4 @@ assignees: ""
 <!-- Please review the following checklist before submitting the issue. -->
 
 - [ ] You have reviewed the README and [FAQs](https://github.com/serverless-nextjs/serverless-next.js#faq), which answers several common questions.
-- [ ] Please first try using the latest `@sls-next/serverless-component` [release version](https://github.com/serverless-nextjs/serverless-next.js/releases), which may have already fixed your issue or implemented the feature you are trying to use. Note that the old `serverless-next.js` component and the `serverless-next.js` plugin are deprecated and no longer maintained.
+- [ ] Please first try using the most recent `latest` or `alpha` `@sls-next/serverless-component` [release version](https://github.com/serverless-nextjs/serverless-next.js/releases), which may have already fixed your issue or implemented the feature you are trying to use. Note that the old `serverless-next.js` component and the `serverless-next.js` plugin are deprecated and no longer maintained.

packages/libs/lambda-at-edge/package.json

@@ -45,7 +45,6 @@
     "@types/klaw": "^3.0.1",
     "@types/node": "^14.0.14",
     "@types/path-to-regexp": "^1.7.0",
-    "klaw": "^3.0.0",
     "rollup": "^2.26.6",
     "rollup-plugin-node-externals": "^2.2.0",
     "rollup-plugin-terser": "^7.0.2",
@@ -61,6 +60,7 @@
     "fs-extra": "^9.0.1",
     "get-stream": "^6.0.0",
     "jsonwebtoken": "^8.5.1",
+    "klaw": "^3.0.0",
     "path-to-regexp": "^6.1.0"
   }
 }