@madgex/fert 1.5.3 → 1.6.1

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/README.md

@@ -71,6 +71,7 @@ e.g.
 | --------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------ |
 | `clientPropertyId` <String> | The `clientPropertyId` associated with the branding repo (required)                                                                        |
 | `entry` <String>            | The JavaScript entry file. Any assets (CSS/SCSS/SVGs) included will be processed and be part of the output. Defaults to `['src/index.js']` |
+| `assumeSite` <String>           | Which site we want to display, jobseeker site or recruiter site. Values are either `js` or `rs`.
 
 The `entry` will be used by Vite to create production bundles.
 
@@ -80,6 +81,7 @@ e.g.
 module.exports = {
   clientPropertyId: "ff6102ff-0f4b-43d1-a2c7-83b835b8dee5",
   entry: "./src/index.js",
+  assumeSite: "js",
 };
 ```
 
@@ -211,22 +213,4 @@ Here are the default npm scripts in a Fert-scaffolded project.
 }
 ```
 
-Its expected that a Jenkins pipeline will run `fert publish` to send all built assets to the Asset Store API.
-
-
-
-# @madgex/boilerplate-utils
-
-A collection of utilities for use in branding projects, e.g.
-
-* Hamburger nav HTML/CSS/JS
-
-* common SCSS
-
-* SVGs
-
-* templates/macros
-
-If needed, this package can be `npm install`ed in the branding project & consumed from the JS/SCSS.
-
-Templates/macros will have to be copied into the branding repo as they won't be visible/available to the server rendering the template.
+Its expected that a Jenkins pipeline will run `fert publish` to send all built assets to the Asset Store API.

package/bin/cli.js

@@ -18,6 +18,10 @@ const run = () => {
     .option('--open', 'Automatically open the dev server in your browser')
     .option('--host [host]', '[string] specify hostname')
     .option('--port <port>', '[number] specify port')
+    .option(
+      '--assume-site [site]',
+      'Use jobseeker or recruiter site, "js" or "rs"'
+    )
     .action((...args) => require('./commands/dev-server')(...args));
 
   cli

package/bin/commands/dev-server.js

@@ -17,7 +17,9 @@ module.exports = async (root, options = {}) => {
   console.log(
     `Starting branding server for ${chalk.green(
       fertConfig.client.brandName
-    )} ${chalk.dim(`(${fertConfig.clientPropertyId})`)}\n`
+    )} [${fertConfig.assumeSite}] ${chalk.dim(
+      `(${fertConfig.clientPropertyId})`
+    )}\n`
   );
 
   // watch brand.json & fert.config.js - refresh on change

package/bin/utils/index.js

@@ -1,7 +1,7 @@
 const path = require('path');
 const fs = require('fs');
 const fsp = require('fs/promises');
-const { VERSION } = require('../../constants');
+const { VERSION, SITE } = require('../../constants');
 const chalk = require('chalk');
 const uuidValidator = require('uuid-validate');
 const Hoek = require('@hapi/hoek');
@@ -36,6 +36,9 @@ exports.resolveConfig = async (root, options = {}) => {
 
   fertConfig.externalAssets = resolveExternalAssets(fertConfig.externalAssets);
 
+  fertConfig.assumeSite =
+    SITE[options.assumeSite] || SITE[fertConfig.assumeSite] || SITE.js;
+
   return {
     ...fertConfig,
     workingDir,

package/constants.js

@@ -34,4 +34,8 @@ module.exports = {
       display: 'BigWorkBag - populated, example project',
     },
   ],
+  SITE: {
+    js: 'jobseekers-frontend',
+    rs: 'recruiterservices-frontend',
+  },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@madgex/fert",
-  "version": "1.5.3",
+  "version": "1.6.1",
   "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/server/index.js

@@ -40,6 +40,7 @@ exports.devServer = async ({ start, fertConfig = {} } = {}) => {
       templatePath: [path.resolve(fertConfig.workingDir, 'templates')],
       clientPropertiesApi: PROPERTY_ID_API,
       assetsApiUrl: ASSETS_API_URL,
+      layout: fertConfig.assumeSite,
     },
     routes: { prefix: '/_podlet' },
   });

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-----