From d660c98056981f4a7fd0d394855e0d33f28a7eb9 Mon Sep 17 00:00:00 2001
From: Dane Tsao <danetsaoo@gmail.com>
Date: Mon, 9 Oct 2023 14:55:32 -0500
Subject: [PATCH 1/2] Revert "Revert "FOLIO-3876: Breaking changes react v18""

---
 CHANGELOG.md                                  |  5 +++++
 package.json                                  | 19 +++++++++----------
 .../useAutomaticSchedulerMutation.test.tsx    |  5 ++---
 .../useManualSchedulerMutation.test.tsx       |  3 +--
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4fcaeee1..6f63d7a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,11 @@
 ## (IN PROGRESS)
 * Support `feesfines` interface version `18.0`. Refs UIPBEX-45.
 
+## [2.4.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.
diff --git a/package.json b/package.json
index 3f01894e..0d78b93e 100644
--- a/package.json
+++ b/package.json
@@ -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": "",
@@ -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",
@@ -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",
diff --git a/src/api/mutators/useAutomaticSchedulerMutation.test.tsx b/src/api/mutators/useAutomaticSchedulerMutation.test.tsx
index 7144dc6a..13647f3d 100644
--- a/src/api/mutators/useAutomaticSchedulerMutation.test.tsx
+++ b/src/api/mutators/useAutomaticSchedulerMutation.test.tsx
@@ -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';
@@ -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',
diff --git a/src/api/mutators/useManualSchedulerMutation.test.tsx b/src/api/mutators/useManualSchedulerMutation.test.tsx
index 15ef9040..38f5842b 100644
--- a/src/api/mutators/useManualSchedulerMutation.test.tsx
+++ b/src/api/mutators/useManualSchedulerMutation.test.tsx
@@ -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';

From abe13aadbe7bdacfaf9c45915f64c6b0afbf00d0 Mon Sep 17 00:00:00 2001
From: Dane Tsao <danetsaoo@gmail.com>
Date: Mon, 9 Oct 2023 14:56:06 -0500
Subject: [PATCH 2/2] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f63d7a6..7378799e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 ## (IN PROGRESS)
 * Support `feesfines` interface version `18.0`. Refs UIPBEX-45.
 
-## [2.4.0](https://github.com/folio-org/ui-plugin-bursar-export/tree/v3.0.0) (2023-10-02)
+## [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.