Merge pull request #60 from khuezy/fix/imageOpt

fix: image optimization and absolute trace output path

.projenrc.js

@@ -35,6 +35,7 @@ const project = new awscdk.AwsCdkConstructLibrary({
     'serverless-http',
     'jszip',
     'glob',
+    'node-fetch',
   ] /* Runtime dependencies of this module. */,
   devDeps: ['aws-sdk', '[email protected]'] /* Build dependencies for this module. */,
 

assets/lambda/ImageOptimization/index.ts

@@ -11,6 +11,11 @@ import { ImageConfigComplete, ImageConfig } from 'next/dist/shared/lib/image-con
 import { Writable } from 'node:stream'
 import https from 'node:https'
 import { getNextServerConfig } from '../utils'
+import fetch from 'node-fetch'
+
+// TODO: Remove this once we use Node18.x
+// imageOptimizer uses fetch in its preprocessing logic
+global.fetch = fetch
 
 const sourceBucket = process.env.S3_SOURCE_BUCKET ?? undefined
 
@@ -110,9 +115,9 @@ const optimizer: APIGatewayProxyHandlerV2 = async (event) => {
       body: optimizedResult.buffer.toString('base64'),
       isBase64Encoded: true,
       headers: { 
-        Vary: 'Accept', 
+        Vary: 'Accept',
         'Cache-Control': `public,max-age=${optimizedResult.maxAge},immutable`,
-        'Content-Type': optimizedResult.contentType 
+        'Content-Type': optimizedResult.contentType,
       },
     }
   } catch (error: any) {

src/ImageOptimizationLambda.ts

@@ -88,7 +88,7 @@ export class ImageOptimizationLambda extends NodejsFunction {
             },
             minify: true,
             target: 'node16',
-            externalModules: ['@aws-sdk/client-s3'],
+            externalModules: [],
           },
       layers: [props.nextLayer],
       ...lambdaOptions,

src/NextjsBuild.ts

@@ -110,7 +110,7 @@ export class NextjsBuild extends Construct {
     const buildEnv = {
       ...process.env,
       [NEXTJS_BUILD_STANDALONE_ENV]: 'true',
-      [NEXTJS_BUILD_OUTPUTTRACEROOT_ENV]: getRootTracePath(nextjsPath),
+      [NEXTJS_BUILD_OUTPUTTRACEROOT_ENV]: path.resolve(),
       ...getBuildCmdEnvironment(this.props.environment),
       ...(this.props.nodeEnv ? { NODE_ENV: this.props.nodeEnv } : {}),
     };
@@ -245,16 +245,3 @@ export const TOKEN_PLACEHOLDER_BEGIN = '{NEXT{! ';
 export const TOKEN_PLACEHOLDER_END = ' !}}';
 export const makeTokenPlaceholder = (value: string): string =>
   TOKEN_PLACEHOLDER_BEGIN + value.toString() + TOKEN_PLACEHOLDER_END;
-
-/**
- * Replaces each path with "../"
- * @param path
- */
-function getRootTracePath(p: string): string {
-  p = p.replace(/^\.\/?/, '');
-  return p
-    .split('/')
-    .filter((v) => v && v !== '.')
-    .map(() => '..')
-    .join('/');
-}