vxrn 0.1.46 → 0.1.48

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/getOptimizeDeps.ts

@@ -0,0 +1,122 @@
+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',
+    '@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/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,14 +1,4 @@
 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[];
-    esbuildOptions: {
-        resolveExtensions: string[];
-    };
-};
 //# sourceMappingURL=constants.d.ts.map

package/types/exports/build.d.ts

@@ -1,4 +1,9 @@
 import type { VXRNConfig } from '../types';
 export declare const resolveFile: (path: string) => string;
-export declare const build: (optionsIn: VXRNConfig) => Promise<void>;
+type BuildOptions = {
+    step?: string;
+    page?: string;
+};
+export declare const build: (optionsIn: VXRNConfig, buildOptions?: BuildOptions) => Promise<void>;
+export {};
 //# 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;

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