@tamagui/cli 1.141.5 → 1.143.0

package/dist/utils.native.js

@@ -0,0 +1,120 @@
+"use strict";
+
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf,
+  __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+    for (var name in all) __defProp(target, name, {
+      get: all[name],
+      enumerable: !0
+    });
+  },
+  __copyProps = (to, from, except, desc) => {
+    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+      get: () => from[key],
+      enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+    });
+    return to;
+  };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+    value: mod,
+    enumerable: !0
+  }) : target, mod)),
+  __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
+    value: !0
+  }), mod);
+var utils_exports = {};
+__export(utils_exports, {
+  disposeAll: () => disposeAll,
+  ensure: () => ensure,
+  getOptions: () => getOptions,
+  loadTamagui: () => loadTamagui,
+  registerDispose: () => registerDispose
+});
+module.exports = __toCommonJS(utils_exports);
+var import_static = require("@tamagui/static"),
+  import_chalk = __toESM(require("chalk")),
+  import_fs_extra = require("fs-extra"),
+  import_path = require("path");
+async function getOptions() {
+  var {
+      root = process.cwd(),
+      tsconfigPath = "tsconfig.json",
+      tamaguiOptions,
+      host,
+      debug,
+      loadTamaguiOptions
+    } = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {},
+    dotDir = (0, import_path.join)(root, ".tamagui"),
+    pkgJson = {},
+    config = "";
+  try {
+    config = await getDefaultTamaguiConfigPath(), pkgJson = await (0, import_fs_extra.readJSON)((0, import_path.join)(root, "package.json"));
+  } catch {}
+  var filledOptions = {
+      platform: "native",
+      components: ["tamagui"],
+      config,
+      ...tamaguiOptions
+    },
+    finalOptions = loadTamaguiOptions ? (0, import_static.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: (0, import_path.join)(dotDir, "tamagui.config.json"),
+      types: (0, import_path.join)(dotDir, "types.json")
+    }
+  };
+}
+function ensure(condition, message) {
+  condition || (console.error(import_chalk.default.red.bold("Error:"), import_chalk.default.yellow(`${message}`)), process.exit(1));
+}
+var defaultPaths = ["tamagui.config.ts", (0, import_path.join)("src", "tamagui.config.ts")],
+  cachedPath = "";
+async function getDefaultTamaguiConfigPath() {
+  if (cachedPath) return cachedPath;
+  var existingPaths = await Promise.all(defaultPaths.map(function (path) {
+      return (0, import_fs_extra.pathExists)(path);
+    })),
+    existing = existingPaths.findIndex(function (x) {
+      return !!x;
+    }),
+    found = defaultPaths[existing];
+  if (!found) throw new Error("No found tamagui.config.ts");
+  return cachedPath = found, found;
+}
+var loadTamagui = async function (opts) {
+    var _opts_config,
+      loaded = await (0, import_static.loadTamagui)({
+        components: ["tamagui"],
+        ...opts,
+        config: (_opts_config = opts.config) !== null && _opts_config !== void 0 ? _opts_config : await getDefaultTamaguiConfigPath()
+      });
+    return loaded;
+  },
+  disposers = /* @__PURE__ */new Set();
+function registerDispose(cb) {
+  disposers.add(cb);
+}
+function disposeAll() {
+  disposers.forEach(function (cb) {
+    return cb();
+  });
+}
+//# sourceMappingURL=utils.native.js.map

package/dist/utils.native.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","utils_exports","__export","disposeAll","ensure","getOptions","loadTamagui","registerDispose","module","exports","import_static","require","import_chalk","__toESM","import_fs_extra","import_path","root","process","cwd","tsconfigPath","tamaguiOptions","host","debug","loadTamaguiOptions","arguments","length","dotDir","join","pkgJson","config","getDefaultTamaguiConfigPath","readJSON","filledOptions","platform","components","finalOptions","loadTamaguiBuildConfigSync","mode","env","NODE_ENV","paths","conf","types","condition","message","console","error","default","red","bold","yellow","exit","defaultPaths","cachedPath","existingPaths","Promise","all","map","path","pathExists","existing","findIndex","x","found","Error","opts","_opts_config","loaded","disposers","Set"],"sources":["../src/utils.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/cli",
-  "version": "1.141.5",
+  "version": "1.143.0",
   "sideEffects": false,
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
@@ -21,14 +21,15 @@
     "build": "tamagui-build --skip-native",
     "watch": "yarn build --skip-native --watch",
     "clean": "tamagui-build clean",
