Skip to content

Commit

Permalink
(chore) More version bumps
Browse files Browse the repository at this point in the history
  • Loading branch information
denniskigen committed Sep 12, 2023
1 parent d0c9b7f commit f1f8794
Show file tree
Hide file tree
Showing 12 changed files with 1,294 additions and 1,629 deletions.
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
src/**/*.test.tsx
**/*.d.tsx
**/*.d.tsx
9 changes: 8 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
{
"parser": "@typescript-eslint/parser",
"parserOptions": {
"project": true
},
"plugins": [
"@typescript-eslint"
],
"extends": ["ts-react-important-stuff", "plugin:prettier/recommended"],
"extends": [
"eslint:recommended",
"plugin:prettier/recommended",
"ts-react-important-stuff"
],
"rules": {
"no-restricted-imports": [
"error",
Expand Down
1 change: 1 addition & 0 deletions .husky/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
_
4 changes: 2 additions & 2 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

yarn pretty-quick --staged
yarn turbo extract-translations
npx lint-staged
yarn turbo extract-translations
36 changes: 17 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
{
"name": "@openmrs/esm-home",
"private": true,
"husky": {
"hooks": {
"pre-commit": "pretty-quick --staged && yarn verify && yarn extract-translations"
}
},
"workspaces": [
"packages/*"
],
"lint-staged": {
"*.{js,jsx,ts,tsx}": "eslint --cache --fix"
},
"scripts": {
"ci:publish": "lerna publish from-package --yes",
"ci:prepublish": "lerna publish from-package --no-git-reset --yes --dist-tag next",
Expand All @@ -26,37 +24,37 @@
"@swc/cli": "^0.1.62",
"@swc/core": "^1.3.84",
"@swc/jest": "^0.2.29",
"@testing-library/dom": "^8.20.1",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
"@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",
"@types/react": "^18.2.21",
"@types/react-dom": "^18.2.7",
"@types/webpack-env": "^1.18.1",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"concurrently": "^7.6.0",
"@typescript-eslint/eslint-plugin": "^6.7.0",
"@typescript-eslint/parser": "^6.7.0",
"concurrently": "^8.2.1",
"cross-env": "^7.0.3",
"css-loader": "^6.8.1",
"eslint": "^8.49.0",
"eslint-config-prettier": "^8.10.0",
"eslint-config-prettier": "^9.0.0",
"eslint-config-ts-react-important-stuff": "^3.0.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-prettier": "^5.0.0-alpha.0",
"husky": "^8.0.3",
"i18next": "^22.5.1",
"i18next-parser": "^7.9.0",
"i18next": "^23.5.1",
"i18next-parser": "^8.7.0",
"identity-obj-proxy": "^3.0.0",
"jest": "^29.7.0",
"jest-cli": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"lerna": "^6.6.2",
"lerna": "^7.2.0",
"lint-staged": ">=10",
"openmrs": "next",
"prettier": "^2.8.8",
"pretty-quick": "^3.1.3",
"prettier": "^3.0.3",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-i18next": "^12.3.1",
"react-i18next": "^13.2.2",
"react-router-dom": "^6.15.0",
"sass": "^1.66.1",
"sass-loader": "^13.3.2",
Expand Down
8 changes: 2 additions & 6 deletions packages/esm-home-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
"debug": "npm run serve",
"build": "webpack --mode production",
"analyze": "webpack --mode=production --env.analyze=true",
"lint": "eslint src --ext tsx",
"lint": "cross-env TIMING=1 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}' --config ../../tools/i18next-parser.config.js",
"test": "cross-env TZ=UTC jest --config jest.config.js --verbose false --passWithNoTests",
"coverage": "yarn test --coverage"
Expand All @@ -27,11 +28,6 @@
"publishConfig": {
"access": "public"
},
"husky": {
"hooks": {
"pre-commit": "pretty-quick --staged && concurrently 'npm:test' 'npm:typescript' 'npm:lint'"
}
},
"repository": {
"type": "git",
"url": "git+https://github.com/openmrs/openmrs-esm-home.git"
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-home-app/src/declarations.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ declare module '*.css';
declare module '*.scss';
declare module '*.png';

declare type SideNavProps = {};
declare interface SideNavProps {}
11 changes: 0 additions & 11 deletions packages/esm-home-app/src/root.test.tsx

This file was deleted.

2 changes: 1 addition & 1 deletion packages/esm-home-app/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.json",
"include": ["src/**/*"],
"exclude": ["src/**/*.test.tsx", "src/**/*.outdated.tsx"]
"exclude": ["src/**/*.test.tsx"]
}
1 change: 1 addition & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"es2020"
],
"resolveJsonModule": true,
"strictNullChecks": true,
"noEmit": true,
"target": "esnext"
}
Expand Down
20 changes: 4 additions & 16 deletions turbo.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,12 @@
"dependsOn": ["^build"],
"outputs": ["dist/**"]
},
"test": {
"dependsOn": [],
"outputs": []
},
"test": {},
"coverage": {
"dependsOn": [],
"outputs": ["coverage/**"]
},
"lint": {
"dependsOn": ["^lint"],
"outputs": []
},
"typescript": {
"dependsOn": ["^typescript"],
"outputs": []
},
"extract-translations": {
"outputs": []
}
"lint": {},
"typescript": {},
"extract-translations": {}
}
}
Loading

0 comments on commit f1f8794

Please sign in to comment.