@tamagui/cli 2.0.0-rc.3 → 2.0.0-rc.30

package/dist/build.cjs

@@ -56,8 +56,21 @@ ${jsContent}`;
 }
 const build = async options => {
   const sourceDir = options.dir ?? ".",
+    outputDir = options.output,
+    outputAround = options.outputAround || !1,
     promises = [],
-    buildOptions = (0, import_static.loadTamaguiBuildConfigSync)(options.tamaguiOptions),
+    isDryRun = options.dryRun || !1;
+  isDryRun && console.info(`[dry-run] no files will be written
+`), outputDir && (await (0, import_fs_extra.mkdir)(outputDir, {
+    recursive: !0
+  }));
+  const loadedOptions = (0, import_static.loadTamaguiBuildConfigSync)(options.tamaguiOptions);
+  loadedOptions.disable && console.warn('[tamagui] Note: "disable" option in tamagui.build.ts is being ignored for CLI build command');
+  const buildOptions = {
+      ...loadedOptions,
+      disable: !1,
+      disableExtraction: !1
+    },
     targets = options.target === "both" || !options.target ? ["web", "native"] : [options.target],
     webTamaguiOptions = {
       ...buildOptions,
@@ -67,12 +80,15 @@ const build = async options => {
   const allFiles = [],
     watchPattern = sourceDir.match(/\.(tsx|jsx)$/) ? sourceDir : `${sourceDir}/**/*.{tsx,jsx}`;
   await new Promise(res => {
-    import_chokidar.default.watch(watchPattern, {
+    const watcher = import_chokidar.default.watch(watchPattern, {
       ignoreInitial: !1
-    }).on("add", relativePath => {
+    });
+    watcher.on("add", relativePath => {
       const sourcePath = (0, import_node_path.resolve)(process.cwd(), relativePath);
       options.exclude && import_micromatch.default.contains(relativePath, options.exclude) || options.include && !import_micromatch.default.contains(relativePath, options.include) || allFiles.push(sourcePath);
-    }).on("ready", () => res());
+    }).on("ready", () => {
+      watcher.close().then(() => res());
+    });
   });
   const fileToTargets = /* @__PURE__ */new Map();
   for (const sourcePath of allFiles) {
@@ -122,7 +138,8 @@ const build = async options => {
   for (const [sourcePath, filePlatforms] of fileToTargets) promises.push((async () => {
     options.debug && (process.env.NODE_ENV ||= "development");
     const originalSource = await (0, import_fs_extra.readFile)(sourcePath, "utf-8");
-    if (filePlatforms.includes("web")) {
+    if (isDryRun && console.info(`
+${sourcePath} [${filePlatforms.join(", ")}]`), filePlatforms.includes("web")) {
       process.env.TAMAGUI_TARGET = "web";
       const extractor = (0, import_static.createExtractor)({
           platform: "web"
@@ -138,19 +155,33 @@ const build = async options => {
           shouldPrintDebug: options.debug || !1
         });
       if (out) {
-        stats.filesProcessed++, stats.optimized += out.stats.optimized, stats.flattened += out.stats.flattened, stats.styled += out.stats.styled, stats.found += out.stats.found;
-        const cssName = "_" + (0, import_node_path.basename)(sourcePath, (0, import_node_path.extname)(sourcePath)),
-          stylePath = (0, import_node_path.join)((0, import_node_path.dirname)(sourcePath), cssName + ".css"),
-          cssImport = `import "./${cssName}.css"`,
-          jsContent = typeof out.js == "string" ? out.js : out.js.toString("utf-8"),
-          code = insertCssImport(jsContent, cssImport);
-        await trackFile(sourcePath), await (0, import_fs_extra.writeFile)(sourcePath, code, "utf-8"), await recordMtime(sourcePath), await (0, import_fs_extra.writeFile)(stylePath, out.styles, "utf-8"), trackedFiles.push({
-          path: stylePath,
-          hardlinkPath: "",
-          // Empty means delete on restore
-          mtimeAfterWrite: (await (0, import_fs_extra.stat)(stylePath)).mtimeMs
-        });
-      }
+        if (stats.filesProcessed++, stats.optimized += out.stats.optimized, stats.flattened += out.stats.flattened, stats.styled += out.stats.styled, stats.found += out.stats.found, isDryRun) {
+          const jsContent = typeof out.js == "string" ? out.js : out.js.toString("utf-8");
+          out.styles && console.info(`
+css:
+${out.styles}`), console.info(`
+js:
+${jsContent}`);
+        } else {
+          const relPath = outputDir ? (0, import_node_path.relative)((0, import_node_path.resolve)(sourceDir), sourcePath) : (0, import_node_path.basename)(sourcePath),
+            cssName = "_" + (0, import_node_path.basename)(sourcePath, (0, import_node_path.extname)(sourcePath)),
+            outputBase = outputDir ? (0, import_node_path.join)(outputDir, (0, import_node_path.dirname)(relPath)) : (0, import_node_path.dirname)(sourcePath);
+          outputDir && (await (0, import_fs_extra.mkdir)(outputBase, {
+            recursive: !0
+          }));
+          const stylePath = (0, import_node_path.join)(outputBase, cssName + ".css"),
+            cssImport = `import "./${cssName}.css"`,
+            jsContent = typeof out.js == "string" ? out.js : out.js.toString("utf-8"),
+            code = insertCssImport(jsContent, cssImport),
+            webOutputPath = outputDir ? (0, import_node_path.join)(outputDir, relPath) : sourcePath;
+          outputDir || (await trackFile(sourcePath)), await (0, import_fs_extra.writeFile)(webOutputPath, code, "utf-8"), outputDir || (await recordMtime(sourcePath)), await (0, import_fs_extra.writeFile)(stylePath, out.styles, "utf-8"), outputDir || trackedFiles.push({
+            path: stylePath,
+            hardlinkPath: "",
+            // Empty means delete on restore
+            mtimeAfterWrite: (await (0, import_fs_extra.stat)(stylePath)).mtimeMs
+          });
+        }
+      } else isDryRun && console.info("  web: no output");
     }
     if (filePlatforms.includes("native")) {
       process.env.TAMAGUI_TARGET = "native";
@@ -159,16 +190,39 @@ const build = async options => {
           platform: "native"
         },
         nativeOut = (0, import_static.extractToNative)(sourcePath, originalSource, nativeTamaguiOptions);
-      let nativeOutputPath = sourcePath;
-      !/\.(web|native|ios|android)\.(tsx|jsx)$/.test(sourcePath) && filePlatforms.length > 1 && (nativeOutputPath = sourcePath.replace(/\.(tsx|jsx)$/, ".native.$1")), nativeOut.code && ((nativeOutputPath === sourcePath || filePlatforms.length === 1) && (await trackFile(nativeOutputPath)), await (0, import_fs_extra.writeFile)(nativeOutputPath, nativeOut.code, "utf-8"), await recordMtime(nativeOutputPath), nativeOutputPath !== sourcePath && filePlatforms.length > 1 && trackedFiles.push({
-        path: nativeOutputPath,
-        hardlinkPath: "",
-        // Empty = delete on restore
-        mtimeAfterWrite: (await (0, import_fs_extra.stat)(nativeOutputPath)).mtimeMs
-      }));
+      if (isDryRun) nativeOut.code ? console.info(`
+native:
+${nativeOut.code}`) : console.info("  native: no output");else {
+        let nativeOutputPath = sourcePath;
+        const needsNativeSuffix = !/\.(web|native|ios|android)\.(tsx|jsx)$/.test(sourcePath) && (filePlatforms.length > 1 || outputAround);
+        if (outputAround) {
+          if (nativeOutputPath = sourcePath.replace(/\.(tsx|jsx)$/, ".native.$1"), await (0, import_fs_extra.stat)(nativeOutputPath).catch(() => null)) throw new Error(`--output-around: ${nativeOutputPath} already exists. Remove it first or use --output instead.`);
+        } else if (outputDir) {
+          const relPath = (0, import_node_path.relative)((0, import_node_path.resolve)(sourceDir), sourcePath),
+            outputRelPath = needsNativeSuffix ? relPath.replace(/\.(tsx|jsx)$/, ".native.$1") : relPath;
+          nativeOutputPath = (0, import_node_path.join)(outputDir, outputRelPath), await (0, import_fs_extra.mkdir)((0, import_node_path.dirname)(nativeOutputPath), {
+            recursive: !0
+          });
+        } else needsNativeSuffix && (nativeOutputPath = sourcePath.replace(/\.(tsx|jsx)$/, ".native.$1"));
+        if (nativeOut.code) {
+          if (nativeOut.code.includes("__ReactNativeStyleSheet") || nativeOut.code.includes("_withStableStyle")) {
+            stats.filesProcessed++;
+            const wrapperMatches = nativeOut.code.match(/_withStableStyle/g);
+            wrapperMatches && (stats.flattened += wrapperMatches.length);
+          }
+          !outputDir && !outputAround && (nativeOutputPath === sourcePath || filePlatforms.length === 1) && (await trackFile(nativeOutputPath)), await (0, import_fs_extra.writeFile)(nativeOutputPath, nativeOut.code, "utf-8"), !outputDir && !outputAround && (await recordMtime(nativeOutputPath)), !outputDir && !outputAround && nativeOutputPath !== sourcePath && filePlatforms.length > 1 && trackedFiles.push({
+            path: nativeOutputPath,
+            hardlinkPath: "",
+            // Empty = delete on restore
+            mtimeAfterWrite: (await (0, import_fs_extra.stat)(nativeOutputPath)).mtimeMs
+          }), outputAround && console.info(`  \u2192 ${nativeOutputPath}`);
+        }
+      }
     }
   })());
-  if (await Promise.all(promises), options.expectOptimizations !== void 0) {
+  if (await Promise.all(promises), isDryRun && console.info(`
+${stats.filesProcessed} files | ${stats.found} found | ${stats.optimized} optimized | ${stats.flattened} flattened | ${stats.styled} styled
+`), options.expectOptimizations !== void 0) {
     const totalOptimizations = stats.optimized + stats.flattened;
     totalOptimizations < options.expectOptimizations && (console.error(`
 Expected at least ${options.expectOptimizations} optimizations but only got ${totalOptimizations}`), console.error(`Stats: ${JSON.stringify(stats, null, 2)}`), process.exit(1)), console.info(`

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();
@@ -32,7 +30,7 @@ var import_arg = __toESM(require("arg")),
 });
 const COMMAND_MAP = {
     check: {
-      description: "Checks your dependencies for inconsistent versions.",
+      description: "Checks for inconsistent versions, duplicate installs, lockfile issues, and missing config.",
       shorthands: [],
       flags: {
         "--help": Boolean,
@@ -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,
@@ -168,9 +174,12 @@ const COMMAND_MAP = {
         "--help": Boolean,
         "--debug": Boolean,
         "--verbose": Boolean,
+        "--dry-run": Boolean,
         "--target": String,
         "--include": String,
         "--exclude": String,
+        "--output": String,
+        "--output-around": Boolean,
         "--expect-optimizations": Number
       },
       async run() {
@@ -186,11 +195,13 @@ const COMMAND_MAP = {
             ...flags2
           } = (0, import_arg.default)(this.flags),
           [_command, dir] = _,
+          dryRun = flags2["--dry-run"] || !1,
+          debug = flags2["--debug"] ? flags2["--verbose"] ? "verbose" : !0 : !1,
           {
             build
           } = require("./build.cjs"),
           options = await (0, import_utils.getOptions)({
-            debug: flags2["--debug"] ? flags2["--verbose"] ? "verbose" : !0 : !1
+            debug
           });
         await build({
           ...options,
@@ -198,8 +209,11 @@ const COMMAND_MAP = {
           include: flags2["--include"],
           target: flags2["--target"] || "both",
           exclude: flags2["--exclude"],
+          output: flags2["--output"],
+          outputAround: flags2["--output-around"],
           expectOptimizations: flags2["--expect-optimizations"],
-          runCommand
+          runCommand,
+          dryRun
         });
       }
     },

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.3",
+  "version": "2.0.0-rc.30",
   "bin": {
     "tama": "./dist/index.cjs",
     "tamagui": "./dist/index.cjs"
@@ -22,14 +22,15 @@
     "watch": "bun run build --skip-native --watch",
     "clean": "tamagui-build clean",
     "clean:build": "tamagui-build clean:build",
-    "test": "vitest run"
+    "test": "vitest run",
+    "test:web": "bun run test"
   },
   "dependencies": {
-    "@tamagui/create-theme": "2.0.0-rc.3",
-    "@tamagui/generate-themes": "2.0.0-rc.3",
-    "@tamagui/static": "2.0.0-rc.3",
-    "@tamagui/types": "2.0.0-rc.3",
-    "@tamagui/vite-plugin": "2.0.0-rc.3",
+    "@tamagui/create-theme": "2.0.0-rc.30",
+    "@tamagui/generate-themes": "2.0.0-rc.30",
+    "@tamagui/static": "2.0.0-rc.30",
+    "@tamagui/types": "2.0.0-rc.30",
+    "@tamagui/vite-plugin": "2.0.0-rc.30",
     "arg": "^5.0.2",
     "chalk": "^4.1.2",
     "change-case": "^4.1.2",
@@ -48,7 +49,7 @@
     "url": "^0.11.0"
   },
   "devDependencies": {
-    "@tamagui/build": "2.0.0-rc.3",
+    "@tamagui/build": "2.0.0-rc.30",
     "@types/chokidar": "^2.1.3",
     "@types/marked": "^5.0.0",
     "vitest": "4.0.4"