Merge pull request #465 from ForgeRock/fix-deps

chore: fix-deps
ForgeRock · Oct 1, 2024 · d8795d9 · d8795d9
2 parents 4f5600f + f7bd1eb
commit d8795d9
Show file tree

Hide file tree

Showing 13 changed files with 163 additions and 182 deletions.
diff --git a/e2e/autoscript-suites/package.json b/e2e/autoscript-suites/package.json
@@ -14,7 +14,9 @@
     "url": "https://github.com/ForgeRock/forgerock-javascript-sdk/issues"
   },
   "homepage": "https://github.com/ForgeRock/forgerock-javascript-sdk#readme",
-  "nx": {
-    "includedScripts": []
+  "dependencies": {
+    "@forgerock/javascript-sdk": "workspace:*",
+    "@forgerock/ping-protect": "workspace:*",
+    "@forgerock/token-vault": "workspace:*"
   }
 }
diff --git a/e2e/autoscript-suites/playwright.config.ts b/e2e/autoscript-suites/playwright.config.ts
@@ -36,7 +36,8 @@ const config: PlaywrightTestConfig = {
       cwd: workspaceRoot,
     },
     {
-      command: 'pnpm nx serve autoscript-apps',
+      command:
+        'pnpm nx build javascript-sdk && pnpm nx build ping-protect && pnpm nx serve autoscript-apps',
       url: 'http://localhost:8443',
       ignoreHTTPSErrors: true,
       reuseExistingServer: !process.env.CI,

diff --git a/e2e/autoscript-suites/project.json b/e2e/autoscript-suites/project.json
@@ -1,7 +1,6 @@
 {
   "name": "autoscript-suites",
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
-  "includedScripts": [],
   "sourceRoot": "e2e/autoscript-suites/src",
   "projectType": "application",
   "tags": [],

diff --git a/e2e/token-vault-proxy/package.json b/e2e/token-vault-proxy/package.json
@@ -3,9 +3,10 @@
   "version": "0.0.0",
   "description": "ForgeRock Token Vault Test Proxy",
   "private": true,
-  "devDependencies": {},
+  "type": "module",
   "dependencies": {
     "@forgerock/javascript-sdk": "workspace:*",
     "@forgerock/token-vault": "workspace:*"
-  }
+  },
+  "devDependencies": {}
 }
