fix(vite): config (#2338)

Co-authored-by: Alexandre Philibeaux <[email protected]>

package.json

@@ -1,7 +1,9 @@
 {
   "name": "root",
   "private": true,
-  "workspaces": ["packages/*"],
+  "workspaces": [
+    "packages/*"
+  ],
   "type": "module",
   "packageManager": "[email protected]",
   "engines": {
@@ -45,7 +47,7 @@
     "shx": "0.3.4",
     "tstyche": "3.1.1",
     "typescript": "5.7.2",
-    "vite": "5.4.11",
+    "vite": "6.0.3",
     "vitest": "2.1.8",
     "vitest-localstorage-mock": "0.1.2",
     "wait-for-expect": "3.0.2"
@@ -58,6 +60,7 @@
     "format": "biome format --write .",
     "test": "pnpm recursive run test:unit",
     "test:coverage": "pnpm run test --coverage",
+    "typecheck": "pnpm tsc --noEmit",
     "test:types": "tstyche",
     "release": "pnpm build && pnpm changeset publish",
     "prepare": "husky install"
@@ -72,13 +75,24 @@
     }
   },
   "commitlint": {
-    "extends": ["@commitlint/config-conventional"]
+    "extends": [
+      "@commitlint/config-conventional"
+    ]
   },
   "lint-staged": {
-    "*.(j|t)s?(x)": ["biome format --write .", "eslint --fix"],
-    "*.json": ["biome format --write ."],
-    "*.y(a)ml,": ["pnpm dlx prettier --write '**/*.{yml,yaml}' --single-quote"],
-    "*.mdx": ["biome format --write ."]
+    "*.(j|t)s?(x)": [
+      "biome format --write .",
+      "eslint --fix"
+    ],
+    "*.json": [
+      "biome format --write ."
+    ],
+    "*.y(a)ml,": [
+      "pnpm dlx prettier --write '**/*.{yml,yaml}' --single-quote"
+    ],
+    "*.mdx": [
+      "biome format --write ."
+    ]
   },
   "config": {
     "commitizen": {

packages/changesets-renovate/vite.config.ts

@@ -1,7 +1,13 @@
 import { defineConfig, mergeConfig } from 'vite'
 import { defaultConfig } from '../../vite.config'
+import { defaultConfig as vitestDefaultConfig } from '../../vitest.config'
 
-export default mergeConfig(defineConfig(defaultConfig), {
+const config = {
+  ...defineConfig(defaultConfig),
+  ...vitestDefaultConfig,
+}
+
+export default mergeConfig(config, {
   build: {
     ssr: true,
     target: ['node20'],

packages/cookie-consent/vite.config.ts

@@ -1,7 +1,13 @@
 import { defineConfig, mergeConfig } from 'vite'
 import { defaultConfig } from '../../vite.config'
+import { defaultConfig as vitestDefaultConfig } from '../../vitest.config'
 
-export default mergeConfig(defineConfig(defaultConfig), {
+const config = {
+  ...defineConfig(defaultConfig),
+  ...vitestDefaultConfig,
+}
+
+export default mergeConfig(config, {
   build: {
     lib: {
       formats: ['es', 'cjs'],

packages/outdated-browser/vite.config.ts

@@ -1,7 +1,13 @@
 import { defineConfig, mergeConfig } from 'vite'
 import { defaultConfig } from '../../vite.config'
+import { defaultConfig as vitestDefaultConfig } from '../../vitest.config'
 
-export default mergeConfig(defineConfig(defaultConfig), {
+const config = {
+  ...defineConfig(defaultConfig),
+  ...vitestDefaultConfig,
+}
+
+export default mergeConfig(config, {
   test: {
     // environment: 'jsdom',
     setupFiles: ['./vitest.setup.ts'],

packages/random-name/vite.config.ts

@@ -1,7 +1,13 @@
 import { defineConfig, mergeConfig } from 'vite'
 import { defaultConfig } from '../../vite.config'
+import { defaultConfig as vitestDefaultConfig } from '../../vitest.config'
 
-export default mergeConfig(defineConfig(defaultConfig), {
+const config = {
+  ...defineConfig(defaultConfig),
+  ...vitestDefaultConfig,
+}
+
+export default mergeConfig(config, {
   build: {
     lib: {
       formats: ['es', 'cjs'],

packages/regex/vite.config.ts

@@ -1,7 +1,13 @@
 import { defineConfig, mergeConfig } from 'vite'
 import { defaultConfig } from '../../vite.config'
+import { defaultConfig as vitestDefaultConfig } from '../../vitest.config'
 
-export default mergeConfig(defineConfig(defaultConfig), {
+const config = {
+  ...defineConfig(defaultConfig),
+  ...vitestDefaultConfig,
+}
+
+export default mergeConfig(config, {
   build: {
     target: ['node20'],
   },

packages/use-dataloader/vite.config.ts

@@ -1,7 +1,13 @@
 import { defineConfig, mergeConfig } from 'vite'
 import { defaultConfig } from '../../vite.config'
+import { defaultConfig as vitestDefaultConfig } from '../../vitest.config'
 
-export default mergeConfig(defineConfig(defaultConfig), {
+const config = {
+  ...defineConfig(defaultConfig),
+  ...vitestDefaultConfig,
+}
+
+export default mergeConfig(config, {
   test: {
     environment: 'jsdom',
     setupFiles: ['./vitest.setup.ts'],

packages/use-growthbook/vite.config.ts

@@ -1,7 +1,13 @@
 import { defineConfig, mergeConfig } from 'vite'
 import { defaultConfig } from '../../vite.config'
+import { defaultConfig as vitestDefaultConfig } from '../../vitest.config'
 
-export default mergeConfig(defineConfig(defaultConfig), {
+const config = {
+  ...defineConfig(defaultConfig),
+  ...vitestDefaultConfig,
+}
+
+export default mergeConfig(config, {
   build: {
     lib: {
       formats: ['es', 'cjs'],

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

@@ -25,6 +25,20 @@ type OnTranslateError = ComponentProps<typeof I18n>['onTranslateError']
 const isDefaultLocalesSupported = (locale: string): locale is Locales =>
   ListLocales.includes(locale as Locales)
 
+const load = async ({
+  locale,
+  namespace,
+}: {
+  locale: string
+  namespace: string
+}) =>
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+  import(`./locales/namespaces/${locale}/${namespace}.json`)
+
+const CustomComponent = ({ children }: { children: ReactNode }) => (
+  <p style={{ fontWeight: 'bold' }}>{children}</p>
+)
+
 const defaultOnTranslateError: OnTranslateError = () => {}
 
 const wrapper =
@@ -148,16 +162,6 @@ describe('i18n hook', () => {
   })
 
   it('should use specific load on useTranslation', async () => {
-    const load = async ({
-      locale,
-      namespace,
-    }: {
-      locale: string
-      namespace: string
-    }) =>
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-      import(`./locales/namespaces/${locale}/${namespace}.json`)
-
     const { result } = renderHook(
       () => useTranslation<NamespaceLocale, Locales>(['user', 'profile'], load),
       {
@@ -206,16 +210,6 @@ describe('i18n hook', () => {
   })
 
   it("should use specific load and fallback default local if the key doesn't exist", async () => {
-    const load = async ({
-      locale,
-      namespace,
-    }: {
-      locale: string
-      namespace: string
-    }) =>
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-      import(`./locales/namespaces/${locale}/${namespace}.json`)
-
     const { result } = renderHook(
       () => useTranslation<NamespaceLocale, Locales>(['user'], load),
       {
@@ -272,21 +266,24 @@ describe('i18n hook', () => {
         wrapper: wrapper({ defaultLocale: 'en' }),
       },
     )
-    const CustomComponent = ({ children }: { children: ReactNode }) => (
-      <p style={{ fontWeight: 'bold' }}>{children}</p>
-    )
 
     await waitFor(() => {
       expect(
-        result.current.t('with.identifier', { identifier: <b>My resource</b> }),
-      ).toEqual(['Are you sure you want to delete ', <b>My resource</b>, '?'])
+        result.current.t('with.identifier', {
+          identifier: <b key="1">My resource</b>,
+        }),
+      ).toEqual([
+        'Are you sure you want to delete ',
+        <b key="1">My resource</b>,
+        '?',
+      ])
       expect(
         result.current.t('with.identifier', {
-          identifier: <CustomComponent>My resource</CustomComponent>,
+          identifier: <CustomComponent key="1">My resource</CustomComponent>,
         }),
       ).toEqual([
         'Are you sure you want to delete ',
-        <CustomComponent>My resource</CustomComponent>,
+        <CustomComponent key="1">My resource</CustomComponent>,
         '?',
       ])
     })
@@ -581,12 +578,12 @@ describe('i18n hook', () => {
           currency: 'EUR',
           style: 'currency',
         }),
-      ).toEqual('2,00\xa0€')
+      ).toEqual('2,00\u00A0€')
     })
 
     expect(
       result.current.formatNumber(2, { currency: 'USD', style: 'currency' }),
-    ).toEqual('2,00\xa0$US')
+    ).toEqual('2,00\u00A0$US')
   })
 
   it('should use formatList', async () => {

packages/use-i18n/vite.config.ts

@@ -1,7 +1,13 @@
 import { defineConfig, mergeConfig } from 'vite'
 import { defaultConfig } from '../../vite.config'
+import { defaultConfig as vitestDefaultConfig } from '../../vitest.config'
 
-export default mergeConfig(defineConfig(defaultConfig), {
+const config = {
+  ...defineConfig(defaultConfig),
+  ...vitestDefaultConfig,
+}
+
+export default mergeConfig(config, {
   test: {
     environment: 'jsdom',
     setupFiles: ['./vitest.setup.ts'],

packages/use-media/vite.config.ts

@@ -1,7 +1,13 @@
 import { defineConfig, mergeConfig } from 'vite'
 import { defaultConfig } from '../../vite.config'
+import { defaultConfig as vitestDefaultConfig } from '../../vitest.config'
 
-export default mergeConfig(defineConfig(defaultConfig), {
+const config = {
+  ...defineConfig(defaultConfig),
+  ...vitestDefaultConfig,
+}
+
+export default mergeConfig(config, {
   test: {
     environment: 'jsdom',
     setupFiles: ['./vitest.setup.ts'],

packages/use-query-params/vite.config.ts

@@ -1,7 +1,13 @@
 import { defineConfig, mergeConfig } from 'vite'
 import { defaultConfig } from '../../vite.config'
+import { defaultConfig as vitestDefaultConfig } from '../../vitest.config'
 
-export default mergeConfig(defineConfig(defaultConfig), {
+const config = {
+  ...defineConfig(defaultConfig),
+  ...vitestDefaultConfig,
+}
+
+export default mergeConfig(config, {
   test: {
     environment: 'jsdom',
     setupFiles: ['./vitest.setup.ts'],

packages/use-random-name/vite.config.ts

@@ -1,7 +1,13 @@
 import { defineConfig, mergeConfig } from 'vite'
 import { defaultConfig } from '../../vite.config'
+import { defaultConfig as vitestDefaultConfig } from '../../vitest.config'
 
-export default mergeConfig(defineConfig(defaultConfig), {
+const config = {
+  ...defineConfig(defaultConfig),
+  ...vitestDefaultConfig,
+}
+
+export default mergeConfig(config, {
   test: {
     environment: 'jsdom',
     setupFiles: ['./vitest.setup.ts'],

packages/use-segment/vite.config.ts

@@ -1,7 +1,13 @@
 import { defineConfig, mergeConfig } from 'vite'
 import { defaultConfig } from '../../vite.config'
+import { defaultConfig as vitestDefaultConfig } from '../../vitest.config'
 
-export default mergeConfig(defineConfig(defaultConfig), {
+const config = {
+  ...defineConfig(defaultConfig),
+  ...vitestDefaultConfig,
+}
+
+export default mergeConfig(config, {
   build: {
     lib: {
       formats: ['es', 'cjs'],

packages/use-storage/vite.config.ts

@@ -1,7 +1,13 @@
 import { defineConfig, mergeConfig } from 'vite'
 import { defaultConfig } from '../../vite.config'
+import { defaultConfig as vitestDefaultConfig } from '../../vitest.config'
 
-export default mergeConfig(defineConfig(defaultConfig), {
+const config = {
+  ...defineConfig(defaultConfig),
+  ...vitestDefaultConfig,
+}
+
+export default mergeConfig(config, {
   test: {
     environment: 'jsdom',
     setupFiles: ['./vitest.setup.ts'],

packages/validate-icu-locales/vite.config.ts

@@ -2,8 +2,14 @@
 
 import { defineConfig, mergeConfig } from 'vite'
 import { defaultConfig } from '../../vite.config'
+import { defaultConfig as vitestDefaultConfig } from '../../vitest.config'
 
-export default mergeConfig(defineConfig(defaultConfig), {
+const config = {
+  ...defineConfig(defaultConfig),
+  ...vitestDefaultConfig,
+}
+
+export default mergeConfig(config, {
   build: {
     ssr: true,
     target: ['node20'],