@tamagui/cli 1.14.8 → 1.15.0

package/dist/esm/vendor/repack/dev-server/src/plugins/wss/wssPlugin.mjs

@@ -6,7 +6,6 @@ import { WebSocketEventsServer } from "./servers/WebSocketEventsServer";
 import { WebSocketHMRServer } from "./servers/WebSocketHMRServer";
 import { WebSocketMessageServer } from "./servers/WebSocketMessageServer";
 import { WebSocketRouter } from "./WebSocketRouter";
-console.log("HermesInspectorProxy disabled");
 async function wssPlugin(instance, {
   options,
   delegate

package/dist/esm/vendor/repack/dev-server/src/plugins/wss/wssPlugin.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../../src/vendor/repack/dev-server/src/plugins/wss/wssPlugin.ts"],
-  "sourcesContent": ["import type { FastifyInstance } from 'fastify'\nimport fastifyPlugin from 'fastify-plugin'\n\nimport type { Server } from '../../types'\n// import { HermesInspectorProxy } from './servers/HermesInspectorProxy'\nimport { WebSocketApiServer } from './servers/WebSocketApiServer'\nimport { WebSocketDebuggerServer } from './servers/WebSocketDebuggerServer'\nimport { WebSocketDevClientServer } from './servers/WebSocketDevClientServer'\nimport { WebSocketEventsServer } from './servers/WebSocketEventsServer'\nimport { WebSocketHMRServer } from './servers/WebSocketHMRServer'\nimport { WebSocketMessageServer } from './servers/WebSocketMessageServer'\nimport { WebSocketRouter } from './WebSocketRouter'\n\nconsole.log('HermesInspectorProxy disabled')\n\ndeclare module 'fastify' {\n  interface FastifyInstance {\n    wss: {\n      debuggerServer: WebSocketDebuggerServer\n      devClientServer: WebSocketDevClientServer\n      messageServer: WebSocketMessageServer\n      eventsServer: WebSocketEventsServer\n      // hermesInspectorProxy: HermesInspectorProxy\n      apiServer: WebSocketApiServer\n      hmrServer: WebSocketHMRServer\n      router: WebSocketRouter\n    }\n  }\n}\n\nasync function wssPlugin(\n  instance: FastifyInstance,\n  {\n    options,\n    delegate,\n  }: {\n    options: Server.Options\n    delegate: Server.Delegate\n  }\n) {\n  const router = new WebSocketRouter(instance)\n\n  console.log('setting up websocket')\n\n  const debuggerServer = new WebSocketDebuggerServer(instance)\n  const devClientServer = new WebSocketDevClientServer(instance)\n  const messageServer = new WebSocketMessageServer(instance)\n  const eventsServer = new WebSocketEventsServer(instance, {\n    webSocketMessageServer: messageServer,\n  })\n  // const hermesInspectorProxy = new HermesInspectorProxy(instance, options)\n  const apiServer = new WebSocketApiServer(instance)\n  const hmrServer = new WebSocketHMRServer(instance, delegate.hmr)\n\n  router.registerServer(debuggerServer)\n  router.registerServer(devClientServer)\n  router.registerServer(messageServer)\n  router.registerServer(eventsServer)\n  // router.registerServer(hermesInspectorProxy)\n  router.registerServer(apiServer)\n  router.registerServer(hmrServer)\n\n  instance.decorate('wss', {\n    debuggerServer,\n    devClientServer,\n    messageServer,\n    eventsServer,\n    // hermesInspectorProxy,\n    apiServer,\n    hmrServer,\n    router,\n  })\n}\n\nexport default fastifyPlugin(wssPlugin, {\n  name: 'wss-plugin',\n})\n"],
-  "mappings": "AACA,OAAO,mBAAmB;AAI1B,SAAS,0BAA0B;AACnC,SAAS,+BAA+B;AACxC,SAAS,gCAAgC;AACzC,SAAS,6BAA6B;AACtC,SAAS,0BAA0B;AACnC,SAAS,8BAA8B;AACvC,SAAS,uBAAuB;AAEhC,QAAQ,IAAI,+BAA+B;AAiB3C,eAAe,UACb,UACA;AAAA,EACE;AAAA,EACA;AACF,GAIA;AACA,QAAM,SAAS,IAAI,gBAAgB,QAAQ;AAE3C,UAAQ,IAAI,sBAAsB;AAElC,QAAM,iBAAiB,IAAI,wBAAwB,QAAQ;AAC3D,QAAM,kBAAkB,IAAI,yBAAyB,QAAQ;AAC7D,QAAM,gBAAgB,IAAI,uBAAuB,QAAQ;AACzD,QAAM,eAAe,IAAI,sBAAsB,UAAU;AAAA,IACvD,wBAAwB;AAAA,EAC1B,CAAC;AAED,QAAM,YAAY,IAAI,mBAAmB,QAAQ;AACjD,QAAM,YAAY,IAAI,mBAAmB,UAAU,SAAS,GAAG;AAE/D,SAAO,eAAe,cAAc;AACpC,SAAO,eAAe,eAAe;AACrC,SAAO,eAAe,aAAa;AACnC,SAAO,eAAe,YAAY;AAElC,SAAO,eAAe,SAAS;AAC/B,SAAO,eAAe,SAAS;AAE/B,WAAS,SAAS,OAAO;AAAA,IACvB;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA;AAAA,IAEA;AAAA,IACA;AAAA,IACA;AAAA,EACF,CAAC;AACH;AAEA,IAAO,oBAAQ,cAAc,WAAW;AAAA,EACtC,MAAM;AACR,CAAC;",
+  "sourcesContent": ["import type { FastifyInstance } from 'fastify'\nimport fastifyPlugin from 'fastify-plugin'\n\nimport type { Server } from '../../types'\n// import { HermesInspectorProxy } from './servers/HermesInspectorProxy'\nimport { WebSocketApiServer } from './servers/WebSocketApiServer'\nimport { WebSocketDebuggerServer } from './servers/WebSocketDebuggerServer'\nimport { WebSocketDevClientServer } from './servers/WebSocketDevClientServer'\nimport { WebSocketEventsServer } from './servers/WebSocketEventsServer'\nimport { WebSocketHMRServer } from './servers/WebSocketHMRServer'\nimport { WebSocketMessageServer } from './servers/WebSocketMessageServer'\nimport { WebSocketRouter } from './WebSocketRouter'\n\ndeclare module 'fastify' {\n  interface FastifyInstance {\n    wss: {\n      debuggerServer: WebSocketDebuggerServer\n      devClientServer: WebSocketDevClientServer\n      messageServer: WebSocketMessageServer\n      eventsServer: WebSocketEventsServer\n      // hermesInspectorProxy: HermesInspectorProxy\n      apiServer: WebSocketApiServer\n      hmrServer: WebSocketHMRServer\n      router: WebSocketRouter\n    }\n  }\n}\n\nasync function wssPlugin(\n  instance: FastifyInstance,\n  {\n    options,\n    delegate,\n  }: {\n    options: Server.Options\n    delegate: Server.Delegate\n  }\n) {\n  const router = new WebSocketRouter(instance)\n\n  console.log('setting up websocket')\n\n  const debuggerServer = new WebSocketDebuggerServer(instance)\n  const devClientServer = new WebSocketDevClientServer(instance)\n  const messageServer = new WebSocketMessageServer(instance)\n  const eventsServer = new WebSocketEventsServer(instance, {\n    webSocketMessageServer: messageServer,\n  })\n  // const hermesInspectorProxy = new HermesInspectorProxy(instance, options)\n  const apiServer = new WebSocketApiServer(instance)\n  const hmrServer = new WebSocketHMRServer(instance, delegate.hmr)\n\n  router.registerServer(debuggerServer)\n  router.registerServer(devClientServer)\n  router.registerServer(messageServer)\n  router.registerServer(eventsServer)\n  // router.registerServer(hermesInspectorProxy)\n  router.registerServer(apiServer)\n  router.registerServer(hmrServer)\n\n  instance.decorate('wss', {\n    debuggerServer,\n    devClientServer,\n    messageServer,\n    eventsServer,\n    // hermesInspectorProxy,\n    apiServer,\n    hmrServer,\n    router,\n  })\n}\n\nexport default fastifyPlugin(wssPlugin, {\n  name: 'wss-plugin',\n})\n"],
+  "mappings": "AACA,OAAO,mBAAmB;AAI1B,SAAS,0BAA0B;AACnC,SAAS,+BAA+B;AACxC,SAAS,gCAAgC;AACzC,SAAS,6BAA6B;AACtC,SAAS,0BAA0B;AACnC,SAAS,8BAA8B;AACvC,SAAS,uBAAuB;AAiBhC,eAAe,UACb,UACA;AAAA,EACE;AAAA,EACA;AACF,GAIA;AACA,QAAM,SAAS,IAAI,gBAAgB,QAAQ;AAE3C,UAAQ,IAAI,sBAAsB;AAElC,QAAM,iBAAiB,IAAI,wBAAwB,QAAQ;AAC3D,QAAM,kBAAkB,IAAI,yBAAyB,QAAQ;AAC7D,QAAM,gBAAgB,IAAI,uBAAuB,QAAQ;AACzD,QAAM,eAAe,IAAI,sBAAsB,UAAU;AAAA,IACvD,wBAAwB;AAAA,EAC1B,CAAC;AAED,QAAM,YAAY,IAAI,mBAAmB,QAAQ;AACjD,QAAM,YAAY,IAAI,mBAAmB,UAAU,SAAS,GAAG;AAE/D,SAAO,eAAe,cAAc;AACpC,SAAO,eAAe,eAAe;AACrC,SAAO,eAAe,aAAa;AACnC,SAAO,eAAe,YAAY;AAElC,SAAO,eAAe,SAAS;AAC/B,SAAO,eAAe,SAAS;AAE/B,WAAS,SAAS,OAAO;AAAA,IACvB;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA;AAAA,IAEA;AAAA,IACA;AAAA,IACA;AAAA,EACF,CAAC;AACH;AAEA,IAAO,oBAAQ,cAAc,WAAW;AAAA,EACtC,MAAM;AACR,CAAC;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/cli",
-  "version": "1.14.8",
+  "version": "1.15.0",
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
   "module": "dist/esm",
@@ -36,11 +36,14 @@
     "@callstack/repack-debugger-app": "^1.0.0",
     "@fastify/sensible": "^4.1.0",
     "@fastify/static": "^5.0.2",
-    "@tamagui/build": "1.14.8",
-    "@tamagui/static": "1.14.8",
-    "@tamagui/vite-plugin": "1.14.8",
+    "@takeout/studio": "1.5.24",
+    "@tamagui/build": "1.15.0",
+    "@tamagui/static": "1.15.0",
+    "@tamagui/types": "1.15.0",
+    "@tamagui/vite-plugin": "1.15.0",
     "@types/compression": "^1.7.2",
     "@types/morgan": "^1.9.3",
+    "@vitejs/plugin-react-swc": "^3.2.0",
     "arg": "^5.0.2",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.2",
@@ -65,13 +68,10 @@
     "pretty-format": "^28.1.0",
     "source-map": "^0.7.3",
     "ts-morph": "^15.1.0",
-    "typescript": "^4.7.4",
+    "typescript": "^5.0.4",
     "url": "^0.11.0",
-    "vite": "^4.0.4",
+    "vite": "^4.2.1",
     "ws": "^8.7.0",
     "zx": "^7.1.1"
-  },
-  "devDependencies": {
-    "@takeout/studio": "1.5.24"
   }
 }

