Skip to content

Commit dd63333

Browse files
authored
Merge pull request #557 from ForgeRock/update-shared-globals
chore: update-shared-globals
2 parents dd3060e + 2aa07ab commit dd63333

File tree

13 files changed

+53
-67
lines changed

13 files changed

+53
-67
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
env:
55
NX_CLOUD_ENCRYPTION_KEY: ${{ secrets.NX_CLOUD_ENCRYPTION_KEY }}
66
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
7-
NX_CLOUD_DISTRIBUTED_EXECUTION: true
87
jobs:
98
pr:
109
if: ${{github.event.pull_request.head.repo.full_name == github.repository}}
@@ -26,7 +25,7 @@ jobs:
2625

2726
# This line enables distribution
2827
# The "--stop-agents-after" is optional, but allows idle agents to shut down once the "e2e-ci" targets have been requested
29-
- run: pnpm dlx nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="e2e-ci" --verbose
28+
- run: pnpm dlx nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="e2e-ci"
3029

3130
- run: pnpm exec playwright install
3231

@@ -35,7 +34,7 @@ jobs:
3534
- run: git branch --track develop origin/develop
3635

3736
- run: pnpm exec nx-cloud record -- nx format:check --verbose
38-
- run: pnpm exec nx affected -t build lint test docs e2e-ci --verbose
37+
- run: pnpm exec nx affected -t build lint test docs e2e-ci
3938

4039
- uses: codecov/codecov-action@v5
4140
with:

.github/workflows/publish.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ env:
3131
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
3232
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
3333
SLACK_WEBHOOK_URL_BETA: ${{ secrets.SLACK_WEBHOOK_URL_BETA }}
34+
NX_CLOUD_DISTRIBUTED_EXECUTION: true
3435
HUSKY: 0
3536
CI: true
3637

e2e/autoscript-apps/vite.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { defineConfig } from 'vite';
21
import * as path from 'path';
2+
import { defineConfig } from 'vite';
33

