@tamagui/static 2.0.0-rc.4 → 2.0.0-rc.40

package/dist/extractor/regenerateConfig.cjs

@@ -2,33 +2,35 @@ 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 __getProtoOf = Object.getPrototypeOf;
+var __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, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  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);
+// 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: true
+}) : target, mod));
+var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
+  value: true
+}), mod);
 var regenerateConfig_exports = {};
 __export(regenerateConfig_exports, {
   generateTamaguiThemes: () => generateTamaguiThemes,
@@ -36,99 +38,125 @@ __export(regenerateConfig_exports, {
   regenerateConfigSync: () => regenerateConfigSync
 });
 module.exports = __toCommonJS(regenerateConfig_exports);
-var import_node_path = require("node:path"),
-  import_generate_themes = require("@tamagui/generate-themes"),
-  FS = __toESM(require("fs-extra")),
-  import_requireTamaguiCore = require("../helpers/requireTamaguiCore.cjs"),
-  import_bundleConfig = require("./bundleConfig.cjs");
-const tamaguiDir = (0, import_node_path.join)(process.cwd(), ".tamagui"),
-  confFile = (0, import_node_path.join)(tamaguiDir, "tamagui.config.json");
-async function regenerateConfig(tamaguiOptions, configIn, rebuild = !1) {
+var import_node_path = require("node:path");
+var import_generate_themes = require("@tamagui/generate-themes");
+var FS = __toESM(require("fs-extra"));
+var import_requireTamaguiCore = require("../helpers/requireTamaguiCore.cjs");
+var import_bundleConfig = require("./bundleConfig.cjs");
+const tamaguiDir = (0, import_node_path.join)(process.cwd(), ".tamagui");
+const confFile = (0, import_node_path.join)(tamaguiDir, "tamagui.config.json");
+async function regenerateConfig(tamaguiOptions, configIn, rebuild = false) {
   try {
     const config = configIn ?? (await (0, import_bundleConfig.getBundledConfig)(tamaguiOptions, rebuild));
     if (!config) return;
     const out = transformConfig(config, tamaguiOptions.platform || "web");
-    await FS.ensureDir((0, import_node_path.dirname)(confFile)), await FS.writeJSON(confFile, out, {
+    await FS.ensureDir((0, import_node_path.dirname)(confFile));
+    await FS.writeJSON(confFile, out, {
       spaces: 2
     });
   } catch (err) {
-    (process.env.DEBUG?.includes("tamagui") || process.env.IS_TAMAGUI_DEV) && console.warn("regenerateConfig error", err);
+    if (process.env.DEBUG?.includes("tamagui") || process.env.IS_TAMAGUI_DEV) {
+      console.warn("regenerateConfig error", err);
+    }
   }
 }
 function regenerateConfigSync(_tamaguiOptions, config) {
   try {
-    FS.ensureDirSync((0, import_node_path.dirname)(confFile)), FS.writeJSONSync(confFile, transformConfig(config, _tamaguiOptions.platform || "web"), {
+    FS.ensureDirSync((0, import_node_path.dirname)(confFile));
+    FS.writeJSONSync(confFile, transformConfig(config, _tamaguiOptions.platform || "web"), {
       spaces: 2
     });
   } catch (err) {
-    (process.env.DEBUG?.includes("tamagui") || process.env.IS_TAMAGUI_DEV) && console.warn("regenerateConfig error", err);
+    if (process.env.DEBUG?.includes("tamagui") || process.env.IS_TAMAGUI_DEV) {
+      console.warn("regenerateConfig error", err);
+    }
   }
 }
-async function generateTamaguiThemes(tamaguiOptions, force = !1) {
-  if (!tamaguiOptions.themeBuilder) return;
+async function generateTamaguiThemes(tamaguiOptions, force = false) {
+  if (!tamaguiOptions.themeBuilder) {
+    return;
+  }
   const {
-      input,
-      output
-    } = tamaguiOptions.themeBuilder,
-    inPath = resolveRelativePath(input),
-    outPath = resolveRelativePath(output),
-    generatedOutput = await (0, import_generate_themes.generateThemes)(inPath),
-    hasChanged = force || (await (async () => {
-      try {
-        if (!generatedOutput) return !1;
-        const next = generatedOutput.generated,
-          current = await FS.readFile(outPath, "utf-8");
-        return next !== current;
-      } catch {}
-      return !0;
-    })());
-  return hasChanged && (await (0, import_generate_themes.writeGeneratedThemes)(tamaguiDir, outPath, generatedOutput)), hasChanged;
+    input,
+    output
+  } = tamaguiOptions.themeBuilder;
+  const inPath = resolveRelativePath(input);
+  const outPath = resolveRelativePath(output);
+  const generatedOutput = await (0, import_generate_themes.generateThemes)(inPath);
+  const hasChanged = force || (await (async () => {
+    try {
+      if (!generatedOutput) return false;
+      const next = generatedOutput.generated;
+      const current = await FS.readFile(outPath, "utf-8");
+      return next !== current;
+    } catch (err) {}
+    return true;
+  })());
+  if (hasChanged) {
+    await (0, import_generate_themes.writeGeneratedThemes)(tamaguiDir, outPath, generatedOutput);
+  }
+  return hasChanged;
 }
 const resolveRelativePath = inputPath => inputPath.startsWith(".") ? (0, import_node_path.join)(process.cwd(), inputPath) : require.resolve(inputPath);
 function cloneDeepSafe(x, excludeKeys = {}) {
-  return x && (Array.isArray(x) ? x.map(_ => cloneDeepSafe(_)) : typeof x == "function" ? "Function" : typeof x != "object" ? x : "$$typeof" in x ? "Component" : Object.fromEntries(Object.entries(x).flatMap(([k, v]) => excludeKeys[k] ? [] : [[k, cloneDeepSafe(v)]])));
+  if (!x) return x;
+  if (Array.isArray(x)) return x.map(_ => cloneDeepSafe(_));
+  if (typeof x === "function") return `Function`;
+  if (typeof x !== "object") return x;
+  if ("$$typeof" in x) return "Component";
+  return Object.fromEntries(Object.entries(x).flatMap(([k, v]) => excludeKeys[k] ? [] : [[k, cloneDeepSafe(v)]]));
 }
 function transformConfig(config, platform) {
-  if (!config) return null;
+  if (!config) {
+    return null;
+  }
+  const {
+    getVariableValue
+  } = (0, import_requireTamaguiCore.requireTamaguiCore)(platform);
+  const next = cloneDeepSafe(config, {
+    validStyles: true
+  });
   const {
-      getVariableValue
-    } = (0, import_requireTamaguiCore.requireTamaguiCore)(platform),
-    next = cloneDeepSafe(config, {
-      validStyles: !0
-    }),
-    {
-      components,
-      nameToPaths,
-      tamaguiConfig
-    } = next,
-    {
-      themes,
-      tokens
-    } = tamaguiConfig;
+    components,
+    nameToPaths,
+    tamaguiConfig
+  } = next;
+  const {
+    themes,
+    tokens
+  } = tamaguiConfig;
   for (const key in themes) {
     const theme = themes[key];
     theme.id = key;
-    for (const tkey in theme) theme[tkey] = getVariableValue(theme[tkey]);
+    for (const tkey in theme) {
+      theme[tkey] = getVariableValue(theme[tkey]);
+    }
   }
   for (const key in tokens) {
     const token = {
       ...tokens[key]
     };
-    for (const tkey in token) token[tkey] = getVariableValue(token[tkey]);
+    for (const tkey in token) {
+      token[tkey] = getVariableValue(token[tkey]);
+    }
   }
-  for (const component of components) for (const _ in component.nameToInfo) {
-    const compDefinition = {
-      ...component.nameToInfo[_]
-    };
-    component.nameToInfo[_] = compDefinition;
-    const {
-      parentStaticConfig,
-      ...rest
-    } = compDefinition.staticConfig;
-    compDefinition.staticConfig = rest;
+  for (const component of components) {
+    for (const _ in component.nameToInfo) {
+      const compDefinition = {
+        ...component.nameToInfo[_]
+      };
+      component.nameToInfo[_] = compDefinition;
+      const {
+        parentStaticConfig,
+        ...rest
+      } = compDefinition.staticConfig;
+      compDefinition.staticConfig = rest;
+    }
   }
   next.nameToPaths = {};
-  for (const key in nameToPaths) next.nameToPaths[key] = [...nameToPaths[key]];
+  for (const key in nameToPaths) {
+    next.nameToPaths[key] = [...nameToPaths[key]];
+  }
   const {
     fontsParsed,
     getCSS,

package/dist/extractor/removeUnusedHooks.cjs

@@ -2,33 +2,35 @@ 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 __getProtoOf = Object.getPrototypeOf;
+var __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, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  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);
+// 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: true
+}) : target, mod));
+var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
+  value: true
+}), mod);
 var removeUnusedHooks_exports = {};
 __export(removeUnusedHooks_exports, {
   removeUnusedHooks: () => removeUnusedHooks
@@ -36,8 +38,8 @@ __export(removeUnusedHooks_exports, {
 module.exports = __toCommonJS(removeUnusedHooks_exports);
 var t = __toESM(require("@babel/types"));
 const hooks = {
-  useMedia: !0,
-  useTheme: !0
+  useMedia: true,
+  useTheme: true
 };
 function removeUnusedHooks(compFn, shouldPrintDebug) {
   compFn.scope.crawl();
@@ -46,31 +48,61 @@ function removeUnusedHooks(compFn, shouldPrintDebug) {
     console.info("no body statemnts?", compFn);
     return;
   }
-  if (Array.isArray(bodyStatements) || (bodyStatements.isFunctionExpression() ? bodyStatements = bodyStatements.scope.path.get("body") : bodyStatements = bodyStatements.get("body")), !bodyStatements || !Array.isArray(bodyStatements)) return;
+  if (!Array.isArray(bodyStatements)) {
+    if (bodyStatements.isFunctionExpression()) {
+      bodyStatements = bodyStatements.scope.path.get("body");
+    } else {
+      bodyStatements = bodyStatements.get("body");
+    }
+  }
+  if (!bodyStatements || !Array.isArray(bodyStatements)) {
+    return;
+  }
   const statements = bodyStatements;
   for (const statement of statements) {
-    if (!statement.isVariableDeclaration()) continue;
+    if (!statement.isVariableDeclaration()) {
+      continue;
+    }
     const declarations = statement.get("declarations");
-    if (!Array.isArray(declarations)) continue;
-    const isBindingReferenced = name => !!statement.scope.getBinding(name)?.referenced;
+    if (!Array.isArray(declarations)) {
+      continue;
+    }
+    const isBindingReferenced = name => {
+      return !!statement.scope.getBinding(name)?.referenced;
+    };
     for (const declarator of declarations) {
-      const id = declarator.get("id"),
-        init = declarator.node.init;
-      if (Array.isArray(id) || Array.isArray(init)) continue;
-      (() => {
-        if (!(init && t.isCallExpression(init) && t.isIdentifier(init.callee) && hooks[init.callee.name])) return !1;
+      const id = declarator.get("id");
+      const init = declarator.node.init;
+      if (Array.isArray(id) || Array.isArray(init)) {
+        continue;
+      }
+      const shouldRemove = (() => {
+        const isHook = init && t.isCallExpression(init) && t.isIdentifier(init.callee) && hooks[init.callee.name];
+        if (!isHook) {
+          return false;
+        }
         if (t.isIdentifier(id.node)) {
           const name = id.node.name;
           return !isBindingReferenced(name);
         }
-        return t.isObjectPattern(id.node) ? id.get("properties").every(prop => {
-          if (!prop.isObjectProperty()) return !1;
-          const value = prop.get("value");
-          if (Array.isArray(value) || !value.isIdentifier()) return !1;
-          const name = value.node.name;
-          return !isBindingReferenced(name);
-        }) : !1;
-      })() && (declarator.remove(), shouldPrintDebug && console.info(`  [\u{1FA9D}] removed ${id.node.name ?? ""}`));
+        if (t.isObjectPattern(id.node)) {
+          const propPaths = id.get("properties");
+          return propPaths.every(prop => {
+            if (!prop.isObjectProperty()) return false;
+            const value = prop.get("value");
+            if (Array.isArray(value) || !value.isIdentifier()) return false;
+            const name = value.node.name;
+            return !isBindingReferenced(name);
+          });
+        }
+        return false;
+      })();
+      if (shouldRemove) {
+        declarator.remove();
+        if (shouldPrintDebug) {
+          console.info(`  [\u{1FA9D}] removed ${id.node["name"] ?? ""}`);
+        }
+      }
     }
   }
 }

package/dist/extractor/timer.cjs

@@ -3,20 +3,22 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __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, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var timer_exports = {};
 __export(timer_exports, {
@@ -27,16 +29,23 @@ const timer = () => {
   const start = Date.now();
   let last = start;
   return {
-    mark: (name, print = !1) => {
+    mark: (name, print = false) => {
       if (print) {
         const took = Date.now() - last;
-        last = Date.now(), console.info(`Time ${name}: ${took}ms`), took > 10 && console.info("  long timer");
+        last = Date.now();
+        console.info(`Time ${name}: ${took}ms`);
+        if (took > 10) {
+          console.info("  long timer");
+        }
       }
     },
-    done: (print = !1) => {
+    done: (print = false) => {
       if (print) {
         const total = Date.now() - start;
-        console.info(`Total time: ${total}ms`), total > 50 && console.info("  long timer");
+        console.info(`Total time: ${total}ms`);
+        if (total > 50) {
+          console.info("  long timer");
+        }
       }
     }
   };

package/dist/extractor/validHTMLAttributes.cjs

@@ -3,20 +3,22 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __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, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var validHTMLAttributes_exports = {};
 __export(validHTMLAttributes_exports, {
@@ -25,53 +27,53 @@ __export(validHTMLAttributes_exports, {
 module.exports = __toCommonJS(validHTMLAttributes_exports);
 const validHTMLAttributes = {
   // SVG attributes that should pass through untouched
-  fill: !0,
-  stroke: !0,
-  autocomplete: !0,
-  style: !0,
-  tabIndex: !0,
-  contenteditable: !0,
-  crossorigin: !0,
-  dir: !0,
-  draggable: !0,
-  enctype: !0,
-  formenctype: !0,
-  formmethod: !0,
-  formtarget: !0,
-  inputmode: !0,
-  kind: !0,
-  link: !0,
-  method: !0,
-  preload: !0,
-  referrerpolicy: !0,
-  rel: !0,
-  rev: !0,
-  role: !0,
-  sandbox: !0,
-  shape: !0,
-  spellcheck: !0,
-  target: !0,
-  translate: !0,
-  type: !0,
-  wrap: !0,
-  "aria-autocomplete": !0,
-  "aria-busy": !0,
-  "aria-checked": !0,
-  "aria-current": !0,
-  "aria-disabled": !0,
-  "aria-expanded": !0,
-  "aria-haspopup": !0,
-  "aria-hidden": !0,
-  "aria-invalid": !0,
-  "aria-polite": !0,
-  "aria-modal": !0,
-  "aria-multiline": !0,
-  "aria-multiselectable": !0,
-  "aria-orientation": !0,
-  "aria-pressed": !0,
-  "aria-readonly": !0,
-  "aria-relevant": !0,
-  "aria-required": !0,
-  "aria-selected": !0,
-  "aria-sort": !0
+  fill: true,
+  stroke: true,
+  autocomplete: true,
+  style: true,
+  tabIndex: true,
+  contenteditable: true,
+  crossorigin: true,
+  dir: true,
+  draggable: true,
+  enctype: true,
+  formenctype: true,
+  formmethod: true,
+  formtarget: true,
+  inputmode: true,
+  kind: true,
+  link: true,
+  method: true,
+  preload: true,
+  referrerpolicy: true,
+  rel: true,
+  rev: true,
+  role: true,
+  sandbox: true,
+  shape: true,
+  spellcheck: true,
+  target: true,
+  translate: true,
+  type: true,
+  wrap: true,
+  "aria-autocomplete": true,
+  "aria-busy": true,
+  "aria-checked": true,
+  "aria-current": true,
+  "aria-disabled": true,
+  "aria-expanded": true,
+  "aria-haspopup": true,
+  "aria-hidden": true,
+  "aria-invalid": true,
+  "aria-polite": true,
+  "aria-modal": true,
+  "aria-multiline": true,
+  "aria-multiselectable": true,
+  "aria-orientation": true,
+  "aria-pressed": true,
+  "aria-readonly": true,
+  "aria-relevant": true,
+  "aria-required": true,
+  "aria-selected": true,
+  "aria-sort": true
 };