package/src/build.ts

@@ -2,12 +2,11 @@ import { writeFile } from 'fs'
 import { basename, dirname, join, resolve } from 'path'
 
 import { createExtractor, extractToClassNames, loadTamagui } from '@tamagui/static'
+import { CLIResolvedOptions } from '@tamagui/types'
 import chokidar from 'chokidar'
 import { readFile } from 'fs-extra'
 
-import { ResolvedOptions } from './types.js'
-
-export const build = async (options: ResolvedOptions) => {
+export const build = async (options: CLIResolvedOptions) => {
   // const tamagui = await loadTamagui(options.tamaguiOptions)
 
   const entry = options.pkgJson.source

package/src/cli.ts

@@ -8,6 +8,7 @@ import { disposeAll, getOptions } from './utils.js'
   process.on(_, () => {
     process.stdout.write(`bye\n`)
     disposeAll()
+    process.exit()
   })
 })
 
@@ -61,14 +62,19 @@ const COMMAND_MAP = {
   studio: {
     shorthands: ['s'],
     description: `Studio`,
-    flags: {},
+    flags: {
+      '--help': Boolean,
+      '--debug': Boolean,
+      '--verbose': Boolean,
+      '--local': Boolean,
+    },
     async run() {
       const { _, ...flags } = arg(this.flags)
       const { studio } = await import('./studio.js')
       const options = await getOptions({
         debug: flags['--debug'] ? (flags['--verbose'] ? 'verbose' : true) : false,
       })
-      await studio(options)
+      await studio(options, !flags['--local'])
     },
   },
 }

