Skip to content

Commit b8b8982

Browse files
authored
Merge branch 'main' into aea-0000-updated-related-apis
2 parents 44d33b4 + c7babdc commit b8b8982

147 files changed

Lines changed: 4756 additions & 6661 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"ms-python.flake8",
2828
"eamodio.gitlens",
2929
"github.vscode-pull-request-github",
30-
"orta.vscode-jest",
30+
"vitest-explorer",
3131
"42crunch.vscode-openapi",
3232
"mermade.openapi-lint",
3333
"christian-kohler.npm-intellisense",

.github/config/ods_codes_int.txt

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,3 +135,39 @@ FXD93
135135
FXH78
136136
FXV31
137137
FXW37
138+
FN288
139+
FH707
140+
FY790
141+
FL260
142+
FJT64
143+
FRM94
144+
FMY73
145+
FH462
146+
FMC15
147+
FFD48
148+
FM764
149+
FRX83
150+
FKG44
151+
FKJ53
152+
FGW87
153+
FML16
154+
FF205
155+
FFA60
156+
FA466
157+
FNK53
158+
FRH27
159+
FA092
160+
FXX59
161+
FPK87
162+
FD578
163+
FEC85
164+
FTR05
165+
FMM65
166+
FD333
167+
FEK19
168+
FJY69
169+
FE618
170+
FVR25
171+
FWD53
172+
FL139
173+
FAK27

.github/config/ods_codes_prod.txt

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,3 +135,39 @@ FXD93
135135
FXH78
136136
FXV31
137137
FXW37
138+
FN288
139+
FH707
140+
FY790
141+
FL260
142+
FJT64
143+
FRM94
144+
FMY73
145+
FH462
146+
FMC15
147+
FFD48
148+
FM764
149+
FRX83
150+
FKG44
151+
FKJ53
152+
FGW87
153+
FML16
154+
FF205
155+
FFA60
156+
FA466
157+
FNK53
158+
FRH27
159+
FA092
160+
FXX59
161+
FPK87
162+
FD578
163+
FEC85
164+
FTR05
165+
FMM65
166+
FD333
167+
FEK19
168+
FJY69
169+
FE618
170+
FVR25
171+
FWD53
172+
FL139
173+
FAK27

.github/workflows/sync_copilot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
steps:
1818
- name: Sync shared instructions
19-
uses: NHSDigital/eps-copilot-instructions@304ab2f4b7cdc15a1d7c0a0fae5290fad41b2451
19+
uses: NHSDigital/eps-copilot-instructions@8b4d7f546fe9825a149cb8cc8cfdb31df58c3730
2020
with:
2121
copilot_instructions_ref: main
2222
calling_repo_base_branch: main

.vscode/eps-prescription-status-update-api.code-workspace

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,6 @@
7070
}
7171
],
7272
"settings": {
73-
"jest.disabledWorkspaceFolders": [
74-
"eps-prescription-status-update-monorepo",
75-
"packages/common/testing",
76-
"packages/specification"
77-
],
7873
"files.exclude": {
7974
"packages/": true
8075
},
@@ -158,11 +153,7 @@
158153
],
159154
"cSpell.dictionaries": ["en-GB"],
160155
"cSpell.ignorePaths": ["package-lock.json", "node_modules", ".vscode"],
161-
"jest.jestCommandLine": "NODE_OPTIONS=--experimental-vm-modules node_modules/.bin/jest --no-cache",
162-
"jest.nodeEnv": {
163-
"POWERTOOLS_DEV": true
164-
},
165-
"typescript.tsdk": "eps-prescription-status-update-monorepo/node_modules/typescript/lib",
156+
"js/ts.tsdk.path": "eps-prescription-status-update-monorepo/node_modules/typescript/lib",
166157
"eslint.useFlatConfig": true,
167158
"eslint.format.enable": true
168159
},
@@ -174,7 +165,7 @@
174165
"ms-python.flake8",
175166
"eamodio.gitlens",
176167
"github.vscode-pull-request-github",
177-
"orta.vscode-jest",
168+
"vitest-explorer",
178169
"42crunch.vscode-openapi",
179170
"mermade.openapi-lint",
180171
"redhat.vscode-yaml",

eslint.config.mjs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ export default [
118118
languageOptions: {
119119
parser: tsParser,
120120
globals: {
121-
...globals.jest,
122121
...globals.node,
123122
},
124123
},

jest.default.config.ts

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)