@tamagui/cli 1.6.3 → 1.7.1

package/dist/cjs/studio.js

@@ -48,12 +48,20 @@ const studio = async (options) => {
   const { default: getPort } = await import("get-port");
   const { paths } = options;
   const root = (0, import_path.dirname)(resolve("@takeout/studio/entry"));
+  const [serverPort, vitePort] = await Promise.all([
+    getPort({
+      port: 1421
+    }),
+    getPort({
+      port: 1422
+    })
+  ]);
   const server = await (0, import_vite.createServer)({
     root,
     server: {
       // open: true,
       host: options.host,
-      port: 1420
+      port: vitePort
     },
     plugins: [
       (0, import_vite_plugin.tamaguiPlugin)({
@@ -61,13 +69,9 @@ const studio = async (options) => {
       })
     ]
   });
-  const serverPromise = server.listen();
+  await server.listen();
   const configWatchPromise = (0, import_tamaguiConfigUtils.watchTamaguiConfig)(options);
   const info = (_a = server.httpServer) == null ? void 0 : _a.address();
-  console.log("devServerInfo", info);
-  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" }));
@@ -76,18 +80,13 @@ const studio = async (options) => {
     const conf = await import_fs_extra.default.readJSON(paths.conf);
     res.status(200).json(conf);
   });
-  app.use("/", (0, import_express_http_proxy.default)(`${info.address}:${info.port}`));
-  const appServer = app.listen(port);
-  console.log(`Listening on`, import_chalk.default.green(`http://localhost:${port}`));
-  const longRunning = [
-    serverPromise,
+  app.use("/", (0, import_express_http_proxy.default)(`${info.address}:${vitePort}`));
+  const appServer = app.listen(serverPort);
+  console.log(`Listening on`, import_chalk.default.green(`http://localhost:${serverPort}`));
+  await Promise.allSettled([
     configWatchPromise,
     new Promise((res) => appServer.on("close", res))
-  ];
-  setInterval(() => {
-    console.log(longRunning);
-  }, 1e4);
-  await Promise.allSettled(longRunning);
+  ]);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/studio.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/studio.ts"],
-  "sourcesContent": ["import { createRequire } from 'module'\nimport { AddressInfo } from 'net'\nimport { dirname } from 'path'\n\nimport { tamaguiPlugin } from '@tamagui/vite-plugin'\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'\n\nconst resolve =\n  'url' in import.meta ? createRequire(import.meta.url).resolve : require.resolve\n\nexport const studio = async (options: ResolvedOptions) => {\n  const { default: getPort } = await import('get-port')\n  const { paths } = options\n  const root = dirname(resolve('@takeout/studio/entry'))\n  const server = await createServer({\n    root,\n    server: {\n      // open: true,\n      host: options.host,\n      port: 1420,\n    },\n    plugins: [\n      tamaguiPlugin({\n        components: ['tamagui'],\n      }),\n    ],\n  })\n\n  // these can be lazy loaded (eventually should put in own process)\n  const serverPromise = server.listen()\n  const configWatchPromise = watchTamaguiConfig(options)\n\n  const info = server.httpServer?.address() as AddressInfo\n  console.log('devServerInfo', info)\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  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  const appServer = app.listen(port)\n\n  console.log(`Listening on`, chalk.green(`http://localhost:${port}`))\n\n  const longRunning = [\n    serverPromise,\n    configWatchPromise,\n    new Promise((res) => appServer.on('close', res)),\n  ]\n\n  setInterval(() => {\n    console.log(longRunning)\n  }, 10_000)\n\n  await Promise.allSettled(longRunning)\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAA8B;AAE9B,kBAAwB;AAExB,yBAA8B;AAC9B,mBAAkB;AAClB,qBAAoB;AACpB,gCAAkB;AAClB,sBAAe;AACf,oBAAmB;AACnB,kBAA6B;AAE7B,gCAAmC;AAZnC;AAeA,MAAM,UACJ,SAAS,kBAAc,6BAAc,YAAY,GAAG,EAAE,UAAU,QAAQ;AAEnE,MAAM,SAAS,OAAO,YAA6B;AAlB1D;AAmBE,QAAM,EAAE,SAAS,QAAQ,IAAI,MAAM,OAAO,UAAU;AACpD,QAAM,EAAE,MAAM,IAAI;AAClB,QAAM,WAAO,qBAAQ,QAAQ,uBAAuB,CAAC;AACrD,QAAM,SAAS,UAAM,0BAAa;AAAA,IAChC;AAAA,IACA,QAAQ;AAAA;AAAA,MAEN,MAAM,QAAQ;AAAA,MACd,MAAM;AAAA,IACR;AAAA,IACA,SAAS;AAAA,UACP,kCAAc;AAAA,QACZ,YAAY,CAAC,SAAS;AAAA,MACxB,CAAC;AAAA,IACH;AAAA,EACF,CAAC;AAGD,QAAM,gBAAgB,OAAO,OAAO;AACpC,QAAM,yBAAqB,8CAAmB,OAAO;AAErD,QAAM,QAAO,YAAO,eAAP,mBAAmB;AAChC,UAAQ,IAAI,iBAAiB,IAAI;AAEjC,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;AAEtB,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,QAAM,YAAY,IAAI,OAAO,IAAI;AAEjC,UAAQ,IAAI,gBAAgB,aAAAC,QAAM,MAAM,oBAAoB,MAAM,CAAC;AAEnE,QAAM,cAAc;AAAA,IAClB;AAAA,IACA;AAAA,IACA,IAAI,QAAQ,CAAC,QAAQ,UAAU,GAAG,SAAS,GAAG,CAAC;AAAA,EACjD;AAEA,cAAY,MAAM;AAChB,YAAQ,IAAI,WAAW;AAAA,EACzB,GAAG,GAAM;AAET,QAAM,QAAQ,WAAW,WAAW;AACtC;",
+  "sourcesContent": ["import { createRequire } from 'module'\nimport { AddressInfo } from 'net'\nimport { dirname } from 'path'\n\nimport { tamaguiPlugin } from '@tamagui/vite-plugin'\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'\n\nconst resolve =\n  'url' in import.meta ? createRequire(import.meta.url).resolve : require.resolve\n\nexport const studio = async (options: ResolvedOptions) => {\n  const { default: getPort } = await import('get-port')\n  const { paths } = options\n  const root = dirname(resolve('@takeout/studio/entry'))\n\n  const [serverPort, vitePort] = await Promise.all([\n    getPort({\n      port: 1421,\n    }),\n    getPort({\n      port: 1422,\n    }),\n  ])\n\n  const server = await createServer({\n    root,\n    server: {\n      // open: true,\n      host: options.host,\n      port: vitePort,\n    },\n    plugins: [\n      tamaguiPlugin({\n        components: ['tamagui'],\n      }),\n    ],\n  })\n\n  // these can be lazy loaded (eventually should put in own process)\n  await server.listen()\n\n  const configWatchPromise = watchTamaguiConfig(options)\n\n  const info = server.httpServer?.address() as AddressInfo\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  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}:${vitePort}`))\n\n  const appServer = app.listen(serverPort)\n\n  console.log(`Listening on`, chalk.green(`http://localhost:${serverPort}`))\n\n  await Promise.allSettled([\n    configWatchPromise,\n    new Promise((res) => appServer.on('close', res)),\n  ])\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAA8B;AAE9B,kBAAwB;AAExB,yBAA8B;AAC9B,mBAAkB;AAClB,qBAAoB;AACpB,gCAAkB;AAClB,sBAAe;AACf,oBAAmB;AACnB,kBAA6B;AAE7B,gCAAmC;AAZnC;AAeA,MAAM,UACJ,SAAS,kBAAc,6BAAc,YAAY,GAAG,EAAE,UAAU,QAAQ;AAEnE,MAAM,SAAS,OAAO,YAA6B;AAlB1D;AAmBE,QAAM,EAAE,SAAS,QAAQ,IAAI,MAAM,OAAO,UAAU;AACpD,QAAM,EAAE,MAAM,IAAI;AAClB,QAAM,WAAO,qBAAQ,QAAQ,uBAAuB,CAAC;AAErD,QAAM,CAAC,YAAY,QAAQ,IAAI,MAAM,QAAQ,IAAI;AAAA,IAC/C,QAAQ;AAAA,MACN,MAAM;AAAA,IACR,CAAC;AAAA,IACD,QAAQ;AAAA,MACN,MAAM;AAAA,IACR,CAAC;AAAA,EACH,CAAC;AAED,QAAM,SAAS,UAAM,0BAAa;AAAA,IAChC;AAAA,IACA,QAAQ;AAAA;AAAA,MAEN,MAAM,QAAQ;AAAA,MACd,MAAM;AAAA,IACR;AAAA,IACA,SAAS;AAAA,UACP,kCAAc;AAAA,QACZ,YAAY,CAAC,SAAS;AAAA,MACxB,CAAC;AAAA,IACH;AAAA,EACF,CAAC;AAGD,QAAM,OAAO,OAAO;AAEpB,QAAM,yBAAqB,8CAAmB,OAAO;AAErD,QAAM,QAAO,YAAO,eAAP,mBAAmB;AAEhC,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;AAEtB,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,UAAU,CAAC;AAEjD,QAAM,YAAY,IAAI,OAAO,UAAU;AAEvC,UAAQ,IAAI,gBAAgB,aAAAC,QAAM,MAAM,oBAAoB,YAAY,CAAC;AAEzE,QAAM,QAAQ,WAAW;AAAA,IACvB;AAAA,IACA,IAAI,QAAQ,CAAC,QAAQ,UAAU,GAAG,SAAS,GAAG,CAAC;AAAA,EACjD,CAAC;AACH;",
   "names": ["express", "morgan", "fs", "proxy", "chalk"]
 }

package/dist/esm/studio.js

@@ -14,12 +14,20 @@ const studio = async (options) => {
   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: 1420
+      port: vitePort
     },
     plugins: [
       tamaguiPlugin({
@@ -27,13 +35,9 @@ const studio = async (options) => {
       })
     ]
   });
-  const serverPromise = server.listen();
+  await server.listen();
   const configWatchPromise = watchTamaguiConfig(options);
   const info = (_a = server.httpServer) == null ? void 0 : _a.address();
-  console.log("devServerInfo", info);
-  const port = await getPort({
-    port: info.port + 1
-  });
   const app = express();
   app.disable("x-powered-by");
   app.use(express.static(paths.dotDir, { maxAge: "2h" }));
@@ -42,18 +46,13 @@ const studio = async (options) => {
     const conf = await fs.readJSON(paths.conf);
     res.status(200).json(conf);
   });
