Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(chore) Version bumps for yarn and several packages #217

Merged
merged 2 commits into from
Aug 22, 2024
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
3 changes: 2 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
src/**/*.test.tsx
**/*.d.tsx
**/*.d.tsx
node_modules
2 changes: 0 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
dist/
node_modules/
**/*.css
**/*.scss
**/*.md
**/*.json
yarn.lock
Expand Down
894 changes: 0 additions & 894 deletions .yarn/releases/yarn-4.3.1.cjs

This file was deleted.

925 changes: 925 additions & 0 deletions .yarn/releases/yarn-4.4.0.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ enableGlobalCache: false

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.3.1.cjs
yarnPath: .yarn/releases/yarn-4.4.0.cjs
49 changes: 24 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,54 +13,53 @@
"verify": "turbo lint typescript test"
},
"devDependencies": {
"@babel/core": "^7.22.17",
"@carbon/react": "^1.63.1",
"@openmrs/esm-framework": "next",
"@swc/cli": "^0.1.62",
"@swc/core": "^1.3.84",
"@swc/jest": "^0.2.29",
"@testing-library/dom": "^9.3.1",
"@testing-library/jest-dom": "^6.1.3",
"@testing-library/react": "^14.0.0",
"@testing-library/user-event": "^14.4.3",
"@types/jest": "^29.5.4",
"@swc/cli": "^0.1.65",
"@swc/core": "^1.7.14",
"@swc/jest": "^0.2.36",
"@testing-library/dom": "^9.3.4",
"@testing-library/jest-dom": "^6.4.8",
"@testing-library/react": "^14.3.1",
"@testing-library/user-event": "^14.5.2",
"@types/jest": "^29.5.12",
"@types/react": "^18.2.21",
"@types/react-dom": "^18.2.7",
"@types/webpack-env": "^1.18.1",
"@typescript-eslint/eslint-plugin": "^6.7.0",
"@typescript-eslint/parser": "^6.7.0",
"concurrently": "^8.2.1",
"@types/webpack-env": "^1.18.5",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"concurrently": "^8.2.2",
"cross-env": "^7.0.3",
"css-loader": "^6.8.1",
"eslint": "^8.49.0",
"eslint-plugin-react-hooks": "^4.6.0",
"css-loader": "^6.11.0",
"eslint": "^8.57.0",
"eslint-plugin-react-hooks": "^4.6.2",
"history": "^5.3.0",
"husky": "^8.0.3",
"i18next": "^23.5.1",
"i18next-parser": "^8.7.0",
"i18next": "^23.14.0",
"i18next-parser": "^8.13.0",
"identity-obj-proxy": "^3.0.0",
"jest": "^29.7.0",
"jest-cli": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"lint-staged": "^14.0.1",
"openmrs": "next",
"prettier": "^3.0.3",
"prettier": "^3.3.3",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-i18next": "^13.2.2",
"react-router-dom": "^6.15.0",
"sass": "^1.66.1",
"sass-loader": "^13.3.2",
"swc-loader": "^0.2.3",
"turbo": "^2.0.6",
"sass": "^1.77.8",
"sass-loader": "^13.3.3",
"swc-loader": "^0.2.6",
"turbo": "^2.0.14",
"typescript": "^4.9.5",
"webpack": "^5.88.2",
"webpack": "^5.93.0",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^5.0.4"
},
"lint-staged": {
"*.{ts,tsx}": "eslint --cache --fix --max-warnings 0",
"*.{css,scss,ts,tsx}": "prettier --write --list-different"
},
"packageManager": "yarn@4.3.1"
"packageManager": "yarn@4.4.0"
}
2 changes: 2 additions & 0 deletions packages/esm-home-app/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
/** @type {import('jest').Config} */
module.exports = {
clearMocks: true,
transform: {
'^.+\\.tsx?$': '@swc/jest',
},
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-home-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"debug": "npm run serve",
"build": "webpack --mode production",
"analyze": "webpack --mode=production --env.analyze=true",
"lint": "cross-env TIMING=1 eslint src --ext ts,tsx --fix --max-warnings=0 --color",
"lint": "cross-env eslint src --ext ts,tsx --fix --max-warnings=0 --color",
"typescript": "tsc",
"verify": "turbo lint typescript test --color",
"extract-translations": "i18next 'src/**/*.{component.tsx,tsx}' 'src/index.ts' --config ../../tools/i18next-parser.config.js",
Expand Down

This file was deleted.

Empty file.
3 changes: 1 addition & 2 deletions packages/esm-home-app/translations/en.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"home": "Home",
"homepageIllustration": "Homepage illustration"
"home": "Home"
}
3 changes: 1 addition & 2 deletions packages/esm-home-app/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"extends": "../../tsconfig.json",
"include": ["src/**/*"],
"exclude": ["src/**/*.test.tsx"]
"include": ["src/**/*", "./setupTests.ts", "./jest.config.js"],
}
19 changes: 10 additions & 9 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
{
"compilerOptions": {
"esModuleInterop": true,
"module": "esnext",
"allowSyntheticDefaultImports": true,
"esModuleInterop": true,
"jsx": "react",
"skipLibCheck": true,
"moduleResolution": "node",
"lib": [
"dom",
"es5",
Expand All @@ -15,16 +12,20 @@
"es2016.array.include",
"es2018",
"es2020",
"es2021"
"es2021",
"es2022"
],
"resolveJsonModule": true,
"strictNullChecks": true,
"module": "esnext",
"moduleResolution": "node",
"noEmit": true,
"target": "esnext",
"paths": {
"@openmrs/*": ["./node_modules/@openmrs/*"],
"__mocks__": ["./__mocks__"],
"tools": ["./tools"],
}
},
"resolveJsonModule": true,
"skipLibCheck": true,
"strictNullChecks": true,
"target": "esnext",
}
}
Loading