vxrn 0.1.46 → 0.1.47

package/src/exports/dev.ts

@@ -47,6 +47,8 @@ import { checkPatches } from '../utils/patches'
 let isBuildingNativeBundle: Promise<string> | null = null
 const hotUpdateCache = new Map<string, string>()
 
+let connectedNativeClients = 0
+
 export const resolveFile = (path: string) => {
   try {
     return importMetaResolve(path, import.meta.url).replace('file://', '')
@@ -217,6 +219,7 @@ export const dev = async ({ clean, ...rest }: VXRNConfig & { clean?: boolean })
       websocket: {
         open(peer) {
           console.debug('[hmr] open', peer)
+          connectedNativeClients++
         },
 
         message(peer, message) {
@@ -228,6 +231,7 @@ export const dev = async ({ clean, ...rest }: VXRNConfig & { clean?: boolean })
 
         close(peer, event) {
           console.info('[hmr] close', peer, event)
+          connectedNativeClients--
         },
 
         error(peer, error) {
@@ -765,23 +769,8 @@ function isWithin(outer: string, inner: string) {
 // used for normalizing hot reloads
 let entryRoot = ''
 
-// function watchNodeModules(modules: string[]): PluginOption {
-//   return {
-//     name: 'watch-node-modules',
-//     config() {
-//       return {
-//         server: {
-//           watch: {
-//             ignored: modules.map((m) => `!**/packages/${m}/**`),
-//           },
-//         },
-//       }
-//     },
-//   }
-// }
-
 async function getViteServerConfig(config: VXRNConfigFilled) {
-  const { root, host, webConfig, cacheDir } = config
+  const { root, host, webConfig } = config
 
   let serverConfig: UserConfig = mergeConfig(
     getBaseViteConfig({
@@ -792,7 +781,6 @@ async function getViteServerConfig(config: VXRNConfigFilled) {
       clearScreen: false,
       plugins: [
         reactNativeHMRPlugin(config),
-        // watchNodeModules(['@tamagui/popper'])
 
         {
           name: 'process-env-ssr',
@@ -805,10 +793,22 @@ async function getViteServerConfig(config: VXRNConfigFilled) {
         },
       ],
       optimizeDeps,
+
       ssr: {
-        noExternal: true,
+        // noExternal true causes many incompat issues because we need things on disk to work
+        // eg generally node uses .cjs extensions to "switch" back to cjs mode on import, but once bundled
+        // this wont happen, breaking many things
+        // but we need react related things always so they dont duplicate
+        noExternal: [
+          ...optimizeDeps.include,
+          'react',
+          'react-dom',
+          'react-dom/server',
+          'react-dom/client',
+        ],
         optimizeDeps,
       },
+
       server: {
         hmr: {
           path: '/__vxrnhmr',
@@ -850,6 +850,9 @@ function reactNativeHMRPlugin({ root }: VXRNConfigFilled) {
         if (!isWithin(root, file)) {
           return
         }
+        if (!connectedNativeClients) {
+          return
+        }
 
         const [module] = modules
         if (!module) return

package/src/utils/getHtml.ts

@@ -1,20 +1,35 @@
+// TODO merge with the other one
 export function getHtml({
   template,
   loaderData,
+  loaderProps,
   appHtml,
   headHtml,
   css,
-}: { css?: string; template: string; loaderData: Object; appHtml: string; headHtml: string }) {
+}: {
+  css?: string
+  template: string
+  loaderData: Object
+  loaderProps?: any
+  appHtml: string
+  headHtml: string
+}) {
   if (!template.includes(`<!--ssr-outlet-->`)) {
     throw new Error(`No <!--ssr-outlet--> found in html to inject SSR contents`)
   }
   if (!template.includes(`<!--head-outlet-->`)) {
     throw new Error(`No <!--head-outlet--> found in html to inject SSR contents`)
   }
-  const loaderDataString = `\n<script>globalThis['__vxrnLoaderData__']=${JSON.stringify(
-    loaderData
-  )}</script>`
+
+  const loaderDataJS = `globalThis['__vxrnLoaderData__']=${JSON.stringify(loaderData)}`
+  const loaderPropsJS = `globalThis['__vxrnLoaderProps__']=${JSON.stringify(loaderProps || null)}`
+  const loaderDataString = `\n<script>
+    ${loaderDataJS};
+    ${loaderPropsJS};
+  </script>`
+
   return template
-    .replace(`<!--ssr-outlet-->`, appHtml + loaderDataString)
-    .replace(`<!--head-outlet-->`, `${headHtml}\n${css ? `<style>${css}</style>` : ``}`)
+    .replace(/\s*<!--ssr-outlet-->\s*/, appHtml)
+    .replace(`<!--head-outlet-->`, `${headHtml}\n${css ? `<style>${css}</style>\n` : ``}`)
+    .replace('</body>', loaderDataString)
 }

package/src/utils/getVitePath.ts

@@ -34,7 +34,9 @@ export async function getVitePath(
   const resolved = resolve(sourceFile)(moduleName)
   // figure out symlinks
   if (!resolved) {
-    throw new Error(`❌ cant find`)
+    throw new Error(
+      ` ❌ Path not found ${sourceFile} (rootPath ${rootPath}, importer ${importer}, moduleName ${moduleName})`
+    )
   }
   const real = await FSExtra.realpath(resolved)
   let id = real

package/src/utils/readVXRNConfig.ts

@@ -30,10 +30,12 @@ export async function readVXRNConfig(): Promise<VXRNConfig> {
 
     await vite.close()
     return resolveOptionalAsyncFunction(userConfig?.default ?? {})
-  } catch (err) {
-    console.info(
-      ` [vxrn] Error loading config via ESM, attempting CJS, set VXRN_CJS=1 to run in cjs mode`
-    )
+  } catch (err: any) {
+    console.info(` [vxrn] Error loading config via ESM:
+
+${err.stack}
+    
+ To load as CommonJS, set VXRN_CJS=1`)
     throw err
   }
 }

package/types/constants.d.ts

@@ -1,12 +1,11 @@
 export declare const DEFAULT_PORT = 8081;
-export declare const EMPTY_LOADER_STRING = "function loader() {/* \u2737\u2737\u2737 */};";
 export declare const nativeExtensions: string[];
 export declare const webExtensions: string[];
 export declare const depsToOptimize: string[];
 export declare const optimizeDeps: {
     include: string[];
-    needsInterop: string[];
     exclude: string[];
+    needsInterop: string[];
     esbuildOptions: {
         resolveExtensions: string[];
     };

package/types/exports/build.d.ts

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

package/types/utils/getHtml.d.ts

@@ -1,7 +1,8 @@
-export declare function getHtml({ template, loaderData, appHtml, headHtml, css, }: {
+export declare function getHtml({ template, loaderData, loaderProps, appHtml, headHtml, css, }: {
     css?: string;
     template: string;
     loaderData: Object;
+    loaderProps?: any;
     appHtml: string;
     headHtml: string;
 }): string;