Skip to content

Commit 6b54ac0

Browse files
Update EHR NPM packages (#1071)
* Update NPM packages * Refactor GridPanelWithModel use in ParticipantReports * Setup eslint
1 parent 1b6e551 commit 6b54ac0

File tree

11 files changed

+31631
-30419
lines changed

11 files changed

+31631
-30419
lines changed

EHR_App/package-lock.json

Lines changed: 9437 additions & 11151 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

EHR_App/package.json

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,18 @@
1717
"lint-fix": "eslint --fix"
1818
},
1919
"dependencies": {
20-
"@labkey/components": "5.5.1",
21-
"@labkey/ehr": "0.0.2"
20+
"@labkey/components": "6.72.1",
21+
"@labkey/ehr": "0.0.3"
2222
},
2323
"devDependencies": {
24-
"@labkey/build": "7.7.1",
25-
"@types/jest": "29.5.12",
26-
"@types/react": "18.3.3",
27-
"@types/react-dom": "18.3.0",
28-
"jest": "29.7.0",
29-
"jest-cli": "29.7.0",
30-
"jest-environment-jsdom": "29.7.0",
24+
"@labkey/build": "8.7.0",
25+
"@types/jest": "30.0.0",
26+
"@types/react": "18.3.26",
27+
"@types/react-dom": "18.3.7",
28+
"jest": "30.2.0",
29+
"jest-cli": "30.2.0",
30+
"jest-environment-jsdom": "30.2.0",
3131
"jest-teamcity-reporter": "0.9.0",
32-
"react-test-renderer": "16.14.0",
33-
"ts-jest": "29.2.3"
32+
"ts-jest": "29.4.5"
3433
}
3534
}

ehr/package-lock.json

Lines changed: 8635 additions & 4096 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ehr/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
"lint-fix": "eslint --fix"
1616
},
1717
"dependencies": {
18-
"@labkey/components": "6.26.3"
18+
"@labkey/components": "6.72.1"
1919
},
2020
"devDependencies": {
21-
"@labkey/build": "8.4.0",
22-
"@types/jest": "29.5.14",
23-
"@types/react": "18.3.12",
24-
"@types/react-dom": "18.3.1"
21+
"@labkey/build": "8.7.0",
22+
"@types/jest": "30.0.0",
23+
"@types/react": "18.3.26",
24+
"@types/react-dom": "18.3.7"
2525
}
2626
}

labkey-ui-ehr/eslint.config.mjs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
import config from '@labkey/eslint-config';
2+
export default config;

labkey-ui-ehr/lint.diff.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ if (process.argv.length > 2) {
4949
const branch = stdout;
5050

5151
// Diff current branch against develop to get changed file names
52-
({stdout} = await execa('git', ['diff', 'develop...' + branch, '--name-only', '--diff-filter=AM']));
52+
({stdout} = await execa('git', ['diff', 'develop...' + branch, '--name-only', '--diff-filter=AM', '--relative']));
5353
if (!stdout) {
5454
console.log('No changed files in branch ' + branch);
5555
}
5656

5757
files = stdout;
5858
} else {
5959
// Diff uncommitted changes against committed to
60-
({stdout} = await execa('git', ['diff', '--name-only', '--diff-filter=AM', lintPath]));
60+
({stdout} = await execa('git', ['diff', '--name-only', '--diff-filter=AM', '--relative', lintPath]));
6161
if (!stdout) {
6262
console.log('No changed files at ' + lintPath);
6363
}

0 commit comments

Comments
 (0)