Merge pull request #1183 from CodeForAfrica/chore-pnpm_v10

kilemensi · web-flow · commit a5f7126bc010 · 2025-06-12T17:15:04.000+03:00
`pnpm` `v10`
diff --git a/Dockerfile b/Dockerfile
@@ -6,7 +6,7 @@
 
 ARG \
   # Must match packageManager in package.json
-  PNPM_VERSION=9.9.0 \
+  PNPM_VERSION=10.12.1 \
   # Next.js / Payload (build time)
   PORT=3000 \
   # Next.js (runtime)
diff --git a/apps/charterafrica/package.json b/apps/charterafrica/package.json
@@ -113,6 +113,8 @@
     "webpack": "catalog:"
   },
   "engines": {
-    "node": "20.x"
-  }
+    "node": "20.x",
+    "pnpm": "10"
+  },
+  "packageManager": "pnpm@10.12.1"
 }
diff --git a/apps/civicsignalblog/package.json b/apps/civicsignalblog/package.json
@@ -106,8 +106,10 @@
     "webpack": "catalog:"
   },
   "engines": {
-    "node": "20.x"
+    "node": "20.x",
+    "pnpm": "10"
   },
+  "packageManager": "pnpm@10.12.1",
   "imports": {
     "#civicsignalblog/*": {
       "dev": [
diff --git a/apps/climatemappedafrica/package.json b/apps/climatemappedafrica/package.json
@@ -132,6 +132,8 @@
     "typescript": "catalog:"
   },
   "engines": {
-    "node": "20.x"
-  }
+    "node": "20.x",
+    "pnpm": "10"
+  },
+  "packageManager": "pnpm@10.12.1"
 }
diff --git a/apps/codeforafrica/package.json b/apps/codeforafrica/package.json
@@ -98,6 +98,8 @@
     "webpack": "catalog:"
   },
   "engines": {
-    "node": "20.x"
-  }
+    "node": "20.x",
+    "pnpm": "10"
+  },
+  "packageManager": "pnpm@10.12.1"
 }
diff --git a/apps/pesayetu/package.json b/apps/pesayetu/package.json
@@ -119,6 +119,8 @@
     "typescript": "catalog:"
   },
   "engines": {
-    "node": "20.x"
-  }
+    "node": "20.x",
+    "pnpm": "10"
+  },
+  "packageManager": "pnpm@10.12.1"
 }
diff --git a/apps/promisetracker/package.json b/apps/promisetracker/package.json
@@ -88,6 +88,8 @@
     "clean": "rm -rf .next .turbo node_modules"
   },
   "engines": {
-    "node": "20.x"
-  }
+    "node": "20.x",
+    "pnpm": "10"
+  },
+  "packageManager": "pnpm@10.12.1"
 }
diff --git a/apps/roboshield/package.json b/apps/roboshield/package.json
@@ -81,5 +81,10 @@
     "tsx": "catalog:",
     "typescript": "catalog:",
     "typescript-eslint": "catalog:"
-  }
+  },
+  "engines": {
+    "node": "20.x",
+    "pnpm": "10"
+  },
+  "packageManager": "pnpm@10.12.1"
 }
diff --git a/apps/techlabblog/package.json b/apps/techlabblog/package.json
@@ -51,6 +51,8 @@
     "typescript": "catalog:"
   },
   "engines": {
-    "node": "20.x"
-  }
+    "node": "20.x",
+    "pnpm": "10"
+  },
+  "packageManager": "pnpm@10.12.1"
 }
diff --git a/apps/trustlab/package.json b/apps/trustlab/package.json
@@ -63,5 +63,10 @@
     "jest": "catalog:",
     "jest-config-commons-ui": "workspace:*",
     "playwright-config-commons-ui": "workspace:*"
-  }
+  },
+  "engines": {
+    "node": "20.x",
+    "pnpm": "10"
+  },
+  "packageManager": "pnpm@10.12.1"
 }
diff --git a/apps/trustlab/src/components/NavBar/NavBar.js b/apps/trustlab/src/components/NavBar/NavBar.js
@@ -7,7 +7,6 @@ import { Link, NextImageButton } from "@commons-ui/next";
 import React from "react";
 
 import CloseIcon from "@/trustlab/assets/icons/Type=x, Size=24, Color=CurrentColor.svg";
