@tamagui/cli 1.1.7 → 1.1.9

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.
package/dist/cjs/build.js CHANGED
@@ -18,6 +18,10 @@ var __copyProps = (to, from, except, desc) => {
18
18
  return to;
19
19
  };
20
20
  var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
21
+ // If the importer is in node compatibility mode or this is not an ESM
22
+ // file that has been converted to a CommonJS file using a Babel-
23
+ // compatible transform (i.e. "__esModule" has not been set), then set
24
+ // "default" to the CommonJS "module.exports" for node compatibility.
21
25
  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
22
26
  mod
23
27
  ));
@@ -41,7 +45,9 @@ const build = async (options) => {
41
45
  const targets = ["web"];
42
46
  console.log("sourceDir", sourceDir, targets);
43
47
  await new Promise((res) => {
44
- import_chokidar.default.watch(sourceDir, {}).on("add", (relativePath) => {
48
+ import_chokidar.default.watch(sourceDir, {
49
+ // persistent: true,
50
+ }).on("add", (relativePath) => {
45
51
  const sourcePath = (0, import_path.resolve)(process.cwd(), relativePath);
46
52
  promises.push(
47
53
  (async () => {
@@ -2,6 +2,6 @@
2
2
  "version": 3,
3
3
  "sources": ["../../src/build.ts"],
4
4
  "sourcesContent": ["import { writeFile } from 'fs'\nimport { basename, dirname, join, resolve } from 'path'\n\nimport { createExtractor, extractToClassNames, loadTamagui } from '@tamagui/static'\nimport chokidar from 'chokidar'\nimport { readFile } from 'fs-extra'\n\nimport { ResolvedOptions } from './types.js'\n\nexport const build = async (options: ResolvedOptions) => {\n // const tamagui = await loadTamagui(options.tamaguiOptions)\n\n const entry = options.pkgJson.source\n if (!entry) {\n throw new Error(`Must add \"source\" to package.json pointing to your source directory`)\n }\n const sourceDir = dirname(entry)\n const promises: Promise<void>[] = []\n const targets = ['web']\n\n console.log('sourceDir', sourceDir, targets)\n\n await new Promise<void>((res) => {\n chokidar\n // prevent infinite loop but cause race condition if you just build directly\n .watch(sourceDir, {\n // persistent: true,\n })\n .on('add', (relativePath) => {\n const sourcePath = resolve(process.cwd(), relativePath)\n\n promises.push(\n (async () => {\n await Promise.all(\n targets.map(async (target) => {\n process.env.TAMAGUI_TARGET = target\n if (options.debug) {\n process.env.NODE_ENV ||= 'development'\n }\n const source = await readFile(sourcePath, 'utf-8')\n const extractor = createExtractor()\n const out = await extractToClassNames({\n extractor,\n source,\n sourcePath,\n options: options.tamaguiOptions,\n shouldPrintDebug: options.debug || false,\n })\n\n // await writeFile()\n })\n )\n })()\n )\n })\n .on('ready', () => {\n res()\n })\n })\n\n await Promise.all(promises)\n}\n"],
5
- "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,kBAAiD;AAEjD,oBAAkE;AAClE,sBAAqB;AACrB,sBAAyB;AAIlB,MAAM,QAAQ,OAAO,YAA6B;AAGvD,QAAM,QAAQ,QAAQ,QAAQ;AAC9B,MAAI,CAAC,OAAO;AACV,UAAM,IAAI,MAAM,qEAAqE;AAAA,EACvF;AACA,QAAM,gBAAY,qBAAQ,KAAK;AAC/B,QAAM,WAA4B,CAAC;AACnC,QAAM,UAAU,CAAC,KAAK;AAEtB,UAAQ,IAAI,aAAa,WAAW,OAAO;AAE3C,QAAM,IAAI,QAAc,CAAC,QAAQ;AAC/B,oBAAAA,QAEG,MAAM,WAAW,CAElB,CAAC,EACA,GAAG,OAAO,CAAC,iBAAiB;AAC3B,YAAM,iBAAa,qBAAQ,QAAQ,IAAI,GAAG,YAAY;AAEtD,eAAS;AAAA,SACN,YAAY;AACX,gBAAM,QAAQ;AAAA,YACZ,QAAQ,IAAI,OAAO,WAAW;AAlC5C;AAmCgB,sBAAQ,IAAI,iBAAiB;AAC7B,kBAAI,QAAQ,OAAO;AACjB,8BAAQ,KAAI,aAAZ,GAAY,WAAa;AAAA,cAC3B;AACA,oBAAM,SAAS,UAAM,0BAAS,YAAY,OAAO;AACjD,oBAAM,gBAAY,+BAAgB;AAClC,oBAAM,MAAM,UAAM,mCAAoB;AAAA,gBACpC;AAAA,gBACA;AAAA,gBACA;AAAA,gBACA,SAAS,QAAQ;AAAA,gBACjB,kBAAkB,QAAQ,SAAS;AAAA,cACrC,CAAC;AAAA,YAGH,CAAC;AAAA,UACH;AAAA,QACF,GAAG;AAAA,MACL;AAAA,IACF,CAAC,EACA,GAAG,SAAS,MAAM;AACjB,UAAI;AAAA,IACN,CAAC;AAAA,EACL,CAAC;AAED,QAAM,QAAQ,IAAI,QAAQ;AAC5B;",
5
+ "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,kBAAiD;AAEjD,oBAAkE;AAClE,sBAAqB;AACrB,sBAAyB;AAIlB,MAAM,QAAQ,OAAO,YAA6B;AAGvD,QAAM,QAAQ,QAAQ,QAAQ;AAC9B,MAAI,CAAC,OAAO;AACV,UAAM,IAAI,MAAM,qEAAqE;AAAA,EACvF;AACA,QAAM,gBAAY,qBAAQ,KAAK;AAC/B,QAAM,WAA4B,CAAC;AACnC,QAAM,UAAU,CAAC,KAAK;AAEtB,UAAQ,IAAI,aAAa,WAAW,OAAO;AAE3C,QAAM,IAAI,QAAc,CAAC,QAAQ;AAC/B,oBAAAA,QAEG,MAAM,WAAW;AAAA;AAAA,IAElB,CAAC,EACA,GAAG,OAAO,CAAC,iBAAiB;AAC3B,YAAM,iBAAa,qBAAQ,QAAQ,IAAI,GAAG,YAAY;AAEtD,eAAS;AAAA,SACN,YAAY;AACX,gBAAM,QAAQ;AAAA,YACZ,QAAQ,IAAI,OAAO,WAAW;AAlC5C;AAmCgB,sBAAQ,IAAI,iBAAiB;AAC7B,kBAAI,QAAQ,OAAO;AACjB,8BAAQ,KAAI,aAAZ,GAAY,WAAa;AAAA,cAC3B;AACA,oBAAM,SAAS,UAAM,0BAAS,YAAY,OAAO;AACjD,oBAAM,gBAAY,+BAAgB;AAClC,oBAAM,MAAM,UAAM,mCAAoB;AAAA,gBACpC;AAAA,gBACA;AAAA,gBACA;AAAA,gBACA,SAAS,QAAQ;AAAA,gBACjB,kBAAkB,QAAQ,SAAS;AAAA,cACrC,CAAC;AAAA,YAGH,CAAC;AAAA,UACH;AAAA,QACF,GAAG;AAAA,MACL;AAAA,IACF,CAAC,EACA,GAAG,SAAS,MAAM;AACjB,UAAI;AAAA,IACN,CAAC;AAAA,EACL,CAAC;AAED,QAAM,QAAQ,IAAI,QAAQ;AAC5B;",
6
6
  "names": ["chokidar"]
7
7
  }
package/dist/cjs/cli.js CHANGED
@@ -14,6 +14,10 @@ var __copyProps = (to, from, except, desc) => {
14
14
  return to;
15
15
  };
16
16
  var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
17
+ // If the importer is in node compatibility mode or this is not an ESM
18
+ // file that has been converted to a CommonJS file using a Babel-
19
+ // compatible transform (i.e. "__esModule" has not been set), then set
20
+ // "default" to the CommonJS "module.exports" for node compatibility.
17
21
  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
18
22
  mod
19
23
  ));
@@ -2,6 +2,6 @@
2
2
  "version": 3,
3
3
  "sources": ["../../src/cli.ts"],
4
4
  "sourcesContent": ["/* eslint-disable no-console */\nimport arg, { flag } from 'arg'\nimport chalk from 'chalk'\n\nimport { getOptions } from './utils.js'\n\nconst COMMAND_MAP = {\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 COMMAND_MAP\ntype CommandKey = keyof typeof COMMAND_MAP\ntype CommandDefinition = CommandDefinitions[CommandKey]\n\nconst commandEntries = Object.keys(COMMAND_MAP).flatMap((command) => {\n const definition = COMMAND_MAP[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<\n CommandKey,\n CommandDefinition\n>\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(COMMAND_MAP)\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(\n `Flags: ${Object.entries(definition.flags).map(([k, v]) => `${k} (${v.name})`)}`\n )\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"],
5
- "mappings": ";;;;;;;;;;;;;;;;;;;AACA,iBAA0B;AAC1B,mBAAkB;AAElB,mBAA2B;AAE3B,MAAM,cAAc;AAAA,EAClB,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;AAAA,EAEA,KAAK;AAAA,IACH,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,IAAI,IAAI,MAAM,OAAO;AAC7B,YAAM,UAAU,UAAM,yBAAW;AAAA,QAC/B,OAAOD,OAAM,aAAcA,OAAM,eAAe,YAAY,OAAQ;AAAA,MACtE,CAAC;AACD,YAAM,IAAI,OAAO;AAAA,IACnB;AAAA,EACF;AAAA,EAEA,QAAQ;AAAA,IACN,YAAY,CAAC,GAAG;AAAA,IAChB,aAAa;AAAA,IACb,OAAO,CAAC;AAAA,IACR,MAAM,MAAM;AACV,YAAM,EAAE,MAAMA,OAAM,QAAI,WAAAC,SAAI,KAAK,KAAK;AACtC,YAAM,EAAE,OAAO,IAAI,MAAM,OAAO;AAChC,YAAM,UAAU,UAAM,yBAAW;AAAA,QAC/B,OAAOD,OAAM,aAAcA,OAAM,eAAe,YAAY,OAAQ;AAAA,MACtE,CAAC;AACD,YAAM,OAAO,OAAO;AAAA,IACtB;AAAA,EACF;AACF;AAMA,MAAM,iBAAiB,OAAO,KAAK,WAAW,EAAE,QAAQ,CAACE,aAAY;AACnE,QAAMC,cAAa,YAAYD;AAC/B,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;AAKlD,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,WAAW,EACtB,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;AAAA,MACN,UAAU,OAAO,QAAQ,WAAW,KAAK,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,GAAG,MAAM,EAAE,OAAO;AAAA,IAC/E;AACA,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;",
5
+ "mappings": "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",
6
6
  "names": ["flags", "arg", "command", "definition", "chalk"]
7
7
  }
package/dist/cjs/dev.js CHANGED
@@ -18,6 +18,10 @@ var __copyProps = (to, from, except, desc) => {
18
18
  return to;
19
19
  };
20
20
  var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
21
+ // If the importer is in node compatibility mode or this is not an ESM
22
+ // file that has been converted to a CommonJS file using a Babel-
23
+ // compatible transform (i.e. "__esModule" has not been set), then set
24
+ // "default" to the CommonJS "module.exports" for node compatibility.
21
25
  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
22
26
  mod
23
27
  ));
@@ -31,8 +35,8 @@ var import_path = require("path");
31
35
  var import_vite_plugin = require("@tamagui/vite-plugin");
32
36
  var import_chalk = __toESM(require("chalk"));
33
37
  var import_express = __toESM(require("express"));
34
- var import_express_http_proxy = __toESM(require("express-http-proxy"));
35
38
  var import_fs_extra = __toESM(require("fs-extra"));
39
+ var import_kill_port = __toESM(require("kill-port"));
36
40
  var import_morgan = __toESM(require("morgan"));
37
41
  var import_vite = require("vite");
38
42
  var import_tamaguiConfigUtils = require("./tamaguiConfigUtils.js");
@@ -66,29 +70,94 @@ const dev = async (options) => {
66
70
  });
67
71
  await Promise.all([
68
72
  server.listen(),
73
+ //
69
74
  (0, import_tamaguiConfigUtils.watchTamaguiConfig)(options)
75
+ // generateTypes(options),
70
76
  ]);
71
77
  const info = (_b = server.httpServer) == null ? void 0 : _b.address();
72
78
  const app = (0, import_express.default)();
79
+ const cleanup = async () => {
80
+ console.log("cleaning up");
81
+ await server.close();
82
+ };
83
+ process.on(`uncaughtException`, (e) => {
84
+ console.log("wtdf", e);
85
+ });
86
+ [`exit`, `SIGINT`, `SIGUSR1`, `SIGUSR2`, `SIGTERM`].forEach((eventType) => {
87
+ process.on(eventType, cleanup);
88
+ });
89
+ const port = 19e3;
73
90
  app.disable("x-powered-by");
74
91
  app.use(import_express.default.static(paths.dotDir, { maxAge: "2h" }));
75
92
  app.use((0, import_morgan.default)("tiny"));
93
+ app.get("/status", (req, res) => {
94
+ res.status(200).send();
95
+ });
76
96
  app.get("/conf", async (req, res) => {
77
97
  const conf = await import_fs_extra.default.readJSON(paths.conf);
78
98
  res.status(200).json(conf);
79
99
  });
80
100
  app.get("/index.bundle", async (req, res) => {
81
101
  const output = (await import_fs_extra.default.readFile(outputJsPath)).toString();
82
- res.status(200).send(output);
102
+ res.status(200);
103
+ res.header("Content-Type", "text/javascript");
104
+ res.send(output);
105
+ });
106
+ const defaultResponse = {
107
+ name: "myapp",
108
+ slug: "myapp",
109
+ scheme: "myapp",
110
+ version: "1.0.0",
111
+ jsEngine: "jsc",
112
+ orientation: "portrait",
113
+ icon: "./assets/icon.png",
114
+ userInterfaceStyle: "light",
115
+ splash: {
116
+ image: "./assets/splash.png",
117
+ resizeMode: "contain",
118
+ backgroundColor: "#ffffff",
119
+ imageUrl: "http://127.0.0.1:8081/assets/./assets/splash.png"
120
+ },
121
+ updates: { fallbackToCacheTimeout: 0 },
122
+ assetBundlePatterns: ["**/*"],
123
+ ios: { supportsTablet: true, bundleIdentifier: "com.natew.myapp" },
124
+ android: {
125
+ package: "com.tamagui.myapp",
126
+ adaptiveIcon: {
127
+ foregroundImage: "./assets/adaptive-icon.png",
128
+ backgroundColor: "#FFFFFF",
129
+ foregroundImageUrl: "http://127.0.0.1:8081/assets/./assets/adaptive-icon.png"
130
+ }
131
+ },
132
+ web: { favicon: "./assets/favicon.png" },
133
+ extra: { eas: { projectId: "061b4470-78c7-4d6a-b850-8167fb0a3434" } },
134
+ _internal: {
135
+ isDebug: false,
136
+ projectRoot: "/Users/n8/tamagui/apps/kitchen-sink",
137
+ dynamicConfigPath: null,
138
+ staticConfigPath: "/Users/n8/tamagui/apps/kitchen-sink/app.json",
139
+ packageJsonPath: "/Users/n8/tamagui/apps/kitchen-sink/package.json"
140
+ },
141
+ sdkVersion: "47.0.0",
142
+ platforms: ["ios", "android", "web"],
143
+ iconUrl: `http://127.0.0.1:${port}/assets/./assets/icon.png`,
144
+ debuggerHost: `127.0.0.1:${port}`,
145
+ logUrl: `http://127.0.0.1:${port}/logs`,
146
+ developer: { tool: "expo-cli", projectRoot: "/Users/n8/tamagui/apps/kitchen-sink" },
147
+ packagerOpts: { dev: true },
148
+ mainModuleName: "index",
149
+ __flipperHack: "React Native packager is running",
150
+ hostUri: `127.0.0.1:${port}`,
151
+ bundleUrl: `http://127.0.0.1:${port}/index.bundle?platform=ios&dev=true&hot=false`,
152
+ id: "@anonymous/myapp-473c4543-3c36-4786-9db1-c66a62ac9b78"
153
+ };
154
+ app.get("/", (req, res) => {
155
+ res.status(200).json(defaultResponse);
83
156
  });
84
- app.use("/", (0, import_express_http_proxy.default)(`${info.address}:${info.port}`));
85
- const port = 8081;
157
+ await (0, import_kill_port.default)(port);
86
158
  app.listen(port);
87
159
  console.log(`Listening on`, import_chalk.default.green(`http://localhost:${port}`));
88
160
  server.printUrls();
89
- process.on("beforeExit", () => {
90
- server.close();
91
- });
92
161
  await (0, import_utils.closeEvent)(server);
93
162
  };
94
163
  // Annotate the CommonJS export names for ESM import in node:
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/dev.ts"],
4
- "sourcesContent": ["import { AddressInfo } from 'net'\nimport { join } from 'path'\n\nimport { nativePlugin, 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 { build, 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 plugins = [\n tamaguiPlugin({\n components: ['tamagui'],\n }),\n nativePlugin(),\n ]\n\n const buildOutput = await build({\n plugins,\n root,\n })\n const outputJsFile = 'output' in buildOutput ? buildOutput.output[0]?.fileName : null\n\n if (!outputJsFile) {\n throw new Error(`No js?`)\n }\n\n const outputJsPath = join(process.cwd(), 'dist', outputJsFile)\n\n const server = await createServer({\n root,\n server: {\n port: options.port,\n host: options.host || 'localhost',\n },\n plugins,\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 // /index.bundle?platform=ios&dev=true&minify=false&modulesOnly=false&runModule=true&app=dish.motion:2811:36)\n app.get('/index.bundle', async (req, res) => {\n const output = (await fs.readFile(outputJsPath)).toString()\n res.status(200).send(output)\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 process.on('beforeExit', () => {\n server.close()\n })\n\n await closeEvent(server)\n}\n"],
5
- "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,kBAAqB;AAErB,yBAA4C;AAC5C,mBAAkB;AAClB,qBAAoB;AACpB,gCAAkB;AAClB,sBAAe;AACf,oBAAmB;AACnB,kBAAoC;AAEpC,gCAAmC;AAEnC,mBAA2B;AAEpB,MAAM,MAAM,OAAO,YAA6B;AAfvD;AAgBE,QAAM,EAAE,MAAM,MAAM,MAAM,IAAI;AAE9B,UAAQ,MAAM,QAAQ,IAAI,CAAC;AAE3B,QAAM,UAAU;AAAA,QACd,kCAAc;AAAA,MACZ,YAAY,CAAC,SAAS;AAAA,IACxB,CAAC;AAAA,QACD,iCAAa;AAAA,EACf;AAEA,QAAM,cAAc,UAAM,mBAAM;AAAA,IAC9B;AAAA,IACA;AAAA,EACF,CAAC;AACD,QAAM,eAAe,YAAY,eAAc,iBAAY,OAAO,OAAnB,mBAAuB,WAAW;AAEjF,MAAI,CAAC,cAAc;AACjB,UAAM,IAAI,MAAM,QAAQ;AAAA,EAC1B;AAEA,QAAM,mBAAe,kBAAK,QAAQ,IAAI,GAAG,QAAQ,YAAY;AAE7D,QAAM,SAAS,UAAM,0BAAa;AAAA,IAChC;AAAA,IACA,QAAQ;AAAA,MACN,MAAM,QAAQ;AAAA,MACd,MAAM,QAAQ,QAAQ;AAAA,IACxB;AAAA,IACA;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;AAGD,MAAI,IAAI,iBAAiB,OAAO,KAAK,QAAQ;AAC3C,UAAM,UAAU,MAAM,gBAAAA,QAAG,SAAS,YAAY,GAAG,SAAS;AAC1D,QAAI,OAAO,GAAG,EAAE,KAAK,MAAM;AAAA,EAC7B,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,UAAQ,GAAG,cAAc,MAAM;AAC7B,WAAO,MAAM;AAAA,EACf,CAAC;AAED,YAAM,yBAAW,MAAM;AACzB;",
6
- "names": ["express", "morgan", "fs", "proxy", "chalk"]
4
+ "sourcesContent": ["import { AddressInfo } from 'net'\nimport { join } from 'path'\n\nimport { nativePlugin, 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 killPort from 'kill-port'\nimport morgan from 'morgan'\nimport { build, 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 plugins = [\n tamaguiPlugin({\n components: ['tamagui'],\n }),\n nativePlugin(),\n ]\n\n const buildOutput = await build({\n plugins,\n root,\n })\n const outputJsFile = 'output' in buildOutput ? buildOutput.output[0]?.fileName : null\n if (!outputJsFile) {\n throw new Error(`No js?`)\n }\n const outputJsPath = join(process.cwd(), 'dist', outputJsFile)\n\n const server = await createServer({\n root,\n server: {\n port: options.port,\n host: options.host || 'localhost',\n },\n plugins,\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 const cleanup = async () => {\n console.log('cleaning up')\n await server.close()\n }\n\n process.on(`uncaughtException`, (e) => {\n console.log('wtdf', e)\n })\n ;[`exit`, `SIGINT`, `SIGUSR1`, `SIGUSR2`, `SIGTERM`].forEach((eventType) => {\n process.on(eventType, cleanup)\n })\n\n // react native port (it scans 19000 +5)\n const port = 19000\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('/status', (req, res) => {\n res.status(200).send()\n })\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 // /index.bundle?platform=ios&dev=true&minify=false&modulesOnly=false&runModule=true&app=dish.motion:2811:36)\n app.get('/index.bundle', async (req, res) => {\n const output = (await fs.readFile(outputJsPath)).toString()\n\n res.status(200)\n res.header('Content-Type', 'text/javascript')\n res.send(output)\n })\n\n const defaultResponse = {\n name: 'myapp',\n slug: 'myapp',\n scheme: 'myapp',\n version: '1.0.0',\n jsEngine: 'jsc',\n orientation: 'portrait',\n icon: './assets/icon.png',\n userInterfaceStyle: 'light',\n splash: {\n image: './assets/splash.png',\n resizeMode: 'contain',\n backgroundColor: '#ffffff',\n imageUrl: 'http://127.0.0.1:8081/assets/./assets/splash.png',\n },\n updates: { fallbackToCacheTimeout: 0 },\n assetBundlePatterns: ['**/*'],\n ios: { supportsTablet: true, bundleIdentifier: 'com.natew.myapp' },\n android: {\n package: 'com.tamagui.myapp',\n adaptiveIcon: {\n foregroundImage: './assets/adaptive-icon.png',\n backgroundColor: '#FFFFFF',\n foregroundImageUrl: 'http://127.0.0.1:8081/assets/./assets/adaptive-icon.png',\n },\n },\n web: { favicon: './assets/favicon.png' },\n extra: { eas: { projectId: '061b4470-78c7-4d6a-b850-8167fb0a3434' } },\n _internal: {\n isDebug: false,\n projectRoot: '/Users/n8/tamagui/apps/kitchen-sink',\n dynamicConfigPath: null,\n staticConfigPath: '/Users/n8/tamagui/apps/kitchen-sink/app.json',\n packageJsonPath: '/Users/n8/tamagui/apps/kitchen-sink/package.json',\n },\n sdkVersion: '47.0.0',\n platforms: ['ios', 'android', 'web'],\n iconUrl: `http://127.0.0.1:${port}/assets/./assets/icon.png`,\n debuggerHost: `127.0.0.1:${port}`,\n logUrl: `http://127.0.0.1:${port}/logs`,\n developer: { tool: 'expo-cli', projectRoot: '/Users/n8/tamagui/apps/kitchen-sink' },\n packagerOpts: { dev: true },\n mainModuleName: 'index',\n __flipperHack: 'React Native packager is running',\n hostUri: `127.0.0.1:${port}`,\n bundleUrl: `http://127.0.0.1:${port}/index.bundle?platform=ios&dev=true&hot=false`,\n id: '@anonymous/myapp-473c4543-3c36-4786-9db1-c66a62ac9b78',\n }\n\n app.get('/', (req, res) => {\n res.status(200).json(defaultResponse)\n })\n\n // app.use('/', proxy(`${info.address}:${info.port}`))\n\n await killPort(port)\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"],
5
+ "mappings": "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",
6
+ "names": ["express", "morgan", "fs", "killPort", "chalk"]
7
7
  }
@@ -19,6 +19,10 @@ var __copyProps = (to, from, except, desc) => {
19
19
  return to;
20
20
  };
21
21
  var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
22
+ // If the importer is in node compatibility mode or this is not an ESM
23
+ // file that has been converted to a CommonJS file using a Babel-
24
+ // compatible transform (i.e. "__esModule" has not been set), then set
25
+ // "default" to the CommonJS "module.exports" for node compatibility.
22
26
  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
23
27
  mod
24
28
  ));
