Skip to content

Commit 4e7ae45

Browse files
Snyk upgrades (#3765)
* Typescript upgrade * Peer deps after typescript upgrade * Lockfile typescript * Upgrade @types/node * Styled components upgrade * Upgrade testing library react * Prettier upgrade * fix: type issue when extending styled-components theme * fix: adjust useGetLocale to work with the specific order of priority we want * fix: setup with types for styled-components * fix: correct eslint disable line * fix: ignore native select prettier issue for now * fix: trigger recalculation of the virtualized content when density changes * feat: add story to show data grid using virtualization with density change * chore: remove console log --------- Co-authored-by: Torleif Halseth <halseth.torleif@gmail.com>
1 parent 45b6f63 commit 4e7ae45

File tree

23 files changed

+793
-343
lines changed

23 files changed

+793
-343
lines changed

.prettierignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
README.md
33
packages/eds-icons/src/data.ts
44
packages/eds-tokens/build/*
5-
packages/eds-icons/src/data.ts
5+
packages/eds-icons/src/data.ts
6+
packages/eds-core-react/src/components/Select/NativeSelect.tsx

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
"@babel/runtime": "^7.26.0",
5454
"@types/jest": "^29.5.14",
5555
"@types/jest-axe": "^3.5.9",
56-
"@typescript-eslint/eslint-plugin": "^8.19.0",
57-
"@typescript-eslint/parser": "^8.19.0",
56+
"@typescript-eslint/eslint-plugin": "^8.29.1",
57+
"@typescript-eslint/parser": "^8.29.1",
5858
"babel-plugin-styled-components": "^2.1.4",
5959
"eslint": "^8.57.0",
6060
"eslint-config-prettier": "^9.1.0",
@@ -66,8 +66,8 @@
6666
"eslint-plugin-react-hooks": "^5.1.0",
6767
"eslint-plugin-testing-library": "^7.1.1",
6868
"jest-axe": "^9.0.0",
69-
"prettier": "3.4.2",
70-
"typescript": "^5.7.2"
69+
"prettier": "3.5.3",
70+
"typescript": "^5.8.2"
7171
},
7272
"browserslist": "last 2 Chrome versions, last 2 firefox versions, last 2 safari versions, last 2 edge versions, not dead",
7373
"packageManager": "pnpm@9.15.0+sha1.8bfdb6d72b4d5fdf87d21d27f2bfbe2b21dd2629"

packages/eds-core-react/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"@storybook/react-vite": "^8.4.7",
5656
"@testing-library/dom": "^10.4.0",
5757
"@testing-library/jest-dom": "^6.6.3",
58-
"@testing-library/react": "16.1.0",
58+
"@testing-library/react": "16.3.0",
5959
"@testing-library/user-event": "14.5.2",
6060
"@types/jest": "^29.5.14",
6161
"@types/ramda": "^0.30.2",
@@ -77,9 +77,9 @@
7777
"rollup-plugin-postcss": "^4.0.2",
7878
"rollup-preserve-directives": "^1.1.3",
7979
"storybook": "^8.4.7",
80-
"styled-components": "6.1.13",
80+
"styled-components": "6.1.17",
8181
"tsc-watch": "^6.2.1",
82-
"typescript": "^5.7.2"
82+
"typescript": "^5.8.2"
8383
},
8484
"peerDependencies": {
8585
"react": ">=16.8",

packages/eds-core-react/src/components/Datepicker/DatePicker.spec.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ describe('DatePicker', () => {
3232
const Comp = () => {
3333
const [date, setDate] = useState<Date | null>(new Date(2024, 4, 1))
3434
return (
35-
<I18nProvider locale={'en-US'}>
35+
<I18nProvider locale="en-US">
3636
<button type={'button'} onClick={() => setDate(null)}>
3737
Reset
3838
</button>
Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
import { useLocale } from 'react-aria'
22

33
export const useGetLocale = (locale?: string) => {
4-
const { locale: externalLocale } = useLocale()
5-
// react-aria defaults to navigator.language if no locale is provided. If these are equal, we override by using the system default locale
6-
const defaultLocale =
7-
(typeof navigator !== 'undefined' && navigator.language) || 'en-US'
8-
const fallbackLocale = new Intl.DateTimeFormat().resolvedOptions().locale
9-
return (
10-
locale ??
11-
(externalLocale === defaultLocale ? undefined : externalLocale) ??
12-
fallbackLocale
13-
)
4+
const { locale: currentLocale } = useLocale()
5+
// Priority:
6+
// 1. Explicitly passed locale prop
7+
// 2. Locale from I18nProvider
8+
// 3. Fallback to browser's default
9+
const browserLocale = new Intl.DateTimeFormat().resolvedOptions().locale
10+
return locale ?? currentLocale ?? browserLocale
1411
}
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
// import original module declarations
21
import 'styled-components'
3-
import { ComponentToken } from '@equinor/eds-tokens'
4-
// and extend them!
2+
import type { ComponentToken } from '@equinor/eds-tokens'
3+
54
declare module 'styled-components' {
65
// eslint-disable-next-line @typescript-eslint/no-empty-object-type
7-
export interface DefaultTheme extends ComponentToken {}
6+
export interface DefaultTheme extends ComponentToken {
7+
// You can add any additional theme properties here if needed
8+
}
89
}

packages/eds-core-react/tsconfig.test.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,12 @@
55
"noEmit": true,
66
"isolatedModules": true,
77
"baseUrl": ".",
8-
"types": ["@testing-library/jest-dom"]
8+
"types": ["@testing-library/jest-dom", "styled-components"]
99
},
10-
"include": ["src/**/*.test.ts*", "./jest.setup.ts"],
10+
"include": [
11+
"src/**/*.test.ts*",
12+
"./jest.setup.ts",
13+
"src/components/styled.d.ts" // Make sure styled.d.ts is included for tests
14+
],
1115
"exclude": ["node_modules", "src/**/*.stories.ts*", "src/stories", "src/test"]
1216
}

packages/eds-data-grid-react/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@
5050
"@storybook/react-vite": "^8.4.7",
5151
"@testing-library/dom": "^10.4.0",
5252
"@testing-library/jest-dom": "^6.6.3",
53-
"@testing-library/react": "16.1.0",
53+
"@testing-library/react": "16.3.0",
5454
"@testing-library/user-event": "^14.5.2",
5555
"@types/jest": "^29.5.14",
56-
"@types/node": "22.10.5",
56+
"@types/node": "^22.13.14",
5757
"@types/ramda": "^0.30.2",
5858
"@types/react": "^18.3.3",
5959
"@types/react-dom": "^18.3.0",
@@ -71,11 +71,11 @@
7171
"rollup-plugin-delete": "^2.1.0",
7272
"rollup-plugin-postcss": "^4.0.2",
7373
"storybook": "^8.4.7",
74-
"styled-components": "6.1.13",
74+
"styled-components": "6.1.17",
7575
"ts-jest": "29.2.5",
7676
"ts-node": "10.9.2",
7777
"tsc-watch": "^6.2.1",
78-
"typescript": "~5.7.2"
78+
"typescript": "~5.8.2"
7979
},
8080
"homepage": "https://eds.equinor.com",
8181
"repository": {

0 commit comments

Comments
 (0)