Skip to content

Commit c57e1fa

Browse files
committed
(chore) bumps community packages
pr changes updates tsconfig.json tsconfig updates fixing ci
1 parent 9630c8a commit c57e1fa

File tree

8 files changed

+34
-18
lines changed

8 files changed

+34
-18
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# OS files
22
.DS_Store
33

4+
# IDE files
5+
.idea
6+
.vscode
7+
48
# Logs
59
logs
610
*.log

jest.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ const path = require('path');
66

77
module.exports = {
88
transform: {
9-
'^.+\\.(j|t)sx?$': '@swc/jest',
9+
'^.+\\.[jt]sx?$': '@swc/jest',
1010
},
11-
transformIgnorePatterns: ['/node_modules/(?!@openmrs)'],
11+
transformIgnorePatterns: ['/node_modules/(?!@openmrs|.+\\.pnp\\.[^\\/]+$)'],
1212
moduleDirectories: ['node_modules', '__mocks__', 'tools', __dirname],
1313
moduleNameMapper: {
1414
'\\.(s?css)$': 'identity-obj-proxy',

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"webpack-dev-server": "^5.2.1"
7575
},
7676
"lint-staged": {
77-
"*.{ts,tsx}": "eslint --cache --fix --max-warnings 0",
77+
"packages/**/src/**/*.{ts,tsx}": "eslint --cache --fix --max-warnings 0",
7878
"*.{css,scss,ts,tsx}": "prettier --cache --write --list-different"
7979
},
8080
"packageManager": "yarn@4.9.1"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"extends": "../../tsconfig.json",
3-
"include": ["src/**/*"],
3+
"include": ["src/**/*", "../../tools/setup-tests.ts"],
44
"exclude": ["src/**/*.test.tsx"]
55
}

packages/esm-nutrition-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
},
4646
"peerDependencies": {
4747
"@openmrs/esm-framework": "6.x",
48-
"@openmrs/esm-patient-common-lib": "9.x",
48+
"@openmrs/esm-patient-common-lib": "10.x",
4949
"dayjs": "1.x",
5050
"react": "18.x",
5151
"react-i18next": "11.x",
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"extends": "../../tsconfig.json",
3-
"include": ["src/**/*"],
3+
"include": ["src/**/*", "../../tools/setup-tests.ts"],
44
"exclude": ["src/**/*.test.tsx"]
55
}

tsconfig.json

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,36 @@
11
{
22
"compilerOptions": {
3-
"esModuleInterop": true,
4-
"module": "esnext",
53
"allowSyntheticDefaultImports": true,
4+
"esModuleInterop": true,
65
"jsx": "react",
7-
"skipLibCheck": true,
8-
"moduleResolution": "node",
96
"lib": [
107
"dom",
11-
"es5",
12-
"scripthost",
13-
"es2015",
148
"es2015.promise",
9+
"es2015",
1510
"es2016.array.include",
1611
"es2018",
1712
"es2020",
18-
"es2022"
13+
"es2021",
14+
"es2022",
15+
"es5",
16+
"scripthost",
1917
],
20-
"resolveJsonModule": true,
18+
"module": "esnext",
19+
"moduleResolution": "node",
2120
"noEmit": true,
22-
"target": "esnext"
23-
}
21+
"paths": {
22+
"@openmrs/*": ["./node_modules/@openmrs/*"],
23+
"__mocks__": ["./__mocks__"],
24+
"tools": ["./tools"],
25+
},
26+
"resolveJsonModule": true,
27+
"skipLibCheck": true,
28+
"target": "esnext",
29+
},
30+
"exclude": [
31+
"node_modules",
32+
// Explicitly exclude source directories from problematic dependencies
33+
"../../node_modules/@openmrs/esm-framework/src/**/*",
34+
"../../node_modules/@openmrs/esm-styleguide/src/**/*"
35+
]
2436
}

yarn.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2930,7 +2930,7 @@ __metadata:
29302930
yup: "npm:^0.32.11"
29312931
peerDependencies:
29322932
"@openmrs/esm-framework": 6.x
2933-
"@openmrs/esm-patient-common-lib": 9.x
2933+
"@openmrs/esm-patient-common-lib": 10.x
29342934
dayjs: 1.x
29352935
react: 18.x
29362936
react-i18next: 11.x

0 commit comments

Comments
 (0)