npm - @tamagui/cli - Versions diffs - 1.0.1-rc.5 → 1.0.1-rc.5.1 - Mend

@tamagui/cli 1.0.1-rc.5 → 1.0.1-rc.5.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

package/dist/cjs/cli.js CHANGED Viewed

@@ -46,6 +46,36 @@ const commandMap = {
       const { update } = await import("./update.js");
       await update();
     }
+  },
+  dev: {
+    shorthands: ["d"],
+    description: `Run tamagui vite`,
+    flags: {
+      "--help": Boolean,
+      "--debug": Boolean,
+      "--verbose": Boolean
+    },
+    async run() {
+      const { _, ...flags2 } = (0, import_arg.default)(this.flags);
+      const { dev } = await import("./dev.js");
+      const options = await (0, import_utils.getOptions)({
+        debug: flags2["--debug"] ? flags2["--verbose"] ? "verbose" : true : false
+      });
+      await dev(options);
+    }
+  },
+  studio: {
+    shorthands: ["s"],
+    description: `Studio`,
+    flags: {},
+    async run() {
+      const { _, ...flags2 } = (0, import_arg.default)(this.flags);
+      const { studio } = await import("./studio.js");
+      const options = await (0, import_utils.getOptions)({
+        debug: flags2["--debug"] ? flags2["--verbose"] ? "verbose" : true : false
+      });
+      await studio(options);
+    }
   }
 };
 const commandEntries = Object.keys(commandMap).flatMap((command2) => {

package/dist/cjs/cli.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/cli.ts"],
-  "sourcesContent": ["/* eslint-disable no-console */\nimport arg, { flag } from 'arg'\nimport chalk from 'chalk'\n\nimport { getOptions } from './utils.js'\n\nconst commandMap = {\n  build: {\n    shorthands: ['b'],\n    description: `Use to pre-build a Tamagui component directory`,\n    flags: {\n      '--help': Boolean,\n      '--debug': Boolean,\n      '--verbose': Boolean,\n    },\n    async run() {\n      const { _, ...flags } = arg(this.flags)\n      const { build } = await import('./build.js')\n      const options = await getOptions({\n        debug: flags['--debug'] ? (flags['--verbose'] ? 'verbose' : true) : false,\n      })\n      await build(options)\n    },\n  },\n\n  update: {\n    shorthands: [],\n    description: `Update all tamagui packages within a monorepo`,\n    flags: {},\n    async run() {\n      const { update } = await import('./update.js')\n      await update()\n    },\n  },\n}\n\ntype CommandDefinitions = typeof commandMap\ntype CommandKey = keyof typeof commandMap\ntype CommandDefinition = CommandDefinitions[CommandKey]\n\nconst commandEntries = Object.keys(commandMap).flatMap((command) => {\n  const definition = commandMap[command as CommandKey]\n  const entries = [command, ...definition.shorthands].map((cmd) => {\n    return [cmd, definition] as const\n  })\n  return entries\n})\n\nconst commands = Object.fromEntries(commandEntries) as any as Record<CommandKey, CommandDefinition>\n\nconst {\n  _: [command],\n  ...flags\n} = arg(\n  {\n    '--help': Boolean,\n    '--version': Boolean,\n  },\n  {\n    permissive: true,\n  }\n)\n\nif (flags['--version']) {\n  console.log(require('../package.json').version)\n  process.exit(0)\n}\n\nif (!command && flags['--help']) {\n  console.log(`$ tamagui\n\ncommands:\n\n${Object.keys(commandMap)\n  .map((key) => {\n    return `  ${key}`\n  })\n  .join('\\n')}`)\n  process.exit(0)\n}\n\nif (!(command in commands)) {\n  console.error()\n  console.warn(chalk.yellow(`Not a valid command: ${command}`))\n  process.exit(1)\n}\n\nconst definition = commands[command] as CommandDefinition\n\nmain()\n\nasync function main() {\n  if (flags['--help']) {\n    console.log(`\\n$ tamagui ${command}: ${definition.description}\\n`)\n    console.log(`Flags: ${Object.entries(definition.flags).map(([k, v]) => `${k} (${v.name})`)}`)\n    process.exit(0)\n  }\n\n  const { _, ...cmdFlags } = arg(definition.flags)\n\n  // help for any command\n  if (cmdFlags['--help']) {\n    console.log(`$ tamagui ${_}\n\n    Flags: ${JSON.stringify(cmdFlags, null, 2)}\n\n`)\n    process.exit(0)\n  }\n\n  await definition.run()\n  process.exit(0)\n}\n\nfunction showHelp(definition: CommandDefinition, flags: { '--help'?: boolean }) {\n  if (flags['--help']) {\n    console.log(`$ ${definition}`)\n  }\n}\n\n// async function main() {\n//   const options = await getOptions({\n//     host: flags['--host'],\n//   })\n\n//   switch (command) {\n//     // build\n//     case 'b':\n//     case 'build': {\n//       const { build } = await import('./build.js')\n//       break\n//     }\n\n//     // generate\n//     case 'generate':\n//     case 'gen': {\n//       const { generateTamaguiConfig: generateTamgauiConfig } = await import(\n//         './tamaguiConfigUtils.js'\n//       )\n//       const { generateTypes } = await import('./generate.js')\n\n//       if (props[0] === 'types') {\n//         await generateTypes(options)\n//         return\n//       }\n//       if (props[0] === 'config') {\n//         await generateTamgauiConfig(options)\n//         return\n//       }\n\n//       await Promise.all([\n//         // all\n//         generateTypes(options),\n//         generateTamgauiConfig(options),\n//       ])\n//       break\n//     }\n\n//     // studio\n//     case 'studio': {\n//       const { studio } = await import('./studio.js')\n//       await studio(options)\n//       break\n//     }\n\n//     // for now, dev === serve, eventually serve can be just prod mode\n//     case 'dev': {\n//       const { dev } = await import('./dev.js')\n//       await dev(options)\n//       break\n//     }\n\n//     default: {\n//       if (!command || flags['--help']) {\n//       }\n//       // eslint-disable-next-line no-console\n//       console.warn(chalk.yellow(`No command found ${command}`))\n//       process.exit(1)\n//     }\n//   }\n// }\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;AACA,iBAA0B;AAC1B,mBAAkB;AAElB,mBAA2B;AAE3B,MAAM,aAAa;AAAA,EACjB,OAAO;AAAA,IACL,YAAY,CAAC,GAAG;AAAA,IAChB,aAAa;AAAA,IACb,OAAO;AAAA,MACL,UAAU;AAAA,MACV,WAAW;AAAA,MACX,aAAa;AAAA,IACf;AAAA,IACA,MAAM,MAAM;AACV,YAAM,EAAE,MAAMA,OAAM,QAAI,WAAAC,SAAI,KAAK,KAAK;AACtC,YAAM,EAAE,MAAM,IAAI,MAAM,OAAO;AAC/B,YAAM,UAAU,UAAM,yBAAW;AAAA,QAC/B,OAAOD,OAAM,aAAcA,OAAM,eAAe,YAAY,OAAQ;AAAA,MACtE,CAAC;AACD,YAAM,MAAM,OAAO;AAAA,IACrB;AAAA,EACF;AAAA,EAEA,QAAQ;AAAA,IACN,YAAY,CAAC;AAAA,IACb,aAAa;AAAA,IACb,OAAO,CAAC;AAAA,IACR,MAAM,MAAM;AACV,YAAM,EAAE,OAAO,IAAI,MAAM,OAAO;AAChC,YAAM,OAAO;AAAA,IACf;AAAA,EACF;AACF;AAMA,MAAM,iBAAiB,OAAO,KAAK,UAAU,EAAE,QAAQ,CAACE,aAAY;AAClE,QAAMC,cAAa,WAAWD;AAC9B,QAAM,UAAU,CAACA,UAAS,GAAGC,YAAW,UAAU,EAAE,IAAI,CAAC,QAAQ;AAC/D,WAAO,CAAC,KAAKA,WAAU;AAAA,EACzB,CAAC;AACD,SAAO;AACT,CAAC;AAED,MAAM,WAAW,OAAO,YAAY,cAAc;AAElD,MAAM;AAAA,EACJ,GAAG,CAAC,OAAO;AAAA,KACR;AACL,QAAI,WAAAF;AAAA,EACF;AAAA,IACE,UAAU;AAAA,IACV,aAAa;AAAA,EACf;AAAA,EACA;AAAA,IACE,YAAY;AAAA,EACd;AACF;AAEA,IAAI,MAAM,cAAc;AACtB,UAAQ,IAAI,QAAQ,iBAAiB,EAAE,OAAO;AAC9C,UAAQ,KAAK,CAAC;AAChB;AAEA,IAAI,CAAC,WAAW,MAAM,WAAW;AAC/B,UAAQ,IAAI;AAAA;AAAA;AAAA;AAAA,EAIZ,OAAO,KAAK,UAAU,EACrB,IAAI,CAAC,QAAQ;AACZ,WAAO,KAAK;AAAA,EACd,CAAC,EACA,KAAK,IAAI,GAAG;AACb,UAAQ,KAAK,CAAC;AAChB;AAEA,IAAI,EAAE,WAAW,WAAW;AAC1B,UAAQ,MAAM;AACd,UAAQ,KAAK,aAAAG,QAAM,OAAO,wBAAwB,SAAS,CAAC;AAC5D,UAAQ,KAAK,CAAC;AAChB;AAEA,MAAM,aAAa,SAAS;AAE5B,KAAK;AAEL,eAAe,OAAO;AACpB,MAAI,MAAM,WAAW;AACnB,YAAQ,IAAI;AAAA,YAAe,YAAY,WAAW;AAAA,CAAe;AACjE,YAAQ,IAAI,UAAU,OAAO,QAAQ,WAAW,KAAK,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,GAAG,MAAM,EAAE,OAAO,GAAG;AAC5F,YAAQ,KAAK,CAAC;AAAA,EAChB;AAEA,QAAM,EAAE,MAAM,SAAS,QAAI,WAAAH,SAAI,WAAW,KAAK;AAG/C,MAAI,SAAS,WAAW;AACtB,YAAQ,IAAI,aAAa;AAAA;AAAA,aAEhB,KAAK,UAAU,UAAU,MAAM,CAAC;AAAA;AAAA,CAE5C;AACG,YAAQ,KAAK,CAAC;AAAA,EAChB;AAEA,QAAM,WAAW,IAAI;AACrB,UAAQ,KAAK,CAAC;AAChB;AAEA,SAAS,SAASE,aAA+BH,QAA+B;AAC9E,MAAIA,OAAM,WAAW;AACnB,YAAQ,IAAI,KAAKG,aAAY;AAAA,EAC/B;AACF;",
+  "sourcesContent": ["/* eslint-disable no-console */\nimport arg, { flag } from 'arg'\nimport chalk from 'chalk'\n\nimport { getOptions } from './utils.js'\n\nconst commandMap = {\n  build: {\n    shorthands: ['b'],\n    description: `Use to pre-build a Tamagui component directory`,\n    flags: {\n      '--help': Boolean,\n      '--debug': Boolean,\n      '--verbose': Boolean,\n    },\n    async run() {\n      const { _, ...flags } = arg(this.flags)\n      const { build } = await import('./build.js')\n      const options = await getOptions({\n        debug: flags['--debug'] ? (flags['--verbose'] ? 'verbose' : true) : false,\n      })\n      await build(options)\n    },\n  },\n\n  update: {\n    shorthands: [],\n    description: `Update all tamagui packages within a monorepo`,\n    flags: {},\n    async run() {\n      const { update } = await import('./update.js')\n      await update()\n    },\n  },\n\n  dev: {\n    shorthands: ['d'],\n    description: `Run tamagui vite`,\n    flags: {\n      '--help': Boolean,\n      '--debug': Boolean,\n      '--verbose': Boolean,\n    },\n    async run() {\n      const { _, ...flags } = arg(this.flags)\n      const { dev } = await import('./dev.js')\n      const options = await getOptions({\n        debug: flags['--debug'] ? (flags['--verbose'] ? 'verbose' : true) : false,\n      })\n      await dev(options)\n    },\n  },\n\n  studio: {\n    shorthands: ['s'],\n    description: `Studio`,\n    flags: {},\n    async run() {\n      const { _, ...flags } = arg(this.flags)\n      const { studio } = await import('./studio.js')\n      const options = await getOptions({\n        debug: flags['--debug'] ? (flags['--verbose'] ? 'verbose' : true) : false,\n      })\n      await studio(options)\n    },\n  },\n}\n\ntype CommandDefinitions = typeof commandMap\ntype CommandKey = keyof typeof commandMap\ntype CommandDefinition = CommandDefinitions[CommandKey]\n\nconst commandEntries = Object.keys(commandMap).flatMap((command) => {\n  const definition = commandMap[command as CommandKey]\n  const entries = [command, ...definition.shorthands].map((cmd) => {\n    return [cmd, definition] as const\n  })\n  return entries\n})\n\nconst commands = Object.fromEntries(commandEntries) as any as Record<CommandKey, CommandDefinition>\n\nconst {\n  _: [command],\n  ...flags\n} = arg(\n  {\n    '--help': Boolean,\n    '--version': Boolean,\n  },\n  {\n    permissive: true,\n  }\n)\n\nif (flags['--version']) {\n  console.log(require('../package.json').version)\n  process.exit(0)\n}\n\nif (!command && flags['--help']) {\n  console.log(`$ tamagui\n\ncommands:\n\n${Object.keys(commandMap)\n  .map((key) => {\n    return `  ${key}`\n  })\n  .join('\\n')}`)\n  process.exit(0)\n}\n\nif (!(command in commands)) {\n  console.error()\n  console.warn(chalk.yellow(`Not a valid command: ${command}`))\n  process.exit(1)\n}\n\nconst definition = commands[command] as CommandDefinition\n\nmain()\n\nasync function main() {\n  if (flags['--help']) {\n    console.log(`\\n$ tamagui ${command}: ${definition.description}\\n`)\n    console.log(`Flags: ${Object.entries(definition.flags).map(([k, v]) => `${k} (${v.name})`)}`)\n    process.exit(0)\n  }\n\n  const { _, ...cmdFlags } = arg(definition.flags)\n\n  // help for any command\n  if (cmdFlags['--help']) {\n    console.log(`$ tamagui ${_}\n\n    Flags: ${JSON.stringify(cmdFlags, null, 2)}\n\n`)\n    process.exit(0)\n  }\n\n  await definition.run()\n  process.exit(0)\n}\n\nfunction showHelp(definition: CommandDefinition, flags: { '--help'?: boolean }) {\n  if (flags['--help']) {\n    console.log(`$ ${definition}`)\n  }\n}\n\n// async function main() {\n//   const options = await getOptions({\n//     host: flags['--host'],\n//   })\n\n//   switch (command) {\n//     // build\n//     case 'b':\n//     case 'build': {\n//       const { build } = await import('./build.js')\n//       break\n//     }\n\n//     // generate\n//     case 'generate':\n//     case 'gen': {\n//       const { generateTamaguiConfig: generateTamgauiConfig } = await import(\n//         './tamaguiConfigUtils.js'\n//       )\n//       const { generateTypes } = await import('./generate.js')\n\n//       if (props[0] === 'types') {\n//         await generateTypes(options)\n//         return\n//       }\n//       if (props[0] === 'config') {\n//         await generateTamgauiConfig(options)\n//         return\n//       }\n\n//       await Promise.all([\n//         // all\n//         generateTypes(options),\n//         generateTamgauiConfig(options),\n//       ])\n//       break\n//     }\n\n//     // for now, dev === serve, eventually serve can be just prod mode\n//     case 'dev': {\n//       const { dev } = await import('./dev.js')\n//       await dev(options)\n//       break\n//     }\n\n//     default: {\n//       if (!command || flags['--help']) {\n//       }\n//       // eslint-disable-next-line no-console\n//       console.warn(chalk.yellow(`No command found ${command}`))\n//       process.exit(1)\n//     }\n//   }\n// }\n"],
+  "mappings": "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",
   "names": ["flags", "arg", "command", "definition", "chalk"]
 }

package/dist/cjs/dev.js CHANGED Viewed

@@ -37,13 +37,13 @@ var import_tamaguiConfigUtils = require("./tamaguiConfigUtils.js");
 var import_utils = require("./utils.js");
 const dev = async (options) => {
   var _a;
-  const { default: getPort } = await import("get-port");
   const { root, mode, paths } = options;
+  process.chdir(process.cwd());
   const server = await (0, import_vite.createServer)({
     root,
     server: {
-      open: true,
-      host: options.host
+      port: options.port,
+      host: options.host || "localhost"
     }
   });
   await Promise.all([
@@ -51,9 +51,6 @@ const dev = async (options) => {
     (0, import_tamaguiConfigUtils.watchTamaguiConfig)(options)
   ]);
   const info = (_a = server.httpServer) == null ? void 0 : _a.address();
-  const port = await getPort({
-    port: info.port + 1
-  });
   const app = (0, import_express.default)();
   app.disable("x-powered-by");
   app.use(import_express.default.static(paths.dotDir, { maxAge: "2h" }));
@@ -63,6 +60,7 @@ const dev = async (options) => {
     res.status(200).json(conf);
   });
   app.use("/", (0, import_express_http_proxy.default)(`${info.address}:${info.port}`));
+  const port = 8081;
   app.listen(port);
   console.log(`Listening on`, import_chalk.default.green(`http://localhost:${port}`));
   server.printUrls();

package/dist/cjs/dev.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/dev.ts"],
-  "sourcesContent": ["import { AddressInfo } from 'net'\n\nimport chalk from 'chalk'\nimport express from 'express'\nimport proxy from 'express-http-proxy'\nimport fs from 'fs-extra'\nimport morgan from 'morgan'\nimport { createServer } from 'vite'\n\nimport { watchTamaguiConfig } from './tamaguiConfigUtils.js'\nimport { ResolvedOptions } from './types.js'\nimport { closeEvent } from './utils.js'\n\nexport const dev = async (options: ResolvedOptions) => {\n  const { default: getPort } = await import('get-port')\n  const { root, mode, paths } = options\n  const server = await createServer({\n    root,\n    server: {\n      open: true,\n      host: options.host,\n    },\n  })\n\n  // these can be lazy loaded (eventually should put in own process)\n  await Promise.all([\n    server.listen(),\n    //\n    watchTamaguiConfig(options),\n    // generateTypes(options),\n  ])\n\n  const info = server.httpServer?.address() as AddressInfo\n\n  const port = await getPort({\n    port: info.port + 1,\n  })\n\n  const app = express()\n\n  app.disable('x-powered-by')\n  app.use(express.static(paths.dotDir, { maxAge: '2h' }))\n  app.use(morgan('tiny'))\n\n  // studio specific - move out eventually to studioPlugin\n\n  app.get('/conf', async (req, res) => {\n    const conf = await fs.readJSON(paths.conf)\n    res.status(200).json(conf)\n  })\n\n  app.use('/', proxy(`${info.address}:${info.port}`))\n\n  app.listen(port)\n\n  console.log(`Listening on`, chalk.green(`http://localhost:${port}`))\n  server.printUrls()\n\n  await closeEvent(server)\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,mBAAkB;AAClB,qBAAoB;AACpB,gCAAkB;AAClB,sBAAe;AACf,oBAAmB;AACnB,kBAA6B;AAE7B,gCAAmC;AAEnC,mBAA2B;AAEpB,MAAM,MAAM,OAAO,YAA6B;AAbvD;AAcE,QAAM,EAAE,SAAS,QAAQ,IAAI,MAAM,OAAO;AAC1C,QAAM,EAAE,MAAM,MAAM,MAAM,IAAI;AAC9B,QAAM,SAAS,UAAM,0BAAa;AAAA,IAChC;AAAA,IACA,QAAQ;AAAA,MACN,MAAM;AAAA,MACN,MAAM,QAAQ;AAAA,IAChB;AAAA,EACF,CAAC;AAGD,QAAM,QAAQ,IAAI;AAAA,IAChB,OAAO,OAAO;AAAA,QAEd,8CAAmB,OAAO;AAAA,EAE5B,CAAC;AAED,QAAM,QAAO,YAAO,eAAP,mBAAmB;AAEhC,QAAM,OAAO,MAAM,QAAQ;AAAA,IACzB,MAAM,KAAK,OAAO;AAAA,EACpB,CAAC;AAED,QAAM,UAAM,eAAAA,SAAQ;AAEpB,MAAI,QAAQ,cAAc;AAC1B,MAAI,IAAI,eAAAA,QAAQ,OAAO,MAAM,QAAQ,EAAE,QAAQ,KAAK,CAAC,CAAC;AACtD,MAAI,QAAI,cAAAC,SAAO,MAAM,CAAC;AAItB,MAAI,IAAI,SAAS,OAAO,KAAK,QAAQ;AACnC,UAAM,OAAO,MAAM,gBAAAC,QAAG,SAAS,MAAM,IAAI;AACzC,QAAI,OAAO,GAAG,EAAE,KAAK,IAAI;AAAA,EAC3B,CAAC;AAED,MAAI,IAAI,SAAK,0BAAAC,SAAM,GAAG,KAAK,WAAW,KAAK,MAAM,CAAC;AAElD,MAAI,OAAO,IAAI;AAEf,UAAQ,IAAI,gBAAgB,aAAAC,QAAM,MAAM,oBAAoB,MAAM,CAAC;AACnE,SAAO,UAAU;AAEjB,YAAM,yBAAW,MAAM;AACzB;",
+  "sourcesContent": ["import { AddressInfo } from 'net'\nimport { join } from 'path'\n\nimport chalk from 'chalk'\nimport express from 'express'\nimport proxy from 'express-http-proxy'\nimport fs from 'fs-extra'\nimport morgan from 'morgan'\nimport { createServer } from 'vite'\n\nimport { watchTamaguiConfig } from './tamaguiConfigUtils.js'\nimport { ResolvedOptions } from './types.js'\nimport { closeEvent } from './utils.js'\n\nexport const dev = async (options: ResolvedOptions) => {\n  const { root, mode, paths } = options\n\n  process.chdir(process.cwd())\n\n  const server = await createServer({\n    root,\n    server: {\n      port: options.port,\n      host: options.host || 'localhost',\n    },\n  })\n\n  // these can be lazy loaded (eventually should put in own process)\n  await Promise.all([\n    server.listen(),\n    //\n    watchTamaguiConfig(options),\n    // generateTypes(options),\n  ])\n\n  const info = server.httpServer?.address() as AddressInfo\n  const app = express()\n\n  app.disable('x-powered-by')\n  app.use(express.static(paths.dotDir, { maxAge: '2h' }))\n  app.use(morgan('tiny'))\n\n  // studio specific - move out eventually to studioPlugin\n\n  app.get('/conf', async (req, res) => {\n    const conf = await fs.readJSON(paths.conf)\n    res.status(200).json(conf)\n  })\n\n  app.use('/', proxy(`${info.address}:${info.port}`))\n\n  // react native port\n  const port = 8081\n  app.listen(port)\n\n  // eslint-disable-next-line no-console\n  console.log(`Listening on`, chalk.green(`http://localhost:${port}`))\n  server.printUrls()\n\n  await closeEvent(server)\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAGA,mBAAkB;AAClB,qBAAoB;AACpB,gCAAkB;AAClB,sBAAe;AACf,oBAAmB;AACnB,kBAA6B;AAE7B,gCAAmC;AAEnC,mBAA2B;AAEpB,MAAM,MAAM,OAAO,YAA6B;AAdvD;AAeE,QAAM,EAAE,MAAM,MAAM,MAAM,IAAI;AAE9B,UAAQ,MAAM,QAAQ,IAAI,CAAC;AAE3B,QAAM,SAAS,UAAM,0BAAa;AAAA,IAChC;AAAA,IACA,QAAQ;AAAA,MACN,MAAM,QAAQ;AAAA,MACd,MAAM,QAAQ,QAAQ;AAAA,IACxB;AAAA,EACF,CAAC;AAGD,QAAM,QAAQ,IAAI;AAAA,IAChB,OAAO,OAAO;AAAA,QAEd,8CAAmB,OAAO;AAAA,EAE5B,CAAC;AAED,QAAM,QAAO,YAAO,eAAP,mBAAmB;AAChC,QAAM,UAAM,eAAAA,SAAQ;AAEpB,MAAI,QAAQ,cAAc;AAC1B,MAAI,IAAI,eAAAA,QAAQ,OAAO,MAAM,QAAQ,EAAE,QAAQ,KAAK,CAAC,CAAC;AACtD,MAAI,QAAI,cAAAC,SAAO,MAAM,CAAC;AAItB,MAAI,IAAI,SAAS,OAAO,KAAK,QAAQ;AACnC,UAAM,OAAO,MAAM,gBAAAC,QAAG,SAAS,MAAM,IAAI;AACzC,QAAI,OAAO,GAAG,EAAE,KAAK,IAAI;AAAA,EAC3B,CAAC;AAED,MAAI,IAAI,SAAK,0BAAAC,SAAM,GAAG,KAAK,WAAW,KAAK,MAAM,CAAC;AAGlD,QAAM,OAAO;AACb,MAAI,OAAO,IAAI;AAGf,UAAQ,IAAI,gBAAgB,aAAAC,QAAM,MAAM,oBAAoB,MAAM,CAAC;AACnE,SAAO,UAAU;AAEjB,YAAM,yBAAW,MAAM;AACzB;",
   "names": ["express", "morgan", "fs", "proxy", "chalk"]
 }

package/dist/cjs/types.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/types.ts"],
-  "sourcesContent": ["import { TamaguiOptions } from '@tamagui/static'\n\nexport type UserOptions = {\n  root?: string\n  host?: string\n  tsconfigPath?: string\n  tamaguiOptions: Partial<TamaguiOptions>\n  debug?: boolean | 'verbose'\n}\n\nexport type ResolvedOptions = {\n  root: string\n  host?: string\n  mode: 'development' | 'production'\n  debug?: UserOptions['debug']\n  tsconfigPath: string\n  tamaguiOptions: TamaguiOptions\n  pkgJson: {\n    name?: string\n    main?: string\n    module?: string\n    source?: string\n    exports?: Record<string, Record<string, string>>\n  }\n  paths: {\n    dotDir: string\n    conf: string\n    types: string\n  }\n}\n"],
+  "sourcesContent": ["import { TamaguiOptions } from '@tamagui/static'\n\nexport type UserOptions = {\n  root?: string\n  host?: string\n  tsconfigPath?: string\n  tamaguiOptions: Partial<TamaguiOptions>\n  debug?: boolean | 'verbose'\n}\n\nexport type ResolvedOptions = {\n  root: string\n  port?: number\n  host?: string\n  mode: 'development' | 'production'\n  debug?: UserOptions['debug']\n  tsconfigPath: string\n  tamaguiOptions: TamaguiOptions\n  pkgJson: {\n    name?: string\n    main?: string\n    module?: string\n    source?: string\n    exports?: Record<string, Record<string, string>>\n  }\n  paths: {\n    dotDir: string\n    conf: string\n    types: string\n  }\n}\n"],
   "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;",
   "names": []
 }

package/dist/cjs/utils.js CHANGED Viewed

@@ -75,9 +75,8 @@ let cachedPath = "";
 async function getDefaultTamaguiConfigPath() {
   if (cachedPath)
     return cachedPath;
-  const existing = (await Promise.all(defaultPaths.map((path) => (0, import_fs_extra.pathExists)(path)))).findIndex(
-    (x) => !!x
-  );
+  const existingPaths = await Promise.all(defaultPaths.map((path) => (0, import_fs_extra.pathExists)(path)));
+  const existing = existingPaths.findIndex((x) => !!x);
   const found = defaultPaths[existing];
   if (!found) {
     throw new Error(`No found tamagui.config.ts`);

package/dist/cjs/utils.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utils.ts"],
-  "sourcesContent": ["import { join } from 'path'\n\nimport type { TamaguiOptions, TamaguiProjectInfo } from '@tamagui/static'\nimport { loadTamagui as loadTamaguiStatic } from '@tamagui/static'\nimport chalk from 'chalk'\nimport fs, { pathExists, readJSON } from 'fs-extra'\nimport { ViteDevServer } from 'vite'\n\nimport { ResolvedOptions, UserOptions } from './types.js'\n\nexport async function getOptions({\n  root = process.cwd(),\n  tsconfigPath = 'tsconfig.json',\n  tamaguiOptions,\n  host,\n  debug,\n}: Partial<UserOptions> = {}): Promise<ResolvedOptions> {\n  const tsConfigFilePath = join(root, tsconfigPath)\n  ensure(await fs.pathExists(tsConfigFilePath), `No tsconfig found: ${tsConfigFilePath}`)\n  const dotDir = join(root, '.tamagui')\n  const pkgJson = await readJSON(join(root, 'package.json'))\n\n  return {\n    mode: process.env.NODE_ENV === 'production' ? 'production' : 'development',\n    root,\n    host,\n    pkgJson,\n    debug,\n    tsconfigPath,\n    tamaguiOptions: {\n      components: ['tamagui'],\n      config: await getDefaultTamaguiConfigPath(),\n      ...tamaguiOptions,\n    },\n    paths: {\n      dotDir,\n      conf: join(dotDir, 'tamagui.config.json'),\n      types: join(dotDir, 'types.json'),\n    },\n  }\n}\n\nexport function ensure(condition: boolean, message: string) {\n  if (!condition) {\n    console.error(chalk.red.bold('Error:'), chalk.yellow(`${message}`))\n    process.exit(1)\n  }\n}\n\nconst defaultPaths = ['tamagui.config.ts', join('src', 'tamagui.config.ts')]\nlet cachedPath = ''\nasync function getDefaultTamaguiConfigPath() {\n  if (cachedPath) return cachedPath\n  const existing = (await Promise.all(defaultPaths.map((path) => pathExists(path)))).findIndex(\n    (x) => !!x\n  )\n  const found = defaultPaths[existing]\n  if (!found) {\n    throw new Error(`No found tamagui.config.ts`)\n  }\n  cachedPath = found\n  return found\n}\n\nlet cached: TamaguiProjectInfo | null = null\nexport const loadTamagui = async (opts: Partial<TamaguiOptions>): Promise<TamaguiProjectInfo> => {\n  return (cached ??= await loadTamaguiStatic({\n    config: await getDefaultTamaguiConfigPath(),\n    components: ['tamagui'],\n    ...opts,\n  }))\n}\n\nexport function closeEvent(server: ViteDevServer): Promise<void> {\n  return new Promise((resolve) => {\n    server.ws.on('close', () => {\n      return resolve()\n    })\n  })\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAqB;AAGrB,oBAAiD;AACjD,mBAAkB;AAClB,sBAAyC;AAKzC,eAAsB,WAAW;AAAA,EAC/B,OAAO,QAAQ,IAAI;AAAA,EACnB,eAAe;AAAA,EACf;AAAA,EACA;AAAA,EACA;AACF,IAA0B,CAAC,GAA6B;AACtD,QAAM,uBAAmB,kBAAK,MAAM,YAAY;AAChD,SAAO,MAAM,gBAAAA,QAAG,WAAW,gBAAgB,GAAG,sBAAsB,kBAAkB;AACtF,QAAM,aAAS,kBAAK,MAAM,UAAU;AACpC,QAAM,UAAU,UAAM,8BAAS,kBAAK,MAAM,cAAc,CAAC;AAEzD,SAAO;AAAA,IACL,MAAM,QAAQ,IAAI,aAAa,eAAe,eAAe;AAAA,IAC7D;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,gBAAgB;AAAA,MACd,YAAY,CAAC,SAAS;AAAA,MACtB,QAAQ,MAAM,4BAA4B;AAAA,MAC1C,GAAG;AAAA,IACL;AAAA,IACA,OAAO;AAAA,MACL;AAAA,MACA,UAAM,kBAAK,QAAQ,qBAAqB;AAAA,MACxC,WAAO,kBAAK,QAAQ,YAAY;AAAA,IAClC;AAAA,EACF;AACF;AAEO,SAAS,OAAO,WAAoB,SAAiB;AAC1D,MAAI,CAAC,WAAW;AACd,YAAQ,MAAM,aAAAC,QAAM,IAAI,KAAK,QAAQ,GAAG,aAAAA,QAAM,OAAO,GAAG,SAAS,CAAC;AAClE,YAAQ,KAAK,CAAC;AAAA,EAChB;AACF;AAEA,MAAM,eAAe,CAAC,yBAAqB,kBAAK,OAAO,mBAAmB,CAAC;AAC3E,IAAI,aAAa;AACjB,eAAe,8BAA8B;AAC3C,MAAI;AAAY,WAAO;AACvB,QAAM,YAAY,MAAM,QAAQ,IAAI,aAAa,IAAI,CAAC,aAAS,4BAAW,IAAI,CAAC,CAAC,GAAG;AAAA,IACjF,CAAC,MAAM,CAAC,CAAC;AAAA,EACX;AACA,QAAM,QAAQ,aAAa;AAC3B,MAAI,CAAC,OAAO;AACV,UAAM,IAAI,MAAM,4BAA4B;AAAA,EAC9C;AACA,eAAa;AACb,SAAO;AACT;AAEA,IAAI,SAAoC;AACjC,MAAM,cAAc,OAAO,SAA+D;AAC/F,SAAQ,oBAAW,UAAM,cAAAC,aAAkB;AAAA,IACzC,QAAQ,MAAM,4BAA4B;AAAA,IAC1C,YAAY,CAAC,SAAS;AAAA,IACtB,GAAG;AAAA,EACL,CAAC;AACH;AAEO,SAAS,WAAW,QAAsC;AAC/D,SAAO,IAAI,QAAQ,CAAC,YAAY;AAC9B,WAAO,GAAG,GAAG,SAAS,MAAM;AAC1B,aAAO,QAAQ;AAAA,IACjB,CAAC;AAAA,EACH,CAAC;AACH;",
+  "sourcesContent": ["import { join } from 'path'\n\nimport type { TamaguiOptions, TamaguiProjectInfo } from '@tamagui/static'\nimport { loadTamagui as loadTamaguiStatic } from '@tamagui/static'\nimport chalk from 'chalk'\nimport fs, { pathExists, readJSON } from 'fs-extra'\nimport { ViteDevServer } from 'vite'\n\nimport { ResolvedOptions, UserOptions } from './types.js'\n\nexport async function getOptions({\n  root = process.cwd(),\n  tsconfigPath = 'tsconfig.json',\n  tamaguiOptions,\n  host,\n  debug,\n}: Partial<UserOptions> = {}): Promise<ResolvedOptions> {\n  const tsConfigFilePath = join(root, tsconfigPath)\n  ensure(await fs.pathExists(tsConfigFilePath), `No tsconfig found: ${tsConfigFilePath}`)\n  const dotDir = join(root, '.tamagui')\n  const pkgJson = await readJSON(join(root, 'package.json'))\n\n  return {\n    mode: process.env.NODE_ENV === 'production' ? 'production' : 'development',\n    root,\n    host,\n    pkgJson,\n    debug,\n    tsconfigPath,\n    tamaguiOptions: {\n      components: ['tamagui'],\n      config: await getDefaultTamaguiConfigPath(),\n      ...tamaguiOptions,\n    },\n    paths: {\n      dotDir,\n      conf: join(dotDir, 'tamagui.config.json'),\n      types: join(dotDir, 'types.json'),\n    },\n  }\n}\n\nexport function ensure(condition: boolean, message: string) {\n  if (!condition) {\n    console.error(chalk.red.bold('Error:'), chalk.yellow(`${message}`))\n    process.exit(1)\n  }\n}\n\nconst defaultPaths = ['tamagui.config.ts', join('src', 'tamagui.config.ts')]\nlet cachedPath = ''\nasync function getDefaultTamaguiConfigPath() {\n  if (cachedPath) return cachedPath\n  const existingPaths = await Promise.all(defaultPaths.map((path) => pathExists(path)))\n  const existing = existingPaths.findIndex((x) => !!x)\n  const found = defaultPaths[existing]\n  if (!found) {\n    throw new Error(`No found tamagui.config.ts`)\n  }\n  cachedPath = found\n  return found\n}\n\nlet cached: TamaguiProjectInfo | null = null\nexport const loadTamagui = async (opts: Partial<TamaguiOptions>): Promise<TamaguiProjectInfo> => {\n  return (cached ??= await loadTamaguiStatic({\n    config: await getDefaultTamaguiConfigPath(),\n    components: ['tamagui'],\n    ...opts,\n  }))\n}\n\nexport function closeEvent(server: ViteDevServer): Promise<void> {\n  return new Promise((resolve) => {\n    server.ws.on('close', () => {\n      return resolve()\n    })\n  })\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAqB;AAGrB,oBAAiD;AACjD,mBAAkB;AAClB,sBAAyC;AAKzC,eAAsB,WAAW;AAAA,EAC/B,OAAO,QAAQ,IAAI;AAAA,EACnB,eAAe;AAAA,EACf;AAAA,EACA;AAAA,EACA;AACF,IAA0B,CAAC,GAA6B;AACtD,QAAM,uBAAmB,kBAAK,MAAM,YAAY;AAChD,SAAO,MAAM,gBAAAA,QAAG,WAAW,gBAAgB,GAAG,sBAAsB,kBAAkB;AACtF,QAAM,aAAS,kBAAK,MAAM,UAAU;AACpC,QAAM,UAAU,UAAM,8BAAS,kBAAK,MAAM,cAAc,CAAC;AAEzD,SAAO;AAAA,IACL,MAAM,QAAQ,IAAI,aAAa,eAAe,eAAe;AAAA,IAC7D;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,gBAAgB;AAAA,MACd,YAAY,CAAC,SAAS;AAAA,MACtB,QAAQ,MAAM,4BAA4B;AAAA,MAC1C,GAAG;AAAA,IACL;AAAA,IACA,OAAO;AAAA,MACL;AAAA,MACA,UAAM,kBAAK,QAAQ,qBAAqB;AAAA,MACxC,WAAO,kBAAK,QAAQ,YAAY;AAAA,IAClC;AAAA,EACF;AACF;AAEO,SAAS,OAAO,WAAoB,SAAiB;AAC1D,MAAI,CAAC,WAAW;AACd,YAAQ,MAAM,aAAAC,QAAM,IAAI,KAAK,QAAQ,GAAG,aAAAA,QAAM,OAAO,GAAG,SAAS,CAAC;AAClE,YAAQ,KAAK,CAAC;AAAA,EAChB;AACF;AAEA,MAAM,eAAe,CAAC,yBAAqB,kBAAK,OAAO,mBAAmB,CAAC;AAC3E,IAAI,aAAa;AACjB,eAAe,8BAA8B;AAC3C,MAAI;AAAY,WAAO;AACvB,QAAM,gBAAgB,MAAM,QAAQ,IAAI,aAAa,IAAI,CAAC,aAAS,4BAAW,IAAI,CAAC,CAAC;AACpF,QAAM,WAAW,cAAc,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;AACnD,QAAM,QAAQ,aAAa;AAC3B,MAAI,CAAC,OAAO;AACV,UAAM,IAAI,MAAM,4BAA4B;AAAA,EAC9C;AACA,eAAa;AACb,SAAO;AACT;AAEA,IAAI,SAAoC;AACjC,MAAM,cAAc,OAAO,SAA+D;AAC/F,SAAQ,oBAAW,UAAM,cAAAC,aAAkB;AAAA,IACzC,QAAQ,MAAM,4BAA4B;AAAA,IAC1C,YAAY,CAAC,SAAS;AAAA,IACtB,GAAG;AAAA,EACL,CAAC;AACH;AAEO,SAAS,WAAW,QAAsC;AAC/D,SAAO,IAAI,QAAQ,CAAC,YAAY;AAC9B,WAAO,GAAG,GAAG,SAAS,MAAM;AAC1B,aAAO,QAAQ;AAAA,IACjB,CAAC;AAAA,EACH,CAAC;AACH;",
   "names": ["fs", "chalk", "loadTamaguiStatic"]
 }

package/dist/esm/cli.js CHANGED Viewed

@@ -27,6 +27,36 @@ const commandMap = {
       const { update } = await import("./update.js");
       await update();
     }
+  },
+  dev: {
+    shorthands: ["d"],
+    description: `Run tamagui vite`,
+    flags: {
+      "--help": Boolean,
+      "--debug": Boolean,
+      "--verbose": Boolean
+    },
+    async run() {
+      const { _, ...flags2 } = arg(this.flags);
+      const { dev } = await import("./dev.js");
+      const options = await getOptions({
+        debug: flags2["--debug"] ? flags2["--verbose"] ? "verbose" : true : false
+      });
+      await dev(options);
+    }
+  },
+  studio: {
+    shorthands: ["s"],
+    description: `Studio`,
+    flags: {},
+    async run() {
+      const { _, ...flags2 } = arg(this.flags);
+      const { studio } = await import("./studio.js");
+      const options = await getOptions({
+        debug: flags2["--debug"] ? flags2["--verbose"] ? "verbose" : true : false
+      });
+      await studio(options);
+    }
   }
 };
 const commandEntries = Object.keys(commandMap).flatMap((command2) => {

package/dist/esm/cli.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/cli.ts"],
-  "sourcesContent": ["/* eslint-disable no-console */\nimport arg, { flag } from 'arg'\nimport chalk from 'chalk'\n\nimport { getOptions } from './utils.js'\n\nconst commandMap = {\n  build: {\n    shorthands: ['b'],\n    description: `Use to pre-build a Tamagui component directory`,\n    flags: {\n      '--help': Boolean,\n      '--debug': Boolean,\n      '--verbose': Boolean,\n    },\n    async run() {\n      const { _, ...flags } = arg(this.flags)\n      const { build } = await import('./build.js')\n      const options = await getOptions({\n        debug: flags['--debug'] ? (flags['--verbose'] ? 'verbose' : true) : false,\n      })\n      await build(options)\n    },\n  },\n\n  update: {\n    shorthands: [],\n    description: `Update all tamagui packages within a monorepo`,\n    flags: {},\n    async run() {\n      const { update } = await import('./update.js')\n      await update()\n    },\n  },\n}\n\ntype CommandDefinitions = typeof commandMap\ntype CommandKey = keyof typeof commandMap\ntype CommandDefinition = CommandDefinitions[CommandKey]\n\nconst commandEntries = Object.keys(commandMap).flatMap((command) => {\n  const definition = commandMap[command as CommandKey]\n  const entries = [command, ...definition.shorthands].map((cmd) => {\n    return [cmd, definition] as const\n  })\n  return entries\n})\n\nconst commands = Object.fromEntries(commandEntries) as any as Record<CommandKey, CommandDefinition>\n\nconst {\n  _: [command],\n  ...flags\n} = arg(\n  {\n    '--help': Boolean,\n    '--version': Boolean,\n  },\n  {\n    permissive: true,\n  }\n)\n\nif (flags['--version']) {\n  console.log(require('../package.json').version)\n  process.exit(0)\n}\n\nif (!command && flags['--help']) {\n  console.log(`$ tamagui\n\ncommands:\n\n${Object.keys(commandMap)\n  .map((key) => {\n    return `  ${key}`\n  })\n  .join('\\n')}`)\n  process.exit(0)\n}\n\nif (!(command in commands)) {\n  console.error()\n  console.warn(chalk.yellow(`Not a valid command: ${command}`))\n  process.exit(1)\n}\n\nconst definition = commands[command] as CommandDefinition\n\nmain()\n\nasync function main() {\n  if (flags['--help']) {\n    console.log(`\\n$ tamagui ${command}: ${definition.description}\\n`)\n    console.log(`Flags: ${Object.entries(definition.flags).map(([k, v]) => `${k} (${v.name})`)}`)\n    process.exit(0)\n  }\n\n  const { _, ...cmdFlags } = arg(definition.flags)\n\n  // help for any command\n  if (cmdFlags['--help']) {\n    console.log(`$ tamagui ${_}\n\n    Flags: ${JSON.stringify(cmdFlags, null, 2)}\n\n`)\n    process.exit(0)\n  }\n\n  await definition.run()\n  process.exit(0)\n}\n\nfunction showHelp(definition: CommandDefinition, flags: { '--help'?: boolean }) {\n  if (flags['--help']) {\n    console.log(`$ ${definition}`)\n  }\n}\n\n// async function main() {\n//   const options = await getOptions({\n//     host: flags['--host'],\n//   })\n\n//   switch (command) {\n//     // build\n//     case 'b':\n//     case 'build': {\n//       const { build } = await import('./build.js')\n//       break\n//     }\n\n//     // generate\n//     case 'generate':\n//     case 'gen': {\n//       const { generateTamaguiConfig: generateTamgauiConfig } = await import(\n//         './tamaguiConfigUtils.js'\n//       )\n//       const { generateTypes } = await import('./generate.js')\n\n//       if (props[0] === 'types') {\n//         await generateTypes(options)\n//         return\n//       }\n//       if (props[0] === 'config') {\n//         await generateTamgauiConfig(options)\n//         return\n//       }\n\n//       await Promise.all([\n//         // all\n//         generateTypes(options),\n//         generateTamgauiConfig(options),\n//       ])\n//       break\n//     }\n\n//     // studio\n//     case 'studio': {\n//       const { studio } = await import('./studio.js')\n//       await studio(options)\n//       break\n//     }\n\n//     // for now, dev === serve, eventually serve can be just prod mode\n//     case 'dev': {\n//       const { dev } = await import('./dev.js')\n//       await dev(options)\n//       break\n//     }\n\n//     default: {\n//       if (!command || flags['--help']) {\n//       }\n//       // eslint-disable-next-line no-console\n//       console.warn(chalk.yellow(`No command found ${command}`))\n//       process.exit(1)\n//     }\n//   }\n// }\n"],
-  "mappings": "AACA,OAAO,SAAmB;AAC1B,OAAO,WAAW;AAElB,SAAS,kBAAkB;AAE3B,MAAM,aAAa;AAAA,EACjB,OAAO;AAAA,IACL,YAAY,CAAC,GAAG;AAAA,IAChB,aAAa;AAAA,IACb,OAAO;AAAA,MACL,UAAU;AAAA,MACV,WAAW;AAAA,MACX,aAAa;AAAA,IACf;AAAA,IACA,MAAM,MAAM;AACV,YAAM,EAAE,MAAMA,OAAM,IAAI,IAAI,KAAK,KAAK;AACtC,YAAM,EAAE,MAAM,IAAI,MAAM,OAAO;AAC/B,YAAM,UAAU,MAAM,WAAW;AAAA,QAC/B,OAAOA,OAAM,aAAcA,OAAM,eAAe,YAAY,OAAQ;AAAA,MACtE,CAAC;AACD,YAAM,MAAM,OAAO;AAAA,IACrB;AAAA,EACF;AAAA,EAEA,QAAQ;AAAA,IACN,YAAY,CAAC;AAAA,IACb,aAAa;AAAA,IACb,OAAO,CAAC;AAAA,IACR,MAAM,MAAM;AACV,YAAM,EAAE,OAAO,IAAI,MAAM,OAAO;AAChC,YAAM,OAAO;AAAA,IACf;AAAA,EACF;AACF;AAMA,MAAM,iBAAiB,OAAO,KAAK,UAAU,EAAE,QAAQ,CAACC,aAAY;AAClE,QAAMC,cAAa,WAAWD;AAC9B,QAAM,UAAU,CAACA,UAAS,GAAGC,YAAW,UAAU,EAAE,IAAI,CAAC,QAAQ;AAC/D,WAAO,CAAC,KAAKA,WAAU;AAAA,EACzB,CAAC;AACD,SAAO;AACT,CAAC;AAED,MAAM,WAAW,OAAO,YAAY,cAAc;AAElD,MAAM;AAAA,EACJ,GAAG,CAAC,OAAO;AAAA,KACR;AACL,IAAI;AAAA,EACF;AAAA,IACE,UAAU;AAAA,IACV,aAAa;AAAA,EACf;AAAA,EACA;AAAA,IACE,YAAY;AAAA,EACd;AACF;AAEA,IAAI,MAAM,cAAc;AACtB,UAAQ,IAAI,QAAQ,iBAAiB,EAAE,OAAO;AAC9C,UAAQ,KAAK,CAAC;AAChB;AAEA,IAAI,CAAC,WAAW,MAAM,WAAW;AAC/B,UAAQ,IAAI;AAAA;AAAA;AAAA;AAAA,EAIZ,OAAO,KAAK,UAAU,EACrB,IAAI,CAAC,QAAQ;AACZ,WAAO,KAAK;AAAA,EACd,CAAC,EACA,KAAK,IAAI,GAAG;AACb,UAAQ,KAAK,CAAC;AAChB;AAEA,IAAI,EAAE,WAAW,WAAW;AAC1B,UAAQ,MAAM;AACd,UAAQ,KAAK,MAAM,OAAO,wBAAwB,SAAS,CAAC;AAC5D,UAAQ,KAAK,CAAC;AAChB;AAEA,MAAM,aAAa,SAAS;AAE5B,KAAK;AAEL,eAAe,OAAO;AACpB,MAAI,MAAM,WAAW;AACnB,YAAQ,IAAI;AAAA,YAAe,YAAY,WAAW;AAAA,CAAe;AACjE,YAAQ,IAAI,UAAU,OAAO,QAAQ,WAAW,KAAK,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,GAAG,MAAM,EAAE,OAAO,GAAG;AAC5F,YAAQ,KAAK,CAAC;AAAA,EAChB;AAEA,QAAM,EAAE,MAAM,SAAS,IAAI,IAAI,WAAW,KAAK;AAG/C,MAAI,SAAS,WAAW;AACtB,YAAQ,IAAI,aAAa;AAAA;AAAA,aAEhB,KAAK,UAAU,UAAU,MAAM,CAAC;AAAA;AAAA,CAE5C;AACG,YAAQ,KAAK,CAAC;AAAA,EAChB;AAEA,QAAM,WAAW,IAAI;AACrB,UAAQ,KAAK,CAAC;AAChB;AAEA,SAAS,SAASA,aAA+BF,QAA+B;AAC9E,MAAIA,OAAM,WAAW;AACnB,YAAQ,IAAI,KAAKE,aAAY;AAAA,EAC/B;AACF;",
+  "sourcesContent": ["/* eslint-disable no-console */\nimport arg, { flag } from 'arg'\nimport chalk from 'chalk'\n\nimport { getOptions } from './utils.js'\n\nconst commandMap = {\n  build: {\n    shorthands: ['b'],\n    description: `Use to pre-build a Tamagui component directory`,\n    flags: {\n      '--help': Boolean,\n      '--debug': Boolean,\n      '--verbose': Boolean,\n    },\n    async run() {\n      const { _, ...flags } = arg(this.flags)\n      const { build } = await import('./build.js')\n      const options = await getOptions({\n        debug: flags['--debug'] ? (flags['--verbose'] ? 'verbose' : true) : false,\n      })\n      await build(options)\n    },\n  },\n\n  update: {\n    shorthands: [],\n    description: `Update all tamagui packages within a monorepo`,\n    flags: {},\n    async run() {\n      const { update } = await import('./update.js')\n      await update()\n    },\n  },\n\n  dev: {\n    shorthands: ['d'],\n    description: `Run tamagui vite`,\n    flags: {\n      '--help': Boolean,\n      '--debug': Boolean,\n      '--verbose': Boolean,\n    },\n    async run() {\n      const { _, ...flags } = arg(this.flags)\n      const { dev } = await import('./dev.js')\n      const options = await getOptions({\n        debug: flags['--debug'] ? (flags['--verbose'] ? 'verbose' : true) : false,\n      })\n      await dev(options)\n    },\n  },\n\n  studio: {\n    shorthands: ['s'],\n    description: `Studio`,\n    flags: {},\n    async run() {\n      const { _, ...flags } = arg(this.flags)\n      const { studio } = await import('./studio.js')\n      const options = await getOptions({\n        debug: flags['--debug'] ? (flags['--verbose'] ? 'verbose' : true) : false,\n      })\n      await studio(options)\n    },\n  },\n}\n\ntype CommandDefinitions = typeof commandMap\ntype CommandKey = keyof typeof commandMap\ntype CommandDefinition = CommandDefinitions[CommandKey]\n\nconst commandEntries = Object.keys(commandMap).flatMap((command) => {\n  const definition = commandMap[command as CommandKey]\n  const entries = [command, ...definition.shorthands].map((cmd) => {\n    return [cmd, definition] as const\n  })\n  return entries\n})\n\nconst commands = Object.fromEntries(commandEntries) as any as Record<CommandKey, CommandDefinition>\n\nconst {\n  _: [command],\n  ...flags\n} = arg(\n  {\n    '--help': Boolean,\n    '--version': Boolean,\n  },\n  {\n    permissive: true,\n  }\n)\n\nif (flags['--version']) {\n  console.log(require('../package.json').version)\n  process.exit(0)\n}\n\nif (!command && flags['--help']) {\n  console.log(`$ tamagui\n\ncommands:\n\n${Object.keys(commandMap)\n  .map((key) => {\n    return `  ${key}`\n  })\n  .join('\\n')}`)\n  process.exit(0)\n}\n\nif (!(command in commands)) {\n  console.error()\n  console.warn(chalk.yellow(`Not a valid command: ${command}`))\n  process.exit(1)\n}\n\nconst definition = commands[command] as CommandDefinition\n\nmain()\n\nasync function main() {\n  if (flags['--help']) {\n    console.log(`\\n$ tamagui ${command}: ${definition.description}\\n`)\n    console.log(`Flags: ${Object.entries(definition.flags).map(([k, v]) => `${k} (${v.name})`)}`)\n    process.exit(0)\n  }\n\n  const { _, ...cmdFlags } = arg(definition.flags)\n\n  // help for any command\n  if (cmdFlags['--help']) {\n    console.log(`$ tamagui ${_}\n\n    Flags: ${JSON.stringify(cmdFlags, null, 2)}\n\n`)\n    process.exit(0)\n  }\n\n  await definition.run()\n  process.exit(0)\n}\n\nfunction showHelp(definition: CommandDefinition, flags: { '--help'?: boolean }) {\n  if (flags['--help']) {\n    console.log(`$ ${definition}`)\n  }\n}\n\n// async function main() {\n//   const options = await getOptions({\n//     host: flags['--host'],\n//   })\n\n//   switch (command) {\n//     // build\n//     case 'b':\n//     case 'build': {\n//       const { build } = await import('./build.js')\n//       break\n//     }\n\n//     // generate\n//     case 'generate':\n//     case 'gen': {\n//       const { generateTamaguiConfig: generateTamgauiConfig } = await import(\n//         './tamaguiConfigUtils.js'\n//       )\n//       const { generateTypes } = await import('./generate.js')\n\n//       if (props[0] === 'types') {\n//         await generateTypes(options)\n//         return\n//       }\n//       if (props[0] === 'config') {\n//         await generateTamgauiConfig(options)\n//         return\n//       }\n\n//       await Promise.all([\n//         // all\n//         generateTypes(options),\n//         generateTamgauiConfig(options),\n//       ])\n//       break\n//     }\n\n//     // for now, dev === serve, eventually serve can be just prod mode\n//     case 'dev': {\n//       const { dev } = await import('./dev.js')\n//       await dev(options)\n//       break\n//     }\n\n//     default: {\n//       if (!command || flags['--help']) {\n//       }\n//       // eslint-disable-next-line no-console\n//       console.warn(chalk.yellow(`No command found ${command}`))\n//       process.exit(1)\n//     }\n//   }\n// }\n"],
+  "mappings": "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",
   "names": ["flags", "command", "definition"]
 }

package/dist/esm/dev.js CHANGED Viewed

@@ -8,13 +8,13 @@ import { watchTamaguiConfig } from "./tamaguiConfigUtils.js";
 import { closeEvent } from "./utils.js";
 const dev = async (options) => {
   var _a;
-  const { default: getPort } = await import("get-port");
   const { root, mode, paths } = options;
+  process.chdir(process.cwd());
   const server = await createServer({
     root,
     server: {
-      open: true,
-      host: options.host
+      port: options.port,
+      host: options.host || "localhost"
     }
   });
   await Promise.all([
@@ -22,9 +22,6 @@ const dev = async (options) => {
     watchTamaguiConfig(options)
   ]);
   const info = (_a = server.httpServer) == null ? void 0 : _a.address();
-  const port = await getPort({
-    port: info.port + 1
-  });
   const app = express();
   app.disable("x-powered-by");
   app.use(express.static(paths.dotDir, { maxAge: "2h" }));
@@ -34,6 +31,7 @@ const dev = async (options) => {
     res.status(200).json(conf);
   });
   app.use("/", proxy(`${info.address}:${info.port}`));
+  const port = 8081;
   app.listen(port);
   console.log(`Listening on`, chalk.green(`http://localhost:${port}`));
   server.printUrls();

package/dist/esm/dev.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/dev.ts"],
-  "sourcesContent": ["import { AddressInfo } from 'net'\n\nimport chalk from 'chalk'\nimport express from 'express'\nimport proxy from 'express-http-proxy'\nimport fs from 'fs-extra'\nimport morgan from 'morgan'\nimport { createServer } from 'vite'\n\nimport { watchTamaguiConfig } from './tamaguiConfigUtils.js'\nimport { ResolvedOptions } from './types.js'\nimport { closeEvent } from './utils.js'\n\nexport const dev = async (options: ResolvedOptions) => {\n  const { default: getPort } = await import('get-port')\n  const { root, mode, paths } = options\n  const server = await createServer({\n    root,\n    server: {\n      open: true,\n      host: options.host,\n    },\n  })\n\n  // these can be lazy loaded (eventually should put in own process)\n  await Promise.all([\n    server.listen(),\n    //\n    watchTamaguiConfig(options),\n    // generateTypes(options),\n  ])\n\n  const info = server.httpServer?.address() as AddressInfo\n\n  const port = await getPort({\n    port: info.port + 1,\n  })\n\n  const app = express()\n\n  app.disable('x-powered-by')\n  app.use(express.static(paths.dotDir, { maxAge: '2h' }))\n  app.use(morgan('tiny'))\n\n  // studio specific - move out eventually to studioPlugin\n\n  app.get('/conf', async (req, res) => {\n    const conf = await fs.readJSON(paths.conf)\n    res.status(200).json(conf)\n  })\n\n  app.use('/', proxy(`${info.address}:${info.port}`))\n\n  app.listen(port)\n\n  console.log(`Listening on`, chalk.green(`http://localhost:${port}`))\n  server.printUrls()\n\n  await closeEvent(server)\n}\n"],
-  "mappings": "AAEA,OAAO,WAAW;AAClB,OAAO,aAAa;AACpB,OAAO,WAAW;AAClB,OAAO,QAAQ;AACf,OAAO,YAAY;AACnB,SAAS,oBAAoB;AAE7B,SAAS,0BAA0B;AAEnC,SAAS,kBAAkB;AAEpB,MAAM,MAAM,OAAO,YAA6B;AAbvD;AAcE,QAAM,EAAE,SAAS,QAAQ,IAAI,MAAM,OAAO;AAC1C,QAAM,EAAE,MAAM,MAAM,MAAM,IAAI;AAC9B,QAAM,SAAS,MAAM,aAAa;AAAA,IAChC;AAAA,IACA,QAAQ;AAAA,MACN,MAAM;AAAA,MACN,MAAM,QAAQ;AAAA,IAChB;AAAA,EACF,CAAC;AAGD,QAAM,QAAQ,IAAI;AAAA,IAChB,OAAO,OAAO;AAAA,IAEd,mBAAmB,OAAO;AAAA,EAE5B,CAAC;AAED,QAAM,QAAO,YAAO,eAAP,mBAAmB;AAEhC,QAAM,OAAO,MAAM,QAAQ;AAAA,IACzB,MAAM,KAAK,OAAO;AAAA,EACpB,CAAC;AAED,QAAM,MAAM,QAAQ;AAEpB,MAAI,QAAQ,cAAc;AAC1B,MAAI,IAAI,QAAQ,OAAO,MAAM,QAAQ,EAAE,QAAQ,KAAK,CAAC,CAAC;AACtD,MAAI,IAAI,OAAO,MAAM,CAAC;AAItB,MAAI,IAAI,SAAS,OAAO,KAAK,QAAQ;AACnC,UAAM,OAAO,MAAM,GAAG,SAAS,MAAM,IAAI;AACzC,QAAI,OAAO,GAAG,EAAE,KAAK,IAAI;AAAA,EAC3B,CAAC;AAED,MAAI,IAAI,KAAK,MAAM,GAAG,KAAK,WAAW,KAAK,MAAM,CAAC;AAElD,MAAI,OAAO,IAAI;AAEf,UAAQ,IAAI,gBAAgB,MAAM,MAAM,oBAAoB,MAAM,CAAC;AACnE,SAAO,UAAU;AAEjB,QAAM,WAAW,MAAM;AACzB;",
+  "sourcesContent": ["import { AddressInfo } from 'net'\nimport { join } from 'path'\n\nimport chalk from 'chalk'\nimport express from 'express'\nimport proxy from 'express-http-proxy'\nimport fs from 'fs-extra'\nimport morgan from 'morgan'\nimport { createServer } from 'vite'\n\nimport { watchTamaguiConfig } from './tamaguiConfigUtils.js'\nimport { ResolvedOptions } from './types.js'\nimport { closeEvent } from './utils.js'\n\nexport const dev = async (options: ResolvedOptions) => {\n  const { root, mode, paths } = options\n\n  process.chdir(process.cwd())\n\n  const server = await createServer({\n    root,\n    server: {\n      port: options.port,\n      host: options.host || 'localhost',\n    },\n  })\n\n  // these can be lazy loaded (eventually should put in own process)\n  await Promise.all([\n    server.listen(),\n    //\n    watchTamaguiConfig(options),\n    // generateTypes(options),\n  ])\n\n  const info = server.httpServer?.address() as AddressInfo\n  const app = express()\n\n  app.disable('x-powered-by')\n  app.use(express.static(paths.dotDir, { maxAge: '2h' }))\n  app.use(morgan('tiny'))\n\n  // studio specific - move out eventually to studioPlugin\n\n  app.get('/conf', async (req, res) => {\n    const conf = await fs.readJSON(paths.conf)\n    res.status(200).json(conf)\n  })\n\n  app.use('/', proxy(`${info.address}:${info.port}`))\n\n  // react native port\n  const port = 8081\n  app.listen(port)\n\n  // eslint-disable-next-line no-console\n  console.log(`Listening on`, chalk.green(`http://localhost:${port}`))\n  server.printUrls()\n\n  await closeEvent(server)\n}\n"],
+  "mappings": "AAGA,OAAO,WAAW;AAClB,OAAO,aAAa;AACpB,OAAO,WAAW;AAClB,OAAO,QAAQ;AACf,OAAO,YAAY;AACnB,SAAS,oBAAoB;AAE7B,SAAS,0BAA0B;AAEnC,SAAS,kBAAkB;AAEpB,MAAM,MAAM,OAAO,YAA6B;AAdvD;AAeE,QAAM,EAAE,MAAM,MAAM,MAAM,IAAI;AAE9B,UAAQ,MAAM,QAAQ,IAAI,CAAC;AAE3B,QAAM,SAAS,MAAM,aAAa;AAAA,IAChC;AAAA,IACA,QAAQ;AAAA,MACN,MAAM,QAAQ;AAAA,MACd,MAAM,QAAQ,QAAQ;AAAA,IACxB;AAAA,EACF,CAAC;AAGD,QAAM,QAAQ,IAAI;AAAA,IAChB,OAAO,OAAO;AAAA,IAEd,mBAAmB,OAAO;AAAA,EAE5B,CAAC;AAED,QAAM,QAAO,YAAO,eAAP,mBAAmB;AAChC,QAAM,MAAM,QAAQ;AAEpB,MAAI,QAAQ,cAAc;AAC1B,MAAI,IAAI,QAAQ,OAAO,MAAM,QAAQ,EAAE,QAAQ,KAAK,CAAC,CAAC;AACtD,MAAI,IAAI,OAAO,MAAM,CAAC;AAItB,MAAI,IAAI,SAAS,OAAO,KAAK,QAAQ;AACnC,UAAM,OAAO,MAAM,GAAG,SAAS,MAAM,IAAI;AACzC,QAAI,OAAO,GAAG,EAAE,KAAK,IAAI;AAAA,EAC3B,CAAC;AAED,MAAI,IAAI,KAAK,MAAM,GAAG,KAAK,WAAW,KAAK,MAAM,CAAC;AAGlD,QAAM,OAAO;AACb,MAAI,OAAO,IAAI;AAGf,UAAQ,IAAI,gBAAgB,MAAM,MAAM,oBAAoB,MAAM,CAAC;AACnE,SAAO,UAAU;AAEjB,QAAM,WAAW,MAAM;AACzB;",
   "names": []
 }

package/dist/esm/utils.js CHANGED Viewed

@@ -43,9 +43,8 @@ let cachedPath = "";
 async function getDefaultTamaguiConfigPath() {
   if (cachedPath)
     return cachedPath;
-  const existing = (await Promise.all(defaultPaths.map((path) => pathExists(path)))).findIndex(
-    (x) => !!x
-  );
+  const existingPaths = await Promise.all(defaultPaths.map((path) => pathExists(path)));
+  const existing = existingPaths.findIndex((x) => !!x);
   const found = defaultPaths[existing];
   if (!found) {
     throw new Error(`No found tamagui.config.ts`);

package/dist/esm/utils.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utils.ts"],
-  "sourcesContent": ["import { join } from 'path'\n\nimport type { TamaguiOptions, TamaguiProjectInfo } from '@tamagui/static'\nimport { loadTamagui as loadTamaguiStatic } from '@tamagui/static'\nimport chalk from 'chalk'\nimport fs, { pathExists, readJSON } from 'fs-extra'\nimport { ViteDevServer } from 'vite'\n\nimport { ResolvedOptions, UserOptions } from './types.js'\n\nexport async function getOptions({\n  root = process.cwd(),\n  tsconfigPath = 'tsconfig.json',\n  tamaguiOptions,\n  host,\n  debug,\n}: Partial<UserOptions> = {}): Promise<ResolvedOptions> {\n  const tsConfigFilePath = join(root, tsconfigPath)\n  ensure(await fs.pathExists(tsConfigFilePath), `No tsconfig found: ${tsConfigFilePath}`)\n  const dotDir = join(root, '.tamagui')\n  const pkgJson = await readJSON(join(root, 'package.json'))\n\n  return {\n    mode: process.env.NODE_ENV === 'production' ? 'production' : 'development',\n    root,\n    host,\n    pkgJson,\n    debug,\n    tsconfigPath,\n    tamaguiOptions: {\n      components: ['tamagui'],\n      config: await getDefaultTamaguiConfigPath(),\n      ...tamaguiOptions,\n    },\n    paths: {\n      dotDir,\n      conf: join(dotDir, 'tamagui.config.json'),\n      types: join(dotDir, 'types.json'),\n    },\n  }\n}\n\nexport function ensure(condition: boolean, message: string) {\n  if (!condition) {\n    console.error(chalk.red.bold('Error:'), chalk.yellow(`${message}`))\n    process.exit(1)\n  }\n}\n\nconst defaultPaths = ['tamagui.config.ts', join('src', 'tamagui.config.ts')]\nlet cachedPath = ''\nasync function getDefaultTamaguiConfigPath() {\n  if (cachedPath) return cachedPath\n  const existing = (await Promise.all(defaultPaths.map((path) => pathExists(path)))).findIndex(\n    (x) => !!x\n  )\n  const found = defaultPaths[existing]\n  if (!found) {\n    throw new Error(`No found tamagui.config.ts`)\n  }\n  cachedPath = found\n  return found\n}\n\nlet cached: TamaguiProjectInfo | null = null\nexport const loadTamagui = async (opts: Partial<TamaguiOptions>): Promise<TamaguiProjectInfo> => {\n  return (cached ??= await loadTamaguiStatic({\n    config: await getDefaultTamaguiConfigPath(),\n    components: ['tamagui'],\n    ...opts,\n  }))\n}\n\nexport function closeEvent(server: ViteDevServer): Promise<void> {\n  return new Promise((resolve) => {\n    server.ws.on('close', () => {\n      return resolve()\n    })\n  })\n}\n"],
-  "mappings": "AAAA,SAAS,YAAY;AAGrB,SAAS,eAAe,yBAAyB;AACjD,OAAO,WAAW;AAClB,OAAO,MAAM,YAAY,gBAAgB;AAKzC,eAAsB,WAAW;AAAA,EAC/B,OAAO,QAAQ,IAAI;AAAA,EACnB,eAAe;AAAA,EACf;AAAA,EACA;AAAA,EACA;AACF,IAA0B,CAAC,GAA6B;AACtD,QAAM,mBAAmB,KAAK,MAAM,YAAY;AAChD,SAAO,MAAM,GAAG,WAAW,gBAAgB,GAAG,sBAAsB,kBAAkB;AACtF,QAAM,SAAS,KAAK,MAAM,UAAU;AACpC,QAAM,UAAU,MAAM,SAAS,KAAK,MAAM,cAAc,CAAC;AAEzD,SAAO;AAAA,IACL,MAAM,QAAQ,IAAI,aAAa,eAAe,eAAe;AAAA,IAC7D;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,gBAAgB;AAAA,MACd,YAAY,CAAC,SAAS;AAAA,MACtB,QAAQ,MAAM,4BAA4B;AAAA,MAC1C,GAAG;AAAA,IACL;AAAA,IACA,OAAO;AAAA,MACL;AAAA,MACA,MAAM,KAAK,QAAQ,qBAAqB;AAAA,MACxC,OAAO,KAAK,QAAQ,YAAY;AAAA,IAClC;AAAA,EACF;AACF;AAEO,SAAS,OAAO,WAAoB,SAAiB;AAC1D,MAAI,CAAC,WAAW;AACd,YAAQ,MAAM,MAAM,IAAI,KAAK,QAAQ,GAAG,MAAM,OAAO,GAAG,SAAS,CAAC;AAClE,YAAQ,KAAK,CAAC;AAAA,EAChB;AACF;AAEA,MAAM,eAAe,CAAC,qBAAqB,KAAK,OAAO,mBAAmB,CAAC;AAC3E,IAAI,aAAa;AACjB,eAAe,8BAA8B;AAC3C,MAAI;AAAY,WAAO;AACvB,QAAM,YAAY,MAAM,QAAQ,IAAI,aAAa,IAAI,CAAC,SAAS,WAAW,IAAI,CAAC,CAAC,GAAG;AAAA,IACjF,CAAC,MAAM,CAAC,CAAC;AAAA,EACX;AACA,QAAM,QAAQ,aAAa;AAC3B,MAAI,CAAC,OAAO;AACV,UAAM,IAAI,MAAM,4BAA4B;AAAA,EAC9C;AACA,eAAa;AACb,SAAO;AACT;AAEA,IAAI,SAAoC;AACjC,MAAM,cAAc,OAAO,SAA+D;AAC/F,SAAQ,WAAW,MAAM,kBAAkB;AAAA,IACzC,QAAQ,MAAM,4BAA4B;AAAA,IAC1C,YAAY,CAAC,SAAS;AAAA,IACtB,GAAG;AAAA,EACL,CAAC;AACH;AAEO,SAAS,WAAW,QAAsC;AAC/D,SAAO,IAAI,QAAQ,CAAC,YAAY;AAC9B,WAAO,GAAG,GAAG,SAAS,MAAM;AAC1B,aAAO,QAAQ;AAAA,IACjB,CAAC;AAAA,EACH,CAAC;AACH;",
+  "sourcesContent": ["import { join } from 'path'\n\nimport type { TamaguiOptions, TamaguiProjectInfo } from '@tamagui/static'\nimport { loadTamagui as loadTamaguiStatic } from '@tamagui/static'\nimport chalk from 'chalk'\nimport fs, { pathExists, readJSON } from 'fs-extra'\nimport { ViteDevServer } from 'vite'\n\nimport { ResolvedOptions, UserOptions } from './types.js'\n\nexport async function getOptions({\n  root = process.cwd(),\n  tsconfigPath = 'tsconfig.json',\n  tamaguiOptions,\n  host,\n  debug,\n}: Partial<UserOptions> = {}): Promise<ResolvedOptions> {\n  const tsConfigFilePath = join(root, tsconfigPath)\n  ensure(await fs.pathExists(tsConfigFilePath), `No tsconfig found: ${tsConfigFilePath}`)\n  const dotDir = join(root, '.tamagui')\n  const pkgJson = await readJSON(join(root, 'package.json'))\n\n  return {\n    mode: process.env.NODE_ENV === 'production' ? 'production' : 'development',\n    root,\n    host,\n    pkgJson,\n    debug,\n    tsconfigPath,\n    tamaguiOptions: {\n      components: ['tamagui'],\n      config: await getDefaultTamaguiConfigPath(),\n      ...tamaguiOptions,\n    },\n    paths: {\n      dotDir,\n      conf: join(dotDir, 'tamagui.config.json'),\n      types: join(dotDir, 'types.json'),\n    },\n  }\n}\n\nexport function ensure(condition: boolean, message: string) {\n  if (!condition) {\n    console.error(chalk.red.bold('Error:'), chalk.yellow(`${message}`))\n    process.exit(1)\n  }\n}\n\nconst defaultPaths = ['tamagui.config.ts', join('src', 'tamagui.config.ts')]\nlet cachedPath = ''\nasync function getDefaultTamaguiConfigPath() {\n  if (cachedPath) return cachedPath\n  const existingPaths = await Promise.all(defaultPaths.map((path) => pathExists(path)))\n  const existing = existingPaths.findIndex((x) => !!x)\n  const found = defaultPaths[existing]\n  if (!found) {\n    throw new Error(`No found tamagui.config.ts`)\n  }\n  cachedPath = found\n  return found\n}\n\nlet cached: TamaguiProjectInfo | null = null\nexport const loadTamagui = async (opts: Partial<TamaguiOptions>): Promise<TamaguiProjectInfo> => {\n  return (cached ??= await loadTamaguiStatic({\n    config: await getDefaultTamaguiConfigPath(),\n    components: ['tamagui'],\n    ...opts,\n  }))\n}\n\nexport function closeEvent(server: ViteDevServer): Promise<void> {\n  return new Promise((resolve) => {\n    server.ws.on('close', () => {\n      return resolve()\n    })\n  })\n}\n"],
+  "mappings": "AAAA,SAAS,YAAY;AAGrB,SAAS,eAAe,yBAAyB;AACjD,OAAO,WAAW;AAClB,OAAO,MAAM,YAAY,gBAAgB;AAKzC,eAAsB,WAAW;AAAA,EAC/B,OAAO,QAAQ,IAAI;AAAA,EACnB,eAAe;AAAA,EACf;AAAA,EACA;AAAA,EACA;AACF,IAA0B,CAAC,GAA6B;AACtD,QAAM,mBAAmB,KAAK,MAAM,YAAY;AAChD,SAAO,MAAM,GAAG,WAAW,gBAAgB,GAAG,sBAAsB,kBAAkB;AACtF,QAAM,SAAS,KAAK,MAAM,UAAU;AACpC,QAAM,UAAU,MAAM,SAAS,KAAK,MAAM,cAAc,CAAC;AAEzD,SAAO;AAAA,IACL,MAAM,QAAQ,IAAI,aAAa,eAAe,eAAe;AAAA,IAC7D;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,gBAAgB;AAAA,MACd,YAAY,CAAC,SAAS;AAAA,MACtB,QAAQ,MAAM,4BAA4B;AAAA,MAC1C,GAAG;AAAA,IACL;AAAA,IACA,OAAO;AAAA,MACL;AAAA,MACA,MAAM,KAAK,QAAQ,qBAAqB;AAAA,MACxC,OAAO,KAAK,QAAQ,YAAY;AAAA,IAClC;AAAA,EACF;AACF;AAEO,SAAS,OAAO,WAAoB,SAAiB;AAC1D,MAAI,CAAC,WAAW;AACd,YAAQ,MAAM,MAAM,IAAI,KAAK,QAAQ,GAAG,MAAM,OAAO,GAAG,SAAS,CAAC;AAClE,YAAQ,KAAK,CAAC;AAAA,EAChB;AACF;AAEA,MAAM,eAAe,CAAC,qBAAqB,KAAK,OAAO,mBAAmB,CAAC;AAC3E,IAAI,aAAa;AACjB,eAAe,8BAA8B;AAC3C,MAAI;AAAY,WAAO;AACvB,QAAM,gBAAgB,MAAM,QAAQ,IAAI,aAAa,IAAI,CAAC,SAAS,WAAW,IAAI,CAAC,CAAC;AACpF,QAAM,WAAW,cAAc,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;AACnD,QAAM,QAAQ,aAAa;AAC3B,MAAI,CAAC,OAAO;AACV,UAAM,IAAI,MAAM,4BAA4B;AAAA,EAC9C;AACA,eAAa;AACb,SAAO;AACT;AAEA,IAAI,SAAoC;AACjC,MAAM,cAAc,OAAO,SAA+D;AAC/F,SAAQ,WAAW,MAAM,kBAAkB;AAAA,IACzC,QAAQ,MAAM,4BAA4B;AAAA,IAC1C,YAAY,CAAC,SAAS;AAAA,IACtB,GAAG;AAAA,EACL,CAAC;AACH;AAEO,SAAS,WAAW,QAAsC;AAC/D,SAAO,IAAI,QAAQ,CAAC,YAAY;AAC9B,WAAO,GAAG,GAAG,SAAS,MAAM;AAC1B,aAAO,QAAQ;AAAA,IACjB,CAAC;AAAA,EACH,CAAC;AACH;",
   "names": []
 }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/cli",
-  "version": "1.0.1-rc.5",
+  "version": "1.0.1-rc.5.1",
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
   "module": "dist/esm",
@@ -31,9 +31,9 @@
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@tamagui/build": "^1.0.1-rc.5",
-    "@tamagui/static": "^1.0.1-rc.5",
-    "@tamagui/vite-plugin": "^1.0.1-rc.5",
+    "@tamagui/build": "^1.0.1-rc.5.1",
+    "@tamagui/static": "^1.0.1-rc.5.1",
+    "@tamagui/vite-plugin": "^1.0.1-rc.5.1",
     "@types/compression": "^1.7.2",
     "@types/morgan": "^1.9.3",
     "arg": "^5.0.2",
@@ -57,6 +57,6 @@
     "zx": "^7.1.1"
   },
   "devDependencies": {
-    "@takeout/studio": "^1.0.1-rc.5"
+    "@takeout/studio": "^1.0.1-rc.5.1"
   }
 }

package/src/cli.ts CHANGED Viewed

@@ -32,6 +32,38 @@ const commandMap = {
       await update()
     },
   },
+  dev: {
+    shorthands: ['d'],
+    description: `Run tamagui vite`,
+    flags: {
+      '--help': Boolean,
+      '--debug': Boolean,
+      '--verbose': Boolean,
+    },
+    async run() {
+      const { _, ...flags } = arg(this.flags)
+      const { dev } = await import('./dev.js')
+      const options = await getOptions({
+        debug: flags['--debug'] ? (flags['--verbose'] ? 'verbose' : true) : false,
+      })
+      await dev(options)
+    },
+  },
+  studio: {
+    shorthands: ['s'],
+    description: `Studio`,
+    flags: {},
+    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)
+    },
+  },
 }
 type CommandDefinitions = typeof commandMap
