chore: fixes to publishing

e2e/davinci-app/.eslintignore

@@ -0,0 +1,11 @@
+node_modules
+*.md
+LICENSE
+.babelrc
+.env*
+.bin
+dist
+.eslintignore
+*.html
+*.svg
+*.css

e2e/davinci-app/package.json

@@ -3,5 +3,9 @@
   "description": "Ping DaVinci Client Test App",
   "private": true,
   "devDependencies": {},
+  "dependencies": {
+    "@forgerock/davinci-client": "workspace:*",
+    "@forgerock/javascript-sdk": "workspace:*"
+  },
   "version": "0.0.0"
 }

e2e/davinci-app/project.json

@@ -6,12 +6,14 @@
   "tags": ["scope:app"],
   "targets": {
     "build": {
-      "executor": "@nx/vite:build",
-      "outputs": ["{options.outputPath}"],
+      "outputs": [
+        "{projectRoot}/{options.outDir}",
+        "{workspaceRoot}/dist/e2e/davinci-app"
+      ],
       "defaultConfiguration": "production",
       "options": {
         "emptyOutDir": false,
-        "outputPath": "dist/e2e/davinci-app"
+        "outDir": "../../dist/e2e/davinci-app"
       },
       "configurations": {
         "development": {
@@ -23,48 +25,34 @@
       }
     },
     "serve": {
-      "executor": "@nx/vite:dev-server",
       "dependsOn": ["davinci-app:build"],
       "defaultConfiguration": "development",
       "options": {
-        "buildTarget": "davinci-app:build",
         "host": "localhost",
         "port": 5823
       },
       "configurations": {
-        "development": {
-          "buildTarget": "davinci-app:build:development",
-          "hmr": true
-        },
-        "production": {
-          "buildTarget": "davinci-app:build:production",
-          "hmr": false
-        }
+        "development": {},
+        "production": {}
       }
     },
     "preview": {
-      "executor": "@nx/vite:preview-server",
       "defaultConfiguration": "development",
-      "options": {
-        "buildTarget": "davinci-app:build"
-      },
       "configurations": {
-        "development": {
-          "buildTarget": "davinci-app:build:development"
-        },
-        "production": {
-          "buildTarget": "davinci-app:build:production"
-        }
+        "development": {},
+        "production": {}
       }
     },
     "lint": {
-      "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
+      "inputs": [
+        "noMarkdown",
+        "^noMarkdown",
+        {
+          "externalDependencies": ["eslint"]
+        }
+      ],
       "options": {
-        "lintFilePatterns": [
-          "e2e/davinci-app/**/*.ts",
-          "e2e/davinci-app/**/*.tsx"
-        ]
+        "args": ["**/*.ts"]
       }
     }
   }

e2e/davinci-app/vite.config.ts

@@ -1,8 +1,6 @@
 import * as path from 'path';
 import { defineConfig } from 'vite';
 
-import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
-
 export default defineConfig({
   root: __dirname,
   build: {
@@ -31,5 +29,4 @@ export default defineConfig({
     },
     strictPort: true,
   },
-  plugins: [nxViteTsPaths()],
 });

e2e/mock-api-v2/tsconfig.app.json

@@ -9,6 +9,6 @@
     "strictNullChecks": true,
     "noErrorTruncation": true
   },
-  "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"],
+  "exclude": ["src/**/*.spec.ts", "src/**/*.test.ts"],
   "include": ["src/**/*.ts"]
 }

e2e/mock-api/src/app/routes.auth.js

@@ -539,7 +539,7 @@ export default function (app) {
     const domain = req.url.includes('localhost') ? 'localhost' : 'example.com';
 
     res.clearCookie('redirected');
-    res.cookie('iPlanetDirectoryPro', 'abcd1234', { domain, sameSite: 'none' });
+    res.cookie('iPlanetDirectoryPro', 'abcd1234', { domain, sameSite: 'none', secure: true });
 
     const url = new URL(`${req.protocol}://${req.headers.host}${authPaths.authorize[1]}`);
     url.searchParams.set('client_id', req.query.client_id);

e2e/mock-api/tsconfig.app.json

@@ -9,6 +9,6 @@
     "allowJs": true,
     "types": ["node", "express"]
   },
-  "exclude": ["**/*.spec.ts", "**/*.test.ts", "jest.config.ts", "dist"],
+  "exclude": ["**/*.spec.ts", "**/*.test.ts", "dist"],
   "include": ["**/*.ts", "**/*.js"]
 }

