Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20,588 changes: 9,437 additions & 11,151 deletions EHR_App/package-lock.json

Large diffs are not rendered by default.

21 changes: 10 additions & 11 deletions EHR_App/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,18 @@
"lint-fix": "eslint --fix"
},
"dependencies": {
"@labkey/components": "5.5.1",
"@labkey/ehr": "0.0.2"
"@labkey/components": "6.72.1",
"@labkey/ehr": "0.0.3"
},
"devDependencies": {
"@labkey/build": "7.7.1",
"@types/jest": "29.5.12",
"@types/react": "18.3.3",
"@types/react-dom": "18.3.0",
"jest": "29.7.0",
"jest-cli": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"@labkey/build": "8.7.0",
"@types/jest": "30.0.0",
"@types/react": "18.3.26",
"@types/react-dom": "18.3.7",
"jest": "30.2.0",
"jest-cli": "30.2.0",
"jest-environment-jsdom": "30.2.0",
"jest-teamcity-reporter": "0.9.0",
"react-test-renderer": "16.14.0",
"ts-jest": "29.2.3"
"ts-jest": "29.4.5"
}
}
12,731 changes: 8,635 additions & 4,096 deletions ehr/package-lock.json

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions ehr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
"lint-fix": "eslint --fix"
},
"dependencies": {
"@labkey/components": "6.26.3"
"@labkey/components": "6.72.1"
},
"devDependencies": {
"@labkey/build": "8.4.0",
"@types/jest": "29.5.14",
"@types/react": "18.3.12",
"@types/react-dom": "18.3.1"
"@labkey/build": "8.7.0",
"@types/jest": "30.0.0",
"@types/react": "18.3.26",
"@types/react-dom": "18.3.7"
}
}
2 changes: 2 additions & 0 deletions labkey-ui-ehr/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
import config from '@labkey/eslint-config';
export default config;
4 changes: 2 additions & 2 deletions labkey-ui-ehr/lint.diff.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ if (process.argv.length > 2) {
const branch = stdout;

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

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