one 1.25.16 → 1.26.0

package/dist/esm/vite/plugins/useDomPlugin.native.js

@@ -1,5 +1,4 @@
-import { extname } from "path";
-import * as swc from "@swc/core";
+import { parseSync } from "oxc-parser";
 function useDOMPlugin() {
   return {
     name: "one-vite-dom-plugin",
@@ -7,37 +6,27 @@ function useDOMPlugin() {
       if (!code.includes("use dom")) {
         return;
       }
-      var ext = extname(id);
-      var mod = swc.parseSync(code, parseOpts(ext));
-      var hasUseDom = false;
-      for (var i = 0; i < mod.body.length; ++i) {
-        var item = mod.body[i];
-        if (item.type === "ExpressionStatement") {
-          if (item.expression.type === "StringLiteral") {
-            if (item.expression.value === "use dom") {
+      try {
+        var parsed = parseSync(id, code);
+        var hasUseDom = false;
+        for (var i = 0; i < parsed.program.body.length; ++i) {
+          var item = parsed.program.body[i];
+          if (item.type === "ExpressionStatement") {
+            var _item_expression, _item_expression1, _item_expression2, _item_expression3;
+            if (item.directive === "use dom" || ((_item_expression = item.expression) === null || _item_expression === void 0 ? void 0 : _item_expression.type) === "Literal" && ((_item_expression1 = item.expression) === null || _item_expression1 === void 0 ? void 0 : _item_expression1.value) === "use dom" || ((_item_expression2 = item.expression) === null || _item_expression2 === void 0 ? void 0 : _item_expression2.type) === "StringLiteral" && ((_item_expression3 = item.expression) === null || _item_expression3 === void 0 ? void 0 : _item_expression3.value) === "use dom") {
               hasUseDom = true;
               break;
             }
           }
-        } else {}
-      }
-      if (!hasUseDom) {
+        }
+        if (!hasUseDom) {
+          return;
+        }
+      } catch (unused) {
         return;
       }
     }
   };
 }
-var parseOpts = function (ext) {
-  if (ext === ".ts" || ext === ".tsx") {
-    return {
-      syntax: "typescript",
-      tsx: ext.endsWith("x")
-    };
-  }
-  return {
-    syntax: "ecmascript",
-    jsx: ext.endsWith("x")
-  };
-};
 export { useDOMPlugin };
 //# sourceMappingURL=useDomPlugin.native.js.map

package/dist/esm/vite/plugins/useDomPlugin.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["extname","swc","useDOMPlugin","name","transform","code","id","options","includes","ext","mod","parseSync","parseOpts","hasUseDom","i","body","length","item","type","expression","value","syntax","tsx","endsWith","jsx"],"sources":["../../../../src/vite/plugins/useDomPlugin.ts"],"sourcesContent":[null],"mappings":"AAwBA,SAASA,OAAA,QAAe;AACxB,YAAYC,GAAA,MAAS;AAOd,SAASC,aAAA,EAAuB;EACrC,OAAO;IACLC,IAAA,EAAM;IAEN,MAAMC,UAAUC,IAAA,EAAMC,EAAA,EAAIC,OAAA,EAAS;MACjC,IAAI,CAACF,IAAA,CAAKG,QAAA,CAAS,SAAS,GAAG;QAC7B;MACF;MAEA,IAAAC,GAAM,GAAAT,OAAM,CAAAM,EAAQ;MACpB,IAAAI,GAAM,GAAAT,GAAM,CAAAU,SAAI,CAAAN,IAAU,EAAAO,SAAM,CAAAH,GAAU,EAAG;MAE7C,IAAII,SAAA,GAAY;MAEhB,SAASC,CAAA,GAAI,GAAGA,CAAA,GAAIJ,GAAA,CAAIK,IAAA,CAAKC,MAAA,EAAQ,EAAEF,CAAA,EAAG;QACxC,IAAAG,IAAM,GAAAP,GAAO,CAAAK,IAAI,CAAAD,CAAA,CAAK;QACtB,IAAIG,IAAA,CAAKC,IAAA,KAAS,uBAAuB;UACvC,IAAID,IAAA,CAAKE,UAAA,CAAWD,IAAA,KAAS,iBAAiB;YAC5C,IAAID,IAAA,CAAKE,UAAA,CAAWC,KAAA,KAAU,WAAW;cACvCP,SAAA,GAAY;cACZ;YACF;UACF;QACF,OAAO,CAGP;MACF;MAEA,IAAI,CAACA,SAAA,EAAW;QACd;MACF;IAGF;EACF;AACF;AAEA,IAAAD,SAAM,YAAAA,CAAaH,GAAgB;EACjC,IAAIA,GAAA,KAAQ,SAASA,GAAA,KAAQ,QAAQ;IACnC,OAAO;MACLY,MAAA,EAAQ;MACRC,GAAA,EAAKb,GAAA,CAAIc,QAAA,CAAS,GAAG;IACvB;EACF;EAGA,OAAO;IACLF,MAAA,EAAQ;IACRG,GAAA,EAAKf,GAAA,CAAIc,QAAA,CAAS,GAAG;EACvB;AACF","ignoreList":[]}
+{"version":3,"names":["parseSync","useDOMPlugin","name","transform","code","id","options","includes","parsed","hasUseDom","i","program","body","length","item","type","_item_expression","_item_expression1","_item_expression2","_item_expression3","directive","expression","value","unused"],"sources":["../../../../src/vite/plugins/useDomPlugin.ts"],"sourcesContent":[null],"mappings":"AAyBA,SAASA,SAAA,QAAiB;AAOnB,SAASC,aAAA,EAAuB;EACrC,OAAO;IACLC,IAAA,EAAM;IAEN,MAAMC,UAAUC,IAAA,EAAMC,EAAA,EAAIC,OAAA,EAAS;MACjC,IAAI,CAACF,IAAA,CAAKG,QAAA,CAAS,SAAS,GAAG;QAC7B;MACF;MAEA,IAAI;QACF,IAAAC,MAAM,GAAAR,SAAS,CAAAK,EAAU,EAAAD,IAAI;QAC7B,IAAIK,SAAA,GAAY;QAEhB,SAASC,CAAA,GAAI,GAAGA,CAAA,GAAIF,MAAA,CAAOG,OAAA,CAAQC,IAAA,CAAKC,MAAA,EAAQ,EAAEH,CAAA,EAAG;UACnD,IAAAI,IAAM,GAAAN,MAAO,CAAAG,OAAO,CAAAC,IAAQ,CAAAF,CAAA,CAAK;UACjC,IAAII,IAAA,CAAKC,IAAA,KAAS,uBAAuB;YACvC,IACGC,gBAAa,EAAAC,iBACZ,EAAaC,iBAAY,EAAAC,iBACxB;YAIH,IAAAL,IAAA,CAAAM,SAAY,oBAAAJ,gBAAA,GAAAF,IAAA,CAAAO,UAAA,cAAAL,gBAAA,uBAAAA,gBAAA,CAAAD,IAAA,qBAAAE,iBAAA,GAAAH,IAAA,CAAAO,UAAA,cAAAJ,iBAAA,uBAAAA,iBAAA,CAAAK,KAAA,qBAAAJ,iBAAA,GAAAJ,IAAA,CAAAO,UAAA,cAAAH,iBAAA,uBAAAA,iBAAA,CAAAH,IAAA,2BAAAI,iBAAA,GAAAL,IAAA,CAAAO,UAAA,cAAAF,iBAAA,uBAAAA,iBAAA,CAAAG,KAAA;cACZb,SAAA;cACF;YACF;UACF;QAEA;QACE,KAAAA,SAAA;UACF;QAGF;MACE,SAAAc,MAAA;QACF;MACF;IACF;EACF","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "one",
-  "version": "1.25.16",
+  "version": "1.26.0",
   "license": "BSD-3-Clause",
   "sideEffects": [
     "setup.mjs",
@@ -91,6 +91,11 @@
       "import": "./dist/esm/babel-preset/index.mjs",
       "require": "./dist/cjs/babel-preset/index.cjs"
     },
+    "./native-transforms": {
+      "types": "./types/native-transforms.d.ts",
+      "import": "./dist/esm/native-transforms.mjs",
+      "require": "./dist/cjs/native-transforms.cjs"
+    },
     "./metro-config": {
       "types": "./types/metro-config/withOne.d.ts",
       "import": "./dist/esm/metro-config/withOne.mjs",
@@ -191,20 +196,19 @@
     "@react-navigation/native-stack": "~7.18.8",
     "@react-navigation/routers": "~7.6.4",
     "@cloudflare/vite-plugin": "^1.33.1",
-    "@swc/core": "^1.14.0",
     "@ungap/structured-clone": "^1.2.0",
-    "@vxrn/color-scheme": "1.25.16",
-    "@vxrn/compiler": "1.25.16",
-    "@vxrn/resolve": "1.25.16",
-    "@vxrn/tslib-lite": "1.25.16",
-    "@vxrn/use-isomorphic-layout-effect": "1.25.16",
-    "@vxrn/vite-plugin-metro": "1.25.16",
+    "@vxrn/color-scheme": "1.26.0",
+    "@vxrn/compiler": "1.26.0",
+    "@vxrn/resolve": "1.26.0",
+    "@vxrn/tslib-lite": "1.26.0",
+    "@vxrn/use-isomorphic-layout-effect": "1.26.0",
+    "@vxrn/vite-plugin-metro": "1.26.0",
     "babel-dead-code-elimination": "1.0.10",
     "babel-plugin-module-resolver": "^5.0.2",
     "babel-preset-expo": "~57.0.5",
     "citty": "^0.1.6",
     "core-js": "^3.38.1",
-    "create-vxrn": "1.25.16",
+    "create-vxrn": "1.26.0",
     "escape-string-regexp": "^5.0.0",
     "expo-linking": "~57.0.5",
     "expo-modules-core": "~57.0.10",
@@ -213,6 +217,7 @@
     "fs-extra": "^11.2.0",
     "hono": "^4.12.8",
     "lightningcss": "^1.30.1",
+    "magic-string": "^0.30.21",
     "micromatch": "^4.0.8",
     "nanoid": "^3.3.18",
     "oxc-parser": "^0.112.0",
@@ -224,7 +229,7 @@
     "tsconfig-paths": "^4",
     "use-latest-callback": "^0.2.3",
     "vite": "^8.2.2",
-    "vxrn": "1.25.16",
+    "vxrn": "1.26.0",
     "web-streams-polyfill": "^4.3.0",
     "ws": "^8.21.0",
     "xxhashjs": "^0.2.2"

package/src/createApp.tsx

@@ -298,4 +298,3 @@ export function createApp(options: CreateAppProps) {
       }
     })
 }
-

package/src/headless.tsx

@@ -57,4 +57,3 @@ export function createApp(options: CreateHeadlessAppProps) {
       }
     })
 }
