temp: testing react router support

Merge branch 'master' of github.com:openedx/frontend-component-header into Ali-Abbas/upgrade-react-router
feat: upgrade react router to v6
2023-08-16 12:42:35 +05:00 · 2023-08-08 15:08:32 +05:00 · 2023-03-16 13:36:37 +05:00
2 changed files with 37 additions and 51 deletions
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,14 +18,13 @@
        "axios-mock-adapter": "1.21.5",
        "babel-polyfill": "6.26.0",
        "react-responsive": "8.2.0",
-        "react-router-dom": "5.3.4",
        "react-transition-group": "4.4.5"
      },
      "devDependencies": {
        "@edx/brand": "npm:@edx/brand-openedx@1.2.0",
        "@edx/browserslist-config": "^1.1.1",
        "@edx/frontend-build": "12.9.4",
-        "@edx/frontend-platform": "4.6.1",
+        "@edx/frontend-platform": "5.0.0",
        "@edx/reactifex": "^2.1.1",
        "@testing-library/dom": "9.3.1",
        "@testing-library/jest-dom": "5.17.0",
@@ -39,13 +38,13 @@
        "react": "17.0.2",
        "react-dom": "17.0.2",
        "react-redux": "7.2.9",
-        "react-router-dom": "5.3.4",
+        "react-router-dom": "6.14.2",
        "react-test-renderer": "17.0.2",
        "redux": "4.2.1",
        "redux-saga": "1.2.3"
      },
      "peerDependencies": {
-        "@edx/frontend-platform": "^4.0.0",
+        "@edx/frontend-platform": "^4.0.0 || ^5.0.0",
        "prop-types": "^15.5.10",
        "react": "^16.9.0 || ^17.0.0",
        "react-dom": "^16.9.0 || ^17.0.0"
@@ -3367,9 +3366,9 @@
      }
    },
    "node_modules/@edx/frontend-platform": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/@edx/frontend-platform/-/frontend-platform-4.6.1.tgz",
-      "integrity": "sha512-Fi/k7iZlFYs8qCsAAVz6Dseyzb9bJGh3r6iKUCiAq4emUl9UA/LfFHe4fDZcA5trVIkohhdLqrDu1U3UksY/5w==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@edx/frontend-platform/-/frontend-platform-5.0.0.tgz",
+      "integrity": "sha512-DD9/B4rnC3BKPiWlbEFF1JIYFbWC6vUBKTyN8sf4khi4DNhhWhsobk+iNeCWNzF9UgCPRbniIqesdV1F9NXNZw==",
      "dev": true,
      "dependencies": {
        "@cospired/i18n-iso-languages": "4.1.0",
@@ -3403,7 +3402,7 @@
        "react": "^16.9.0 || ^17.0.0",
        "react-dom": "^16.9.0 || ^17.0.0",
        "react-redux": "^7.1.1",
-        "react-router-dom": "^5.0.1",
+        "react-router-dom": "^6.0.0",
        "redux": "^4.0.4"
      }
    },
@@ -5471,6 +5470,15 @@
      "integrity": "sha512-1dgmkh+3so0+LlBWRhGA33ua4MYr7tUOj+a9Si28vUi0IUFNbff1T3sgpeDJI/LaC75bBYnQ0A3wXjn0OrRNBA==",
      "dev": true
    },
+    "node_modules/@remix-run/router": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.7.2.tgz",
+      "integrity": "sha512-7Lcn7IqGMV+vizMPoEl5F0XDshcdDYtMI6uJLQdQz5CfZAwy3vvGKYSUk789qndt5dEC4HfSjviSYlSoHGL2+A==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
    "node_modules/@restart/context": {
      "version": "2.1.4",
      "resolved": "https://registry.npmjs.org/@restart/context/-/context-2.1.4.tgz",
@@ -18832,15 +18840,6 @@
      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
      "dev": true
    },
-    "node_modules/path-to-regexp": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
-      "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
-      "dev": true,
-      "dependencies": {
-        "isarray": "0.0.1"
-      }
-    },
    "node_modules/path-type": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
