Skip to content

Commit

Permalink
(chore) Version bumps for yarn and several packages (#1118)
Browse files Browse the repository at this point in the history
  • Loading branch information
denniskigen authored Aug 22, 2024
1 parent b00ef1e commit 3f3a625
Show file tree
Hide file tree
Showing 21 changed files with 2,502 additions and 2,624 deletions.
894 changes: 0 additions & 894 deletions .yarn/releases/yarn-4.2.2.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.2.2.cjs
yarnPath: .yarn/releases/yarn-4.4.0.cjs
30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,41 +28,41 @@
"devDependencies": {
"@playwright/test": "1.45.3",
"@swc/core": "^1.3.58",
"@swc/jest": "^0.2.29",
"@testing-library/dom": "^9.3.3",
"@swc/jest": "^0.2.36",
"@testing-library/dom": "^9.3.4",
"@testing-library/jest-dom": "^6.1.5",
"@testing-library/react": "^14.1.2",
"@testing-library/user-event": "^14.5.1",
"@types/jest": "^29.5.11",
"@testing-library/user-event": "^14.5.2",
"@types/jest": "^29.5.12",
"@types/react-dom": "^18.0.6",
"@types/systemjs": "^6.1.0",
"@types/webpack-env": "^1.16.4",
"@typescript-eslint/eslint-plugin": "^6.13.2",
"@typescript-eslint/parser": "^6.13.2",
"autoprefixer": "^10.4.2",
"autoprefixer": "^10.4.20",
"classnames": "^2.3.2",
"cross-env": "7.0.2",
"cross-env": "7.0.3",
"dotenv": "^16.0.3",
"eslint": "^8.55.0",
"eslint-plugin-react-hooks": "^4.6.0",
"fake-indexeddb": "^4.0.1",
"eslint-plugin-react-hooks": "^4.6.2",
"fake-indexeddb": "^4.0.2",
"fork-ts-checker-webpack-plugin": "^7.2.13",
"husky": "^8.0.1",
"husky": "^8.0.3",
"i18next-parser": "^6.6.0",
"identity-obj-proxy": "^3.0.0",
"jest": "^29.7.0",
"jest-cli": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"lint-staged": "^15.2.0",
"lint-staged": "^15.2.9",
"openmrs": "workspace:*",
"postcss": "^8.4.6",
"postcss": "^8.4.41",
"prettier": "^3.1.0",
"swc-loader": "^0.2.3",
"swc-loader": "^0.2.6",
"systemjs-webpack-interop": "^2.3.7",
"timezone-mock": "^1.2.2",
"turbo": "^2.0.6",
"typedoc": "^0.22.15",
"typedoc-plugin-file-tags": "^1.0.0",
"typedoc": "^0.22.18",
"typedoc-plugin-file-tags": "^1.0.1",
"typedoc-plugin-markdown": "3.11.14",
"typedoc-plugin-no-inherit": "^1.3.1",
"typescript": "~4.6.4",
Expand All @@ -76,5 +76,5 @@
"@carbon/icons-react": "11.37.0",
"minipass": "3.3.5"
},
"packageManager": "yarn@4.2.2"
"packageManager": "yarn@4.4.0"
}
2 changes: 1 addition & 1 deletion packages/apps/esm-implementer-tools-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"react-dom": "^18.1.0",
"react-i18next": "^11.18.6",
"rxjs": "^6.5.3",
"swr": "^2.2.2",
"swr": "^2.2.5",
"webpack": "^5.88.0"
}
}
4 changes: 2 additions & 2 deletions packages/apps/esm-login-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@carbon/react": "~1.37.0",
"@hookform/resolvers": "^3.6.0",
"lodash-es": "^4.17.21",
"react-hook-form": "^7.52.0",
"react-hook-form": "^7.52.2",
"zod": "^3.23.8"
},
"peerDependencies": {
Expand All @@ -63,7 +63,7 @@
"react-i18next": "^11.18.6",
"react-router-dom": "^6.3.0",
"rxjs": "^6.5.3",
"swr": "^2.2.2",
"swr": "^2.2.5",
"webpack": "^5.88.0"
}
}
20 changes: 11 additions & 9 deletions packages/apps/esm-login-app/src/login.resource.ts
Original file line number Diff line number Diff line change
@@ -1,33 +1,35 @@
import { useEffect, useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import type { KeyedMutator } from 'swr';
import useSwrInfinite from 'swr/infinite';
import useSwrInfinite, { type SWRInfiniteResponse } from 'swr/infinite';
import useSwrImmutable from 'swr/immutable';
import {
type FetchResponse,
fhirBaseUrl,
openmrsFetch,
refetchCurrentUser,
type FetchResponse,
type Session,
useDebounce,
} from '@openmrs/esm-framework';
import type { LocationEntry, LocationResponse } from './types';

// "swr/infinite" doesn't export InfiniteKeyedMutator directly
type InfiniteKeyedMutator<T> = SWRInfiniteResponse<T extends (infer I)[] ? I : T>['mutate'];

interface LoginLocationData {
locations: Array<LocationEntry>;
isLoading: boolean;
totalResults: number;
error: Error;
hasMore: boolean;
isLoading: boolean;
loadingNewData: boolean;
locations: Array<LocationEntry>;
mutate: InfiniteKeyedMutator<FetchResponse<LocationResponse>[]>;
setPage: (size: number | ((_size: number) => number)) => Promise<FetchResponse<LocationResponse>[]>;
mutate: KeyedMutator<FetchResponse<LocationResponse>[]>;
error: Error;
totalResults: number;
}

export function useLoginLocations(
useLoginLocationTag: boolean,
count: number = 0,
searchQuery: string = '',
useLoginLocationTag: boolean,
): LoginLocationData {
const { t } = useTranslation();
const debouncedSearchQuery = useDebounce(searchQuery);
Expand Down
4 changes: 2 additions & 2 deletions packages/apps/esm-offline-tools-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@carbon/icons-react": "^11.37.0",
"@carbon/react": "~1.37.0",
"lodash-es": "^4.17.21",
"swr": "^2.2.2"
"swr": "^2.2.5"
},
"peerDependencies": {
"@carbon/react": "1.x",
Expand All @@ -56,7 +56,7 @@
"devDependencies": {
"@openmrs/esm-framework": "workspace:*",
"@openmrs/webpack-config": "workspace:*",
"@types/lodash-es": "^4.17.5",
"@types/lodash-es": "^4.17.12",
"jest": "^29.7.0",
"react": "^18.1.0",
"react-dom": "^18.1.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/framework/esm-framework/docs/API.md
Original file line number Diff line number Diff line change
Expand Up @@ -6682,7 +6682,7 @@ a UseServerInfiniteReturnObject object

#### Defined in

[packages/framework/esm-react-utils/src/useServerInfinite.ts:78](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-react-utils/src/useServerInfinite.ts#L78)
[packages/framework/esm-react-utils/src/useServerInfinite.ts:80](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-react-utils/src/useServerInfinite.ts#L80)

___

Expand Down Expand Up @@ -7149,7 +7149,7 @@ ___

### useOpenmrsSWR

**useOpenmrsSWR**<`DataType`, `ErrorType`\>(`key`, `options?`): `SWRResponse`<[`FetchResponse`](interfaces/FetchResponse.md)<`DataType`\>, `ErrorType`, `undefined` \| `Partial`<`PublicConfiguration`<[`FetchResponse`](interfaces/FetchResponse.md)<`DataType`\>, `ErrorType`, `BareFetcher`<[`FetchResponse`](interfaces/FetchResponse.md)<`DataType`\>\>\>\>\>
**useOpenmrsSWR**<`DataType`, `ErrorType`\>(`key`, `options?`): `SWRResponse`<[`FetchResponse`](interfaces/FetchResponse.md)<`DataType`\>, `ErrorType`, `undefined` \| `SWRConfiguration`<[`FetchResponse`](interfaces/FetchResponse.md)<`DataType`\>, `ErrorType`, `BareFetcher`<[`FetchResponse`](interfaces/FetchResponse.md)<`DataType`\>\>\>\>

**`beta`**

Expand Down Expand Up @@ -7202,7 +7202,7 @@ function MyComponent() {

#### Returns

`SWRResponse`<[`FetchResponse`](interfaces/FetchResponse.md)<`DataType`\>, `ErrorType`, `undefined` \| `Partial`<`PublicConfiguration`<[`FetchResponse`](interfaces/FetchResponse.md)<`DataType`\>, `ErrorType`, `BareFetcher`<[`FetchResponse`](interfaces/FetchResponse.md)<`DataType`\>\>\>\>\>
`SWRResponse`<[`FetchResponse`](interfaces/FetchResponse.md)<`DataType`\>, `ErrorType`, `undefined` \| `SWRConfiguration`<[`FetchResponse`](interfaces/FetchResponse.md)<`DataType`\>, `ErrorType`, `BareFetcher`<[`FetchResponse`](interfaces/FetchResponse.md)<`DataType`\>\>\>\>

#### Defined in

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ Omit.autoFocus

#### Defined in

node_modules/@react-types/shared/src/events.d.ts:116
node_modules/@react-types/shared/src/events.d.ts:120

___

Expand All @@ -160,7 +160,7 @@ Omit.children

#### Defined in

node_modules/react-aria-components/dist/types.d.ts:54
node_modules/react-aria-components/dist/types.d.ts:56

___

Expand Down Expand Up @@ -544,7 +544,7 @@ Omit.shouldCloseOnSelect

#### Defined in

node_modules/@react-stately/datepicker/dist/types.d.ts:12
node_modules/@react-stately/datepicker/dist/types.d.ts:21

___

Expand Down Expand Up @@ -590,7 +590,7 @@ Omit.slot

#### Defined in

node_modules/react-aria-components/dist/types.d.ts:71
node_modules/react-aria-components/dist/types.d.ts:73

___

Expand All @@ -606,7 +606,7 @@ Omit.style

#### Defined in

node_modules/react-aria-components/dist/types.d.ts:48
node_modules/react-aria-components/dist/types.d.ts:50

___

Expand All @@ -626,7 +626,7 @@ Omit.validationBehavior

#### Defined in

node_modules/react-aria-components/dist/types.d.ts:82
node_modules/react-aria-components/dist/types.d.ts:84

___

Expand Down Expand Up @@ -690,7 +690,7 @@ Omit.onBlur

#### Defined in

node_modules/@react-types/shared/src/events.d.ts:81
node_modules/@react-types/shared/src/events.d.ts:85

___

Expand Down Expand Up @@ -760,7 +760,7 @@ Omit.onFocus

#### Defined in

node_modules/@react-types/shared/src/events.d.ts:79
node_modules/@react-types/shared/src/events.d.ts:83

___

Expand All @@ -786,7 +786,7 @@ Omit.onFocusChange

#### Defined in

node_modules/@react-types/shared/src/events.d.ts:83
node_modules/@react-types/shared/src/events.d.ts:87

___

Expand All @@ -812,7 +812,7 @@ Omit.onKeyDown

#### Defined in

node_modules/@react-types/shared/src/events.d.ts:72
node_modules/@react-types/shared/src/events.d.ts:76

___

Expand All @@ -838,7 +838,7 @@ Omit.onKeyUp

#### Defined in

node_modules/@react-types/shared/src/events.d.ts:74
node_modules/@react-types/shared/src/events.d.ts:78

___

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ this array does not contain the complete data set.

#### Defined in

[packages/framework/esm-react-utils/src/useServerInfinite.ts:14](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-react-utils/src/useServerInfinite.ts#L14)
[packages/framework/esm-react-utils/src/useServerInfinite.ts:16](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-react-utils/src/useServerInfinite.ts#L16)

___

Expand All @@ -48,7 +48,7 @@ from useSWRInfinite

#### Defined in

[packages/framework/esm-react-utils/src/useServerInfinite.ts:34](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-react-utils/src/useServerInfinite.ts#L34)
[packages/framework/esm-react-utils/src/useServerInfinite.ts:36](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-react-utils/src/useServerInfinite.ts#L36)

___

Expand All @@ -60,7 +60,7 @@ Whether there are more results in the data set that have not been fetched yet.

#### Defined in

[packages/framework/esm-react-utils/src/useServerInfinite.ts:24](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-react-utils/src/useServerInfinite.ts#L24)
[packages/framework/esm-react-utils/src/useServerInfinite.ts:26](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-react-utils/src/useServerInfinite.ts#L26)

___

Expand All @@ -72,7 +72,7 @@ from useSWRInfinite

#### Defined in

[packages/framework/esm-react-utils/src/useServerInfinite.ts:49](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-react-utils/src/useServerInfinite.ts#L49)
[packages/framework/esm-react-utils/src/useServerInfinite.ts:51](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-react-utils/src/useServerInfinite.ts#L51)

___

Expand All @@ -84,19 +84,19 @@ from useSWRInfinite

#### Defined in

[packages/framework/esm-react-utils/src/useServerInfinite.ts:44](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-react-utils/src/useServerInfinite.ts#L44)
[packages/framework/esm-react-utils/src/useServerInfinite.ts:46](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-react-utils/src/useServerInfinite.ts#L46)

___

### mutate

**mutate**: `KeyedMutator`<[`FetchResponse`](FetchResponse.md)<[`OpenMRSPaginatedResponse`](OpenMRSPaginatedResponse.md)<`T`\>\>[]\>
**mutate**: `InfiniteKeyedMutator`<[`FetchResponse`](FetchResponse.md)<[`OpenMRSPaginatedResponse`](OpenMRSPaginatedResponse.md)<`T`\>\>[]\>

from useSWRInfinite

#### Defined in

[packages/framework/esm-react-utils/src/useServerInfinite.ts:39](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-react-utils/src/useServerInfinite.ts#L39)
[packages/framework/esm-react-utils/src/useServerInfinite.ts:41](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-react-utils/src/useServerInfinite.ts#L41)

___

Expand All @@ -108,7 +108,7 @@ The total number of rows in the data set.

#### Defined in

[packages/framework/esm-react-utils/src/useServerInfinite.ts:19](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-react-utils/src/useServerInfinite.ts#L19)
[packages/framework/esm-react-utils/src/useServerInfinite.ts:21](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-react-utils/src/useServerInfinite.ts#L21)

## UI Methods

Expand All @@ -124,4 +124,4 @@ callback function to make another fetch of next page's data set.

#### Defined in

[packages/framework/esm-react-utils/src/useServerInfinite.ts:29](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-react-utils/src/useServerInfinite.ts#L29)
[packages/framework/esm-react-utils/src/useServerInfinite.ts:31](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-react-utils/src/useServerInfinite.ts#L31)
2 changes: 1 addition & 1 deletion packages/framework/esm-offline/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"dependencies": {
"dexie": "^3.0.3",
"lodash-es": "^4.17.21",
"uuid": "^9.0.0",
"uuid": "^9.0.1",
"workbox-window": "^6.1.5"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/framework/esm-react-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"react-dom": "^18.1.0",
"react-i18next": "^11.18.6",
"rxjs": "^6.5.3",
"swr": "^2.2.2",
"swr": "^2.2.5",
"webpack": "^5.88.0"
}
}
Loading

0 comments on commit 3f3a625

Please sign in to comment.