@madgex/fert 1.6.0 → 1.7.0

package/.github/workflows/release.yml

@@ -19,11 +19,23 @@ jobs:
         uses: actions/setup-node@v2
         with:
           cache: npm
-          node-version: 14
+          node-version: 20
+
+      - name: Setup SSH Keys and known_hosts
+        env:
+          SSH_AUTH_SOCK: /tmp/ssh_agent.sock
+        run: |
+          ssh-agent -a $SSH_AUTH_SOCK > /dev/null
+          ssh-add - <<< "${{ secrets.MADGEX_GITHUB_SSH_KEY }}"
+
       - name: Install dependencies
         run: npm ci
+        env:
+          SSH_AUTH_SOCK: /tmp/ssh_agent.sock
+          NPM_TOKEN: ${{ secrets.MADGEX_NPM_TOKEN }}
+
       - name: Release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+          NPM_TOKEN: ${{ secrets.MADGEX_NPM_TOKEN }}
         run: npx semantic-release

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

@@ -33,6 +33,7 @@ module.exports = class AssetStoreUploader {
 
     const form = new FormData();
     form.append('data', fs.createReadStream(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();
@@ -77,6 +78,34 @@ module.exports = class AssetStoreUploader {
     };
   }
 
+  /**
+   * Invalidate files on all CloudFront edge locations
+   * @param {array} paths Paths to invalidate
+   */
+  async invalidatePaths(paths) {
+    const invalidateUrl = new URL('api/assets/invalidate', this.apiUrl);
+
+    log.debug('invalidating', { paths });
+
+    const payload = {
+      modifiedById: ASSET_STORE_USER_GUID,
+      paths,
+    };
+
+    await axios.post(invalidateUrl.href, payload, {
+      headers: {
+        apikey: this.apiKey,
+      },
+    });
+
+    log.info(
+      `CloudFront cache invalidation sent for the following paths:\n${JSON.stringify(
+        paths
+      )}\n\nNote this may take upto ${chalk.yellow(
+        '30 seconds'
+      )} to complete.\n`
+    );
+  }
   // Returns array of all files in provided directory (recursive)
   _getFilesFromDir = (dir, files = []) => {
     fs.readdirSync(dir).forEach((entry) => {

package/bin/commands/publish.js

@@ -10,6 +10,7 @@ const {
   AWS_PARAM_NAME,
   REMOTE_UPLOAD_BASE,
   UPLOAD_DIR,
+  INVALIDATION_PATH,
 } = require('../../constants');
 
 module.exports = async (root, options) => {
@@ -32,6 +33,7 @@ module.exports = async (root, options) => {
   const apiUrl = Hoek.reachTemplate(templateCtx, ASSET_STORE_API);
   const remoteBasePath = Hoek.reachTemplate(templateCtx, REMOTE_UPLOAD_BASE);
   const apiKeyParamPath = Hoek.reachTemplate(templateCtx, AWS_PARAM_NAME);
+  const invalidationPath = Hoek.reachTemplate(templateCtx, INVALIDATION_PATH);
 
   const apiKey = await getAwsParam(apiKeyParamPath);
 
@@ -49,4 +51,6 @@ module.exports = async (root, options) => {
   const result = await assetStore.uploadDir(localDir);
 
   log.success(`Publish complete in ${(result.duration / 1000).toFixed(0)}s\n`);
+
+  await assetStore.invalidatePaths([invalidationPath]);
 };

package/constants.js

@@ -23,6 +23,7 @@ module.exports = {
     '/api/assets/jobseekers-frontend/{fertConfig.clientPropertyId}',
   AWS_PARAM_NAME:
     '/{Environement_Name}/jobboard/kong/internal/consumer-key/jobseekers-frontend_{fertConfig.client.rootClientPropertyId}',
+  INVALIDATION_PATH: `/jobseekers-frontend/{fertConfig.clientPropertyId}/*`,
   ASSET_STORE_USER_GUID: 'a386d4b6-f2df-4b80-ad1f-0349e23f530b',
   TEMPLATES: [
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@madgex/fert",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "Tool to help build the V6 branding",
   "bin": {
     "fert": "./bin/cli.js"
@@ -23,8 +23,8 @@
   "author": "Madgex",
   "license": "UNLICENSED",
   "dependencies": {
-    "@aws-sdk/client-ssm": "^3.370.0",
-    "@aws-sdk/credential-providers": "^3.370.0",
+    "@aws-sdk/client-ssm": "^3.453.0",
+    "@aws-sdk/credential-providers": "^3.451.0",
     "@hapi/hapi": "^21.3.2",
     "@hapi/hoek": "^11.0.2",
     "@hapi/inert": "^7.1.0",
@@ -32,11 +32,11 @@
     "@hapipal/toys": "^4.0.0",
     "@madgex/design-system": "*",
     "@private/header-footer-podlet-server": "github:wiley/madgex-header-footer-podlet",
-    "axios": "^1.5.0",
+    "axios": "^1.6.2",
     "cac": "^6.7.14",
     "chalk": "4.1.2",
     "chokidar": "^3.5.3",
-    "dayjs": "^1.11.9",
+    "dayjs": "^1.11.10",
     "debug": "^4.3.4",
     "form-data": "^4.0.0",
     "lodash": "^4.17.21",
@@ -45,26 +45,26 @@
     "open": "8.4.2",
     "ora": "5.4.1",
     "prompts": "^2.4.2",
-    "rimraf": "^5.0.1",
-    "sass": "^1.66.1",
+    "rimraf": "^5.0.5",
+    "sass": "^1.69.5",
     "simple-update-notifier": "^2.0.0",
-    "style-dictionary": "^3.8.0",
+    "style-dictionary": "^3.9.0",
     "uuid-validate": "^0.0.3",
     "vite": "^4.4.9",
-    "vite-plugin-static-copy": "^0.17.0"
+    "vite-plugin-static-copy": "^0.17.1"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.6.7",
-    "@commitlint/config-conventional": "^17.7.0",
+    "@commitlint/cli": "^18.4.2",
+    "@commitlint/config-conventional": "^18.4.2",
     "commitizen": "^4.3.0",
     "cz-conventional-changelog": "^3.3.0",
-    "eslint": "^8.49.0",
+    "eslint": "^8.53.0",
     "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-prettier": "^5.0.0",
+    "eslint-plugin-prettier": "^5.0.1",
     "husky": "^8.0.3",
-    "lint-staged": "^14.0.1",
-    "prettier": "^3.0.3",
-    "semantic-release": "^21.1.1"
+    "lint-staged": "^15.1.0",
+    "prettier": "^3.1.0",
+    "semantic-release": "^22.0.8"
   },
   "peerDependencies": {
     "@ctrl/tinycolor": "^3.6.0"

package/delivery/git.cer

@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDmzCCAoOgAwIBAgIQFausXHONQJZAJThAIzsEMzANBgkqhkiG9w0BAQsFADBC
-MRUwEwYKCZImiZPyLGQBGRYFbG9jYWwxGDAWBgoJkiaJk/IsZAEZFghDbGFyZW5j
-ZTEPMA0GA1UEAxMGcm9vdGNhMB4XDTIyMDgxNzE0MDgxNVoXDTMyMDgxODEwMTAx
-NVowQjEVMBMGCgmSJomT8ixkARkWBWxvY2FsMRgwFgYKCZImiZPyLGQBGRYIQ2xh
-cmVuY2UxDzANBgNVBAMTBnJvb3RjYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAKBP9oZ923t+O3ydOoZtptE70cxFA9B7BM9tNVWvKU93LeUc/Sj1nd0M
-nToMElEfKasUWPBOaNS1Nkz7UZ8FhibNzqGp5LwFQxFzYoCIEB5eWumECUV5mrey
-4wKt5cZypQ33bwAhlvtP2MHBaYd/GBfYVww7k81SWaOTMfZLO4jPbTrPe2vJo4Zr
-4YXkK/ntGGlUrYG+L7cEACbdLtaTU53ORBSAZhRSFh9Xfc8JRuh6mBu5To/LX8S/
-gA2EeCWGqQxh3gUjxKpMtMQ7+DzHfpLSYdEQGBG2rnqY8d9+v6hAfuJW+BFlyOvX
-Q6l+3ejKg7YFZmOvKKztFNI0SdvU5hECAwEAAaOBjDCBiTATBgkrBgEEAYI3FAIE
-Bh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU
-EBokiBcrmgWuf693v8CNxfKtY2EwEAYJKwYBBAGCNxUBBAMCAQEwIwYJKwYBBAGC
-NxUCBBYEFKUcb/T4F7x8uAJsibz0HRxxqAdrMA0GCSqGSIb3DQEBCwUAA4IBAQCg
-KoV0dXGIRfPZzVl0eWQ04k66R6kOkOP+y/toy7KcYvi2+HjgXkZ/YWcKs6U1okxv
-jTLSnDOBP0yUoISSNGjZhHpt5ChOdHd0g1RP/sHO0ruvCq8x0tM3kjxq6z0ki1wG
-zW8ffmiZIFfQcaPnzhEkgB89EClHD8kz/cHNg369/CotrWZfoIYudDD6pupF0Jb8
-IWnY0IL1CF2W5qI7PxmBwtp8zNY2st1qMnebYiVCqtIsZ2Wa2Qs33+BmzxcLC7lz
-dZvXCqqMb+nbLBo5jg33XgsJ6+GIuTJYp+bSC+zDtPUSi6/3o22I8dmOLRmIe9la
-//Jyi53PL8XbWMkiEQzs
------END CERTIFICATE-----