Merge branch 'main' into dependabot/npm_and_yarn/npm_and_yarn-6542b67532

Author: rocketstack-matt

.github/workflows/cve-scanning-maven.yml

@@ -44,7 +44,7 @@ jobs:
 
             - name: Upload Test results
               if: ${{ always() }}
-              uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+              uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
               with:
                   name: Depcheck report ${{ github.job }} ${{ matrix.module-folder }}
                   path: ${{ github.workspace }}/${{ matrix.module-folder }}/target/dependency-check-report.*

.github/workflows/cve-scanning-node.yml

@@ -62,7 +62,7 @@ jobs:
               shell: bash
             - name: Upload Test results
               if: ${{ always() }}
-              uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+              uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
               with:
                   name: Depcheck report ${{ env.UPNAME }}
                   path: ${{ github.workspace }}/${{ matrix.module-folder }}-reports

.github/workflows/license-scanning-maven.yml

@@ -46,7 +46,7 @@ jobs:
                   if [ $LINES_FOUND -gt 1 ]; then echo $LICENSE_REPORT ; exit -1; fi
               working-directory: ${{ matrix.module-folder }}
             - name: Upload license XML reports
-              uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+              uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
               with:
                   name: license-xml-report
                   path: '${{ matrix.module-folder }}/**/${{ env.REPORT_PATH }}'

.nvmrc

@@ -1 +1 @@
-22.14.0
+22.22.0

advent-of-calm/website/package-lock.json

@@ -0,0 +1,17 @@
+{
+  "extends": ["stylelint-config-standard"],
+  "rules": {
+    "declaration-no-important": true,
+    "selector-class-pattern": null,
+    "at-rule-no-unknown": [true, {
+      "ignoreAtRules": ["tailwind", "apply", "layer", "config", "plugin", "theme", "source"]
+    }],
+    "import-notation": null,
+    "no-empty-source": null,
+    "at-rule-empty-line-before": null,
+    "rule-empty-line-before": null,
+    "color-hex-length": null,
+    "font-family-name-quotes": null,
+    "alpha-value-notation": null
+  }
+}

calm-hub-ui/.stylelintrc.json

@@ -11,12 +11,14 @@
         "test": "vitest run",
         "test-coverage": "vitest run --coverage",
         "watch-test": "vitest watch",
-        "lint": "eslint .",
+        "lint": "eslint . && stylelint 'src/**/*.css'",
+        "lint:css": "stylelint 'src/**/*.css'",
         "format": "prettier --write .",
         "copy-public": "copyfiles -u 1 ../brand/**/* public/",
         "start-cypress": "npx cypress open"
     },
     "dependencies": {
+        "@dagrejs/dagre": "^1.1.4",
         "@monaco-editor/react": "^4.7.0",
         "@tailwindcss/vite": "^4.1.4",
         "@types/node": "^22.19.2",
@@ -28,9 +30,11 @@
         "axios-mock-adapter": "^2.1.0",
         "copyfiles": "^2.4.1",
         "css-what": "6.2.2",
-        "cytoscape": "^3.30.3",
-        "cytoscape-cola": "^2.5.1",
-        "cytoscape-dagre": "^2.5.0",
+        "d3-drag": "^3.0.0",
+        "d3-selection": "^3.0.0",
+        "d3-transition": "^3.0.1",
+        "d3-zoom": "^3.0.0",
+        "lucide-react": "^0.468.0",
         "oidc-client": "^1.11.5",
         "react": "^19.1.0",
         "react-dom": "^19.1.0",
@@ -39,6 +43,7 @@
         "react-json-view-lite": "^2.4.1",
         "react-markdown": "^10.1.0",
         "react-router-dom": "^7.12.0",
+        "reactflow": "^11.11.4",
         "typescript": "^5.9.2",
         "vite-plugin-svgr": "^4.3.0",
         "vite-tsconfig-paths": "^5.1.4",
@@ -51,7 +56,6 @@
         "@testing-library/jest-dom": "^6.6.3",
         "@testing-library/react": "^16.2.0",
         "@testing-library/user-event": "^14.6.1",
-        "@types/cytoscape": "^3.21.8",
         "@types/file-saver": "^2.0.7",
         "@types/react": "^19.1.2",
         "@types/react-dom": "^19.1.2",
@@ -63,12 +67,14 @@
         "eslint": "^9.25.0",
         "eslint-plugin-react": "^7.37.2",
         "eslint-plugin-react-hooks": "^5.2.0",
-        "eslint-plugin-react-refresh": "^0.4.19",
+        "eslint-plugin-react-refresh": "^0.5.0",
         "globals": "^16.0.0",
         "jsdom": "^26.0.0",
         "npm-force-resolutions": "^0.0.10",
         "postcss": "^8.4.49",
         "prettier": "^3.3.3",
+        "stylelint": "^16.26.0",
+        "stylelint-config-standard": "^39.0.1",
         "tailwindcss": "^4.1.4",
         "typescript": "^5.5.3",
         "typescript-eslint": "^8.14.0",
@@ -80,7 +86,11 @@
         "express": "5.2.1",
         "nth-check": "2.1.1",
         "postcss": "8.5.6",
-        "rollup": "4.54.0"
+        "rollup": "4.57.1"
+    },
+    "overrides": {
+        "d3-selection": "3.0.0",
+        "d3-transition": "3.0.1"
     },
     "proxy": "http://127.0.0.1:8080/",
     "eslintConfig": {

calm-hub-ui/package.json

@@ -1,5 +1,5 @@
 .markdownParagraphSpacing p {
-    margin-bottom: 1.5% !important;
+    margin-bottom: 1.5%;
 }
 
 .adr-title {

calm-hub-ui/src/hub/components/adr-renderer/AdrRenderer.css

@@ -1,7 +1,6 @@
 import { Option } from '../../../model/adr/option.js';
 import { Link } from '../../../model/adr/link.js';
 import Markdown from 'react-markdown';
-import './adr-helper-function.css';
 import { Decision } from '../../../model/adr/decision.js';
 import { AdrStatus } from '../../../model/adr/adr-status/adrStatus.js';