@madgex/fert 7.0.13 → 7.0.14

package/bin/commands/publish-tasks/asset-store-uploader.js

@@ -1,8 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import * as Hoek from '@hapi/hoek';
-import axios from 'axios';
-import FormData from 'form-data';
 import ora from 'ora';
 import chalk from 'chalk';
 import { log } from '../../utils/logging.js';
@@ -27,43 +25,52 @@ export class AssetStoreUploader {
     const label = absoluteUrl.pathname;
 
     log.debug('upload', { file, dest, absoluteUrl });
-
+    // `openAsBlob` returns a "File-backend" Blob, not in memory
+    // eslint-disable-next-line n/no-unsupported-features/node-builtins
+    const fileBackedBlob = await fs.openAsBlob(file);
     const form = new FormData();
-    form.append('data', fs.createReadStream(file));
+    form.append('data', fileBackedBlob, path.basename(file));
     form.append('invalidateCache', 'false'); // opt out as will invalidate whole path (*) at end
     form.append('modifiedById', ASSET_STORE_USER_GUID);
 
     const spinner = ora(`${chalk.yellow('Uploading')}: ${label}`).start();
 
-    return axios
-      .put(absoluteUrl.href, form, {
+    try {
+      const res = await fetch(absoluteUrl.href, {
+        method: 'put',
         headers: {
           apikey: this.apiKey,
-          ...form.getHeaders(),
         },
-      })
-      .then(() => {
-        spinner.succeed(`${label}`);
-      })
-      .catch((err) => {
-        spinner.fail(`Failed to upload '${label}':`, err.message);
-
-        throw err;
+        body: form,
       });
+      if (!res.ok) {
+        const resText = await res.text();
+        throw new Error(`${res.status} - ${resText}`);
+      }
+
+      spinner.succeed(`${label}`);
+    } catch (err) {
+      spinner.fail(`Failed to upload '${label}':`, err.message);
+
+      throw err;
+    }
   }
 
-  async uploadDir(dir, dest = false) {
+  async uploadDir(dir, dryRun = false) {
     Hoek.assert(dir, 'dir missing');
 
     const start = process.hrtime();
-    const files = this._getFilesFromDir(dir);
+    const files = await this._getFilesFromDir(dir);
 
     // Send files consecutively to avoid straining the api
     for (const file of files) {
       const relativeName = path.posix.relative(dir, file);
-      const remotePath = path.posix.dirname(dest || relativeName);
-
-      await this.upload(file, remotePath);
+      const remotePath = path.posix.dirname(relativeName);
+      if (!dryRun) {
+        await this.upload(file, remotePath);
+      } else {
+        log.info('(Dry run) Uploading', file, 'to => ', remotePath);
+      }
     }
 
     const end = process.hrtime(start);
@@ -94,10 +101,13 @@ export class AssetStoreUploader {
       payload.distributionId = distributionId;
     }
 
-    await axios.post(invalidateUrl.href, payload, {
+    await fetch(invalidateUrl.href, {
+      method: 'post',
       headers: {
         apikey: this.apiKey,
+        'Content-Type': 'application/json',
       },
+      body: JSON.stringify(payload),
     });
 
     log.info(
@@ -106,18 +116,13 @@ export class AssetStoreUploader {
       }:\n${JSON.stringify(paths)}\n`,
     );
   }
-  // Returns array of all files in provided directory (recursive)
-  _getFilesFromDir = (dir, files = []) => {
-    fs.readdirSync(dir).forEach((entry) => {
-      const name = path.join(dir, entry);
-
-      if (fs.statSync(name).isDirectory()) {
-        this._getFilesFromDir(name, files);
-      } else {
-        files.push(name);
-      }
-    });
-
-    return files;
-  };
+  /**
+   * Returns array of all files in provided directory (recursive), as absolute paths including filename.
+   */
+  async _getFilesFromDir(dir) {
+    // eslint-disable-next-line n/no-unsupported-features/node-builtins
+    const all = await Array.fromAsync(fs.promises.glob('**/*', { cwd: dir, withFileTypes: true })); // withFileTypes return dirent instead of strings
+    // only files, make sure output is array of absolute file path strings
+    return all.filter((dirent) => dirent.isFile()).map((dirent) => path.resolve(dirent.parentPath, dirent.name));
+  }
 }

package/bin/commands/publish.js

@@ -57,10 +57,10 @@ export async function publish(options) {
   const localDir = path.resolve(fertConfig.workingDir, UPLOAD_DIR);
   const apiKeyParamPath = Hoek.reachTemplate(templateCtx, AWS_PARAM_NAME);
 
-  const apiKey = await getAwsParam(apiKeyParamPath);
-
-  const assetsPath = await getAssetsPath(fertConfig, options.target);
-  const clientCloudFrontDists = await getCloudFrontDistributionsForDomain(assetsPath.hostname, options);
+  const [apiKey, assetsPath] = await Promise.all([
+    getAwsParam(apiKeyParamPath),
+    getAssetsPath(fertConfig, options.target),
+  ]);
 
   log.info(
     `\nPublishing ${chalk.cyan(localDir)} to ${chalk.green.bold(
@@ -76,18 +76,17 @@ export async function publish(options) {
       basePath: remoteBasePath,
     });
 
-    let uploadResult;
-    if (!options.dryRun) {
-      uploadResult = await assetStore.uploadDir(localDir);
-    }
+    const uploadResult = await assetStore.uploadDir(localDir, options.dryRun);
 
     log.success(`Publish complete in ${((uploadResult?.duration || 1) / 1000).toFixed(0)}s\n`);
 
     // invalidate cloudfront cache
-    await assetStore.invalidatePaths([assetStoreInvPath]);
-
-    for (let dist of clientCloudFrontDists) {
-      await assetStore.invalidatePaths([`${assetsPath.pathname}/*`], dist.id);
+    if (!options.dryRun) {
+      await assetStore.invalidatePaths([assetStoreInvPath]);
+      const clientCloudFrontDists = await getCloudFrontDistributionsForDomain(assetsPath.hostname, options);
+      for (let dist of clientCloudFrontDists) {
+        await assetStore.invalidatePaths([`${assetsPath.pathname}/*`], dist.id);
+      }
     }
 
     log.info(`\nNote cloudfront invalidations may take upto ${chalk.yellow('30 seconds')} to complete.\n`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@madgex/fert",
-  "version": "7.0.13",
+  "version": "7.0.14",
   "description": "Tool to help build the V6 branding",
   "bin": {
     "fert": "./bin/cli.js"
@@ -24,47 +24,45 @@
   "author": "Madgex",
   "license": "UNLICENSED",
   "dependencies": {
-    "@aws-sdk/client-cloudfront": "3.982.0",
-    "@aws-sdk/client-ssm": "3.982.0",
-    "@hapi/hapi": "21.4.4",
+    "@aws-sdk/client-cloudfront": "3.1017.0",
+    "@aws-sdk/client-ssm": "3.1017.0",
+    "@hapi/hapi": "21.4.7",
     "@hapi/hoek": "11.0.7",
     "@hapi/inert": "7.1.0",
     "@hapi/vision": "7.0.3",
     "@hapipal/toys": "4.0.0",
-    "@madgex/config-api-sdk": "1.13.1",
-    "@madgex/design-system": "13.2.1",
+    "@madgex/config-api-sdk": "1.16.0",
+    "@madgex/design-system": "13.5.1",
     "@private/header-footer-podlet-server": "github:wiley/madgex-header-footer-podlet",
-    "axios": "1.13.2",
     "cac": "6.7.14",
     "chalk": "5.6.2",
     "chokidar5": "npm:chokidar@5.0.0",
     "debug": "4.4.3",
     "dedent": "1.7.1",
     "find-up-simple": "1.0.1",
-    "flat-cache": "6.1.20",
-    "form-data": "4.0.5",
-    "joi": "18.0.2",
+    "flat-cache": "6.1.21",
+    "joi": "18.1.1",
     "nunjucks": "3.2.4",
     "open": "11.0.0",
     "ora": "5.4.1",
     "prompts": "2.4.2",
     "rimraf": "6.1.2",
-    "sass": "1.97.3",
-    "simple-git": "3.30.0",
+    "sass": "1.98.0",
+    "simple-git": "3.33.0",
     "simple-update-notifier": "2.0.0",
     "uuid-validate": "0.0.3",
     "vite": "7.3.1",
     "vite-plugin-static-copy": "3.2.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "20.4.1",
-    "@commitlint/config-conventional": "20.4.1",
-    "@madgex/eslint-config-madgex": "2.3.0",
-    "@madgex/prettier-config-madgex": "2.0.0",
-    "eslint": "9.39.2",
+    "@commitlint/cli": "20.5.0",
+    "@commitlint/config-conventional": "20.5.0",
+    "@madgex/eslint-config-madgex": "3.0.0",
+    "@madgex/prettier-config-madgex": "2.0.1",
+    "eslint": "10.1.0",
     "husky": "9.1.7",
-    "lint-staged": "16.2.7",
-    "msw": "^2.12.8",
+    "lint-staged": "16.4.0",
+    "msw": "^2.12.14",
     "prettier": "3.8.1",
     "semantic-release": "25.0.3"
   },

package/shared/Dockerfile.brandingRepoPublish

@@ -1,4 +1,4 @@
-FROM node:22-alpine
+FROM node:24-alpine
 
 ENV HOME=/app/