@madgex/fert 2.0.2 → 2.0.4

package/bin/commands/build-tasks/build-external-assets.js

@@ -1,5 +1,5 @@
-const Path = require('path');
-const fs = require('fs/promises');
+const Path = require('node:path');
+const fs = require('node:fs/promises');
 const { log } = require('../../utils/logging');
 
 module.exports = async function buildExternalAssets(fertConfig) {

package/bin/commands/build-tasks/build-tokens-v5.js

@@ -1,6 +1,6 @@
+const Path = require('node:path');
+const fs = require('node:fs/promises');
 const StyleDictionaryPackage = require('style-dictionary');
-const Path = require('path');
-const fs = require('fs/promises');
 const {
   registerTransforms,
 } = require('@madgex/design-system-v5/tasks/registerTransforms');

package/bin/commands/build-tasks/build-tokens.js

@@ -1,6 +1,6 @@
+const Path = require('node:path');
+const fs = require('node:fs/promises');
 const StyleDictionaryPackage = require('style-dictionary');
-const Path = require('path');
-const fs = require('fs/promises');
 const {
   registerTransforms,
 } = require('@madgex/design-system/tasks/registerTransforms');
@@ -102,7 +102,7 @@ module.exports = async function buildCssFromTokens(srcTokensPath, buildPath) {
   // Use StyleDictionary to build a tokens SCSS file
   const StyleDictionary = StyleDictionaryPackage.extend(styleDictionaryConfig);
 
-  const tokenBaseFontSize = brandObj?.font?.size?.base; // will default to 16px if undefined
+  const tokenBaseFontSize = brandObj?.font?.size?.base?.value; // will default to 16px if undefined
   await registerTransforms(StyleDictionary, tokenBaseFontSize);
   await runSilently(StyleDictionary.buildAllPlatforms.bind(StyleDictionary));
 

package/bin/commands/build-tasks/bundle-entry.js

@@ -1,4 +1,4 @@
-const path = require('path');
+const path = require('node:path');
 const _ = require('lodash');
 const vite = require('vite');
 const updateBuildWithBundledDsCSS = require('./bundle-ds-css');

package/bin/commands/build.js

@@ -1,4 +1,4 @@
-const path = require('path');
+const path = require('node:path');
 const { rimraf } = require('rimraf');
 const { resolveConfig } = require('../utils');
 const { log } = require('../utils/logging');

package/bin/commands/dev-server.js

@@ -1,4 +1,4 @@
-const path = require('path');
+const path = require('node:path');
 const chalk = require('chalk');
 const open = require('open');
 const chokidar = require('chokidar');

package/bin/commands/init.js

@@ -1,5 +1,5 @@
-const path = require('path');
-const fs = require('fs');
+const path = require('node:path');
+const fs = require('node:fs');
 const chalk = require('chalk');
 const prompts = require('prompts');
 const uuidValidator = require('uuid-validate');

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

@@ -1,5 +1,5 @@
-const fs = require('fs');
-const path = require('path');
+const fs = require('node:fs');
+const path = require('node:path');
 const Hoek = require('@hapi/hoek');
 const { log } = require('../../utils/logging');
 const axios = require('axios');

package/bin/commands/publish.js

@@ -1,4 +1,4 @@
-const path = require('path');
+const path = require('node:path');
 const Hoek = require('@hapi/hoek');
 const chalk = require('chalk');
 const { resolveConfig } = require('../utils');
@@ -38,7 +38,11 @@ module.exports = async (root, options) => {
   const apiKey = await getAwsParam(apiKeyParamPath);
 
   log.info(
-    `Publishing ${chalk.cyan(localDir)} to ${chalk.green.bold(options.target)}`
+    `\nPublishing ${chalk.cyan(localDir)} to ${chalk.green.bold(
+      options.target
+    )} for ${chalk.green(fertConfig.client.brandName)} ${chalk.dim(
+      `(${fertConfig.clientPropertyId})`
+    )}\n`
   );
 
   // send to S3 using the Asset Store API

package/bin/utils/cpid-lookup.js

@@ -1,14 +1,25 @@
-// Fetch provides support for node 16 and lower
+const path = require('node:path');
 const axios = require('axios');
 const { log } = require('../utils/logging');
-const storage = require('node-persist');
+const { slug } = require('../utils/slug');
 const dayjs = require('dayjs');
 const duration = require('dayjs/plugin/duration');
-const { PROPERTY_ID_API, TMP_DIR } = require('../../constants');
+const { PROPERTY_ID_API, TMP_DIR, VERSION } = require('../../constants');
 const chalk = require('chalk');
+const flatCache = require('flat-cache');
+const { diskCacheWithTtl } = require('./disk-cache-with-ttl');
 
 dayjs.extend(duration);
 
+const flatCacheDoc = flatCache.load(
+  'fert-cpid-cache',
+  path.resolve(`${TMP_DIR}/fert-cpid-cache-${slug(VERSION)}`)
+);
+
+const cache = new diskCacheWithTtl(flatCacheDoc, {
+  ttl: dayjs.duration(1, 'week').asMilliseconds(),
+});
+
 exports.doCpidLookup = async (clientPropertyId) => {
   const API_URL = new URL(clientPropertyId, PROPERTY_ID_API).toString();
 
@@ -27,7 +38,6 @@ exports.doCpidLookup = async (clientPropertyId) => {
       throw Error(error.message);
     });
 
-  // const { data: results } = await res.json();
   const { brandName, parentId: parentCpid } = results;
 
   return {
@@ -39,20 +49,15 @@ exports.doCpidLookup = async (clientPropertyId) => {
 };
 
 exports.cpidLookup = async (clientPropertyId) => {
-  await storage.init({
-    dir: `${TMP_DIR}/fert-cpid-cache`,
-    ttl: dayjs.duration(1, 'week').asMilliseconds(),
-  });
-
-  const cache = await storage.getItem(clientPropertyId);
+  const value = cache.get(clientPropertyId);
 
-  if (cache) {
-    return cache;
+  if (value) {
+    return value;
   }
 
   const result = await this.doCpidLookup(clientPropertyId);
 
-  await storage.updateItem(clientPropertyId, result);
+  cache.set(clientPropertyId, result);
 
   return result;
 };

package/bin/utils/disk-cache-with-ttl.js

@@ -0,0 +1,29 @@
+class diskCacheWithTtl {
+  constructor(cache, options = { ttl: 0 }) {
+    this.cache = cache;
+    this.options = options;
+  }
+
+  set(key, value) {
+    this.cache.setKey(key, {
+      value,
+      expire: new Date().getTime() + this.options.ttl,
+    });
+
+    this.cache.save(true);
+  }
+
+  get(key) {
+    let cachedBlob = this.cache.getKey(key);
+
+    if (cachedBlob && new Date().getTime() > cachedBlob.expire) {
+      this.cache.removeKey(key);
+      cachedBlob = null;
+
+      this.cache.save(true);
+    }
+
+    return cachedBlob && cachedBlob.value;
+  }
+}
+exports.diskCacheWithTtl = diskCacheWithTtl;

package/bin/utils/index.js

@@ -1,15 +1,15 @@
-const path = require('path');
-const fs = require('fs');
-const fsp = require('fs/promises');
+const path = require('node:path');
+const fs = require('node:fs');
 const { VERSION, SITE } = require('../../constants');
 const chalk = require('chalk');
 const uuidValidator = require('uuid-validate');
 const Hoek = require('@hapi/hoek');
 const { cpidLookup } = require('./cpid-lookup');
 const resolveExternalAssets = require('./resolve-external-assets');
+const { log } = require('./logging');
 
 exports.printBanner = () => {
-  console.log(chalk`\n{green.bold Fert} v${VERSION}\n`);
+  console.log(`\n${chalk.green.bold('Fert')} v${VERSION}`);
 };
 
 exports.resolveConfig = async (root, options = {}) => {
@@ -62,7 +62,7 @@ exports.loadConfigFromFile = (workingDir) => {
 
     return fertConfig;
   } catch (err) {
-    this.log.error(
+    log.error(
       `Failed to load fert.config.js - ensure you're running fert on a branding repo & config exists.\n`
     );
 
@@ -78,7 +78,7 @@ exports.ensureTrailingSlash = (str) => {
 
 exports.exists = async (path) => {
   try {
-    await fsp.access(path);
+    fs.access(path);
     return true;
   } catch {
     return false;

package/bin/utils/slug.js

@@ -0,0 +1,6 @@
+exports.slug = (txt) => {
+  return txt
+    .toLowerCase()
+    .replace(/\W+/g, '-')
+    .replace(/^-+|-+$/g, '');
+};

package/constants.js

@@ -1,6 +1,6 @@
-const fs = require('fs');
-const path = require('path');
-const os = require('os');
+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()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@madgex/fert",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "Tool to help build the V6 branding",
   "bin": {
     "fert": "./bin/cli.js"
@@ -30,7 +30,7 @@
     "@hapi/inert": "^7.1.0",
     "@hapi/vision": "^7.0.3",
     "@hapipal/toys": "^4.0.0",
-    "@madgex/design-system": "^6.1.2",
+    "@madgex/design-system": "^6.1.4",
     "@madgex/design-system-v5": "npm:@madgex/design-system@^5.0.0",
     "@private/header-footer-podlet-server": "github:wiley/madgex-header-footer-podlet",
     "axios": "^1.6.2",
@@ -39,9 +39,9 @@
     "chokidar": "^3.5.3",
     "dayjs": "^1.11.10",
     "debug": "^4.3.4",
+    "flat-cache": "^4.0.0",
     "form-data": "^4.0.0",
     "lodash": "^4.17.21",
-    "node-persist": "^3.1.3",
     "nunjucks": "^3.2.4",
     "open": "8.4.2",
     "ora": "5.4.1",

package/server/index.js

@@ -1,6 +1,6 @@
 const Hapi = require('@hapi/hapi');
 const Toys = require('@hapipal/toys');
-const path = require('path');
+const path = require('node:path');
 const { log } = require('../bin/utils/logging');
 const podletServer = require('@private/header-footer-podlet-server');
 const {

package/server/view-manager.js

@@ -1,5 +1,5 @@
 const Nunjucks = require('nunjucks');
-const path = require('path');
+const path = require('node:path');
 
 module.exports = (server) => {
   const fertConfig = server.fertConfig();