Skip to content

Commit ee80ee1

Browse files
authored
Merge branch 'main' into renovate/growthbook-growthbook-react-1.x
2 parents 5a2dcac + 8655476 commit ee80ee1

File tree

25 files changed

+762
-305
lines changed

25 files changed

+762
-305
lines changed

.changeset/large-moose-drop.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@scaleway/eslint-config-react": major
3+
---
4+
5+
remove usage of eslint-config-airbnb-typescript as it's not maintain anymore, migrate to stylistic package

.changeset/renovate-368d4fa.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@scaleway/eslint-config-react': patch
3+
---
4+
5+
Updated dependency `@eslint/eslintrc` to `3.2.0`.

.changeset/renovate-e2ad89a.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@scaleway/eslint-config-react': patch
3+
---
4+
5+
Updated dependency `typescript` to `5.7.2`.

.changeset/renovate-f38caec.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@scaleway/use-query-params': patch
3+
---
4+
5+
Updated dependency `react-router-dom` to `6.28.0`.

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- run: pnpm install
5454
- run: pnpm run build
5555
- run: pnpm run test:coverage
56-
- uses: codecov/codecov-action@v4.6.0
56+
- uses: codecov/codecov-action@v5.0.7
5757
with:
5858
files: packages/**/coverage/cobertura-coverage.xml
5959
token: ${{ secrets.CODECOV_TOKEN }}

eslint.config.mjs

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,17 @@ export default [
1515
],
1616
},
1717
{
18+
settings: {
19+
react: {
20+
pragma: 'React', // Pragma to use, default to "React"
21+
fragment: 'Fragment', // Fragment to use (may be a property of <pragma>), default to "Fragment"
22+
version: 'detect', // React version. "detect" automatically picks the version you have installed.
23+
// You can also use `16.0`, `16.3`, etc, if you want to override the detected value.
24+
// Defaults to the "defaultVersion" setting and warns if missing, and to "detect" in the future
25+
defaultVersion: '18', // Default React version to use when the version you have installed cannot be detected.
26+
// If not provided, defaults to the latest React version.
27+
},
28+
},
1829
languageOptions: {
1930
globals: {
2031
...globals.browser,
@@ -65,23 +76,6 @@ export default [
6576
project: ['tsconfig.json'],
6677
},
6778
},
68-
})),
69-
...scwTypescript.map(config => ({
70-
...config,
71-
files: [
72-
'packages/changesets-renovate/**/*.ts{x,}',
73-
'packages/validate-icu-locales/**/*.ts{x,}',
74-
'**/__tests__/**/*.ts{x,}',
75-
],
76-
77-
languageOptions: {
78-
ecmaVersion: 5,
79-
sourceType: 'script',
80-
81-
parserOptions: {
82-
project: ['tsconfig.json'],
83-
},
84-
},
8579

8680
rules: {
8781
...config.rules,
@@ -93,7 +87,6 @@ export default [
9387

9488
{
9589
files: [
96-
'packages/jest-helpers/**/*.ts{x,}',
9790
'**/__tests__/**/*.ts{x,}',
9891
'**/vitest.setup.ts',
9992
'**/*.config.ts',

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"private": true,
44
"workspaces": ["packages/*"],
55
"type": "module",
6-
"packageManager": "[email protected].2",
6+
"packageManager": "[email protected].4",
77
"engines": {
88
"node": ">=20.x",
99
"pnpm": ">=9.x"
@@ -20,7 +20,7 @@
2020
"@changesets/cli": "2.27.10",
2121
"@commitlint/cli": "19.6.0",
2222
"@commitlint/config-conventional": "19.6.0",
23-
"@eslint/eslintrc": "3.1.0",
23+
"@eslint/eslintrc": "3.2.0",
2424
"@scaleway/eslint-config-react": "workspace:*",
2525
"@scaleway/tsconfig": "workspace:*",
2626
"@testing-library/jest-dom": "6.6.3",
@@ -29,22 +29,22 @@
2929
"@types/node": "22.9.4",
3030
"@types/react": "18.3.12",
3131
"@types/react-dom": "18.3.1",
32-
"@vitejs/plugin-react": "4.3.3",
32+
"@vitejs/plugin-react": "4.3.4",
3333
"@vitest/coverage-istanbul": "2.1.6",
3434
"browserslist": "4.24.2",
3535
"builtin-modules": "4.0.0",
3636
"cross-env": "7.0.3",
3737
"esbuild-plugin-browserslist": "0.15.0",
38-
"eslint": "9.13.0",
39-
"globals": "15.12.0",
40-
"happy-dom": "15.11.6",
38+
"eslint": "9.16.0",
39+
"globals": "15.13.0",
40+
"happy-dom": "15.11.7",
4141
"husky": "9.1.7",
4242
"lint-staged": "15.2.10",
4343
"mockdate": "3.0.5",
4444
"read-pkg": "9.0.1",
4545
"shx": "0.3.4",
4646
"tstyche": "3.0.0",
47-
"typescript": "5.6.3",
47+
"typescript": "5.7.2",
4848
"vite": "5.4.11",
4949
"vitest": "2.1.6",
5050
"vitest-localstorage-mock": "0.1.2",

packages/cookie-consent/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
"cookie": "1.0.1"
4545
},
4646
"devDependencies": {
47-
"@types/cookie": "0.6.0",
4847
"react": "18.3.1",
4948
"@scaleway/use-segment": "workspace:*"
5049
},

packages/cookie-consent/src/CookieConsentProvider/__tests__/index.test.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ const integrations: Integrations = [
4444
},
4545
]
4646

47-
const mockUseSegmentIntegrations = vi.fn<
48-
() => ReturnType<typeof useSegmentIntegrations>
49-
>(() => ({
47+
type MockSegmentIntegrations = () => ReturnType<typeof useSegmentIntegrations>
48+
49+
const mockUseSegmentIntegrations = vi.fn<MockSegmentIntegrations>(() => ({
5050
integrations,
5151
isLoaded: true,
5252
}))

packages/cookie-consent/src/CookieConsentProvider/types.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ import type { CategoryKind } from './helpers'
33
export type { CategoryKind }
44
export type Consent = { [K in CategoryKind]: boolean }
55

6-
type Integration = { category: CategoryKind; name: string }
6+
type Integration = {
7+
category: CategoryKind
8+
name: string
9+
}
710

811
export type Integrations = Integration[]
912

0 commit comments

Comments
 (0)