@@ -2,6 +2,6 @@
2
2
  "version": 3,
3
3
  "sources": ["../../src/generate.ts"],
4
4
  "sourcesContent": ["#!/usr/bin/env node\n\nimport fs from 'fs-extra'\nimport { Project } from 'ts-morph'\n\nimport { ResolvedOptions } from './types.js'\nimport { loadTamagui } from './utils.js'\n\nexport async function generateTypes(options: ResolvedOptions) {\n const types = await getTypes(options)\n await fs.writeJSON(options.paths.types, types, {\n spaces: 2,\n })\n}\n\nexport async function getTypes(options: ResolvedOptions) {\n const tamagui = await loadTamagui(options.tamaguiOptions)\n\n const uniqueViewExportingPaths = new Set(\n Object.keys(tamagui.nameToPaths).map((name) => {\n return `${[...tamagui.nameToPaths[name]][0]}.ts*`\n }),\n )\n\n const project = new Project({\n compilerOptions: {\n noEmit: false,\n declaration: true,\n emitDeclarationOnly: true,\n },\n skipAddingFilesFromTsConfig: true,\n tsConfigFilePath: options.tsconfigPath,\n })\n\n const files = project.addSourceFilesAtPaths([...uniqueViewExportingPaths])\n\n return Object.fromEntries(\n files.flatMap((x) => {\n return [...x.getExportedDeclarations()].map(([k, v]) => {\n return [\n k,\n v[0]\n .getType()\n .getApparentType()\n .getProperties()\n .map((prop) => {\n return [\n prop.getEscapedName(),\n prop.getValueDeclaration()?.getType().getText(),\n ]\n }),\n ]\n })\n }),\n )\n\n // console.log(\n // 'project',\n // files.map((x) => x.getFilePath()),\n // files.map((x) => {\n // return x.getExportedDeclarations()\n // }),\n // Object.fromEntries(\n // files.flatMap((x) => {\n // return [...x.getExportedDeclarations()].map(([k, v]) => {\n // return [k, v[0].getType().getApparentType().getText()]\n // })\n // })\n // ),\n\n // // files.map((f) => f.getExportSymbols())\n}\n"],
