support remote images (#44)

* support remote images * fix changelog date --------- Co-authored-by: Eleftherios Myriounis <[email protected]>
Nexode-Consulting · Dec 4, 2023 · fb08e9b · fb08e9b
1 parent 9c4080a
commit fb08e9b
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 <!-- ## [Unreleased] -->
 
 
+## [v0.2.18] - 2023-12-04
+
+* Support remote images [#44](https://github.com/Nexode-Consulting/terraform-aws-nextjs-serverless/pull/44)
+
+
 ## [v0.2.17] - 2023-11-23
 
 Updates:

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -60,7 +60,7 @@ Please check our [testing guidelines](https://github.com/Nexode-Consulting/terra
 ```diff
 module "tf_next" {
 - source  = "Nexode-Consulting/nextjs-serverless/aws"
-- version = "0.2.17"
+- version = "0.2.18"
 + source = "../../../"
   ...
 }

diff --git a/examples/nextjs-v13/package.json b/examples/nextjs-v13/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nextjs",
-  "version": "0.2.17",
+  "version": "0.2.18",
   "private": true,
   "scripts": {
     "dev": "next dev",
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "autoprefixer": "^10.4.15",
-    "build-serverless-next": "^0.2.17",
+    "build-serverless-next": "^0.2.18",
     "next": "^13.4.19",
     "react": "18.2.0",
     "react-dom": "18.2.0",

diff --git a/examples/nextjs-v13/terraform/main.tf b/examples/nextjs-v13/terraform/main.tf
@@ -1,7 +1,7 @@
 module "next_serverless" {
   source = "../../../"
   # source  = "Nexode-Consulting/nextjs-serverless/aws"
-  # version = "0.2.17"
+  # version = "0.2.18"
 
   deployment_name = var.deployment_name
   region          = var.region

diff --git a/examples/nextjs-v13/terraform/outputs.tf b/examples/nextjs-v13/terraform/outputs.tf
@@ -1,3 +1,7 @@
 output "next_serverless" {
   value = module.next_serverless
 }
+
+output "cloudfront_url" {
+  value = module.next_serverless.cloudfront_url
+}
diff --git a/examples/nextjs-v13/terraform/providers.tf b/examples/nextjs-v13/terraform/providers.tf
@@ -6,19 +6,3 @@ provider "aws" {
   alias  = "global_region"
   region = var.global_region
 }
-
-terraform {
-  required_providers {
-    aws = {
-      source  = "hashicorp/aws"
-      version = "4.67.0"
-    }
-  }
-
-  backend "s3" {
-    bucket  = "{{bucket name}}"
-    key     = "{{bucket key}}/terraform.tfstate"
-    region  = "{{bucket region}}"
-    encrypt = true
-  }
-}
diff --git a/packages/build-serverless-next/bin/build-serverless-next.sh b/packages/build-serverless-next/bin/build-serverless-next.sh
@@ -20,7 +20,7 @@ rm -r standalone
 rm -r deployments
 
 # Install necessary packages
-npm i -D [email protected] [email protected] [email protected] [email protected] [email protected].17 [email protected].17
+npm i -D [email protected] [email protected] [email protected] [email protected] [email protected].18 [email protected].18
 
 # Inject code in build, and cleanup
 cp -a ./app ./app-backup

diff --git a/packages/build-serverless-next/package.json b/packages/build-serverless-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "build-serverless-next",
-  "version": "0.2.17",
+  "version": "0.2.18",
   "description": "Bash script to build serverless component for deploying to AWS using Terraform",
   "bin": {
     "build-serverless-next": "./bin/build-serverless-next.sh"

diff --git a/packages/image-redirection/package-lock.json b/packages/image-redirection/package-lock.json
diff --git a/packages/image-redirection/package.json b/packages/image-redirection/package.json
@@ -1,6 +1,6 @@
 {
   "name": "image-redirection",
-  "version": "0.2.17",
+  "version": "0.2.18",
   "description": "Image Redirection Lambda",
   "main": "index.js",
   "scripts": {

diff --git a/packages/image-redirection/src/index.ts b/packages/image-redirection/src/index.ts
@@ -79,6 +79,24 @@ export const handler = async (event: any, _context: any, callback: any) => {
         {}
       )
 
+    // Return original image if it's remote image
+    if (/^(http|https)%3A%2F%2F/.test(query?.url)) {
+      /* The URL for the original image. */
+      const imageUrl = query?.url.replace(/%3A/g, ':').replace(/%2F/g, '/')
+      console.log({ imageUrl });
+      return redirectTo(imageUrl, callback)
+    }
+
+    // Return original image if it's static image
+    if (/_next/.test(query?.url)) {
+      /* The URL for the original image. */
+      const imageUrl =
+        'https://' +
+        config?.distributionDomainName +
+        query?.url.replace(/%2F/g, '/')
+      return redirectTo(imageUrl, callback)
+    }
+
     // Return original image if it's image/gif or image/svg+xml
     const regex = /\.(gif|svg|xml)$/
     if (regex.test(query?.url)) {

diff --git a/packages/nextjs-image-optimization/package-lock.json b/packages/nextjs-image-optimization/package-lock.json
diff --git a/packages/nextjs-image-optimization/package.json b/packages/nextjs-image-optimization/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nextjs-image-optimization",
-  "version": "0.2.17",
+  "version": "0.2.18",
   "description": "Image Optimization Lambda",
   "main": "index.js",
   "scripts": {