vxrn 0.1.96 → 0.1.97

package/dist/esm/utils/getViteServerConfig.native.js

@@ -1,4 +1,4 @@
-import { mergeConfig } from "vite";
+import { loadConfigFromFile, mergeConfig } from "vite";
 import { reactNativeHMRPlugin } from "../plugins/reactNativeHMRPlugin";
 import { coerceToArray } from "./coerceToArray";
 import { getBaseViteConfig } from "./getBaseViteConfig";
@@ -178,53 +178,64 @@ function getViteServerConfig(config) {
 }
 function _getViteServerConfig() {
   return _getViteServerConfig = _async_to_generator(function(config) {
-    var _serverConfig_ssr, _serverConfig_ssr1, _serverConfig_ssr2, _serverConfig_ssr3, _webConfig_ssr, _webConfig_ssr1, _serverConfig_ssr4, _webConfig_ssr2, _serverConfig_ssr5, _webConfig_ssr3, _serverConfig_ssr6, _webConfig_ssr4, _serverConfig_ssr7, _webConfig_ssr5, _serverConfig, _serverConfig_ssr8, _webConfig, _webConfig_ssr6, root, host, optimizeDeps, serverConfig, webConfig;
+    var _serverConfig_ssr, _serverConfig_ssr1, root, host, optimizeDeps, _ref, _ref1, userViteConfig, serverConfig, _serverConfig_ssr2, _serverConfig_ssr3, _userViteConfig_ssr, _userViteConfig_ssr1, _serverConfig_ssr4, _userViteConfig_ssr2, _serverConfig_ssr5, _userViteConfig_ssr3, _serverConfig_ssr6, _userViteConfig_ssr4, _serverConfig_ssr7, _userViteConfig_ssr5, _serverConfig, _serverConfig_ssr8, _userViteConfig, _userViteConfig_ssr6;
     return _ts_generator(this, function(_state) {
-      if (root = config.root, host = config.host, optimizeDeps = getOptimizeDeps("serve").optimizeDeps, serverConfig = mergeConfig(getBaseViteConfig({
-        mode: "development"
-      }), {
-        root,
-        appType: "custom",
-        clearScreen: !1,
-        plugins: [
-          reactNativeHMRPlugin(config),
-          {
-            name: "process-env-ssr",
-            transform: function(code, id, options) {
-              if (!id.includes("node_modules") && code.includes("process.env.TAMAGUI_IS_SERVER"))
-                return code.replaceAll("process.env.TAMAGUI_IS_SERVER", "".concat(!!(options != null && options.ssr)));
-            }
-          }
-        ],
-        optimizeDeps,
-        ssr: {
-          optimizeDeps
-        },
-        server: {
-          watch: {
-            ignored: function(path) {
-              return !1;
+      switch (_state.label) {
+        case 0:
+          return root = config.root, host = config.host, optimizeDeps = getOptimizeDeps("serve").optimizeDeps, [
+            4,
+            loadConfigFromFile({
+              mode: "dev",
+              command: "serve"
+            })
+          ];
+        case 1:
+          if (_ref1 = (_ref = _state.sent()) !== null && _ref !== void 0 ? _ref : {}, userViteConfig = _ref1.config, serverConfig = mergeConfig(getBaseViteConfig({
+            mode: "development"
+          }), {
+            root,
+            appType: "custom",
+            clearScreen: !1,
+            plugins: [
+              reactNativeHMRPlugin(config),
+              {
+                name: "process-env-ssr",
+                transform: function(code, id, options) {
+                  if (!id.includes("node_modules") && code.includes("process.env.TAMAGUI_IS_SERVER"))
+                    return code.replaceAll("process.env.TAMAGUI_IS_SERVER", "".concat(!!(options != null && options.ssr)));
+                }
+              }
+            ],
+            optimizeDeps,
+            ssr: {
+              optimizeDeps
+            },
+            server: {
+              watch: {
+                ignored: function(path) {
+                  return !1;
+                }
+              },
+              hmr: {
+                path: "/__vxrnhmr"
+              },
+              cors: !0,
+              host
             }
-          },
-          hmr: {
-            path: "/__vxrnhmr"
-          },
-          cors: !0,
-          host
-        }
-      }), webConfig = config.webConfig || {}, webConfig && (serverConfig = mergeConfig(serverConfig, webConfig)), !((_serverConfig_ssr = serverConfig.ssr) === null || _serverConfig_ssr === void 0) && _serverConfig_ssr.noExternal && !Array.isArray((_serverConfig_ssr1 = serverConfig.ssr) === null || _serverConfig_ssr1 === void 0 ? void 0 : _serverConfig_ssr1.noExternal))
-        throw new Error("ssr.noExternal must be array");
-      return (_serverConfig = serverConfig).ssr || (_serverConfig.ssr = {}), (_serverConfig_ssr8 = serverConfig.ssr).optimizeDeps || (_serverConfig_ssr8.optimizeDeps = {}), (_webConfig = webConfig).ssr || (_webConfig.ssr = {}), (_webConfig_ssr6 = webConfig.ssr).optimizeDeps || (_webConfig_ssr6.optimizeDeps = {}), serverConfig.ssr.noExternal = uniq(_to_consumable_array(coerceToArray(((_serverConfig_ssr2 = serverConfig.ssr) === null || _serverConfig_ssr2 === void 0 ? void 0 : _serverConfig_ssr2.noExternal) || [])).concat(_to_consumable_array(((_serverConfig_ssr3 = serverConfig.ssr) === null || _serverConfig_ssr3 === void 0 ? void 0 : _serverConfig_ssr3.optimizeDeps.include) || []), _to_consumable_array(((_webConfig_ssr = webConfig.ssr) === null || _webConfig_ssr === void 0 ? void 0 : _webConfig_ssr.optimizeDeps.include) || []), _to_consumable_array(coerceToArray(((_webConfig_ssr1 = webConfig.ssr) === null || _webConfig_ssr1 === void 0 ? void 0 : _webConfig_ssr1.noExternal) || [])), _to_consumable_array(optimizeDeps.include), [
-        "react",
-        "react-dom",
-        "react-dom/server",
-        "react-dom/client"
-      ])), serverConfig.ssr.optimizeDeps.exclude = uniq(_to_consumable_array(((_serverConfig_ssr4 = serverConfig.ssr) === null || _serverConfig_ssr4 === void 0 ? void 0 : _serverConfig_ssr4.optimizeDeps.exclude) || []).concat(_to_consumable_array(((_webConfig_ssr2 = webConfig.ssr) === null || _webConfig_ssr2 === void 0 ? void 0 : _webConfig_ssr2.optimizeDeps.exclude) || []), _to_consumable_array(optimizeDeps.exclude))), serverConfig.ssr.optimizeDeps.include = uniq(_to_consumable_array(((_serverConfig_ssr5 = serverConfig.ssr) === null || _serverConfig_ssr5 === void 0 ? void 0 : _serverConfig_ssr5.optimizeDeps.include) || []).concat(_to_consumable_array(((_webConfig_ssr3 = webConfig.ssr) === null || _webConfig_ssr3 === void 0 ? void 0 : _webConfig_ssr3.optimizeDeps.include) || []), _to_consumable_array(optimizeDeps.include))), serverConfig.ssr.optimizeDeps.needsInterop = uniq(_to_consumable_array(((_serverConfig_ssr6 = serverConfig.ssr) === null || _serverConfig_ssr6 === void 0 ? void 0 : _serverConfig_ssr6.optimizeDeps.needsInterop) || []).concat(_to_consumable_array(((_webConfig_ssr4 = webConfig.ssr) === null || _webConfig_ssr4 === void 0 ? void 0 : _webConfig_ssr4.optimizeDeps.needsInterop) || []), _to_consumable_array(optimizeDeps.needsInterop))), serverConfig.ssr.optimizeDeps.esbuildOptions = _object_spread({}, ((_serverConfig_ssr7 = serverConfig.ssr) === null || _serverConfig_ssr7 === void 0 ? void 0 : _serverConfig_ssr7.optimizeDeps.esbuildOptions) || {}, ((_webConfig_ssr5 = webConfig.ssr) === null || _webConfig_ssr5 === void 0 ? void 0 : _webConfig_ssr5.optimizeDeps.esbuildOptions) || {}, optimizeDeps.esbuildOptions), process.env.DEBUG && console.debug("merged config is", JSON.stringify(serverConfig, null, 2)), serverConfig = _object_spread_props(_object_spread({}, serverConfig), {
-        plugins: _to_consumable_array(serverConfig.plugins)
-      }), [
-        2,
-        serverConfig
-      ];
+          }), userViteConfig && (serverConfig = mergeConfig(serverConfig, userViteConfig)), !((_serverConfig_ssr = serverConfig.ssr) === null || _serverConfig_ssr === void 0) && _serverConfig_ssr.noExternal && !Array.isArray((_serverConfig_ssr1 = serverConfig.ssr) === null || _serverConfig_ssr1 === void 0 ? void 0 : _serverConfig_ssr1.noExternal))
+            throw new Error("ssr.noExternal must be array");
+          return userViteConfig && ((_serverConfig = serverConfig).ssr || (_serverConfig.ssr = {}), (_serverConfig_ssr8 = serverConfig.ssr).optimizeDeps || (_serverConfig_ssr8.optimizeDeps = {}), (_userViteConfig = userViteConfig).ssr || (_userViteConfig.ssr = {}), (_userViteConfig_ssr6 = userViteConfig.ssr).optimizeDeps || (_userViteConfig_ssr6.optimizeDeps = {}), serverConfig.ssr.noExternal = uniq(_to_consumable_array(coerceToArray(((_serverConfig_ssr2 = serverConfig.ssr) === null || _serverConfig_ssr2 === void 0 ? void 0 : _serverConfig_ssr2.noExternal) || [])).concat(_to_consumable_array(((_serverConfig_ssr3 = serverConfig.ssr) === null || _serverConfig_ssr3 === void 0 ? void 0 : _serverConfig_ssr3.optimizeDeps.include) || []), _to_consumable_array(((_userViteConfig_ssr = userViteConfig.ssr) === null || _userViteConfig_ssr === void 0 ? void 0 : _userViteConfig_ssr.optimizeDeps.include) || []), _to_consumable_array(coerceToArray(((_userViteConfig_ssr1 = userViteConfig.ssr) === null || _userViteConfig_ssr1 === void 0 ? void 0 : _userViteConfig_ssr1.noExternal) || [])), _to_consumable_array(optimizeDeps.include), [
+            "react",
+            "react-dom",
+            "react-dom/server",
+            "react-dom/client"
+          ])), serverConfig.ssr.optimizeDeps.exclude = uniq(_to_consumable_array(((_serverConfig_ssr4 = serverConfig.ssr) === null || _serverConfig_ssr4 === void 0 ? void 0 : _serverConfig_ssr4.optimizeDeps.exclude) || []).concat(_to_consumable_array(((_userViteConfig_ssr2 = userViteConfig.ssr) === null || _userViteConfig_ssr2 === void 0 ? void 0 : _userViteConfig_ssr2.optimizeDeps.exclude) || []), _to_consumable_array(optimizeDeps.exclude))), serverConfig.ssr.optimizeDeps.include = uniq(_to_consumable_array(((_serverConfig_ssr5 = serverConfig.ssr) === null || _serverConfig_ssr5 === void 0 ? void 0 : _serverConfig_ssr5.optimizeDeps.include) || []).concat(_to_consumable_array(((_userViteConfig_ssr3 = userViteConfig.ssr) === null || _userViteConfig_ssr3 === void 0 ? void 0 : _userViteConfig_ssr3.optimizeDeps.include) || []), _to_consumable_array(optimizeDeps.include))), serverConfig.ssr.optimizeDeps.needsInterop = uniq(_to_consumable_array(((_serverConfig_ssr6 = serverConfig.ssr) === null || _serverConfig_ssr6 === void 0 ? void 0 : _serverConfig_ssr6.optimizeDeps.needsInterop) || []).concat(_to_consumable_array(((_userViteConfig_ssr4 = userViteConfig.ssr) === null || _userViteConfig_ssr4 === void 0 ? void 0 : _userViteConfig_ssr4.optimizeDeps.needsInterop) || []), _to_consumable_array(optimizeDeps.needsInterop))), serverConfig.ssr.optimizeDeps.esbuildOptions = _object_spread({}, ((_serverConfig_ssr7 = serverConfig.ssr) === null || _serverConfig_ssr7 === void 0 ? void 0 : _serverConfig_ssr7.optimizeDeps.esbuildOptions) || {}, ((_userViteConfig_ssr5 = userViteConfig.ssr) === null || _userViteConfig_ssr5 === void 0 ? void 0 : _userViteConfig_ssr5.optimizeDeps.esbuildOptions) || {}, optimizeDeps.esbuildOptions)), process.env.DEBUG && console.debug("merged config is", JSON.stringify(serverConfig, null, 2)), serverConfig = _object_spread_props(_object_spread({}, serverConfig), {
+            plugins: _to_consumable_array(serverConfig.plugins)
+          }), [
+            2,
+            serverConfig
+          ];
+      }
     });
   }), _getViteServerConfig.apply(this, arguments);
 }

package/dist/esm/utils/getViteServerConfig.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/utils/Users/n8/vxrn/packages/vxrn/src/utils/getViteServerConfig.ts"],
-  "mappings": "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",
-  "names": ["mergeConfig", "reactNativeHMRPlugin", "coerceToArray", "getBaseViteConfig", "getOptimizeDeps", "uniq", "getViteServerConfig", "config", "serverConfig", "webConfig", "root", "host", "optimizeDeps", "mode", "appType", "clearScreen", "plugins", "name", "transform", "code", "id", "options", "includes", "replaceAll", "ssr", "server", "watch", "ignored", "path", "hmr", "cors", "noExternal", "Array", "isArray", "Error", "include", "exclude", "needsInterop", "esbuildOptions", "process", "env", "DEBUG", "console", "debug", "JSON", "stringify"]
+  "mappings": "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",
+  "names": ["loadConfigFromFile", "mergeConfig", "reactNativeHMRPlugin", "coerceToArray", "getBaseViteConfig", "getOptimizeDeps", "uniq", "getViteServerConfig", "config", "serverConfig", "root", "host", "optimizeDeps", "userViteConfig", "mode", "command", "appType", "clearScreen", "plugins", "name", "transform", "code", "id", "options", "includes", "replaceAll", "ssr", "server", "watch", "ignored", "path", "hmr", "cors", "noExternal", "Array", "isArray", "Error", "include", "exclude", "needsInterop", "esbuildOptions", "process", "env", "DEBUG", "console", "debug", "JSON", "stringify"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxrn",
-  "version": "0.1.96",
+  "version": "0.1.97",
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
   "type": "module",
@@ -35,10 +35,10 @@
     "@babel/core": "^7.21.8",
     "@hono/node-server": "^1.11.1",
     "@vitejs/plugin-react-swc": "^3.6.0",
-    "@vxrn/react-native-prebuilt": "0.1.96",
-    "@vxrn/safe-area": "0.1.96",
-    "@vxrn/vite-flow": "0.1.96",
-    "@vxrn/vite-native-swc": "0.1.96",
+    "@vxrn/react-native-prebuilt": "0.1.97",
+    "@vxrn/safe-area": "0.1.97",
+    "@vxrn/vite-flow": "0.1.97",
+    "@vxrn/vite-native-swc": "0.1.97",
     "citty": "^0.1.6",
     "crossws": "^0.2.4",
     "es-module-lexer": "^1.3.0",

package/src/cli.ts

@@ -1,4 +1,3 @@
-import { readVXRNConfig } from './utils/readVXRNConfig'
 import { defineCommand, runMain } from 'citty'
 
 const dev = defineCommand({
@@ -19,7 +18,6 @@ const dev = defineCommand({
     },
   },
   async run({ args }) {
-    const userConfig = await readVXRNConfig()
     const { dev } = await import(
       // @ts-expect-error
       './exports/dev.mjs'
@@ -37,9 +35,8 @@ const dev = defineCommand({
         include: [],
         exclude: [],
       },
-      ...userConfig,
-      host: args.host ?? userConfig.host,
-      port: args.port ? +args.port : userConfig.port,
+      host: args.host,
+      port: args.port ? +args.port : undefined,
     })
 
     const { closePromise } = await start()
@@ -82,7 +79,6 @@ const build = defineCommand({
     },
   },
   async run({ args }) {
-    const userConfig = await readVXRNConfig()
     const { build } = await import(
       // @ts-expect-error
       './exports/build.mjs'
@@ -92,7 +88,7 @@ const build = defineCommand({
       console.error(err?.message || err)
     })
 
-    const results = await build(userConfig, args)
+    const results = await build({}, args)
 
     if (process.env.DEBUG) {
       console.info('results', results)
@@ -115,7 +111,6 @@ const serve = defineCommand({
     },
   },
   async run({ args }) {
-    const userConfig = await readVXRNConfig()
     const { serve } = await import(
       // @ts-expect-error
       './exports/serve.mjs'
@@ -126,9 +121,8 @@ const serve = defineCommand({
     })
 
     const results = await serve({
-      ...userConfig,
-      port: args.port ? +args.port : userConfig.port,
-      host: args.host ?? userConfig.host,
+      port: args.port ? +args.port : undefined,
+      host: args.host,
     })
 
     if (process.env.DEBUG) {

package/src/exports/build.ts

@@ -1,7 +1,14 @@
 import FSExtra from 'fs-extra'
 import { rm } from 'node:fs/promises'
 import type { RollupOutput } from 'rollup'
-import { mergeConfig, build as viteBuild, type Plugin, type UserConfig } from 'vite'
+import {
+  loadConfigFromFile,
+  mergeConfig,
+  resolveConfig,
+  build as viteBuild,
+  type Plugin,
+  type UserConfig,
+} from 'vite'
 import { analyzer } from 'vite-bundle-analyzer'
 import type { BuildArgs, VXRNConfig } from '../types'
 import { getBaseViteConfig } from '../utils/getBaseViteConfig'
@@ -31,7 +38,13 @@ const disableOptimizationConfig = {
 } satisfies UserConfig
 
 export const build = async (optionsIn: VXRNConfig, buildArgs: BuildArgs = {}) => {
-  const options = await getOptionsFilled(optionsIn)
+  const [options, viteConfig] = await Promise.all([
+    getOptionsFilled(optionsIn),
+    loadConfigFromFile({
+      command: 'build',
+      mode: 'prod',
+    }).then((_) => _?.config),
+  ])
 
   // clean
   await Promise.all([
@@ -74,8 +87,8 @@ export const build = async (optionsIn: VXRNConfig, buildArgs: BuildArgs = {}) =>
     },
   } satisfies Plugin
 
-  if (options.webConfig) {
-    webBuildConfig = mergeConfig(webBuildConfig, options.webConfig) as any
+  if (viteConfig) {
+    webBuildConfig = mergeConfig(webBuildConfig, viteConfig) as any
   }
 
   let clientOutput
@@ -145,19 +158,16 @@ export const build = async (optionsIn: VXRNConfig, buildArgs: BuildArgs = {}) =>
   // }
 
   const { output: serverOutput } = (await viteBuild(serverBuildConfig)) as RollupOutput
+  const clientManifest = await FSExtra.readJSON('dist/client/.vite/manifest.json')
 
-  if (options.afterBuild) {
-    const clientManifest = await FSExtra.readJSON('dist/client/.vite/manifest.json')
-
-    await options.afterBuild({
-      options,
-      buildArgs,
-      clientOutput,
-      serverOutput,
-      webBuildConfig,
-      clientManifest,
-    })
-  }
+  console.info(`\n ✔️ vxrn build complete\n`)
 
-  console.info(`\n ✔️ build complete\n`)
+  return {
+    options,
+    buildArgs,
+    clientOutput,
+    serverOutput,
+    webBuildConfig,
+    clientManifest,
+  }
 }

package/src/exports/createServer.ts

@@ -17,10 +17,6 @@ export const createProdServer = async (options: VXRNConfig) => {
     })
   )
 
-  if (options.serve) {
-    options.serve(options, app)
-  }
-
   // app.get(
   //   '*',
   //   cache({

package/src/exports/dev.ts

@@ -33,7 +33,7 @@ const { ensureDir } = FSExtra
 
 export const dev = async ({ clean, ...rest }: VXRNConfig & { clean?: boolean }) => {
   const options = await getOptionsFilled(rest)
-  const { host, port, root, cacheDir } = options
+  const { port, root, cacheDir } = options
 
   if (clean) {
     try {

package/src/exports/serve.ts

@@ -7,6 +7,9 @@ import { getOptionsFilled } from '../utils/getOptionsFilled'
 export const serve = async (optionsIn: VXRNConfig) => {
   const options = await getOptionsFilled(optionsIn, { mode: 'prod' })
   const app = await createProdServer(options)
+  if (options.onServe) {
+    options.onServe(options, app)
+  }
   // strange prevents a cant listen on port issue
   await new Promise((res) => setTimeout(res, 1))
   const server = honoServe({

package/src/types.ts

@@ -43,13 +43,11 @@ export type VXRNConfig = {
   root?: string
   host?: string
   port?: number
-  webConfig?: InlineConfig
-  nativeConfig?: InlineConfig
   flow?: FlowOptions
 
+  // for hooking into things
   afterBuild?: (props: AfterBuildProps) => void | Promise<void>
-
-  serve?: (options: VXRNConfig, app: Hono) => void
+  onServe?: (options: VXRNConfig, app: Hono) => void
 }
 
 export type HMRListener = (update: { file: string; contents: string }) => void

package/src/utils/getReactNativeBundle.ts

@@ -20,7 +20,7 @@ export let entryRoot = ''
 
 export async function getReactNativeBundle(options: VXRNConfigFilled, viteRNClientPlugin: any) {
   const { root, port, cacheDir } = options
-  const { depsToOptimize } = getOptimizeDeps('build')
+  const { depsToOptimize, needsInterop } = getOptimizeDeps('build')
 
   if (process.env.LOAD_TMP_BUNDLE) {
     // for easier quick testing things:
@@ -111,6 +111,7 @@ export async function getReactNativeBundle(options: VXRNConfigFilled, viteRNClie
 
     optimizeDeps: {
       include: depsToOptimize,
+      needsInterop,
       esbuildOptions: {
         jsx: 'automatic',
       },
@@ -144,9 +145,10 @@ export async function getReactNativeBundle(options: VXRNConfigFilled, viteRNClie
     },
   } satisfies InlineConfig
 
-  if (options.nativeConfig) {
-    nativeBuildConfig = mergeConfig(nativeBuildConfig, options.nativeConfig) as any
-  }
+  // TODO
+  // if (options.nativeConfig) {
+  //   nativeBuildConfig = mergeConfig(nativeBuildConfig, options.nativeConfig) as any
+  // }
 
   // // this fixes my swap-react-native plugin not being called pre 😳
   await resolveConfig(nativeBuildConfig, 'build')

package/src/utils/getViteServerConfig.ts

@@ -1,4 +1,4 @@
-import { mergeConfig, type InlineConfig, type UserConfig } from 'vite'
+import { loadConfigFromFile, mergeConfig, type InlineConfig, type UserConfig } from 'vite'
 import { reactNativeHMRPlugin } from '../plugins/reactNativeHMRPlugin'
 import { coerceToArray } from './coerceToArray'
 import { getBaseViteConfig } from './getBaseViteConfig'
@@ -9,6 +9,11 @@ import { uniq } from './uniq'
 export async function getViteServerConfig(config: VXRNConfigFilled) {
   const { root, host } = config
   const { optimizeDeps } = getOptimizeDeps('serve')
+  const { config: userViteConfig } =
+    (await loadConfigFromFile({
+      mode: 'dev',
+      command: 'serve',
+    })) ?? {}
 
   let serverConfig: UserConfig = mergeConfig(
     getBaseViteConfig({
@@ -54,10 +59,8 @@ export async function getViteServerConfig(config: VXRNConfigFilled) {
     } satisfies UserConfig
   ) satisfies InlineConfig
 
-  let webConfig = config.webConfig || {}
-
-  if (webConfig) {
-    serverConfig = mergeConfig(serverConfig, webConfig) as any
+  if (userViteConfig) {
+    serverConfig = mergeConfig(serverConfig, userViteConfig) as any
   }
 
   if (serverConfig.ssr?.noExternal && !Array.isArray(serverConfig.ssr?.noExternal)) {
@@ -66,46 +69,48 @@ export async function getViteServerConfig(config: VXRNConfigFilled) {
 
   // vite doesnt merge arrays but we want that
 
-  serverConfig.ssr ||= {}
-  serverConfig.ssr.optimizeDeps ||= {}
-
-  webConfig.ssr ||= {}
-  webConfig.ssr.optimizeDeps ||= {}
-
-  serverConfig.ssr.noExternal = uniq([
-    ...coerceToArray((serverConfig.ssr?.noExternal as string[]) || []),
-    ...(serverConfig.ssr?.optimizeDeps.include || []),
-    ...(webConfig.ssr?.optimizeDeps.include || []),
-    ...coerceToArray(webConfig.ssr?.noExternal || []),
-    ...optimizeDeps.include,
-    'react',
-    'react-dom',
-    'react-dom/server',
-    'react-dom/client',
-  ])
-
-  serverConfig.ssr.optimizeDeps.exclude = uniq([
-    ...(serverConfig.ssr?.optimizeDeps.exclude || []),
-    ...(webConfig.ssr?.optimizeDeps.exclude || []),
-    ...optimizeDeps.exclude,
-  ])
-
-  serverConfig.ssr.optimizeDeps.include = uniq([
-    ...(serverConfig.ssr?.optimizeDeps.include || []),
-    ...(webConfig.ssr?.optimizeDeps.include || []),
-    ...optimizeDeps.include,
-  ])
-
-  serverConfig.ssr.optimizeDeps.needsInterop = uniq([
-    ...(serverConfig.ssr?.optimizeDeps.needsInterop || []),
-    ...(webConfig.ssr?.optimizeDeps.needsInterop || []),
-    ...optimizeDeps.needsInterop,
-  ])
-
-  serverConfig.ssr.optimizeDeps.esbuildOptions = {
-    ...(serverConfig.ssr?.optimizeDeps.esbuildOptions || {}),
-    ...(webConfig.ssr?.optimizeDeps.esbuildOptions || {}),
-    ...optimizeDeps.esbuildOptions,
+  if (userViteConfig) {
+    serverConfig.ssr ||= {}
+    serverConfig.ssr.optimizeDeps ||= {}
+
+    userViteConfig.ssr ||= {}
+    userViteConfig.ssr.optimizeDeps ||= {}
+
+    serverConfig.ssr.noExternal = uniq([
+      ...coerceToArray((serverConfig.ssr?.noExternal as string[]) || []),
+      ...(serverConfig.ssr?.optimizeDeps.include || []),
+      ...(userViteConfig.ssr?.optimizeDeps.include || []),
+      ...coerceToArray(userViteConfig.ssr?.noExternal || []),
+      ...optimizeDeps.include,
+      'react',
+      'react-dom',
+      'react-dom/server',
+      'react-dom/client',
+    ])
+
+    serverConfig.ssr.optimizeDeps.exclude = uniq([
+      ...(serverConfig.ssr?.optimizeDeps.exclude || []),
+      ...(userViteConfig.ssr?.optimizeDeps.exclude || []),
+      ...optimizeDeps.exclude,
+    ])
+
+    serverConfig.ssr.optimizeDeps.include = uniq([
+      ...(serverConfig.ssr?.optimizeDeps.include || []),
+      ...(userViteConfig.ssr?.optimizeDeps.include || []),
+      ...optimizeDeps.include,
+    ])
+
+    serverConfig.ssr.optimizeDeps.needsInterop = uniq([
+      ...(serverConfig.ssr?.optimizeDeps.needsInterop || []),
+      ...(userViteConfig.ssr?.optimizeDeps.needsInterop || []),
+      ...optimizeDeps.needsInterop,
+    ])
+
+    serverConfig.ssr.optimizeDeps.esbuildOptions = {
+      ...(serverConfig.ssr?.optimizeDeps.esbuildOptions || {}),
+      ...(userViteConfig.ssr?.optimizeDeps.esbuildOptions || {}),
+      ...optimizeDeps.esbuildOptions,
+    }
   }
 
   // manually merge

package/types/exports/build.d.ts

@@ -1,3 +1,30 @@
 import type { BuildArgs, VXRNConfig } from '../types';
-export declare const build: (optionsIn: VXRNConfig, buildArgs?: BuildArgs) => Promise<void>;
+export declare const build: (optionsIn: VXRNConfig, buildArgs?: BuildArgs) => Promise<{
+    options: {
+        entries: {
+            native: string;
+            web?: string | undefined;
+            server: string;
+        };
+        packageJSON: import("pkg-types").PackageJson;
+        state: {
+            applyPatches?: boolean | undefined;
+        };
+        packageRootDir: string;
+        cacheDir: string;
+        userPatchesDir: string;
+        internalPatchesDir: string;
+        host: string;
+        root: string;
+        port: number;
+        flow?: import("@vxrn/vite-flow").Options | undefined;
+        afterBuild?: ((props: import("..").AfterBuildProps) => void | Promise<void>) | undefined;
+        onServe?: ((options: VXRNConfig, app: import("hono").Hono<import("hono").Env, import("hono/types").BlankSchema, "/">) => void) | undefined;
+    };
+    buildArgs: BuildArgs;
+    clientOutput: any;
+    serverOutput: [import("rollup").OutputChunk, ...(import("rollup").OutputChunk | import("rollup").OutputAsset)[]];
+    webBuildConfig: Record<string, any>;
+    clientManifest: any;
+}>;
 //# sourceMappingURL=build.d.ts.map

package/types/types.d.ts

@@ -1,7 +1,7 @@
 import type { Options as FlowOptions } from '@vxrn/vite-flow';
 import type { Hono } from 'hono';
 import type { OutputAsset, OutputChunk } from 'rollup';
-import type { InlineConfig, UserConfig } from 'vite';
+import type { UserConfig } from 'vite';
 type RollupOutputList = [OutputChunk, ...(OutputChunk | OutputAsset)[]];
 export type BuildArgs = {
     step?: string;
@@ -41,11 +41,9 @@ export type VXRNConfig = {
     root?: string;
     host?: string;
     port?: number;
-    webConfig?: InlineConfig;
-    nativeConfig?: InlineConfig;
     flow?: FlowOptions;
     afterBuild?: (props: AfterBuildProps) => void | Promise<void>;
-    serve?: (options: VXRNConfig, app: Hono) => void;
+    onServe?: (options: VXRNConfig, app: Hono) => void;
 };
 export type HMRListener = (update: {
     file: string;

package/types/utils/getOptionsFilled.d.ts

@@ -17,11 +17,9 @@ export declare function getOptionsFilled(options: VXRNConfig, internal?: {
     host: string;
     root: string;
     port: number;
-    webConfig?: import("vite").InlineConfig | undefined;
-    nativeConfig?: import("vite").InlineConfig | undefined;
     flow?: import("@vxrn/vite-flow").Options | undefined;
     afterBuild?: ((props: import("..").AfterBuildProps) => void | Promise<void>) | undefined;
-    serve?: ((options: VXRNConfig, app: import("hono").Hono<import("hono").Env, import("hono/types").BlankSchema, "/">) => void) | undefined;
+    onServe?: ((options: VXRNConfig, app: import("hono").Hono<import("hono").Env, import("hono/types").BlankSchema, "/">) => void) | undefined;
 }>;
 type State = {
     applyPatches?: boolean;