chore: add syncpack v15 and align all deps to pnpm catalogs

- Install syncpack@15 for monorepo dependency alignment enforcement
- Add .syncpackrc with JSON schema reference
- Add syncpack:lint and syncpack:fix scripts (with explicit --source to
  exclude dist/ build artifacts, which syncpack reads via pnpm-workspace)
- Extend pnpm default catalog with: @forgerock/javascript-sdk, @types/express,
  tslib, tsx
- Migrate all consumers to catalog: references — fixes DiffersToCatalog
  and DiffersToHighestOrLowestSemver across 11 package.json files

Author: ryanbas21

.github/workflows/ci.yml

@@ -32,6 +32,9 @@ jobs:
         with:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
+      - name: Lint dependency versions
+        run: pnpm syncpack:lint
+
       - run: pnpm nx fix-ci
         if: always()
 

.syncpackrc

@@ -0,0 +1,12 @@
+{
+  "$schema": "./node_modules/syncpack/schema.json",
+  "source": [
+    "package.json",
+    "packages/*/package.json",
+    "packages/sdk-effects/*/package.json",
+    "packages/utils/*/package.json",
+    "e2e/*/package.json",
+    "tools/*/package.json",
+    "scratchpad/package.json"
+  ]
+}

e2e/am-mock-api/package.json

@@ -16,6 +16,6 @@
     "uuid": "^14.0.0"
   },
   "devDependencies": {
-    "@types/express": "^5.0.0"
+    "@types/express": "catalog:"
   }
 }

e2e/davinci-app/main.ts

@@ -6,8 +6,9 @@
  */
 import './style.css';
 
-import { Config, FRUser, TokenManager } from '@forgerock/javascript-sdk';
 import { davinci } from '@forgerock/davinci-client';
+import { oidc } from '@forgerock/oidc-client';
+import type { OidcConfig } from '@forgerock/oidc-client/types';
 import type {
   CustomLogger,
   DaVinciConfig,
@@ -86,6 +87,11 @@ const urlParams = new URLSearchParams(window.location.search);
 
 (async () => {
   const davinciClient: DavinciClient = await davinci({ config, logger, requestMiddleware });
+  const oidcResult = await oidc({ config: config as OidcConfig });
+  if ('error' in oidcResult) {
+    throw new Error(`Failed to initialize oidc client: ${oidcResult.error}`);
+  }
+  const oidcClient = oidcResult;
   const protectApi = protect({ envId: '02fb4743-189a-4bc7-9d6c-a919edfe6447' });
   const continueToken = urlParams.get('continueToken');
   const formEl = document.getElementById('form') as HTMLFormElement;
@@ -99,10 +105,6 @@ const urlParams = new URLSearchParams(window.location.search);
 
   if (continueToken) {
     resumed = await davinciClient.resume({ continueToken });
-  } else {
-    // the current davinci-config has a slightly
-    // different middleware type than the old legacy config
-    await Config.setAsync(config as any);
   }
 
   function renderComplete() {
@@ -141,25 +143,26 @@ const urlParams = new URLSearchParams(window.location.search);
 
     const tokenBtn = document.getElementById('tokensButton') as HTMLButtonElement;
     tokenBtn.addEventListener('click', async () => {
-      tokens = await TokenManager.getTokens({ query: { code, state } });
+      tokens = await oidcClient.token.exchange(code, state);
 
       console.log(tokens);
 
+      const accessTokenValue = tokens && 'accessToken' in tokens ? tokens.accessToken : '';
       const tokenPreEl = document.getElementById('accessTokenContainer') as HTMLPreElement;
       tokenPreEl.innerHTML = `
         <pre
           data-testid="access-token"
           id="accessTokenValue"
           style="display: block; max-width: 400px; text-wrap: wrap; overflow-wrap: anywhere;"
-        >${tokens?.accessToken}</pre>
+        >${accessTokenValue}</pre>
       `;
     });
 
     const loginBtn = document.getElementById('logoutButton') as HTMLButtonElement;
     loginBtn.addEventListener('click', async () => {
-      await FRUser.logout({ logoutRedirectUri: `${window.location.origin}/` });
+      await oidcClient.user.logout();
 
-      //window.location.reload();
+      window.location.reload();
     });
   }
 

e2e/davinci-app/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@forgerock/davinci-client": "workspace:*",
-    "@forgerock/javascript-sdk": "4.7.0",
+    "@forgerock/oidc-client": "workspace:*",
     "@forgerock/protect": "workspace:*",
     "@forgerock/sdk-logger": "workspace:*"
   },

e2e/davinci-app/tsconfig.app.json

@@ -18,6 +18,9 @@
     {
       "path": "../../packages/protect/tsconfig.lib.json"
     },
+    {
+      "path": "../../packages/oidc-client/tsconfig.lib.json"
+    },
     {
       "path": "../../packages/davinci-client/tsconfig.lib.json"
     }

e2e/davinci-suites/src/basic.test.ts

@@ -40,14 +40,8 @@ test('Test happy paths on test page', async ({ page }) => {
       return true;
     }
   });
-  const signoff = page.waitForResponse((response) => {
-    if (response.url().includes('/signoff') && response.status() === 302) {
-      return true;
-    }
-  });
   await logoutButton.click();
   await revokeCall;
-  await signoff;
   await expect(page.getByText('Username/Password Form')).toBeVisible();
 });
 test('ensure query params passed to start are sent off in authorize call', async ({ page }) => {

e2e/device-client-app/package.json

@@ -10,11 +10,11 @@
   },
   "dependencies": {
     "@forgerock/device-client": "workspace:*",
-    "@forgerock/javascript-sdk": "4.7.0",
-    "effect": "^3.12.7"
+    "@forgerock/javascript-sdk": "catalog:",
+    "effect": "catalog:effect"
   },
   "devDependencies": {
-    "@effect/language-service": "^0.20.0"
+    "@effect/language-service": "catalog:effect"
   },
   "nx": {
     "tags": ["scope:e2e"]

e2e/protect-app/package.json

@@ -11,7 +11,7 @@
     "serve": "pnpm nx nxServe"
   },
   "dependencies": {
-    "@forgerock/javascript-sdk": "4.7.0",
+    "@forgerock/javascript-sdk": "catalog:",
     "@forgerock/protect": "workspace:*"
   },
   "nx": {

lefthook.yml

@@ -5,6 +5,20 @@ pre-commit:
     nx-check:
       run: pnpm nx affected -t typecheck lint build api-report --tui=false
       stage_fixed: true
+    format:
+      run: pnpm nx format:write
+      stage_fixed: true
+    syncpack:
+      glob: >-
+        {package.json,
+        pnpm-workspace.yaml,
+        packages/*/package.json,
+        packages/sdk-effects/*/package.json,
+        packages/utils/*/package.json,
+        e2e/*/package.json,
+        tools/*/package.json,
+        scratchpad/package.json}
+      run: pnpm syncpack:lint
     interface-mapping:
       glob: >-
         {tools/interface-mapping-validator/**/*.ts,
@@ -21,9 +35,6 @@ pre-commit:
          echo "Interface mapping is out of sync." &&
          echo "Run: pnpm mapping:generate" &&
          exit 1)
-    format:
-      run: pnpm nx format:write
-      stage_fixed: true
 commit-msg:
   commands:
     commitlint: