@tamagui/cli 1.100.6 → 1.101.0

package/dist/utils.mjs

@@ -0,0 +1,72 @@
+import { join } from "path";
+import { loadTamaguiBuildConfigSync, loadTamagui as loadTamaguiStatic } from "@tamagui/static";
+import chalk from "chalk";
+import fs, { pathExists, readJSON } from "fs-extra";
+async function getOptions({
+  root = process.cwd(),
+  tsconfigPath = "tsconfig.json",
+  tamaguiOptions,
+  host,
+  debug,
+  loadTamaguiOptions
+} = {}) {
+  const tsConfigFilePath = join(root, tsconfigPath);
+  ensure(await fs.pathExists(tsConfigFilePath), `No tsconfig found: ${tsConfigFilePath}`);
+  const dotDir = join(root, ".tamagui");
+  let pkgJson = {},
+    config = "";
+  try {
+    config = await getDefaultTamaguiConfigPath(), pkgJson = await readJSON(join(root, "package.json"));
+  } catch {}
+  const filledOptions = {
+      platform: "native",
+      components: ["tamagui"],
+      config,
+      ...tamaguiOptions
+    },
+    finalOptions = loadTamaguiOptions ? loadTamaguiBuildConfigSync(filledOptions) : filledOptions;
+  return {
+    mode: process.env.NODE_ENV === "production" ? "production" : "development",
+    root,
+    host: host || "127.0.0.1",
+    pkgJson,
+    debug,
+    tsconfigPath,
+    tamaguiOptions: finalOptions,
+    paths: {
+      root,
+      dotDir,
+      conf: join(dotDir, "tamagui.config.json"),
+      types: join(dotDir, "types.json")
+    }
+  };
+}
+function ensure(condition, message) {
+  condition || (console.error(chalk.red.bold("Error:"), chalk.yellow(`${message}`)), process.exit(1));
+}
+const defaultPaths = ["tamagui.config.ts", join("src", "tamagui.config.ts")];
+let cachedPath = "";
+async function getDefaultTamaguiConfigPath() {
+  if (cachedPath) return cachedPath;
+  const existing = (await Promise.all(defaultPaths.map(path => pathExists(path)))).findIndex(x => !!x),
+    found = defaultPaths[existing];
+  if (!found) throw new Error("No found tamagui.config.ts");
+  return cachedPath = found, found;
+}
+let cached = null;
+const loadTamagui = async opts => {
+    const loaded = await loadTamaguiStatic({
+      config: await getDefaultTamaguiConfigPath(),
+      components: ["tamagui"],
+      ...opts
+    });
+    return loaded && (cached = loaded), loaded;
+  },
+  disposers = /* @__PURE__ */new Set();
+function registerDispose(cb) {
+  disposers.add(cb);
+}
+function disposeAll() {
+  disposers.forEach(cb => cb());
+}
+export { disposeAll, ensure, getOptions, loadTamagui, registerDispose };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/cli",
-  "version": "1.100.6",
+  "version": "1.101.0",
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
   "main": "dist",
@@ -23,11 +23,11 @@
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@tamagui/create-theme": "1.100.6",
-    "@tamagui/generate-themes": "1.100.6",
-    "@tamagui/static": "1.100.6",
-    "@tamagui/types": "1.100.6",
-    "@tamagui/vite-plugin": "1.100.6",
+    "@tamagui/create-theme": "1.101.0",
+    "@tamagui/generate-themes": "1.101.0",
+    "@tamagui/static": "1.101.0",
+    "@tamagui/types": "1.101.0",
+    "@tamagui/vite-plugin": "1.101.0",
     "@vitejs/plugin-react-swc": "^3.6.0",
     "arg": "^5.0.2",
     "chalk": "^4.1.2",
@@ -45,6 +45,7 @@
     "kill-port": "^2.0.1",
     "marked": "^5.1.0",
     "marked-terminal": "^5.2.0",
+    "micromatch": "^4.0.7",
     "opener": "^1.5.2",
     "prompts": "2.1.0",
     "ts-morph": "^15.1.0",
@@ -55,7 +56,8 @@
     "vite-tsconfig-paths": "^4.3.2"
   },
   "devDependencies": {
-    "@tamagui/build": "1.100.6",
+    "@tamagui/build": "1.101.0",
+    "@types/chokidar": "^2.1.3",
     "@types/marked": "^5.0.0"
   }
 }

package/src/add.ts

@@ -6,12 +6,14 @@ import path from 'node:path'
 
 import chalk from 'chalk'
 import { pascalCase } from 'change-case'
