Merge branch 'main' into type-check

docs/build.md

@@ -41,23 +41,25 @@ The build config is quite opinionated, as it is designed to work with our intern
 
 ## vite.config.ts
 
-- Wrap your `defineConfig` in `mergeConfig` (also exported from Vite).
-- Add `tanstackBuildConfig` into `mergeConfig`.
-- Note: Please avoid modifying `build` in your own `defineConfig`.
+- Import `mergeConfig` and `tanstackBuildConfig`.
+- Merge your custom config first, followed by `tanstackBuildConfig`.
+- Please avoid modifying `build` in your custom config.
 - See an example below:
 
 ```ts
 import { defineConfig, mergeConfig } from 'vite'
 import { tanstackBuildConfig } from '@tanstack/config/build'
 
+const config = defineConfig({
+  // Framework plugins, vitest config, etc.
+})
+
 export default mergeConfig(
+  config,
   tanstackBuildConfig({
     entry: 'src/index.ts',
     srcDir: 'src',
   }),
-  defineConfig({
-    // Add any custom options here, such as framework plugins
-  }),
 )
 ```