merge commit

.dockerignore

@@ -1,5 +1,8 @@
 *
 
+!package.json
+!yarn.lock
 !tsconfig.json
-!lib/package.json
+!scripts/*
+!lib/*.json
 !lib/**/*.ts

.github/workflows/CI.yml

@@ -124,6 +124,17 @@ jobs:
 
       - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
 
+      - name: Cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            .yarn
+            **/node_modules
+          key: e2e-${{ hashFiles('yarn.lock') }}
+
+      - name: Install dependencies
+        run: yarn install --frozen-lockfile --check-files
+
       - name: Download build artifact
         uses: actions/download-artifact@v2
         with:

.github/workflows/release.yml

@@ -21,4 +21,4 @@ jobs:
           upstream-branch: main
           release-branch: release
           release-tag: ${{ github.event.inputs.tag }}
-          exclude: '["lib/*", "test/*", "package.json", "yarn.lock"]'
+          exclude: '["lib/**/*", "test/**/*", "package.json", "yarn.lock"]'

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 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))
+
 ## 10.0.5 (March 15, 2021)
 
 **Note 1:** From now on we aligning the versioning schema with the releases of Next.js.

README.md

@@ -130,7 +130,7 @@ module.exports = {
 | next\_image\_device\_sizes | Allowed device sizes that should be used for image optimization. | `list(number)` | `null` | no |
 | next\_image\_domains | Allowed origin domains that can be used for fetching images. | `list(string)` | `[]` | no |
 | next\_image\_image\_sizes | Allowed image sizes that should be used for image optimization. | `list(number)` | `null` | no |
-| next\_image\_version | Next.js version from where you want to use the image optimizer from. Supports semver ranges. | `string` | `"10.0.5"` | no |
+| next\_image\_version | Next.js version from where you want to use the image optimizer from. Supports semver ranges. | `string` | `"10.0.6"` | no |
 | source\_bucket\_id | When your static files are deployed to a Bucket (e.g. with Terraform Next.js) the optimizer can pull the source from the bucket rather than over the internet. | `string` | `null` | no |
 | tags | Tag metadata to label AWS resources that support tags. | `map(string)` | `{}` | no |
 

buildimage.Dockerfile

@@ -4,11 +4,12 @@
 
 FROM amazon/aws-sam-cli-emulation-image-nodejs14.x
 
+# Install yarn
+RUN npm i -g yarn
+
 WORKDIR /app
 
-ADD tsconfig.json \
-    lib \
-    /app/
+COPY . .
 
-RUN npm i &&\
-    npm run build
+RUN yarn --frozen-lockfile &&\
+    yarn build

lib/.gitignore

@@ -1,2 +1,6 @@
 dist
 dist.zip
+
+# Temporary license files
+third-party-licenses.txt
+LICENSE

scripts/build-local.sh

@@ -8,5 +8,5 @@ docker build -t "${IMAGE_NAME}" -f buildimage.Dockerfile .
 # Copy the artifact back to the host machine
 # https://stackoverflow.com/a/31316636/831465
 id=$(docker create local/tf-next-image-optiomizer-build sh)
-docker cp $id:/app/dist.zip ./lib/dist.zip
+docker cp $id:/app/lib/dist.zip ./lib/dist.zip
 docker rm -v $id

scripts/bundle.js

@@ -0,0 +1,54 @@
+/**
+ * Creates a bundled zip file with all dependencies for AWS Lambda
+ */
+
+const path = require('path');
+const fs = require('fs');
+const { nodeFileTrace } = require('@vercel/nft');
+const glob = require('glob');
+const archiver = require('archiver');
+
+const workspaceRoot = path.resolve(__dirname, '..');
+const buildDir = path.resolve(workspaceRoot, 'lib/dist');
+
+async function main() {
+  // Get all files from build dir
+  const buildFiles = glob.sync('**/*.js', { cwd: buildDir, absolute: true });
+
+  console.log('buildFiles', buildFiles);
+
+  const { fileList } = await nodeFileTrace(buildFiles, {
+    base: workspaceRoot,
+    processCwd: process.cwd(),
+    // aws-sdk is already provided in Lambda images
+    ignore: ['**/aws-sdk/**/*'],
+  });
+
+  // Create zip file
+  await new Promise((resolve, reject) => {
+    const outputFile = fs.createWriteStream(
+      path.resolve(workspaceRoot, 'lib/dist.zip')
+    );
+
+    outputFile.on('close', () => resolve());
+    outputFile.on('error', (error) => reject(error));
+
+    const archive = archiver('zip', {
+      zlib: { level: 5 }, // Optimal compression
+    });
+    archive.pipe(outputFile);
+
+    for (const file of fileList) {
+      // Remove lib/ and lib/dist/ prefix
+      const fileName = file.replace(/^lib\/(dist\/)?/, '');
+
+      archive.append(fs.createReadStream(path.join(workspaceRoot, file)), {
+        name: fileName,
+        mode: 0o666,
+      });
+    }
+    archive.finalize();
+  });
+}
+
+main();