vxrn 0.1.96 → 0.1.98

package/dist/esm/utils/getReactNativeBundle.mjs

@@ -3,7 +3,7 @@ import createViteFlow from "@vxrn/vite-flow";
 import viteReactPlugin from "@vxrn/vite-native-swc";
 import { readFile } from "node:fs/promises";
 import { dirname, join, relative } from "node:path";
-import { build, mergeConfig, resolveConfig, transformWithEsbuild } from "vite";
+import { createBuilder, resolveConfig, transformWithEsbuild } from "vite";
 import { nativeExtensions } from "../constants.mjs";
 import { resolveFile } from "./resolveFile.mjs";
 import { isBuildingNativeBundle, setIsBuildingNativeBundle } from "./isBuildingNativeBundle.mjs";
@@ -22,7 +22,8 @@ async function getReactNativeBundle(options, viteRNClientPlugin) {
       cacheDir
     } = options,
     {
-      depsToOptimize
+      depsToOptimize,
+      needsInterop
     } = getOptimizeDeps("build");
   if (process.env.LOAD_TMP_BUNDLE) {
     const tmpBundle = join(process.cwd(), "bundle.tmp.js");
@@ -70,6 +71,7 @@ async function getReactNativeBundle(options, viteRNClientPlugin) {
     clearScreen: !1,
     optimizeDeps: {
       include: depsToOptimize,
+      needsInterop,
       esbuildOptions: {
         jsx: "automatic"
       }
@@ -98,8 +100,9 @@ async function getReactNativeBundle(options, viteRNClientPlugin) {
       }
     }
   };
-  options.nativeConfig && (nativeBuildConfig = mergeConfig(nativeBuildConfig, options.nativeConfig)), await resolveConfig(nativeBuildConfig, "build");
-  const buildOutput = await build(nativeBuildConfig);
+  await resolveConfig(nativeBuildConfig, "build");
+  const builder = await createBuilder(nativeBuildConfig),
+    buildOutput = await builder.build(builder.environments.ios);
   if (!("output" in buildOutput)) throw "\u274C";
   let appCode = buildOutput.output.sort((a, b) => a.isEntry ? 1 : -1).map(outputModule => {
     if (outputModule.type == "chunk") {

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

@@ -3,7 +3,7 @@ import createViteFlow from "@vxrn/vite-flow";
 import viteReactPlugin from "@vxrn/vite-native-swc";
 import { readFile } from "node:fs/promises";
 import { dirname, join, relative } from "node:path";
-import { build, mergeConfig, resolveConfig, transformWithEsbuild } from "vite";
+import { createBuilder, resolveConfig, transformWithEsbuild } from "vite";
 import { nativeExtensions } from "../constants";
 import { resolveFile } from "./resolveFile";
 import { isBuildingNativeBundle, setIsBuildingNativeBundle } from "./isBuildingNativeBundle";
@@ -127,7 +127,7 @@ function getReactNativeBundle(options, viteRNClientPlugin) {
 }
 function _getReactNativeBundle() {
   return _getReactNativeBundle = _async_to_generator(function(options, viteRNClientPlugin) {
-    var root, port, cacheDir, depsToOptimize, tmpBundle, res, done, viteFlow, nativeBuildConfig, buildOutput, appCode, appRootParent, prebuilds, templateFile, template, out;
+    var root, port, cacheDir, _getOptimizeDeps, depsToOptimize, needsInterop, tmpBundle, res, done, viteFlow, nativeBuildConfig, builder, buildOutput, appCode, appRootParent, prebuilds, templateFile, template, out;
     function babelReanimated(input, filename) {
       return _babelReanimated.apply(this, arguments);
     }
@@ -161,7 +161,7 @@ function _getReactNativeBundle() {
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          return root = options.root, port = options.port, cacheDir = options.cacheDir, depsToOptimize = getOptimizeDeps("build").depsToOptimize, process.env.LOAD_TMP_BUNDLE ? (tmpBundle = join(process.cwd(), "bundle.tmp.js"), [
+          return root = options.root, port = options.port, cacheDir = options.cacheDir, _getOptimizeDeps = getOptimizeDeps("build"), depsToOptimize = _getOptimizeDeps.depsToOptimize, needsInterop = _getOptimizeDeps.needsInterop, process.env.LOAD_TMP_BUNDLE ? (tmpBundle = join(process.cwd(), "bundle.tmp.js"), [
             4,
             pathExists(tmpBundle)
           ]) : [
@@ -265,6 +265,7 @@ function _getReactNativeBundle() {
             clearScreen: !1,
             optimizeDeps: {
               include: depsToOptimize,
+              needsInterop,
               esbuildOptions: {
                 jsx: "automatic"
               }
@@ -292,16 +293,21 @@ function _getReactNativeBundle() {
                 }
               }
             }
-          }, options.nativeConfig && (nativeBuildConfig = mergeConfig(nativeBuildConfig, options.nativeConfig)), [
+          }, [
             4,
             resolveConfig(nativeBuildConfig, "build")
           ];
         case 6:
           return _state.sent(), [
             4,
-            build(nativeBuildConfig)
+            createBuilder(nativeBuildConfig)
           ];
         case 7:
+          return builder = _state.sent(), [
+            4,
+            builder.build(builder.environments.ios)
+          ];
+        case 8:
           if (buildOutput = _state.sent(), !("output" in buildOutput) || (appCode = buildOutput.output.sort(function(a, b) {
             return a.isEntry ? 1 : -1;
           }).map(function(outputModule) {
@@ -350,7 +356,7 @@ __require("`.concat(outputModule.fileName, `")
             4,
             readFile(templateFile, "utf-8")
           ];
-        case 8:
+        case 9:
           return template = _state.sent().replace("_virtual/virtual_react-native.js", relative(appRootParent, prebuilds.reactNative)).replace("_virtual/virtual_react.js", relative(appRootParent, prebuilds.react)).replaceAll("_virtual/virtual_react-jsx.js", relative(appRootParent, prebuilds.reactJSX)), out = template + appCode, done(out), setIsBuildingNativeBundle(null), [
             2,
             out

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/utils/Users/n8/vxrn/packages/vxrn/src/utils/getReactNativeBundle.ts"],
-  "mappings": "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",
-  "names": ["babel", "createViteFlow", "viteReactPlugin", "readFile", "dirname", "join", "relative", "build", "mergeConfig", "resolveConfig", "transformWithEsbuild", "nativeExtensions", "resolveFile", "isBuildingNativeBundle", "setIsBuildingNativeBundle", "swapPrebuiltReactModules", "reactNativeCommonJsPlugin", "getOptimizeDeps", "FSExtra", "pathExists", "entryRoot", "getReactNativeBundle", "options", "viteRNClientPlugin", "root", "port", "cacheDir", "depsToOptimize", "tmpBundle", "res", "done", "viteFlow", "nativeBuildConfig", "buildOutput", "appCode", "appRootParent", "prebuilds", "templateFile", "template", "out", "babelReanimated", "input", "filename", "Promise", "rej", "transform", "plugins", "err", "result", "code", "process", "env", "LOAD_TMP_BUNDLE", "cwd", "console", "info", "flow", "name", "id", "includes", "_state", "mode", "tsDecorators", "loader", "jsx", "filter", "Boolean", "appType", "clearScreen", "optimizeDeps", "include", "esbuildOptions", "resolve", "extensions", "define", "ssr", "minify", "commonjsOptions", "transformMixedEsModules", "rollupOptions", "entries", "native", "treeshake", "preserveEntrySignatures", "output", "preserveModules", "format", "nativeConfig", "sort", "a", "b", "map", "outputModule", "type", "importsMap", "currentPath", "fileName", "imports", "imp", "relativePath", "isEntry", "JSON", "stringify", "replaceAll", "reactJSX", "react", "reactNative", "replace"]
+  "mappings": "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",
+  "names": ["babel", "createViteFlow", "viteReactPlugin", "readFile", "dirname", "join", "relative", "createBuilder", "resolveConfig", "transformWithEsbuild", "nativeExtensions", "resolveFile", "isBuildingNativeBundle", "setIsBuildingNativeBundle", "swapPrebuiltReactModules", "reactNativeCommonJsPlugin", "getOptimizeDeps", "FSExtra", "pathExists", "entryRoot", "getReactNativeBundle", "options", "viteRNClientPlugin", "root", "port", "cacheDir", "depsToOptimize", "needsInterop", "tmpBundle", "res", "done", "viteFlow", "nativeBuildConfig", "builder", "buildOutput", "appCode", "appRootParent", "prebuilds", "templateFile", "template", "out", "babelReanimated", "input", "filename", "Promise", "rej", "transform", "plugins", "err", "result", "code", "process", "env", "LOAD_TMP_BUNDLE", "cwd", "console", "info", "flow", "name", "id", "includes", "_state", "mode", "tsDecorators", "loader", "jsx", "filter", "Boolean", "appType", "clearScreen", "optimizeDeps", "include", "esbuildOptions", "resolve", "extensions", "define", "build", "ssr", "minify", "commonjsOptions", "transformMixedEsModules", "rollupOptions", "entries", "native", "treeshake", "preserveEntrySignatures", "output", "preserveModules", "format", "environments", "ios", "sort", "a", "b", "map", "outputModule", "type", "importsMap", "currentPath", "fileName", "imports", "imp", "relativePath", "isEntry", "JSON", "stringify", "replaceAll", "reactJSX", "react", "reactNative", "replace"]
 }

package/dist/esm/utils/getViteServerConfig.js

@@ -1,11 +1,14 @@
-import { mergeConfig } from "vite";
+import { loadConfigFromFile, mergeConfig } from "vite";
 import { reactNativeHMRPlugin } from "../plugins/reactNativeHMRPlugin";
 import { coerceToArray } from "./coerceToArray";
 import { getBaseViteConfig } from "./getBaseViteConfig";
 import { getOptimizeDeps } from "./getOptimizeDeps";
 import { uniq } from "./uniq";
 async function getViteServerConfig(config) {
-  const { root, host } = config, { optimizeDeps } = getOptimizeDeps("serve");
+  const { root, host } = config, { optimizeDeps } = getOptimizeDeps("serve"), { config: userViteConfig } = await loadConfigFromFile({
+    mode: "dev",
+    command: "serve"
+  }) ?? {};
   let serverConfig = mergeConfig(
     getBaseViteConfig({
       mode: "development"
@@ -39,14 +42,14 @@ async function getViteServerConfig(config) {
         host
       }
     }
-  ), webConfig = config.webConfig || {};
-  if (webConfig && (serverConfig = mergeConfig(serverConfig, webConfig)), serverConfig.ssr?.noExternal && !Array.isArray(serverConfig.ssr?.noExternal))
+  );
+  if (userViteConfig && (serverConfig = mergeConfig(serverConfig, userViteConfig)), serverConfig.ssr?.noExternal && !Array.isArray(serverConfig.ssr?.noExternal))
     throw new Error("ssr.noExternal must be array");
-  return serverConfig.ssr ||= {}, serverConfig.ssr.optimizeDeps ||= {}, webConfig.ssr ||= {}, webConfig.ssr.optimizeDeps ||= {}, serverConfig.ssr.noExternal = uniq([
+  return userViteConfig && (serverConfig.ssr ||= {}, serverConfig.ssr.optimizeDeps ||= {}, userViteConfig.ssr ||= {}, userViteConfig.ssr.optimizeDeps ||= {}, serverConfig.ssr.noExternal = uniq([
     ...coerceToArray(serverConfig.ssr?.noExternal || []),
     ...serverConfig.ssr?.optimizeDeps.include || [],
-    ...webConfig.ssr?.optimizeDeps.include || [],
-    ...coerceToArray(webConfig.ssr?.noExternal || []),
+    ...userViteConfig.ssr?.optimizeDeps.include || [],
+    ...coerceToArray(userViteConfig.ssr?.noExternal || []),
     ...optimizeDeps.include,
     "react",
     "react-dom",
@@ -54,21 +57,21 @@ async function getViteServerConfig(config) {
     "react-dom/client"
   ]), serverConfig.ssr.optimizeDeps.exclude = uniq([
     ...serverConfig.ssr?.optimizeDeps.exclude || [],
-    ...webConfig.ssr?.optimizeDeps.exclude || [],
+    ...userViteConfig.ssr?.optimizeDeps.exclude || [],
     ...optimizeDeps.exclude
   ]), serverConfig.ssr.optimizeDeps.include = uniq([
     ...serverConfig.ssr?.optimizeDeps.include || [],
-    ...webConfig.ssr?.optimizeDeps.include || [],
+    ...userViteConfig.ssr?.optimizeDeps.include || [],
     ...optimizeDeps.include
   ]), serverConfig.ssr.optimizeDeps.needsInterop = uniq([
     ...serverConfig.ssr?.optimizeDeps.needsInterop || [],
-    ...webConfig.ssr?.optimizeDeps.needsInterop || [],
+    ...userViteConfig.ssr?.optimizeDeps.needsInterop || [],
     ...optimizeDeps.needsInterop
   ]), serverConfig.ssr.optimizeDeps.esbuildOptions = {
     ...serverConfig.ssr?.optimizeDeps.esbuildOptions || {},
-    ...webConfig.ssr?.optimizeDeps.esbuildOptions || {},
+    ...userViteConfig.ssr?.optimizeDeps.esbuildOptions || {},
     ...optimizeDeps.esbuildOptions
-  }, process.env.DEBUG && console.debug("merged config is", JSON.stringify(serverConfig, null, 2)), serverConfig = {
+  }), process.env.DEBUG && console.debug("merged config is", JSON.stringify(serverConfig, null, 2)), serverConfig = {
     ...serverConfig,
     plugins: [...serverConfig.plugins]
   }, serverConfig;

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/utils/getViteServerConfig.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": []
 }

package/dist/esm/utils/getViteServerConfig.mjs

@@ -1,4 +1,4 @@
-import { mergeConfig } from "vite";
+import { loadConfigFromFile, mergeConfig } from "vite";
 import { reactNativeHMRPlugin } from "../plugins/reactNativeHMRPlugin.mjs";
 import { coerceToArray } from "./coerceToArray.mjs";
 import { getBaseViteConfig } from "./getBaseViteConfig.mjs";
@@ -11,41 +11,46 @@ async function getViteServerConfig(config) {
     } = config,
     {
       optimizeDeps
-    } = getOptimizeDeps("serve");
+    } = getOptimizeDeps("serve"),
+    {
+      config: userViteConfig
+    } = (await loadConfigFromFile({
+      mode: "dev",
+      command: "serve"
+    })) ?? {};
   let serverConfig = mergeConfig(getBaseViteConfig({
-      mode: "development"
-    }), {
-      root,
-      appType: "custom",
-      clearScreen: !1,
-      plugins: [reactNativeHMRPlugin(config), {
-        name: "process-env-ssr",
-        transform(code, id, options) {
-          if (!id.includes("node_modules") && code.includes("process.env.TAMAGUI_IS_SERVER")) return code.replaceAll("process.env.TAMAGUI_IS_SERVER", `${!!options?.ssr}`);
-        }
-      }],
-      optimizeDeps,
-      ssr: {
-        optimizeDeps
-      },
-      server: {
-        watch: {
-          ignored: path => !1
-        },
-        hmr: {
-          path: "/__vxrnhmr"
-        },
-        cors: !0,
-        host
+    mode: "development"
+  }), {
+    root,
+    appType: "custom",
+    clearScreen: !1,
+    plugins: [reactNativeHMRPlugin(config), {
+      name: "process-env-ssr",
+      transform(code, id, options) {
+        if (!id.includes("node_modules") && code.includes("process.env.TAMAGUI_IS_SERVER")) return code.replaceAll("process.env.TAMAGUI_IS_SERVER", `${!!options?.ssr}`);
       }
-    }),
-    webConfig = config.webConfig || {};
-  if (webConfig && (serverConfig = mergeConfig(serverConfig, webConfig)), serverConfig.ssr?.noExternal && !Array.isArray(serverConfig.ssr?.noExternal)) throw new Error("ssr.noExternal must be array");
-  return serverConfig.ssr ||= {}, serverConfig.ssr.optimizeDeps ||= {}, webConfig.ssr ||= {}, webConfig.ssr.optimizeDeps ||= {}, serverConfig.ssr.noExternal = uniq([...coerceToArray(serverConfig.ssr?.noExternal || []), ...(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 = {
+    }],
+    optimizeDeps,
+    ssr: {
+      optimizeDeps
+    },
+    server: {
+      watch: {
+        ignored: path => !1
+      },
+      hmr: {
+        path: "/__vxrnhmr"
+      },
+      cors: !0,
+      host
+    }
+  });
+  if (userViteConfig && (serverConfig = mergeConfig(serverConfig, userViteConfig)), serverConfig.ssr?.noExternal && !Array.isArray(serverConfig.ssr?.noExternal)) throw new Error("ssr.noExternal must be array");
+  return userViteConfig && (serverConfig.ssr ||= {}, serverConfig.ssr.optimizeDeps ||= {}, userViteConfig.ssr ||= {}, userViteConfig.ssr.optimizeDeps ||= {}, serverConfig.ssr.noExternal = uniq([...coerceToArray(serverConfig.ssr?.noExternal || []), ...(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 || {}),
-    ...(webConfig.ssr?.optimizeDeps.esbuildOptions || {}),
+    ...(userViteConfig.ssr?.optimizeDeps.esbuildOptions || {}),
     ...optimizeDeps.esbuildOptions
-  }, process.env.DEBUG && console.debug("merged config is", JSON.stringify(serverConfig, null, 2)), serverConfig = {
+  }), process.env.DEBUG && console.debug("merged config is", JSON.stringify(serverConfig, null, 2)), serverConfig = {
     ...serverConfig,
     plugins: [...serverConfig.plugins]
   }, serverConfig;

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.98",
   "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.98",
+    "@vxrn/safe-area": "0.1.98",
+    "@vxrn/vite-flow": "0.1.98",
+    "@vxrn/vite-native-swc": "0.1.98",
     "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) {