Skip to content
This repository has been archived by the owner on Nov 4, 2024. It is now read-only.

Commit

Permalink
Merge pull request #62 from ualibweb/revert-60-revert-59-FOLIO-3876
Browse files Browse the repository at this point in the history
Revert "Revert "FOLIO-3876: Breaking changes react v18"
  • Loading branch information
danetsao authored Oct 9, 2023
2 parents e35f782 + abe13aa commit 7f89622
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 15 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
## (IN PROGRESS)
* Support `feesfines` interface version `18.0`. Refs UIPBEX-45.

## [3.0.0](https://github.com/folio-org/ui-plugin-bursar-export/tree/v3.0.0) (2023-10-02)
[Full Changelog](https://github.com/folio-org/ui-plugin-bursar-export/compare/v2.4.0...v3.0.0)
* Upgrade react v18.0.0. Refs FOLIO-3876.
* Upgrade dependent modules.

## [2.4.0](https://github.com/folio-org/ui-plugin-bursar-export/tree/v2.4.0) (2023-02-20)
[Full Changelog](https://github.com/folio-org/ui-plugin-bursar-export/compare/v2.3.0...v2.4.0)
* Bump stripes to 8.0.0 for Orchid/2023-R1. Refs UIPBEX-41.
Expand Down
19 changes: 9 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@folio/plugin-bursar-export",
"version": "2.4.0",
"version": "3.0.0",
"description": "Bursar export",
"main": "src/index.js",
"repository": "",
Expand Down Expand Up @@ -77,26 +77,25 @@
"@babel/plugin-transform-runtime": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"@babel/preset-react": "^7.7.4",
"@folio/eslint-config-stripes": "^5.0.0",
"@folio/stripes": "https://github.com/ualibweb/stripes#stripes-859",
"@folio/stripes-cli": "^2.0.0",
"@folio/eslint-config-stripes": "^7.0.0",
"@folio/stripes": "^9.0.0",
"@folio/stripes-cli": "^3.0.0",
"@formatjs/cli": "^4.8.2",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^14.0.0",
"@testing-library/react-hooks": "^8.0.1",
"@testing-library/user-event": "^14.4.3",
"@types/jest": "^29.5.1",
"@types/react": "^18.2.0",
"babel-jest": "^26.3.0",
"babel-jest": "^29.6.1",
"core-js": "^3.6.1",
"eslint": "^6.2.1",
"eslint-plugin-filenames": "^1.3.2",
"eslint-plugin-jest": "^23.0.4",
"identity-obj-proxy": "^3.0.0",
"jest": "^28.1.3",
"jest": "^29.6.1",
"jest-css-modules": "^2.1.0",
"jest-environment-jsdom": "^28.1.3",
"jest-junit": "^14.0.0",
"jest-environment-jsdom": "^29.6.1",
"jest-junit": "^16.0.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-intl": "^6.4.4",
Expand All @@ -118,7 +117,7 @@
"react-router-prop-types": "^1.0.4"
},
"peerDependencies": {
"@folio/stripes": "^8.0.0",
"@folio/stripes": "^9.0.0",
"@types/react": "^18.2.0",
"final-form": "^4.18.2",
"final-form-arrays": "^3.0.1",
Expand Down
5 changes: 2 additions & 3 deletions src/api/mutators/useAutomaticSchedulerMutation.test.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { CalloutContext } from '@folio/stripes/core';
import { waitFor } from '@testing-library/react';
import { act, renderHook } from '@testing-library/react-hooks';
import { waitFor, act, renderHook } from '@testing-library/react';
import React, { ReactNode } from 'react';
import { QueryClient, QueryClientProvider } from 'react-query';
import useAutomaticSchedulerMutation from './useAutomaticSchedulerMutation';
Expand Down Expand Up @@ -167,7 +166,7 @@ describe('Automatic scheduling mutation', () => {
} as any);
});

await waitFor(() =>
waitFor(async () =>
expect(putMock).toHaveBeenCalledWith('data-export-spring/configs/foo', {
json: {
id: 'foo',
Expand Down
3 changes: 1 addition & 2 deletions src/api/mutators/useManualSchedulerMutation.test.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { CalloutContext } from '@folio/stripes/core';
import { waitFor } from '@testing-library/react';
import { act, renderHook } from '@testing-library/react-hooks';
import { waitFor, act, renderHook } from '@testing-library/react';
import React, { ReactNode } from 'react';
import { QueryClient, QueryClientProvider } from 'react-query';
import useManualSchedulerMutation from './useManualSchedulerMutation';
Expand Down

0 comments on commit 7f89622

Please sign in to comment.