vxrn 0.1.47 → 0.1.48

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

@@ -0,0 +1,150 @@
+import { webExtensions } from "../constants";
+function _array_like_to_array(arr, len) {
+  (len == null || len > arr.length) && (len = arr.length);
+  for (var i = 0, arr2 = new Array(len); i < len; i++)
+    arr2[i] = arr[i];
+  return arr2;
+}
+function _array_without_holes(arr) {
+  if (Array.isArray(arr))
+    return _array_like_to_array(arr);
+}
+function _iterable_to_array(iter) {
+  if (typeof Symbol < "u" && iter[Symbol.iterator] != null || iter["@@iterator"] != null)
+    return Array.from(iter);
+}
+function _non_iterable_spread() {
+  throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _to_consumable_array(arr) {
+  return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
+}
+function _unsupported_iterable_to_array(o, minLen) {
+  if (o) {
+    if (typeof o == "string")
+      return _array_like_to_array(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor && (n = o.constructor.name), n === "Map" || n === "Set")
+      return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))
+      return _array_like_to_array(o, minLen);
+  }
+}
+function getOptimizeDeps(mode) {
+  var 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"
+  ], depsToOptimize = _to_consumable_array(needsInterop).concat([
+    "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"
+  ]);
+  return mode === "build" && depsToOptimize.push("@babel/runtime"), {
+    needsInterop,
+    depsToOptimize,
+    optimizeDeps: {
+      include: depsToOptimize,
+      exclude: [
+        "util",
+        "@swc/wasm",
+        "@swc/core-darwin-arm64"
+      ],
+      needsInterop,
+      esbuildOptions: {
+        resolveExtensions: webExtensions
+      }
+    }
+  };
+}
+export {
+  getOptimizeDeps
+};
+//# sourceMappingURL=getOptimizeDeps.js.map

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

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../../src/utils/Users/n8/vxrn/packages/vxrn/src/utils/getOptimizeDeps.ts"],
+  "mappings": "AACA,SAASA,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEvB,SAASC,gBAAgBC,MAAuB;AACrD,MAAMC,eAAe;IACnB;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;KAGIC,iBACJ,qBAAGD,YAAAA,EAAAA,OADkB;IAErB;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;GACD;AAED,SAAID,SAAS,WAEXE,eAAeC,KAAK,gBAAA,GAGf;IACLF;IACAC;IACAE,cAAc;MACZC,SAASH;MACTI,SAAS;QAAC;QAAQ;QAAa;;MAC/BL;MACAM,gBAAgB;QACdC,mBAAmBV;MACrB;IACF;EACF;AACF;",
+  "names": ["webExtensions", "getOptimizeDeps", "mode", "needsInterop", "depsToOptimize", "push", "optimizeDeps", "include", "exclude", "esbuildOptions", "resolveExtensions"]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxrn",
-  "version": "0.1.47",
+  "version": "0.1.48",
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
   "type": "module",
@@ -29,13 +29,13 @@
     "@babel/code-frame": "^7.21.4",
     "@vitejs/plugin-react": "^4.2.1",
     "@vitejs/plugin-react-swc": "^3.6.0",
-    "@vxrn/react-native-prebuilt": "0.1.47",
-    "@vxrn/router": "0.1.47",
-    "@vxrn/safe-area": "0.1.47",
-    "@vxrn/vite-flow": "0.1.47",
-    "@vxrn/vite-native-client": "0.1.47",
-    "@vxrn/vite-native-hmr": "0.1.47",
-    "@vxrn/vite-native-swc": "0.1.47",
+    "@vxrn/react-native-prebuilt": "0.1.48",
+    "@vxrn/router": "0.1.48",
+    "@vxrn/safe-area": "0.1.48",
+    "@vxrn/vite-flow": "0.1.48",
+    "@vxrn/vite-native-client": "0.1.48",
+    "@vxrn/vite-native-hmr": "0.1.48",
+    "@vxrn/vite-native-swc": "0.1.48",
     "citty": "^0.1.6",
     "crossws": "^0.2.4",
     "es-module-lexer": "^1.3.0",
@@ -47,7 +47,7 @@
     "get-port-please": "^3.1.2",
     "glob": "^10.3.12",
     "h3": "^1.11.1",