44
const pages = [
55
'authn-basic',

e2e/mock-api-v2/vite.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export default defineConfig({
99
cache: {
1010
dir: '../../node_modules/.vitest',
1111
},
12-
watch: !process.env['CI'],
12+
watch: false,
1313
environment: 'jsdom',
1414
include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
1515

nx.json

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
{
22
"namedInputs": {
33
"default": ["{projectRoot}/**/*", "sharedGlobals"],
4-
"sharedGlobals": ["{workspaceRoot}/.github/workflows/ci.yml"],
4+
"sharedGlobals": ["{workspaceRoot}/.github/workflows/*.yml"],
55
"production": [
66
"default",
77
"!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
88
"!{projectRoot}/tsconfig.spec.json",
99
"!{projectRoot}/src/test-setup.[jt]s",
1010
"!{projectRoot}/test-setup.[jt]s"
11-
],
12-
"noMarkdown": ["!{projectRoot}/**/*.md"]
11+
]
1312
},
1413
"targetDefaults": {
14+
"e2e-ci": {
15+
"dependsOn": ["^build"]
16+
},
1517
"nx-release-publish": {
1618
"options": {
1719
"packageRoot": "packages/{projectName}"
@@ -28,45 +30,44 @@
2830
},
2931
"e2e": {
3032
"dependsOn": ["^build"],
31-
"inputs": ["noMarkdown", "^noMarkdown"],
3233
"cache": true
3334
},
35+
"test": {
36+
"dependsOn": ["^build"]
37+
},
3438
"build": {
3539
"dependsOn": ["^build"],
36-
"inputs": ["noMarkdown", "^noMarkdown"],
40+
"inputs": ["production", "^production"],
3741
"cache": true,
3842
"outputs": ["{projectRoot}/dist"]
3943
},
4044
"@nx/vite:test": {
41-
"dependsOn": ["^test"],
42-
"inputs": ["noMarkdown", "^noMarkdown"],
45+
"dependsOn": ["build", "^test"],
4346
"outputs": ["{projectRoot}/coverage"],
4447
"cache": true
4548
},
4649
"@nx/eslint:lint": {
4750
"dependsOn": ["^build", "^lint"],
48-
"inputs": ["noMarkdown", "^noMarkdown"],
4951
"cache": true
5052
},
5153
"@nx/vite:build": {
5254
"dependsOn": ["^build"],
55+
"inputs": ["production", "^production"],
5356
"cache": true,
54-
"inputs": ["noMarkdown", "^noMarkdown"],
5557
"outputs": ["{projectRoot}/dist"]
5658
},
5759
"@nx/playwright:run": {
5860
"dependsOn": ["^build"],
59-
"inputs": ["noMarkdown", "^noMarkdown"],
6061
"cache": true
6162
},
6263
"@nx/esbuild:esbuild": {
64+
"inputs": ["production", "^production"],
6365
"dependsOn": ["^build"],
64-
"cache": true,
65-
"inputs": ["noMarkdown", "^noMarkdown"]
66+
"cache": true
6667
},
6768
"e2e-ci--**/*": {
69+
"inputs": ["default", "^default"],
6870
"dependsOn": ["^build"],
69-
"inputs": ["noMarkdown", "^noMarkdown"],
7071
"cache": true
7172
},
7273
"@nx/js:tsc": {
@@ -108,7 +109,8 @@
108109
"options": {
109110
"ciTargetName": "e2e-ci",
110111
"targetName": "e2e"
111-
}
112+
},
113+
"include": ["e2e/**/**/*"]
112114
},
113115
{
114116
"plugin": "@nx/eslint/plugin",
@@ -149,7 +151,8 @@
149151
"previewTargetName": "vite:preview",
150152
"serveStaticTargetName": "vite:serve-static",
151153
"typecheckTargetName": "vite:typecheck"
152-
}
154+
},
155+
"include": ["packages/**/*", "e2e/**/*"]
153156
}
154157
],
155158
"defaultProject": "javascript-sdk",

packages/javascript-sdk/project.json

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,6 @@
88
"docs": {
99
"command": "pnpm typedoc --options {projectRoot}/typedoc.json"
1010
},
11-
"build": {
12-
"inputs": [
13-
"default",
14-
"^default",
15-
{
16-
"externalDependencies": ["vite"]
17-
}
18-
],
19-
"outputs": ["{projectRoot}/dist"]
20-
},
2111
"lint": {
2212
"options": {
2313
"fix": true,

packages/javascript-sdk/vite.config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import { copyFileSync } from 'fs';
12
import { defineConfig } from 'vite';
23
import dts from 'vite-plugin-dts';
3-
import { copyFileSync } from 'fs';
44
import pkg from './package.json';
55

66
export default defineConfig({
@@ -48,7 +48,7 @@ export default defineConfig({
4848
globals: true,
4949
environment: 'jsdom',
5050
include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}', 'tests/**/*.test.ts'],
51-
watch: !process.env['CI'],
51+
watch: false,
5252
reporters: ['default'],
5353
setupFiles: ['./vitest.setup.ts'],
5454
coverage: {

packages/ping-protect/LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2019-2025 Ping Identity Corporation
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

packages/ping-protect/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ Install both modules and their latest versions:
2020
npm install @forgerock/javascript-sdk @forgerock/ping-protect
2121
```
2222

23+
```sh
24+
pnpm add @forgerock/javascript-sdk @forgerock/ping-protect
25+
```
26+
2327
The two main responsibilities of the Ping Protect module is the initialization of the profiling and data collection and the completion and preparation of the collected data for the server. You can find the two methods on the `PIProtect` module found within the `@forgerock/ping-protect` module.
2428

2529
- `PIProtect.start()`

packages/ping-protect/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "4.6.0",
44
"private": false,
55
"type": "module",
6-
"files": ["dist"],
6+
"files": ["./dist/*"],
77
"module": "./dist/index.js",
88
"main": "./dist/index.js",
99
"repository": {

0 commit comments

Comments
 (0)