eschweitzer78/vic2-20240501

.github/workflows/ci-pr-prerelease.yml

@@ -39,6 +39,8 @@ jobs:
       - name: "Install npm dependencies"
         if: steps.cache-npm.outputs.cache-hit != 'true'
         run: npm ci
+        env:
+          GHCR_TOKEN: ${{ secrets.GHCR_ACCESS_TOKEN }}
 
       # Prettier formatting
       - name: "Code formatting verification with Prettier"
@@ -144,6 +146,19 @@ jobs:
         if: steps.pmd-sf-gps-ds-au-vic1.outputs.violations != 0
         run: exit 1
 
+      # Run PMD scan
+      - name: "Run PMD scan for sfGpsDsAuVic2"
+        uses: pmd/pmd-github-action@v1.4.1
+        id: pmd-sf-gps-ds-au-vic2
+        with:
+          sourcePath: "sfGpsDsAuVic2"
+          rulesets: "ruleset.xml"
+
+      # Check for PMD violations
+      - name: "Check for PMD violations"
+        if: steps.pmd-sf-gps-ds-au-vic2.outputs.violations != 0
+        run: exit 1
+
       # Run PMD scan
       - name: "Run PMD scan for sfGpsDsFrGov"
         uses: pmd/pmd-github-action@v1.4.1
@@ -215,7 +230,14 @@ jobs:
 
       # Deploy source to scratch org
       - name: "Push source to scratch org"
-        run: sfdx project deploy start --target-org=scratch-org
+        run: |
+          sfdx project deploy start --source-dir sfGpsDs --target-org=scratch-org
+          sfdx project deploy start --source-dir sfGpsDsAuNsw --target-org=scratch-org
+          sfdx project deploy start --source-dir sfGpsDsAuNswS --target-org=scratch-org
+          sfdx project deploy start --source-dir sfGpsDsAuVic --target-org=scratch-org
+          sfdx project deploy start --source-dir sfGpsDsAuVic2 --target-org=scratch-org
+          sfdx project deploy start --source-dir sfGpsDsUkGov --target-org=scratch-org
+          sfdx project deploy start --source-dir sfGpsDsFrGov --target-org=scratch-org
 
       # Assign permissionset
       # - name: 'Assign permissionset to default user'

.github/workflows/ci-pr.yml

@@ -49,6 +49,8 @@ jobs:
       - name: "Install npm dependencies"
         if: steps.cache-npm.outputs.cache-hit != 'true'
         run: npm ci
+        env:
+          GHCR_TOKEN: ${{ secrets.GHCR_ACCESS_TOKEN }}
 
       # Prettier formatting
       - name: "Code formatting verification with Prettier"
@@ -144,14 +146,27 @@ jobs:
       # Run PMD scan
       - name: "Run PMD scan for sfGpsDsAuVic"
         uses: pmd/pmd-github-action@v1.4.1
-        id: pmd-sf-gps-ds-au-vic
+        id: pmd-sf-gps-ds-au-vic1
         with:
           sourcePath: "sfGpsDsAuVic"
           rulesets: "ruleset.xml"
 
       # Check for PMD violations
       - name: "Check for PMD violations"
-        if: steps.pmd-sf-gps-ds-au-vic.outputs.violations != 0
+        if: steps.pmd-sf-gps-ds-au-vic1.outputs.violations != 0
+        run: exit 1
+
+      # Run PMD scan
+      - name: "Run PMD scan for sfGpsDsAuVic2"
+        uses: pmd/pmd-github-action@v1.4.1
+        id: pmd-sf-gps-ds-au-vic2
+        with:
+          sourcePath: "sfGpsDsAuVic2"
+          rulesets: "ruleset.xml"
+
+      # Check for PMD violations
+      - name: "Check for PMD violations"
+        if: steps.pmd-sf-gps-ds-au-vic2.outputs.violations != 0
         run: exit 1
 
       # Run PMD scan
@@ -225,7 +240,14 @@ jobs:
 
       # Deploy source to scratch org
       - name: "Push source to scratch org"
-        run: sfdx project deploy start --target-org=scratch-org
+        run: |
+          sfdx project deploy start --source-dir sfGpsDs --target-org=scratch-org
+          sfdx project deploy start --source-dir sfGpsDsAuNsw --target-org=scratch-org
+          sfdx project deploy start --source-dir sfGpsDsAuNswS --target-org=scratch-org
+          sfdx project deploy start --source-dir sfGpsDsAuVic --target-org=scratch-org
+          sfdx project deploy start --source-dir sfGpsDsAuVic2 --target-org=scratch-org
+          sfdx project deploy start --source-dir sfGpsDsUkGov --target-org=scratch-org
+          sfdx project deploy start --source-dir sfGpsDsFrGov --target-org=scratch-org
 
       # Assign permissionset
       # - name: 'Assign permissionset to default user'

.github/workflows/ci.yml