e2e/mock-api/tsconfig.spec.json

@@ -5,11 +5,5 @@
     "module": "commonjs",
     "types": ["node"]
   },
-  "include": [
-    "**/*.test.ts",
-    "**/*.spec.ts",
-    "**/*.d.ts",
-    "jest.config.ts",
-    "./jest.env.config.ts"
-  ]
+  "include": ["**/*.test.ts", "**/*.spec.ts", "**/*.d.ts"]
 }

e2e/token-vault-interceptor/package.json

@@ -2,6 +2,7 @@
   "name": "@forgerock/token-vault-interceptor",
   "version": "0.0.1",
   "dependencies": {
+    "@forgerock/javascript-sdk": "workspace:*",
     "@forgerock/token-vault": "workspace:*"
   },
   "type": "module",

nx.json

@@ -33,11 +33,6 @@
       "inputs": ["noMarkdown", "^noMarkdown"],
       "cache": true
     },
-    "build-interceptor": {
-      "dependsOn": ["^build"],
-      "cache": true,
-      "inputs": ["noMarkdown", "^noMarkdown"]
-    },
     "@nx/vite:test": {
       "inputs": ["noMarkdown", "^noMarkdown"],
       "cache": true
@@ -59,6 +54,11 @@
     "e2e-ci--**/*": {
       "inputs": ["noMarkdown", "^noMarkdown"],
       "cache": true
+    },
+    "@nx/js:tsc": {
+      "cache": true,
+      "dependsOn": ["^build"],
+      "inputs": ["production", "^production"]
     }
   },
   "parallel": 1,

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@forgerock/javascript-sdk",
+  "name": "forgerock-javascript-sdk",
   "description": "ForgeRock JavaScript SDK",
   "engines": { "node": "^20 || ^18", "npm": ">= 7.0.0" },
   "private": true,
@@ -103,6 +103,7 @@
     "vite": "^5.4.8",
     "vite-plugin-dts": "^4.2.2",
     "vite-plugin-eslint": "^1.8.1",
+    "vite-plugin-externalize-deps": "^0.8.0",
     "vite-tsconfig-paths": "^4.3.2",
     "vitest": "^1.4.0",
     "vitest-canvas-mock": "^0.3.3"

packages/davinci-client/.eslintignore

@@ -0,0 +1,8 @@
+node_modules
+*.md
+LICENSE
+.babelrc
+.env*
+.bin
+dist
+.eslintignore

packages/davinci-client/package.json

@@ -1,19 +1,23 @@
 {
   "name": "@forgerock/davinci-client",
-  "version": "0.0.1",
-  "main": "./index.js",
-  "module": "./index.mjs",
-  "typings": "./index.d.ts",
-  "private": true,
+  "version": "0.0.1-davinci.1",
+  "main": "./dist/index.js",
+  "module": "./dist/index.js",
+  "typings": "./dist/index.d.ts",
+  "type": "module",
+  "files": ["dist"],
+  "peerDependencies": {
+    "@forgerock/javascript-sdk": "workspace:*"
+  },
   "dependencies": {
-    "@forgerock/javascript-sdk": "*",
-    "@reduxjs/toolkit": "^2.2.5"
+    "@reduxjs/toolkit": "^2.2.5",
+    "vitest": "^1.4.0"
   },
   "exports": {
     ".": {
-      "import": "./src/index.js",
-      "require": "./src/index.js"
+      "import": "./dist/index.js",
+      "require": "./dist/index.js"
     },
-    "./types": "./src/types.js"
+    "./types": "./dist/types.d.ts"
   }
 }

packages/davinci-client/project.json

