vxrn 0.1.47 → 0.1.49

package/src/exports/dev.ts

@@ -13,7 +13,6 @@ import { createServer as nodeCreateServer } from 'node:http'
 import { dirname, join, relative, resolve } from 'node:path'
 import readline from 'node:readline'
 import { WebSocket } from 'ws'
-
 import * as babel from '@babel/core'
 import { buildReact, buildReactJSX, buildReactNative } from '@vxrn/react-native-prebuilt'
 import viteReactPlugin, { swcTransform, transformForBuild } from '@vxrn/vite-native-swc'
@@ -33,7 +32,7 @@ import {
 import createViteFlow from '@vxrn/vite-flow'
 import type { Peer } from 'crossws'
 import { resolve as importMetaResolve } from 'import-meta-resolve'
-import { depsToOptimize, nativeExtensions, optimizeDeps } from '../constants'
+import { nativeExtensions } from '../constants'
 import { clientInjectionsPlugin } from '../plugins/clientInjectPlugin'
 import { reactNativeCommonJsPlugin } from '../plugins/reactNativeCommonJsPlugin'
 import type { VXRNConfig } from '../types'
@@ -41,6 +40,7 @@ import { getBaseViteConfig } from '../utils/getBaseViteConfig'
 import { getOptionsFilled, type VXRNConfigFilled } from '../utils/getOptionsFilled'
 import { getVitePath } from '../utils/getVitePath'
 import { checkPatches } from '../utils/patches'
+import { getOptimizeDeps } from '../utils/getOptimizeDeps'
 
 // sorry for the mess, exploring before abstracting
 
@@ -178,7 +178,6 @@ export const dev = async ({ clean, ...rest }: VXRNConfig & { clean?: boolean })
   const { handleUpgrade } = wsAdapter(app.websocket)
 
   // vite hmr two way bridge:
-  // vite hmr:
   app.use(
     '/__vxrnhmr',
     defineEventHandler({
@@ -295,11 +294,14 @@ export const dev = async ({ clean, ...rest }: VXRNConfig & { clean?: boolean })
   )
 
   // Define proxy event handler
-  const proxyEventHandler = createProxyEventHandler({
-    target: `http://127.0.0.1:${vitePort}`,
-    enableLogger: !!process.env.DEBUG,
-  })
-  app.use(eventHandler(proxyEventHandler))
+  app.use(
+    eventHandler(
+      createProxyEventHandler({
+        target: `http://127.0.0.1:${vitePort}`,
+        enableLogger: process.env.DEBUG?.startsWith('vxrn'),
+      })
+    )
+  )
 
   const server = nodeCreateServer(toNodeListener(app))
 
@@ -314,21 +316,23 @@ export const dev = async ({ clean, ...rest }: VXRNConfig & { clean?: boolean })
 
       console.info(`Server running on http://localhost:${port}`)
 
-      // bridge socket between vite
-      if (vitePort) {
-        socket = new WebSocket(`ws://localhost:${vitePort}/__vxrnhmr`, 'vite-hmr')
+      server.once('listening', () => {
+        // bridge socket between vite
+        if (vitePort) {
+          socket = new WebSocket(`ws://127.0.0.1:${vitePort}/__vxrnhmr`, 'vite-hmr')
 
-        socket.on('message', (msg) => {
-          const message = msg.toString()
-          for (const listener of [...clients]) {
-            listener.send(message)
-          }
-        })
+          socket.on('message', (msg) => {
+            const message = msg.toString()
+            for (const listener of [...clients]) {
+              listener.send(message)
+            }
+          })
 
-        socket.on('error', (err) => {
-          console.info('error bridging socket to vite', err)
-        })
-      }
+          socket.on('error', (err) => {
+            console.info('error bridging socket to vite', err)
+          })
+        }
+      })
 
       return {
         closePromise: new Promise((res) => viteServer.httpServer?.on('close', res)),
@@ -343,6 +347,7 @@ export const dev = async ({ clean, ...rest }: VXRNConfig & { clean?: boolean })
 
 async function getReactNativeBundle(options: VXRNConfigFilled, viteRNClientPlugin: any) {
   const { root, port, cacheDir } = options
+  const { depsToOptimize } = getOptimizeDeps('build')
 
   if (process.env.LOAD_TMP_BUNDLE) {
     // for easier quick testing things:
@@ -771,6 +776,7 @@ let entryRoot = ''
 
 async function getViteServerConfig(config: VXRNConfigFilled) {
   const { root, host, webConfig } = config
+  const { optimizeDeps } = getOptimizeDeps('serve')
 
   let serverConfig: UserConfig = mergeConfig(
     getBaseViteConfig({
@@ -792,6 +798,7 @@ async function getViteServerConfig(config: VXRNConfigFilled) {
           },
         },
       ],
+
       optimizeDeps,
 
       ssr: {

package/src/utils/assert.ts

@@ -0,0 +1,5 @@
+export function assertIsError(error: unknown): asserts error is Error {
+  if (!(error instanceof Error)) {
+    throw error
+  }
+}

package/src/utils/getOptimizeDeps.ts

@@ -0,0 +1,124 @@
+import { optimizeDeps, type UserConfig } from 'vite'
+import { webExtensions } from '../constants'
+
+export function getOptimizeDeps(mode: 'build' | 'serve') {
+  const needsInterop = [
+    'react',
+    'react/jsx-runtime',
+    'react/jsx-dev-runtime',
+    'react-native-web-internals',
+    'react-dom',
+    'react-native-web',
+    'react-dom/server',
+    'react-dom/client',
+    'url-parse',
+    '@vxrn/safe-area',
+    'query-string',
+    'escape-string-regexp',
+    'use-latest-callback',
+    'react-is',
+    'fast-deep-equal',
+    'react-native-svg',
+    '@supabase/auth-helpers-react',
+    'parse-numeric-range',
+    'use-sync-external-store',
+    'use-sync-external-store/shim',
+    'expo-constants',
+    'expo-linking',
+    'uuid',
+    '@react-navigation/core',
+    '@react-navigation/native',
+    '@react-navigation/elements',
+    '@react-navigation/bottom-tabs',
+    '@react-navigation/native-stack',
+    'inline-style-prefixer',
+    '@docsearch/react',
+    '@algolia/autocomplete-core',
+    '@algolia/autocomplete-plugin-algolia-insights',
+    '@algolia/autocomplete-shared',
+    'react-native-reanimated',
+    'moti',
+  ]
+
+  const depsToOptimize = [
+    ...needsInterop,
+    'requires-port',
+    'querystringify',
+    'compare-versions',
+    'strict-uri-encode',
+    'decode-uri-component',
+    'split-on-first',
+    'filter-obj',
+    'scheduler',
+    'warn-once',
+    '@radix-ui/react-compose-refs',
+    '@radix-ui/react-slot',
+    'expo-splash-screen',
+    'nanoid',
+    'swr',
+    'refractor/lang/tsx',
+    'invariant',
+    'tamagui/linear-gradient',
+    '@tamagui/linear-gradient',
+    '@react-native/normalize-color',
+    '@vxrn/router',
+    'expo-modules-core',
+    'expo-status-bar',
+    'react-native-web',
+    'react-native-web-lite',
+    'react-native',
+    '@floating-ui/react',
+    '@floating-ui/react-dom',
+    '@tamagui/constants',
+    '@tamagui/react-native-use-responder-events',
+    '@tamagui/alert-dialog',
+    '@react-navigation/routers',
+    '@tamagui/simple-hash',
+    '@tamagui/use-did-finish-ssr',
+    '@tamagui/use-event',
+    '@tamagui/portal',
+    '@tamagui/compose-refs',
+    '@tamagui/avatar',
+    '@tamagui/core',
+    '@tamagui/dialog',
+    '@tamagui/group',
+    '@tamagui/helpers-icon',
+    '@tamagui/helpers',
+    '@tamagui/image',
+    '@tamagui/lucide-icons',
+    '@tamagui/popover',
+    '@tamagui/popper',
+    '@tamagui/scroll-view',
+    '@tamagui/select',
+    '@tamagui/sheet',
+    '@tamagui/switch',
+    '@tamagui/tabs',
+    '@tamagui/toast',
+    '@tamagui/toggle-group',
+    '@tamagui/tooltip',
+    '@tamagui/use-window-dimensions',
+    '@tamagui/web',
+    'tamagui',
+    'react-native-web',
+    'react-native-web-lite',
+    'reforest',
+  ]
+
+  if (mode === 'build') {
+    // breaks in serve mode
+    depsToOptimize.push('@babel/runtime')
+  }
+
+  return {
+    needsInterop,
+    depsToOptimize,
+    optimizeDeps: {
+      include: depsToOptimize,
+      exclude: ['util', '@swc/wasm', '@swc/core-darwin-arm64'],
+      needsInterop,
+      esbuildOptions: {
+        resolveExtensions: webExtensions,
+      },
+    } satisfies UserConfig['optimizeDeps'],
+  }
+}

package/types/constants.d.ts

@@ -1,13 +1,4 @@
 export declare const DEFAULT_PORT = 8081;
 export declare const nativeExtensions: string[];
 export declare const webExtensions: string[];
-export declare const depsToOptimize: string[];
-export declare const optimizeDeps: {
-    include: string[];
-    exclude: string[];
-    needsInterop: string[];
-    esbuildOptions: {
-        resolveExtensions: string[];
-    };
-};
 //# sourceMappingURL=constants.d.ts.map

package/types/exports/build.d.ts

@@ -1,6 +1,9 @@
 import type { VXRNConfig } from '../types';
 export declare const resolveFile: (path: string) => string;
-export declare const build: (optionsIn: VXRNConfig, { step }?: {
+type BuildOptions = {
     step?: string;
-}) => Promise<void>;
+    page?: string;
+};
+export declare const build: (optionsIn: VXRNConfig, buildOptions?: BuildOptions) => Promise<void>;
+export {};
 //# sourceMappingURL=build.d.ts.map

package/types/utils/assert.d.ts

@@ -0,0 +1,2 @@
+export declare function assertIsError(error: unknown): asserts error is Error;
+//# sourceMappingURL=assert.d.ts.map

package/types/utils/getOptimizeDeps.d.ts

@@ -0,0 +1,13 @@
+export declare function getOptimizeDeps(mode: 'build' | 'serve'): {
+    needsInterop: string[];
+    depsToOptimize: string[];
+    optimizeDeps: {
+        include: string[];
+        exclude: string[];
+        needsInterop: string[];
+        esbuildOptions: {
+            resolveExtensions: string[];
+        };
+    };
+};
+//# sourceMappingURL=getOptimizeDeps.d.ts.map