vxrn 0.1.20 → 0.1.21

package/src/exports/serve.ts

@@ -0,0 +1,51 @@
+import sirv from 'sirv'
+import type { VXRNConfig } from '../types'
+import { getOptionsFilled } from '../utils/getOptionsFilled'
+import { createApp, defineEventHandler } from 'h3'
+
+export const serve = async (optionsIn: VXRNConfig) => {
+  const options = await getOptionsFilled(optionsIn)
+
+  const app = createApp()
+
+  const sirvStaticMiddleware = sirv('dist/static', {
+    gzip: true,
+  })
+
+  app.use(
+    defineEventHandler(async ({ node: { req, res } }) => {
+      await new Promise<void>((response) => {
+        sirvStaticMiddleware(req, res, () => {
+          response()
+        })
+      })
+    })
+  )
+
+  const sirvMiddleware = sirv('dist/client', {
+    gzip: true,
+  })
+
+  app.use(
+    defineEventHandler(async ({ node: { req, res } }) => {
+      await new Promise<void>((response) => {
+        sirvMiddleware(req, res, () => {
+          response()
+        })
+      })
+    })
+  )
+}
+
+// app.use(
+//   defineEventHandler(async ({ node: { req, res } }) => {
+//     const url = req.originalUrl
+//     const template = fs.readFileSync(path.resolve('dist/client/index.html'), 'utf-8')
+//     // @ts-ignore
+//     const render = (await import('./dist/server/entry-server.js')).render
+//     const appHtml = await render({ path: url })
+//     const html = template.replace(`<!--ssr-outlet-->`, appHtml)
+//     res.setHeader('Content-Type', 'text/html')
+//     return html
+//   })
+// )

package/src/index.ts

@@ -1,4 +1,4 @@
-export { createDevServer as create } from './createDevServer'
-export { build } from './build'
-export { nativePlugin } from './nativePlugin'
+export { build } from './exports/build'
+export { dev } from './exports/dev'
+
 export * from './types'

package/src/{dev → plugins}/clientInjectPlugin.ts

@@ -81,15 +81,6 @@ export function clientInjectionsPlugin(config: ResolvedConfig): Plugin {
     transform(code, id, options) {
       if (id.includes('vite-native-client/dist/esm/client.')) {
         return injectConfigValues(code)
-      } else if (!options?.ssr && code.includes('process.env.NODE_ENV')) {
-        // replace process.env.NODE_ENV instead of defining a global
-        // for it to avoid shimming a `process` object during dev,
-        // avoiding inconsistencies between dev and build
-        // return code.replace(
-        //   process_env_NODE_ENV_RE,
-        //   config.define?.['process.env.NODE_ENV'] ||
-        //     JSON.stringify(process.env.NODE_ENV || config.mode)
-        // )
       }
     },
   }
@@ -104,9 +95,7 @@ function serializeDefine(define: Record<string, any>): string {
   let res = `{`
   for (const key in define) {
     const val = define[key]
-    res += `${JSON.stringify(key)}: ${
-      typeof val === 'string' ? `(${val})` : JSON.stringify(val)
-    }, `
+    res += `${JSON.stringify(key)}: ${typeof val === 'string' ? `(${val})` : JSON.stringify(val)}, `
   }
   return res + `}`
 }

package/src/{nativePlugin.ts → plugins/reactNativeCommonJsPlugin.ts}

@@ -1,10 +1,10 @@
-import { dirname } from 'path'
+import { dirname } from 'node:path'
 
 import { parse } from 'es-module-lexer'
 import type { OutputOptions } from 'rollup'
 import type { Plugin } from 'vite'
 
