Merge pull request #10805 from transcom/kh-upgrade-react-router-6.11.2

MB-15974 - upgrades react-router and react-router-dom versions
transcom · Jun 6, 2023 · ff5cc87 · ff5cc87
2 parents b679d56 + 18ef91c
commit ff5cc87
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 29 deletions.
diff --git a/package.json b/package.json
@@ -54,8 +54,8 @@
     "react-query": "^3.39.2",
     "react-rangeslider": "^2.2.0",
     "react-redux": "^7.2.9",
-    "react-router": "^6.4.3",
-    "react-router-dom": "^6.4.3",
+    "react-router": "6.7.0",
+    "react-router-dom": "6.7.0",
     "react-router-tabs": "^1.1.1",
     "react-select": "^5.7.3",
     "react-table": "^7.8.0",
@@ -80,17 +80,19 @@
     "yup": "^0.32.11"
   },
   "resolutions": {
-    "loader-utils": "^2.0.3",
     "dns-packet": "^5.4.0",
+    "eslint-plugin-react": "^7.28",
+    "immer": "^9.0.2",
+    "json5": "^2.2.2",
     "kind-of": "^6.0.2",
+    "loader-utils": "^2.0.3",
+    "minimist": "^1.2.6",
+    "node-fetch": "^2.6.7",
+    "react-router": "6.7.0",
+    "react-router-dom": "6.7.0",
     "selfsigned": "^1.10.8",
-    "immer": "^9.0.2",
     "url-parse": "^1.5.1",
-    "y18n": "^5.0.5",
-    "eslint-plugin-react": "^7.28",
-    "node-fetch": "^2.6.7",
-    "minimist": "^1.2.6",
-    "json5": "^2.2.2"
+    "y18n": "^5.0.5"
   },
   "name": "client",
   "private": true,

