Updated to pnpm 10

.github/workflows/e2e.yml

@@ -42,12 +42,12 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v3
         with:
-          version: 9
+          version: 10.6.5
 
-      - name: Use Node.js 20
+      - name: Use Node.js 22
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
           cache: 'pnpm'
 
       - name: Install dependencies
@@ -80,12 +80,12 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v3
         with:
-          version: 9
+          version: 10.6.5
 
-      - name: Use Node.js 20
+      - name: Use Node.js 22
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
           cache: 'pnpm'
 
       - name: Install dependencies
@@ -126,12 +126,12 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v3
         with:
-          version: 9
+          version: 10.6.5
 
-      - name: Use Node.js 20
+      - name: Use Node.js 22
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
           cache: 'pnpm'
 
       - name: Install dependencies

.github/workflows/extract-api.yml

@@ -22,12 +22,12 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v3
         with:
-          version: 9
+          version: 10.6.5
 
-      - name: Use Node.js 20
+      - name: Use Node.js 22
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
           cache: 'pnpm'
 
       - name: Install dependencies

.npmrc

@@ -3,9 +3,9 @@ registry=https://registry.npmjs.org/
 
 resolution-mode=lowest-direct
 
-link-workspace-packages=false
 shared-workspace-lockfile=false
-
 side-effects-cache=false
 
+inject-workspace-packages=true
+
 package-manager-strict=false

apps/learning-snippets/package.json

@@ -76,14 +76,6 @@
     "sinon-chai": "^3.7.0",
     "typescript": "~5.6.0"
   },
-  "dependenciesMeta": {
-    "@itwin/tree-widget-react": {
-      "injected": true
-    },
-    "@itwin/property-grid-react": {
-      "injected": true
-    }
-  },
   "eslintConfig": {
     "extends": [
       ".eslintrc.js"

apps/test-viewer/package.json

@@ -76,35 +76,6 @@
     "vite": "^5.4.12",
     "vite-plugin-static-copy": "^2.0.0"
   },
-  "dependenciesMeta": {
-    "@itwin/property-grid-react": {
-      "injected": true
-    },
-    "@itwin/tree-widget-react": {
-      "injected": true
-    },
-    "@itwin/measure-tools-react": {
-      "injected": true
-    },
-    "@itwin/map-layers": {
-      "injected": true
-    },
-    "@itwin/geo-tools-react": {
-      "injected": true
-    },
-    "@itwin/grouping-mapping-widget": {
-      "injected": true
-    },
-    "@itwin/reports-config-widget-react": {
-      "injected": true
-    },
-    "@itwin/ec3-widget-react": {
-      "injected": true
-    },
-    "@itwin/one-click-lca-react": {
-      "injected": true
-    }
-  },
   "scripts": {
     "start": "dotenvx run -- vite",
     "start:dev": "run-p start link:deps:watch",

apps/test-viewer/vite.config.mts

@@ -3,8 +3,7 @@
  * See LICENSE.md in the project root for license terms and full copyright notice.
  *--------------------------------------------------------------------------------------------*/
 
-import { readFileSync } from "fs";
-import { defineConfig, loadEnv, Plugin } from "vite";
+import { defineConfig, loadEnv } from "vite";
 import { viteStaticCopy } from "vite-plugin-static-copy";
 import react from "@vitejs/plugin-react";
 
@@ -27,8 +26,6 @@ export default defineConfig(({ mode }) => {
     }
   }
 
-  const reloadConfig = getReloadConfig(env.IMJS_ENABLE_HOT_RELOAD);
-
   return {
     plugins: [
       react(),
@@ -41,7 +38,6 @@ export default defineConfig(({ mode }) => {
           },
         ],
       }),
-      ...(reloadConfig ? [reloadInjectedPackages(reloadConfig)] : []),
     ],
     server: {
       port: 3000,
@@ -65,54 +61,3 @@ export default defineConfig(({ mode }) => {
     },
   };
 });
-
-function getReloadConfig(config?: string) {
-  if (!!config) {
-    return config === "polling" ? { usePolling: true } : {};
-  }
-  return undefined;
-}
-
-function reloadInjectedPackages(config: { usePolling?: boolean }): Plugin {
-  const { rootDependencies, injectedPackages } = getRootConfig();
-  const include = [...injectedPackages, "@itwin/itwinui-react"].flatMap((mod) => getModuleIncludes(mod));
-  return {
-    name: "watch-node-modules",
-    configureServer: (server) => {
-      server.watcher.options = {
-        ...server.watcher.options,
-        ...config,
-        ignored: ["**/build/**", "**/node_modules/.vite/**", ...injectedPackages.map((mod) => `!**/node_modules/${mod}/lib/esm/**`)],
-      };
-      (server.watcher as any)._userIgnored = undefined;
-    },
-    config: () => {
-      return {
-        optimizeDeps: {
-          force: true,
-          exclude: [...injectedPackages, "@itwin/itwinui-react"],
-          include: [...rootDependencies, ...include, ...forceInclude],
-        },
-      };
-    },
-  };
-}
-
-function getRootConfig() {
-  const packageJson = JSON.parse(readFileSync("./package.json", { encoding: "utf-8" }));
-  const injectedPackages = Object.keys(packageJson.dependenciesMeta);
-  const excluded = [...excludedDeps, ...injectedPackages, "@itwin/itwinui-react"];
-  return {
-    injectedPackages,
-    rootDependencies: Object.keys(packageJson.dependencies).filter((dep) => !excluded.includes(dep)),
-  };
-}
-
-function getModuleIncludes(module: string) {
-  const packageJson = JSON.parse(readFileSync(`./node_modules/${module}/package.json`, { encoding: "utf-8" }));
-  const deps = Object.keys(packageJson.dependencies);
-  return deps.filter((dep) => !excludedDeps.includes(dep)).map((dep) => `${module} > ${dep}`);
-}
-
-const excludedDeps = ["@bentley/icons-generic-webfont", "@bentley/icons-generic", "@itwin/imodels-access-common"];
-const forceInclude = ["react-dom/server"];

lage.config.js

@@ -59,5 +59,6 @@ module.exports = {
       cache: false,
     },
   },
+  npmClient: "pnpm",
   cache: true,
 };

package.json

@@ -4,7 +4,7 @@
   "repository": {
     "url": "https://github.com/iTwin/viewer-components-react.git"
   },
-  "packageManager": "pnpm@9.15.0",
+  "packageManager": "pnpm@10.6.5",
   "scripts": {
     "build": "lage build --grouped",
     "cover": "lage cover --grouped --continue",
@@ -28,7 +28,7 @@
   "devDependencies": {
     "beachball": "^2.43.1",
     "cpx2": "^7.0.1",
-    "lage": "^2.7.16",
+    "lage": "^2.13.0",
     "prettier": "^3.2.5",
     "yargs": "^17.7.2"
   }