-import { getVitePath } from './utils/getVitePath'
+import { getVitePath } from '../utils/getVitePath'
 
 const extensions = [
   '.ios.js',
@@ -19,7 +19,7 @@ const extensions = [
   '.mjs',
 ]
 
-export function nativePlugin(options: {
+export function reactNativeCommonJsPlugin(options: {
   root: string
   port: number
   mode: 'build' | 'serve'
@@ -93,13 +93,6 @@ export function nativePlugin(options: {
 
       config.build.rollupOptions.plugins ??= []
 
-      // config.build.rollupOptions.external = [
-      //   'react-native',
-      //   'react',
-      //   'react/jsx-runtime',
-      //   'react/jsx-dev-runtime',
-      // ]
-
       if (!Array.isArray(config.build.rollupOptions.plugins)) {
         throw `x`
       }
@@ -107,22 +100,6 @@ export function nativePlugin(options: {
       if (options.mode === 'build') {
         config.plugins ||= []
 
-        // https://vitejs.dev/config/dep-optimization-options.html
-        // config.build.commonjsOptions ||= {}
-        // config.build.commonjsOptions.include = []
-
-        // CANT DO THIS BECAUSE TAMAGUI PLUGIN DOES THIS! they clobber each other!
-        // config.plugins.push(
-        //   viteCommonjs({
-        //     include: ['escape-string-regexp'],
-        //   })
-        // )
-
-        // config.resolve.alias = {
-        //   ...config.resolve.alias,
-        //   'react-native': virtualModuleId,
-        // }
-
         config.build.rollupOptions.plugins.push({
           name: `force-export-all`,
 

package/src/utils/getBaseViteConfig.ts

@@ -1,5 +1,5 @@
 import type { UserConfig } from 'vite'
-import { resolveFile } from '../createDevServer'
+import { resolveFile } from '../exports/dev'
 
 export function getBaseViteConfig({ mode }: { mode: 'development' | 'production' }): UserConfig {
   return {

package/src/utils/patches.ts

@@ -0,0 +1,54 @@
+import findNodeModules from 'find-node-modules'
+import { join } from 'node:path'
+import FSExtra from 'fs-extra'
+import type { VXRNConfigFilled } from './getOptionsFilled'
+
+const patches = [
+  {
+    module: 'react-native-screens',
+    patchFile: 'react-native-screens+3.22.1.patch',
+  },
+]
+type Patch = (typeof patches)[0]
+
+export async function checkPatches(options: VXRNConfigFilled) {
+  if (options.state.applyPatches === false) {
+    return
+  }
+
+  const nodeModulesDirs = findNodeModules({
+    cwd: options.root,
+  }).map((relativePath) => join(options.root, relativePath))
+
+  const patchesToCopy = new Set<Patch>()
+
+  await Promise.all(
+    patches.flatMap((patch) => {
+      return nodeModulesDirs.flatMap(async (dir) => {
+        if (await FSExtra.pathExists(join(dir, patch.module))) {
+          patchesToCopy.add(patch)
+        }
+      })
+    })
+  )
+
+  let didCopy = false
+
+  for (const patch of [...patchesToCopy]) {
+    const dest = join(options.userPatchesDir, patch.patchFile)
+    if (!(await FSExtra.pathExists(dest))) {
+      didCopy = true
+      console.info(`Copying patch ${patch.module}`)
+      const src = join(options.internalPatchesDir, patch.patchFile)
+      await FSExtra.copy(src, dest)
+    }
+  }
+
+  if (didCopy) {
+    console.info(
+      `\nPlease restart after applying the patch by running "npx patch-package".
+  Ideally add it to your devDependencies and as a postinstall script.\n`
+    )
+    process.exit(0)
+  }
+}

package/types/build.d.ts

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

package/types/constants.d.ts

@@ -0,0 +1,2 @@
+export declare const DEFAULT_PORT = 8081;
+//# sourceMappingURL=constants.d.ts.map

package/types/dispose.d.ts

@@ -0,0 +1,3 @@
+export declare function registerDispose(cb: () => void): void;
+export declare function disposeAll(): void;
+//# sourceMappingURL=dispose.d.ts.map

package/types/exports/build.d.ts

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

package/types/exports/dev.d.ts

@@ -0,0 +1,13 @@
+/// <reference types="node" />
+import type { VXRNConfig } from '../types';
+export declare const resolveFile: (path: string) => string;
+export declare const dev: (optionsIn: VXRNConfig) => Promise<{
+    server: import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>;
+    viteServer: import("vite").ViteDevServer;
+    start(): Promise<{
+        closePromise: Promise<unknown>;
+    }>;
+    stop: () => Promise<void>;
+}>;
+export declare function bindKeypressInput(): void;
+//# sourceMappingURL=dev.d.ts.map

package/types/exports/serve.d.ts

@@ -0,0 +1,3 @@
+import type { VXRNConfig } from '../types';
+export declare const serve: (optionsIn: VXRNConfig) => Promise<void>;
+//# sourceMappingURL=serve.d.ts.map

package/types/index.d.ts

@@ -1,5 +1,4 @@
-export { createDevServer as create } from './createDevServer';
-export { build } from './build';
-export { nativePlugin } from './nativePlugin';
+export { build } from './exports/build';
+export { dev } from './exports/dev';
 export * from './types';
 //# sourceMappingURL=index.d.ts.map

package/types/plugins/clientInjectPlugin.d.ts

@@ -0,0 +1,7 @@
+import type { Plugin, ResolvedConfig } from 'vite';
+/**
+ * some values used by the client needs to be dynamically injected by the server
+ * @server-only
+ */
+export declare function clientInjectionsPlugin(config: ResolvedConfig): Plugin;
+//# sourceMappingURL=clientInjectPlugin.d.ts.map

package/types/plugins/reactNativeCommonJsPlugin.d.ts

@@ -0,0 +1,7 @@
+import type { Plugin } from 'vite';
+export declare function reactNativeCommonJsPlugin(options: {
+    root: string;
+    port: number;
+    mode: 'build' | 'serve';
+}): Plugin;
+//# sourceMappingURL=reactNativeCommonJsPlugin.d.ts.map

package/types/utils/checkPatches.d.ts

@@ -0,0 +1,3 @@
+import { type VXRNConfigFilled } from './getOptionsFilled';
+export declare function checkPatches(options: VXRNConfigFilled): Promise<void>;
+//# sourceMappingURL=checkPatches.d.ts.map

package/types/utils/dispose.d.ts

@@ -0,0 +1,3 @@
+export declare function registerDispose(cb: () => void): void;
+export declare function disposeAll(): void;
+//# sourceMappingURL=dispose.d.ts.map

package/types/utils/patches.d.ts

@@ -0,0 +1,3 @@
+import type { VXRNConfigFilled } from './getOptionsFilled';
+export declare function checkPatches(options: VXRNConfigFilled): Promise<void>;
+//# sourceMappingURL=patches.d.ts.map

package/types/utils/prerender.d.ts

@@ -0,0 +1 @@
+//# sourceMappingURL=prerender.d.ts.map

package/types/vendor/createExpoServer.d.ts

@@ -0,0 +1,4 @@
+import type { App } from 'h3';
+export declare function createExpoServer(root: string, app: App): void;
+export declare function getRoutePaths(cwd: string): string[];
+//# sourceMappingURL=createExpoServer.d.ts.map

package/src/commands/cli-build.ts

@@ -1,25 +0,0 @@
-import { defineCommand } from 'citty'
-import { build } from '../build'
-import { readVXRNConfig } from '../utils/readVXRNConfig'
-
-export default defineCommand({
-  meta: {
-    name: 'build',
-    version: '0.0.0',
-    description: 'Build your app',
-  },
-  args: {},
-  async run({ args }) {
-    const userConfig = await readVXRNConfig()
-
-    process.on('uncaughtException', (err) => {
-      console.error(err?.message || err)
-    })
-
-    const results = await build(userConfig)
-
-    if (process.env.DEBUG) {
-      console.info('results', results)
-    }
-  },
-})

package/src/commands/cli-dev.ts

@@ -1,47 +0,0 @@
-import { defineCommand } from 'citty'
-import { readVXRNConfig } from '../utils/readVXRNConfig'
-import { createDevServer } from '../createDevServer'
-
-export default defineCommand({
-  meta: {
-    name: 'dev',
-    version: '0.0.0',
-    description: 'Start the dev server',
-  },
-  args: {},
-  async run({ args }) {
-    const userConfig = await readVXRNConfig()
-
-    const { start, stop } = await createDevServer({
-      root: process.cwd(),
-      host: '127.0.0.1',
-      webConfig: {
-        plugins: [],
-      },
-      buildConfig: {
-        plugins: [],
-      },
-      flow: {
-        include: [],
-        exclude: [],
-      },
-      ...userConfig,
-    })
-
-    const { closePromise } = await start()
-
-    process.on('beforeExit', () => {
-      stop()
-    })
-
-    process.on('SIGINT', () => {
-      stop()
-    })
-
-    process.on('uncaughtException', (err) => {
-      console.error(err?.message || err)
-    })
-
-    await closePromise
-  },
-})

package/src/commands/index.ts

@@ -1,10 +0,0 @@
-import type { CommandDef } from 'citty'
-
-const runDefault = (r: any) => (r.default || r) as Promise<CommandDef>
-
-export const commands = {
-  // @ts-ignore
-  dev: () => import('./cli-dev.mjs').then(runDefault),
-  // @ts-ignore
-  build: () => import('./cli-build.mjs').then(runDefault),
-}

package/src/dev/createDevServer.ts

@@ -1,234 +0,0 @@
-// import mime from 'mime/lite'
-
-// import type { HMRListener } from '../types'
-// import { DEFAULT_PORT } from '../utils/constants'
-// import { type Server, createServer } from '../vendor/repack/dev-server/src'
-// import { bindKeypressInput } from './bindKeypressInput'
-
-// export async function createDevServer(
-//   options: {
-//     host: string
-//     port: number
-//     root: string
-//   },
-//   {
-//     listenForHMR,
-//     hotUpdatedCJSFiles,
-//   }: {
-//     listenForHMR: (cb: HMRListener) => void
-//     hotUpdatedCJSFiles: Map<string, string>
-//   }
-// ) {
-//   return await createServer({
-//     options: {
-//       rootDir: options.root,
-//       host: options.host,
-//       port: options.port ?? DEFAULT_PORT,
-//       // https: args.https
-//       //   ? {
-//       //       cert: args.cert,
-//       //       key: args.key,
-//       //     }
-//       //   : undefined,
-//     },
-
-//     delegate: (ctx): Server.Delegate => {
-//       bindKeypressInput(ctx)
-
-//       // if (reversePort && args.port) {
-//       //   runAdbReverse(ctx, args.port)
-//       // }
-
-//       // let lastStats: webpack.StatsCompilation | undefined
-
-//       // compiler.on('watchRun', ({ platform }) => {
-//       //   ctx.notifyBuildStart(platform)
-//       //   if (platform === 'android') {
-//       //     runAdbReverse(ctx, args.port ?? DEFAULT_PORT)
-//       //   }
-//       // })
-
-//       // compiler.on('invalid', ({ platform }) => {
-//       //   ctx.notifyBuildStart(platform)
-//       //   ctx.broadcastToHmrClients({ action: 'building' }, platform)
-//       // })
-
-//       const platform = 'ios'
-//       listenForHMR((update) => {
-//         ctx.notifyBuildEnd(platform)
-//         ctx.broadcastToHmrClients(
-//           {
-//             action: 'built',
-//             body: createHmrBody({
-//               errors: [],
-//               warnings: [],
-//               hash: `${Math.random()}`,
-//               modules: {},
-//               name: '',
-//               time: 0,
-//             }),
-//           },
-//           platform
-//         )
-//       })
-
-//       return {
-//         hotFiles: {
-//           getSource: (path) => {
-//             const next = hotUpdatedCJSFiles.get(path)
-//             // hotUpdatedCJSFiles.delete(path) // memory leak prevent
-//             return next || ''
-//           },
-//         },
-
-//         compiler: {
-//           getAsset: async (filename, platform, sendProgress) => {
-//             console.info('[GET] - ', filename)
-//             return ''
-//             // return (await compiler.getAsset(filename, platform, sendProgress)).data
-//           },
-
-//           getMimeType: (filename) => {
-//             return mime.getType(filename) || 'application/javascript'
-//           },
-
-//           inferPlatform: (uri) => {
-//             const url = new URL(uri, 'protocol://domain')
-//             if (!url.searchParams.get('platform')) {
-//               const [, platform] = /^\/(.+)\/.+$/.exec(url.pathname) ?? []
-//               return platform
-//             }
-
-//             return undefined
-//           },
-//         },
-
-//         symbolicator: {
-//           getSource: async (fileUrl) => {
-//             console.info('get source', fileUrl)
-//             // const { filename, platform } = parseFileUrl(fileUrl)
-//             // return compiler.getSource(filename, platform)
-//             return ''
-//           },
-//           getSourceMap: async (fileUrl) => {
-//             // const { filename, platform } = parseFileUrl(fileUrl)
-//             // if (!platform) {
-//             //   throw new Error('Cannot infer platform for file URL')
-//             // }
-
-//             // return compiler.getSourceMap(filename, platform)
-//             return ''
-//           },
-//           shouldIncludeFrame: (frame) => {
-//             // If the frame points to internal bootstrap/module system logic, skip the code frame.
-//             return !/webpack[/\\]runtime[/\\].+\s/.test(frame.file)
-//           },
-//         },
-
-//         hmr: {
-//           getUriPath: () => '/__hmr',
-//           onClientConnected: (platform, clientId) => {
-//             // todo
-//             // const lastStats = {}
-//             // ctx.broadcastToHmrClients(
-//             //   { action: 'sync', body: createHmrBody(lastStats) },
-//             //   platform,
-//             //   [clientId]
-//             // )
-//           },
-//         },
-
-//         messages: {
-//           getStatus: () => 'packager-status:running',
-//         },
-
-//         logger: {
-//           onMessage: (log) => {
-//             const logEntry = makeLogEntryFromFastifyLog(log)
-//             logEntry.issuer = 'DevServer'
-
-//             // ignore for now
-//             if (logEntry.type === 'debug') return
-
-//             // error DevServer, warn DevServer
-//             console.info(
-//               '[logger]',
-//               logEntry.type === 'info' ? '' : logEntry.type,
-//               logEntry.message
-//                 .map((m) => {
-//                   return `${m.msg}`
-//                 })
-//                 .join(', ')
-//             )
-//             // reporter.process(logEntry)
-//           },
-//         },
-
-//         api: {
-//           // getPlatforms: async () => Object.keys(compiler.workers),
-//           getPlatforms: async () => ['ios'],
-//           getAssets: async (platform) => {
-//             console.info('get assets', platform)
-//             return []
-//             // return Object.entries(compiler.assetsCache[platform] ?? {}).map(([name, asset]) => ({
-//             //   name,
-//             //   size: asset.info.size,
-//             // })),
-//           },
-//           getCompilationStats: async (platform) => {
-//             return null
-//             // return compiler.statsCache[platform] ?? null
-//           },
-//         },
-//       }
-//     },
-//   })
-// }
-
-// function createHmrBody(body: HMRMessageBody): HMRMessageBody | null {
-//   return body
-// }
-
-// /**
-//  * Represent Hot Module Replacement Update body.
-//  *
-//  * @internal
-//  */
-// export interface HMRMessageBody {
-//   name: string
-//   time: number
-//   hash: string
-//   warnings: any
-//   errors: any
-//   modules: Record<string, string>
-// }
-
-// /**
-//  * Represent Hot Module Replacement Update message.
-//  *
-//  * @internal
-//  */
-// export interface HMRMessage {
-//   action: 'building' | 'built' | 'sync'
-//   body: HMRMessageBody | null
-// }
-
-// function makeLogEntryFromFastifyLog(data: any): any {
-//   const { level, time, pid, hostname, ...rest } = data
-
-//   const levelToTypeMapping: Record<number, any> = {
-//     10: 'debug',
-//     20: 'debug',
-//     30: 'info',
-//     40: 'warn',
-//     50: 'error',
-//     60: 'error',
-//   }
-
-//   return {
-//     type: levelToTypeMapping[level],
-//     timestamp: time,
-//     issuer: '',
-//     message: [rest],
-//   }
-// }