package/src/dev/createDevServer.ts

@@ -1,11 +1,12 @@
 import { readFile } from 'fs/promises'
 
-import { ResolvedOptions } from '../types.js'
+import { CLIResolvedOptions } from '@tamagui/types'
+
 import { DEFAULT_PORT } from '../utils/constants.js'
 import { Server, createServer } from '../vendor/repack/dev-server/src'
 
 export async function createDevServer(
-  options: ResolvedOptions,
+  options: CLIResolvedOptions,
   {
     indexJson,
     getIndexBundle,

package/src/dev.ts

@@ -2,16 +2,16 @@ import { readFile } from 'fs/promises'
 import { AddressInfo } from 'net'
 import { join } from 'path'
 
+import { CLIResolvedOptions } from '@tamagui/types'
 import chalk from 'chalk'
 import fs from 'fs-extra'
 import { build, createServer } from 'vite'
 
 import { createDevServer } from './dev/createDevServer.js'
 import { watchTamaguiConfig } from './tamaguiConfigUtils.js'
-import { ResolvedOptions } from './types.js'
 import { registerDispose } from './utils.js'
 
-export const dev = async (options: ResolvedOptions) => {
+export const dev = async (options: CLIResolvedOptions) => {
   const { root, mode, paths } = options
 
   process.chdir(process.cwd())

package/src/generate.ts

@@ -1,25 +1,25 @@
 #!/usr/bin/env node
 
+import { CLIResolvedOptions } from '@tamagui/types'
 import fs from 'fs-extra'
 import { Project } from 'ts-morph'
 
-import { ResolvedOptions } from './types.js'
 import { loadTamagui } from './utils.js'
 
-export async function generateTypes(options: ResolvedOptions) {
+export async function generateTypes(options: CLIResolvedOptions) {
   const types = await getTypes(options)
   await fs.writeJSON(options.paths.types, types, {
     spaces: 2,
   })
 }
 
-export async function getTypes(options: ResolvedOptions) {
+export async function getTypes(options: CLIResolvedOptions) {
   const tamagui = await loadTamagui(options.tamaguiOptions)
 
   const uniqueViewExportingPaths = new Set(
     Object.keys(tamagui.nameToPaths).map((name) => {
       return `${[...tamagui.nameToPaths[name]][0]}.ts*`
-    }),
+    })
   )
 
   const project = new Project({
@@ -51,7 +51,7 @@ export async function getTypes(options: ResolvedOptions) {
             }),
         ]
       })
-    }),
+    })
   )
 
   // console.log(

