Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
91de877
Bump rexml from 3.3.9 to 3.4.2 in /docs
dependabot[bot] Sep 17, 2025
f605d3f
Bump pip in /scripts/docker/examples/python/assets/hello_world
dependabot[bot] Sep 24, 2025
833c122
Bump ossf/scorecard-action from 2.4.2 to 2.4.3
dependabot[bot] Oct 1, 2025
5c26a32
Bump pm2 from 5.4.3 to 6.0.13
dependabot[bot] Oct 1, 2025
a920ae8
Bump yargs from 17.7.2 to 18.0.0
dependabot[bot] Oct 1, 2025
c368c50
Bump react-dom and @types/react-dom
dependabot[bot] Oct 2, 2025
a4c9265
Bump @types/node from 20.19.17 to 24.8.1
dependabot[bot] Oct 17, 2025
a6fe2d8
Bump @stylistic/eslint-plugin from 3.1.0 to 5.5.0
dependabot[bot] Oct 20, 2025
c6a8c7d
Bump github/codeql-action from 3.30.3 to 4.30.9
dependabot[bot] Oct 20, 2025
211317f
Merge dependabot/github_actions/github/codeql-action-4.30.9 into depe…
github-actions[bot] Oct 20, 2025
863c5f8
Merge dependabot/npm_and_yarn/stylistic/eslint-plugin-5.5.0 into depe…
github-actions[bot] Oct 20, 2025
9b42d55
Merge dependabot/npm_and_yarn/types/node-24.8.1 into dependabotCombined
github-actions[bot] Oct 20, 2025
72751bf
Merge dependabot/npm_and_yarn/multi-357e51bb92 into dependabotCombined
github-actions[bot] Oct 20, 2025
bde8d09
Merge dependabot/npm_and_yarn/yargs-18.0.0 into dependabotCombined
github-actions[bot] Oct 20, 2025
de59262
Merge dependabot/npm_and_yarn/pm2-6.0.13 into dependabotCombined
github-actions[bot] Oct 20, 2025
72fdbed
Merge dependabot/pip/scripts/docker/examples/python/assets/hello_worl…
github-actions[bot] Oct 20, 2025
9717daa
Merge dependabot/bundler/docs/rexml-3.4.2 into dependabotCombined
github-actions[bot] Oct 20, 2025
34aec02
Merge remote-tracking branch 'origin/dependabot/github_actions/ossf/s…
m-houston Oct 20, 2025
b88616e
Bump schema version due to change detection vs main
m-houston Oct 20, 2025
aba454e
Fix dependabot changes
m-houston Oct 20, 2025
77a90fe
Fix tests
m-houston Oct 20, 2025
fa5ec7c
Align react and react-dom versions
m-houston Oct 20, 2025
5a29fb5
Dependency and version fixes
m-houston Oct 20, 2025
16cb25d
Fix schema change detection
m-houston Oct 20, 2025
a2ec029
Reset package version to 1.0.0
m-houston Oct 21, 2025
4277256
Update generated schemas
m-houston Oct 21, 2025
537eed0
Fix linting
m-houston Oct 21, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ indent_style = unset
indent_size = unset
generated_code = true

