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

package/dist/checkDeps.cjs

@@ -28,40 +28,173 @@ var import_node_fs = require("node:fs"),
   import_node_path = require("node:path"),
   import_check_dep_versions = require("./check-dep-versions.cjs"),
   DEPENDENCY_TYPE = /* @__PURE__ */(DEPENDENCY_TYPE2 => (DEPENDENCY_TYPE2.dependencies = "dependencies", DEPENDENCY_TYPE2.devDependencies = "devDependencies", DEPENDENCY_TYPE2.optionalDependencies = "optionalDependencies", DEPENDENCY_TYPE2.peerDependencies = "peerDependencies", DEPENDENCY_TYPE2.resolutions = "resolutions", DEPENDENCY_TYPE2))(DEPENDENCY_TYPE || {});
-function checkTamaguiPackageVersions(root) {
-  const packageJsonPath = (0, import_node_path.join)(root, "package.json");
-  if (!(0, import_node_fs.existsSync)(packageJsonPath)) return "";
-  const packageJson = JSON.parse((0, import_node_fs.readFileSync)(packageJsonPath, "utf8")),
-    tamaguiDeps = [],
-    allDeps = {
-      ...packageJson.dependencies,
-      ...packageJson.devDependencies,
-      ...packageJson.optionalDependencies
-    };
-  for (const [name, version] of Object.entries(allDeps)) (name === "tamagui" || name.startsWith("@tamagui/")) && tamaguiDeps.push({
-    name,
-    version
-  });
-  if (tamaguiDeps.length <= 1) return "";
-  const normalizeVersion = v => v.startsWith("workspace:") ? v : v.replace(/^[\^~>=<]+/, ""),
-    versionGroups = /* @__PURE__ */new Map();
-  for (const dep of tamaguiDeps) {
-    const normalized = normalizeVersion(dep.version);
-    versionGroups.has(normalized) || versionGroups.set(normalized, []), versionGroups.get(normalized).push(`${dep.name}@${dep.version}`);
+const CRITICAL_PACKAGES = ["@tamagui/web", "@tamagui/core", "tamagui"];
+function checkDuplicateInstalls(root) {
+  const nodeModules = (0, import_node_path.join)(root, "node_modules");
+  if (!(0, import_node_fs.existsSync)(nodeModules)) return "";
+  const duplicates = /* @__PURE__ */new Map();
+  for (const pkg of CRITICAL_PACKAGES) {
+    const locations = findAllInstances(nodeModules, pkg);
+    if (locations.length > 1) {
+      const realPaths = /* @__PURE__ */new Set(),
+        distinctLocations = [];
+      for (const loc of locations) try {
+        const real = (0, import_node_fs.realpathSync)(loc);
+        realPaths.has(real) || (realPaths.add(real), distinctLocations.push((0, import_node_path.relative)(root, loc)));
+      } catch {
+        distinctLocations.push((0, import_node_path.relative)(root, loc));
+      }
+      distinctLocations.length > 1 && duplicates.set(pkg, distinctLocations);
+    }
   }
-  if (versionGroups.size <= 1) return "";
-  const lines = ["Found mismatched @tamagui/* package versions in package.json:", ""];
-  for (const [version, packages] of versionGroups) {
-    lines.push(`  ${version}:`);
-    for (const pkg of packages.sort()) lines.push(`    - ${pkg}`);
+  if (duplicates.size === 0) return "";
+  const lines = ["Found duplicate tamagui installations in node_modules:", "", "This causes multiple runtime instances, which breaks theme/config detection.", ""];
+  for (const [pkg, locations] of duplicates) {
+    lines.push(`  ${pkg}:`);
+    for (const loc of locations) {
+      const pkgJsonPath = (0, import_node_path.join)(root, loc, "package.json");
+      let version = "?";
+      try {
+        version = JSON.parse((0, import_node_fs.readFileSync)(pkgJsonPath, "utf8")).version;
+      } catch {}
+      lines.push(`    ${version} at ${loc}`);
+    }
+    lines.push("");
   }
-  return lines.push(""), lines.push("All @tamagui/* packages should use the same version to avoid runtime issues."), lines.push("Run `npx tamagui upgrade` to sync all packages to the latest version."), lines.join(`
+  return lines.push("Fix: run your package manager's dedupe command:"), lines.push("  bun install  (bun auto-dedupes)"), lines.push("  npx yarn-deduplicate && yarn install"), lines.push("  npm dedupe"), lines.push(""), lines.push("If that doesn't help, delete node_modules and lockfile, then reinstall."), lines.join(`
+`);
+}
+function findAllInstances(nodeModulesDir, packageName, found = [], depth = 0) {
+  if (depth > 4 || !(0, import_node_fs.existsSync)(nodeModulesDir)) return found;
+  const pkgDir = (0, import_node_path.join)(nodeModulesDir, ...packageName.split("/"));
+  (0, import_node_fs.existsSync)((0, import_node_path.join)(pkgDir, "package.json")) && found.push(pkgDir);
+  try {
+    const entries = (0, import_node_fs.readdirSync)(nodeModulesDir);
+    for (const entry of entries) if (!entry.startsWith(".")) if (entry.startsWith("@")) {
+      const scopeDir = (0, import_node_path.join)(nodeModulesDir, entry);
+      try {
+        const scopeEntries = (0, import_node_fs.readdirSync)(scopeDir);
+        for (const scopeEntry of scopeEntries) {
+          const nested = (0, import_node_path.join)(scopeDir, scopeEntry, "node_modules");
+          (0, import_node_fs.existsSync)(nested) && findAllInstances(nested, packageName, found, depth + 1);
+        }
+      } catch {}
+    } else {
+      const nested = (0, import_node_path.join)(nodeModulesDir, entry, "node_modules");
+      (0, import_node_fs.existsSync)(nested) && findAllInstances(nested, packageName, found, depth + 1);
+    }
+  } catch {}
+  return found;
+}
+function checkLockfileDuplicates(root) {
+  const bunLock = (0, import_node_path.join)(root, "bun.lock"),
+    yarnLock = (0, import_node_path.join)(root, "yarn.lock"),
+    npmLock = (0, import_node_path.join)(root, "package-lock.json");
+  return (0, import_node_fs.existsSync)(bunLock) ? checkBunLockDuplicates(bunLock) : (0, import_node_fs.existsSync)(yarnLock) ? checkYarnLockDuplicates(yarnLock) : (0, import_node_fs.existsSync)(npmLock) ? checkNpmLockDuplicates(npmLock) : "";
+}
+function checkBunLockDuplicates(lockPath) {
+  try {
+    const content = (0, import_node_fs.readFileSync)(lockPath, "utf8"),
+      duplicates = /* @__PURE__ */new Map(),
+      criticalSet = new Set(CRITICAL_PACKAGES),
+      packagePattern = /["'](@tamagui\/[\w-]+|tamagui)@([^"'\s,]+)["']/g;
+    let match;
+    for (; (match = packagePattern.exec(content)) !== null;) {
+      const name = match[1],
+        version = match[2];
+      version.startsWith("workspace:") || criticalSet.has(name) && (duplicates.has(name) || duplicates.set(name, /* @__PURE__ */new Set()), duplicates.get(name).add(version));
+    }
+    return formatLockfileDuplicates(duplicates, "bun.lock");
+  } catch {
+    return "";
+  }
+}
+function checkYarnLockDuplicates(lockPath) {
+  try {
+    const content = (0, import_node_fs.readFileSync)(lockPath, "utf8"),
+      duplicates = /* @__PURE__ */new Map(),
+      criticalSet = new Set(CRITICAL_PACKAGES),
+      entryPattern = /^"?(@tamagui\/[\w-]+|tamagui)@[^":\n]+[":]?\s*$/gm,
+      versionPattern = /^\s+version\s+"([^"]+)"/gm;
+    let entryMatch;
+    for (; (entryMatch = entryPattern.exec(content)) !== null;) {
+      const name = entryMatch[1];
+      if (!criticalSet.has(name)) continue;
+      versionPattern.lastIndex = entryMatch.index;
+      const verMatch = versionPattern.exec(content);
+      verMatch && (duplicates.has(name) || duplicates.set(name, /* @__PURE__ */new Set()), duplicates.get(name).add(verMatch[1]));
+    }
+    return formatLockfileDuplicates(duplicates, "yarn.lock");
+  } catch {
+    return "";
+  }
+}
+function checkNpmLockDuplicates(lockPath) {
+  try {
+    const lock = JSON.parse((0, import_node_fs.readFileSync)(lockPath, "utf8")),
+      duplicates = /* @__PURE__ */new Map(),
+      criticalSet = new Set(CRITICAL_PACKAGES),
+      packages = lock.packages || {};
+    for (const [path, info] of Object.entries(packages)) {
+      if (!path) continue;
+      const name = info.name || path.split("node_modules/").pop();
+      if (!name || !criticalSet.has(name)) continue;
+      const version = info.version;
+      version && (duplicates.has(name) || duplicates.set(name, /* @__PURE__ */new Set()), duplicates.get(name).add(version));
+    }
+    return formatLockfileDuplicates(duplicates, "package-lock.json");
+  } catch {
+    return "";
+  }
+}
+function formatLockfileDuplicates(duplicates, lockfileName) {
+  const multiVersion = /* @__PURE__ */new Map();
+  for (const [name, versions] of duplicates) versions.size > 1 && multiVersion.set(name, [...versions].sort());
+  if (multiVersion.size === 0) return "";
+  const lines = [`Found multiple resolved versions in ${lockfileName}:`, ""];
+  for (const [name, versions] of multiVersion) lines.push(`  ${name}: ${versions.join(", ")}`);
+  return lines.push(""), lines.push("Multiple versions cause duplicate runtime instances, breaking config/theme detection."), lines.push("Fix: ensure all tamagui packages use the same version range, then dedupe."), lines.join(`
+`);
+}
+function checkConfigExists(root) {
+  const configNames = ["tamagui.config.ts", "tamagui.config.tsx", "tamagui.config.js", "tamagui.config.mjs", "tamagui.config.cjs"],
+    searchDirs = [root, (0, import_node_path.join)(root, "src"), (0, import_node_path.join)(root, "app"), (0, import_node_path.join)(root, "config")];
+  for (const dir of searchDirs) for (const name of configNames) if ((0, import_node_fs.existsSync)((0, import_node_path.join)(dir, name))) return "";
+  const buildConfigNames = ["tamagui.build.ts", "tamagui.build.js", "tamagui.build.mjs", "tamagui.build.cjs"];
+  for (const name of buildConfigNames) {
+    const buildPath = (0, import_node_path.join)(root, name);
+    if ((0, import_node_fs.existsSync)(buildPath)) try {
+      const match = (0, import_node_fs.readFileSync)(buildPath, "utf8").match(/config\s*:\s*['"`]([^'"`]+)['"`]/);
+      if (match) {
+        const configPath = (0, import_node_path.join)(root, match[1]);
+        if ((0, import_node_fs.existsSync)(configPath)) return "";
+      }
+    } catch {}
+  }
+  const pkgJsonPath = (0, import_node_path.join)(root, "package.json");
+  if ((0, import_node_fs.existsSync)(pkgJsonPath)) try {
+    const pkg = JSON.parse((0, import_node_fs.readFileSync)(pkgJsonPath, "utf8"));
+    if (pkg.tamagui?.config) {
+      const configPath = (0, import_node_path.join)(root, pkg.tamagui.config);
+      if ((0, import_node_fs.existsSync)(configPath)) return "";
+    }
+  } catch {}
+  if ((0, import_node_fs.existsSync)(pkgJsonPath)) try {
+    if (JSON.parse((0, import_node_fs.readFileSync)(pkgJsonPath, "utf8")).workspaces) return "";
+  } catch {}
+  return ["No tamagui.config file found.", "", "Tamagui requires a config file (e.g. tamagui.config.ts) that calls createTamagui().", `Without it, components will throw "Can't find Tamagui configuration" at runtime.`, "", "See: https://tamagui.dev/docs/core/configuration"].join(`
 `);
 }
 async function checkDeps(root) {
-  const tamaguiMismatchSummary = checkTamaguiPackageVersions(root),
-    workspaceMismatchSummary = new import_check_dep_versions.CDVC(root).toMismatchSummary(),
-    hasTamaguiMismatch = !!tamaguiMismatchSummary,
-    hasWorkspaceMismatch = !!workspaceMismatchSummary;
-  !hasTamaguiMismatch && !hasWorkspaceMismatch && (console.info("Tamagui dependencies look good \u2705"), process.exit(0)), hasTamaguiMismatch && console.error(tamaguiMismatchSummary), hasWorkspaceMismatch && (hasTamaguiMismatch && console.error(""), console.error(workspaceMismatchSummary)), process.exit(1);
+  const issues = [],
+    workspaceMismatchSummary = new import_check_dep_versions.CDVC(root).toMismatchSummary();
+  workspaceMismatchSummary && issues.push(workspaceMismatchSummary);
+  const lockfileSummary = checkLockfileDuplicates(root);
+  lockfileSummary && issues.push(lockfileSummary);
+  const duplicatesSummary = checkDuplicateInstalls(root);
+  duplicatesSummary && issues.push(duplicatesSummary);
+  const configSummary = checkConfigExists(root);
+  configSummary && issues.push(configSummary), issues.length === 0 && (console.info("Tamagui dependencies look good \u2705"), process.exit(0));
+  for (let i = 0; i < issues.length; i++) i > 0 && console.error(""), console.error(issues[i]);
+  process.exit(1);
 }

package/dist/exports.cjs

@@ -21,7 +21,9 @@ var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
 }), mod);
 var exports_exports = {};
 __export(exports_exports, {
+  clearFormatCache: () => import_detectModuleFormat.clearFormatCache,
   createExtractor: () => import_createExtractor.createExtractor,
+  detectModuleFormat: () => import_detectModuleFormat.detectModuleFormat,
   literalToAst: () => import_literalToAst.literalToAst
 });
 module.exports = __toCommonJS(exports_exports);