@@ -20598,49 +20597,37 @@
      }
    },
    "node_modules/react-router": {
-      "version": "5.3.4",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.3.4.tgz",
-      "integrity": "sha512-Ys9K+ppnJah3QuaRiLxk+jDWOR1MekYQrlytiXxC1RyfbdsZkS5pvKAzCCr031xHixZwpnsYNT5xysdFHQaYsA==",
+      "version": "6.14.2",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.14.2.tgz",
+      "integrity": "sha512-09Zss2dE2z+T1D03IheqAFtK4UzQyX8nFPWx6jkwdYzGLXd5ie06A6ezS2fO6zJfEb/SpG6UocN2O1hfD+2urQ==",
      "dev": true,
      "dependencies": {
-        "@babel/runtime": "^7.12.13",
-        "history": "^4.9.0",
-        "hoist-non-react-statics": "^3.1.0",
-        "loose-envify": "^1.3.1",
-        "path-to-regexp": "^1.7.0",
-        "prop-types": "^15.6.2",
-        "react-is": "^16.6.0",
-        "tiny-invariant": "^1.0.2",
-        "tiny-warning": "^1.0.0"
+        "@remix-run/router": "1.7.2"
+      },
+      "engines": {
+        "node": ">=14"
      },
      "peerDependencies": {
-        "react": ">=15"
+        "react": ">=16.8"
      }
    },
    "node_modules/react-router-dom": {
-      "version": "5.3.4",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.4.tgz",
-      "integrity": "sha512-m4EqFMHv/Ih4kpcBCONHbkT68KoAeHN4p3lAGoNryfHi0dMy0kCzEZakiKRsvg5wHZ/JLrLW8o8KomWiz/qbYQ==",
+      "version": "6.14.2",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.14.2.tgz",
+      "integrity": "sha512-5pWX0jdKR48XFZBuJqHosX3AAHjRAzygouMTyimnBPOLdY3WjzUSKhus2FVMihUFWzeLebDgr4r8UeQFAct7Bg==",
      "dev": true,
      "dependencies": {
-        "@babel/runtime": "^7.12.13",
-        "history": "^4.9.0",
-        "loose-envify": "^1.3.1",
-        "prop-types": "^15.6.2",
-        "react-router": "5.3.4",
-        "tiny-invariant": "^1.0.2",
-        "tiny-warning": "^1.0.0"
+        "@remix-run/router": "1.7.2",
+        "react-router": "6.14.2"
+      },
+      "engines": {
+        "node": ">=14"
      },
      "peerDependencies": {
-        "react": ">=15"
+        "react": ">=16.8",
+        "react-dom": ">=16.8"
      }
    },
-    "node_modules/react-router/node_modules/react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-      "dev": true
-    },
    "node_modules/react-shallow-renderer": {
      "version": "16.15.0",
      "resolved": "https://registry.npmjs.org/react-shallow-renderer/-/react-shallow-renderer-16.15.0.tgz",
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
    "@edx/brand": "npm:@edx/brand-openedx@1.2.0",
    "@edx/browserslist-config": "^1.1.1",
    "@edx/frontend-build": "12.9.4",
-    "@edx/frontend-platform": "4.6.1",
+    "@edx/frontend-platform": "5.0.0",
    "@edx/reactifex": "^2.1.1",
    "@testing-library/dom": "9.3.1",
    "@testing-library/jest-dom": "5.17.0",
@@ -50,7 +50,7 @@
    "react": "17.0.2",
    "react-dom": "17.0.2",
    "react-redux": "7.2.9",
-    "react-router-dom": "5.3.4",
+    "react-router-dom": "6.14.2",
    "react-test-renderer": "17.0.2",
    "redux": "4.2.1",
    "redux-saga": "1.2.3"
@@ -65,11 +65,10 @@
    "axios-mock-adapter": "1.21.5",
    "babel-polyfill": "6.26.0",
    "react-responsive": "8.2.0",
-    "react-router-dom": "5.3.4",
    "react-transition-group": "4.4.5"
  },
  "peerDependencies": {
-    "@edx/frontend-platform": "^4.0.0",
+    "@edx/frontend-platform": "^4.0.0 || ^5.0.0",
    "prop-types": "^15.5.10",
    "react": "^16.9.0 || ^17.0.0",
    "react-dom": "^16.9.0 || ^17.0.0"
Author	SHA1	Message	Date
Syed Ali Abbas Zaidi	0f3c4d50b5	temp: testing react router support	2023-08-16 12:42:35 +05:00
Syed Ali Abbas Zaidi	aae3c2553b	Merge branch 'master' of github.com:openedx/frontend-component-header into Ali-Abbas/upgrade-react-router	2023-08-08 15:08:32 +05:00
Syed Ali Abbas Zaidi	55fe69473d	feat: upgrade react router to v6	2023-03-16 13:36:37 +05:00