Merge pull request #512 from ForgeRock/mend-scan

chore: mend-failures
ForgeRock · Dec 11, 2024 · 634c870 · 634c870
2 parents 4f76d1d + 520efc3
commit 634c870
Show file tree

Hide file tree

Showing 14 changed files with 85 additions and 105 deletions.
diff --git a/e2e/autoscript-apps/project.json b/e2e/autoscript-apps/project.json
@@ -6,7 +6,6 @@
   "tags": ["scope:app"],
   "targets": {
     "build": {
-      "dependsOn": ["^build"],
       "inputs": ["default", "^default"],
       "outputs": ["{projectRoot}/dist"],
       "options": {

diff --git a/e2e/token-vault-app/index.html b/e2e/token-vault-app/index.html
@@ -38,7 +38,6 @@
         margin: 0;
       }
     </style>
-    <link rel="stylesheet" href="/src/styles.scss" />
   </head>
 
   <body>

diff --git a/e2e/token-vault-app/src/styles.scss b/e2e/token-vault-app/src/styles.scss
diff --git a/e2e/token-vault-app/tsconfig.app.json b/e2e/token-vault-app/tsconfig.app.json
@@ -6,7 +6,6 @@
     "moduleResolution": "Bundler",
     "target": "ESNext",
     "module": "ESNext",
-    "types": ["vite/client"],
     "moduleDetection": "force"
   },
   "exclude": ["src/**/*.spec.ts", "src/**/*.test.ts"],

diff --git a/e2e/token-vault-interceptor/package.json b/e2e/token-vault-interceptor/package.json
@@ -2,7 +2,7 @@
   "name": "@forgerock/token-vault-interceptor",
   "version": "0.0.1",
   "dependencies": {
-    "@forgerock/token-vault": "4.2.0"
+    "@forgerock/token-vault": "workspace:*"
   },
   "main": "./dist/index.iife.js",
   "module": "./dist/index.iife.js",

diff --git a/e2e/token-vault-interceptor/project.json b/e2e/token-vault-interceptor/project.json
@@ -6,7 +6,6 @@
   "tags": ["scope:app"],
   "targets": {
     "build": {
-      "dependsOn": ["^build"],
       "inputs": ["default", "^default"],
       "outputs": ["{projectRoot}/dist"],
       "defaultConfiguration": "production",

diff --git a/e2e/token-vault-proxy/index.html b/e2e/token-vault-proxy/index.html
@@ -7,7 +7,6 @@
 
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="icon" href="favicon.ico" />
-    <link rel="stylesheet" href="/src/styles.scss" />
   </head>
   <body>
     <script type="module" src="/src/main.ts"></script>

diff --git a/e2e/token-vault-proxy/project.json b/e2e/token-vault-proxy/project.json
@@ -6,7 +6,6 @@
   "tags": ["scope:app"],
   "targets": {
     "build": {
-      "dependsOn": ["^build"],
       "inputs": ["default", "^default"],
       "outputs": ["{projectRoot}/dist"],
       "defaultConfiguration": "production",

diff --git a/e2e/token-vault-proxy/src/styles.scss b/e2e/token-vault-proxy/src/styles.scss
diff --git a/nx.json b/nx.json
@@ -48,7 +48,13 @@
     "@nx/vite:build": {
       "dependsOn": ["^build"],
       "cache": true,
-      "inputs": ["noMarkdown", "^noMarkdown"]
+      "inputs": ["noMarkdown", "^noMarkdown"],
+      "outputs": ["{projectRoot}/dist"]
+    },
+    "@nx/playwright:run": {
+      "dependsOn": ["^build"],
+      "inputs": ["noMarkdown", "^noMarkdown"],
+      "cache": true
     },
     "@nx/esbuild:esbuild": {
       "dependsOn": ["^build"],

diff --git a/package.json b/package.json
@@ -132,6 +132,9 @@
   },
   "pnpm": {
     "overrides": {
+      "jsonpath-plus@<=7.2.0": ">=10.2.0",
+      "nanoid@<=3.3.7": ">=3.3.8",
+      "cross-spawn@<=7.0.3": ">=7.0.5",
       "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",

diff --git a/packages/ping-protect/project.json b/packages/ping-protect/project.json
@@ -19,13 +19,11 @@
       "outputs": ["{projectRoot}/dist"]
     },
     "lint": {
-      "dependsOn": ["javascript-sdk:build"],
       "options": {
         "args": ["**/*.ts"]
       }
     },
     "test": {
-      "dependsOn": ["javascript-sdk:build"],
       "inputs": [
         "default",
         "^default",

diff --git a/packages/token-vault/project.json b/packages/token-vault/project.json
@@ -6,7 +6,6 @@
   "tags": ["scope:package"],
   "targets": {
     "build": {
-      "dependsOn": ["javascript-sdk:build"],
       "inputs": [
         "default",
         "^default",
@@ -17,7 +16,6 @@
       "outputs": ["{projectRoot}/dist"]
     },
     "test": {
-      "dependsOn": ["javascript-sdk:build"],
       "inputs": [
         "default",
         "^default",
@@ -35,7 +33,6 @@
       }
     },
     "lint": {
-      "dependsOn": ["javascript-sdk:build"],
       "options": {
         "fix": true,
         "ignore-path": ".eslintignore",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,7 +38,6 @@ @@
             margin: 0;
           }
         </style>
-        <link rel="stylesheet" href="/src/styles.scss" />
       </head>
       <body>
@@ Expand Down @@