@madgex/fert 5.0.3 → 5.0.5

package/bin/utils/index.js

@@ -1,11 +1,8 @@
 const path = require('node:path');
 const fs = require('node:fs');
+// eslint-disable-next-line n/no-unsupported-features/node-builtins
 const { glob } = require('node:fs/promises');
-const {
-  VERSION,
-  FERT_CONFIG_FILENAME,
-  FERT_SERVICE_CONFIG_FILENAME,
-} = require('../../constants');
+const { VERSION, FERT_CONFIG_FILENAME, FERT_SERVICE_CONFIG_FILENAME } = require('../../constants');
 const chalk = require('chalk');
 const uuidValidator = require('uuid-validate');
 const Hoek = require('@hapi/hoek');
@@ -56,7 +53,7 @@ exports.resolveConfig = async (options = {}) => {
 
   // workingDir based on service folder
   const { dir: workingDir, serviceConfig } = serviceConfigs.find(
-    (item) => item.serviceConfig.serviceName === options.serviceName
+    (item) => item.serviceConfig.serviceName === options.serviceName,
   );
   const fertConfig = Hoek.applyToDefaults(
     defaults,
@@ -64,20 +61,17 @@ exports.resolveConfig = async (options = {}) => {
     {
       ...this.loadConfigFromFile({ dir: rootDir }),
       ...serviceConfig,
-    }
+    },
   );
 
   // Check Fert cpid is valid
   Hoek.assert(
     uuidValidator(fertConfig.clientPropertyId),
-    `Invalid clientPropertyId specified in fert.config.js: ${fertConfig.clientPropertyId}`
+    `Invalid clientPropertyId specified in fert.config.js: ${fertConfig.clientPropertyId}`,
   );
 
   // Check Fert serviceName is valid
-  Hoek.assert(
-    typeof fertConfig.serviceName === 'string',
-    `serviceName required: ${fertConfig.serviceName}`
-  );
+  Hoek.assert(typeof fertConfig.serviceName === 'string', `serviceName required: ${fertConfig.serviceName}`);
   // get & store the current git branch
   fertConfig.currBranch = (await git.branch()).current;
 
@@ -86,7 +80,7 @@ exports.resolveConfig = async (options = {}) => {
 
   Hoek.assert(
     fertCpidMatchesGitRemote,
-    `CPID mismatch, please correct before retrying: ${fertConfig.clientPropertyId}`
+    `CPID mismatch, please correct before retrying: ${fertConfig.clientPropertyId}`,
   );
 
   const client = await cpidLookup(fertConfig.clientPropertyId);
@@ -145,11 +139,7 @@ exports.loadServiceConfigFiles = async () => {
   return serviceConfigs;
 };
 
-exports.loadConfigFromFile = ({
-  dir = process.cwd(),
-  filename = FERT_CONFIG_FILENAME,
-  silent = false,
-}) => {
+exports.loadConfigFromFile = ({ dir = process.cwd(), filename = FERT_CONFIG_FILENAME, silent = false }) => {
   const configPath = path.resolve(dir, filename);
   try {
     // always return fresh config
@@ -162,14 +152,13 @@ exports.loadConfigFromFile = ({
     return fertConfig;
   } catch (err) {
     if (!silent) {
-      log.error(
-        `Failed to load ${filename} - ensure you're running fert on a branding repo & config exists.\n`
-      );
+      log.error(`Failed to load ${filename} - ensure you're running fert on a branding repo & config exists.\n`);
 
       console.error(err);
       throw err;
     }
   }
+  return null;
 };
 
 exports.ensureTrailingSlash = (str) => {
@@ -178,17 +167,17 @@ exports.ensureTrailingSlash = (str) => {
   return lastChar === '/' ? str : `${str}/`;
 };
 
-exports.exists = async (path) => {
+exports.exists = async (_path) => {
   try {
-    fs.access(path);
+    fs.access(_path);
     return true;
   } catch {
     return false;
   }
 };
 
-exports.isEmptyDir = function isEmptyDir(path) {
-  const files = fs.readdirSync(path);
+exports.isEmptyDir = function isEmptyDir(_path) {
+  const files = fs.readdirSync(_path);
   return files.length === 0 || (files.length === 1 && files[0] === '.git');
 };
 

package/bin/utils/lookup-cf-distribution-ids.js

@@ -1,7 +1,4 @@
-const {
-  CloudFrontClient,
-  ListDistributionsCommand,
-} = require('@aws-sdk/client-cloudfront');
+const { CloudFrontClient, ListDistributionsCommand } = require('@aws-sdk/client-cloudfront');
 const { persistentCacheWithTtl } = require('./persistent-cache-with-ttl');
 const assert = require('node:assert');
 const { ONE_WEEK, AWS_REGION } = require('../../constants');
@@ -19,9 +16,7 @@ exports.doGetAllCloudFrontDistributions = async () => {
   let isTruncated = false;
 
   do {
-    const list = await cloudfront.send(
-      new ListDistributionsCommand({ Marker })
-    );
+    const list = await cloudfront.send(new ListDistributionsCommand({ Marker }));
 
     Marker = list.DistributionList.NextMarker;
     isTruncated = list.DistributionList.IsTruncated;

package/bin/utils/resolve-external-assets.js

@@ -6,18 +6,14 @@ class LinkAsset {
       this.href = arg;
     } else if (typeof arg === 'object') {
       if (!arg.href) {
-        throw new Error(
-          'External assets - the link is missing the href property'
-        );
+        throw new Error('External assets - the link is missing the href property');
       }
 
       for (const [key, value] of Object.entries(arg)) {
         this[key] = value;
       }
     } else {
-      throw new Error(
-        'External assets - the value should be a string or an object'
-      );
+      throw new Error('External assets - the value should be a string or an object');
     }
   }
 }
@@ -29,13 +25,12 @@ class ScriptAsset {
       this.src = arg;
     } else if (typeof arg === 'object') {
       if (!arg.src) {
-        throw new Error(
-          'External assets - the script is missing the src property'
-        );
+        throw new Error('External assets - the script is missing the src property');
       }
 
       // in case defer has been set to false in the config, we remove it so it's not added to the object
       if (arg.defer === false) {
+        // eslint-disable-next-line no-param-reassign
         delete arg.defer;
       }
 
@@ -48,9 +43,7 @@ class ScriptAsset {
         delete this.async;
       }
     } else {
-      throw new Error(
-        'External assets - the value should be a string or an object'
-      );
+      throw new Error('External assets - the value should be a string or an object');
     }
   }
 }
@@ -70,9 +63,7 @@ function resolveExternalAssets(assets = {}) {
   }
 
   if (assets.scripts) {
-    const scriptArr = Array.isArray(assets.scripts)
-      ? assets.scripts
-      : [assets.scripts];
+    const scriptArr = Array.isArray(assets.scripts) ? assets.scripts : [assets.scripts];
 
     scriptArr.forEach((item) => {
       result.scripts.push(new ScriptAsset(item));

package/constants.js

@@ -2,9 +2,7 @@ const fs = require('node:fs');
 const path = require('node:path');
 const os = require('node:os');
 
-const { version: VERSION } = JSON.parse(
-  fs.readFileSync(path.resolve(__dirname, './package.json')).toString()
-);
+const { version: VERSION } = JSON.parse(fs.readFileSync(path.resolve(__dirname, './package.json')).toString());
 
 const ONE_MINUTE = 60000;
 const ONE_HOUR = ONE_MINUTE * 60;
@@ -16,8 +14,7 @@ module.exports = {
   TMP_DIR: fs.realpathSync(os.tmpdir()),
   FERT_PACKAGE_DIR: path.resolve('./'),
   AWS_REGION: 'eu-west-1',
-  PROPERTY_ID_API:
-    'https://property-identification-api.cs.madgexhosting.net/properties/',
+  PROPERTY_ID_API: 'https://property-identification-api.cs.madgexhosting.net/properties/',
   ASSETS_API_URL: 'https://asset-store.job.madgexhosting.net',
   BRAND_JSON_FILENAME: 'brand.json',
   FERT_CONFIG_FILENAME: 'fert.config.js',
@@ -34,8 +31,7 @@ module.exports = {
   /**
    * important to have the correct service name and cpid so assets are uploaded to the correct unique place per-service.
    */
-  REMOTE_UPLOAD_BASE:
-    '/api/assets/{fertConfig.serviceName}/{fertConfig.clientPropertyId}',
+  REMOTE_UPLOAD_BASE: '/api/assets/{fertConfig.serviceName}/{fertConfig.clientPropertyId}',
   /**
    * invalidates the real asset store key path, which is related to `REMOTE_UPLOAD_BASE`
    * asset-store puts things in `rootClientPropertyId` based on the AWS_PARAM_NAME used, and the rest of the path relates to `REMOTE_UPLOAD_BASE`
@@ -50,16 +46,6 @@ module.exports = {
    */
   BRANDED_SITE_INVALIDATION_PATH: `/_/{fertConfig.serviceName}/assets/*`,
   ASSET_STORE_USER_GUID: 'a386d4b6-f2df-4b80-ad1f-0349e23f530b',
-  TEMPLATES: [
-    {
-      name: 'basic',
-      display: 'Basic - blank canvas',
-    },
-    {
-      name: 'bigworkbag',
-      display: 'BigWorkBag - populated, example project',
-    },
-  ],
   ONE_MINUTE,
   ONE_HOUR,
   ONE_DAY,

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@madgex/fert",
-  "version": "5.0.3",
+  "version": "5.0.5",
   "description": "Tool to help build the V6 branding",
   "bin": {
     "fert": "./bin/cli.js"
   },
+  "type": "commonjs",
   "scripts": {
     "lint": "eslint .",
     "format": "prettier --write .",
@@ -18,21 +19,21 @@
     "url": "https://github.com/wiley/madgex-frontend-rollout-tool.git"
   },
   "engines": {
-    "node": ">=22"
+    "node": ">=22.3"
   },
   "author": "Madgex",
   "license": "UNLICENSED",
   "dependencies": {
-    "@aws-sdk/client-cloudfront": "^3.716.0",
-    "@aws-sdk/client-ssm": "^3.716.0",
-    "@aws-sdk/credential-providers": "^3.716.0",
+    "@aws-sdk/client-cloudfront": "^3.745.0",
+    "@aws-sdk/client-ssm": "^3.744.0",
+    "@aws-sdk/credential-providers": "^3.744.0",
     "@hapi/hapi": "^21.3.12",
     "@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.6.2",
-    "@madgex/design-system": "^9.1.9",
+    "@madgex/config-api-sdk": "^1.7.0",
+    "@madgex/design-system": "^9.2.0",
     "@private/header-footer-podlet-server": "github:wiley/madgex-header-footer-podlet",
     "axios": "^1.7.9",
     "cac": "^6.7.14",
@@ -49,7 +50,7 @@
     "ora": "5.4.1",
     "prompts": "^2.4.2",
     "rimraf": "^5.0.5",
-    "sass": "^1.83.4",
+    "sass": "^1.84.0",
     "simple-git": "^3.27.0",
     "simple-update-notifier": "^2.0.0",
     "style-dictionary": "3.9.0",
@@ -58,30 +59,20 @@
     "vite-plugin-static-copy": "^0.17.1"
   },
   "devDependencies": {
-    "@commitlint/cli": "^19.6.1",
-    "@commitlint/config-conventional": "^19.6.0",
-    "@eslint/eslintrc": "^3.2.0",
-    "@eslint/js": "^9.17.0",
-    "commitizen": "^4.3.1",
-    "cz-conventional-changelog": "^3.3.0",
-    "eslint": "^9.17.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.2.1",
-    "globals": "^15.14.0",
+    "@commitlint/cli": "^19.7.1",
+    "@commitlint/config-conventional": "^19.7.1",
+    "@madgex/eslint-config-madgex": "^2.3.0",
+    "@madgex/prettier-config-madgex": "^2.0.0",
+    "eslint": "^9.19.0",
     "husky": "^9.1.7",
     "joi": "^17.13.3",
-    "lint-staged": "^15.3.0",
-    "prettier": "^3.4.2",
-    "semantic-release": "^24.2.0"
+    "lint-staged": "^15.4.3",
+    "prettier": "^3.5.0",
+    "semantic-release": "^24.2.2"
   },
   "peerDependencies": {
     "@ctrl/tinycolor": "^3.6.0"
   },
-  "config": {
-    "commitizen": {
-      "path": "node_modules/cz-conventional-changelog"
-    }
-  },
   "lint-staged": {
     "*.{js,json}": [
       "prettier --write",

package/repo-template/fert.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  clientPropertyId: '{CPID}',
+};

package/repo-template/package.json

@@ -0,0 +1,22 @@
+{
+  "name": "madgex-cpid",
+  "version": "1.0.0",
+  "description": "Branding Repo",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/wiley/madgex-cpid.git"
+  },
+  "author": "Madgex",
+  "license": "UNLICENSED",
+  "homepage": "https://github.com/wiley/madgex-cpid#readme",
+  "scripts": {
+    "dev": "fert",
+    "build": "fert build"
+  },
+  "dependencies": {
+    "@madgex/branding-shared": "^1.0.1"
+  },
+  "devDependencies": {
+    "@madgex/fert": "*"
+  }
+}

package/{repo-templates/template-basic → repo-template/services/jobseekers-frontend}/brand.json

@@ -7,14 +7,17 @@
       "2": {
         "base": { "value": "#343434" }
       }
+    },
+    "button": {
+      "bg": {
+        "base": { "value": "#005689" }
+      }
     }
   },
   "font": {
     "family": {
       "button": {
-        "base": {
-          "value": "comic sans"
-        }
+        "base": { "value": "Arial" }
       }
     }
   }

package/repo-template/services/jobseekers-frontend/fert.service.config.js

@@ -0,0 +1,7 @@
+module.exports = {
+  serviceName: 'jobseekers-frontend',
+  entry: './src/index.js',
+  externalAssets: {
+    links: 'https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,400;0,700;1,400&display=swap',
+  },
+};

package/repo-template/services/jobseekers-frontend/public/icons/user.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="100pt" height="100pt" version="1.1" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+ <path d="m60.418 66.668c-3.125-1.668-1.457-4.793 0-6.25 1.875-1.875 4.168-8.332 4.168-8.332 3.75-1.668 4.168-4.375 4.582-6.25 1.668-5.418-2.5-6.25-2.5-6.25s3.332-8.957 0.625-15.832c-3.543-8.957-17.918-12.293-20.418-3.957-17.082-3.7539-13.543 19.785-13.543 19.785s-4.168 0.83203-2.5 6.25c0.41797 1.875 0.83203 4.582 4.582 6.25 0 0 2.293 6.457 4.168 8.332 1.457 1.457 3.125 4.582 0 6.25-6.25 3.332-25 4.168-25 18.75h70.832c0.003907-14.582-18.746-15.414-24.996-18.746z"/>
+</svg>