@tamagui/cli 2.0.0-rc.27 → 2.0.0-rc.29

package/dist/cli.cjs

@@ -22,9 +22,7 @@ isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
 }) : target, mod));
 var import_arg = __toESM(require("arg")),
   import_chalk = __toESM(require("chalk")),
-  import_add = require("./add.cjs"),
-  import_utils = require("./utils.cjs"),
-  import_static = require("@tamagui/static");
+  import_utils = require("./utils.cjs");
 ["exit", "SIGINT"].forEach(_ => {
   process.on(_, () => {
     (0, import_utils.disposeAll)(), process.exit();
@@ -45,10 +43,12 @@ const COMMAND_MAP = {
             ...flags2
           } = (0, import_arg.default)(this.flags),
           options = await (0, import_utils.getOptions)({
-            debug: flags2["--debug"] ? flags2["--verbose"] ? "verbose" : !0 : !1,
-            loadTamaguiOptions: !0
-          });
-        await (0, import_static.checkDeps)(options.paths.root);
+            debug: flags2["--debug"] ? flags2["--verbose"] ? "verbose" : !0 : !1
+          }),
+          {
+            checkDeps
+          } = require("@tamagui/static/checkDeps");
+        await checkDeps(options.paths.root);
       }
     },
     generate: {
@@ -67,8 +67,11 @@ const COMMAND_MAP = {
           options = await (0, import_utils.getOptions)({
             debug: flags2["--debug"] ? flags2["--verbose"] ? "verbose" : !0 : !1,
             loadTamaguiOptions: !0
-          });
-        process.env.TAMAGUI_KEEP_THEMES = "1", await (0, import_static.loadTamagui)({
+          }),
+          {
+            loadTamagui
+          } = require("@tamagui/static/loadTamagui");
+        process.env.TAMAGUI_KEEP_THEMES = "1", await loadTamagui({
           ...options.tamaguiOptions,
           platform: "web"
         });
@@ -102,8 +105,11 @@ const COMMAND_MAP = {
             debug: flags2["--debug"] ? flags2["--verbose"] ? "verbose" : !0 : !1,
             loadTamaguiOptions: !0
           }),
-          outputPath = flags2["--output"] || options.tamaguiOptions.outputCSS || "./tamagui.generated.css";
-        process.env.TAMAGUI_KEEP_THEMES = "1", await (0, import_static.loadTamagui)({
+          outputPath = flags2["--output"] || options.tamaguiOptions.outputCSS || "./tamagui.generated.css",
+          {
+            loadTamagui
+          } = require("@tamagui/static/loadTamagui");
+        process.env.TAMAGUI_KEEP_THEMES = "1", await loadTamagui({
           ...options.tamaguiOptions,
           outputCSS: outputPath,
           platform: "web"
@@ -143,7 +149,7 @@ const COMMAND_MAP = {
     },
     add: {
       shorthands: [],
-      description: `Use to add fonts and icons to your monorepo. Supported types: ${import_add.generatedPackageTypes.join(", ")}`,
+      description: "Use to add fonts and icons to your monorepo.",
       flags: {
         "--help": Boolean,
         "--debug": Boolean,

package/dist/generate-prompt.cjs

@@ -35,14 +35,16 @@ __export(generate_prompt_exports, {
 });
 module.exports = __toCommonJS(generate_prompt_exports);
 var import_node_path = require("node:path"),
-  FS = __toESM(require("fs-extra")),
-  import_static = require("@tamagui/static");
+  FS = __toESM(require("fs-extra"));
 async function generatePrompt(options) {
   const {
-    paths,
-    output
-  } = options;
-  process.env.TAMAGUI_KEEP_THEMES = "1", await (0, import_static.loadTamagui)({
+      paths,
+      output
+    } = options,
+    {
+      loadTamagui
+    } = require("@tamagui/static/loadTamagui");
+  process.env.TAMAGUI_KEEP_THEMES = "1", await loadTamagui({
     ...options.tamaguiOptions,
     platform: "web"
   });

package/dist/utils.cjs

@@ -38,8 +38,7 @@ __export(utils_exports, {
   registerDispose: () => registerDispose
 });
 module.exports = __toCommonJS(utils_exports);
-var import_static = require("@tamagui/static"),
-  import_chalk = __toESM(require("chalk")),
+var import_chalk = __toESM(require("chalk")),
   import_fs_extra = require("fs-extra"),
   import_node_path = require("node:path");
 async function getOptions({
@@ -55,14 +54,22 @@ async function getOptions({
     config = "";
   try {
     config = await getDefaultTamaguiConfigPath(), pkgJson = await (0, import_fs_extra.readJSON)((0, import_node_path.join)(root, "package.json"));
-  } catch {}
+  } catch {
+    loadTamaguiOptions && console.warn(import_chalk.default.yellow(`Warning: no tamagui.config.ts found in ${root}. Commands that need a config may fail.`));
+  }
   const filledOptions = {
-      platform: "native",
-      components: ["tamagui"],
-      config,
-      ...tamaguiOptions
-    },
-    finalOptions = loadTamaguiOptions ? (0, import_static.loadTamaguiBuildConfigSync)(filledOptions) : filledOptions;
+    platform: "native",
+    components: ["tamagui"],
+    config,
+    ...tamaguiOptions
+  };
+  let finalOptions = filledOptions;
+  if (loadTamaguiOptions) {
+    const {
+      loadTamaguiBuildConfigSync
+    } = require("@tamagui/static/loadTamagui");
+    finalOptions = loadTamaguiBuildConfigSync(filledOptions);
+  }
   return {
     mode: process.env.NODE_ENV === "production" ? "production" : "development",
     root,
@@ -91,11 +98,16 @@ async function getDefaultTamaguiConfigPath() {
   if (!found) throw new Error("No found tamagui.config.ts");
   return cachedPath = found, found;
 }
-const loadTamagui = async opts => await (0, import_static.loadTamagui)({
-    components: ["tamagui"],
-    ...opts,
-    config: opts.config ?? (await getDefaultTamaguiConfigPath())
-  }),
+const loadTamagui = async opts => {
+    const {
+      loadTamagui: loadTamaguiStatic
+    } = require("@tamagui/static/loadTamagui");
+    return await loadTamaguiStatic({
+      components: ["tamagui"],
+      ...opts,
+      config: opts.config ?? (await getDefaultTamaguiConfigPath())
+    });
+  },
   disposers = /* @__PURE__ */new Set();
 function registerDispose(cb) {
   disposers.add(cb);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/cli",
-  "version": "2.0.0-rc.27",
+  "version": "2.0.0-rc.29",
   "bin": {
     "tama": "./dist/index.cjs",
     "tamagui": "./dist/index.cjs"
@@ -26,11 +26,11 @@
     "test:web": "bun run test"
   },
   "dependencies": {
-    "@tamagui/create-theme": "2.0.0-rc.27",
-    "@tamagui/generate-themes": "2.0.0-rc.27",
-    "@tamagui/static": "2.0.0-rc.27",
-    "@tamagui/types": "2.0.0-rc.27",
-    "@tamagui/vite-plugin": "2.0.0-rc.27",
+    "@tamagui/create-theme": "2.0.0-rc.29",
+    "@tamagui/generate-themes": "2.0.0-rc.29",
+    "@tamagui/static": "2.0.0-rc.29",
+    "@tamagui/types": "2.0.0-rc.29",
+    "@tamagui/vite-plugin": "2.0.0-rc.29",
     "arg": "^5.0.2",
     "chalk": "^4.1.2",
     "change-case": "^4.1.2",
@@ -49,7 +49,7 @@
     "url": "^0.11.0"
   },
   "devDependencies": {
-    "@tamagui/build": "2.0.0-rc.27",
+    "@tamagui/build": "2.0.0-rc.29",
     "@types/chokidar": "^2.1.3",
     "@types/marked": "^5.0.0",
     "vitest": "4.0.4"

package/src/cli.ts

@@ -1,9 +1,7 @@
 import arg from 'arg'
 import chalk from 'chalk'
 
-import { generatedPackageTypes } from './add'
 import { disposeAll, getOptions } from './utils'
-import { loadTamagui, checkDeps } from '@tamagui/static'
 
 // exit handlers
 ;['exit', 'SIGINT'].forEach((_) => {
@@ -26,9 +24,8 @@ const COMMAND_MAP = {
       const { _, ...flags } = arg(this.flags)
       const options = await getOptions({
         debug: flags['--debug'] ? (flags['--verbose'] ? 'verbose' : true) : false,
-        loadTamaguiOptions: true,
       })
-
+      const { checkDeps } = require('@tamagui/static/checkDeps')
       await checkDeps(options.paths.root)
     },
   },
@@ -47,13 +44,14 @@ const COMMAND_MAP = {
         debug: flags['--debug'] ? (flags['--verbose'] ? 'verbose' : true) : false,
         loadTamaguiOptions: true,
       })
+      const { loadTamagui } = require('@tamagui/static/loadTamagui')
       process.env.TAMAGUI_KEEP_THEMES = '1'
       await loadTamagui({
         ...options.tamaguiOptions,
         platform: 'web',
       })
 
-      // Also generate prompt to .tamagui/prompt.md
+      // also generate prompt to .tamagui/prompt.md
       const { generatePrompt } = require('./generate-prompt')
       const { join } = require('node:path')
       await generatePrompt({
@@ -82,6 +80,7 @@ const COMMAND_MAP = {
       const outputPath =
         flags['--output'] || options.tamaguiOptions.outputCSS || './tamagui.generated.css'
 
+      const { loadTamagui } = require('@tamagui/static/loadTamagui')
       process.env.TAMAGUI_KEEP_THEMES = '1'
       await loadTamagui({
         ...options.tamaguiOptions,
@@ -133,9 +132,7 @@ const COMMAND_MAP = {
 
   add: {
     shorthands: [],
-    description: `Use to add fonts and icons to your monorepo. Supported types: ${generatedPackageTypes.join(
-      ', '
-    )}`,
+    description: `Use to add fonts and icons to your monorepo.`,
     flags: {
       '--help': Boolean,
       '--debug': Boolean,
@@ -145,9 +142,6 @@ const COMMAND_MAP = {
       const { _, ...flags } = arg(this.flags)
       const { installGeneratedPackage } = require('./add')
       const [cmd, type, path] = _
-      // const options = await getOptions({
-      //   debug: flags['--debug'] ? (flags['--verbose'] ? 'verbose' : true) : false,
-      // })
       await installGeneratedPackage(type, path)
     },
   },
@@ -364,63 +358,3 @@ async function main() {
 
   process.exit(0)
 }
-
-function showHelp(definition: CommandDefinition, flags: { '--help'?: boolean }) {
-  if (flags['--help']) {
-    console.info(`$ ${definition}`)
-  }
-}
-
-// async function main() {
-//   const options = await getOptions({
-//     host: flags['--host'],
-//   })
-
-//   switch (command) {
-//     // build
-//     case 'b':
-//     case 'build': {
-//       const { build } = await import('./build')
-//       break
-//     }
-
-//     // generate
-//     case 'generate':
-//     case 'gen': {
-//       const { generateTamaguiConfig: generateTamgauiConfig } = await import(
-//         './tamaguiConfigUtils.js'
-//       )
-//       const { generateTypes } = await import('./generate')
-
-//       if (props[0] === 'types') {
-//         await generateTypes(options)
-//         return
-//       }
-//       if (props[0] === 'config') {
-//         await generateTamgauiConfig(options)
-//         return
-//       }
-
-//       await Promise.all([
-//         // all
-//         generateTypes(options),
-//         generateTamgauiConfig(options),
-//       ])
-//       break
-//     }
-
-//     // for now, dev === serve, eventually serve can be just prod mode
-//     case 'dev': {
-//       const { dev } = await import('./dev')
-//       await dev(options)
-//       break
-//     }
-
-//     default: {
-//       if (!command || flags['--help']) {
-//       }
-//       console.warn(chalk.yellow(`No command found ${command}`))
-//       process.exit(1)
-//     }
-//   }
-// }

package/src/generate-prompt.ts

@@ -1,6 +1,5 @@
 import { join } from 'node:path'
 import * as FS from 'fs-extra'
-import { loadTamagui } from '@tamagui/static'
 import type { CLIResolvedOptions } from '@tamagui/types'
 
 interface GeneratePromptOptions extends CLIResolvedOptions {
@@ -11,6 +10,7 @@ export async function generatePrompt(options: GeneratePromptOptions) {
   const { paths, output } = options
 
   // Regenerate the config first
+  const { loadTamagui } = require('@tamagui/static/loadTamagui')
   process.env.TAMAGUI_KEEP_THEMES = '1'
   await loadTamagui({
     ...options.tamaguiOptions,

package/src/utils.ts

@@ -1,8 +1,4 @@
 import type { TamaguiOptions, TamaguiProjectInfo } from '@tamagui/static'
-import {
-  loadTamaguiBuildConfigSync,
-  loadTamagui as loadTamaguiStatic,
-} from '@tamagui/static'
 import type { CLIResolvedOptions, CLIUserOptions } from '@tamagui/types'
 import chalk from 'chalk'
 import fs, { pathExists, readJSON } from 'fs-extra'
@@ -23,7 +19,13 @@ export async function getOptions({
     config = await getDefaultTamaguiConfigPath()
     pkgJson = await readJSON(join(root, 'package.json'))
   } catch {
-    // ok
+    if (loadTamaguiOptions) {
+      console.warn(
+        chalk.yellow(
+          `Warning: no tamagui.config.ts found in ${root}. Commands that need a config may fail.`
+        )
+      )
+    }
   }
 
   const filledOptions = {
@@ -33,9 +35,11 @@ export async function getOptions({
     ...tamaguiOptions,
   } satisfies TamaguiOptions
 
-  const finalOptions = loadTamaguiOptions
-    ? loadTamaguiBuildConfigSync(filledOptions)
-    : filledOptions
+  let finalOptions: TamaguiOptions = filledOptions
+  if (loadTamaguiOptions) {
+    const { loadTamaguiBuildConfigSync } = require('@tamagui/static/loadTamagui')
+    finalOptions = loadTamaguiBuildConfigSync(filledOptions)
+  }
 
   return {
     mode: process.env.NODE_ENV === 'production' ? 'production' : 'development',
@@ -79,6 +83,7 @@ async function getDefaultTamaguiConfigPath() {
 export const loadTamagui = async (
   opts: Partial<TamaguiOptions>
 ): Promise<TamaguiProjectInfo | null> => {
+  const { loadTamagui: loadTamaguiStatic } = require('@tamagui/static/loadTamagui')
   const loaded = await loadTamaguiStatic({
     components: ['tamagui'],
     ...opts,

package/types/generate-prompt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-prompt.d.ts","sourceRoot":"","sources":["../src/generate-prompt.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAExD,UAAU,qBAAsB,SAAQ,kBAAkB;IACxD,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,wBAAsB,cAAc,CAAC,OAAO,EAAE,qBAAqB,iBA6BlE"}
+{"version":3,"file":"generate-prompt.d.ts","sourceRoot":"","sources":["../src/generate-prompt.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAExD,UAAU,qBAAsB,SAAQ,kBAAkB;IACxD,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,wBAAsB,cAAc,CAAC,OAAO,EAAE,qBAAqB,iBA8BlE"}

package/types/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAKzE,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAKxE,wBAAsB,UAAU,CAAC,EAC/B,IAAoB,EACpB,YAA8B,EAC9B,cAAc,EACd,IAAI,EACJ,KAAK,EACL,kBAAkB,GACnB,GAAE,OAAO,CAAC,cAAc,CAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAqC5D;AAED,wBAAgB,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,QAKzD;AAiBD,eAAO,MAAM,WAAW,GACtB,MAAM,OAAO,CAAC,cAAc,CAAC,KAC5B,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAOnC,CAAA;AAID,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,IAAI,QAE7C;AAED,wBAAgB,UAAU,SAEzB"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AACzE,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAKxE,wBAAsB,UAAU,CAAC,EAC/B,IAAoB,EACpB,YAA8B,EAC9B,cAAc,EACd,IAAI,EACJ,KAAK,EACL,kBAAkB,GACnB,GAAE,OAAO,CAAC,cAAc,CAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA6C5D;AAED,wBAAgB,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,QAKzD;AAiBD,eAAO,MAAM,WAAW,GACtB,MAAM,OAAO,CAAC,cAAc,CAAC,KAC5B,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAQnC,CAAA;AAID,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,IAAI,QAE7C;AAED,wBAAgB,UAAU,SAEzB"}