diff --git a/src/constants/routes.js b/src/constants/routes.js
@@ -61,8 +61,8 @@ export const servicesCounselingRoutes = {
   MOVE_VIEW_PATH: 'details',
   BASE_ORDERS_EDIT_PATH: `${BASE_COUNSELING_MOVE_PATH}/orders`,
   ORDERS_EDIT_PATH: 'orders',
-  BASE_SHIPMENT_ADD_PATH: `${BASE_COUNSELING_MOVE_PATH}/new-:shipmentType`,
-  SHIPMENT_ADD_PATH: 'new-:shipmentType',
+  BASE_SHIPMENT_ADD_PATH: `${BASE_COUNSELING_MOVE_PATH}/new-shipment/:shipmentType`,
+  SHIPMENT_ADD_PATH: 'new-shipment/:shipmentType',
   BASE_SHIPMENT_EDIT_PATH: `${BASE_COUNSELING_MOVE_PATH}/shipments/:shipmentId`,
   SHIPMENT_EDIT_PATH: 'shipments/:shipmentId',
   BASE_SHIPMENT_ADVANCE_PATH: `${BASE_COUNSELING_MOVE_PATH}/shipments/:shipmentId/advance`,

diff --git a/src/pages/Office/ServicesCounselingMoveInfo/ServicesCounselingMoveInfo.test.jsx b/src/pages/Office/ServicesCounselingMoveInfo/ServicesCounselingMoveInfo.test.jsx
@@ -133,7 +133,7 @@ describe('Services Counseling Move Info Container', () => {
       ['Services Counseling Move Details', '/'],
       ['Services Counseling Move Details', 'details'],
       ['Review Documents', 'shipments/SHIP123/document-review'],
-      ['Services Counseling Add Shipment', 'new-hhg'],
+      ['Services Counseling Add Shipment', 'new-shipment/hhg'],
       ['Services Counselor Customer Support Remarks', 'customer-support-remarks'],
       ['Move History', 'history'],
       ['Services Counseling Move Document Wrapper', 'allowances'],

diff --git a/src/pages/Office/index.test.jsx b/src/pages/Office/index.test.jsx
@@ -206,7 +206,7 @@ describe('Office App', () => {
     it.each([
       ['Move Queue', '/moves/queue', roleTypes.TOO],
       ['Payment Request Queue', '/invoicing/queue', roleTypes.TIO],
-      ['Services Counseling Add Shipment', '/new-PPM', roleTypes.SERVICES_COUNSELOR],
+      ['Services Counseling Add Shipment', '/new-shipment/PPM', roleTypes.SERVICES_COUNSELOR],
       ['Services Counseling Queue', '/counseling', roleTypes.SERVICES_COUNSELOR],
       ['Services Counseling Queue', '/PPM-closeout', roleTypes.SERVICES_COUNSELOR],
       ['Services Counseling Move Info', '/counseling/moves/test123/', roleTypes.SERVICES_COUNSELOR],
@@ -261,7 +261,7 @@ describe('Office App', () => {
     it.each([
       ['Move Queue', '/moves/queue', roleTypes.PRIME_SIMULATOR],
       ['Payment Request Queue', '/invoicing/queue', roleTypes.PRIME_SIMULATOR],
-      ['Services Counseling Add Shipment', '/new-PPM', roleTypes.PRIME_SIMULATOR],
+      ['Services Counseling Add Shipment', '/new-shipment/PPM', roleTypes.PRIME_SIMULATOR],
       ['Services Counseling Move Info', '/counseling/moves/test123/', roleTypes.QAE_CSR],
       ['Edit Shipment Details', '/moves/test123/shipments/ship123', roleTypes.QAE_CSR],
       ['Prime Simulator Move Details', '/simulator/moves/test123/details', roleTypes.QAE_CSR],

diff --git a/yarn.lock b/yarn.lock
@@ -3862,10 +3862,10 @@
   resolved "https://registry.yarnpkg.com/@redux-saga/types/-/types-1.2.1.tgz#9403f51c17cae37edf870c6bc0c81c1ece5ccef8"
   integrity sha512-1dgmkh+3so0+LlBWRhGA33ua4MYr7tUOj+a9Si28vUi0IUFNbff1T3sgpeDJI/LaC75bBYnQ0A3wXjn0OrRNBA==
 
-"@remix-run/router@1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.0.3.tgz#953b88c20ea00d0eddaffdc1b115c08474aa295d"
-  integrity sha512-ceuyTSs7PZ/tQqi19YZNBc5X7kj1f8p+4DIyrcIYFY9h+hd1OKm4RqtiWldR9eGEvIiJfsqwM4BsuCtRIuEw6Q==
+"@remix-run/router@1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.3.0.tgz#b6ee542c7f087b73b3d8215b9bf799f648be71cb"
+  integrity sha512-nwQoYb3m4DDpHTeOwpJEuDt8lWVcujhYYSFGLluC+9es2PyLjm+jjq3IeRBQbwBtPLJE/lkuHuGHr8uQLgmJRA==
 
 "@rollup/plugin-babel@^5.2.0":
   version "5.3.1"
@@ -15827,13 +15827,13 @@ react-resize-detector@^7.1.2:
   dependencies:
     lodash "^4.17.21"
 
-react-router-dom@^6.1.0, react-router-dom@^6.4.3:
-  version "6.4.3"
-  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.4.3.tgz#70093b5f65f85f1df9e5d4182eb7ff3a08299275"
-  integrity sha512-MiaYQU8CwVCaOfJdYvt84KQNjT78VF0TJrA17SIQgNHRvLnXDJO6qsFqq8F/zzB1BWZjCFIrQpu4QxcshitziQ==
+react-router-dom@6.7.0, react-router-dom@^6.1.0:
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.7.0.tgz#0249f4ca4eb704562b8b0ff29caeb928c3a6ed38"
+  integrity sha512-jQtXUJyhso3kFw430+0SPCbmCmY1/kJv8iRffGHwHy3CkoomGxeYzMkmeSPYo6Egzh3FKJZRAL22yg5p2tXtfg==
   dependencies:
-    "@remix-run/router" "1.0.3"
-    react-router "6.4.3"
+    "@remix-run/router" "1.3.0"
+    react-router "6.7.0"
 
 react-router-tabs@^1.1.1:
   version "1.3.2"
@@ -15843,12 +15843,12 @@ react-router-tabs@^1.1.1:
     "@babel/runtime" "^7.4.3"
     prop-types "^15.7.2"
 
-react-router@6.4.3, react-router@^6.1.0, react-router@^6.4.3:
-  version "6.4.3"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.4.3.tgz#9ed3ee4d6e95889e9b075a5d63e29acc7def0d49"
-  integrity sha512-BT6DoGn6aV1FVP5yfODMOiieakp3z46P1Fk0RNzJMACzE7C339sFuHebfvWtnB4pzBvXXkHP2vscJzWRuUjTtA==
+react-router@6.7.0, react-router@^6.1.0:
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.7.0.tgz#db262684c13b5c2970694084ae9e8531718a0681"
+  integrity sha512-KNWlG622ddq29MAM159uUsNMdbX8USruoKnwMMQcs/QWZgFUayICSn2oB7reHce1zPj6CG18kfkZIunSSRyGHg==
   dependencies:
-    "@remix-run/router" "1.0.3"
+    "@remix-run/router" "1.3.0"
 
 [email protected]:
   version "5.0.1"