-    "clean:build": "tamagui-build clean:build"
+    "clean:build": "tamagui-build clean:build",
+    "test": "vitest run"
   },
   "dependencies": {
-    "@tamagui/create-theme": "1.141.5",
-    "@tamagui/generate-themes": "1.141.5",
-    "@tamagui/static": "1.141.5",
-    "@tamagui/types": "1.141.5",
-    "@tamagui/vite-plugin": "1.141.5",
+    "@tamagui/create-theme": "1.143.0",
+    "@tamagui/generate-themes": "1.143.0",
+    "@tamagui/static": "1.143.0",
+    "@tamagui/types": "1.143.0",
+    "@tamagui/vite-plugin": "1.143.0",
     "arg": "^5.0.2",
     "chalk": "^4.1.2",
     "change-case": "^4.1.2",
@@ -47,8 +48,9 @@
     "url": "^0.11.0"
   },
   "devDependencies": {
-    "@tamagui/build": "1.141.5",
+    "@tamagui/build": "1.143.0",
     "@types/chokidar": "^2.1.3",
-    "@types/marked": "^5.0.0"
+    "@types/marked": "^5.0.0",
+    "vitest": "^4.0.4"
   }
 }

package/src/build.ts

@@ -33,6 +33,23 @@ export type BuildResult = {
   trackedFiles: TrackedFile[]
 }
 
+/**
+ * Inserts a CSS import statement into JS code, placing it after any
+ * 'use client' or 'use server' directives at the top of the file.
+ */
+export function insertCssImport(jsContent: string, cssImport: string): string {
+  // Match 'use client' or 'use server' directives at the start of the file
+  // Only consume one optional semicolon and one optional newline to preserve formatting
+  const directiveMatch = jsContent.match(/^(['"])use (client|server)\1;?\n?/)
+  if (directiveMatch) {
+    // Directive found at start - insert CSS import after it
+    const directive = directiveMatch[0]
+    const rest = jsContent.slice(directive.length)
+    return `${directive}${cssImport}\n${rest}`
+  }
+  return `${cssImport}\n${jsContent}`
+}
+
 export const build = async (
   options: CLIResolvedOptions & {
     target?: 'web' | 'native' | 'both'
@@ -213,7 +230,9 @@ export const build = async (
 
             const cssName = '_' + basename(sourcePath, extname(sourcePath))
             const stylePath = join(dirname(sourcePath), cssName + '.css')
-            const code = `import "./${cssName}.css"\n${out.js}`
+            const cssImport = `import "./${cssName}.css"`
+            const jsContent = typeof out.js === 'string' ? out.js : out.js.toString('utf-8')
+            const code = insertCssImport(jsContent, cssImport)
 
             // Track original file before modifying
             await trackFile(sourcePath)

package/types/build.d.ts

@@ -15,6 +15,11 @@ export type BuildResult = {
     stats: BuildStats;
     trackedFiles: TrackedFile[];
 };
+/**
+ * Inserts a CSS import statement into JS code, placing it after any
+ * 'use client' or 'use server' directives at the top of the file.
+ */
+export declare function insertCssImport(jsContent: string, cssImport: string): string;
 export declare const build: (options: CLIResolvedOptions & {
     target?: "web" | "native" | "both";
     dir?: string;

package/types/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,kBAAkB,EAAkB,MAAM,gBAAgB,CAAA;AASxE,MAAM,MAAM,UAAU,GAAG;IACvB,cAAc,EAAE,MAAM,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,YAAY,EAAE,MAAM,CAAA;IACpB,eAAe,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,UAAU,CAAA;IACjB,YAAY,EAAE,WAAW,EAAE,CAAA;CAC5B,CAAA;AAED,eAAO,MAAM,KAAK,GAChB,SAAS,kBAAkB,GAAG;IAC5B,MAAM,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAA;IAClC,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;CACtB,KACA,OAAO,CAAC,WAAW,CAmRrB,CAAA"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,kBAAkB,EAAkB,MAAM,gBAAgB,CAAA;AASxE,MAAM,MAAM,UAAU,GAAG;IACvB,cAAc,EAAE,MAAM,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,YAAY,EAAE,MAAM,CAAA;IACpB,eAAe,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,UAAU,CAAA;IACjB,YAAY,EAAE,WAAW,EAAE,CAAA;CAC5B,CAAA;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAW5E;AAED,eAAO,MAAM,KAAK,GAChB,SAAS,kBAAkB,GAAG;IAC5B,MAAM,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAA;IAClC,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;CACtB,KACA,OAAO,CAAC,WAAW,CAqRrB,CAAA"}