@@ -156,13 +188,6 @@ function showHelp(definition: CommandDefinition, flags: { '--help'?: boolean })
 //       break
 //     }
-//     // studio
-//     case 'studio': {
-//       const { studio } = await import('./studio.js')
-//       await studio(options)
-//       break
-//     }
 //     // for now, dev === serve, eventually serve can be just prod mode
 //     case 'dev': {
 //       const { dev } = await import('./dev.js')

package/src/dev.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 import { AddressInfo } from 'net'
+import { join } from 'path'
 import chalk from 'chalk'
 import express from 'express'
@@ -12,13 +13,15 @@ import { ResolvedOptions } from './types.js'
 import { closeEvent } from './utils.js'
 export const dev = async (options: ResolvedOptions) => {
-  const { default: getPort } = await import('get-port')
   const { root, mode, paths } = options
+  process.chdir(process.cwd())
   const server = await createServer({
     root,
     server: {
-      open: true,
-      host: options.host,
+      port: options.port,
+      host: options.host || 'localhost',
     },
   })
@@ -31,11 +34,6 @@ export const dev = async (options: ResolvedOptions) => {
   ])
   const info = server.httpServer?.address() as AddressInfo
-  const port = await getPort({
-    port: info.port + 1,
-  })
   const app = express()
   app.disable('x-powered-by')
