[pull] dev from KelvinTegelaar:dev

.github/workflows/Node_Project_Check.yml

@@ -20,7 +20,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v6.3.0
+        uses: actions/setup-node@v6.4.0
         with:
           node-version: ${{ matrix.node-version }}
       - name: Install and Build Test

.github/workflows/cipp_dev_build.yml

@@ -26,7 +26,7 @@ jobs:
           echo "node_version=$node_sanitized_version" >> $GITHUB_OUTPUT
 
       - name: Set up Node.js
-        uses: actions/setup-node@v6.3.0
+        uses: actions/setup-node@v6.4.0
         with:
           node-version: ${{ steps.get_node_version.outputs.node_version }}
 

.github/workflows/cipp_frontend_build.yml

@@ -26,7 +26,7 @@ jobs:
           echo "node_version=$node_sanitized_version" >> $GITHUB_OUTPUT
 
       - name: Set up Node.js
-        uses: actions/setup-node@v6.3.0
+        uses: actions/setup-node@v6.4.0
         with:
           node-version: ${{ steps.get_node_version.outputs.node_version }}
 
@@ -38,6 +38,13 @@ jobs:
       - name: Build Project
         run: npm run build
 
+      # Update version.json with commit hash
+      - name: Update version.json
+        run: |
+          VERSION=$(jq -r '.version' public/version.json)
+          SHORT_SHA="${GITHUB_SHA::7}"
+          echo "{\"version\": \"${VERSION}\", \"commit\": \"${SHORT_SHA}\"}" > out/version.json
+
       # Create ZIP File in a New Source Directory
       - name: Prepare and Zip Build Files
         run: |

.github/workflows/pr_check.yml

@@ -22,7 +22,7 @@ jobs:
         # Only process fork PRs with specific branch conditions
         # Must be a fork AND (source is main/master OR target is main/master)
         if: |
-          github.event.pull_request.head.repo.fork == true && 
+          github.event.pull_request.head.repo.fork == true &&
           ((github.event.pull_request.head.ref == 'main' || github.event.pull_request.head.ref == 'master') ||
           (github.event.pull_request.base.ref == 'main' || github.event.pull_request.base.ref == 'master'))
         uses: actions/github-script@v9
@@ -31,7 +31,31 @@ jobs:
           script: |
             let message = '';
 
+            // Check if the fork has open PRs (indicates pull bot or similar is active)
+            const forkOwner = context.payload.pull_request.head.repo.owner.login;
+            const forkRepo = context.payload.pull_request.head.repo.name;
+            const forkPullsUrl = context.payload.pull_request.head.repo.html_url + '/pulls';
+
+            let openPRs = [];
+            try {
+              const { data: prs } = await github.rest.pulls.list({
+                owner: forkOwner,
+                repo: forkRepo,
+                state: 'open',
+                per_page: 5
+              });
+              openPRs = prs;
+            } catch (e) {
+              // Can't read fork PRs — skip
+            }
+
             message += '🔄 If you are attempting to update your CIPP repo please follow the instructions at: https://docs.cipp.app/setup/self-hosting-guide/updating. Are you a sponsor? Contact the helpdesk for direct assistance with updating to the latest version.';
+
+            if (openPRs.length > 0) {
+              message += ` It looks like you may already have a pending update PR on your fork — check your [open pull requests](${forkPullsUrl}) to accept it.`;
+            } else {
+              message += ` You can enable [Pull Bot](https://github.com/apps/pull) or [Repo Sync](https://github.com/apps/repo-sync) to automatically keep your fork up to date.`;
+            }
             message += '\n\n';
 
             // Check if PR is targeting main/master
@@ -40,7 +64,7 @@ jobs:
             }
 
             // Check if PR is from a fork's main/master branch
