vxrn 0.0.7 → 0.1.2

package/src/dev/bindKeypressInput.ts

@@ -0,0 +1,46 @@
+import { Server } from '../vendor/repack/dev-server/src'
+import readline from 'readline'
+
+export function bindKeypressInput(ctx: Server.DelegateContext) {
+  if (!process.stdin.setRawMode) {
+    ctx.log.warn({
+      msg: 'Interactive mode is not supported in this environment',
+    })
+    return
+  }
+
+  readline.emitKeypressEvents(process.stdin)
+  process.stdin.setRawMode(true)
+
+  process.stdin.on('keypress', (_key, data) => {
+    const { ctrl, name } = data
+    if (ctrl === true) {
+      switch (name) {
+        case 'c':
+          process.exit()
+        case 'z':
+          process.emit('SIGTSTP', 'SIGTSTP')
+          break
+      }
+    } else {
+      switch (name) {
+        case 'r':
+          ctx.broadcastToMessageClients({ method: 'reload' })
+          ctx.log.info({
+            msg: 'Reloading app',
+          })
+          break
+        case 'd':
+          ctx.broadcastToMessageClients({ method: 'devMenu' })
+          ctx.log.info({
+            msg: 'Opening developer menu',
+          })
+          break
+        case 'c':
+          process.stdout.write('\u001b[2J\u001b[0;0H')
+          // TODO: after logging we should print information about port and host
+          break
+      }
+    }
+  })
+}

package/src/dev/createDevServer.ts

@@ -1,8 +1,9 @@
 import mime from 'mime/lite'
 
-import { HMRListener, StartOptions } from '../types'
+import type { HMRListener } from '../types'
 import { DEFAULT_PORT } from '../utils/constants'