-  app.use("/", proxy(`${info.address}:${info.port}`));
-  const appServer = app.listen(port);
-  console.log(`Listening on`, chalk.green(`http://localhost:${port}`));
-  const longRunning = [
-    serverPromise,
+  app.use("/", proxy(`${info.address}:${vitePort}`));
+  const appServer = app.listen(serverPort);
+  console.log(`Listening on`, chalk.green(`http://localhost:${serverPort}`));
+  await Promise.allSettled([
     configWatchPromise,
     new Promise((res) => appServer.on("close", res))
-  ];
-  setInterval(() => {
-    console.log(longRunning);
-  }, 1e4);
-  await Promise.allSettled(longRunning);
+  ]);
 };
 export {
   studio

package/dist/esm/studio.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/studio.ts"],
-  "sourcesContent": ["import { createRequire } from 'module'\nimport { AddressInfo } from 'net'\nimport { dirname } from 'path'\n\nimport { tamaguiPlugin } from '@tamagui/vite-plugin'\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'\n\nconst resolve =\n  'url' in import.meta ? createRequire(import.meta.url).resolve : require.resolve\n\nexport const studio = async (options: ResolvedOptions) => {\n  const { default: getPort } = await import('get-port')\n  const { paths } = options\n  const root = dirname(resolve('@takeout/studio/entry'))\n  const server = await createServer({\n    root,\n    server: {\n      // open: true,\n      host: options.host,\n      port: 1420,\n    },\n    plugins: [\n      tamaguiPlugin({\n        components: ['tamagui'],\n      }),\n    ],\n  })\n\n  // these can be lazy loaded (eventually should put in own process)\n  const serverPromise = server.listen()\n  const configWatchPromise = watchTamaguiConfig(options)\n\n  const info = server.httpServer?.address() as AddressInfo\n  console.log('devServerInfo', info)\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  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  const appServer = app.listen(port)\n\n  console.log(`Listening on`, chalk.green(`http://localhost:${port}`))\n\n  const longRunning = [\n    serverPromise,\n    configWatchPromise,\n    new Promise((res) => appServer.on('close', res)),\n  ]\n\n  setInterval(() => {\n    console.log(longRunning)\n  }, 10_000)\n\n  await Promise.allSettled(longRunning)\n}\n"],
-  "mappings": "AAAA,SAAS,qBAAqB;AAE9B,SAAS,eAAe;AAExB,SAAS,qBAAqB;AAC9B,OAAO,WAAW;AAClB,OAAO,aAAa;AACpB,OAAO,WAAW;AAClB,OAAO,QAAQ;AACf,OAAO,YAAY;AACnB,SAAS,oBAAoB;AAE7B,SAAS,0BAA0B;AAGnC,MAAM,UACJ,SAAS,cAAc,cAAc,YAAY,GAAG,EAAE,UAAU,QAAQ;AAEnE,MAAM,SAAS,OAAO,YAA6B;AAlB1D;AAmBE,QAAM,EAAE,SAAS,QAAQ,IAAI,MAAM,OAAO,UAAU;AACpD,QAAM,EAAE,MAAM,IAAI;AAClB,QAAM,OAAO,QAAQ,QAAQ,uBAAuB,CAAC;AACrD,QAAM,SAAS,MAAM,aAAa;AAAA,IAChC;AAAA,IACA,QAAQ;AAAA;AAAA,MAEN,MAAM,QAAQ;AAAA,MACd,MAAM;AAAA,IACR;AAAA,IACA,SAAS;AAAA,MACP,cAAc;AAAA,QACZ,YAAY,CAAC,SAAS;AAAA,MACxB,CAAC;AAAA,IACH;AAAA,EACF,CAAC;AAGD,QAAM,gBAAgB,OAAO,OAAO;AACpC,QAAM,qBAAqB,mBAAmB,OAAO;AAErD,QAAM,QAAO,YAAO,eAAP,mBAAmB;AAChC,UAAQ,IAAI,iBAAiB,IAAI;AAEjC,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;AAEtB,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,QAAM,YAAY,IAAI,OAAO,IAAI;AAEjC,UAAQ,IAAI,gBAAgB,MAAM,MAAM,oBAAoB,MAAM,CAAC;AAEnE,QAAM,cAAc;AAAA,IAClB;AAAA,IACA;AAAA,IACA,IAAI,QAAQ,CAAC,QAAQ,UAAU,GAAG,SAAS,GAAG,CAAC;AAAA,EACjD;AAEA,cAAY,MAAM;AAChB,YAAQ,IAAI,WAAW;AAAA,EACzB,GAAG,GAAM;AAET,QAAM,QAAQ,WAAW,WAAW;AACtC;",
+  "sourcesContent": ["import { createRequire } from 'module'\nimport { AddressInfo } from 'net'\nimport { dirname } from 'path'\n\nimport { tamaguiPlugin } from '@tamagui/vite-plugin'\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'\n\nconst resolve =\n  'url' in import.meta ? createRequire(import.meta.url).resolve : require.resolve\n\nexport const studio = async (options: ResolvedOptions) => {\n  const { default: getPort } = await import('get-port')\n  const { paths } = options\n  const root = dirname(resolve('@takeout/studio/entry'))\n\n  const [serverPort, vitePort] = await Promise.all([\n    getPort({\n      port: 1421,\n    }),\n    getPort({\n      port: 1422,\n    }),\n  ])\n\n  const server = await createServer({\n    root,\n    server: {\n      // open: true,\n      host: options.host,\n      port: vitePort,\n    },\n    plugins: [\n      tamaguiPlugin({\n        components: ['tamagui'],\n      }),\n    ],\n  })\n\n  // these can be lazy loaded (eventually should put in own process)\n  await server.listen()\n\n  const configWatchPromise = watchTamaguiConfig(options)\n\n  const info = server.httpServer?.address() as AddressInfo\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  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}:${vitePort}`))\n\n  const appServer = app.listen(serverPort)\n\n  console.log(`Listening on`, chalk.green(`http://localhost:${serverPort}`))\n\n  await Promise.allSettled([\n    configWatchPromise,\n    new Promise((res) => appServer.on('close', res)),\n  ])\n}\n"],
+  "mappings": "AAAA,SAAS,qBAAqB;AAE9B,SAAS,eAAe;AAExB,SAAS,qBAAqB;AAC9B,OAAO,WAAW;AAClB,OAAO,aAAa;AACpB,OAAO,WAAW;AAClB,OAAO,QAAQ;AACf,OAAO,YAAY;AACnB,SAAS,oBAAoB;AAE7B,SAAS,0BAA0B;AAGnC,MAAM,UACJ,SAAS,cAAc,cAAc,YAAY,GAAG,EAAE,UAAU,QAAQ;AAEnE,MAAM,SAAS,OAAO,YAA6B;AAlB1D;AAmBE,QAAM,EAAE,SAAS,QAAQ,IAAI,MAAM,OAAO,UAAU;AACpD,QAAM,EAAE,MAAM,IAAI;AAClB,QAAM,OAAO,QAAQ,QAAQ,uBAAuB,CAAC;AAErD,QAAM,CAAC,YAAY,QAAQ,IAAI,MAAM,QAAQ,IAAI;AAAA,IAC/C,QAAQ;AAAA,MACN,MAAM;AAAA,IACR,CAAC;AAAA,IACD,QAAQ;AAAA,MACN,MAAM;AAAA,IACR,CAAC;AAAA,EACH,CAAC;AAED,QAAM,SAAS,MAAM,aAAa;AAAA,IAChC;AAAA,IACA,QAAQ;AAAA;AAAA,MAEN,MAAM,QAAQ;AAAA,MACd,MAAM;AAAA,IACR;AAAA,IACA,SAAS;AAAA,MACP,cAAc;AAAA,QACZ,YAAY,CAAC,SAAS;AAAA,MACxB,CAAC;AAAA,IACH;AAAA,EACF,CAAC;AAGD,QAAM,OAAO,OAAO;AAEpB,QAAM,qBAAqB,mBAAmB,OAAO;AAErD,QAAM,QAAO,YAAO,eAAP,mBAAmB;AAEhC,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;AAEtB,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,UAAU,CAAC;AAEjD,QAAM,YAAY,IAAI,OAAO,UAAU;AAEvC,UAAQ,IAAI,gBAAgB,MAAM,MAAM,oBAAoB,YAAY,CAAC;AAEzE,QAAM,QAAQ,WAAW;AAAA,IACvB;AAAA,IACA,IAAI,QAAQ,CAAC,QAAQ,UAAU,GAAG,SAAS,GAAG,CAAC;AAAA,EACjD,CAAC;AACH;",
   "names": []
 }