-            if (context.payload.pull_request.head.repo.fork && 
+            if (context.payload.pull_request.head.repo.fork &&
                 (context.payload.pull_request.head.ref === 'main' || context.payload.pull_request.head.ref === 'master')) {
               message += '⚠️ This PR cannot be merged because it originates from your fork\'s main/master branch. If you are attempting to contribute code please PR from your dev branch or another non-main/master branch.\n\n';
             }

Tests/Shapes/ListTests.json

@@ -103,23 +103,19 @@
       "ExoAcceptedDomains": "number",
       "ExoAdminAuditLogConfig": "number",
       "ExoAntiPhishPolicies": "number",
-      "ExoAntiPhishPolicy": "number",
       "ExoAntiPhishRules": "number",
       "ExoAtpPolicyForO365": "number",
       "ExoDkimSigningConfig": "number",
       "ExoHostedContentFilterPolicy": "number",
       "ExoHostedOutboundSpamFilterPolicy": "number",
       "ExoMalwareFilterPolicies": "number",
-      "ExoMalwareFilterPolicy": "number",
       "ExoMalwareFilterRules": "number",
       "ExoOrganizationConfig": "number",
       "ExoQuarantinePolicy": "number",
       "ExoRemoteDomain": "number",
       "ExoSafeAttachmentPolicies": "number",
-      "ExoSafeAttachmentPolicy": "number",
       "ExoSafeAttachmentRules": "number",
       "ExoSafeLinksPolicies": "number",
-      "ExoSafeLinksPolicy": "number",
       "ExoSafeLinksRules": "number",
       "ExoSharingPolicy": "number",
       "ExoTenantAllowBlockList": "number",

Tools/Start-CippDevEmulators.ps1

@@ -22,7 +22,7 @@ $apiCommand = @'
 try {
 	# Use a stable local identity so timer node selection treats this as the catch-all host.
 	$env:WEBSITE_SITE_NAME = "cipp"
-	$env:CIPP_PROCESSOR = "true"
+	$env:CIPP_PROCESSOR = "false"
 	$env:AzureFunctionsWebHost__hostid = "cipp-single"
 
 	# Ensure prior offload simulation env overrides do not disable triggers in this shell.
@@ -42,5 +42,11 @@ try {
 $frontendCommand = 'try { npm run dev } catch { Write-Error $_.Exception.Message } finally { Read-Host "Press Enter to exit" }'
 $swaCommand = 'try { npm run start-swa } catch { Write-Error $_.Exception.Message } finally { Read-Host "Press Enter to exit" }'
 
+# Encode commands to avoid parsing issues with multi-line strings
+$azuriteEncoded = [Convert]::ToBase64String([Text.Encoding]::Unicode.GetBytes($azuriteCommand))
+$apiEncoded = [Convert]::ToBase64String([Text.Encoding]::Unicode.GetBytes($apiCommand))
+$frontendEncoded = [Convert]::ToBase64String([Text.Encoding]::Unicode.GetBytes($frontendCommand))
+$swaEncoded = [Convert]::ToBase64String([Text.Encoding]::Unicode.GetBytes($swaCommand))
+
 # Start Windows Terminal with all tabs
-wt --title CIPP`; new-tab --title 'Azurite' -d $Path pwsh -c $azuriteCommand`; new-tab --title 'FunctionApp' -d $ApiPath pwsh -c $apiCommand`; new-tab --title 'CIPP Frontend' -d $FrontendPath pwsh -c $frontendCommand`; new-tab --title 'SWA' -d $FrontendPath pwsh -c $swaCommand
+wt --title CIPP`; new-tab --title 'Azurite' -d $Path pwsh -EncodedCommand $azuriteEncoded`; new-tab --title 'FunctionApp' -d $ApiPath pwsh -EncodedCommand $apiEncoded`; new-tab --title 'CIPP Frontend' -d $FrontendPath pwsh -EncodedCommand $frontendEncoded`; new-tab --title 'SWA' -d $FrontendPath pwsh -EncodedCommand $swaEncoded

next.config.js

@@ -1,6 +1,28 @@
+const disableOptimizePackageImports = process.env.NEXT_DISABLE_OPTIMIZE_PACKAGE_IMPORTS === '1'
+
 /** @type {import('next').NextConfig} */
 const config = {
   reactStrictMode: false,
+  experimental: {
+    optimizePackageImports: disableOptimizePackageImports
+      ? []
+      : [
+          '@mui/material',
+          '@mui/icons-material',
+          '@mui/lab',
+          '@mui/system',
+          '@mui/x-date-pickers',
+          'material-react-table',
+          'mui-tiptap',
+          'recharts',
+          '@react-pdf/renderer',
+          'lodash',
+        ],
+    webpackMemoryOptimizations: true,
+    preloadEntriesOnStart: false,
+    turbopackFileSystemCacheForDev: false,
+    turbopackMemoryLimit: 4096,
+  },
   images: {
     unoptimized: true,
   },
@@ -12,12 +34,6 @@ const config = {
       },
     },
   },
-  experimental: {
-    webpackMemoryOptimizations: true,
-    preloadEntriesOnStart: false,
-    turbopackFileSystemCacheForDev: false,
-    turbopackMemoryLimit: 4096,
-  },
   async redirects() {
     return []
   },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "10.3.1",
+  "version": "10.4.5",
   "author": "CIPP Contributors",
   "homepage": "https://cipp.app/",
   "bugs": {
@@ -16,7 +16,7 @@
   },
   "scripts": {
     "dev": "next -H 127.0.0.1",
-    "build": "next build && rm -rf package.json yarn.lock",
+    "build": "next build --webpack && rm -rf package.json yarn.lock",
     "start": "next start",
     "export": "next export",
     "lint": "npx eslint .",
@@ -31,10 +31,10 @@
     "@emotion/styled": "11.14.1",
     "@heroicons/react": "2.2.0",
     "@monaco-editor/react": "^4.6.0",
-    "@mui/icons-material": "7.3.7",
+    "@mui/icons-material": "7.3.10",
     "@mui/lab": "7.0.0-beta.17",
-    "@mui/material": "7.3.7",
-    "@mui/system": "7.3.2",
+    "@mui/material": "7.3.10",
+    "@mui/system": "7.3.10",
     "@mui/x-date-pickers": "^9.0.2",
     "@musement/iso-duration": "^1.0.0",
     "@nivo/core": "^0.99.0",
@@ -43,37 +43,35 @@
     "@reduxjs/toolkit": "^2.11.2",
     "@tanstack/query-sync-storage-persister": "^5.90.25",
     "@tanstack/react-query": "^5.96.2",
-    "@tanstack/react-query-devtools": "^5.51.11",
-    "@tanstack/react-query-persist-client": "^5.76.0",
+    "@tanstack/react-query-devtools": "^5.96.2",
+    "@tanstack/react-query-persist-client": "^5.96.2",
     "@tanstack/react-table": "^8.19.2",
     "@tiptap/core": "^3.4.1",
     "@tiptap/extension-heading": "^3.4.1",
-    "@tiptap/extension-image": "^3.20.5",
     "@tiptap/extension-table": "^3.19.0",
     "@tiptap/pm": "^3.22.3",
     "@tiptap/react": "^3.20.5",
     "@tiptap/starter-kit": "^3.20.5",
-    "@uiw/react-json-view": "^2.0.0-alpha.41",
     "@vvo/tzdb": "^6.198.0",
     "apexcharts": "5.10.4",
     "axios": "1.15.0",
     "date-fns": "4.1.0",
     "diff": "^8.0.3",
+    "dompurify": "^3.4.2",
     "eml-parse-js": "^1.2.0-beta.0",
     "export-to-csv": "^1.3.0",
     "formik": "2.4.9",
     "gray-matter": "4.0.3",
-    "i18next": "25.8.18",
     "javascript-time-ago": "^2.6.2",
     "jspdf": "^4.2.0",
     "jspdf-autotable": "^5.0.7",
     "leaflet": "^1.9.4",
-    "leaflet-defaulticon-compatibility": "^0.1.2",
     "leaflet.markercluster": "^1.5.3",
+    "lodash": "^4.18.1",
     "lodash.isequal": "4.5.0",
     "material-react-table": "^3.0.1",
     "monaco-editor": "^0.55.1",
-    "mui-tiptap": "^1.29.1",
+    "mui-tiptap": "^1.30.0",
     "next": "^16.2.2",
     "nprogress": "0.2.0",
     "numeral": "2.0.6",
@@ -82,15 +80,12 @@
     "react": "19.2.5",
     "react-apexcharts": "2.1.0",
     "react-beautiful-dnd": "13.1.1",
-    "react-copy-to-clipboard": "^5.1.0",
     "react-dom": "19.2.5",
     "react-dropzone": "15.0.0",
     "react-error-boundary": "^6.1.1",
-    "react-grid-layout": "^2.2.3",
     "react-hook-form": "^7.72.0",
     "react-hot-toast": "2.6.0",
     "react-html-parser": "^2.0.2",
-    "react-i18next": "16.6.5",
     "react-leaflet": "5.0.0",
     "react-leaflet-markercluster": "^5.0.0-rc.0",
     "react-markdown": "10.1.0",
@@ -101,28 +96,23 @@
     "react-syntax-highlighter": "^16.1.0",
     "react-time-ago": "^7.3.3",
     "react-virtuoso": "^4.18.5",
-    "react-window": "^2.2.7",
-    "recharts": "^3.7.0",
+    "recharts": "^3.8.1",
     "redux": "5.0.1",
-    "redux-devtools-extension": "2.13.9",
     "redux-persist": "^6.0.0",
-    "redux-thunk": "3.1.0",
     "rehype-raw": "^7.0.0",
     "remark-gfm": "^4.0.0",
+    "remark-parse": "^11.0.0",
     "simplebar": "6.3.3",
     "simplebar-react": "3.3.2",
     "stylis-plugin-rtl": "2.1.1",
-    "typescript": "5.9.3",
+    "unified": "^11.0.5",
     "yup": "1.7.1"
   },
   "devDependencies": {
     "@svgr/webpack": "8.1.0",
-    "@types/react": "^19.2.14",
-    "@types/react-dom": "^19.2.3",
     "eslint": "^9.39.4",
     "eslint-config-next": "^16.2.3",
     "eslint-config-prettier": "^10.1.8",
-    "prettier": "^3.8.1",
-    "prettier-eslint": "^16.4.2"
+    "prettier": "^3.8.1"
   }
 }

public/languageList.json

@@ -160,6 +160,13 @@
     "languageTag": "Danish (da-DK)",
     "LCID": "1030"
   },
