Skip to content

Commit 23e7961

Browse files
fix(vite): config (#2338)
Co-authored-by: Alexandre Philibeaux <[email protected]>
1 parent 774ce56 commit 23e7961

File tree

20 files changed

+766
-116
lines changed

20 files changed

+766
-116
lines changed

package.json

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"name": "root",
33
"private": true,
4-
"workspaces": ["packages/*"],
4+
"workspaces": [
5+
"packages/*"
6+
],
57
"type": "module",
68
"packageManager": "[email protected]",
79
"engines": {
@@ -45,7 +47,7 @@
4547
"shx": "0.3.4",
4648
"tstyche": "3.1.1",
4749
"typescript": "5.7.2",
48-
"vite": "5.4.11",
50+
"vite": "6.0.3",
4951
"vitest": "2.1.8",
5052
"vitest-localstorage-mock": "0.1.2",
5153
"wait-for-expect": "3.0.2"
@@ -58,6 +60,7 @@
5860
"format": "biome format --write .",
5961
"test": "pnpm recursive run test:unit",
6062
"test:coverage": "pnpm run test --coverage",
63+
"typecheck": "pnpm tsc --noEmit",
6164
"test:types": "tstyche",
6265
"release": "pnpm build && pnpm changeset publish",
6366
"prepare": "husky install"
@@ -72,13 +75,24 @@
7275
}
7376
},
7477
"commitlint": {
75-
"extends": ["@commitlint/config-conventional"]
78+
"extends": [
79+
"@commitlint/config-conventional"
80+
]
7681
},
7782
"lint-staged": {
78-
"*.(j|t)s?(x)": ["biome format --write .", "eslint --fix"],
79-
"*.json": ["biome format --write ."],
80-
"*.y(a)ml,": ["pnpm dlx prettier --write '**/*.{yml,yaml}' --single-quote"],
81-
"*.mdx": ["biome format --write ."]
83+
"*.(j|t)s?(x)": [
84+
"biome format --write .",
85+
"eslint --fix"
86+
],
87+
"*.json": [
88+
"biome format --write ."
89+
],
90+
"*.y(a)ml,": [
91+
"pnpm dlx prettier --write '**/*.{yml,yaml}' --single-quote"
92+
],
93+
"*.mdx": [
94+
"biome format --write ."
95+
]
8296
},
8397
"config": {
8498
"commitizen": {

packages/changesets-renovate/vite.config.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
import { defineConfig, mergeConfig } from 'vite'
22
import { defaultConfig } from '../../vite.config'
3+
import { defaultConfig as vitestDefaultConfig } from '../../vitest.config'
34

4-
export default mergeConfig(defineConfig(defaultConfig), {
5+
const config = {
6+
...defineConfig(defaultConfig),
7+
...vitestDefaultConfig,
8+
}
9+
10+
export default mergeConfig(config, {
511
build: {
612
ssr: true,
713
target: ['node20'],

packages/cookie-consent/vite.config.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
import { defineConfig, mergeConfig } from 'vite'
22
import { defaultConfig } from '../../vite.config'
3+
import { defaultConfig as vitestDefaultConfig } from '../../vitest.config'
34

4-
export default mergeConfig(defineConfig(defaultConfig), {
5+
const config = {
6+
...defineConfig(defaultConfig),
7+
...vitestDefaultConfig,
8+
}
9+
10+
export default mergeConfig(config, {
511
build: {
612
lib: {
713
formats: ['es', 'cjs'],

packages/outdated-browser/vite.config.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
import { defineConfig, mergeConfig } from 'vite'
22
import { defaultConfig } from '../../vite.config'
3+
import { defaultConfig as vitestDefaultConfig } from '../../vitest.config'
34

4-
export default mergeConfig(defineConfig(defaultConfig), {
5+
const config = {
6+
...defineConfig(defaultConfig),
7+
...vitestDefaultConfig,
8+
}
9+
10+
export default mergeConfig(config, {
511
test: {
612
// environment: 'jsdom',
713
setupFiles: ['./vitest.setup.ts'],

packages/random-name/vite.config.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
import { defineConfig, mergeConfig } from 'vite'
22
import { defaultConfig } from '../../vite.config'
3+
import { defaultConfig as vitestDefaultConfig } from '../../vitest.config'
34

4-
export default mergeConfig(defineConfig(defaultConfig), {
5+
const config = {
6+
...defineConfig(defaultConfig),
7+
...vitestDefaultConfig,
8+
}
9+
10+
export default mergeConfig(config, {
511
build: {
612
lib: {
713
formats: ['es', 'cjs'],

packages/regex/vite.config.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
import { defineConfig, mergeConfig } from 'vite'
22
import { defaultConfig } from '../../vite.config'
3+
import { defaultConfig as vitestDefaultConfig } from '../../vitest.config'
34

4-
export default mergeConfig(defineConfig(defaultConfig), {
5+
const config = {
6+
...defineConfig(defaultConfig),
7+
...vitestDefaultConfig,
8+
}
9+
10+
export default mergeConfig(config, {
511
build: {
612
target: ['node20'],
713
},

packages/use-dataloader/vite.config.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
import { defineConfig, mergeConfig } from 'vite'
22
import { defaultConfig } from '../../vite.config'
3+
import { defaultConfig as vitestDefaultConfig } from '../../vitest.config'
34

4-
export default mergeConfig(defineConfig(defaultConfig), {
5+
const config = {
6+
...defineConfig(defaultConfig),
7+
...vitestDefaultConfig,
8+
}
9+
10+
export default mergeConfig(config, {
511
test: {
612
environment: 'jsdom',
713
setupFiles: ['./vitest.setup.ts'],

packages/use-growthbook/vite.config.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
import { defineConfig, mergeConfig } from 'vite'
22
import { defaultConfig } from '../../vite.config'
3+
import { defaultConfig as vitestDefaultConfig } from '../../vitest.config'
34

4-
export default mergeConfig(defineConfig(defaultConfig), {
5+
const config = {
6+
...defineConfig(defaultConfig),
7+
...vitestDefaultConfig,
8+
}
9+
10+
export default mergeConfig(config, {
511
build: {
612
lib: {
713
formats: ['es', 'cjs'],

packages/use-i18n/src/__tests__/usei18n.test.tsx

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,20 @@ type OnTranslateError = ComponentProps<typeof I18n>['onTranslateError']
2525
const isDefaultLocalesSupported = (locale: string): locale is Locales =>
2626
ListLocales.includes(locale as Locales)
2727

28+
const load = async ({
29+
locale,
30+
namespace,
31+
}: {
32+
locale: string
33+
namespace: string
34+
}) =>
35+
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
36+
import(`./locales/namespaces/${locale}/${namespace}.json`)
37+
38+
const CustomComponent = ({ children }: { children: ReactNode }) => (
39+
<p style={{ fontWeight: 'bold' }}>{children}</p>
40+
)
41+
2842
const defaultOnTranslateError: OnTranslateError = () => {}
2943

3044
const wrapper =
@@ -148,16 +162,6 @@ describe('i18n hook', () => {
148162
})
149163

150164
it('should use specific load on useTranslation', async () => {
151-
const load = async ({
152-
locale,
153-
namespace,
154-
}: {
155-
locale: string
156-
namespace: string
157-
}) =>
158-
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
159-
import(`./locales/namespaces/${locale}/${namespace}.json`)
160-
161165
const { result } = renderHook(
162166
() => useTranslation<NamespaceLocale, Locales>(['user', 'profile'], load),
163167
{
@@ -206,16 +210,6 @@ describe('i18n hook', () => {
206210
})
207211

208212
it("should use specific load and fallback default local if the key doesn't exist", async () => {
209-
const load = async ({
210-
locale,
211-
namespace,
212-
}: {
213-
locale: string
214-
namespace: string
215-
}) =>
216-
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
217-
import(`./locales/namespaces/${locale}/${namespace}.json`)
218-
219213
const { result } = renderHook(
220214
() => useTranslation<NamespaceLocale, Locales>(['user'], load),
221215
{
@@ -272,21 +266,24 @@ describe('i18n hook', () => {
272266
wrapper: wrapper({ defaultLocale: 'en' }),
273267
},
274268
)
275-
const CustomComponent = ({ children }: { children: ReactNode }) => (
276-
<p style={{ fontWeight: 'bold' }}>{children}</p>
277-
)
278269

279270
await waitFor(() => {
280271
expect(
281-
result.current.t('with.identifier', { identifier: <b>My resource</b> }),
282-
).toEqual(['Are you sure you want to delete ', <b>My resource</b>, '?'])
272+
result.current.t('with.identifier', {
273+
identifier: <b key="1">My resource</b>,
274+
}),
275+
).toEqual([
276+
'Are you sure you want to delete ',
277+
<b key="1">My resource</b>,
278+
'?',
279+
])
283280
expect(
284281
result.current.t('with.identifier', {
285-
identifier: <CustomComponent>My resource</CustomComponent>,
282+
identifier: <CustomComponent key="1">My resource</CustomComponent>,
286283
}),
287284
).toEqual([
288285
'Are you sure you want to delete ',
289-
<CustomComponent>My resource</CustomComponent>,
286+
<CustomComponent key="1">My resource</CustomComponent>,
290287
'?',
291288
])
292289
})
@@ -581,12 +578,12 @@ describe('i18n hook', () => {
581578
currency: 'EUR',
582579
style: 'currency',
583580
}),
584-
).toEqual('2,00\xa0€')
581+
).toEqual('2,00\u00A0€')
585582
})
586583

587584
expect(
588585
result.current.formatNumber(2, { currency: 'USD', style: 'currency' }),
589-
).toEqual('2,00\xa0$US')
586+
).toEqual('2,00\u00A0$US')
590587
})
591588

592589
it('should use formatList', async () => {

packages/use-i18n/vite.config.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
import { defineConfig, mergeConfig } from 'vite'
22
import { defaultConfig } from '../../vite.config'
3+
import { defaultConfig as vitestDefaultConfig } from '../../vitest.config'
34

4-
export default mergeConfig(defineConfig(defaultConfig), {
5+
const config = {
6+
...defineConfig(defaultConfig),
7+
...vitestDefaultConfig,
8+
}
9+
10+
export default mergeConfig(config, {
511
test: {
612
environment: 'jsdom',
713
setupFiles: ['./vitest.setup.ts'],

0 commit comments

Comments
 (0)