diff --git a/e2e/token-vault-proxy/project.json b/e2e/token-vault-proxy/project.json
@@ -6,7 +6,7 @@
   "tags": ["scope:app"],
   "targets": {
     "build": {
-      "dependsOn": ["javascript-sdk:build", "token-vault:build"],
+      "dependsOn": ["javascript-sdk:build", "token-vault:build", "^build"],
       "inputs": ["default", "^default"],
       "outputs": ["{projectRoot}/dist"],
       "defaultConfiguration": "production",
@@ -20,6 +20,7 @@
       }
     },
     "serve": {
+      "dependsOn": ["build"],
       "defaultConfiguration": "development",
       "options": {
         "host": "localhost",

diff --git a/e2e/token-vault-suites/playwright.config.ts b/e2e/token-vault-suites/playwright.config.ts
@@ -27,14 +27,16 @@ const config: PlaywrightTestConfig = {
       cwd: workspaceRoot,
     },
     {
-      command: 'pnpm nx serve token-vault-proxy',
+      command:
+        'pnpm nx build javascript-sdk && pnpm nx build token-vault  && pnpm nx serve token-vault-proxy',
       port: 5833,
       ignoreHTTPSErrors: true,
       reuseExistingServer: !process.env.CI,
       cwd: workspaceRoot,
     },
     {
-      command: 'pnpm nx serve token-vault-app',
+      command:
+        'pnpm nx build javascript-sdk && pnpm nx build token-vault && pnpm nx serve token-vault-app',
       port: 5823,
       ignoreHTTPSErrors: true,
       reuseExistingServer: !process.env.CI,

diff --git a/nx.json b/nx.json
@@ -1,4 +1,14 @@
 {
+  "namedInputs": {
+    "default": ["{projectRoot}/**/*", "sharedGlobals"],
+    "sharedGlobals": ["{workspaceRoot}/.github/workflows/ci=github.yml"],
+    "production": [
+      "default",
+      "!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
+      "!{projectRoot}/tsconfig.spec.json"
+    ],
+    "noMarkdown": ["!{projectRoot}/**/*.md"]
+  },
   "targetDefaults": {
     "nx-release-publish": {
       "options": {
@@ -9,43 +19,39 @@
       "cache": true
     },
     "e2e": {
+      "inputs": ["noMarkdown", "^noMarkdown"],
       "cache": true
     },
     "build": {
-      "cache": true,
-      "inputs": ["!{projectRoot}/**/*.md"]
+      "inputs": ["noMarkdown", "^noMarkdown"],
+      "cache": true
     },
     "build-interceptor": {
       "cache": true,
-      "inputs": ["!{projectRoot}/**/*.md"]
+      "inputs": ["noMarkdown", "^noMarkdown"]
     },
     "@nx/vite:test": {
-      "inputs": ["default", "^default", "!{projectRoot}/**/*.md"],
+      "inputs": ["noMarkdown", "^noMarkdown"],
       "cache": true
     },
     "@nx/eslint:lint": {
-      "inputs": [
-        "{workspaceRoot}/.eslintrc.json",
-        "default",
-        "^default",
-        "!{projectRoot}/**/*.md"
-      ],
+      "inputs": ["noMarkdown", "^noMarkdown"],
       "cache": true
     },
     "@nx/vite:build": {
       "cache": true,
-      "inputs": ["default", "^default", "!{projectRoot}/**/*.md"]
+      "inputs": ["noMarkdown", "^noMarkdown"]
     },
     "@nx/esbuild:esbuild": {
       "cache": true,
-      "inputs": ["production", "^production", "!{projectRoot}/**/*.md"]
+      "inputs": ["noMarkdown", "^noMarkdown"]
     },
     "e2e-ci--**/*": {
+      "inputs": ["noMarkdown", "^noMarkdown"],
       "dependsOn": [
         "javascript-sdk:build",
-        "token-vault:build",
         "ping-protect:build",
-        "token-vault:build-interceptor"
+        "token-vault:build"
       ],
       "cache": true
     }
@@ -116,15 +122,7 @@
   ],
   "defaultProject": "javascript-sdk",
   "useDaemonProcess": true,
-  "namedInputs": {
-    "default": ["{projectRoot}/**/*", "sharedGlobals"],
-    "sharedGlobals": ["{workspaceRoot}/.github/workflows/ci=github.yml"],
-    "production": [
-      "default",
-      "!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
-      "!{projectRoot}/tsconfig.spec.json"
-    ]
-  },
+
   "useInferencePlugins": true,
   "defaultBase": "develop"
 }
diff --git a/package.json b/package.json
@@ -79,7 +79,7 @@
     "eslint-plugin-import": "2.27.5",
     "eslint-plugin-playwright": "^1.5.1",
     "eslint-plugin-prettier": "^5.1.3",
-    "express": "^4.18.3",
+    "express": "^4.21.0",
     "fast-check": "^3.19.0",
     "husky": "^8.0.3",
     "jsdom": "22.1.0",
@@ -120,5 +120,19 @@
   "packageManager": "[email protected]+sha512.38dc6fba8dba35b39340b9700112c2fe1e12f10b17134715a4aa98ccf7bb035e76fd981cf0bb384dfa98f8d6af5481c2bef2f4266a24bfa20c34eb7147ce0b5e",
   "dependencies": {
     "nx-cloud": "^19.1.0"
+  },
+  "pnpm": {
+    "overrides": {
+      "ssri@>=5.2.2 <6.0.2": ">=6.0.2",
+      "express@<4.19.2": ">=4.19.2",
+      "tough-cookie@<4.1.3": ">=4.1.3",
+      "micromatch@<4.0.8": ">=4.0.8",
+      "body-parser@<1.20.3": ">=1.20.3",
+      "send@<0.19.0": ">=0.19.0",
+      "serve-static@<1.16.0": ">=1.16.0",
+      "express@<4.20.0": ">=4.20.0",
+      "path-to-regexp@<0.1.10": ">=0.1.10",
+      "rollup@<2.79.2": ">=2.79.2"
+    }
   }
 }
diff --git a/packages/javascript-sdk/package.json b/packages/javascript-sdk/package.json
@@ -7,7 +7,7 @@
   "files": ["dist/*"],
   "repository": {
     "type": "git",
-    "url": "git@github.com:ForgeRock/forgerock-javascript-sdk.git",
+    "url": "git+https://github.com:ForgeRock/forgerock-javascript-sdk.git",
     "directory": "packages/javascript-sdk"
   },
   "bugs": {

diff --git a/packages/ping-protect/package.json b/packages/ping-protect/package.json
@@ -8,7 +8,7 @@
   "main": "./dist/index.js",
   "repository": {
     "type": "git",
-    "url": "git@github.com:ForgeRock/forgerock-javascript-sdk.git",
+    "url": "git+https://github.com:ForgeRock/forgerock-javascript-sdk.git",
     "directory": "packages/ping-protect"
   },
   "exports": {

diff --git a/packages/token-vault/package.json b/packages/token-vault/package.json
@@ -6,7 +6,7 @@
   "files": ["dist/*"],
   "repository": {
     "type": "git",
-    "url": "git@github.com:ForgeRock/forgerock-javascript-sdk.git",
+    "url": "git+https://github.com:ForgeRock/forgerock-javascript-sdk.git",
     "directory": "packages/token-vault"
   },
   "exports": {