-

package/src/native-transforms.ts

@@ -0,0 +1,11 @@
+/**
+ * The transforms one needs applied to native bundles, in a form the metro
+ * transformer worker can reach.
+ *
+ * The worker lives in `@vxrn/vite-plugin-metro`, which one depends on, so it
+ * cannot import from here directly — it resolves this subpath out of the user's
+ * own `one` install instead. Everything re-exported here must stay free of
+ * vite: the worker runs in a bare node process.
+ */
+
+export { transformTreeShakeClient } from './vite/plugins/clientTreeShakePlugin'

package/src/router/useViteRoutes.test.ts

@@ -2,22 +2,113 @@ import { afterEach, describe, expect, it, vi } from 'vitest'
 
 const mocks = vi.hoisted(() => ({
   hmrImport: vi.fn(),
+  diagnoseRouteLoadFailure: vi.fn(),
 }))
 
 vi.mock('./hmrImport', () => ({
   hmrImport: mocks.hmrImport,
 }))
 
+vi.mock('./diagnoseRouteLoadFailure', () => ({
+  diagnoseRouteLoadFailure: mocks.diagnoseRouteLoadFailure,
+}))
+
 import { globbedRoutesToRouteContext } from './useViteRoutes'
 
 const realWindow = (globalThis as any).window
 
 afterEach(() => {
   vi.unstubAllEnvs()
+  vi.unstubAllGlobals()
+  vi.restoreAllMocks()
   mocks.hmrImport.mockReset()
+  mocks.diagnoseRouteLoadFailure.mockReset()
   ;(globalThis as any).window = realWindow
 })
 