@@ -39,6 +39,8 @@ jobs:
       - name: "Install npm dependencies"
         if: steps.cache-npm.outputs.cache-hit != 'true'
         run: npm ci
+        env:
+          GHCR_TOKEN: ${{ secrets.GHCR_ACCESS_TOKEN }}
 
       # Prettier formatting
       - name: "Code formatting verification with Prettier"
@@ -144,6 +146,19 @@ jobs:
         if: steps.pmd-sf-gps-ds-au-vic1.outputs.violations != 0
         run: exit 1
 
+      # Run PMD scan
+      - name: "Run PMD scan for sfGpsDsAuVic1"
+        uses: pmd/pmd-github-action@v1.4.1
+        id: pmd-sf-gps-ds-au-vic2
+        with:
+          sourcePath: "sfGpsDsAuVic2"
+          rulesets: "ruleset.xml"
+
+      # Check for PMD violations
+      - name: "Check for PMD violations"
+        if: steps.pmd-sf-gps-ds-au-vic2.outputs.violations != 0
+        run: exit 1
+
       # Run PMD scan
       - name: "Run PMD scan for sfGpsDsFrGov"
         uses: pmd/pmd-github-action@v1.4.1
@@ -213,9 +228,16 @@ jobs:
       - name: "Automatically generate Omnistudio source"
         run: npm run osfilegen
 
-      # Deploy source to scratch org
+      # Deploy source to scratch org (but not showcases)
       - name: "Push source to scratch org"
-        run: sfdx project deploy start --target-org=scratch-org
+        run: |
+          sfdx project deploy start --source-dir sfGpsDs --target-org=scratch-org
+          sfdx project deploy start --source-dir sfGpsDsAuNsw --target-org=scratch-org
+          sfdx project deploy start --source-dir sfGpsDsAuNswS --target-org=scratch-org
+          sfdx project deploy start --source-dir sfGpsDsAuVic --target-org=scratch-org
+          sfdx project deploy start --source-dir sfGpsDsAuVic2 --target-org=scratch-org
+          sfdx project deploy start --source-dir sfGpsDsUkGov --target-org=scratch-org
+          sfdx project deploy start --source-dir sfGpsDsFrGov --target-org=scratch-org
 
       # Assign permissionset
       # - name: 'Assign permissionset to default user'

.github/workflows/packaging-pr-prerelease.yml

@@ -46,6 +46,8 @@ jobs:
       - name: "Install npm dependencies"
         if: steps.cache-npm.outputs.cache-hit != 'true'
         run: npm ci
+        env:
+          GHCR_TOKEN: ${{ secrets.GHCR_ACCESS_TOKEN }}
 
       # Prep
       - name: "Prepare repo"

.github/workflows/packaging-pr.yml

@@ -46,6 +46,8 @@ jobs:
       - name: "Install npm dependencies"
         if: steps.cache-npm.outputs.cache-hit != 'true'
         run: npm ci
+        env:
+          GHCR_TOKEN: ${{ secrets.GHCR_ACCESS_TOKEN }}
 
       # Prep
       - name: "Prepare repo"

.github/workflows/packaging.yml

@@ -53,6 +53,8 @@ jobs:
       - name: "Install npm dependencies"
         if: steps.cache-npm.outputs.cache-hit != 'true'
         run: npm ci
+        env:
+          GHCR_TOKEN: ${{ secrets.GHCR_ACCESS_TOKEN }}
 
       # Prep
       - name: "Prepare repo"

.gitignore

@@ -11,6 +11,7 @@ deploy-options.json
 # LWC VSCode autocomplete
 **/lwc/jsconfig.json
 jsconfig.json
+.vscode/
 
 # LWC Jest coverage reports
 coverage/

.npmrc

@@ -0,0 +1,2 @@
+@dpc-sdp:registry=https://npm.pkg.github.com
+//npm.pkg.github.com/:_authToken=${GHCR_TOKEN}

README.md