-    "h3-proxy": "^1.12.0",
+    "h3-proxy": "^1.13.0",
     "import-meta-resolve": "^4.0.0",
     "jiti": "^1.21.0",
     "metro-inspector-proxy": "^0.71.0",
@@ -60,7 +60,7 @@
     "sirv": "^2.0.4",
     "source-map": "^0.7.3",
     "url": "^0.11.0",
-    "vite": "^5.2.10",
+    "vite": "^5.2.11",
     "ws": "^8.7.0"
   },
   "devDependencies": {

package/src/cli.ts

@@ -64,6 +64,11 @@ const build = defineCommand({
       type: 'string',
       required: false,
     },
+    // always wanted to be able to just generate one-off pages
+    // page: {
+    //   type: 'string',
+    //   required: false,
+    // },
   },
   async run({ args }) {
     const userConfig = await readVXRNConfig()

package/src/constants.ts

@@ -1,5 +1,3 @@
-import type { UserConfig } from 'vite'
-
 export const DEFAULT_PORT = 8081
 
 export const nativeExtensions = [
@@ -27,76 +25,3 @@ export const webExtensions = [
   '.css',
   '.json',
 ]
-
-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-navigation/native',
-  'react-native-svg',
-  '@supabase/auth-helpers-react',
-  'parse-numeric-range',
-  'use-sync-external-store',
-  'use-sync-external-store/shim',
-]
-
-export const depsToOptimize = [
-  ...needsInterop,
-  'swr',
-  '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/alert-dialog',
-  '@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',
-]
-
-export const optimizeDeps = {
-  include: depsToOptimize,
-  exclude: ['util', '@swc/wasm', '@swc/core-darwin-arm64'],
-  needsInterop,
-  esbuildOptions: {
-    resolveExtensions: webExtensions,
-  },
-} satisfies UserConfig['optimizeDeps']

package/src/exports/build.ts

@@ -4,15 +4,16 @@ import fs from 'node:fs'
 import { tmpdir } from 'node:os'
 import path from 'node:path'
 import { mergeConfig, build as viteBuild, type UserConfig } from 'vite'
-
 import FSExtra from 'fs-extra'
 import type { OutputAsset, OutputChunk, RollupOutput } from 'rollup'
-import { optimizeDeps } from '../constants'
 import type { VXRNConfig } from '../types'
 import { getBaseViteConfig } from '../utils/getBaseViteConfig'
 import { getHtml } from '../utils/getHtml'
+import { getOptimizeDeps } from '../utils/getOptimizeDeps'
 import { getOptionsFilled, type VXRNConfigFilled } from '../utils/getOptionsFilled'
 
+Error.stackTraceLimit = Infinity
+
 export const resolveFile = (path: string) => {
   try {
     return importMetaResolve(path, import.meta.url).replace('file://', '')
@@ -23,6 +24,8 @@ export const resolveFile = (path: string) => {
 
 const { ensureDir, existsSync, readFile, pathExists } = FSExtra
 
+type BuildOptions = { step?: string; page?: string }
+
 // web only for now
 
 // TODO:
@@ -30,12 +33,14 @@ const { ensureDir, existsSync, readFile, pathExists } = FSExtra
 //  - move router stuff into router package
 //  - generateStaticPages becomes a vite 'post' postbuild callback in router plugin
 
-export const build = async (optionsIn: VXRNConfig, { step }: { step?: string } = {}) => {
+export const build = async (optionsIn: VXRNConfig, buildOptions: BuildOptions = {}) => {
   const options = await getOptionsFilled(optionsIn)
 
   // TODO?
   process.env.NODE_ENV = 'production'
 
+  const { optimizeDeps } = getOptimizeDeps('build')
+
   let webBuildConfig = mergeConfig(
     getBaseViteConfig({
       mode: 'production',
@@ -51,7 +56,7 @@ export const build = async (optionsIn: VXRNConfig, { step }: { step?: string } =
     webBuildConfig = mergeConfig(webBuildConfig, options.webConfig) as any
   }
 
-  if (step !== 'generate') {
+  if (buildOptions.step !== 'generate') {
     console.info(`build client`)
     await viteBuild(
       mergeConfig(webBuildConfig, {
@@ -72,10 +77,10 @@ export const build = async (optionsIn: VXRNConfig, { step }: { step?: string } =
       //   },
       // },
 
-      // ssr: {
-      //   noExternal: true,
-      //   optimizeDeps,
-      // },
+      ssr: {
+        noExternal: optimizeDeps.include,
+        optimizeDeps,
+      },
 
       build: {
         // we want one big file of css
@@ -86,7 +91,7 @@ export const build = async (optionsIn: VXRNConfig, { step }: { step?: string } =
           external: [],
         },
       },
-    })
+    } satisfies UserConfig)
   )) as RollupOutput
 
   console.info(`generating static pages`)
@@ -112,58 +117,70 @@ async function generateStaticPages(
 
   const assets: OutputAsset[] = []
 
-  const allRoutes = (
-    await Promise.all(
-      serverOutput.flatMap(async (output) => {
-        if (output.type === 'asset') {
-          assets.push(output)
-          return []
-        }
-
-        const id = output.facadeModuleId || ''
-        const file = path.basename(id)
-        const name = file.replace(/\.[^/.]+$/, '')
-
-        if (!id || file[0] === '_' || file.includes('entry-server')) {
-          return []
-        }
-        if (id.includes('+api')) {
-          return []
-        }
-
-        const endpointPath = path.join(options.root, 'dist/server', output.fileName)
-        const exported = await import(endpointPath)
-
-        const paramsList = ((await exported.generateStaticParams?.()) ?? [{}]) as Object[]
-
-        return await Promise.all(
-          paramsList.map(async (params) => {
-            const path = getUrl(params)
-            const loaderData = (await exported.loader?.({ path, params })) ?? {}
-            return { path, params, loaderData }
-          })
-        )
-
-        function getUrl(_params = {}) {
-          return name === 'index'
-            ? '/'
-            : `/${name
-                .split('/')
-                .map((part) => {
-                  if (part[0] === '[') {
-                    const found = _params[part.slice(1, part.length - 1)]
-                    if (!found) {
-                      console.warn('not found', { _params, part })
-                    }
-                    return found
-                  }
-                  return part
-                })
-                .join('/')}`
-        }
-      })
-    )
-  ).flat()
+  const allRoutes: {
+    path: string
+    params: Object
+    loaderData: any
+  }[] = []
+
+  for (const output of serverOutput) {
+    if (output.type === 'asset') {
+      assets.push(output)
+      continue
+    }
+
+    const id = output.facadeModuleId || ''
+    const file = path.basename(id)
+    const name = file.replace(/\.[^/.]+$/, '')
+
+    if (!id || file[0] === '_' || file.includes('entry-server')) {
+      continue
+    }
+    if (id.includes('+api')) {
+      continue
+    }
+
+    const endpointPath = path.join(options.root, 'dist/server', output.fileName)
+
+    const exported = await import(endpointPath)
+
+    const paramsList = ((await exported.generateStaticParams?.()) ?? [{}]) as Object[]
+
+    for (const params of paramsList) {
+      const path = getUrl(params)
+      const loaderData = (await exported.loader?.({ path, params })) ?? {}
+      allRoutes.push({ path, params, loaderData })
+    }
+
+    function getUrl(_params = {}) {
+      if (name === 'index') {
+        return '/'
+      }
+      if (name.startsWith('[...')) {
+        const part = name.replace('[...', '').replace(']', '')
+        return `/${_params[part]}`
+      }
+      return `/${name
+        .split('/')
+        .map((part) => {
+          if (part[0] === '[') {
+            const found = _params[part.slice(1, part.length - 1)]
+            if (!found) {
+              console.warn('not found', { _params, part })
+            }
+            return found
+          }
+          return part
+        })
+        .join('/')}`
+    }
+  }
+
+  // can build them in parallel
+  // const allRoutes = (
+  //   await Promise.all(
+  //   )
+  // ).flat()
 
   // for now just inline
   const cssStringRaw = assets
@@ -189,6 +206,7 @@ async function generateStaticPages(
   for (const { path, loaderData, params } of allRoutes) {
     const loaderProps = { params }
     globalThis['__vxrnLoaderProps__'] = loaderProps
+    console.info(`render`, path)
     const { appHtml, headHtml } = await render({ path })
     const slashFileName = `${path === '/' ? '/index' : path}.html`
     const clientHtmlPath = toAbsolute(`dist/client${slashFileName}`)

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: {