5
- "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,sBAAe;AACf,sBAAwB;AAGxB,mBAA4B;AAE5B,eAAsB,cAAc,SAA0B;AAC5D,QAAM,QAAQ,MAAM,SAAS,OAAO;AACpC,QAAM,gBAAAA,QAAG,UAAU,QAAQ,MAAM,OAAO,OAAO;AAAA,IAC7C,QAAQ;AAAA,EACV,CAAC;AACH;AAEA,eAAsB,SAAS,SAA0B;AACvD,QAAM,UAAU,UAAM,0BAAY,QAAQ,cAAc;AAExD,QAAM,2BAA2B,IAAI;AAAA,IACnC,OAAO,KAAK,QAAQ,WAAW,EAAE,IAAI,CAAC,SAAS;AAC7C,aAAO,GAAG,CAAC,GAAG,QAAQ,YAAY,KAAK,EAAE;AAAA,IAC3C,CAAC;AAAA,EACH;AAEA,QAAM,UAAU,IAAI,wBAAQ;AAAA,IAC1B,iBAAiB;AAAA,MACf,QAAQ;AAAA,MACR,aAAa;AAAA,MACb,qBAAqB;AAAA,IACvB;AAAA,IACA,6BAA6B;AAAA,IAC7B,kBAAkB,QAAQ;AAAA,EAC5B,CAAC;AAED,QAAM,QAAQ,QAAQ,sBAAsB,CAAC,GAAG,wBAAwB,CAAC;AAEzE,SAAO,OAAO;AAAA,IACZ,MAAM,QAAQ,CAAC,MAAM;AACnB,aAAO,CAAC,GAAG,EAAE,wBAAwB,CAAC,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM;AACtD,eAAO;AAAA,UACL;AAAA,UACA,EAAE,GACC,QAAQ,EACR,gBAAgB,EAChB,cAAc,EACd,IAAI,CAAC,SAAS;AA7C3B;AA8Cc,mBAAO;AAAA,cACL,KAAK,eAAe;AAAA,eACpB,UAAK,oBAAoB,MAAzB,mBAA4B,UAAU;AAAA,YACxC;AAAA,UACF,CAAC;AAAA,QACL;AAAA,MACF,CAAC;AAAA,IACH,CAAC;AAAA,EACH;AAiBF;",
5
+ "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,sBAAe;AACf,sBAAwB;AAGxB,mBAA4B;AAE5B,eAAsB,cAAc,SAA0B;AAC5D,QAAM,QAAQ,MAAM,SAAS,OAAO;AACpC,QAAM,gBAAAA,QAAG,UAAU,QAAQ,MAAM,OAAO,OAAO;AAAA,IAC7C,QAAQ;AAAA,EACV,CAAC;AACH;AAEA,eAAsB,SAAS,SAA0B;AACvD,QAAM,UAAU,UAAM,0BAAY,QAAQ,cAAc;AAExD,QAAM,2BAA2B,IAAI;AAAA,IACnC,OAAO,KAAK,QAAQ,WAAW,EAAE,IAAI,CAAC,SAAS;AAC7C,aAAO,GAAG,CAAC,GAAG,QAAQ,YAAY,IAAI,CAAC,EAAE,CAAC;AAAA,IAC5C,CAAC;AAAA,EACH;AAEA,QAAM,UAAU,IAAI,wBAAQ;AAAA,IAC1B,iBAAiB;AAAA,MACf,QAAQ;AAAA,MACR,aAAa;AAAA,MACb,qBAAqB;AAAA,IACvB;AAAA,IACA,6BAA6B;AAAA,IAC7B,kBAAkB,QAAQ;AAAA,EAC5B,CAAC;AAED,QAAM,QAAQ,QAAQ,sBAAsB,CAAC,GAAG,wBAAwB,CAAC;AAEzE,SAAO,OAAO;AAAA,IACZ,MAAM,QAAQ,CAAC,MAAM;AACnB,aAAO,CAAC,GAAG,EAAE,wBAAwB,CAAC,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM;AACtD,eAAO;AAAA,UACL;AAAA,UACA,EAAE,CAAC,EACA,QAAQ,EACR,gBAAgB,EAChB,cAAc,EACd,IAAI,CAAC,SAAS;AA7C3B;AA8Cc,mBAAO;AAAA,cACL,KAAK,eAAe;AAAA,eACpB,UAAK,oBAAoB,MAAzB,mBAA4B,UAAU;AAAA,YACxC;AAAA,UACF,CAAC;AAAA,QACL;AAAA,MACF,CAAC;AAAA,IACH,CAAC;AAAA,EACH;AAiBF;",
6
6
  "names": ["fs"]
7
7
  }
@@ -18,6 +18,10 @@ var __copyProps = (to, from, except, desc) => {
18
18
  return to;
19
19
  };
20
20
  var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
21
+ // If the importer is in node compatibility mode or this is not an ESM
22
+ // file that has been converted to a CommonJS file using a Babel-
23
+ // compatible transform (i.e. "__esModule" has not been set), then set
24
+ // "default" to the CommonJS "module.exports" for node compatibility.
21
25
  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
22
26
  mod
23
27
  ));
@@ -48,6 +52,7 @@ const studio = async (options) => {
48
52
  const server = await (0, import_vite.createServer)({
49
53
  root,
50
54
  server: {
55
+ // open: true,
51
56
  host: options.host,
52
57
  port: 1420
53
58
  },
@@ -59,7 +64,9 @@ const studio = async (options) => {
59
64
  });
60
65
  await Promise.all([
61
66
  server.listen(),
67
+ //
62
68
  (0, import_tamaguiConfigUtils.watchTamaguiConfig)(options)
69
+ // generateTypes(options),
63
70
  ]);
64
71
  const info = (_a = server.httpServer) == null ? void 0 : _a.address();
65
72
  console.log("devServerInfo", info);
@@ -2,6 +2,6 @@
2
2
  "version": 3,
3
3
  "sources": ["../../src/studio.ts"],
4
4
  "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'\nimport { closeEvent } from './utils.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 await Promise.all([\n server.listen(),\n //\n watchTamaguiConfig(options),\n // generateTypes(options),\n ])\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 app.listen(port)\n\n console.log(`Listening on`, chalk.green(`http://localhost:${port}`))\n\n await closeEvent(server)\n}\n"],
5
- "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;AAEnC,mBAA2B;AAd3B;AAgBA,MAAM,UACJ,SAAS,kBAAc,6BAAc,YAAY,GAAG,EAAE,UAAU,QAAQ;AAEnE,MAAM,SAAS,OAAO,YAA6B;AAnB1D;AAoBE,QAAM,EAAE,SAAS,QAAQ,IAAI,MAAM,OAAO;AAC1C,QAAM,EAAE,MAAM,IAAI;AAClB,QAAM,WAAO,qBAAQ,QAAQ,uBAAuB,CAAC;AACrD,QAAM,SAAS,UAAM,0BAAa;AAAA,IAChC;AAAA,IACA,QAAQ;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,QAAQ,IAAI;AAAA,IAChB,OAAO,OAAO;AAAA,QAEd,8CAAmB,OAAO;AAAA,EAE5B,CAAC;AAED,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,MAAI,OAAO,IAAI;AAEf,UAAQ,IAAI,gBAAgB,aAAAC,QAAM,MAAM,oBAAoB,MAAM,CAAC;AAEnE,YAAM,yBAAW,MAAM;AACzB;",
5
+ "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;AAEnC,mBAA2B;AAd3B;AAgBA,MAAM,UACJ,SAAS,kBAAc,6BAAc,YAAY,GAAG,EAAE,UAAU,QAAQ;AAEnE,MAAM,SAAS,OAAO,YAA6B;AAnB1D;AAoBE,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,QAAQ,IAAI;AAAA,IAChB,OAAO,OAAO;AAAA;AAAA,QAEd,8CAAmB,OAAO;AAAA;AAAA,EAE5B,CAAC;AAED,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,MAAI,OAAO,IAAI;AAEf,UAAQ,IAAI,gBAAgB,aAAAC,QAAM,MAAM,oBAAoB,MAAM,CAAC;AAEnE,YAAM,yBAAW,MAAM;AACzB;",
6
6
  "names": ["express", "morgan", "fs", "proxy", "chalk"]
7
7
  }
@@ -19,6 +19,10 @@ var __copyProps = (to, from, except, desc) => {
19
19
  return to;
20
20
  };
21
21
  var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
22
+ // If the importer is in node compatibility mode or this is not an ESM
23
+ // file that has been converted to a CommonJS file using a Babel-
24
+ // compatible transform (i.e. "__esModule" has not been set), then set
25
+ // "default" to the CommonJS "module.exports" for node compatibility.
22
26
  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
23
27
  mod
24
28
  ));
