Skip to content

Commit ee4d0da

Browse files
authored
chore: fix dependabot security alerts (#5286)
* chore: fix dependabot security alerts * chore: address review — bound override ranges, patch brace-expansion 1.x and js-yaml
1 parent beee289 commit ee4d0da

5 files changed

Lines changed: 1035 additions & 1228 deletions

File tree

package.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,17 +106,19 @@
106106
"overrides": {
107107
"mdast-util-to-hast": ">=13.2.1",
108108
"flatted": ">=3.4.2",
109-
"undici": ">=7.24.0",
109+
"undici": ">=8.9.0 <9",
110110
"yaml@^2": ">=2.8.3",
111111
"picomatch@^2": ">=2.3.2",
112-
"brace-expansion@^2": ">=2.0.3",
113-
"brace-expansion@^5": ">=5.0.7",
112+
"brace-expansion@^1": ">=1.1.18 <2",
113+
"brace-expansion@^2": ">=2.1.4 <3",
114+
"brace-expansion@^5": ">=5.0.9 <6",
114115
"@isaacs/brace-expansion": ">=5.0.1",
115-
"fast-uri@^3": "^3.1.4",
116+
"fast-uri@^3": "^3.1.5",
116117
"sharp": ">=0.35.0",
117118
"json5@^1": ">=1.0.3",
118119
"diff": ">=4.0.4",
119-
"js-yaml@^4": "^4.2.0",
120+
"js-yaml@^3": "^3.15.1",
121+
"js-yaml@^4": "^4.3.1",
120122
"gray-matter>js-yaml": "^3.14.1",
121123
"lodash": ">=4.18.0",
122124
"webpackbar": "^7.0.0",
@@ -129,7 +131,7 @@
129131
"launch-editor": ">=2.14.1",
130132
"joi": ">=17.13.4",
131133
"qs": ">=6.15.2",
132-
"postcss": ">=8.5.10",
134+
"postcss": ">=8.5.23",
133135
"uuid": "^11.1.1",
134136
"react-stately": "3.47.0",
135137
"@types/react": ">=19.2.17",

packages/eds-core-react/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"react": "^19.2.8",
8989
"react-dom": "^19.2.8",
9090
"react-hook-form": "^7.82.0",
91-
"react-router-dom": "^7.18.1",
91+
"react-router": "^8.3.0",
9292
"remark-gfm": "^4.0.1",
9393
"rollup": "^4.62.3",
9494
"rollup-plugin-delete": "^3.0.2",

packages/eds-core-react/src/components/Tabs/Tabs.docs.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ The non-active `Tabs.Panels` are by default hidden with `display: none`, but can
9191
`Tabs.Tab` can be rendered as another component using the `as` prop.
9292
```tsx
9393
import { Tabs } from '@equinor/eds-core-react'
94-
import { Link, Outlet } from "react-router-dom";
94+
import { Link, Outlet } from "react-router";
9595

9696
<Tabs activeTab="/foo/bar">
9797
<Tabs.List>
@@ -101,7 +101,7 @@ import { Link, Outlet } from "react-router-dom";
101101
<Outlet />
102102
</Tabs>
103103
```
104-
Routes can of course be entered by other means than clicking tabs. Therefore, we can not reliably use `onChange` to send a new index to `activeTab`. Instead `activeTab` can take a string value that sets the correct active tab if it matches the `value` prop on a tab. In the below example we use `react-router-dom` and its provided functions to match the current path to the correct tab.
104+
Routes can of course be entered by other means than clicking tabs. Therefore, we can not reliably use `onChange` to send a new index to `activeTab`. Instead `activeTab` can take a string value that sets the correct active tab if it matches the `value` prop on a tab. In the below example we use `react-router` and its provided functions to match the current path to the correct tab.
105105
<Canvas of={ComponentStories.Router} />
106106

107107
### With search

packages/eds-core-react/src/components/Tabs/Tabs.stories.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
Link,
1515
matchPath,
1616
useLocation,
17-
} from 'react-router-dom'
17+
} from 'react-router'
1818

1919
const icons = {
2020
chevron_left,
@@ -203,7 +203,7 @@ WithPanels.decorators = [
203203
]
204204

205205
export const Router: StoryFn<TabsProps> = () => {
206-
/*import {MemoryRouter, Route, Routes, Link, matchPath, useLocation} from 'react-router-dom' */
206+
/*import {MemoryRouter, Route, Routes, Link, matchPath, useLocation} from 'react-router' */
207207
function CurrentRoute() {
208208
const location = useLocation()
209209
return <Typography>Current route: {location.pathname}</Typography>

0 commit comments

Comments
 (0)