package/src/index.ts

@@ -1,11 +1,4 @@
 #!/usr/bin/env node
 
-process.on('beforeExit', () => {
-  process.stdout.write(`exiting22123??????`)
-})
-
-process.on('SIGINT', () => {
-  process.stdout.write(`exiting33123??????`)
-})
 
 import './cli.js'

package/src/studio.ts

@@ -2,74 +2,88 @@ import { createRequire } from 'module'
 import { AddressInfo } from 'net'
 import { dirname } from 'path'
 
+import { CLIResolvedOptions } from '@tamagui/types'
 import { tamaguiPlugin } from '@tamagui/vite-plugin'
+import viteReactPlugin from '@vitejs/plugin-react-swc'
 import chalk from 'chalk'
 import express from 'express'
 import proxy from 'express-http-proxy'
 import fs from 'fs-extra'
-import morgan from 'morgan'
 import { createServer } from 'vite'
 
 import { watchTamaguiConfig } from './tamaguiConfigUtils.js'
-import { ResolvedOptions } from './types.js'
 
 const resolve =
   'url' in import.meta ? createRequire(import.meta.url).resolve : require.resolve
 
-export const studio = async (options: ResolvedOptions) => {
-  const { default: getPort } = await import('get-port')
-  const { paths } = options
-  const root = dirname(resolve('@takeout/studio/entry'))
-
-  const [serverPort, vitePort] = await Promise.all([
-    getPort({
-      port: 1421,
-    }),
-    getPort({
-      port: 1422,
-    }),
-  ])
-
-  const server = await createServer({
-    root,
-    server: {
-      // open: true,
-      host: options.host,
-      port: vitePort,
-    },
-    plugins: [
-      tamaguiPlugin({
-        components: ['tamagui'],
+export const studio = async (options: CLIResolvedOptions, isRemote = true) => {
+  process.env.TAMAGUI_TARGET = 'web'
+
+  const configWatchPromise = watchTamaguiConfig(options)
+  let localServerPromise = new Promise(() => {})
+  if (!isRemote) {
+    process.env.VITE_IS_LOCAL = '1'
+
+    process.stdout.on('error', function (err) {
+      if (err.code == 'EPIPE') {
+        process.exit(0)
+      }
+    })
+    const { default: getPort } = await import('get-port')
+    const { paths } = options
+    const root = dirname(resolve('@takeout/studio/entry'))
+
+    const [serverPort, vitePort] = await Promise.all([
+      getPort({
+        port: 1421,
+      }),
+      getPort({
+        port: 1422,
       }),
-    ],
-  })
+    ])
 
-  // these can be lazy loaded (eventually should put in own process)
-  await server.listen()
+    const server = await createServer({
+      root,
+      server: {
+        host: options.host,
+        port: vitePort,
+        hmr: true,
+        cors: true,
+      },
+      plugins: [
+        tamaguiPlugin({
+          components: ['tamagui'],
+        }),
+        viteReactPlugin(),
+      ],
+    })
 
-  const configWatchPromise = watchTamaguiConfig(options)
+    // these can be lazy loaded (eventually should put in own process)
+    await server.listen()
+
+    const info = server.httpServer?.address() as AddressInfo
 
-  const info = server.httpServer?.address() as AddressInfo
+    const app = express()
 
-  const app = express()
+    app.disable('x-powered-by')
+    app.use(express.static(paths.dotDir, { maxAge: '2h' }))
+    // app.use(morgan('tiny'))
 
-  app.disable('x-powered-by')
-  app.use(express.static(paths.dotDir, { maxAge: '2h' }))
-  app.use(morgan('tiny'))
+    app.get('/conf.json', async (req, res) => {
+      const conf = await fs.readJSON(paths.conf)
+      res.status(200).json(conf)
+    })
 
-  app.get('/conf', async (req, res) => {
-    const conf = await fs.readJSON(paths.conf)
-    res.status(200).json(conf)
-  })
+    app.use('/', proxy(`${info.address}:${vitePort}`))
 
-  app.use('/', proxy(`${info.address}:${vitePort}`))
+    const appServer = app.listen(serverPort)
 
-  const appServer = app.listen(serverPort)
+    localServerPromise = new Promise((res) => appServer.on('close', res))
 
-  console.log(`Listening on`, chalk.green(`http://localhost:${serverPort}`))
+    console.log(`Listening on`, chalk.green(`http://localhost:${serverPort}`))
+  } else {
+    console.log(`Open `, chalk.green(`https://studio.tamagui.dev`), ` to load studio`)
+  }
 
-  await Promise.allSettled([
-    configWatchPromise,
-    new Promise((res) => appServer.on('close', res)),
-  ])
+  await Promise.allSettled([configWatchPromise, localServerPromise])
 }

package/src/tamaguiConfigUtils.ts

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 
 import { getVariableValue } from '@tamagui/core-node'
+import { CLIResolvedOptions } from '@tamagui/types'
 import esbuild from 'esbuild'
 import fs, { ensureDir } from 'fs-extra'
 
-import { ResolvedOptions } from './types.js'
 import { loadTamagui } from './utils.js'
 
-export async function generateTamaguiConfig(options: ResolvedOptions) {
+export async function generateTamaguiConfig(options: CLIResolvedOptions) {
   await ensureDir(options.paths.dotDir)
   const config = await getTamaguiConfig(options)
   const { components, nameToPaths } = config
@@ -34,10 +34,10 @@ export async function generateTamaguiConfig(options: ResolvedOptions) {
   }
 
   // remove bulky stuff in components
-  for (const key in components) {
-    const component = components[key]
+  for (const component of components) {
     for (const _ in component.nameToInfo) {
       delete component.nameToInfo[_].staticConfig['validStyles']
+      delete component.nameToInfo[_].staticConfig['parentStaticConfig']
     }
   }
 
@@ -47,50 +47,46 @@ export async function generateTamaguiConfig(options: ResolvedOptions) {
     nameToPaths[key] = [...nameToPaths[key]]
   }
 
-  // cleanup other stuff
-  // @ts-ignore
-  delete config.tamaguiConfig['Provider']
-  // @ts-ignore
-  delete config.tamaguiConfig['fontsParsed']
-  // @ts-ignore
-  delete config.tamaguiConfig['getCSS']
-  // @ts-ignore
-  delete config.tamaguiConfig['tokensParsed']
-  // @ts-ignore
-  delete config.tamaguiConfig['themeConfig']
+  // remove stuff we dont need to send
+  const { fontsParsed, getCSS, tokensParsed, themeConfig, ...cleanedConfig } =
+    config.tamaguiConfig
 
-  await fs.writeJSON(options.paths.conf, config, {
-    spaces: 2,
-  })
+  await fs.writeJSON(
+    options.paths.conf,
+    {
+      ...config,
+      tamaguiConfig: cleanedConfig,
+    },
+    {
+      spaces: 2,
+    }
+  )
 }
 
-async function getTamaguiConfig(options: ResolvedOptions) {
+async function getTamaguiConfig(options: CLIResolvedOptions) {
   return loadTamagui(options.tamaguiOptions)
 }
 
-export async function watchTamaguiConfig(options: ResolvedOptions) {
-  console.warn('❌ disabling watch conf')
-  return
-  // if (!options.tamaguiOptions.config) return
-  // await generateTamaguiConfig(options)
-  // const context = await esbuild.context({
-  //   entryPoints: [options.tamaguiOptions.config],
-  //   sourcemap: false,
-  //   // dont output just use esbuild as a watcher
-  //   write: false,
+export async function watchTamaguiConfig(options: CLIResolvedOptions) {
+  if (!options.tamaguiOptions.config) return
+  await generateTamaguiConfig(options)
+  const context = await esbuild.context({
+    entryPoints: [options.tamaguiOptions.config],
+    sourcemap: false,
+    // dont output just use esbuild as a watcher
+    write: false,
 
-  //   plugins: [
-  //     {
-  //       name: `on-rebuild`,
-  //       setup({ onEnd }) {
-  //         onEnd((res) => {
-  //           generateTamaguiConfig(options)
-  //         })
-  //       },
-  //     },
-  //   ],
-  // })
+    plugins: [
+      {
+        name: `on-rebuild`,
+        setup({ onEnd }) {
+          onEnd((res) => {
+            generateTamaguiConfig(options)
+          })
+        },
+      },
+    ],
+  })
 
-  // await context.watch()
-  // console.log('done watching')
+  await context.watch()
 }

package/src/test.ts

@@ -1,7 +1,7 @@
 /* eslint-disable no-console */
-import { ResolvedOptions } from './types.js'
+import { CLIResolvedOptions } from '@tamagui/types'
 
-export const test = async (options: ResolvedOptions) => {
+export const test = async (options: CLIResolvedOptions) => {
   const { dev } = await import('./dev.js')
 
   // failing on startup "Tamagui error bundling components require() of ES Module"

package/src/utils.ts

@@ -2,11 +2,9 @@ import { join } from 'path'
 
 import type { TamaguiOptions, TamaguiProjectInfo } from '@tamagui/static'
 import { loadTamagui as loadTamaguiStatic } from '@tamagui/static'
+import { CLIResolvedOptions, CLIUserOptions } from '@tamagui/types'
 import chalk from 'chalk'
 import fs, { pathExists, readJSON } from 'fs-extra'
-import { ViteDevServer } from 'vite'
-
-import { ResolvedOptions, UserOptions } from './types.js'
 
 export async function getOptions({
   root = process.cwd(),
@@ -14,14 +12,12 @@ export async function getOptions({
   tamaguiOptions,
   host,
   debug,
-}: Partial<UserOptions> = {}): Promise<ResolvedOptions> {
+}: Partial<CLIUserOptions> = {}): Promise<CLIResolvedOptions> {
   const tsConfigFilePath = join(root, tsconfigPath)
   ensure(await fs.pathExists(tsConfigFilePath), `No tsconfig found: ${tsConfigFilePath}`)
   const dotDir = join(root, '.tamagui')
   const pkgJson = await readJSON(join(root, 'package.json'))
 
-  console.log('host', host)
-
   return {
     mode: process.env.NODE_ENV === 'production' ? 'production' : 'development',
     root,
@@ -82,4 +78,4 @@ export function registerDispose(cb: () => void) {
 
 export function disposeAll() {
   disposers.forEach((cb) => cb())
-}
+}

package/src/vendor/repack/dev-server/src/plugins/wss/wssPlugin.ts

@@ -11,8 +11,6 @@ import { WebSocketHMRServer } from './servers/WebSocketHMRServer'
 import { WebSocketMessageServer } from './servers/WebSocketMessageServer'
 import { WebSocketRouter } from './WebSocketRouter'
 
-console.log('HermesInspectorProxy disabled')
-
 declare module 'fastify' {
   interface FastifyInstance {
     wss: {

package/types/build.d.ts

@@ -1,3 +1,3 @@
-import { ResolvedOptions } from './types.js';
-export declare const build: (options: ResolvedOptions) => Promise<void>;
+import { CLIResolvedOptions } from '@tamagui/types';
+export declare const build: (options: CLIResolvedOptions) => Promise<void>;
 //# sourceMappingURL=build.d.ts.map

package/types/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAE5C,eAAO,MAAM,KAAK,YAAmB,eAAe,kBAoDnD,CAAA"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAInD,eAAO,MAAM,KAAK,YAAmB,kBAAkB,kBAoDtD,CAAA"}

package/types/dev/createDevServer.d.ts

@@ -1,5 +1,5 @@
-import { ResolvedOptions } from '../types.js';
-export declare function createDevServer(options: ResolvedOptions, { indexJson, getIndexBundle, }: {
+import { CLIResolvedOptions } from '@tamagui/types';
+export declare function createDevServer(options: CLIResolvedOptions, { indexJson, getIndexBundle, }: {
     indexJson: Object;
     getIndexBundle: () => Promise<string>;
 }): Promise<() => Promise<void>>;

package/types/dev/createDevServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createDevServer.d.ts","sourceRoot":"","sources":["../../src/dev/createDevServer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAI7C,wBAAsB,eAAe,CACnC,OAAO,EAAE,eAAe,EACxB,EACE,SAAS,EACT,cAAc,GACf,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAA;CAAE,gCAgKhE;AAyBD;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,GAAG,CAAA;IACb,MAAM,EAAE,GAAG,CAAA;IACX,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAChC;AAED;;;;GAIG;AACH,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,UAAU,GAAG,OAAO,GAAG,MAAM,CAAA;IACrC,IAAI,EAAE,cAAc,GAAG,IAAI,CAAA;CAC5B"}
+{"version":3,"file":"createDevServer.d.ts","sourceRoot":"","sources":["../../src/dev/createDevServer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAKnD,wBAAsB,eAAe,CACnC,OAAO,EAAE,kBAAkB,EAC3B,EACE,SAAS,EACT,cAAc,GACf,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAA;CAAE,gCAgKhE;AAyBD;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,GAAG,CAAA;IACb,MAAM,EAAE,GAAG,CAAA;IACX,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAChC;AAED;;;;GAIG;AACH,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,UAAU,GAAG,OAAO,GAAG,MAAM,CAAA;IACrC,IAAI,EAAE,cAAc,GAAG,IAAI,CAAA;CAC5B"}

package/types/dev.d.ts

@@ -1,3 +1,3 @@
-import { ResolvedOptions } from './types.js';
-export declare const dev: (options: ResolvedOptions) => Promise<void>;
+import { CLIResolvedOptions } from '@tamagui/types';
+export declare const dev: (options: CLIResolvedOptions) => Promise<void>;
 //# sourceMappingURL=dev.d.ts.map

package/types/dev.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../src/dev.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAG5C,eAAO,MAAM,GAAG,YAAmB,eAAe,kBA4KjD,CAAA"}
+{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../src/dev.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AASnD,eAAO,MAAM,GAAG,YAAmB,kBAAkB,kBA4KpD,CAAA"}

package/types/generate.d.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-import { ResolvedOptions } from './types.js';
-export declare function generateTypes(options: ResolvedOptions): Promise<void>;
-export declare function getTypes(options: ResolvedOptions): Promise<{
+import { CLIResolvedOptions } from '@tamagui/types';
+export declare function generateTypes(options: CLIResolvedOptions): Promise<void>;
+export declare function getTypes(options: CLIResolvedOptions): Promise<{
     [k: string]: (string | undefined)[][];
 }>;
 //# sourceMappingURL=generate.d.ts.map

package/types/generate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":";AAKA,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAG5C,wBAAsB,aAAa,CAAC,OAAO,EAAE,eAAe,iBAK3D;AAED,wBAAsB,QAAQ,CAAC,OAAO,EAAE,eAAe;;GAwDtD"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAMnD,wBAAsB,aAAa,CAAC,OAAO,EAAE,kBAAkB,iBAK9D;AAED,wBAAsB,QAAQ,CAAC,OAAO,EAAE,kBAAkB;;GAwDzD"}

package/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAUA,OAAO,UAAU,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAGA,OAAO,UAAU,CAAA"}

package/types/studio.d.ts

@@ -1,3 +1,3 @@
-import { ResolvedOptions } from './types.js';
-export declare const studio: (options: ResolvedOptions) => Promise<void>;
+import { CLIResolvedOptions } from '@tamagui/types';
+export declare const studio: (options: CLIResolvedOptions, isRemote?: boolean) => Promise<void>;
 //# sourceMappingURL=studio.d.ts.map

package/types/studio.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"studio.d.ts","sourceRoot":"","sources":["../src/studio.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAK5C,eAAO,MAAM,MAAM,YAAmB,eAAe,kBAwDpD,CAAA"}
+{"version":3,"file":"studio.d.ts","sourceRoot":"","sources":["../src/studio.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAcnD,eAAO,MAAM,MAAM,YAAmB,kBAAkB,sCAsEvD,CAAA"}

package/types/tamaguiConfigUtils.d.ts

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { ResolvedOptions } from './types.js';
-export declare function generateTamaguiConfig(options: ResolvedOptions): Promise<void>;
-export declare function watchTamaguiConfig(options: ResolvedOptions): Promise<void>;
+import { CLIResolvedOptions } from '@tamagui/types';
+export declare function generateTamaguiConfig(options: CLIResolvedOptions): Promise<void>;
+export declare function watchTamaguiConfig(options: CLIResolvedOptions): Promise<void>;
 //# sourceMappingURL=tamaguiConfigUtils.d.ts.map

package/types/tamaguiConfigUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tamaguiConfigUtils.d.ts","sourceRoot":"","sources":["../src/tamaguiConfigUtils.ts"],"names":[],"mappings":";AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAG5C,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,eAAe,iBAuDnE;AAMD,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,eAAe,iBAyBhE"}
+{"version":3,"file":"tamaguiConfigUtils.d.ts","sourceRoot":"","sources":["../src/tamaguiConfigUtils.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAMnD,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,kBAAkB,iBAsDtE;AAMD,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,kBAAkB,iBAsBnE"}

package/types/test.d.ts

@@ -1,3 +1,3 @@
-import { ResolvedOptions } from './types.js';
-export declare const test: (options: ResolvedOptions) => Promise<void>;
+import { CLIResolvedOptions } from '@tamagui/types';
+export declare const test: (options: CLIResolvedOptions) => Promise<void>;
 //# sourceMappingURL=test.d.ts.map

package/types/test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test.d.ts","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAE5C,eAAO,MAAM,IAAI,YAAmB,eAAe,kBAQlD,CAAA"}
+{"version":3,"file":"test.d.ts","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAEnD,eAAO,MAAM,IAAI,YAAmB,kBAAkB,kBAQrD,CAAA"}

package/types/utils.d.ts

@@ -1,6 +1,6 @@
 import type { TamaguiOptions, TamaguiProjectInfo } from '@tamagui/static';
-import { ResolvedOptions, UserOptions } from './types.js';
-export declare function getOptions({ root, tsconfigPath, tamaguiOptions, host, debug, }?: Partial<UserOptions>): Promise<ResolvedOptions>;
+import { CLIResolvedOptions, CLIUserOptions } from '@tamagui/types';
+export declare function getOptions({ root, tsconfigPath, tamaguiOptions, host, debug, }?: Partial<CLIUserOptions>): Promise<CLIResolvedOptions>;
 export declare function ensure(condition: boolean, message: string): void;
 export declare const loadTamagui: (opts: Partial<TamaguiOptions>) => Promise<TamaguiProjectInfo>;
 export declare function registerDispose(cb: () => void): void;

package/types/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAMzE,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAEzD,wBAAsB,UAAU,CAAC,EAC/B,IAAoB,EACpB,YAA8B,EAC9B,cAAc,EACd,IAAI,EACJ,KAAK,GACN,GAAE,OAAO,CAAC,WAAW,CAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CA0BtD;AAED,wBAAgB,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,QAKzD;AAiBD,eAAO,MAAM,WAAW,SAChB,QAAQ,cAAc,CAAC,KAC5B,QAAQ,kBAAkB,CAM5B,CAAA;AAID,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,IAAI,QAE7C;AAED,wBAAgB,UAAU,SAEzB"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAEzE,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAInE,wBAAsB,UAAU,CAAC,EAC/B,IAAoB,EACpB,YAA8B,EAC9B,cAAc,EACd,IAAI,EACJ,KAAK,GACN,GAAE,OAAO,CAAC,cAAc,CAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAwB5D;AAED,wBAAgB,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,QAKzD;AAiBD,eAAO,MAAM,WAAW,SAChB,QAAQ,cAAc,CAAC,KAC5B,QAAQ,kBAAkB,CAM5B,CAAA;AAID,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,IAAI,QAE7C;AAED,wBAAgB,UAAU,SAEzB"}