merge commit

milliHQ · Aug 30, 2021 · b6f35f6 · b6f35f6
2 parents a651eca + 2c798a3
commit b6f35f6
Show file tree

Hide file tree

Showing 17 changed files with 134 additions and 90 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -6,3 +6,4 @@ updates:
       interval: 'daily'
     allow:
       - dependency-name: 'next'
+      - dependency-name: 'sharp'
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Build
         run: |
           yarn --frozen-lockfile --cache-folder .yarn
-          yarn workspace @dealmore/tf-next-image-optimization build
+          yarn workspace @millihq/tf-next-image-optimization build
 
       - name: Artifact
         uses: actions/upload-artifact@v2

diff --git a/.github/workflows/tf-docs.yml b/.github/workflows/tf-docs.yml
@@ -14,8 +14,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Update Terraform docs in README
-        uses: Dirrk/terraform-docs@v1.0.8
+        uses: terraform-docs/gh-actions@v0.10.0
         with:
-          tf_docs_output_file: README.md
-          tf_docs_git_push: 'true'
-          tf_docs_git_commit_message: 'docs: Update Terraform docs'
+          config-file: '.terraform-docs.yml'
+          output-file: README.md
+          git-push: 'true'
+          git-commit-message: 'docs: Update Terraform docs'
diff --git a/.terraform-docs.yml b/.terraform-docs.yml
@@ -0,0 +1,10 @@
+formatter: 'markdown table'
+
+sections:
+  hide:
+    - 'data-sources'
+    - 'modules'
+    - 'resources'
+
+settings:
+  anchor: false
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,71 +1,95 @@
 # Changelog
 
-## 10.0.1 (July 06, 2021)
+## 11.1.0 (August 30, 2021)
 