-import { Server, createServer } from '../vendor/repack/dev-server/src'
+import { type Server, createServer } from '../vendor/repack/dev-server/src'
+import { bindKeypressInput } from './bindKeypressInput'
 
 export async function createDevServer(
   options: {
@@ -11,13 +12,9 @@ export async function createDevServer(
     root: string
   },
   {
-    indexJson,
     listenForHMR,
-    getIndexBundle,
     hotUpdatedCJSFiles,
   }: {
-    indexJson: Object
-    getIndexBundle: () => Promise<string>
     listenForHMR: (cb: HMRListener) => void
     hotUpdatedCJSFiles: Map<string, string>
   }
@@ -36,9 +33,7 @@ export async function createDevServer(
     },
 
     delegate: (ctx): Server.Delegate => {
-      // if (args.interactive) {
-      //   bindKeypressInput(ctx)
-      // }
+      bindKeypressInput(ctx)
 
       // if (reversePort && args.port) {
       //   runAdbReverse(ctx, args.port)
@@ -88,10 +83,7 @@ export async function createDevServer(
 
         compiler: {
           getAsset: async (filename, platform, sendProgress) => {
-            console.log('[GET] - ', filename)
-            if (filename === 'index.bundle') {
-              return await getIndexBundle()
-            }
+            console.info('[GET] - ', filename)
             return ''
             // return (await compiler.getAsset(filename, platform, sendProgress)).data
           },
@@ -101,8 +93,6 @@ export async function createDevServer(
           },
 
           inferPlatform: (uri) => {
-            return 'ios'
-
             const url = new URL(uri, 'protocol://domain')
             if (!url.searchParams.get('platform')) {
               const [, platform] = /^\/(.+)\/.+$/.exec(url.pathname) ?? []
@@ -115,7 +105,7 @@ export async function createDevServer(
 
         symbolicator: {
           getSource: async (fileUrl) => {
-            console.log('get source', fileUrl)
+            console.info('get source', fileUrl)
             // const { filename, platform } = parseFileUrl(fileUrl)
             // return compiler.getSource(filename, platform)
             return ''
@@ -138,7 +128,6 @@ export async function createDevServer(
         hmr: {
           getUriPath: () => '/__hmr',
           onClientConnected: (platform, clientId) => {
-            // biome-ignore lint/suspicious/noConsoleLog: <explanation>
             // todo
             // const lastStats = {}
             // ctx.broadcastToHmrClients(
@@ -150,7 +139,6 @@ export async function createDevServer(
         },
 
         messages: {
-          getHello: () => indexJson,
           getStatus: () => 'packager-status:running',
         },
 
@@ -163,8 +151,7 @@ export async function createDevServer(
             if (logEntry.type === 'debug') return
 
             // error DevServer, warn DevServer
-            // biome-ignore lint/suspicious/noConsoleLog: <explanation>
-            console.log(
+            console.info(
               '[logger]',
               logEntry.type === 'info' ? '' : logEntry.type,
               logEntry.message
@@ -181,7 +168,7 @@ export async function createDevServer(
           // getPlatforms: async () => Object.keys(compiler.workers),
           getPlatforms: async () => ['ios'],
           getAssets: async (platform) => {
-            console.log('get assets', platform)
+            console.info('get assets', platform)
             return []
             // return Object.entries(compiler.assetsCache[platform] ?? {}).map(([name, asset]) => ({
             //   name,

package/src/getVitePath.ts

@@ -1,7 +1,7 @@
 import { join, relative, dirname } from 'path'
 
 import resolve from 'esm-resolve'
-import { realpath } from 'fs-extra'
+import FSExtra from 'fs-extra'
 
 export async function getVitePath(
   rootPath: string,
@@ -34,7 +34,7 @@ export async function getVitePath(
     if (!resolved) {
       throw new Error(`❌ cant find`)
     }
-    const real = await realpath(resolved)
+    const real = await FSExtra.realpath(resolved)
     let id = real
     if (!absolute) {
       id = relative(importer, real)

package/src/index.ts

@@ -1,2 +1,3 @@
 export { create } from './create'
 export { nativePlugin } from './nativePlugin'
+export * from './types'

package/src/nativePlugin.ts

@@ -1,7 +1,7 @@
 import { dirname } from 'path'
 
 import { parse } from 'es-module-lexer'
-import { OutputOptions } from 'rollup'
+import type { OutputOptions } from 'rollup'
 import type { Plugin } from 'vite'
 
 import { getVitePath } from './getVitePath'
@@ -25,7 +25,7 @@ export function nativePlugin(options: {
   mode: 'build' | 'serve'
 }): Plugin {
   return {
-    name: 'tamagui-native',
+    name: 'native',
     enforce: 'pre',
 
     config: async (config) => {
@@ -52,16 +52,13 @@ export function nativePlugin(options: {
       config.resolve ??= {}
 
       config.resolve.extensions = extensions
-      // config.resolve.conditions = [
-      //   // for rn compat use require over exports
-      //   'require',
-      //   'default',
-      //   'import',
-      // ]
+
+      config.resolve.conditions = ['react-native', 'require', 'default', 'import']
 
       config.optimizeDeps ??= {}
 
-      config.optimizeDeps.disabled = true
+      config.optimizeDeps.noDiscovery = true
+      config.optimizeDeps.include = undefined
 
       config.optimizeDeps.esbuildOptions ??= {}
       config.optimizeDeps.esbuildOptions.resolveExtensions = extensions
@@ -177,8 +174,7 @@ export function nativePlugin(options: {
       }
 
       if (process.env.DEBUG) {
-        // biome-ignore lint/suspicious/noConsoleLog: <explanation>
-        console.log('config..', config)
+        console.info('config..', config)
       }
 
       const updateOutputOptions = (out: OutputOptions) => {
@@ -199,8 +195,7 @@ export function nativePlugin(options: {
       }
 
       if (Array.isArray(config.build.rollupOptions.output)) {
-        for (const o in config.build.rollupOptions.output)
-          updateOutputOptions(o as OutputOptions)
+        for (const o in config.build.rollupOptions.output) updateOutputOptions(o as OutputOptions)
       } else {
         updateOutputOptions(config.build.rollupOptions.output as OutputOptions)
       }

package/src/types.ts

@@ -1,10 +1,9 @@
-import { InlineConfig } from 'vite'
+import type { InlineConfig } from 'vite'
 
-export type StartOptions = {
-  root: string
+export type VXRNConfig = {
+  root?: string
   host?: string
-  webPort?: number
-  nativePort?: number
+  port?: number
   webConfig?: InlineConfig
   buildConfig?: InlineConfig
 }

package/src/utils/readVXRNConfig.ts

@@ -0,0 +1,12 @@
+import jiti from 'jiti'
+import FSExtra from 'fs-extra'
+import type { VXRNConfig } from '../types'
+
+export async function readVXRNConfig(): Promise<VXRNConfig> {
+  if (!(await FSExtra.pathExists('vxrn.config.ts'))) {
+    return {}
+  }
+  const requireFile = jiti(process.cwd())
+  const userConfig = requireFile('./vxrn.config.ts')
+  return userConfig?.default ?? {}
+}

package/src/vendor/repack/dev-server/src/createServer.ts

@@ -1,6 +1,5 @@
 import { Writable } from 'stream'
 
-// import debuggerAppPath from '@callstack/repack-debugger-app'
 import fastifySensible from '@fastify/sensible'
 import fastifyStatic from '@fastify/static'
 import Fastify from 'fastify'
@@ -12,7 +11,7 @@ import devtoolsPlugin from './plugins/devtools'
 import multipartPlugin from './plugins/multipart'
 import symbolicatePlugin from './plugins/symbolicate'
 import wssPlugin from './plugins/wss'
-import { Internal, Server } from './types'
+import { Internal, type Server } from './types'
 
 /**
  * Create instance of development server, powered by Fastify.
@@ -91,20 +90,13 @@ export async function createServer(config: Server.Config) {
     options: config.options,
   })
 
-  const debuggerAppPath = (await import('@callstack/repack-debugger-app')).default
-
-  await instance.register(fastifyStatic, {
-    root: debuggerAppPath,
-    prefix: '/debugger-ui',
-    prefixAvoidTrailingSlash: true,
-  })
-
   // below is to prevent showing `GET 400 /favicon.ico`
   // errors in console when requesting the bundle via browser
   // await instance.register(faviconPlugin)
 
   instance.addHook('onSend', async (request, reply, payload) => {
     reply.header('X-Content-Type-Options', 'nosniff')
+    reply.header('X-React-Native-Project-Root', config.options.rootDir)
 
     const [pathname] = request.url.split('?')
     if (pathname.endsWith('.map')) {
@@ -115,7 +107,7 @@ export async function createServer(config: Server.Config) {
   })
 
   // Register routes
-  instance.get('/', async () => delegate.messages.getHello())
+
   instance.get('/status', async () => delegate.messages.getStatus())
 
   /** Start the development server. */

package/src/vendor/repack/dev-server/src/types.ts

@@ -99,20 +99,14 @@ export namespace Server {
      * @param clientIds Ids of the client to which broadcast should be sent.
      * If `undefined` the broadcast will be sent to all connected clients for the given `platform`.
      */
-    broadcastToHmrClients: <E = any>(
-      event: E,
-      platform: string,
-      clientIds?: string[]
-    ) => void
+    broadcastToHmrClients: <E = any>(event: E, platform: string, clientIds?: string[]) => void
 
     /**
      * Broadcast arbitrary method-like event to all connected message clients.
      *
      * @param event Arbitrary method-like event to broadcast.
      */
-    broadcastToMessageClients: <
-      E extends { method: string; params?: Record<string, any> }
-    >(
+    broadcastToMessageClients: <E extends { method: string; params?: Record<string, any> }>(
       event: E
     ) => void
   }
@@ -133,9 +127,6 @@ export namespace Server {
    * Delegate with implementation for messages used in route handlers.
    */
   export interface MessagesDelegate {
-    /** Get message to send as a reply for `GET /` route. */
-    getHello: () => Object
-
     /** Get message to send as a reply for `GET /status` route. */
     getStatus: () => string
   }

package/tsconfig.json

@@ -0,0 +1,8 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": { 
+    "composite": true
+  },
+  "references": [
+  ]
+}

package/types/cli.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=cli.d.ts.map

package/types/commands/cli-dev.d.ts

@@ -0,0 +1,3 @@
+declare const _default: import("citty").CommandDef<{}>;
+export default _default;
+//# sourceMappingURL=cli-dev.d.ts.map

package/types/commands/index.d.ts

@@ -0,0 +1,5 @@
+import type { CommandDef } from 'citty';
+export declare const commands: {
+    dev: () => Promise<CommandDef>;
+};
+//# sourceMappingURL=index.d.ts.map

package/types/create.d.ts

@@ -1,11 +1,12 @@
 /// <reference types="node" />
-import { StartOptions } from './types';
-export declare const create: (options: StartOptions) => Promise<{
-    nativeServer: import("fastify").FastifyInstance<import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, import("fastify").FastifyLoggerInstance> & PromiseLike<import("fastify").FastifyInstance<import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, import("fastify").FastifyLoggerInstance>>;
+import type { VXRNConfig } from './types';
+export declare const create: (options: VXRNConfig) => Promise<{
+    nativeServer: 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=create.d.ts.map

package/types/dev/bindKeypressInput.d.ts

@@ -0,0 +1,3 @@
+import { Server } from '../vendor/repack/dev-server/src';
+export declare function bindKeypressInput(ctx: Server.DelegateContext): void;
+//# sourceMappingURL=bindKeypressInput.d.ts.map

package/types/dev/createDevServer.d.ts

@@ -1,12 +1,10 @@
 /// <reference types="node" />
-import { HMRListener } from '../types';
+import type { HMRListener } from '../types';
 export declare function createDevServer(options: {
     host: string;
     port: number;
     root: string;
-}, { indexJson, listenForHMR, getIndexBundle, hotUpdatedCJSFiles, }: {
-    indexJson: Object;
-    getIndexBundle: () => Promise<string>;
+}, { listenForHMR, hotUpdatedCJSFiles, }: {
     listenForHMR: (cb: HMRListener) => void;
     hotUpdatedCJSFiles: Map<string, string>;
 }): Promise<{

package/types/index.d.ts

@@ -1,3 +1,4 @@
 export { create } from './create';
 export { nativePlugin } from './nativePlugin';
+export * from './types';
 //# sourceMappingURL=index.d.ts.map

package/types/types.d.ts

@@ -1,9 +1,8 @@
-import { InlineConfig } from 'vite';
-export type StartOptions = {
-    root: string;
+import type { InlineConfig } from 'vite';
+export type VXRNConfig = {
+    root?: string;
     host?: string;
-    webPort?: number;
-    nativePort?: number;
+    port?: number;
     webConfig?: InlineConfig;
     buildConfig?: InlineConfig;
 };

package/types/utils/readVXRNConfig.d.ts

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

package/types/vendor/repack/dev-server/src/createServer.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { Server } from './types';
+import { type Server } from './types';
 /**
  * Create instance of development server, powered by Fastify.
  *

package/types/vendor/repack/dev-server/src/plugins/wss/servers/WebSocketMessageServer.d.ts

@@ -22,6 +22,9 @@ export interface ReactNativeMessage {
     error?: Error;
     params?: Record<string, any>;
 }
+type WebSocketWithUpgradeReq = WebSocket & {
+    upgradeReq?: IncomingMessage;
+};
 /**
  * Class for creating a WebSocket server and sending messages between development server
  * and the React Native applications.
@@ -78,7 +81,7 @@ export declare class WebSocketMessageServer extends WebSocketServer {
      * @param clientId Id of the client.
      * @returns WebSocket connection.
      */
-    getClientSocket(clientId: string): any;
+    getClientSocket(clientId: string): WebSocketWithUpgradeReq;
     /**
      * Process error by sending an error message to the client whose message caused the error
      * to occur.
@@ -134,4 +137,5 @@ export declare class WebSocketMessageServer extends WebSocketServer {
      */
     onConnection(socket: WebSocket, request: IncomingMessage): void;
 }
+export {};
 //# sourceMappingURL=WebSocketMessageServer.d.ts.map

package/types/vendor/repack/dev-server/src/types.d.ts

@@ -98,8 +98,6 @@ export declare namespace Server {
      * Delegate with implementation for messages used in route handlers.
      */
     interface MessagesDelegate {
-        /** Get message to send as a reply for `GET /` route. */
-        getHello: () => Object;
         /** Get message to send as a reply for `GET /status` route. */
         getStatus: () => string;
     }