+describe('route load error diagnostics', () => {
+  it.each(['native', 'server', 'web shim', 'browser'])(
+    '%s preserves the original route error',
+    async (environment) => {
+      vi.stubEnv('NODE_ENV', 'development')
+      vi.stubEnv('TAMAGUI_TARGET', environment === 'native' ? 'native' : 'web')
+      vi.stubGlobal(
+        'window',
+        environment === 'server'
+          ? undefined
+          : environment === 'browser'
+            ? {
+                history: {},
+                location: { href: 'http://localhost/', origin: 'http://localhost' },
+              }
+            : {}
+      )
+      const report = vi.fn()
+      vi.stubGlobal('__oneReportRouteLoadError', report)
+      vi.spyOn(console, 'error').mockImplementation(() => {})
+      mocks.diagnoseRouteLoadFailure.mockResolvedValue(null)
+      vi.resetModules()
+      const { globbedRoutesToRouteContext } = await import('./useViteRoutes')
+      const error = new Error('original route failure')
+      const context = globbedRoutesToRouteContext(
+        { '/app/index.tsx': () => Promise.reject(error) },
+        'app'
+      )
+
+      const route = await resolveRoute(context)
+
+      expect(route.default()).toBeNull()
+      expect(report).toHaveBeenCalledExactlyOnceWith({
+        id: './index.tsx',
+        message: error.message,
+        stack: error.stack,
+      })
+      if (environment === 'browser') {
+        expect(mocks.diagnoseRouteLoadFailure).toHaveBeenCalledExactlyOnceWith(
+          './index.tsx',
+          '/app/index.tsx'
+        )
+      } else {
+        expect(mocks.diagnoseRouteLoadFailure).not.toHaveBeenCalled()
+      }
+    }
+  )
+
+  it('keeps the original report when a browser diagnostic rejects', async () => {
+    vi.stubEnv('NODE_ENV', 'development')
+    vi.stubEnv('TAMAGUI_TARGET', 'web')
+    vi.stubGlobal('window', {
+      history: {},
+      location: { href: 'http://localhost/', origin: 'http://localhost' },
+    })
+    const report = vi.fn()
+    vi.stubGlobal('__oneReportRouteLoadError', report)
+    vi.spyOn(console, 'error').mockImplementation(() => {})
+    mocks.diagnoseRouteLoadFailure.mockRejectedValue(new Error('diagnostic failed'))
+    vi.resetModules()
+    const { globbedRoutesToRouteContext } = await import('./useViteRoutes')
+    const error = new Error('original route failure')
+    const context = globbedRoutesToRouteContext(
+      { '/app/index.tsx': () => Promise.reject(error) },
+      'app'
+    )
+
+    const route = await resolveRoute(context)
+    await new Promise((resolve) => setImmediate(resolve))
+
+    expect(route.default()).toBeNull()
+    expect(report).toHaveBeenCalledExactlyOnceWith({
+      id: './index.tsx',
+      message: error.message,
+      stack: error.stack,
+    })
+    expect(mocks.diagnoseRouteLoadFailure).toHaveBeenCalledExactlyOnceWith(
+      './index.tsx',
+      '/app/index.tsx'
+    )
+  })
+})
+
 async function resolveRoute(context: ReturnType<typeof globbedRoutesToRouteContext>) {
   try {
     return context('./index.tsx')

package/src/router/useViteRoutes.tsx

@@ -1,5 +1,6 @@
 import type { GlobbedRouteImports } from '../types'
 import type { One } from '../vite/types'
+import { hasWebHistory } from '../constants'
 import { handleSkewError, isChunkLoadError } from '../utils/dynamicImport'
 import { diagnoseRouteLoadFailure } from './diagnoseRouteLoadFailure'
 import { hmrImport } from './hmrImport'
@@ -316,10 +317,12 @@ export function globbedRoutesToRouteContext(
             // `Importing a module script failed` names neither the module nor
             // the reason. when a browser content blocker refused one of the
             // route's imports, walking the graph finds the exact file.
-            if (process.env.NODE_ENV === 'development' && routePaths[id]) {
-              diagnoseRouteLoadFailure(id, routePaths[id]).then((message) => {
-                if (message) console.error(message)
-              })
+            if (hasWebHistory && routePaths[id]) {
+              diagnoseRouteLoadFailure(id, routePaths[id])
+                .then((message) => {
+                  if (message) console.error(message)
+                })
+                .catch(() => {})
             }
           }
           loadedRoutes[id] = {

package/src/vercel/build/generate/createApiServerlessFunction.ts

@@ -1,8 +1,6 @@
 import { dirname, join, resolve } from 'node:path'
-import generator from '@babel/generator'
-import parser from '@babel/parser'
-import traverse from '@babel/traverse'
-import t from '@babel/types'
+import { parseSync } from 'oxc-parser'
+import MagicString from 'magic-string'
 import { resolvePath } from '@vxrn/resolve'
 import FSExtra from 'fs-extra'
 
@@ -86,114 +84,69 @@ export async function createApiServerlessFunction(
  * So we need to wrap the handler function to parse the params from the request,
  * and pass them to the handler function.
  */
-function wrapHandlerFunctions(code) {
-  const ast = parser.parse(code, {
-    sourceType: 'module',
-  })
-
-  // TODO: idk why the TypeScript type does not match the actual type. Seems that we should use `traverse.default`, but TypeScript thinks we should use `traverse` directly.
-  ;((traverse as any).default as typeof traverse)(ast, {
-    FunctionDeclaration(path) {
-      const { node } = path
-
-      const functionNamesToHandle = [
-        'GET',
-        'POST',
-        'PUT',
-        'PATCH',
-        'DELETE',
-        'HEAD',
-        'OPTIONS',
-        // TODO: more possibilities?
-      ]
-
-      if (!node.id || !functionNamesToHandle.includes(node.id.name)) return
-      // TODO: may need to also check if the function is export in any way, if
-      // the isn't exported at all, we can skip.
-      if (node.extra && node.extra.isWrapper) return
-      if (node.extra && node.extra.isWrapped) return
-
-      const originalName = `orig_${node.id.name}`
-
-      const originalFunction = t.functionDeclaration(
-        t.identifier(originalName),
-        node.params,
-        node.body,
-        node.generator,
-        node.async
-      )
+function wrapHandlerFunctions(code: string): string {
+  let parsed: any
+  try {
+    parsed = parseSync('api.js', code)
+  } catch {
+    return code
+  }
 
-      /* The first argument of the handler function, which is the request object. */
-      const requestIdentifier = t.identifier('request')
-      const wrapperParams = [requestIdentifier]
-
-      /* A local variable in the wrapper function to hold the URL object. */
-      const urlIdentifier = t.identifier('url')
-      /* A local variable in the wrapper function to hold parsed params. */
-      const paramsIdentifier = t.identifier('params')
-
-      const urlDecl = t.variableDeclaration('const', [
-        t.variableDeclarator(
-          urlIdentifier,
-          t.newExpression(t.identifier('URL') /* Node.js global */, [
-            t.memberExpression(requestIdentifier, t.identifier('url')) /* request.url */,
-          ])
-        ),
-      ])
-
-      const paramsDecl = t.variableDeclaration('const', [
-        t.variableDeclarator(
-          paramsIdentifier,
-          t.callExpression(
-            t.memberExpression(t.identifier('Object'), t.identifier('fromEntries')),
-            [
-              t.callExpression(
-                t.memberExpression(
-                  t.memberExpression(
-                    urlIdentifier,
-                    t.identifier('searchParams')
-                  ) /* url.searchParams */,
-                  t.identifier('entries')
-                ),
-                []
-              ),
-            ]
-          )
-        ),
-      ])
-
-      const callOrigFnStatement = t.callExpression(t.identifier(originalName), [
-        requestIdentifier,
-        t.objectExpression([t.objectProperty(t.identifier('params'), paramsIdentifier)]),
-      ])
-
-      const wrapperFunction = t.functionDeclaration(
-        t.identifier(node.id.name + ''),
-        wrapperParams,
-        t.blockStatement([urlDecl, paramsDecl, t.returnStatement(callOrigFnStatement)])
-        // No need to care if the wrapper function should be async,
-        // since we didn't use any await in the wrapper function, and we'll
-        // just return what the original function returns.
-      )
+  if (!parsed?.program) return code
+
+  const functionNamesToHandle = new Set([
+    'GET',
+    'POST',
+    'PUT',
+    'PATCH',
+    'DELETE',
+    'HEAD',
+    'OPTIONS',
+  ])
+
+  const ms = new MagicString(code)
+  const wrappersToAppend: string[] = []
+
+  for (const item of parsed.program.body || []) {
+    let fnDecl: any = null
+    let isExported = false
+    let exportNode: any = null
+
+    if (
+      item.type === 'ExportNamedDeclaration' &&
+      item.declaration?.type === 'FunctionDeclaration'
+    ) {
+      fnDecl = item.declaration
+      isExported = true
+      exportNode = item
+    } else if (item.type === 'FunctionDeclaration') {
+      fnDecl = item
+      isExported = false
+    }
+
+    if (!fnDecl || !fnDecl.id?.name || !functionNamesToHandle.has(fnDecl.id.name)) {
+      continue
+    }
+
+    const name = fnDecl.id.name
+    const originalName = `orig_${name}`
+
+    if (isExported) {
+      ms.remove(exportNode.start, fnDecl.start)
+    }
+
+    ms.overwrite(fnDecl.id.start, fnDecl.id.end, originalName)
+
+    const exportPrefix = isExported ? 'export ' : ''
+    wrappersToAppend.push(
+      `\n${exportPrefix}function ${name}(request) {\n  const url = new URL(request.url);\n  const params = Object.fromEntries(url.searchParams.entries());\n  return ${originalName}(request, { params });\n}`
+    )
+  }
+
+  if (wrappersToAppend.length > 0) {
+    ms.append(wrappersToAppend.join('\n'))
+    return ms.toString()
+  }
 
-      node.extra = node.extra || {}
-      node.extra.isWrapped = true
-
-      wrapperFunction.extra = wrapperFunction.extra || {}
-      wrapperFunction.extra.isWrapper = true
-
-      if (path.parentPath.isExportNamedDeclaration()) {
-        path.replaceWithMultiple([
-          originalFunction,
-          t.exportNamedDeclaration(wrapperFunction, []),
-        ])
-      } else {
-        path.replaceWithMultiple([originalFunction, wrapperFunction])
-      }
-    },
-  })
-
-  // TODO: idk why the TypeScript type does not match the actual type. Seems that we should use `generator.default`, but TypeScript thinks we should use `generator` directly.
-  const output = ((generator as any).default as typeof generator)(ast, {}).code
-  return output
+  return code
 }

package/src/vite/one.ts

@@ -87,7 +87,19 @@ export function one(options: One.PluginOptions = {}): PluginOption {
     | (MetroOptions & ExpoManifestRequestHandlerPluginPluginOptions)
     | null = (() => {
     if (nativeDisabled) return null
-    if (nativeOptions?.bundler !== 'metro' && !process.env.ONE_METRO_MODE) return null
+    if (nativeOptions?.bundler !== 'metro' && !process.env.ONE_METRO_MODE) {
+      // the vite native bundler runs no babel and has nowhere to put a babel
+      // plugin, so anything configured here is dropped. that is silent by
+      // default, and a dropped plugin usually means a broken bundle rather than
+      // a missing optimization, so name it.
+      const dropped = nativeOptions?.bundlerOptions as any
+      if (dropped?.babelConfig || dropped?.babelConfigOverrides) {
+        console.warn(
+          `[one] native.bundlerOptions configures babel plugins, but native.bundler is "${nativeOptions?.bundler}", which runs no babel. Those plugins will not run and whatever they were rewriting will reach the bundle untransformed.`
+        )
+      }
+      return null
+    }
 
     if (process.env.ONE_METRO_MODE) {
       console.info('ONE_METRO_MODE environment variable is set, enabling Metro mode')
@@ -842,11 +854,19 @@ export function one(options: One.PluginOptions = {}): PluginOption {
   // TODO move to single config and through environments
   const nativeWebDevAndProdPlugsin: Plugin[] = [clientTreeShakePlugin({ routerRoot })]
 
-  // TODO make this passed into vxrn through real API
+  // TODO move this handoff off globalThis, like the other one -> vxrn options
   if (!nativeDisabled) {
+    // the native bundler is its own rolldown instance rather than a vite
+    // environment, so nothing in `config.plugins` reaches it. one's own plugins
+    // go first, then whatever the app opted in through native.bundlerOptions.
+    const viteBundlerOptions =
+      nativeOptions?.bundler === 'metro' ? undefined : (nativeOptions?.bundlerOptions as any)
+
     globalThis.__vxrnAddNativePlugins = [
       clientTreeShakePlugin({ runtime: 'rolldown', routerRoot }),
+      ...(viteBundlerOptions?.plugins ?? []),
     ]
+    ;(globalThis as any).__vxrnNativeUserDefine = viteBundlerOptions?.define
   }
   globalThis.__vxrnAddWebPluginsProd = devAndProdPlugins