@@ -79,6 +83,7 @@ async function watchTamaguiConfig(options) {
79
83
  await import_esbuild.default.build({
80
84
  entryPoints: [options.tamaguiOptions.config],
81
85
  sourcemap: false,
86
+ // dont output just use esbuild as a watcher
82
87
  write: false,
83
88
  watch: {
84
89
  onRebuild(err, result) {
@@ -2,6 +2,6 @@
2
2
  "version": 3,
3
3
  "sources": ["../../src/tamaguiConfigUtils.ts"],
4
4
  "sourcesContent": ["#!/usr/bin/env node\n\nimport { getVariableValue } from '@tamagui/core-node'\nimport esbuild from 'esbuild'\nimport fs, { ensureDir } from 'fs-extra'\n\nimport { ResolvedOptions } from './types.js'\nimport { loadTamagui } from './utils.js'\n\nexport async function generateTamaguiConfig(options: ResolvedOptions) {\n await ensureDir(options.paths.dotDir)\n const config = await getTamaguiConfig(options)\n const { components, nameToPaths } = config\n const { themes, tokens } = config.tamaguiConfig\n\n // reduce down to usable, smaller json\n\n // slim themes, add name\n for (const key in themes) {\n const theme = themes[key]\n // @ts-ignore\n theme.id = key\n for (const tkey in theme) {\n theme[tkey] = getVariableValue(theme[tkey])\n }\n }\n\n // flatten variables\n for (const key in tokens) {\n const token = tokens[key]\n for (const tkey in token) {\n token[tkey] = getVariableValue(token[tkey])\n }\n }\n\n // remove bulky stuff in components\n for (const key in components) {\n const component = components[key]\n for (const _ in component.nameToInfo) {\n delete component.nameToInfo[_].staticConfig['validStyles']\n }\n }\n\n // set to array\n for (const key in nameToPaths) {\n // @ts-ignore\n nameToPaths[key] = [...nameToPaths[key]]\n }\n\n // cleanup other stuff\n // @ts-ignore\n delete config.tamaguiConfig['Provider']\n // @ts-ignore\n delete config.tamaguiConfig['fontsParsed']\n // @ts-ignore\n delete config.tamaguiConfig['getCSS']\n // @ts-ignore\n delete config.tamaguiConfig['tokensParsed']\n // @ts-ignore\n delete config.tamaguiConfig['themeConfig']\n\n await fs.writeJSON(options.paths.conf, config, {\n spaces: 2,\n })\n}\n\nasync function getTamaguiConfig(options: ResolvedOptions) {\n return loadTamagui(options.tamaguiOptions)\n}\n\nexport async function watchTamaguiConfig(options: ResolvedOptions) {\n if (!options.tamaguiOptions.config) return\n await generateTamaguiConfig(options)\n await esbuild.build({\n entryPoints: [options.tamaguiOptions.config],\n sourcemap: false,\n // dont output just use esbuild as a watcher\n write: false,\n watch: {\n onRebuild(err, result) {\n generateTamaguiConfig(options)\n },\n },\n })\n}\n"],
5
- "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,uBAAiC;AACjC,qBAAoB;AACpB,sBAA8B;AAG9B,mBAA4B;AAE5B,eAAsB,sBAAsB,SAA0B;AACpE,YAAM,2BAAU,QAAQ,MAAM,MAAM;AACpC,QAAM,SAAS,MAAM,iBAAiB,OAAO;AAC7C,QAAM,EAAE,YAAY,YAAY,IAAI;AACpC,QAAM,EAAE,QAAQ,OAAO,IAAI,OAAO;AAKlC,aAAW,OAAO,QAAQ;AACxB,UAAM,QAAQ,OAAO;AAErB,UAAM,KAAK;AACX,eAAW,QAAQ,OAAO;AACxB,YAAM,YAAQ,mCAAiB,MAAM,KAAK;AAAA,IAC5C;AAAA,EACF;AAGA,aAAW,OAAO,QAAQ;AACxB,UAAM,QAAQ,OAAO;AACrB,eAAW,QAAQ,OAAO;AACxB,YAAM,YAAQ,mCAAiB,MAAM,KAAK;AAAA,IAC5C;AAAA,EACF;AAGA,aAAW,OAAO,YAAY;AAC5B,UAAM,YAAY,WAAW;AAC7B,eAAW,KAAK,UAAU,YAAY;AACpC,aAAO,UAAU,WAAW,GAAG,aAAa;AAAA,IAC9C;AAAA,EACF;AAGA,aAAW,OAAO,aAAa;AAE7B,gBAAY,OAAO,CAAC,GAAG,YAAY,IAAI;AAAA,EACzC;AAIA,SAAO,OAAO,cAAc;AAE5B,SAAO,OAAO,cAAc;AAE5B,SAAO,OAAO,cAAc;AAE5B,SAAO,OAAO,cAAc;AAE5B,SAAO,OAAO,cAAc;AAE5B,QAAM,gBAAAA,QAAG,UAAU,QAAQ,MAAM,MAAM,QAAQ;AAAA,IAC7C,QAAQ;AAAA,EACV,CAAC;AACH;AAEA,eAAe,iBAAiB,SAA0B;AACxD,aAAO,0BAAY,QAAQ,cAAc;AAC3C;AAEA,eAAsB,mBAAmB,SAA0B;AACjE,MAAI,CAAC,QAAQ,eAAe;AAAQ;AACpC,QAAM,sBAAsB,OAAO;AACnC,QAAM,eAAAC,QAAQ,MAAM;AAAA,IAClB,aAAa,CAAC,QAAQ,eAAe,MAAM;AAAA,IAC3C,WAAW;AAAA,IAEX,OAAO;AAAA,IACP,OAAO;AAAA,MACL,UAAU,KAAK,QAAQ;AACrB,8BAAsB,OAAO;AAAA,MAC/B;AAAA,IACF;AAAA,EACF,CAAC;AACH;",
5
+ "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,uBAAiC;AACjC,qBAAoB;AACpB,sBAA8B;AAG9B,mBAA4B;AAE5B,eAAsB,sBAAsB,SAA0B;AACpE,YAAM,2BAAU,QAAQ,MAAM,MAAM;AACpC,QAAM,SAAS,MAAM,iBAAiB,OAAO;AAC7C,QAAM,EAAE,YAAY,YAAY,IAAI;AACpC,QAAM,EAAE,QAAQ,OAAO,IAAI,OAAO;AAKlC,aAAW,OAAO,QAAQ;AACxB,UAAM,QAAQ,OAAO,GAAG;AAExB,UAAM,KAAK;AACX,eAAW,QAAQ,OAAO;AACxB,YAAM,IAAI,QAAI,mCAAiB,MAAM,IAAI,CAAC;AAAA,IAC5C;AAAA,EACF;AAGA,aAAW,OAAO,QAAQ;AACxB,UAAM,QAAQ,OAAO,GAAG;AACxB,eAAW,QAAQ,OAAO;AACxB,YAAM,IAAI,QAAI,mCAAiB,MAAM,IAAI,CAAC;AAAA,IAC5C;AAAA,EACF;AAGA,aAAW,OAAO,YAAY;AAC5B,UAAM,YAAY,WAAW,GAAG;AAChC,eAAW,KAAK,UAAU,YAAY;AACpC,aAAO,UAAU,WAAW,CAAC,EAAE,aAAa,aAAa;AAAA,IAC3D;AAAA,EACF;AAGA,aAAW,OAAO,aAAa;AAE7B,gBAAY,GAAG,IAAI,CAAC,GAAG,YAAY,GAAG,CAAC;AAAA,EACzC;AAIA,SAAO,OAAO,cAAc,UAAU;AAEtC,SAAO,OAAO,cAAc,aAAa;AAEzC,SAAO,OAAO,cAAc,QAAQ;AAEpC,SAAO,OAAO,cAAc,cAAc;AAE1C,SAAO,OAAO,cAAc,aAAa;AAEzC,QAAM,gBAAAA,QAAG,UAAU,QAAQ,MAAM,MAAM,QAAQ;AAAA,IAC7C,QAAQ;AAAA,EACV,CAAC;AACH;AAEA,eAAe,iBAAiB,SAA0B;AACxD,aAAO,0BAAY,QAAQ,cAAc;AAC3C;AAEA,eAAsB,mBAAmB,SAA0B;AACjE,MAAI,CAAC,QAAQ,eAAe;AAAQ;AACpC,QAAM,sBAAsB,OAAO;AACnC,QAAM,eAAAC,QAAQ,MAAM;AAAA,IAClB,aAAa,CAAC,QAAQ,eAAe,MAAM;AAAA,IAC3C,WAAW;AAAA;AAAA,IAEX,OAAO;AAAA,IACP,OAAO;AAAA,MACL,UAAU,KAAK,QAAQ;AACrB,8BAAsB,OAAO;AAAA,MAC/B;AAAA,IACF;AAAA,EACF,CAAC;AACH;",
6
6
  "names": ["fs", "esbuild"]
7
7
  }
package/dist/cjs/test.js CHANGED
@@ -18,6 +18,10 @@ var __copyProps = (to, from, except, desc) => {
18
18
  return to;
19
19
  };
20
20
  var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
21
+ // If the importer is in node compatibility mode or this is not an ESM
22
+ // file that has been converted to a CommonJS file using a Babel-
23
+ // compatible transform (i.e. "__esModule" has not been set), then set
24
+ // "default" to the CommonJS "module.exports" for node compatibility.
21
25
  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
22
26
  mod
23
27
  ));
@@ -2,6 +2,6 @@
2
2
  "version": 3,
3
3
  "sources": ["../../src/test.ts"],
4
4
  "sourcesContent": ["/* eslint-disable no-console */\nimport { ResolvedOptions } from './types.js'\n\nexport const test = async (options: ResolvedOptions) => {\n const { dev } = await import('./dev.js')\n\n // failing on startup \"Tamagui error bundling components require() of ES Module\"\n\n void dev(options)\n\n console.log('run tests')\n}\n"],
5
- "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAGO,MAAM,OAAO,OAAO,YAA6B;AACtD,QAAM,EAAE,IAAI,IAAI,MAAM,OAAO;AAI7B,OAAK,IAAI,OAAO;AAEhB,UAAQ,IAAI,WAAW;AACzB;",
5
+ "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAGO,MAAM,OAAO,OAAO,YAA6B;AACtD,QAAM,EAAE,IAAI,IAAI,MAAM,OAAO,UAAU;AAIvC,OAAK,IAAI,OAAO;AAEhB,UAAQ,IAAI,WAAW;AACzB;",
6
6
  "names": []
7
7
  }
package/dist/cjs/utils.js CHANGED
@@ -18,6 +18,10 @@ var __copyProps = (to, from, except, desc) => {
18
18
  return to;
19
19
  };
20
20
  var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
21
+ // If the importer is in node compatibility mode or this is not an ESM
22
+ // file that has been converted to a CommonJS file using a Babel-
23
+ // compatible transform (i.e. "__esModule" has not been set), then set
24
+ // "default" to the CommonJS "module.exports" for node compatibility.
21
25
  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
22
26
  mod
23
27
  ));
@@ -2,6 +2,6 @@
2
2
  "version": 3,
3
3
  "sources": ["../../src/utils.ts"],
4
4
  "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(\n await fs.pathExists(tsConfigFilePath),\n `No tsconfig found: ${tsConfigFilePath}`,\n )\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(\n defaultPaths.map((path) => pathExists(path)),\n )\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 (\n opts: Partial<TamaguiOptions>,\n): 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"],
5
- "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;AAAA,IACE,MAAM,gBAAAA,QAAG,WAAW,gBAAgB;AAAA,IACpC,sBAAsB;AAAA,EACxB;AACA,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;AAAA,IAClC,aAAa,IAAI,CAAC,aAAS,4BAAW,IAAI,CAAC;AAAA,EAC7C;AACA,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,OACzB,SACgC;AAChC,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;",
5
+ "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;AAAA,IACE,MAAM,gBAAAA,QAAG,WAAW,gBAAgB;AAAA,IACpC,sBAAsB;AAAA,EACxB;AACA,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;AAAA,IAClC,aAAa,IAAI,CAAC,aAAS,4BAAW,IAAI,CAAC;AAAA,EAC7C;AACA,QAAM,WAAW,cAAc,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;AACnD,QAAM,QAAQ,aAAa,QAAQ;AACnC,MAAI,CAAC,OAAO;AACV,UAAM,IAAI,MAAM,4BAA4B;AAAA,EAC9C;AACA,eAAa;AACb,SAAO;AACT;AAEA,IAAI,SAAoC;AACjC,MAAM,cAAc,OACzB,SACgC;AAChC,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;",
6
6
  "names": ["fs", "chalk", "loadTamaguiStatic"]
7
7
  }