@@ -14,7 +14,8 @@ Do read our [change log](./CHANGELOG.md) if you plan on updating already install
 - sfGpsDs is the folder for code that is reusable across individual design systems supported by this repo and sfdx project; it is now fully packaged with the design systems library below but the directory is kept for clarity, deployment as source code or as a dependency package for third party design systems
 - sfGpsDsAuNsw is the folder for code and assets pertaining to the Design System of New South Wales, Australia; check the [documentation web site](https://nswds.dsforce.dev)
 - sfGpsDsAuNswS is the folder for code and assets pertaining to the specific Design System of Service NSW, New South Wales, Australia; check the [documentation website](https://nsws.dsforce.dev)
-- sfGpsDsAuVic is the folder for code and assets to the Design System of Victoria, Australia aka Ripple v1 (pilot, no production without prior consultation); check the [documentation website](https://vic.dsforce.dev) and know that we are investigating the support of Ripple v2
+- sfGpsDsAuVic is the folder for code and assets to the Design System of Victoria, Australia aka Ripple v1 (pilot, no production without prior consultation); check the [documentation website](https://vic.dsforce.dev)
+- sfGpsDsAuVic2 is the folder for code and assets to the Design System of Victoria v2, Australia aka Ripple v2 (alpha); check the [documentation website](https://vic2.dsforce.dev)
 - sfGpsDsFrGov is the folder for code and assets to the Design System of France (alpha, only sandbox); check the [documentation page](docs/DSFR_README.md)
 - sfGpsDsUkGov is the folder for code and assets to the Design System of the United Kingdom (pilot, no production without prior consultation); check the [documentation website](https://uk.dsforce.dev)
 
@@ -34,6 +35,8 @@ Follow this set of instructions if you want to deploy the library in its most re
 
 1. Click <a href="https://test.salesforce.com/packaging/installPackage.apexp?p0=04t5j000000A2ZyAAK" title="sfGpsDsAuVic1Full">this link</a> to install the sfGpsDsAuVic unlocked package in your org (with sfGpsDs included).
 
+1. Click <a href="https://test.salesforce.com/packaging/installPackage.apexp?p0=040000000000000000" title="sfGpsDsAuVic2Full">this link</a> to install the sfGpsDsAuVic2 unlocked package in your org (with sfGpsDs included).
+
 1. Click <a href="https://test.salesforce.com/packaging/installPackage.apexp?p0=04t5j000000dzFJAAY" title="sfGpsDsFrGovFull">this link</a> to install the sfGpsDsFrGov unlocked package in your org (with sfGpsDs included).
 
 1. Click <a href="https://test.salesforce.com/packaging/installPackage.apexp?p0=04t5j000000A2a3AAC" title="sfGpsDsUkGovFull">this link</a> to install the sfGpsDsUkGov unlocked package in your org (with sfGpsDs included).

__test__/jest-mocks/lightning/primitiveIcon/primitiveIcon.html

@@ -0,0 +1 @@
+<template></template>

__test__/jest-mocks/lightning/primitiveIcon/primitiveIcon.js

@@ -0,0 +1,6 @@
+import { LightningElement, api } from "lwc";
+
+export default class extends LightningElement {
+  @api iconName;
+  @api size;
+}

cssgen.js

@@ -1,12 +1,14 @@
 let fs = require("fs").promises;
 let path = require("path");
+const postcss = require("postcss");
+const postcssCustomMedia = require("postcss-custom-media");
 let sass = require("sass");
 const fileRegEx = /!/;
 
 function genFile(filename) {
   return sass.compile(filename, {
     style: "compressed",
-    loadPaths: ["./", "node_modules/@gouvfr/dsfr"]
+    loadPaths: ["./", "node_modules/@gouvfr/dsfr", "node_modules"]
   });
 }
 
@@ -41,20 +43,28 @@ async function main() {
               : `${dot}/${directory}/${file}.scss`
           ).css;
 
+          /* go through configured content replacements */
+
           for (const replacement of config[directory]) {
             let regexFrom = new RegExp(replacement.from, "gm");
             content = content.replaceAll(regexFrom, replacement.to);
           }
 
-          fs.writeFile(
-            fileInDirectory
-              ? `${dot}/${file}${hasStar ? "" : ".gen"}.css`
-              : `${dot}/${directory}/${file}${hasStar ? "" : ".gen"}.css`,
-            content,
-            (err) => {
-              if (err) throw err;
-            }
-          );
+          /* use postcss to remove custom media generated by VIC2 */
+
+          postcss([postcssCustomMedia()])
+            .process(content)
+            .then((pContent) => {
+              fs.writeFile(
+                fileInDirectory
+                  ? `${dot}/${file}${hasStar ? "" : ".gen"}.css`
+                  : `${dot}/${directory}/${file}${hasStar ? "" : ".gen"}.css`,
+                pContent.css,
+                (err) => {
+                  if (err) throw err;
+                }
+              );
+            });
         }
       })
       .catch((err) => {

jest.config.js

@@ -3,6 +3,7 @@ const ro = require("resize-observer-polyfill");
 
 const setupFilesAfterEnv = jestConfig.setupFilesAfterEnv || [];
 setupFilesAfterEnv.push("<rootDir>/jest-sa11y-setup.js");
+setupFilesAfterEnv.push("<rootDir>/jest-crypto-setup.js");
 
 module.exports = {
   ...jestConfig,
@@ -22,6 +23,8 @@ module.exports = {
       "<rootDir>/__test__/jest-mocks/omnistudio/radioGroup",
     "^lightning/combobox$":
       "<rootDir>/__test__/jest-mocks/lightning/combobox/combobox",
+    "^lightning/primitiveIcon$":
+      "<rootDir>/__test__/jest-mocks/lightning/primitiveIcon/primitiveIcon",
     "^lightning/(.*)":
       "<rootDir>/node_modules/@salesforce/sfdx-lwc-jest/src/lightning-stubs/$1/$1"
   },