-- Uses Image Optimizer module of [Next.js 11.0.1](https://github.com/vercel/next.js/releases/tag/v11.0.1) ([#49](https://github.com/dealmore/terraform-aws-next-js-image-optimization/pull/49))
+⚠️ **Namespace changed** ⚠️
+
+We [recently changed](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/issues/61) the namespace of this module from `dealmore` to `milliHQ`.
+Make sure to upgrade the source of the module accordingly:
+
+```diff
+module "next_image_optimizer" {
+-  source = "dealmore/next-js-image-optimization/aws"
++  source = "milliHQ/next-js-image-optimization/aws"
+}
+```
+
+---
+
+Beginning with this release we change the engine that is used to optimize the images from squoosh to Sharp.
+Sharp has a much better performance and is therefore better suited for the job.
+Please read the [Next.js RFC](https://github.com/vercel/next.js/discussions/27073) for more information.
+
+- Use sharp as image optimization engine ([#51](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/issues/51), [#57](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/pull/57))
+- Fix typo for default image sizes ([#53](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/issues/53), [#56](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/pull/56))
+- Uses Image Optimizer module of [Next.js 11.1.0](https://github.com/vercel/next.js/releases/tag/v11.1.0) ([#54](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/pull/54))
+
+## 11.0.1 (July 06, 2021)
+
+- Uses Image Optimizer module of [Next.js 11.0.1](https://github.com/vercel/next.js/releases/tag/v11.0.1) ([#49](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/pull/49))
 
 ## 11.0.0 (June 15, 2021)
 
 The output `cloudfront_origin_image_optimizer` is now deprecated.
 Use `cloudfront_origin` instead.
 
-- Fixes image optimization for webp format ([#44](https://github.com/dealmore/terraform-aws-next-js-image-optimization/pull/44))  
+- Fixes image optimization for webp format ([#44](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/pull/44))  
   Thanks to [@vcnc-hex](https://github.com/vcnc-hex) for contributing!
-- Uses Image Optimizer module of [Next.js 11.0.0](https://github.com/vercel/next.js/releases/tag/v11.0.0) ([#45](https://github.com/dealmore/terraform-aws-next-js-image-optimization/pull/45))
-- Add output for cache behavior ([#43](https://github.com/dealmore/terraform-aws-next-js-image-optimization/issues/43), [#48](https://github.com/dealmore/terraform-aws-next-js-image-optimization/pull/48))
-- Bump AWS API Gateway Terraform module from 0.11.0 to 1.1.0 ([#47](https://github.com/dealmore/terraform-aws-next-js-image-optimization/pull/47))
-- Bump AWS Lambda Terraform module from 1.47.0 to 2.4.0 ([#46](https://github.com/dealmore/terraform-aws-next-js-image-optimization/pull/46))
+- Uses Image Optimizer module of [Next.js 11.0.0](https://github.com/vercel/next.js/releases/tag/v11.0.0) ([#45](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/pull/45))
+- Add output for cache behavior ([#43](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/issues/43), [#48](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/pull/48))
+- Bump AWS API Gateway Terraform module from 0.11.0 to 1.1.0 ([#47](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/pull/47))
+- Bump AWS Lambda Terraform module from 1.47.0 to 2.4.0 ([#46](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/pull/46))
 
 ## 10.2.3 (June 05, 2021)
 
-- Improves caching of processed images by using [CloudFront Origin Shield](https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/origin-shield.html) ([#2](https://github.com/dealmore/terraform-aws-next-js-image-optimization/issues/2), [#41](https://github.com/dealmore/terraform-aws-next-js-image-optimization/pull/41))
-- Uses Image Optimizer module of [Next.js 10.2.3](https://github.com/vercel/next.js/releases/tag/v10.2.3) ([#39](https://github.com/dealmore/terraform-aws-next-js-image-optimization/pull/39))
+- Improves caching of processed images by using [CloudFront Origin Shield](https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/origin-shield.html) ([#2](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/issues/2), [#41](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/pull/41))
+- Uses Image Optimizer module of [Next.js 10.2.3](https://github.com/vercel/next.js/releases/tag/v10.2.3) ([#39](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/pull/39))
 
 ## 10.2.2 (May 22, 2021)
 
-- Uses Image Optimizer module of [Next.js 10.2.2](https://github.com/vercel/next.js/releases/tag/v10.2.2) ([#35](https://github.com/dealmore/terraform-aws-next-js-image-optimization/pull/35))
+- Uses Image Optimizer module of [Next.js 10.2.2](https://github.com/vercel/next.js/releases/tag/v10.2.2) ([#35](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/pull/35))
 
 ## 10.2.1 (May 22, 2021)
 
-- Uses Image Optimizer module of [Next.js 10.2.1](https://github.com/vercel/next.js/releases/tag/v10.2.1) ([#38](https://github.com/dealmore/terraform-aws-next-js-image-optimization/pull/38))
+- Uses Image Optimizer module of [Next.js 10.2.1](https://github.com/vercel/next.js/releases/tag/v10.2.1) ([#38](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/pull/38))
 
 ## 10.2.0 (May 11, 2021)
 
-- Uses Image Optimizer module of [Next.js 10.2.0](https://github.com/vercel/next.js/releases/tag/v10.2.0) ([#31](https://github.com/dealmore/terraform-aws-next-js-image-optimization/pull/31))
+- Uses Image Optimizer module of [Next.js 10.2.0](https://github.com/vercel/next.js/releases/tag/v10.2.0) ([#31](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/pull/31))
 
 ## 10.1.3 (May 11, 2021)
 
-- Uses Image Optimizer module of [Next.js 10.1.3](https://github.com/vercel/next.js/releases/tag/v10.1.3) ([#28](https://github.com/dealmore/terraform-aws-next-js-image-optimization/pull/28))
+- Uses Image Optimizer module of [Next.js 10.1.3](https://github.com/vercel/next.js/releases/tag/v10.1.3) ([#28](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/pull/28))
 
 ## 10.1.2 (May 04, 2021)
 
-- Uses Image Optimizer module of [Next.js 10.1.2](https://github.com/vercel/next.js/releases/tag/v10.1.2) ([#25](https://github.com/dealmore/terraform-aws-next-js-image-optimization/pull/25))
+- Uses Image Optimizer module of [Next.js 10.1.2](https://github.com/vercel/next.js/releases/tag/v10.1.2) ([#25](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/pull/25))
 
 ## 10.1.1 (May 04, 2021)
 
-- Uses Image Optimizer module of [Next.js 10.1.1](https://github.com/vercel/next.js/releases/tag/v10.1.1) ([#33](https://github.com/dealmore/terraform-aws-next-js-image-optimization/pull/33))
+- Uses Image Optimizer module of [Next.js 10.1.1](https://github.com/vercel/next.js/releases/tag/v10.1.1) ([#33](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/pull/33))
 
 ## 10.1.0 (May 04, 2021)
 
-- Uses Image Optimizer module of [Next.js 10.1.0](https://github.com/vercel/next.js/releases/tag/v10.1.0) ([#32](https://github.com/dealmore/terraform-aws-next-js-image-optimization/pull/32))
+- Uses Image Optimizer module of [Next.js 10.1.0](https://github.com/vercel/next.js/releases/tag/v10.1.0) ([#32](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/pull/32))
 
 ## 10.0.9 (April 27, 2021)
 
-- Uses Image Optimizer module of [Next.js 10.0.9](https://github.com/vercel/next.js/releases/tag/v10.0.9) ([#22](https://github.com/dealmore/terraform-aws-next-js-image-optimization/pull/22))
+- Uses Image Optimizer module of [Next.js 10.0.9](https://github.com/vercel/next.js/releases/tag/v10.0.9) ([#22](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/pull/22))
 
 ## 10.0.8 (April 26, 2021)
 
-- Makes the module compatible with Terraform `0.15` ([#26](https://github.com/dealmore/terraform-aws-next-js-image-optimization/issues/26), [#29](https://github.com/dealmore/terraform-aws-next-js-image-optimization/pull/29))
-- Uses Image Optimizer module of [Next.js 10.0.8](https://github.com/vercel/next.js/releases/tag/v10.0.8) ([#19](https://github.com/dealmore/terraform-aws-next-js-image-optimization/pull/19))
+- Makes the module compatible with Terraform `0.15` ([#26](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/issues/26), [#29](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/pull/29))
+- Uses Image Optimizer module of [Next.js 10.0.8](https://github.com/vercel/next.js/releases/tag/v10.0.8) ([#19](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/pull/19))
 
 ## 10.0.7 (April 01, 2021)
 
-- Uses Image Optimizer module of [Next.js 10.0.7](https://github.com/vercel/next.js/releases/tag/v10.0.7) ([#10](https://github.com/dealmore/terraform-aws-next-js-image-optimization/pull/10))
+- Uses Image Optimizer module of [Next.js 10.0.7](https://github.com/vercel/next.js/releases/tag/v10.0.7) ([#10](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/pull/10))
 
 ## 10.0.6 (April 01, 2021)
 
-- Uses Image Optimizer module of [Next.js 10.0.6](https://github.com/vercel/next.js/releases/tag/v10.0.6) ([#3](https://github.com/dealmore/terraform-aws-next-js-image-optimization/pull/3))
-- Bundling of the image optimizer has changed from ncc to nft ([#23](https://github.com/dealmore/terraform-aws-next-js-image-optimization/issues/23), [#24](https://github.com/dealmore/terraform-aws-next-js-image-optimization/pull/24))
+- Uses Image Optimizer module of [Next.js 10.0.6](https://github.com/vercel/next.js/releases/tag/v10.0.6) ([#3](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/pull/3))
+- Bundling of the image optimizer has changed from ncc to nft ([#23](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/issues/23), [#24](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/pull/24))
 
 ## 10.0.5 (March 15, 2021)
 
@@ -81,18 +105,18 @@ InvalidArgument: The parameter ForwardedValues cannot be used when a cache polic
 
 This is a known bug in the Terraform AWS provider and may requires a manual upgrade in the AWS Console ([terraform-provider-aws#17626](https://github.com/hashicorp/terraform-provider-aws/issues/17626)).
 
-- Fixes wrong response for repeated requests from external source ([#12](https://github.com/dealmore/terraform-aws-next-js-image-optimization/issues/12), [#13](https://github.com/dealmore/terraform-aws-next-js-image-optimization/pull/13))
-- Use Request and Cache Policies in CloudFront distribution ([#5](https://github.com/dealmore/terraform-aws-next-js-image-optimization/issues/5), [#9](https://github.com/dealmore/terraform-aws-next-js-image-optimization/pull/9))
-- Upgrades Lambda runtime from `nodejs12.x` to `nodejs14.x`. ([#4](https://github.com/dealmore/terraform-aws-next-js-image-optimization/issues/4), [#8](https://github.com/dealmore/terraform-aws-next-js-image-optimization/pull/8))
+- Fixes wrong response for repeated requests from external source ([#12](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/issues/12), [#13](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/pull/13))
+- Use Request and Cache Policies in CloudFront distribution ([#5](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/issues/5), [#9](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/pull/9))
+- Upgrades Lambda runtime from `nodejs12.x` to `nodejs14.x`. ([#4](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/issues/4), [#8](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/pull/8))
 
 ## 2.0.1 (March 08, 2021)
 
-- Bump internal module `terraform-aws-modules/apigateway-v2/aws` from `0.8.0` to `0.11.0` ([#16](https://github.com/dealmore/terraform-aws-next-js-image-optimization/pull/16), [#18](https://github.com/dealmore/terraform-aws-next-js-image-optimization/pull/18))  
+- Bump internal module `terraform-aws-modules/apigateway-v2/aws` from `0.8.0` to `0.11.0` ([#16](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/pull/16), [#18](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/pull/18))  
   Resolves compatibility issue with newer versions of Terraform.
 
 ## 2.0.0 (February 13, 2021)
 
-- Adds support to resize images from a S3 origin ([#7](https://github.com/dealmore/terraform-aws-next-js-image-optimization/pull/7))
+- Adds support to resize images from a S3 origin ([#7](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/pull/7))
 
 ## 1.0.0 (February 07, 2021)
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -2,7 +2,7 @@
 
 Contributions are welcome!
 
-As a general advice it is always a good idea to raise an [issue](https://github.com/dealmore/terraform-aws-next-js-image-optimization/issues) before creating a new pull request.
+As a general advice it is always a good idea to raise an [issue](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/issues) before creating a new pull request.
 This ensures that we don't have to reject pull requests that are not aligning with our roadmap and not wasting your valuable time.
 
 ## Contribution Prerequisites
@@ -27,7 +27,7 @@ For the worker component you should have installed:
 
 #### Codestyle
 
-We use a [GitHub Action](https://github.com/dealmore/terraform-aws-next-js-image-optimization/actions/workflows/lint.yml) to make sure that the committed code is properly formatted.
+We use a [GitHub Action](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/actions/workflows/lint.yml) to make sure that the committed code is properly formatted.
 Before submitting a PR, you should make sure that the code is properly formatted.
 
 You can do this by running the Terraform [`fmt` command](https://www.terraform.io/docs/cli/commands/fmt.html) in the root of the repository:
@@ -42,7 +42,7 @@ After cloning the repository, run `yarn` to fetch its dependencies.
 
 #### Codestyle
 
-We use a [GitHub Action](https://github.com/dealmore/terraform-aws-next-js-image-optimization/actions/workflows/lint.yml) to make sure that the committed code is properly formatted.
+We use a [GitHub Action](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/actions/workflows/lint.yml) to make sure that the committed code is properly formatted.
 Before submitting a PR, you should make sure that the code is properly formatted.
 
 You can do this by running the `fix:prettier` command from the root of the repository:
@@ -59,7 +59,7 @@ The Terraform module is **not** covered by automatic tests.
 ## Testing Terraform module
 
 Since the Terraform module itself is not covered by automatic tests, testing has to be done manually.
-The repository contains some examples in the [`examples/*`](https://github.com/dealmore/terraform-aws-next-js-image-optimization/tree/main/examples) folder, that can be used to run a quick acceptance test on your own AWS account.
+The repository contains some examples in the [`examples/*`](https://github.com/milliHQ/terraform-aws-next-js-image-optimization/tree/main/examples) folder, that can be used to run a quick acceptance test on your own AWS account.
 
 You may need to change a few settings in the `main.tf` file in the root of the example.
 
@@ -69,7 +69,7 @@ To use the local development version instead of downloading it from the Terrafor
 
 ```diff
 module "next_image_optimizer" {
-- source = "dealmore/next-js-image-optimization/aws"
+- source = "milliHQ/next-js-image-optimization/aws"
 + source = "../.."
   ...
 }

diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2021 Felix Haus (DealMore)
+   Copyright 2021 Felix Haus (milliVolt infrastructure)
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.