package/dist/esm/build.js CHANGED
@@ -12,7 +12,9 @@ const build = async (options) => {
12
12
  const targets = ["web"];
13
13
  console.log("sourceDir", sourceDir, targets);
14
14
  await new Promise((res) => {
15
- chokidar.watch(sourceDir, {}).on("add", (relativePath) => {
15
+ chokidar.watch(sourceDir, {
16
+ // persistent: true,
17
+ }).on("add", (relativePath) => {
16
18
  const sourcePath = resolve(process.cwd(), relativePath);
17
19
  promises.push(
18
20
  (async () => {
@@ -2,6 +2,6 @@
2
2
  "version": 3,
3
3
  "sources": ["../../src/build.ts"],
4
4
  "sourcesContent": ["import { writeFile } from 'fs'\nimport { basename, dirname, join, resolve } from 'path'\n\nimport { createExtractor, extractToClassNames, loadTamagui } from '@tamagui/static'\nimport chokidar from 'chokidar'\nimport { readFile } from 'fs-extra'\n\nimport { ResolvedOptions } from './types.js'\n\nexport const build = async (options: ResolvedOptions) => {\n // const tamagui = await loadTamagui(options.tamaguiOptions)\n\n const entry = options.pkgJson.source\n if (!entry) {\n throw new Error(`Must add \"source\" to package.json pointing to your source directory`)\n }\n const sourceDir = dirname(entry)\n const promises: Promise<void>[] = []\n const targets = ['web']\n\n console.log('sourceDir', sourceDir, targets)\n\n await new Promise<void>((res) => {\n chokidar\n // prevent infinite loop but cause race condition if you just build directly\n .watch(sourceDir, {\n // persistent: true,\n })\n .on('add', (relativePath) => {\n const sourcePath = resolve(process.cwd(), relativePath)\n\n promises.push(\n (async () => {\n await Promise.all(\n targets.map(async (target) => {\n process.env.TAMAGUI_TARGET = target\n if (options.debug) {\n process.env.NODE_ENV ||= 'development'\n }\n const source = await readFile(sourcePath, 'utf-8')\n const extractor = createExtractor()\n const out = await extractToClassNames({\n extractor,\n source,\n sourcePath,\n options: options.tamaguiOptions,\n shouldPrintDebug: options.debug || false,\n })\n\n // await writeFile()\n })\n )\n })()\n )\n })\n .on('ready', () => {\n res()\n })\n })\n\n await Promise.all(promises)\n}\n"],
5
- "mappings": "AACA,SAAmB,SAAe,eAAe;AAEjD,SAAS,iBAAiB,2BAAwC;AAClE,OAAO,cAAc;AACrB,SAAS,gBAAgB;AAIlB,MAAM,QAAQ,OAAO,YAA6B;AAGvD,QAAM,QAAQ,QAAQ,QAAQ;AAC9B,MAAI,CAAC,OAAO;AACV,UAAM,IAAI,MAAM,qEAAqE;AAAA,EACvF;AACA,QAAM,YAAY,QAAQ,KAAK;AAC/B,QAAM,WAA4B,CAAC;AACnC,QAAM,UAAU,CAAC,KAAK;AAEtB,UAAQ,IAAI,aAAa,WAAW,OAAO;AAE3C,QAAM,IAAI,QAAc,CAAC,QAAQ;AAC/B,aAEG,MAAM,WAAW,CAElB,CAAC,EACA,GAAG,OAAO,CAAC,iBAAiB;AAC3B,YAAM,aAAa,QAAQ,QAAQ,IAAI,GAAG,YAAY;AAEtD,eAAS;AAAA,SACN,YAAY;AACX,gBAAM,QAAQ;AAAA,YACZ,QAAQ,IAAI,OAAO,WAAW;AAC5B,sBAAQ,IAAI,iBAAiB;AAC7B,kBAAI,QAAQ,OAAO;AACjB,wBAAQ,IAAI,aAAa;AAAA,cAC3B;AACA,oBAAM,SAAS,MAAM,SAAS,YAAY,OAAO;AACjD,oBAAM,YAAY,gBAAgB;AAClC,oBAAM,MAAM,MAAM,oBAAoB;AAAA,gBACpC;AAAA,gBACA;AAAA,gBACA;AAAA,gBACA,SAAS,QAAQ;AAAA,gBACjB,kBAAkB,QAAQ,SAAS;AAAA,cACrC,CAAC;AAAA,YAGH,CAAC;AAAA,UACH;AAAA,QACF,GAAG;AAAA,MACL;AAAA,IACF,CAAC,EACA,GAAG,SAAS,MAAM;AACjB,UAAI;AAAA,IACN,CAAC;AAAA,EACL,CAAC;AAED,QAAM,QAAQ,IAAI,QAAQ;AAC5B;",
5
+ "mappings": "AACA,SAAmB,SAAe,eAAe;AAEjD,SAAS,iBAAiB,2BAAwC;AAClE,OAAO,cAAc;AACrB,SAAS,gBAAgB;AAIlB,MAAM,QAAQ,OAAO,YAA6B;AAGvD,QAAM,QAAQ,QAAQ,QAAQ;AAC9B,MAAI,CAAC,OAAO;AACV,UAAM,IAAI,MAAM,qEAAqE;AAAA,EACvF;AACA,QAAM,YAAY,QAAQ,KAAK;AAC/B,QAAM,WAA4B,CAAC;AACnC,QAAM,UAAU,CAAC,KAAK;AAEtB,UAAQ,IAAI,aAAa,WAAW,OAAO;AAE3C,QAAM,IAAI,QAAc,CAAC,QAAQ;AAC/B,aAEG,MAAM,WAAW;AAAA;AAAA,IAElB,CAAC,EACA,GAAG,OAAO,CAAC,iBAAiB;AAC3B,YAAM,aAAa,QAAQ,QAAQ,IAAI,GAAG,YAAY;AAEtD,eAAS;AAAA,SACN,YAAY;AACX,gBAAM,QAAQ;AAAA,YACZ,QAAQ,IAAI,OAAO,WAAW;AAC5B,sBAAQ,IAAI,iBAAiB;AAC7B,kBAAI,QAAQ,OAAO;AACjB,wBAAQ,IAAI,aAAa;AAAA,cAC3B;AACA,oBAAM,SAAS,MAAM,SAAS,YAAY,OAAO;AACjD,oBAAM,YAAY,gBAAgB;AAClC,oBAAM,MAAM,MAAM,oBAAoB;AAAA,gBACpC;AAAA,gBACA;AAAA,gBACA;AAAA,gBACA,SAAS,QAAQ;AAAA,gBACjB,kBAAkB,QAAQ,SAAS;AAAA,cACrC,CAAC;AAAA,YAGH,CAAC;AAAA,UACH;AAAA,QACF,GAAG;AAAA,MACL;AAAA,IACF,CAAC,EACA,GAAG,SAAS,MAAM;AACjB,UAAI;AAAA,IACN,CAAC;AAAA,EACL,CAAC;AAED,QAAM,QAAQ,IAAI,QAAQ;AAC5B;",
6
6
  "names": []
7
7
  }
@@ -2,6 +2,6 @@
2
2
  "version": 3,
3
3
  "sources": ["../../src/cli.ts"],
4
4
  "sourcesContent": ["/* eslint-disable no-console */\nimport arg, { flag } from 'arg'\nimport chalk from 'chalk'\n\nimport { getOptions } from './utils.js'\n\nconst COMMAND_MAP = {\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 COMMAND_MAP\ntype CommandKey = keyof typeof COMMAND_MAP\ntype CommandDefinition = CommandDefinitions[CommandKey]\n\nconst commandEntries = Object.keys(COMMAND_MAP).flatMap((command) => {\n const definition = COMMAND_MAP[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<\n CommandKey,\n CommandDefinition\n>\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(COMMAND_MAP)\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(\n `Flags: ${Object.entries(definition.flags).map(([k, v]) => `${k} (${v.name})`)}`\n )\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"],
5
- "mappings": "AACA,OAAO,SAAmB;AAC1B,OAAO,WAAW;AAElB,SAAS,kBAAkB;AAE3B,MAAM,cAAc;AAAA,EAClB,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;AAAA,EAEA,KAAK;AAAA,IACH,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,IAAI,IAAI,MAAM,OAAO;AAC7B,YAAM,UAAU,MAAM,WAAW;AAAA,QAC/B,OAAOA,OAAM,aAAcA,OAAM,eAAe,YAAY,OAAQ;AAAA,MACtE,CAAC;AACD,YAAM,IAAI,OAAO;AAAA,IACnB;AAAA,EACF;AAAA,EAEA,QAAQ;AAAA,IACN,YAAY,CAAC,GAAG;AAAA,IAChB,aAAa;AAAA,IACb,OAAO,CAAC;AAAA,IACR,MAAM,MAAM;AACV,YAAM,EAAE,MAAMA,OAAM,IAAI,IAAI,KAAK,KAAK;AACtC,YAAM,EAAE,OAAO,IAAI,MAAM,OAAO;AAChC,YAAM,UAAU,MAAM,WAAW;AAAA,QAC/B,OAAOA,OAAM,aAAcA,OAAM,eAAe,YAAY,OAAQ;AAAA,MACtE,CAAC;AACD,YAAM,OAAO,OAAO;AAAA,IACtB;AAAA,EACF;AACF;AAMA,MAAM,iBAAiB,OAAO,KAAK,WAAW,EAAE,QAAQ,CAACC,aAAY;AACnE,QAAMC,cAAa,YAAYD;AAC/B,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;AAKlD,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,WAAW,EACtB,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;AAAA,MACN,UAAU,OAAO,QAAQ,WAAW,KAAK,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,GAAG,MAAM,EAAE,OAAO;AAAA,IAC/E;AACA,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;",
5
+ "mappings": "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",
6
6
  "names": ["flags", "command", "definition"]
7
7
  }
package/dist/esm/dev.js CHANGED
@@ -2,8 +2,8 @@ import { join } from "path";
2
2
  import { nativePlugin, tamaguiPlugin } from "@tamagui/vite-plugin";
3
3
  import chalk from "chalk";
4
4
  import express from "express";
5
- import proxy from "express-http-proxy";
6
5
  import fs from "fs-extra";
6
+ import killPort from "kill-port";
7
7
  import morgan from "morgan";
8
8
  import { build, createServer } from "vite";
9
9
  import { watchTamaguiConfig } from "./tamaguiConfigUtils.js";
@@ -37,29 +37,94 @@ const dev = async (options) => {
37
37
  });
38
38
  await Promise.all([
39
39
  server.listen(),
40
+ //
40
41
  watchTamaguiConfig(options)
42
+ // generateTypes(options),
41
43
  ]);
42
44
  const info = (_b = server.httpServer) == null ? void 0 : _b.address();
43
45
  const app = express();
46
+ const cleanup = async () => {
47
+ console.log("cleaning up");
48
+ await server.close();
49
+ };
50
+ process.on(`uncaughtException`, (e) => {
51
+ console.log("wtdf", e);
52
+ });
53
+ [`exit`, `SIGINT`, `SIGUSR1`, `SIGUSR2`, `SIGTERM`].forEach((eventType) => {
54
+ process.on(eventType, cleanup);
55
+ });
56
+ const port = 19e3;
44
57
  app.disable("x-powered-by");
45
58
  app.use(express.static(paths.dotDir, { maxAge: "2h" }));
46
59
  app.use(morgan("tiny"));
60
+ app.get("/status", (req, res) => {
61
+ res.status(200).send();
62
+ });
47
63
  app.get("/conf", async (req, res) => {
48
64
  const conf = await fs.readJSON(paths.conf);
49
65
  res.status(200).json(conf);
50
66
  });
51
67
  app.get("/index.bundle", async (req, res) => {
52
68
  const output = (await fs.readFile(outputJsPath)).toString();
53
- res.status(200).send(output);
69
+ res.status(200);
70
+ res.header("Content-Type", "text/javascript");
71
+ res.send(output);
72
+ });
73
+ const defaultResponse = {
74
+ name: "myapp",
75
+ slug: "myapp",
76
+ scheme: "myapp",
77
+ version: "1.0.0",
78
+ jsEngine: "jsc",
79
+ orientation: "portrait",
80
+ icon: "./assets/icon.png",
81
+ userInterfaceStyle: "light",
82
+ splash: {
83
+ image: "./assets/splash.png",
84
+ resizeMode: "contain",
85
+ backgroundColor: "#ffffff",
86
+ imageUrl: "http://127.0.0.1:8081/assets/./assets/splash.png"
87
+ },
88
+ updates: { fallbackToCacheTimeout: 0 },
89
+ assetBundlePatterns: ["**/*"],
90
+ ios: { supportsTablet: true, bundleIdentifier: "com.natew.myapp" },
91
+ android: {
92
+ package: "com.tamagui.myapp",
93
+ adaptiveIcon: {
94
+ foregroundImage: "./assets/adaptive-icon.png",
95
+ backgroundColor: "#FFFFFF",
96
+ foregroundImageUrl: "http://127.0.0.1:8081/assets/./assets/adaptive-icon.png"
97
+ }
98
+ },
99
+ web: { favicon: "./assets/favicon.png" },
100
+ extra: { eas: { projectId: "061b4470-78c7-4d6a-b850-8167fb0a3434" } },
101
+ _internal: {
102
+ isDebug: false,
103
+ projectRoot: "/Users/n8/tamagui/apps/kitchen-sink",
104
+ dynamicConfigPath: null,
105
+ staticConfigPath: "/Users/n8/tamagui/apps/kitchen-sink/app.json",
106
+ packageJsonPath: "/Users/n8/tamagui/apps/kitchen-sink/package.json"
107
+ },
108
+ sdkVersion: "47.0.0",
109
+ platforms: ["ios", "android", "web"],
110
+ iconUrl: `http://127.0.0.1:${port}/assets/./assets/icon.png`,
111
+ debuggerHost: `127.0.0.1:${port}`,
112
+ logUrl: `http://127.0.0.1:${port}/logs`,
113
+ developer: { tool: "expo-cli", projectRoot: "/Users/n8/tamagui/apps/kitchen-sink" },
114
+ packagerOpts: { dev: true },
115
+ mainModuleName: "index",
116
+ __flipperHack: "React Native packager is running",
117
+ hostUri: `127.0.0.1:${port}`,
118
+ bundleUrl: `http://127.0.0.1:${port}/index.bundle?platform=ios&dev=true&hot=false`,
119
+ id: "@anonymous/myapp-473c4543-3c36-4786-9db1-c66a62ac9b78"
120
+ };
121
+ app.get("/", (req, res) => {
122
+ res.status(200).json(defaultResponse);
54
123
  });
55
- app.use("/", proxy(`${info.address}:${info.port}`));
56
- const port = 8081;
124
+ await killPort(port);
57
125
  app.listen(port);
58
126
  console.log(`Listening on`, chalk.green(`http://localhost:${port}`));
59
127
  server.printUrls();
60
- process.on("beforeExit", () => {
61
- server.close();
62
- });
63
128
  await closeEvent(server);
64
129
  };
65
130
  export {
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/dev.ts"],
4
- "sourcesContent": ["import { AddressInfo } from 'net'\nimport { join } from 'path'\n\nimport { nativePlugin, 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 { build, 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 plugins = [\n tamaguiPlugin({\n components: ['tamagui'],\n }),\n nativePlugin(),\n ]\n\n const buildOutput = await build({\n plugins,\n root,\n })\n const outputJsFile = 'output' in buildOutput ? buildOutput.output[0]?.fileName : null\n\n if (!outputJsFile) {\n throw new Error(`No js?`)\n }\n\n const outputJsPath = join(process.cwd(), 'dist', outputJsFile)\n\n const server = await createServer({\n root,\n server: {\n port: options.port,\n host: options.host || 'localhost',\n },\n plugins,\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 // /index.bundle?platform=ios&dev=true&minify=false&modulesOnly=false&runModule=true&app=dish.motion:2811:36)\n app.get('/index.bundle', async (req, res) => {\n const output = (await fs.readFile(outputJsPath)).toString()\n res.status(200).send(output)\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 process.on('beforeExit', () => {\n server.close()\n })\n\n await closeEvent(server)\n}\n"],
5
- "mappings": "AACA,SAAS,YAAY;AAErB,SAAS,cAAc,qBAAqB;AAC5C,OAAO,WAAW;AAClB,OAAO,aAAa;AACpB,OAAO,WAAW;AAClB,OAAO,QAAQ;AACf,OAAO,YAAY;AACnB,SAAS,OAAO,oBAAoB;AAEpC,SAAS,0BAA0B;AAEnC,SAAS,kBAAkB;AAEpB,MAAM,MAAM,OAAO,YAA6B;AAfvD;AAgBE,QAAM,EAAE,MAAM,MAAM,MAAM,IAAI;AAE9B,UAAQ,MAAM,QAAQ,IAAI,CAAC;AAE3B,QAAM,UAAU;AAAA,IACd,cAAc;AAAA,MACZ,YAAY,CAAC,SAAS;AAAA,IACxB,CAAC;AAAA,IACD,aAAa;AAAA,EACf;AAEA,QAAM,cAAc,MAAM,MAAM;AAAA,IAC9B;AAAA,IACA;AAAA,EACF,CAAC;AACD,QAAM,eAAe,YAAY,eAAc,iBAAY,OAAO,OAAnB,mBAAuB,WAAW;AAEjF,MAAI,CAAC,cAAc;AACjB,UAAM,IAAI,MAAM,QAAQ;AAAA,EAC1B;AAEA,QAAM,eAAe,KAAK,QAAQ,IAAI,GAAG,QAAQ,YAAY;AAE7D,QAAM,SAAS,MAAM,aAAa;AAAA,IAChC;AAAA,IACA,QAAQ;AAAA,MACN,MAAM,QAAQ;AAAA,MACd,MAAM,QAAQ,QAAQ;AAAA,IACxB;AAAA,IACA;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;AAGD,MAAI,IAAI,iBAAiB,OAAO,KAAK,QAAQ;AAC3C,UAAM,UAAU,MAAM,GAAG,SAAS,YAAY,GAAG,SAAS;AAC1D,QAAI,OAAO,GAAG,EAAE,KAAK,MAAM;AAAA,EAC7B,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,UAAQ,GAAG,cAAc,MAAM;AAC7B,WAAO,MAAM;AAAA,EACf,CAAC;AAED,QAAM,WAAW,MAAM;AACzB;",
4
+ "sourcesContent": ["import { AddressInfo } from 'net'\nimport { join } from 'path'\n\nimport { nativePlugin, 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 killPort from 'kill-port'\nimport morgan from 'morgan'\nimport { build, 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 plugins = [\n tamaguiPlugin({\n components: ['tamagui'],\n }),\n nativePlugin(),\n ]\n\n const buildOutput = await build({\n plugins,\n root,\n })\n const outputJsFile = 'output' in buildOutput ? buildOutput.output[0]?.fileName : null\n if (!outputJsFile) {\n throw new Error(`No js?`)\n }\n const outputJsPath = join(process.cwd(), 'dist', outputJsFile)\n\n const server = await createServer({\n root,\n server: {\n port: options.port,\n host: options.host || 'localhost',\n },\n plugins,\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 const cleanup = async () => {\n console.log('cleaning up')\n await server.close()\n }\n\n process.on(`uncaughtException`, (e) => {\n console.log('wtdf', e)\n })\n ;[`exit`, `SIGINT`, `SIGUSR1`, `SIGUSR2`, `SIGTERM`].forEach((eventType) => {\n process.on(eventType, cleanup)\n })\n\n // react native port (it scans 19000 +5)\n const port = 19000\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('/status', (req, res) => {\n res.status(200).send()\n })\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 // /index.bundle?platform=ios&dev=true&minify=false&modulesOnly=false&runModule=true&app=dish.motion:2811:36)\n app.get('/index.bundle', async (req, res) => {\n const output = (await fs.readFile(outputJsPath)).toString()\n\n res.status(200)\n res.header('Content-Type', 'text/javascript')\n res.send(output)\n })\n\n const defaultResponse = {\n name: 'myapp',\n slug: 'myapp',\n scheme: 'myapp',\n version: '1.0.0',\n jsEngine: 'jsc',\n orientation: 'portrait',\n icon: './assets/icon.png',\n userInterfaceStyle: 'light',\n splash: {\n image: './assets/splash.png',\n resizeMode: 'contain',\n backgroundColor: '#ffffff',\n imageUrl: 'http://127.0.0.1:8081/assets/./assets/splash.png',\n },\n updates: { fallbackToCacheTimeout: 0 },\n assetBundlePatterns: ['**/*'],\n ios: { supportsTablet: true, bundleIdentifier: 'com.natew.myapp' },\n android: {\n package: 'com.tamagui.myapp',\n adaptiveIcon: {\n foregroundImage: './assets/adaptive-icon.png',\n backgroundColor: '#FFFFFF',\n foregroundImageUrl: 'http://127.0.0.1:8081/assets/./assets/adaptive-icon.png',\n },\n },\n web: { favicon: './assets/favicon.png' },\n extra: { eas: { projectId: '061b4470-78c7-4d6a-b850-8167fb0a3434' } },\n _internal: {\n isDebug: false,\n projectRoot: '/Users/n8/tamagui/apps/kitchen-sink',\n dynamicConfigPath: null,\n staticConfigPath: '/Users/n8/tamagui/apps/kitchen-sink/app.json',\n packageJsonPath: '/Users/n8/tamagui/apps/kitchen-sink/package.json',\n },\n sdkVersion: '47.0.0',\n platforms: ['ios', 'android', 'web'],\n iconUrl: `http://127.0.0.1:${port}/assets/./assets/icon.png`,\n debuggerHost: `127.0.0.1:${port}`,\n logUrl: `http://127.0.0.1:${port}/logs`,\n developer: { tool: 'expo-cli', projectRoot: '/Users/n8/tamagui/apps/kitchen-sink' },\n packagerOpts: { dev: true },\n mainModuleName: 'index',\n __flipperHack: 'React Native packager is running',\n hostUri: `127.0.0.1:${port}`,\n bundleUrl: `http://127.0.0.1:${port}/index.bundle?platform=ios&dev=true&hot=false`,\n id: '@anonymous/myapp-473c4543-3c36-4786-9db1-c66a62ac9b78',\n }\n\n app.get('/', (req, res) => {\n res.status(200).json(defaultResponse)\n })\n\n // app.use('/', proxy(`${info.address}:${info.port}`))\n\n await killPort(port)\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"],
5
+ "mappings": "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",
6
6
  "names": []
7
7
  }
@@ -2,6 +2,6 @@
2
2
  "version": 3,
3
3
  "sources": ["../../src/generate.ts"],
4
4
  "sourcesContent": ["#!/usr/bin/env node\n\nimport fs from 'fs-extra'\nimport { Project } from 'ts-morph'\n\nimport { ResolvedOptions } from './types.js'\nimport { loadTamagui } from './utils.js'\n\nexport async function generateTypes(options: ResolvedOptions) {\n const types = await getTypes(options)\n await fs.writeJSON(options.paths.types, types, {\n spaces: 2,\n })\n}\n\nexport async function getTypes(options: ResolvedOptions) {\n const tamagui = await loadTamagui(options.tamaguiOptions)\n\n const uniqueViewExportingPaths = new Set(\n Object.keys(tamagui.nameToPaths).map((name) => {\n return `${[...tamagui.nameToPaths[name]][0]}.ts*`\n }),\n )\n\n const project = new Project({\n compilerOptions: {\n noEmit: false,\n declaration: true,\n emitDeclarationOnly: true,\n },\n skipAddingFilesFromTsConfig: true,\n tsConfigFilePath: options.tsconfigPath,\n })\n\n const files = project.addSourceFilesAtPaths([...uniqueViewExportingPaths])\n\n return Object.fromEntries(\n files.flatMap((x) => {\n return [...x.getExportedDeclarations()].map(([k, v]) => {\n return [\n k,\n v[0]\n .getType()\n .getApparentType()\n .getProperties()\n .map((prop) => {\n return [\n prop.getEscapedName(),\n prop.getValueDeclaration()?.getType().getText(),\n ]\n }),\n ]\n })\n }),\n )\n\n // console.log(\n // 'project',\n // files.map((x) => x.getFilePath()),\n // files.map((x) => {\n // return x.getExportedDeclarations()\n // }),\n // Object.fromEntries(\n // files.flatMap((x) => {\n // return [...x.getExportedDeclarations()].map(([k, v]) => {\n // return [k, v[0].getType().getApparentType().getText()]\n // })\n // })\n // ),\n\n // // files.map((f) => f.getExportSymbols())\n}\n"],
5
- "mappings": ";AAEA,OAAO,QAAQ;AACf,SAAS,eAAe;AAGxB,SAAS,mBAAmB;AAE5B,eAAsB,cAAc,SAA0B;AAC5D,QAAM,QAAQ,MAAM,SAAS,OAAO;AACpC,QAAM,GAAG,UAAU,QAAQ,MAAM,OAAO,OAAO;AAAA,IAC7C,QAAQ;AAAA,EACV,CAAC;AACH;AAEA,eAAsB,SAAS,SAA0B;AACvD,QAAM,UAAU,MAAM,YAAY,QAAQ,cAAc;AAExD,QAAM,2BAA2B,IAAI;AAAA,IACnC,OAAO,KAAK,QAAQ,WAAW,EAAE,IAAI,CAAC,SAAS;AAC7C,aAAO,GAAG,CAAC,GAAG,QAAQ,YAAY,KAAK,EAAE;AAAA,IAC3C,CAAC;AAAA,EACH;AAEA,QAAM,UAAU,IAAI,QAAQ;AAAA,IAC1B,iBAAiB;AAAA,MACf,QAAQ;AAAA,MACR,aAAa;AAAA,MACb,qBAAqB;AAAA,IACvB;AAAA,IACA,6BAA6B;AAAA,IAC7B,kBAAkB,QAAQ;AAAA,EAC5B,CAAC;AAED,QAAM,QAAQ,QAAQ,sBAAsB,CAAC,GAAG,wBAAwB,CAAC;AAEzE,SAAO,OAAO;AAAA,IACZ,MAAM,QAAQ,CAAC,MAAM;AACnB,aAAO,CAAC,GAAG,EAAE,wBAAwB,CAAC,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM;AACtD,eAAO;AAAA,UACL;AAAA,UACA,EAAE,GACC,QAAQ,EACR,gBAAgB,EAChB,cAAc,EACd,IAAI,CAAC,SAAS;AA7C3B;AA8Cc,mBAAO;AAAA,cACL,KAAK,eAAe;AAAA,eACpB,UAAK,oBAAoB,MAAzB,mBAA4B,UAAU;AAAA,YACxC;AAAA,UACF,CAAC;AAAA,QACL;AAAA,MACF,CAAC;AAAA,IACH,CAAC;AAAA,EACH;AAiBF;",
5
+ "mappings": ";AAEA,OAAO,QAAQ;AACf,SAAS,eAAe;AAGxB,SAAS,mBAAmB;AAE5B,eAAsB,cAAc,SAA0B;AAC5D,QAAM,QAAQ,MAAM,SAAS,OAAO;AACpC,QAAM,GAAG,UAAU,QAAQ,MAAM,OAAO,OAAO;AAAA,IAC7C,QAAQ;AAAA,EACV,CAAC;AACH;AAEA,eAAsB,SAAS,SAA0B;AACvD,QAAM,UAAU,MAAM,YAAY,QAAQ,cAAc;AAExD,QAAM,2BAA2B,IAAI;AAAA,IACnC,OAAO,KAAK,QAAQ,WAAW,EAAE,IAAI,CAAC,SAAS;AAC7C,aAAO,GAAG,CAAC,GAAG,QAAQ,YAAY,IAAI,CAAC,EAAE,CAAC;AAAA,IAC5C,CAAC;AAAA,EACH;AAEA,QAAM,UAAU,IAAI,QAAQ;AAAA,IAC1B,iBAAiB;AAAA,MACf,QAAQ;AAAA,MACR,aAAa;AAAA,MACb,qBAAqB;AAAA,IACvB;AAAA,IACA,6BAA6B;AAAA,IAC7B,kBAAkB,QAAQ;AAAA,EAC5B,CAAC;AAED,QAAM,QAAQ,QAAQ,sBAAsB,CAAC,GAAG,wBAAwB,CAAC;AAEzE,SAAO,OAAO;AAAA,IACZ,MAAM,QAAQ,CAAC,MAAM;AACnB,aAAO,CAAC,GAAG,EAAE,wBAAwB,CAAC,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM;AACtD,eAAO;AAAA,UACL;AAAA,UACA,EAAE,CAAC,EACA,QAAQ,EACR,gBAAgB,EAChB,cAAc,EACd,IAAI,CAAC,SAAS;AA7C3B;AA8Cc,mBAAO;AAAA,cACL,KAAK,eAAe;AAAA,eACpB,UAAK,oBAAoB,MAAzB,mBAA4B,UAAU;AAAA,YACxC;AAAA,UACF,CAAC;AAAA,QACL;AAAA,MACF,CAAC;AAAA,IACH,CAAC;AAAA,EACH;AAiBF;",
6
6
  "names": []
7
7
  }
@@ -18,6 +18,7 @@ const studio = async (options) => {
18
18
  const server = await createServer({
19
19
  root,
20
20
  server: {
21
+ // open: true,
21
22
  host: options.host,
22
23
  port: 1420
23
24
  },
@@ -29,7 +30,9 @@ const studio = async (options) => {
29
30
  });
30
31
  await Promise.all([
31
32
  server.listen(),
33
+ //
32
34
  watchTamaguiConfig(options)
35
+ // generateTypes(options),
33
36
  ]);
34
37
  const info = (_a = server.httpServer) == null ? void 0 : _a.address();
35
38
  console.log("devServerInfo", info);
@@ -2,6 +2,6 @@
2
2
  "version": 3,
3
3
  "sources": ["../../src/studio.ts"],
4
4
  "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'\nimport { closeEvent } from './utils.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 await Promise.all([\n server.listen(),\n //\n watchTamaguiConfig(options),\n // generateTypes(options),\n ])\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 app.listen(port)\n\n console.log(`Listening on`, chalk.green(`http://localhost:${port}`))\n\n await closeEvent(server)\n}\n"],
5
- "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;AAEnC,SAAS,kBAAkB;AAE3B,MAAM,UACJ,SAAS,cAAc,cAAc,YAAY,GAAG,EAAE,UAAU,QAAQ;AAEnE,MAAM,SAAS,OAAO,YAA6B;AAnB1D;AAoBE,QAAM,EAAE,SAAS,QAAQ,IAAI,MAAM,OAAO;AAC1C,QAAM,EAAE,MAAM,IAAI;AAClB,QAAM,OAAO,QAAQ,QAAQ,uBAAuB,CAAC;AACrD,QAAM,SAAS,MAAM,aAAa;AAAA,IAChC;AAAA,IACA,QAAQ;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,QAAQ,IAAI;AAAA,IAChB,OAAO,OAAO;AAAA,IAEd,mBAAmB,OAAO;AAAA,EAE5B,CAAC;AAED,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,MAAI,OAAO,IAAI;AAEf,UAAQ,IAAI,gBAAgB,MAAM,MAAM,oBAAoB,MAAM,CAAC;AAEnE,QAAM,WAAW,MAAM;AACzB;",
5
+ "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;AAEnC,SAAS,kBAAkB;AAE3B,MAAM,UACJ,SAAS,cAAc,cAAc,YAAY,GAAG,EAAE,UAAU,QAAQ;AAEnE,MAAM,SAAS,OAAO,YAA6B;AAnB1D;AAoBE,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,QAAQ,IAAI;AAAA,IAChB,OAAO,OAAO;AAAA;AAAA,IAEd,mBAAmB,OAAO;AAAA;AAAA,EAE5B,CAAC;AAED,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,MAAI,OAAO,IAAI;AAEf,UAAQ,IAAI,gBAAgB,MAAM,MAAM,oBAAoB,MAAM,CAAC;AAEnE,QAAM,WAAW,MAAM;AACzB;",
6
6
  "names": []
7
7
  }
@@ -49,6 +49,7 @@ async function watchTamaguiConfig(options) {
49
49
  await esbuild.build({
50
50
  entryPoints: [options.tamaguiOptions.config],
51
51
  sourcemap: false,
52
+ // dont output just use esbuild as a watcher
52
53
  write: false,
53
54
  watch: {
54
55
  onRebuild(err, result) {
@@ -2,6 +2,6 @@
2
2
  "version": 3,
3
3
  "sources": ["../../src/tamaguiConfigUtils.ts"],
4
4
  "sourcesContent": ["#!/usr/bin/env node\n\nimport { getVariableValue } from '@tamagui/core-node'\nimport esbuild from 'esbuild'\nimport fs, { ensureDir } from 'fs-extra'\n\nimport { ResolvedOptions } from './types.js'\nimport { loadTamagui } from './utils.js'\n\nexport async function generateTamaguiConfig(options: ResolvedOptions) {\n await ensureDir(options.paths.dotDir)\n const config = await getTamaguiConfig(options)\n const { components, nameToPaths } = config\n const { themes, tokens } = config.tamaguiConfig\n\n // reduce down to usable, smaller json\n\n // slim themes, add name\n for (const key in themes) {\n const theme = themes[key]\n // @ts-ignore\n theme.id = key\n for (const tkey in theme) {\n theme[tkey] = getVariableValue(theme[tkey])\n }\n }\n\n // flatten variables\n for (const key in tokens) {\n const token = tokens[key]\n for (const tkey in token) {\n token[tkey] = getVariableValue(token[tkey])\n }\n }\n\n // remove bulky stuff in components\n for (const key in components) {\n const component = components[key]\n for (const _ in component.nameToInfo) {\n delete component.nameToInfo[_].staticConfig['validStyles']\n }\n }\n\n // set to array\n for (const key in nameToPaths) {\n // @ts-ignore\n nameToPaths[key] = [...nameToPaths[key]]\n }\n\n // cleanup other stuff\n // @ts-ignore\n delete config.tamaguiConfig['Provider']\n // @ts-ignore\n delete config.tamaguiConfig['fontsParsed']\n // @ts-ignore\n delete config.tamaguiConfig['getCSS']\n // @ts-ignore\n delete config.tamaguiConfig['tokensParsed']\n // @ts-ignore\n delete config.tamaguiConfig['themeConfig']\n\n await fs.writeJSON(options.paths.conf, config, {\n spaces: 2,\n })\n}\n\nasync function getTamaguiConfig(options: ResolvedOptions) {\n return loadTamagui(options.tamaguiOptions)\n}\n\nexport async function watchTamaguiConfig(options: ResolvedOptions) {\n if (!options.tamaguiOptions.config) return\n await generateTamaguiConfig(options)\n await esbuild.build({\n entryPoints: [options.tamaguiOptions.config],\n sourcemap: false,\n // dont output just use esbuild as a watcher\n write: false,\n watch: {\n onRebuild(err, result) {\n generateTamaguiConfig(options)\n },\n },\n })\n}\n"],
5
- "mappings": ";AAEA,SAAS,wBAAwB;AACjC,OAAO,aAAa;AACpB,OAAO,MAAM,iBAAiB;AAG9B,SAAS,mBAAmB;AAE5B,eAAsB,sBAAsB,SAA0B;AACpE,QAAM,UAAU,QAAQ,MAAM,MAAM;AACpC,QAAM,SAAS,MAAM,iBAAiB,OAAO;AAC7C,QAAM,EAAE,YAAY,YAAY,IAAI;AACpC,QAAM,EAAE,QAAQ,OAAO,IAAI,OAAO;AAKlC,aAAW,OAAO,QAAQ;AACxB,UAAM,QAAQ,OAAO;AAErB,UAAM,KAAK;AACX,eAAW,QAAQ,OAAO;AACxB,YAAM,QAAQ,iBAAiB,MAAM,KAAK;AAAA,IAC5C;AAAA,EACF;AAGA,aAAW,OAAO,QAAQ;AACxB,UAAM,QAAQ,OAAO;AACrB,eAAW,QAAQ,OAAO;AACxB,YAAM,QAAQ,iBAAiB,MAAM,KAAK;AAAA,IAC5C;AAAA,EACF;AAGA,aAAW,OAAO,YAAY;AAC5B,UAAM,YAAY,WAAW;AAC7B,eAAW,KAAK,UAAU,YAAY;AACpC,aAAO,UAAU,WAAW,GAAG,aAAa;AAAA,IAC9C;AAAA,EACF;AAGA,aAAW,OAAO,aAAa;AAE7B,gBAAY,OAAO,CAAC,GAAG,YAAY,IAAI;AAAA,EACzC;AAIA,SAAO,OAAO,cAAc;AAE5B,SAAO,OAAO,cAAc;AAE5B,SAAO,OAAO,cAAc;AAE5B,SAAO,OAAO,cAAc;AAE5B,SAAO,OAAO,cAAc;AAE5B,QAAM,GAAG,UAAU,QAAQ,MAAM,MAAM,QAAQ;AAAA,IAC7C,QAAQ;AAAA,EACV,CAAC;AACH;AAEA,eAAe,iBAAiB,SAA0B;AACxD,SAAO,YAAY,QAAQ,cAAc;AAC3C;AAEA,eAAsB,mBAAmB,SAA0B;AACjE,MAAI,CAAC,QAAQ,eAAe;AAAQ;AACpC,QAAM,sBAAsB,OAAO;AACnC,QAAM,QAAQ,MAAM;AAAA,IAClB,aAAa,CAAC,QAAQ,eAAe,MAAM;AAAA,IAC3C,WAAW;AAAA,IAEX,OAAO;AAAA,IACP,OAAO;AAAA,MACL,UAAU,KAAK,QAAQ;AACrB,8BAAsB,OAAO;AAAA,MAC/B;AAAA,IACF;AAAA,EACF,CAAC;AACH;",
5
+ "mappings": ";AAEA,SAAS,wBAAwB;AACjC,OAAO,aAAa;AACpB,OAAO,MAAM,iBAAiB;AAG9B,SAAS,mBAAmB;AAE5B,eAAsB,sBAAsB,SAA0B;AACpE,QAAM,UAAU,QAAQ,MAAM,MAAM;AACpC,QAAM,SAAS,MAAM,iBAAiB,OAAO;AAC7C,QAAM,EAAE,YAAY,YAAY,IAAI;AACpC,QAAM,EAAE,QAAQ,OAAO,IAAI,OAAO;AAKlC,aAAW,OAAO,QAAQ;AACxB,UAAM,QAAQ,OAAO,GAAG;AAExB,UAAM,KAAK;AACX,eAAW,QAAQ,OAAO;AACxB,YAAM,IAAI,IAAI,iBAAiB,MAAM,IAAI,CAAC;AAAA,IAC5C;AAAA,EACF;AAGA,aAAW,OAAO,QAAQ;AACxB,UAAM,QAAQ,OAAO,GAAG;AACxB,eAAW,QAAQ,OAAO;AACxB,YAAM,IAAI,IAAI,iBAAiB,MAAM,IAAI,CAAC;AAAA,IAC5C;AAAA,EACF;AAGA,aAAW,OAAO,YAAY;AAC5B,UAAM,YAAY,WAAW,GAAG;AAChC,eAAW,KAAK,UAAU,YAAY;AACpC,aAAO,UAAU,WAAW,CAAC,EAAE,aAAa,aAAa;AAAA,IAC3D;AAAA,EACF;AAGA,aAAW,OAAO,aAAa;AAE7B,gBAAY,GAAG,IAAI,CAAC,GAAG,YAAY,GAAG,CAAC;AAAA,EACzC;AAIA,SAAO,OAAO,cAAc,UAAU;AAEtC,SAAO,OAAO,cAAc,aAAa;AAEzC,SAAO,OAAO,cAAc,QAAQ;AAEpC,SAAO,OAAO,cAAc,cAAc;AAE1C,SAAO,OAAO,cAAc,aAAa;AAEzC,QAAM,GAAG,UAAU,QAAQ,MAAM,MAAM,QAAQ;AAAA,IAC7C,QAAQ;AAAA,EACV,CAAC;AACH;AAEA,eAAe,iBAAiB,SAA0B;AACxD,SAAO,YAAY,QAAQ,cAAc;AAC3C;AAEA,eAAsB,mBAAmB,SAA0B;AACjE,MAAI,CAAC,QAAQ,eAAe;AAAQ;AACpC,QAAM,sBAAsB,OAAO;AACnC,QAAM,QAAQ,MAAM;AAAA,IAClB,aAAa,CAAC,QAAQ,eAAe,MAAM;AAAA,IAC3C,WAAW;AAAA;AAAA,IAEX,OAAO;AAAA,IACP,OAAO;AAAA,MACL,UAAU,KAAK,QAAQ;AACrB,8BAAsB,OAAO;AAAA,MAC/B;AAAA,IACF;AAAA,EACF,CAAC;AACH;",
6
6
  "names": []
7
7
  }
@@ -2,6 +2,6 @@
2
2
  "version": 3,
3
3
  "sources": ["../../src/test.ts"],
4
4
  "sourcesContent": ["/* eslint-disable no-console */\nimport { ResolvedOptions } from './types.js'\n\nexport const test = async (options: ResolvedOptions) => {\n const { dev } = await import('./dev.js')\n\n // failing on startup \"Tamagui error bundling components require() of ES Module\"\n\n void dev(options)\n\n console.log('run tests')\n}\n"],
5
- "mappings": "AAGO,MAAM,OAAO,OAAO,YAA6B;AACtD,QAAM,EAAE,IAAI,IAAI,MAAM,OAAO;AAI7B,OAAK,IAAI,OAAO;AAEhB,UAAQ,IAAI,WAAW;AACzB;",
5
+ "mappings": "AAGO,MAAM,OAAO,OAAO,YAA6B;AACtD,QAAM,EAAE,IAAI,IAAI,MAAM,OAAO,UAAU;AAIvC,OAAK,IAAI,OAAO;AAEhB,UAAQ,IAAI,WAAW;AACzB;",
6
6
  "names": []
7
7
  }
@@ -2,6 +2,6 @@
2
2
  "version": 3,
3
3
  "sources": ["../../src/utils.ts"],
4
4
  "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(\n await fs.pathExists(tsConfigFilePath),\n `No tsconfig found: ${tsConfigFilePath}`,\n )\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(\n defaultPaths.map((path) => pathExists(path)),\n )\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 (\n opts: Partial<TamaguiOptions>,\n): 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"],
5
- "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;AAAA,IACE,MAAM,GAAG,WAAW,gBAAgB;AAAA,IACpC,sBAAsB;AAAA,EACxB;AACA,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;AAAA,IAClC,aAAa,IAAI,CAAC,SAAS,WAAW,IAAI,CAAC;AAAA,EAC7C;AACA,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,OACzB,SACgC;AAChC,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;",
5
+ "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;AAAA,IACE,MAAM,GAAG,WAAW,gBAAgB;AAAA,IACpC,sBAAsB;AAAA,EACxB;AACA,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;AAAA,IAClC,aAAa,IAAI,CAAC,SAAS,WAAW,IAAI,CAAC;AAAA,EAC7C;AACA,QAAM,WAAW,cAAc,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;AACnD,QAAM,QAAQ,aAAa,QAAQ;AACnC,MAAI,CAAC,OAAO;AACV,UAAM,IAAI,MAAM,4BAA4B;AAAA,EAC9C;AACA,eAAa;AACb,SAAO;AACT;AAEA,IAAI,SAAoC;AACjC,MAAM,cAAc,OACzB,SACgC;AAChC,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;",
6
6
  "names": []
7
7
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tamagui/cli",
3
- "version": "1.1.7",
3
+ "version": "1.1.9",
4
4
  "source": "src/index.ts",
5
5
  "types": "./types/index.d.ts",
6
6
  "module": "dist/esm",
@@ -32,16 +32,16 @@
32
32
  "clean:build": "tamagui-build clean:build"
33
33
  },
34
34
  "dependencies": {
35
- "@tamagui/build": "^1.1.7",
36
- "@tamagui/static": "^1.1.7",
37
- "@tamagui/vite-plugin": "^1.1.7",
35
+ "@tamagui/build": "^1.1.9",
36
+ "@tamagui/static": "^1.1.9",
37
+ "@tamagui/vite-plugin": "^1.1.9",
38
38
  "@types/compression": "^1.7.2",
39
39
  "@types/morgan": "^1.9.3",
40
40
  "arg": "^5.0.2",
41
41
  "chalk": "^4.1.2",
42
42
  "chokidar": "^3.5.2",
43
43
  "compression": "^1.7.4",
44
- "esbuild": "^0.16.15",
44
+ "esbuild": "^0.17.5",
45
45
  "execa": "^5.0.0",
46
46
  "express": "^4.18.1",
47
47
  "express-http-proxy": "^1.6.3",
@@ -49,6 +49,7 @@
49
49
  "fs-extra": "^10.1.0",
50
50
  "get-port": "^6.1.2",
51
51
  "graphology": "^0.24.1",
52
+ "kill-port": "^2.0.1",
52
53
  "lodash.debounce": "^4.0.8",
53
54
  "morgan": "^1.10.0",
54
55
  "ts-morph": "^15.1.0",
@@ -58,6 +59,6 @@
58
59
  "zx": "^7.1.1"
59
60
  },
60
61
  "devDependencies": {
61
- "@takeout/studio": "^1.1.7"
62
+ "@takeout/studio": "^1.1.9"
62
63
  }
63
64
  }
package/src/dev.ts CHANGED
@@ -6,6 +6,7 @@ import chalk from 'chalk'
6
6
  import express from 'express'
7
7
  import proxy from 'express-http-proxy'
8
8
  import fs from 'fs-extra'
9
+ import killPort from 'kill-port'
9
10
  import morgan from 'morgan'
10
11
  import { build, createServer } from 'vite'
11
12
 
@@ -30,11 +31,9 @@ export const dev = async (options: ResolvedOptions) => {
30
31
  root,
31
32
  })
32
33
  const outputJsFile = 'output' in buildOutput ? buildOutput.output[0]?.fileName : null
33
-
34
34
  if (!outputJsFile) {
35
35
  throw new Error(`No js?`)
36
36
  }
37
-
38
37
  const outputJsPath = join(process.cwd(), 'dist', outputJsFile)
39
38
 
40
39
  const server = await createServer({
@@ -57,12 +56,31 @@ export const dev = async (options: ResolvedOptions) => {
57
56
  const info = server.httpServer?.address() as AddressInfo
58
57
  const app = express()
59
58
 
59
+ const cleanup = async () => {
60
+ console.log('cleaning up')
61
+ await server.close()
62
+ }
63
+
64
+ process.on(`uncaughtException`, (e) => {
65
+ console.log('wtdf', e)
66
+ })
67
+ ;[`exit`, `SIGINT`, `SIGUSR1`, `SIGUSR2`, `SIGTERM`].forEach((eventType) => {
68
+ process.on(eventType, cleanup)
69
+ })
70
+
71
+ // react native port (it scans 19000 +5)
72
+ const port = 19000
73
+
60
74
  app.disable('x-powered-by')
61
75
  app.use(express.static(paths.dotDir, { maxAge: '2h' }))
62
76
  app.use(morgan('tiny'))
63
77
 
64
78
  // studio specific - move out eventually to studioPlugin
65
79
 
80
+ app.get('/status', (req, res) => {
81
+ res.status(200).send()
82
+ })
83
+
66
84
  app.get('/conf', async (req, res) => {
67
85
  const conf = await fs.readJSON(paths.conf)
68
86
  res.status(200).json(conf)
@@ -71,22 +89,73 @@ export const dev = async (options: ResolvedOptions) => {
71
89
  // /index.bundle?platform=ios&dev=true&minify=false&modulesOnly=false&runModule=true&app=dish.motion:2811:36)
72
90
  app.get('/index.bundle', async (req, res) => {
73
91
  const output = (await fs.readFile(outputJsPath)).toString()
74
- res.status(200).send(output)
92
+
93
+ res.status(200)
94
+ res.header('Content-Type', 'text/javascript')
95
+ res.send(output)
96
+ })
97
+
98
+ const defaultResponse = {
99
+ name: 'myapp',
100
+ slug: 'myapp',
101
+ scheme: 'myapp',
102
+ version: '1.0.0',
103
+ jsEngine: 'jsc',
104
+ orientation: 'portrait',
105
+ icon: './assets/icon.png',
106
+ userInterfaceStyle: 'light',
107
+ splash: {
108
+ image: './assets/splash.png',
109
+ resizeMode: 'contain',
110
+ backgroundColor: '#ffffff',
111
+ imageUrl: 'http://127.0.0.1:8081/assets/./assets/splash.png',
112
+ },
113
+ updates: { fallbackToCacheTimeout: 0 },
114
+ assetBundlePatterns: ['**/*'],
115
+ ios: { supportsTablet: true, bundleIdentifier: 'com.natew.myapp' },
116
+ android: {
117
+ package: 'com.tamagui.myapp',
118
+ adaptiveIcon: {
119
+ foregroundImage: './assets/adaptive-icon.png',
120
+ backgroundColor: '#FFFFFF',
121
+ foregroundImageUrl: 'http://127.0.0.1:8081/assets/./assets/adaptive-icon.png',
122
+ },
123
+ },
124
+ web: { favicon: './assets/favicon.png' },
125
+ extra: { eas: { projectId: '061b4470-78c7-4d6a-b850-8167fb0a3434' } },
126
+ _internal: {
127
+ isDebug: false,
128
+ projectRoot: '/Users/n8/tamagui/apps/kitchen-sink',
129
+ dynamicConfigPath: null,
130
+ staticConfigPath: '/Users/n8/tamagui/apps/kitchen-sink/app.json',
131
+ packageJsonPath: '/Users/n8/tamagui/apps/kitchen-sink/package.json',
132
+ },
133
+ sdkVersion: '47.0.0',
134
+ platforms: ['ios', 'android', 'web'],
135
+ iconUrl: `http://127.0.0.1:${port}/assets/./assets/icon.png`,
136
+ debuggerHost: `127.0.0.1:${port}`,
137
+ logUrl: `http://127.0.0.1:${port}/logs`,
138
+ developer: { tool: 'expo-cli', projectRoot: '/Users/n8/tamagui/apps/kitchen-sink' },
139
+ packagerOpts: { dev: true },
140
+ mainModuleName: 'index',
141
+ __flipperHack: 'React Native packager is running',
142
+ hostUri: `127.0.0.1:${port}`,
143
+ bundleUrl: `http://127.0.0.1:${port}/index.bundle?platform=ios&dev=true&hot=false`,
144
+ id: '@anonymous/myapp-473c4543-3c36-4786-9db1-c66a62ac9b78',
145
+ }
146
+
147
+ app.get('/', (req, res) => {
148
+ res.status(200).json(defaultResponse)
75
149
  })
76
150
 
77
- app.use('/', proxy(`${info.address}:${info.port}`))
151
+ // app.use('/', proxy(`${info.address}:${info.port}`))
78
152
 
79
- // react native port
80
- const port = 8081
153
+ await killPort(port)
81
154
  app.listen(port)
82
155
 
83
156
  // eslint-disable-next-line no-console
84
157
  console.log(`Listening on`, chalk.green(`http://localhost:${port}`))
85
158
  server.printUrls()
86
159
 
87
- process.on('beforeExit', () => {
88
- server.close()
89
- })
90
-
91
160
  await closeEvent(server)
92
161
  }
package/types/utils.d.ts CHANGED
@@ -1,8 +1,8 @@
1
- import type { TamaguiOptions, TamaguiProjectInfo } from '@tamagui/static';
1
+ import type { TamaguiProjectInfo } from '@tamagui/static';
2
2
  import { ViteDevServer } from 'vite';
3
3
  import { ResolvedOptions, UserOptions } from './types.js';
4
4
  export declare function getOptions({ root, tsconfigPath, tamaguiOptions, host, debug, }?: Partial<UserOptions>): Promise<ResolvedOptions>;
5
5
  export declare function ensure(condition: boolean, message: string): void;
6
- export declare const loadTamagui: (opts: Partial<TamaguiOptions>) => Promise<TamaguiProjectInfo>;
6
+ export declare const loadTamagui: (opts: TamaguiOptions) => Promise<TamaguiProjectInfo>;
7
7
  export declare function closeEvent(server: ViteDevServer): Promise<void>;
8
8
  //# sourceMappingURL=utils.d.ts.map