+  {
+    "language": "Dutch",
+    "Geographic area": "Belgium",
+    "tag": "nl-BE",
+    "languageTag": "Dutch (nl-BE)",
+    "LCID": "2067"
+  },
   {
     "language": "Dutch",
     "Geographic area": "Netherlands",

public/manifest.json

@@ -1,15 +1,26 @@
 {
-  "short_name": "Carpatin",
-  "name": "Carpatin",
+  "short_name": "CIPP",
+  "name": "CIPP - CyberDrian Improved Partner Portal",
   "icons": [
     {
       "src": "favicon.ico",
       "sizes": "64x64 32x32 24x24 16x16",
       "type": "image/x-icon"
+    },
+    {
+      "src": "android-chrome-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png"
+    },
+    {
+      "src": "android-chrome-512x512.png",
+      "sizes": "512x512",
+      "type": "image/png"
     }
   ],
-  "start_url": ".",
+  "start_url": "/",
+  "scope": "/",
   "display": "standalone",
-  "theme_color": "#000000",
+  "theme_color": "#ffffff",
   "background_color": "#ffffff"
-}
+}

public/sw.js

@@ -0,0 +1,8 @@
+// Minimal service worker to satisfy Chrome's installability criteria.
+// This does NOT cache anything or provide offline support — it simply
+// passes all requests through to the network so Chrome treats the site
+// as an installable web app.
+
+self.addEventListener('install', () => self.skipWaiting())
+self.addEventListener('activate', (event) => event.waitUntil(self.clients.claim()))
+self.addEventListener('fetch', () => {})

public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "10.3.1"
+  "version": "10.4.5"
 }