@@ -38,4 +40,5 @@ __reExport(exports_exports, require("./extractor/loadTamagui.cjs"), module.expor
 __reExport(exports_exports, require("./extractor/watchTamaguiConfig.cjs"), module.exports);
 __reExport(exports_exports, require("./extractor/createLogger.cjs"), module.exports);
 __reExport(exports_exports, require("./registerRequire.cjs"), module.exports);
+var import_detectModuleFormat = require("./extractor/detectModuleFormat.cjs");
 __reExport(exports_exports, require("./getPragmaOptions.cjs"), module.exports);

package/dist/extractor/bundle.cjs

@@ -36,9 +36,10 @@ __export(bundle_exports, {
   esbundleTamaguiConfig: () => esbundleTamaguiConfig
 });
 module.exports = __toCommonJS(bundle_exports);
-var import_node_path = require("node:path"),
+var import_node_fs = require("node:fs"),
   import_esbuild = __toESM(require("esbuild")),
   FS = __toESM(require("fs-extra")),
+  import_detectModuleFormat = require("./detectModuleFormat.cjs"),
   import_esbuildAliasPlugin = require("./esbuildAliasPlugin.cjs"),
   import_loadTamagui = require("./loadTamagui.cjs"),
   import_esbuildTsconfigPaths = require("./esbuildTsconfigPaths.cjs");
@@ -74,11 +75,21 @@ function getESBuildConfig({
   resolvePlatformSpecificEntries,
   ...options
 }, platform, aliases) {
-  return process.env.DEBUG?.startsWith("tamagui") && console.info("Building", entryPoints), {
+  process.env.DEBUG?.startsWith("tamagui") && console.info("Building", entryPoints);
+  const resolvedEntryPoints = resolvePlatformSpecificEntries ? entryPoints.map(import_loadTamagui.resolveWebOrNativeSpecificEntry) : entryPoints,
+    detectedFormat = options.format || detectEntryFormat(resolvedEntryPoints[0]);
+  return {
     bundle: !0,
-    entryPoints: resolvePlatformSpecificEntries ? entryPoints.map(import_loadTamagui.resolveWebOrNativeSpecificEntry) : entryPoints,
-    format: "cjs",
-    target: "node20",
+    entryPoints: resolvedEntryPoints,
+    format: detectedFormat,
+    // for ESM: prefer "module" field for resolution, add require() shim for bundled CJS deps
+    ...(detectedFormat === "esm" ? {
+      mainFields: ["module", "main"],
+      banner: {
+        js: 'import { createRequire as __cr } from "module"; const require = __cr(import.meta.url);'
+      }
+    } : {}),
+    target: "node24",
     jsx: "transform",
     jsxFactory: "react",
     allowOverwrite: !0,
@@ -92,33 +103,59 @@ function getESBuildConfig({
     },
     loader: esbuildLoaderConfig,
     logLevel: "warning",
-    plugins: [(0, import_esbuildTsconfigPaths.TsconfigPathsPlugin)(), {
+    plugins: [(0, import_esbuildTsconfigPaths.TsconfigPathsPlugin)(),
+    // handle ESM-only features that can't be used with CJS output
+    {
+      name: "handle-esm-features",
+      setup(build) {
+        const isCjs = build.initialOptions.format === "cjs" || !build.initialOptions.format;
+        build.onLoad({
+          filter: /\.(ts|tsx|js|jsx|mjs)$/
+        }, args => {
+          if (!isCjs || args.path.includes("node_modules") && !args.path.includes("@tamagui")) return null;
+          let contents = (0, import_node_fs.readFileSync)(args.path, "utf8"),
+            modified = !1;
+          return contents.includes("import.meta.env") && (contents = contents.replace(/import\.meta\.env/g, "process.env"), modified = !0), contents.includes("import.meta.url") && (contents = contents.replace(/import\.meta\.url/g, '""'), modified = !0), contents.includes("import.meta.main") && (contents = contents.replace(/import\.meta\.main/g, "false"), modified = !0), /^\s*(?:const|let|var|export)\s+[^=]*=\s*await\b/m.test(contents) || /^await\s/m.test(contents) ? (process.env.DEBUG?.startsWith("tamagui") && console.info(`[tamagui] stubbing file with top-level await: ${args.path}`), {
+            contents: `// stubbed - contains top-level await
+module.exports = {}`,
+            loader: "js"
+          }) : modified ? {
+            contents,
+            loader: args.path.endsWith(".tsx") ? "tsx" : args.path.endsWith(".ts") ? "ts" : args.path.endsWith(".jsx") ? "jsx" : "js"
+          } : null;
+        });
+      }
+    }, {
       name: "external",
       setup(build) {
+        const proxyWormPath = require.resolve("@tamagui/proxy-worm");
         build.onResolve({
-          filter: /@tamagui\/core/
-        }, args => ({
-          path: platform === "native" ? "@tamagui/core/native" : "@tamagui/core",
+          filter: /^@tamagui\/(core|web)$/
+        }, args => args.kind === "entry-point" ? null : {
+          path: platform === "native" ? "@tamagui/core/native" : args.path,
           external: !0
-        })), build.onResolve({
+        }), build.onResolve({
           filter: /react-native\/package.json$/
-        }, args => ({
+        }, () => ({
           path: "react-native/package.json",
           external: !0
-        })), build.onResolve({
-          filter: /@tamagui\/web/
-        }, args => ({
-          path: platform === "native" ? "@tamagui/core/native" : "@tamagui/core",
-          external: !0
         })), build.onResolve({
           filter: /^(react-native|react-native\/.*)$/
-        }, args => ({
+        }, () => ({
           path: "@tamagui/react-native-web-lite",
           external: !0
         })), build.onResolve({
-          filter: /react-native-reanimated/
+          filter: /^react-native-reanimated(?:\/.*)?$/
+        }, () => ({
+          path: proxyWormPath
+        })), build.onResolve({
+          filter: /^react-native-worklets(?:\/.*)?$/
+        }, () => ({
+          path: proxyWormPath
+        })), build.onResolve({
+          filter: /^(framer-motion|motion)/
         }, args => ({
-          path: "react-native-reanimated",
+          path: args.path,
           external: !0
         }));
       }
@@ -128,21 +165,21 @@ function getESBuildConfig({
     ...options
   };
 }
-async function esbundleTamaguiConfig(props, platform, aliases) {
-  await asyncLock(props);
-  const config = getESBuildConfig(props, platform, aliases);
-  return await import_esbuild.default.build(config);
-}
-async function asyncLock(props) {
-  const lockFile = (0, import_node_path.join)((0, import_node_path.dirname)(props.outfile), (0, import_node_path.basename)(props.outfile, ".lock")),
-    lockStat = await FS.stat(lockFile).catch(() => {});
-  if ((lockStat ? (/* @__PURE__ */new Date()).getTime() - new Date(lockStat.mtime).getTime() : Number.POSITIVE_INFINITY) < 500) {
-    process.env.DEBUG?.startsWith("tamagui") && console.info("Waiting for existing build", props.entryPoints);
-    let tries = 5;
-    for (; tries--;) {
-      if (await FS.pathExists(props.outfile)) return;
-      await new Promise(res => setTimeout(res, 50));
-    }
+function detectEntryFormat(entryPoint) {
+  if (entryPoint.startsWith("/") || entryPoint.startsWith(".")) return (0, import_detectModuleFormat.detectModuleFormat)(entryPoint);
+  try {
+    const pkgJsonPath = require.resolve(entryPoint + "/package.json");
+    return JSON.parse((0, import_node_fs.readFileSync)(pkgJsonPath, "utf-8")).type === "module" ? "esm" : "cjs";
+  } catch {
+    return "cjs";
   }
-  FS.writeFile(lockFile, "");
+}
+async function esbundleTamaguiConfig(props, platform, aliases) {
+  const config = getESBuildConfig(props, platform, aliases),
+    tmpFile = props.outfile + ".tmp." + process.pid,
+    result = await import_esbuild.default.build({
+      ...config,
+      outfile: tmpFile
+    });
+  return await FS.rename(tmpFile, props.outfile), result;
 }