Merge branch 'master' into uical-268

package.json

@@ -118,7 +118,7 @@
     "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "^14.5.1",
     "@types/jest": "^29.5.5",
-    "@types/react": "^18.2.22",
+    "@types/react": "^18.2.0",
     "@typescript-eslint/eslint-plugin": "^6.7.2",
     "@typescript-eslint/parser": "^6.7.2",
     "eslint": "^8.49.0",
@@ -153,8 +153,8 @@
   "peerDependencies": {
     "@folio/stripes": "^9.0.0",
     "final-form": "^4.20.7",
-    "react": "^18.0.2",
-    "react-dom": "^18.0.2",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "react-final-form": "^6.5.9",
     "react-intl": "^6.4.4",
     "react-query": "^3.39.2",

src/index.test.tsx

@@ -12,7 +12,8 @@ describe('Main index.tsx entry point', () => {
   it('renders appropriately when it should not be showing', () => {
     expectRender(
       <CalendarRouting
-        location={{ pathname: 'foo', search: '', hash: '' } as Location}
+        stripes={{ hasPerm: () => true, connect: () => ({}) } as StripesType}
+        location={{ pathname: 'foo', search: '', state: undefined, hash: '', key: 'foo' }}
         forceRender={0}
       />
     ).toContain('How did you get to foo?');
@@ -21,7 +22,8 @@ describe('Main index.tsx entry point', () => {
   it('renders appropriately when it should be showing', () => {
     expectRender(
       <CalendarRouting
-        location={{ pathname: 'foo', search: '', hash: '' } as Location}
+        stripes={{ hasPerm: () => true, connect: () => ({}) } as StripesType}
+        location={{ pathname: 'foo', search: '', state: undefined, hash: '', key: 'foo' }}
         forceRender={0}
         showSettings
       />