package/dist/esm/studio.mjs

@@ -14,12 +14,20 @@ const studio = async (options) => {
   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: 1420
+      port: vitePort
     },
     plugins: [
       tamaguiPlugin({
@@ -27,13 +35,9 @@ const studio = async (options) => {
       })
     ]
   });
-  const serverPromise = server.listen();
+  await server.listen();
   const configWatchPromise = watchTamaguiConfig(options);
   const info = (_a = server.httpServer) == null ? void 0 : _a.address();
-  console.log("devServerInfo", info);
-  const port = await getPort({
-    port: info.port + 1
-  });
   const app = express();
   app.disable("x-powered-by");
   app.use(express.static(paths.dotDir, { maxAge: "2h" }));
@@ -42,18 +46,13 @@ const studio = async (options) => {
     const conf = await fs.readJSON(paths.conf);
     res.status(200).json(conf);
   });
-  app.use("/", proxy(`${info.address}:${info.port}`));
-  const appServer = app.listen(port);
-  console.log(`Listening on`, chalk.green(`http://localhost:${port}`));
-  const longRunning = [
-    serverPromise,
+  app.use("/", proxy(`${info.address}:${vitePort}`));
+  const appServer = app.listen(serverPort);
+  console.log(`Listening on`, chalk.green(`http://localhost:${serverPort}`));
+  await Promise.allSettled([
     configWatchPromise,
     new Promise((res) => appServer.on("close", res))
-  ];
-  setInterval(() => {
-    console.log(longRunning);
-  }, 1e4);
-  await Promise.allSettled(longRunning);
+  ]);
 };
 export {
   studio

package/dist/esm/studio.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/studio.ts"],
-  "sourcesContent": ["import { createRequire } from 'module'\nimport { AddressInfo } from 'net'\nimport { dirname } from 'path'\n\nimport { tamaguiPlugin } from '@tamagui/vite-plugin'\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'\n\nconst resolve =\n  'url' in import.meta ? createRequire(import.meta.url).resolve : require.resolve\n\nexport const studio = async (options: ResolvedOptions) => {\n  const { default: getPort } = await import('get-port')\n  const { paths } = options\n  const root = dirname(resolve('@takeout/studio/entry'))\n  const server = await createServer({\n    root,\n    server: {\n      // open: true,\n      host: options.host,\n      port: 1420,\n    },\n    plugins: [\n      tamaguiPlugin({\n        components: ['tamagui'],\n      }),\n    ],\n  })\n\n  // these can be lazy loaded (eventually should put in own process)\n  const serverPromise = server.listen()\n  const configWatchPromise = watchTamaguiConfig(options)\n\n  const info = server.httpServer?.address() as AddressInfo\n  console.log('devServerInfo', info)\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  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  const appServer = app.listen(port)\n\n  console.log(`Listening on`, chalk.green(`http://localhost:${port}`))\n\n  const longRunning = [\n    serverPromise,\n    configWatchPromise,\n    new Promise((res) => appServer.on('close', res)),\n  ]\n\n  setInterval(() => {\n    console.log(longRunning)\n  }, 10_000)\n\n  await Promise.allSettled(longRunning)\n}\n"],
-  "mappings": "AAAA,SAAS,qBAAqB;AAE9B,SAAS,eAAe;AAExB,SAAS,qBAAqB;AAC9B,OAAO,WAAW;AAClB,OAAO,aAAa;AACpB,OAAO,WAAW;AAClB,OAAO,QAAQ;AACf,OAAO,YAAY;AACnB,SAAS,oBAAoB;AAE7B,SAAS,0BAA0B;AAGnC,MAAM,UACJ,SAAS,cAAc,cAAc,YAAY,GAAG,EAAE,UAAU,QAAQ;AAEnE,MAAM,SAAS,OAAO,YAA6B;AAlB1D;AAmBE,QAAM,EAAE,SAAS,QAAQ,IAAI,MAAM,OAAO,UAAU;AACpD,QAAM,EAAE,MAAM,IAAI;AAClB,QAAM,OAAO,QAAQ,QAAQ,uBAAuB,CAAC;AACrD,QAAM,SAAS,MAAM,aAAa;AAAA,IAChC;AAAA,IACA,QAAQ;AAAA;AAAA,MAEN,MAAM,QAAQ;AAAA,MACd,MAAM;AAAA,IACR;AAAA,IACA,SAAS;AAAA,MACP,cAAc;AAAA,QACZ,YAAY,CAAC,SAAS;AAAA,MACxB,CAAC;AAAA,IACH;AAAA,EACF,CAAC;AAGD,QAAM,gBAAgB,OAAO,OAAO;AACpC,QAAM,qBAAqB,mBAAmB,OAAO;AAErD,QAAM,QAAO,YAAO,eAAP,mBAAmB;AAChC,UAAQ,IAAI,iBAAiB,IAAI;AAEjC,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;AAEtB,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,QAAM,YAAY,IAAI,OAAO,IAAI;AAEjC,UAAQ,IAAI,gBAAgB,MAAM,MAAM,oBAAoB,MAAM,CAAC;AAEnE,QAAM,cAAc;AAAA,IAClB;AAAA,IACA;AAAA,IACA,IAAI,QAAQ,CAAC,QAAQ,UAAU,GAAG,SAAS,GAAG,CAAC;AAAA,EACjD;AAEA,cAAY,MAAM;AAChB,YAAQ,IAAI,WAAW;AAAA,EACzB,GAAG,GAAM;AAET,QAAM,QAAQ,WAAW,WAAW;AACtC;",
+  "sourcesContent": ["import { createRequire } from 'module'\nimport { AddressInfo } from 'net'\nimport { dirname } from 'path'\n\nimport { tamaguiPlugin } from '@tamagui/vite-plugin'\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'\n\nconst resolve =\n  'url' in import.meta ? createRequire(import.meta.url).resolve : require.resolve\n\nexport const studio = async (options: ResolvedOptions) => {\n  const { default: getPort } = await import('get-port')\n  const { paths } = options\n  const root = dirname(resolve('@takeout/studio/entry'))\n\n  const [serverPort, vitePort] = await Promise.all([\n    getPort({\n      port: 1421,\n    }),\n    getPort({\n      port: 1422,\n    }),\n  ])\n\n  const server = await createServer({\n    root,\n    server: {\n      // open: true,\n      host: options.host,\n      port: vitePort,\n    },\n    plugins: [\n      tamaguiPlugin({\n        components: ['tamagui'],\n      }),\n    ],\n  })\n\n  // these can be lazy loaded (eventually should put in own process)\n  await server.listen()\n\n  const configWatchPromise = watchTamaguiConfig(options)\n\n  const info = server.httpServer?.address() as AddressInfo\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  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}:${vitePort}`))\n\n  const appServer = app.listen(serverPort)\n\n  console.log(`Listening on`, chalk.green(`http://localhost:${serverPort}`))\n\n  await Promise.allSettled([\n    configWatchPromise,\n    new Promise((res) => appServer.on('close', res)),\n  ])\n}\n"],
+  "mappings": "AAAA,SAAS,qBAAqB;AAE9B,SAAS,eAAe;AAExB,SAAS,qBAAqB;AAC9B,OAAO,WAAW;AAClB,OAAO,aAAa;AACpB,OAAO,WAAW;AAClB,OAAO,QAAQ;AACf,OAAO,YAAY;AACnB,SAAS,oBAAoB;AAE7B,SAAS,0BAA0B;AAGnC,MAAM,UACJ,SAAS,cAAc,cAAc,YAAY,GAAG,EAAE,UAAU,QAAQ;AAEnE,MAAM,SAAS,OAAO,YAA6B;AAlB1D;AAmBE,QAAM,EAAE,SAAS,QAAQ,IAAI,MAAM,OAAO,UAAU;AACpD,QAAM,EAAE,MAAM,IAAI;AAClB,QAAM,OAAO,QAAQ,QAAQ,uBAAuB,CAAC;AAErD,QAAM,CAAC,YAAY,QAAQ,IAAI,MAAM,QAAQ,IAAI;AAAA,IAC/C,QAAQ;AAAA,MACN,MAAM;AAAA,IACR,CAAC;AAAA,IACD,QAAQ;AAAA,MACN,MAAM;AAAA,IACR,CAAC;AAAA,EACH,CAAC;AAED,QAAM,SAAS,MAAM,aAAa;AAAA,IAChC;AAAA,IACA,QAAQ;AAAA;AAAA,MAEN,MAAM,QAAQ;AAAA,MACd,MAAM;AAAA,IACR;AAAA,IACA,SAAS;AAAA,MACP,cAAc;AAAA,QACZ,YAAY,CAAC,SAAS;AAAA,MACxB,CAAC;AAAA,IACH;AAAA,EACF,CAAC;AAGD,QAAM,OAAO,OAAO;AAEpB,QAAM,qBAAqB,mBAAmB,OAAO;AAErD,QAAM,QAAO,YAAO,eAAP,mBAAmB;AAEhC,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;AAEtB,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,UAAU,CAAC;AAEjD,QAAM,YAAY,IAAI,OAAO,UAAU;AAEvC,UAAQ,IAAI,gBAAgB,MAAM,MAAM,oBAAoB,YAAY,CAAC;AAEzE,QAAM,QAAQ,WAAW;AAAA,IACvB;AAAA,IACA,IAAI,QAAQ,CAAC,QAAQ,UAAU,GAAG,SAAS,GAAG,CAAC;AAAA,EACjD,CAAC;AACH;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/cli",
-  "version": "1.6.3",
+  "version": "1.7.1",
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
   "module": "dist/esm",
@@ -36,9 +36,9 @@
     "@callstack/repack-debugger-app": "^1.0.0",
     "@fastify/sensible": "^4.1.0",
     "@fastify/static": "^5.0.2",
-    "@tamagui/build": "1.6.3",
-    "@tamagui/static": "1.6.3",
-    "@tamagui/vite-plugin": "1.6.3",
+    "@tamagui/build": "1.7.1",
+    "@tamagui/static": "1.7.1",
+    "@tamagui/vite-plugin": "1.7.1",
     "@types/compression": "^1.7.2",
     "@types/morgan": "^1.9.3",
     "arg": "^5.0.2",

package/src/studio.ts

@@ -20,12 +20,22 @@ 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: 1420,
+      port: vitePort,
     },
     plugins: [
       tamaguiPlugin({
@@ -35,15 +45,11 @@ export const studio = async (options: ResolvedOptions) => {
   })
 
   // these can be lazy loaded (eventually should put in own process)
-  const serverPromise = server.listen()
+  await server.listen()
+
   const configWatchPromise = watchTamaguiConfig(options)
 
   const info = server.httpServer?.address() as AddressInfo
-  console.log('devServerInfo', info)
-
-  const port = await getPort({
-    port: info.port + 1,
-  })
 
   const app = express()
 
@@ -56,21 +62,14 @@ export const studio = async (options: ResolvedOptions) => {
     res.status(200).json(conf)
   })
 
-  app.use('/', proxy(`${info.address}:${info.port}`))
+  app.use('/', proxy(`${info.address}:${vitePort}`))
 
-  const appServer = app.listen(port)
+  const appServer = app.listen(serverPort)
 
-  console.log(`Listening on`, chalk.green(`http://localhost:${port}`))
+  console.log(`Listening on`, chalk.green(`http://localhost:${serverPort}`))
 
-  const longRunning = [
-    serverPromise,
+  await Promise.allSettled([
     configWatchPromise,
     new Promise((res) => appServer.on('close', res)),
-  ]
-
-  setInterval(() => {
-    console.log(longRunning)
-  }, 10_000)
-
-  await Promise.allSettled(longRunning)
+  ])
 }

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,kBAyDpD,CAAA"}
+{"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"}