-// eslint-disable-next-line import/no-unresolved
 import menuIcon from "@/trustlab/assets/menu-icon.svg?url";
 import { neutral } from "@/trustlab/colors";
 import MobileNavBar from "@/trustlab/components/MobileNavBar";
diff --git a/apps/trustlab/src/components/PayloadLivePreview/index.js b/apps/trustlab/src/components/PayloadLivePreview/index.js
@@ -1,7 +1,7 @@
 "use client";
 
 import { RefreshRouteOnSave as PayloadLivePreview } from "@payloadcms/live-preview-react";
-import { useRouter } from "next/navigation.js";
+import { useRouter } from "next/navigation";
 import React from "react";
 
 function RefreshRouteOnSave() {
diff --git a/apps/trustlab/src/pages/_app.page.js b/apps/trustlab/src/pages/_app.page.js
@@ -1,7 +1,6 @@
 import { createEmotionCache } from "@/commons-ui/core/styles";
 import { CacheProvider } from "@emotion/react";
 import { CssBaseline, ThemeProvider } from "@mui/material";
-/* eslint-disable-next-line import/no-unresolved */
 import { GoogleAnalytics } from "@next/third-parties/google";
 import Head from "next/head";
 import { DefaultSeo } from "next-seo";
diff --git a/apps/trustlab/src/payload/collections/Media.js b/apps/trustlab/src/payload/collections/Media.js
@@ -1,7 +1,7 @@
 import path from "path";
-import { fileURLToPath } from "url";
 
 import { createdBy } from "@commons-ui/payload";
+import { fileURLToPath } from "url";
 
 import { canManageContent } from "@/trustlab/payload/access/abilities";
 import { anyone } from "@/trustlab/payload/access/anyone";
diff --git a/apps/trustlab/src/payload/globals/tabs/SeoTab.js b/apps/trustlab/src/payload/globals/tabs/SeoTab.js
@@ -1,4 +1,3 @@
-/* eslint-disable import/no-unresolved */
 import {
   MetaDescriptionField,
   MetaImageField,
diff --git a/apps/trustlab/src/payload/plugins/index.js b/apps/trustlab/src/payload/plugins/index.js
@@ -1,7 +1,6 @@
 import { nestedDocsPlugin } from "@payloadcms/plugin-nested-docs";
 import { sentryPlugin } from "@payloadcms/plugin-sentry";
 import { seoPlugin } from "@payloadcms/plugin-seo";
-/* eslint-disable-next-line import/no-unresolved */
 import { convertLexicalToPlaintext } from "@payloadcms/richtext-lexical/plaintext";
 import { s3Storage } from "@payloadcms/storage-s3";
 import * as Sentry from "@sentry/nextjs";
diff --git a/apps/twoopstracker/package.json b/apps/twoopstracker/package.json
@@ -95,7 +95,8 @@
     "defaults"
   ],
   "engines": {
-    "node": "20.x"
+    "node": "20.x",
+    "pnpm": "10"
   },
-  "packageManager": "pnpm@9.15.3"
+  "packageManager": "pnpm@10.12.1"
 }
diff --git a/apps/uibook/package.json b/apps/uibook/package.json
@@ -71,6 +71,8 @@
     "webpack": "catalog:"
   },
   "engines": {
-    "node": "20.x"
-  }
+    "node": "20.x",
+    "pnpm": "10"
+  },
+  "packageManager": "pnpm@10.12.1"
 }
diff --git a/apps/vpnmanager/package.json b/apps/vpnmanager/package.json
@@ -50,5 +50,10 @@
     "eslint-config-prettier": "catalog:",
     "typescript": "catalog:",
     "typescript-eslint": "catalog:"
-  }
+  },
+  "engines": {
+    "node": "20.x",
+    "pnpm": "10"
+  },
+  "packageManager": "pnpm@10.12.1"
 }
diff --git a/package.json b/package.json
@@ -35,14 +35,14 @@
     "lint-staged": "catalog:",
     "playwright-config-commons-ui": "workspace:*",
     "prettier": "catalog:",
-    "turbo": "catalog:",
-    "react": "catalog:"
+    "react": "catalog:",
+    "turbo": "catalog:"
   },
   "engines": {
     "node": "20.x",
-    "pnpm": "9"
+    "pnpm": "10"
   },