@@ -51,8 +49,11 @@ export const dev = async (options: ResolvedOptions) => {
   app.use('/', proxy(`${info.address}:${info.port}`))
+  // react native port
+  const port = 8081
   app.listen(port)
+  // eslint-disable-next-line no-console
   console.log(`Listening on`, chalk.green(`http://localhost:${port}`))
   server.printUrls()

package/src/types.ts CHANGED Viewed

@@ -10,6 +10,7 @@ export type UserOptions = {
 export type ResolvedOptions = {
   root: string
+  port?: number
   host?: string
   mode: 'development' | 'production'
   debug?: UserOptions['debug']

package/src/utils.ts CHANGED Viewed

@@ -51,9 +51,8 @@ const defaultPaths = ['tamagui.config.ts', join('src', 'tamagui.config.ts')]
 let cachedPath = ''
 async function getDefaultTamaguiConfigPath() {
   if (cachedPath) return cachedPath
-  const existing = (await Promise.all(defaultPaths.map((path) => pathExists(path)))).findIndex(
-    (x) => !!x
-  )
+  const existingPaths = await Promise.all(defaultPaths.map((path) => pathExists(path)))
+  const existing = existingPaths.findIndex((x) => !!x)
   const found = defaultPaths[existing]
   if (!found) {
     throw new Error(`No found tamagui.config.ts`)

package/types/types.d.ts CHANGED Viewed

@@ -8,6 +8,7 @@ export type UserOptions = {
 };
 export type ResolvedOptions = {
     root: string;
+    port?: number;
     host?: string;
     mode: 'development' | 'production';
     debug?: UserOptions['debug'];