[/packages/schemas/client-config/domain/**.json]
[/packages/events/schemas/domain/**.json]
insert_final_newline = false
5 changes: 5 additions & 0 deletions .github/dependabot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,28 @@ updates:
directory: "/"
schedule:
interval: "daily"
open-pull-requests-limit: 0

- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
open-pull-requests-limit: 0

- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "daily"
open-pull-requests-limit: 0

- package-ecosystem: "pip"
directory: "/"
schedule:
interval: "daily"
open-pull-requests-limit: 0

- package-ecosystem: "terraform"
directory: "/"
schedule:
interval: "daily"
open-pull-requests-limit: 0
4 changes: 2 additions & 2 deletions .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
persist-credentials: false

- name: "Run analysis"
uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
with:
results_file: results.sarif
results_format: sarif
Expand Down Expand Up @@ -68,6 +68,6 @@ jobs:
# Upload the results to GitHub's code scanning dashboard (optional).
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@192325c86100d080feab897ff886c34abd4c83a3 # v3.29.5
uses: github/codeql-action/upload-sarif@16140ae1a102900babc80a33c44059580f687047 # v3.29.5
with:
sarif_file: results.sarif
12 changes: 6 additions & 6 deletions .github/workflows/stage-1-commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -223,15 +223,15 @@ jobs:
run: |
git fetch origin main

if git diff --quiet origin/main...HEAD -- packages/schemas; then
if git diff --quiet origin/main...HEAD -- packages/events; then
echo "No changes in event schemas package"
echo "changed=false" >> $GITHUB_OUTPUT
else
echo "Changes detected in event schemas"
echo "changed=true" >> $GITHUB_OUTPUT
fi

if content=$(git show origin/main:packages/schemas/package.json 2>/dev/null); then
if content=$(git show origin/main:packages/events/package.json 2>/dev/null); then
version=$(jq -r .version <<< $content);
else
version=null;
Expand Down Expand Up @@ -263,11 +263,11 @@ jobs:

- name: "Re-generate schemas"
run: |
npm ci --workspace packages/schemas
npm --workspace packages/schemas run gen:jsonschema
npm ci --workspace packages/events
npm --workspace packages/events run gen:jsonschema

- name: Check for schema changes
run: git diff --quiet packages/schemas/client-config
run: git diff --quiet packages/events/schemas

check-schema-version-change:
name: Check event schema version has been updated
Expand All @@ -287,7 +287,7 @@ jobs:
main_version="${{ needs.detect-event-schema-package-changes.outputs.main_version }}"
echo "Main version: ${{ needs.detect-event-schema-package-changes.outputs.main_version }}"

local_version=$(jq -r '.version' packages/schemas/package.json)
local_version=$(jq -r '.version' packages/events/package.json)
echo "Local version: $local_version"

if ! is_valid_increment "$main_version" "$local_version" ; then
Expand Down
10 changes: 10 additions & 0 deletions .syncpackrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"versionGroups": [
{
"dependencies": ["@nhsdigital/nhs-notify-events-client-config"],
"specifierTypes": ["*"],
"label": "Internal deps",
"isIgnored": true
}
]
}
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
act 0.2.64
gitleaks 8.24.0
jq 1.6
nodejs 22.11.0
nodejs 22.12.0
pre-commit 3.6.0
terraform 1.9.2
terraform-docs 0.19.0
Expand Down
2 changes: 1 addition & 1 deletion docs/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ GEM
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
rexml (3.3.9)
rexml (3.4.2)
rouge (4.2.1)
safe_yaml (1.0.5)
sass-embedded (1.83.0-x86_64-linux-gnu)
Expand Down
22 changes: 0 additions & 22 deletions docs/package-lock.json

This file was deleted.

51 changes: 25 additions & 26 deletions frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,48 +1,47 @@
{
"name": "nhs-notify-client-config-frontend",
"version": "0.1.0",
"private": true,
"scripts": {
"dev": "next dev",
"build": "next build",
"start": "next start",
"lint": "next lint",
"lint:fix": "next lint --fix",
"test:unit": "jest",
"test:coverage": "jest --coverage",
"app:start": "pm2 start npm -- start",
"app:wait": "wait-on -l http://localhost:3000/auth",
"app:stop": "pm2 kill",
"typecheck": "tsc --noEmit"
},
"dependencies": {
"@aws-amplify/adapter-nextjs": "^1.6.9",
"aws-amplify": "^6.15.6",
"next": "^15.3.2",
"react": "^19.0.0",
"react-dom": "^19.0.0"
"react": "19.2.0",
"react-dom": "19.2.0"
},
"devDependencies": {
"@testing-library/dom": "^10.4.0",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.2.0",
"@testing-library/user-event": "^14.6.1",
"@types/jest": "^30.0.0",
"@types/node": "^20.17.32",
"@types/node": "^24.8.1",
"@types/react": "19.0.8",
"@types/react-dom": "19.0.3",
"jest": "^30.1.3",
"jest-environment-jsdom": "^30.1.2",
"jest-html-reporter": "^4.3.0",
"jest-mock-extended": "^4.0.0",
"pm2": "^5.4.3",
"pm2": "^6.0.13",
"sass": "^1.86.0",
"ts-jest": "^29.3.0"
},
"overrides": {
"react": "^19.0.0"
"ts-jest": "^29.4.0"
},
"eslintConfig": {
"extends": ["next/core-web-vitals"]
}
"extends": [
"next/core-web-vitals"
]
},
"name": "nhs-notify-client-config-frontend",
"private": true,
"scripts": {
"app:start": "pm2 start npm -- start",
"app:stop": "pm2 kill",
"app:wait": "wait-on -l http://localhost:3000/auth",
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"lint:fix": "next lint --fix",
"start": "next start",
"test:coverage": "jest --coverage",
"test:unit": "jest",
"typecheck": "tsc --noEmit"
},
"version": "0.1.0"
}
Loading
Loading