-import { copy, ensureDir, readFileSync } from 'fs-extra'
+import FSExtra from 'fs-extra'
 import { marked } from 'marked'
 import TerminalRenderer from 'marked-terminal'
 import open from 'opener'
 import prompts from 'prompts'
 
+const { copy, ensureDir, readFileSync } = FSExtra
+
 marked.setOptions({
   headerIds: false,
   mangle: false,

package/src/build.ts

@@ -1,51 +1,97 @@
-import { dirname, resolve } from 'path'
-
-import { createExtractor, extractToClassNames } from '@tamagui/static'
-import type { CLIResolvedOptions } from '@tamagui/types'
+import { dirname, basename, resolve, join, extname } from 'node:path'
+import {
+  createExtractor,
+  extractToClassNames,
+  extractToNative,
+  loadTamagui,
+  loadTamaguiBuildConfigSync,
+} from '@tamagui/static'
+import type { CLIResolvedOptions, TamaguiOptions } from '@tamagui/types'
 import chokidar from 'chokidar'
-import { readFile } from 'fs-extra'
-
-export const build = async (options: CLIResolvedOptions) => {
-  // const tamagui = await loadTamagui(options.tamaguiOptions)
+import { readFile, writeFile } from 'fs-extra'
+import MicroMatch from 'micromatch'
 
-  const entry = options.pkgJson.source
-  if (!entry) {
-    throw new Error(`Must add "source" to package.json pointing to your source directory`)
+export const build = async (
+  options: CLIResolvedOptions & {
+    target?: 'web' | 'native'
+    dir?: string
+    include?: string
+    exclude?: string
   }
-  const sourceDir = dirname(entry)
+) => {
+  const sourceDir = options.dir ?? '.'
   const promises: Promise<void>[] = []
-  const targets = ['web']
+
+  const buildOptions = loadTamaguiBuildConfigSync(options.tamaguiOptions)
+  const platform = options.target ?? 'web'
+  process.env.TAMAGUI_TARGET = platform
+
+  const tamaguiOptions = {
+    ...buildOptions,
+    platform,
+  } satisfies TamaguiOptions
+
+  // load once first
+  await loadTamagui(tamaguiOptions)
 
   await new Promise<void>((res) => {
     chokidar
       // prevent infinite loop but cause race condition if you just build directly
-      .watch(sourceDir, {
+      .watch(`${sourceDir}/**/*.tsx`, {
         // persistent: true,
       })
       .on('add', (relativePath) => {
+        if (options.exclude) {
+          if (MicroMatch.contains(relativePath, options.exclude)) {
+            return
+          }
+        }
+        if (options.include) {
+          if (!MicroMatch.contains(relativePath, options.include)) {
+            return
+          }
+        }
+
         const sourcePath = resolve(process.cwd(), relativePath)
+        console.info(` [tamagui] optimizing ${sourcePath}`)
 
         promises.push(
           (async () => {
-            await Promise.all(
-              targets.map(async (target) => {
-                process.env.TAMAGUI_TARGET = target
-                if (options.debug) {
-                  process.env.NODE_ENV ||= 'development'
-                }
-                const source = await readFile(sourcePath, 'utf-8')
-                const extractor = createExtractor()
-                const out = await extractToClassNames({
-                  extractor,
-                  source,
-                  sourcePath,
-                  options: options.tamaguiOptions,
-                  shouldPrintDebug: options.debug || false,
-                })
-
-                // await writeFile()
+            if (options.debug) {
+              process.env.NODE_ENV ||= 'development'
+            }
+            const source = await readFile(sourcePath, 'utf-8')
+
+            if (platform === 'web') {
+              const extractor = createExtractor({
+                platform,
               })
-            )
+
+              const out = await extractToClassNames({
+                extractor,
+                source,
+                sourcePath,
+                options: buildOptions,
+                shouldPrintDebug: options.debug || false,
+              })
+
+              if (!out) {
+                return
+              }
+
+              const cssName = '_' + basename(sourcePath, extname(sourcePath))
+              const stylePath = join(dirname(sourcePath), cssName + '.css')
+              const code = `import "./${cssName}.css"\n${out.js}`
+
+              await Promise.all([
+                writeFile(sourcePath, code, 'utf-8'),
+                writeFile(stylePath, out.styles, 'utf-8'),
+              ])
+            }
+
+            // native
+            const out = extractToNative(sourcePath, source, tamaguiOptions)
+            await writeFile(sourcePath, out.code, 'utf-8')
           })()
         )
       })

package/src/cli.ts

@@ -137,23 +137,33 @@ const COMMAND_MAP = {
     },
   },
 
-  // build: {
-  //   shorthands: ['b'],
-  //   description: `Use to pre-build a Tamagui component directory`,
-  //   flags: {
-  //     '--help': Boolean,
-  //     '--debug': Boolean,
-  //     '--verbose': Boolean,
-  //   },
-  //   async run() {
-  //     const { _, ...flags } = arg(this.flags)
-  //     const { build } = await import('./build')
-  //     const options = await getOptions({
-  //       debug: flags['--debug'] ? (flags['--verbose'] ? 'verbose' : true) : false,
-  //     })
-  //     await build(options)
-  //   },
-  // },
+  build: {
+    shorthands: ['b'],
+    description: `Use to pre-build a Tamagui component directory`,
+    flags: {
+      '--help': Boolean,
+      '--debug': Boolean,
+      '--verbose': Boolean,
+      '--target': String,
+      '--include': String,
+      '--exclude': String,
+    },
+    async run() {
+      const { _, ...flags } = arg(this.flags)
+      const [_command, dir] = _
+      const imported = await import('./build.js')
+      const options = await getOptions({
+        debug: flags['--debug'] ? (flags['--verbose'] ? 'verbose' : true) : false,
+      })
+      await imported['default'].build({
+        ...options,
+        dir,
+        include: flags['--include'],
+        target: flags['--target'] || 'web',
+        exclude: flags['--exclude'],
+      })
+    },
+  },
 
   // update: {
   //   shorthands: [],
@@ -238,12 +248,12 @@ const {
 )
 
 if (flags['--version']) {
-  console.log(require('../package.json').version)
+  console.info(require('../package.json').version)
   process.exit(0)
 }
 
 if (!command && flags['--help']) {
-  console.log(`$ tamagui
+  console.info(`$ tamagui
 
 commands:
 
@@ -267,8 +277,8 @@ main()
 
 async function main() {
   if (flags['--help']) {
-    console.log(`\n$ tamagui ${command}: ${definition.description}\n`)
-    console.log(
+    console.info(`\n$ tamagui ${command}: ${definition.description}\n`)
+    console.info(
       `Flags: ${Object.entries(definition.flags).map(([k, v]) => `${k} (${v.name})`)}`
     )
     process.exit(0)
@@ -278,7 +288,7 @@ async function main() {
 
   // help for any command
   if (cmdFlags['--help']) {
-    console.log(`$ tamagui ${_}
+    console.info(`$ tamagui ${_}
 
     Flags: ${JSON.stringify(cmdFlags, null, 2)}
 
@@ -297,7 +307,7 @@ async function main() {
 
 function showHelp(definition: CommandDefinition, flags: { '--help'?: boolean }) {
   if (flags['--help']) {
-    console.log(`$ ${definition}`)
+    console.info(`$ ${definition}`)
   }
 }
 

package/types/add.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../src/add.ts"],"names":[],"mappings":"AAuBA,eAAO,MAAM,qBAAqB,2BAA4B,CAAA;AAC9D,eAAO,MAAM,uBAAuB,SAAgB,MAAM,iBAAiB,MAAM,kBAqGhF,CAAA"}
+{"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../src/add.ts"],"names":[],"mappings":"AAyBA,eAAO,MAAM,qBAAqB,2BAA4B,CAAA;AAC9D,eAAO,MAAM,uBAAuB,SAAgB,MAAM,iBAAiB,MAAM,kBAqGhF,CAAA"}

package/types/build.d.ts

@@ -1,3 +1,8 @@
 import type { CLIResolvedOptions } from '@tamagui/types';
-export declare const build: (options: CLIResolvedOptions) => Promise<void>;
+export declare const build: (options: CLIResolvedOptions & {
+    target?: 'web' | 'native';
+    dir?: string;
+    include?: string;
+    exclude?: string;
+}) => Promise<void>;
 //# sourceMappingURL=build.d.ts.map

package/types/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAIxD,eAAO,MAAM,KAAK,YAAmB,kBAAkB,kBAkDtD,CAAA"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,kBAAkB,EAAkB,MAAM,gBAAgB,CAAA;AAKxE,eAAO,MAAM,KAAK,YACP,kBAAkB,GAAG;IAC5B,MAAM,CAAC,EAAE,KAAK,GAAG,QAAQ,CAAA;IACzB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,kBAoFF,CAAA"}