Skip to content

Commit f6202c0

Browse files
WRR-28851: Update major dependency versions - samples (#255)
* Fixes made for react-router updates * Small fix * Merge fixes
1 parent b378812 commit f6202c0

File tree

7 files changed

+9
-11
lines changed

7 files changed

+9
-11
lines changed

agate/all-samples/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"react": "^19.1.0",
4040
"react-dom": "^19.1.0",
4141
"react-redux": "^9.2.0",
42-
"react-router-dom": "^v6.30.1",
42+
"react-router": "^7.6.2",
4343
"redux": "^5.0.1",
4444
"redux-thunk": "^3.1.0"
4545
}

agate/all-samples/src/App/App.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ import Scroller from '@enact/agate/Scroller';
22
import ThemeDecorator from '@enact/agate/ThemeDecorator';
33
import kind from '@enact/core/kind';
44
import PropTypes from 'prop-types';
5-
import {HashRouter, Route, Routes, useNavigate} from 'react-router-dom';
6-
import {StaticRouter} from 'react-router-dom/server';
5+
import {HashRouter, Route, Routes, StaticRouter, useNavigate} from 'react-router';
76

87
import SampleItem from '../components/SampleItem';
98
import ButtonToSamples from '../components/ButtonToSamples';

agate/all-samples/src/components/ButtonToSamples/ButtonToSamples.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import Button from '@enact/agate/Button';
2-
import {Link} from 'react-router-dom';
2+
import {Link} from 'react-router';
33

44
import css from './ButtonToSamples.module.less';
55

66
const ButtonToSamples = () => (
77
<div className={css.buttonContainer}>
8-
<Link to="/" className={css.backLink}>
8+
<Link to="../" className={css.backLink}>
99
<Button
1010
className={css.backButton}
1111
style={{zIndex: 1}}

ui/all-samples/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"react": "^19.1.0",
3838
"react-dom": "^19.1.0",
3939
"react-redux": "^9.2.0",
40-
"react-router-dom": "^6.30.1",
40+
"react-router": "^7.6.2",
4141
"redux": "^5.0.1",
4242
"redux-thunk": "^3.1.0"
4343
}

ui/all-samples/src/App/App.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
33
import {routes} from '../index';
44
import SampleItem from '../components/SampleItem';
55
import Scroller from '@enact/ui/Scroller';
6-
import {useNavigate} from 'react-router-dom';
6+
import {useNavigate} from 'react-router';
77

88
import css from './App.module.less';
99

ui/all-samples/src/components/ButtonToSamples/ButtonToSamples.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import Button from '@enact/ui/Button';
2-
import {Link} from 'react-router-dom';
2+
import {Link} from 'react-router';
33

44
import css from './ButtonToSamples.module.less';
55

66
const ButtonToSamples = () => (
77
<div className={css.buttonContainer}>
8-
<Link to="/" className={css.backLink}>
8+
<Link to="../" className={css.backLink}>
99
<Button
1010
className={css.backButton}
1111
style={{zIndex: 1}}

ui/all-samples/src/index.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/* global ENACT_PACK_ISOMORPHIC */
2-
import {HashRouter, Route, Routes} from 'react-router-dom';
3-
import {StaticRouter} from 'react-router-dom/server';
2+
import {HashRouter, Route, Routes, StaticRouter} from 'react-router';
43
import {createRoot, hydrateRoot} from 'react-dom/client';
54

65
import PatternListDetails from '../../pattern-list-details/src/App';

0 commit comments

Comments
 (0)