@@ -6,33 +6,42 @@
   "tags": ["scope:package"],
   "targets": {
     "build": {
-      "executor": "@nx/vite:build",
-      "outputs": ["{options.outputPath}"],
-      "defaultConfiguration": "production",
-      "options": {
-        "outputPath": "dist/packages/davinci-client"
-      },
-      "configurations": {
-        "development": {
-          "mode": "development"
-        },
-        "production": {
-          "mode": "production"
+      "inputs": [
+        "default",
+        "^default",
+        {
+          "externalDependencies": ["vite"]
         }
-      }
+      ],
+      "outputs": ["{projectRoot}/dist"]
     },
     "test": {
-      "executor": "@nx/vite:test",
-      "outputs": ["{options.reportsDirectory}"],
+      "inputs": [
+        "noMarkdown",
+        "^noMarkdown",
+        {
+          "externalDependencies": ["vitest"]
+        }
+      ],
+      "outputs": [
+        "{projectRoot}/{options.coverage.reportsDirectory}",
+        "{workspaceRoot}/coverage/packages/davinci-client"
+      ],
       "options": {
-        "reportsDirectory": "../../coverage/packages/davinci-client"
+        "coverage.reportsDirectory": "../../coverage/packages/davinci-client"
       }
     },
     "lint": {
-      "executor": "@nx/eslint:lint",
+      "inputs": [
+        "noMarkdown",
+        "^noMarkdown",
+        {
+          "externalDependencies": ["eslint"]
+        }
+      ],
       "options": {
-        "lintFilePatterns": ["packages/davinci-client/**/*.ts"],
-        "fix": true
+        "fix": true,
+        "args": ["**/*.ts"]
       }
     }
   }

packages/davinci-client/src/index.ts

@@ -1,3 +1,3 @@
-import { davinci } from './lib/client.store';
+import { davinci } from './lib/client.store.js';
 
 export default davinci;

packages/davinci-client/src/lib/client.store.ts

@@ -13,9 +13,9 @@ import { configSlice } from './config.slice.js';
 /**
  * Import the DaVinciRequest types
  */
-import type { DaVinciConfig } from './config.types';
-import type { DaVinciAction, DaVinciRequest } from './davinci.types';
-import type { SingleValueCollector } from './collector.types';
+import type { DaVinciConfig } from './config.types.js';
+import type { DaVinciAction, DaVinciRequest } from './davinci.types.js';
+import type { SingleValueCollector } from './collector.types.js';
 
 /**
  * Create a client function that returns a set of methods

packages/davinci-client/src/lib/collector.utils.test.ts

@@ -3,8 +3,8 @@ import { describe, it, expect } from 'vitest';
 import { returnActionCollector } from './collector.utils.js';
 import { returnSingleValueCollector } from './collector.utils.js';
 
-import type { ActionCollectorTypes, SingleValueCollectorTypes } from './collector.types';
-import type { DaVinciField } from './davinci.types';
+import type { ActionCollectorTypes, SingleValueCollectorTypes } from './collector.types.js';
+import type { DaVinciField } from './davinci.types.d.ts';
 
 describe('returnActionCollector', () => {
   const mockField: DaVinciField = {

packages/davinci-client/src/lib/collector.utils.ts

@@ -6,14 +6,14 @@ import type {
   PasswordCollector,
   SocialLoginCollector,
   TextCollector,
-} from './collector.types';
-import type { DaVinciField } from './davinci.types';
+} from './collector.types.js';
+import type { DaVinciField } from './davinci.types.js';
 import type {
   ActionCollector,
   ActionCollectorTypes,
   SingleValueCollector,
   SingleValueCollectorTypes,
-} from './collector.types';
+} from './collector.types.js';
 
 /**
  * @function returnActionCollector - Creates an ActionCollector object based on the provided field and index.
@@ -36,7 +36,7 @@ export function returnActionCollector(
       key: field.key,
       label: field.label,
       type: field.type,
-      url: field.links?.authenticate?.href,
+      url: field.links?.['authenticate']?.href,
     },
   };
 }

packages/davinci-client/src/lib/config.slice.ts

@@ -2,12 +2,12 @@
  * Import the createSlice and PayloadAction utilities from Redux Toolkit
  * @see https://redux-toolkit.js.org/api/createslice
  */
-import { createSlice, PayloadAction } from '@reduxjs/toolkit';
+import { createSlice, type PayloadAction } from '@reduxjs/toolkit';
 
 /**
  * Import the types
  */
-import type { DaVinciConfig } from './config.types';
+import type { DaVinciConfig } from './config.types.js';
 
 /**
  * @const configSlice - Define the configuration slice for Redux state management

packages/davinci-client/src/lib/davinci.api.ts

@@ -22,7 +22,7 @@ import type {
   DavinciErrorResponse,
   DavinciNextResponse,
   DavinciSuccessResponse,
-} from './davinci.types';
+} from './davinci.types.d.ts';
 
 /**
  * @const davinciApi - Define the DaVinci API for Redux state management