-  "packageManager": "pnpm@9.9.0",
+  "packageManager": "pnpm@10.12.1",
   "pnpm": {
     "overrides": {
       "sharp": "catalog:"
diff --git a/packages/commons-ui-core/package.json b/packages/commons-ui-core/package.json
@@ -62,5 +62,10 @@
   },
   "dependencies": {
     "prop-types": "catalog:"
-  }
+  },
+  "engines": {
+    "node": "20.x",
+    "pnpm": "10"
+  },
+  "packageManager": "pnpm@10.12.1"
 }
diff --git a/packages/commons-ui-next/package.json b/packages/commons-ui-next/package.json
@@ -66,5 +66,10 @@
   },
   "dependencies": {
     "clsx": "catalog:"
-  }
+  },
+  "engines": {
+    "node": "20.x",
+    "pnpm": "10"
+  },
+  "packageManager": "pnpm@10.12.1"
 }
diff --git a/packages/commons-ui-payload/jsconfig.json b/packages/commons-ui-payload/jsconfig.json
@@ -4,9 +4,9 @@
     "paths": {
       "@/commons-ui/payload/*": ["./src/*"],
       "@payloadcms/richtext-lexical/react": [
-        "node_modules/@payloadcms/richtext-lexical/dist/exports/react/index.js"
+        "../../node_modules/@payloadcms/richtext-lexical/dist/exports/react/index.js"
       ],
-      "payload/shared": ["node_modules/payload/dist/exports/shared.js"]
+      "payload/shared": ["../../node_modules/payload/dist/exports/shared.js"]
     }
   },
   "exclude": ["node_modules"]
diff --git a/packages/commons-ui-payload/package.json b/packages/commons-ui-payload/package.json
@@ -70,5 +70,9 @@
     "react-dom": "catalog:",
     "slate": "catalog:"
   },
-  "dependencies": {}
+  "engines": {
+    "node": "20.x",
+    "pnpm": "10"
+  },
+  "packageManager": "pnpm@10.12.1"
 }
diff --git a/packages/commons-ui-testing-library/package.json b/packages/commons-ui-testing-library/package.json
@@ -63,5 +63,10 @@
     "@testing-library/jest-dom": "catalog:",
     "@testing-library/react": "catalog:",
     "prop-types": "catalog:"
-  }
+  },
+  "engines": {
+    "node": "20.x",
+    "pnpm": "10"
+  },
+  "packageManager": "pnpm@10.12.1"
 }
diff --git a/packages/eslint-config-commons-ui/package.json b/packages/eslint-config-commons-ui/package.json
@@ -47,5 +47,10 @@
     "eslint": "catalog:",
     "prettier": "catalog:",
     "typescript": "catalog:"
-  }
+  },
+  "engines": {
+    "node": "20.x",
+    "pnpm": "10"
+  },
+  "packageManager": "pnpm@10.12.1"
 }
diff --git a/packages/hurumap-core/package.json b/packages/hurumap-core/package.json
@@ -78,5 +78,9 @@
     "vega": "catalog:",
     "xlsx": "catalog:"
   },
-  "dependencies": {}
+  "engines": {
+    "node": "20.x",
+    "pnpm": "10"
+  },
+  "packageManager": "pnpm@10.12.1"
 }
diff --git a/packages/hurumap-next/package.json b/packages/hurumap-next/package.json
@@ -73,5 +73,10 @@
     "react-leaflet": "catalog:",
     "video.js": "catalog:",
     "videojs-youtube": "catalog:"
-  }
+  },
+  "engines": {
+    "node": "20.x",
+    "pnpm": "10"
+  },
+  "packageManager": "pnpm@10.12.1"
 }
diff --git a/packages/jest-config-commons-ui/package.json b/packages/jest-config-commons-ui/package.json
@@ -32,5 +32,10 @@
   },
   "peerDependencies": {
     "jest": "catalog:"
-  }
+  },
+  "engines": {
+    "node": "20.x",
+    "pnpm": "10"
+  },
+  "packageManager": "pnpm@10.12.1"
 }
diff --git a/packages/playwright-config-commons-ui/package.json b/packages/playwright-config-commons-ui/package.json
@@ -24,5 +24,10 @@
   },
   "peerDependencies": {
     "@playwright/test": "catalog:"
-  }
+  },
+  "engines": {
+    "node": "20.x",
+    "pnpm": "10"
+  },
+  "packageManager": "pnpm@10.12.1"
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
