@tamagui/static 1.0.0-alpha.34 → 1.0.0-alpha.38

package/dist/index.cjs

@@ -73,6 +73,7 @@ __export(exports, {
 });
 
 // src/extractor/createExtractor.ts
+var import_path2 = __toModule(require("path"));
 var import_traverse = __toModule(require("@babel/traverse"));
 var t9 = __toModule(require("@babel/types"));
 var CoreNode = __toModule(require("@tamagui/core-node"));
@@ -255,9 +256,7 @@ function isValidThemeHook(jsxPath, n, sourcePath) {
   return true;
 }
 __name(isValidThemeHook, "isValidThemeHook");
-var isInsideTamagui = /* @__PURE__ */ __name((srcName) => {
-  return srcName.includes("/tamagui/_jsx") || srcName.includes("/core/src");
-}, "isInsideTamagui");
+var isInsideTamagui = /* @__PURE__ */ __name((srcName) => srcName.includes("/tamagui/"), "isInsideTamagui");
 
 // src/extractor/createEvaluator.ts
 function createEvaluator({
@@ -321,6 +320,7 @@ __name(findTopmostFunction, "findTopmostFunction");
 // src/extractor/getStaticBindingsForScope.ts
 var import_path = __toModule(require("path"));
 var t5 = __toModule(require("@babel/types"));
+var import_core_node = __toModule(require("@tamagui/core-node"));
 var import_fs_extra = __toModule(require("fs-extra"));
 
 // src/extractor/getSourceModule.ts
@@ -389,6 +389,9 @@ function getSourceModule(itemName, itemBinding) {
 __name(getSourceModule, "getSourceModule");
 
 // src/extractor/getStaticBindingsForScope.ts
+var tamaguiConstants = {
+  defaultMediaQueries: import_core_node.defaultMediaQueries
+};
 var isLocalImport = /* @__PURE__ */ __name((path3) => path3.startsWith(".") || path3.startsWith("/"), "isLocalImport");
 function resolveImportPath(sourcePath, path3) {
   const sourceDir = (0, import_path.dirname)(sourcePath);
@@ -424,6 +427,9 @@ function getStaticBindingsForScope(scope, whitelist = [], sourcePath, bindingCac
       if (!node.specifiers.length)
         continue;
       if (!isLocalImport(importPath)) {
+        if (importPath === "tamagui") {
+          Object.assign(ret, tamaguiConstants);
+        }
         continue;
       }
       const moduleName = resolveImportPath(sourcePath, importPath);
@@ -537,43 +543,6 @@ function literalToAst(literal) {
 }
 __name(literalToAst, "literalToAst");
 
-// src/extractor/loadTamagui.ts
-var import_path2 = __toModule(require("path"));
-var import_core_node = __toModule(require("@tamagui/core-node"));
-var loadedTamagui = null;
-function loadTamagui(props) {
-  if (loadedTamagui) {
-    return loadedTamagui;
-  }
-  process.env.IS_STATIC = "is_static";
-  const proxyWorm = require("@tamagui/fake-react-native");
-  const Mod = require("module");
-  const og = Mod.prototype.require;
-  Mod.prototype.require = function(path3) {
-    if (path3.startsWith("react-native") && !path3.startsWith("react-native-web/dist/cjs/exports")) {
-      return proxyWorm;
-    }
-    return og.apply(this, arguments);
-  };
-  const configPath = (0, import_path2.join)(process.cwd(), props.config);
-  const tamaguiConfigExport = require(configPath);
-  const tamaguiConfig = tamaguiConfigExport["default"] || tamaguiConfigExport;
-  const components = {};
-  for (const module2 of props.components) {
-    const exported = require(module2);
-    Object.assign(components, exported);
-  }
-  process.env.IS_STATIC = void 0;
-  Mod.prototype.require = og;
-  (0, import_core_node.createTamagui)(tamaguiConfig);
-  loadedTamagui = {
-    components,
-    tamaguiConfig
-  };
-  return loadedTamagui;
-}
-__name(loadTamagui, "loadTamagui");
-
 // src/extractor/normalizeTernaries.ts
 var import_generator2 = __toModule(require("@babel/generator"));
 var t7 = __toModule(require("@babel/types"));
@@ -697,7 +666,7 @@ function removeUnusedHooks(compFn, shouldPrintDebug) {
 __name(removeUnusedHooks, "removeUnusedHooks");
 
 // src/extractor/createExtractor.ts
-var { mediaQueryConfig, postProcessStyles, pseudos } = CoreNode;
+var { mediaQueryConfig, postProcessStyles } = CoreNode;
 var FAILED_EVAL = Symbol("failed_style_eval");
 var UNTOUCHED_PROPS = {
   key: true,
@@ -710,18 +679,44 @@ var validHooks = {
   useTheme: true
 };
 var createTernary = /* @__PURE__ */ __name((x) => x, "createTernary");
+var loadedTamagui = null;
+function loadTamagui(props) {
+  if (loadedTamagui) {
+    return loadedTamagui;
+  }
+  process.env.IS_STATIC = "is_static";
+  const proxyWorm = require("@dish/proxy-worm");
+  const Mod = require("module");
+  const og = Mod.prototype.require;
+  Mod.prototype.require = function(path3) {
+    if (path3.startsWith("react-native")) {
+      return proxyWorm;
+    }
+    return og.apply(this, arguments);
+  };
+  const tamaguiConfigExport = require((0, import_path2.join)(process.cwd(), props.config));
+  const tamaguiConfig = tamaguiConfigExport["default"] || tamaguiConfigExport;
+  const components = {};
+  for (const module2 of props.components) {
+    const exported = require(module2);
+    Object.assign(components, exported);
+  }
+  process.env.IS_STATIC = void 0;
+  Mod.prototype.require = og;
+  return {
+    components,
+    tamaguiConfig
+  };
+}
+__name(loadTamagui, "loadTamagui");
 function createExtractor() {
-  const shouldAddDebugProp = !process.env.npm_package_dependencies_next && process.env.TAMAGUI_TARGET !== "native" && process.env.IDENTIFY_TAGS !== "false" && (process.env.NODE_ENV === "development" || process.env.DEBUG || process.env.IDENTIFY_TAGS);
+  console.log("create");
+  const shouldAddDebugProp = process.env.TARGET !== "native" && process.env.IDENTIFY_TAGS !== "false" && (process.env.NODE_ENV === "development" || process.env.DEBUG || process.env.IDENTIFY_TAGS);
   require("esbuild-register/dist/node").register({
     target: "es2019",
     format: "cjs"
   });
-  let loadedTamaguiConfig;
-  let hasLogged = false;
   return {
-    getTamagui() {
-      return loadedTamaguiConfig;
-    },
     parse: (fileOrPath, _a) => {
       var _b = _a, {
         config = "tamagui.config.ts",
@@ -731,9 +726,7 @@ function createExtractor() {
         sourcePath = "",
         onExtractTag,
         getFlattenedNode,
-        disableExtraction,
-        disableExtractInlineMedia,
-        disableDebugAttr
+        onDidFlatten
       } = _b, props = __objRest(_b, [
         "config",
         "importsWhitelist",
@@ -742,38 +735,31 @@ function createExtractor() {
         "sourcePath",
         "onExtractTag",
         "getFlattenedNode",
-        "disableExtraction",
-        "disableExtractInlineMedia",
-        "disableDebugAttr"
+        "onDidFlatten"
       ]);
       if (sourcePath === "") {
         throw new Error(`Must provide a source file name`);
       }
-      if (!Array.isArray(props.components)) {
-        throw new Error(`Must provide components array with list of Tamagui component modules`);
-      }
       const { components, tamaguiConfig } = loadTamagui({
         config,
         components: props.components || ["tamagui"]
       });
-      loadedTamaguiConfig = tamaguiConfig;
-      const defaultTheme = tamaguiConfig.themes[Object.keys(tamaguiConfig.themes)[0]];
+      let doesUseValidImport = false;
       const body = fileOrPath.type === "Program" ? fileOrPath.get("body") : fileOrPath.program.body;
       const isInternalImport = /* @__PURE__ */ __name((importStr) => isInsideTamagui(sourcePath) && importStr[0] === ".", "isInternalImport");
       const validComponents = Object.keys(components).filter((key) => {
         var _a2;
-        return key[0].toUpperCase() === key[0] && !!((_a2 = components[key]) == null ? void 0 : _a2.staticConfig);
+        return !!((_a2 = components[key]) == null ? void 0 : _a2.staticConfig);
       }).reduce((obj, name) => {
         obj[name] = components[name];
         return obj;
       }, {});
-      let doesUseValidImport = false;
       for (const bodyPath of body) {
         if (bodyPath.type !== "ImportDeclaration")
           continue;
         const node = "node" in bodyPath ? bodyPath.node : bodyPath;
         const from = node.source.value;
-        if (props.components.includes(from) || isInternalImport(from)) {
+        if (from === "tamagui" || isInternalImport(from)) {
           if (node.specifiers.some((specifier) => {
             const name = specifier.local.name;
             return validComponents[name] || validHooks[name];
@@ -796,11 +782,6 @@ function createExtractor() {
         return fileOrPath.type === "File" ? (0, import_traverse.default)(fileOrPath, a) : fileOrPath.traverse(a);
       }, "callTraverse");
       let programPath;
-      const res = {
-        flattened: 0,
-        optimized: 0,
-        modified: 0
-      };
       callTraverse({
         Program: {
           enter(path3) {
@@ -808,7 +789,6 @@ function createExtractor() {
           }
         },
         JSXElement(traversePath) {
-          var _a2;
           const node = traversePath.node.openingElement;
           const ogAttributes = node.attributes;
           const componentName = findComponentName(traversePath.scope);
@@ -822,7 +802,7 @@ function createExtractor() {
               return;
             }
             const source = binding.path.parent.source;
-            if (!props.components.includes(source.value) && !isInternalImport(source.value)) {
+            if (source.value !== "tamagui" && !isInternalImport(source.value)) {
               return;
             }
             if (!validComponents[binding.identifier.name]) {
@@ -833,29 +813,11 @@ function createExtractor() {
           if (!component || !component.staticConfig) {
             return;
           }
-          const originalNodeName = node.name.name;
-          if (shouldPrintDebug) {
-            console.log(`
-<${originalNodeName} />`);
-          }
-          const filePath = sourcePath.replace(process.cwd(), ".");
-          const lineNumbers = node.loc ? node.loc.start.line + (node.loc.start.line !== node.loc.end.line ? `-${node.loc.end.line}` : "") : "";
-          if (shouldAddDebugProp && !disableDebugAttr) {
-            const preName = componentName ? `${componentName}:` : "";
-            res.modified++;
-            node.attributes.unshift(t9.jsxAttribute(t9.jsxIdentifier("data-is"), t9.stringLiteral(`  ${preName}${node.name.name}   ${filePath.replace("./", "")}:${lineNumbers}  `)));
-          }
-          if (disableExtraction) {
-            if (!hasLogged) {
-              console.log("\u{1F95A} Tamagui disableExtraction set: no CSS or optimizations will be run");
-              hasLogged = true;
-            }
-            return;
-          }
           const { staticConfig } = component;
+          const originalNodeName = node.name.name;
           const isTextView = staticConfig.isText || false;
           const validStyles = (staticConfig == null ? void 0 : staticConfig.validStyles) ?? {};
-          let tagName = ((_a2 = staticConfig.defaultProps) == null ? void 0 : _a2.tag) ?? (isTextView ? "span" : "div");
+          let tagName = isTextView ? "span" : "div";
           traversePath.get("openingElement").get("attributes").forEach((path3) => {
             const attr = path3.node;
             if (t9.isJSXSpreadAttribute(attr))
@@ -874,17 +836,21 @@ function createExtractor() {
           ]);
           const excludeProps = new Set(props.excludeProps ?? []);
           const isExcludedProp = /* @__PURE__ */ __name((name) => {
-            const res2 = excludeProps.has(name);
-            if (res2 && shouldPrintDebug)
+            const res = excludeProps.has(name);
+            if (res && shouldPrintDebug)
               console.log(`  excluding ${name}`);
-            return res2;
+            return res;
           }, "isExcludedProp");
           const isDeoptedProp = /* @__PURE__ */ __name((name) => {
-            const res2 = deoptProps.has(name);
-            if (res2 && shouldPrintDebug)
+            const res = deoptProps.has(name);
+            if (res && shouldPrintDebug)
               console.log(`  deopting ${name}`);
-            return res2;
+            return res;
           }, "isDeoptedProp");
+          if (shouldPrintDebug) {
+            console.log(`
+<${originalNodeName} />`);
+          }
           const staticNamespace = getStaticBindingsForScope(traversePath.scope, importsWhitelist, sourcePath, bindingCache, shouldPrintDebug);
           const attemptEval = !evaluateVars ? evaluateAstNode : createEvaluator({
             tamaguiConfig,
@@ -957,11 +923,11 @@ function createExtractor() {
           let isFlattened = false;
           attrs = traversePath.get("openingElement").get("attributes").flatMap((path3) => {
             try {
-              const res2 = evaluateAttribute(path3);
-              if (!res2) {
+              const res = evaluateAttribute(path3);
+              if (!res) {
                 path3.remove();
               }
-              return res2;
+              return res;
             } catch (err) {
               console.log("Error extracting attribute", err.message, err.stack);
               console.log("node", path3.node);
@@ -972,8 +938,8 @@ function createExtractor() {
             }
           }).flat(4).filter(isPresent);
           function isStaticAttributeName(name) {
-            var _a3, _b2;
-            return !!(!!validStyles[name] || ((_a3 = staticConfig.validPropsExtra) == null ? void 0 : _a3[name]) || !!pseudos[name] || ((_b2 = staticConfig.variants) == null ? void 0 : _b2[name]) || tamaguiConfig.shorthands[name] || (name[0] === "$" ? !!mediaQueryConfig[name.slice(1)] : false));
+            var _a2;
+            return !!validStyles[name] || ((_a2 = staticConfig.validPropsExtra) == null ? void 0 : _a2[name]) || !!import_helpers.pseudos[name];
           }
           __name(isStaticAttributeName, "isStaticAttributeName");
           function isExtractable(obj) {
@@ -983,10 +949,8 @@ function createExtractor() {
                 return false;
               }
               const propName = prop.key["name"];
-              if (!isStaticAttributeName(propName) && propName !== "tag") {
-                if (shouldPrintDebug) {
-                  console.log("  not a valid style prop!", propName);
-                }
+              if (!isStaticAttributeName(propName)) {
+                console.log("  not a valid style prop!", propName);
                 return false;
               }
               return true;
@@ -1045,15 +1009,13 @@ function createExtractor() {
             const attr = { type: "attr", value: attribute };
             if (t9.isJSXSpreadAttribute(attribute)) {
               const arg = attribute.argument;
-              const conditional = t9.isConditionalExpression(arg) ? [arg.test, arg.consequent, arg.alternate] : t9.isLogicalExpression(arg) && arg.operator === "&&" ? [arg.left, arg.right, null] : null;
+              const conditional = t9.isConditionalExpression(arg) ? [arg.test, arg.alternate, arg.consequent] : t9.isLogicalExpression(arg) && arg.operator === "&&" ? [arg.left, arg.right, null] : null;
               if (conditional) {
                 const [test, alt, cons] = conditional;
                 if (!test)
                   throw new Error(`no test`);
                 if ([alt, cons].some((side) => side && !isExtractable(side))) {
-                  if (shouldPrintDebug) {
-                    console.log("not extractable", alt, cons);
-                  }
+                  console.log("not extractable", alt, cons);
                   return attr;
                 }
                 return [
@@ -1084,9 +1046,6 @@ function createExtractor() {
               return attr;
             }
             if (name[0] === "$" && t9.isJSXExpressionContainer(attribute == null ? void 0 : attribute.value)) {
-              if (disableExtractInlineMedia) {
-                return attr;
-              }
               const shortname = name.slice(1);
               if (mediaQueryConfig[shortname]) {
                 const expression = attribute.value.expression;
@@ -1120,22 +1079,11 @@ function createExtractor() {
               inlinePropCount++;
               return attr;
             }
-            if (name === "tag") {
-              return {
-                type: "attr",
-                value: path3.node
-              };
-            }
             const styleValue = attemptEvalSafe(value);
             if (!isStaticAttributeName(name)) {
               let keys = [name];
-              if (staticConfig.propMapper) {
-                const out = staticConfig.propMapper(name, styleValue, defaultTheme, staticConfig.defaultProps);
-                if (out) {
-                  keys = Object.keys(out);
-                }
-              }
-              if (keys.some((k) => !isStaticAttributeName(k) && k !== "tag")) {
+              console.warn("\u26A0\uFE0F NEED TO DO PROP MAPPING HERE");
+              if (keys.some((k) => !isStaticAttributeName(k))) {
                 if (shouldPrintDebug) {
                   console.log("  ! inlining, not static attribute name", name);
                 }
@@ -1146,9 +1094,7 @@ function createExtractor() {
             if (styleValue !== FAILED_EVAL) {
               return {
                 type: "style",
-                value: { [name]: styleValue },
-                name,
-                attr: path3.node
+                value: { [name]: styleValue }
               };
             }
             if (t9.isBinaryExpression(value)) {
@@ -1210,9 +1156,6 @@ function createExtractor() {
             function getStaticConditional(value2) {
               if (t9.isConditionalExpression(value2)) {
                 try {
-                  if (shouldPrintDebug) {
-                    console.log("attempt", value2.alternate, value2.consequent);
-                  }
                   const aVal = attemptEval(value2.alternate);
                   const cVal = attemptEval(value2.consequent);
                   if (shouldPrintDebug) {
@@ -1275,6 +1218,8 @@ function createExtractor() {
           if (parentFn) {
             modifiedComponents.add(parentFn);
           }
+          const filePath = sourcePath.replace(process.cwd(), ".");
+          const lineNumbers = node.loc ? node.loc.start.line + (node.loc.start.line !== node.loc.end.line ? `-${node.loc.end.line}` : "") : "";
           let ternaries = [];
           attrs = attrs.reduce((out, cur) => {
             const next = attrs[attrs.indexOf(cur) + 1];
@@ -1282,8 +1227,8 @@ function createExtractor() {
               ternaries.push(cur.value);
             }
             if ((!next || next.type !== "ternary") && ternaries.length) {
-              const normalized = normalizeTernaries(ternaries).map((_a3) => {
-                var _b2 = _a3, { alternate, consequent } = _b2, rest = __objRest(_b2, ["alternate", "consequent"]);
+              const normalized = normalizeTernaries(ternaries).map((_a2) => {
+                var _b2 = _a2, { alternate, consequent } = _b2, rest = __objRest(_b2, ["alternate", "consequent"]);
                 return {
                   type: "ternary",
                   value: __spreadProps(__spreadValues({}, rest), {
@@ -1333,19 +1278,17 @@ function createExtractor() {
           const shouldFlatten = !shouldDeopt && inlinePropCount === 0 && !hasSpread && staticConfig.neverFlatten !== true && (staticConfig.neverFlatten === "jsx" ? hasOnlyStringChildren : true);
           if (!shouldFlatten) {
             attrs = attrs.reduce((acc, cur) => {
-              var _a3, _b2;
+              var _a2;
               if (cur.type === "style") {
                 for (const key in cur.value) {
-                  const shouldEnsureOverridden = !!((_a3 = staticConfig.ensureOverriddenProp) == null ? void 0 : _a3[key]);
+                  const shouldInsertNull = !!((_a2 = staticConfig.ensureOverriddenProp) == null ? void 0 : _a2[key]);
                   const isSetInAttrsAlready = attrs.some((x) => x.type === "attr" && x.value.type === "JSXAttribute" && x.value.name.name === key);
-                  if (!isSetInAttrsAlready) {
-                    const isVariant = !!((_b2 = staticConfig.variants) == null ? void 0 : _b2[cur.name || ""]);
-                    if (isVariant || shouldEnsureOverridden) {
-                      acc.push({
-                        type: "attr",
-                        value: cur.attr || t9.jsxAttribute(t9.jsxIdentifier(key), t9.jsxExpressionContainer(t9.nullLiteral()))
-                      });
-                    }
+                  const shouldInsertNullOverride = shouldInsertNull && !isSetInAttrsAlready;
+                  if (shouldInsertNullOverride) {
+                    acc.push({
+                      type: "attr",
+                      value: t9.jsxAttribute(t9.jsxIdentifier(key), t9.jsxExpressionContainer(t9.nullLiteral()))
+                    });
                   }
                 }
               }
@@ -1360,7 +1303,7 @@ function createExtractor() {
             if (cur.type !== "attr" || !t9.isJSXAttribute(cur.value) || typeof cur.value.name.name !== "string") {
               if (cur.type === "style") {
                 const key = Object.keys(cur.value)[0];
-                if (!validStyles[key] && !pseudos[key]) {
+                if (!validStyles[key] && !import_helpers.pseudos[key]) {
                   if (shouldPrintDebug) {
                     console.log(" \u274C excluding", key);
                   }
@@ -1378,6 +1321,9 @@ function createExtractor() {
           attrs = attrs.reduce((acc, cur) => {
             if (cur.type === "style") {
               if ((prev == null ? void 0 : prev.type) === "style") {
+                if (shouldPrintDebug) {
+                  console.log("   \u{1F500} merging style");
+                }
                 Object.assign(prev.value, cur.value);
                 return acc;
               }
@@ -1387,7 +1333,7 @@ function createExtractor() {
             return acc;
           }, []);
           if (shouldPrintDebug) {
-            console.log("  - attrs (combined \u{1F500}):  ", attrs.map(attrStr).join(", "));
+            console.log("  - attrs (combined styles):  ", attrs.map(attrStr).join(", "));
           }
           const getStyles = /* @__PURE__ */ __name((props2) => {
             if (!props2)
@@ -1398,7 +1344,7 @@ function createExtractor() {
                   delete props2[key];
               }
             }
-            const out = postProcessStyles(props2, staticConfig, defaultTheme);
+            const out = postProcessStyles(props2, staticConfig);
             const next = (out == null ? void 0 : out.style) ?? props2;
             if (shouldPrintDebug) {
               console.log("    >> getStyles: ", objToStr(props2), "==>>", objToStr(next));
@@ -1407,7 +1353,7 @@ function createExtractor() {
             }
             if (staticConfig.validStyles) {
               for (const key in next) {
-                if (!staticConfig.validStyles[key] && !pseudos[key]) {
+                if (!staticConfig.validStyles[key] && !import_helpers.pseudos[key]) {
                   delete next[key];
                 }
               }
@@ -1451,11 +1397,7 @@ function createExtractor() {
                 case "style":
                   const next = {};
                   for (const key in attr.value) {
-                    if (key in import_helpers.stylePropsTransform) {
-                      next["transform"] = completeStylesProcessed["transform"];
-                    } else {
-                      next[key] = completeStylesProcessed[key] ?? attr.value[key];
-                    }
+                    next[key] = completeStylesProcessed[key] ?? attr.value[key];
                   }
                   attr.value = next;
                   break;
@@ -1471,13 +1413,20 @@ function createExtractor() {
           if (shouldPrintDebug) {
             console.log("  - attrs (after): ", attrs.map(attrStr).join(", "));
           }
+          if (shouldAddDebugProp) {
+            const preName = componentName ? `${componentName}:` : "";
+            attrs.unshift({
+              type: "attr",
+              value: t9.jsxAttribute(t9.jsxIdentifier("data-is"), t9.stringLiteral(`  ${preName}${node.name.name}   ${filePath.replace("./", "")}:${lineNumbers}  `))
+            });
+          }
           if (shouldFlatten) {
             if (shouldPrintDebug) {
               console.log("  [\u2705] flattening", originalNodeName, flatNode);
             }
             isFlattened = true;
             node.name.name = flatNode;
-            res.flattened++;
+            onDidFlatten == null ? void 0 : onDidFlatten();
             if (closingElement) {
               closingElement.name.name = flatNode;
             }
@@ -1486,7 +1435,6 @@ function createExtractor() {
             console.log("  [\u274A] inline props ", inlinePropCount, shouldDeopt ? " deopted" : "", hasSpread ? " spread" : "", "!flatten", staticConfig.neverFlatten);
             console.log("  - attrs (end): ", attrs.map(attrStr).join(", "));
           }
-          res.optimized++;
           onExtractTag({
             attrs,
             node,
@@ -1509,7 +1457,6 @@ function createExtractor() {
           removeUnusedHooks(comp, shouldPrintDebug);
         }
       }
-      return res;
     }
   };
 }
@@ -1528,7 +1475,8 @@ var util = __toModule(require("util"));
 var import_generator3 = __toModule(require("@babel/generator"));
 var t14 = __toModule(require("@babel/types"));
 var import_core_node3 = __toModule(require("@tamagui/core-node"));
-var import_helpers2 = __toModule(require("@tamagui/helpers"));
+var import_helpers3 = __toModule(require("@tamagui/helpers"));
+var import_helpers4 = __toModule(require("@tamagui/helpers"));
 var import_invariant2 = __toModule(require("invariant"));
 var import_loader_utils = __toModule(require("loader-utils"));
 
@@ -1615,42 +1563,40 @@ __name(ensureImportingConcat, "ensureImportingConcat");
 // src/extractor/extractMediaStyle.ts
 var t12 = __toModule(require("@babel/types"));
 var import_core_node2 = __toModule(require("@tamagui/core-node"));
-function extractMediaStyle(ternary, jsxPath, tamaguiConfig, sourcePath, importance = 0, shouldPrintDebug = false) {
+var import_helpers2 = __toModule(require("@tamagui/helpers"));
+function extractMediaStyle(ternary, jsxPath, mediaQueries, sourcePath, importance = 0, shouldPrintDebug = false) {
   const mt = getMediaQueryTernary(ternary, jsxPath, sourcePath);
   if (!mt) {
     return null;
   }
   const { key } = mt;
-  const mq = tamaguiConfig.media[key];
+  const mq = mediaQueries[key];
   if (!mq) {
-    console.error(`Media query "${key}" not found: ${Object.keys(tamaguiConfig.media)}`);
+    console.error(`Media query "${key}" not found: ${Object.keys(mediaQueries)}`);
     return null;
   }
   const getStyleObj = /* @__PURE__ */ __name((styleObj, negate = false) => {
     return styleObj ? { styleObj, negate } : null;
   }, "getStyleObj");
-  const styleOpts = [
-    getStyleObj(ternary.consequent, false),
-    getStyleObj(ternary.alternate, true)
-  ].filter(isPresent);
+  const styleOpts = [getStyleObj(ternary.consequent, false), getStyleObj(ternary.alternate, true)].filter(isPresent);
   if (shouldPrintDebug && !styleOpts.length) {
     console.log("  media query, no styles?");
     return null;
   }
-  const mediaKeys = Object.keys(tamaguiConfig.media);
+  const mediaKeys = Object.keys(mediaQueries);
   const mediaKeyPrecendence = mediaKeys.reduce((acc, cur, i) => {
     acc[cur] = new Array(importance + 1).fill(":root").join("");
     return acc;
   }, {});
   let mediaStyles = [];
   for (const { styleObj, negate } of styleOpts) {
-    const styles = (0, import_core_node2.getStylesAtomic)(styleObj);
+    const styles = (0, import_helpers2.getStylesAtomic)(styleObj);
     const singleMediaStyles = styles.map((style) => {
       const negKey = negate ? "0" : "";
       const ogPrefix = style.identifier.slice(0, style.identifier.indexOf("-") + 1);
       const identifier3 = `${style.identifier.replace(ogPrefix, `${ogPrefix}${MEDIA_SEP}${key}${negKey}${MEDIA_SEP}`)}`;
       const className = `.${identifier3}`;
-      const mediaSelector = (0, import_core_node2.mediaObjectToString)(tamaguiConfig.media[key]);
+      const mediaSelector = (0, import_core_node2.mediaObjectToString)(mediaQueries[key]);
       const screenStr = negate ? "not all" : "screen";
       const mediaQuery = `${screenStr} and ${mediaSelector}`;
       const precendencePrefix = mediaKeyPrecendence[key];
@@ -1827,11 +1773,17 @@ function extractToClassNames({
   }
   const cssMap = new Map();
   const existingHoists = {};
-  const res = extractor.parse(ast, __spreadProps(__spreadValues({
+  const mediaQueries = options.mediaQueries ?? import_core_node3.defaultMediaQueries;
+  let flattened = 0;
+  let optimized = 0;
+  extractor.parse(ast, __spreadProps(__spreadValues({
     sourcePath,
     shouldPrintDebug
   }, options), {
     getFlattenedNode: ({ tag }) => tag,
+    onDidFlatten() {
+      flattened++;
+    },
     onExtractTag: ({
       attrs,
       node,
@@ -1842,6 +1794,7 @@ function extractToClassNames({
       lineNumbers,
       programPath
     }) => {
+      optimized++;
       let finalClassNames = [];
       let finalAttrs = [];
       let finalStyles = [];
@@ -1867,18 +1820,18 @@ function extractToClassNames({
         if (!style)
           return [];
         const styleWithPrev = ensureNeededPrevStyle(style);
-        const res2 = (0, import_core_node3.getStylesAtomic)(styleWithPrev);
-        if (res2.length) {
-          finalStyles = [...finalStyles, ...res2];
+        const res = (0, import_helpers4.getStylesAtomic)(styleWithPrev);
+        if (res.length) {
+          finalStyles = [...finalStyles, ...res];
         }
-        return res2;
+        return res;
       }, "addStyles");
       let lastMediaImportance = 1;
       for (const attr of attrs) {
         switch (attr.type) {
           case "style":
             const styles2 = addStyles(attr.value);
-            const newClassNames = (0, import_helpers2.concatClassName)(styles2.map((x) => x.identifier).join(" "));
+            const newClassNames = (0, import_helpers3.concatClassName)(styles2.map((x) => x.identifier).join(" "));
             if (shouldPrintDebug) {
               console.log("  classnames", newClassNames, finalClassNames);
             }
@@ -1913,7 +1866,7 @@ function extractToClassNames({
             finalAttrs.push(val);
             break;
           case "ternary":
-            const mediaExtraction = extractMediaStyle(attr.value, jsxPath, extractor.getTamagui(), sourcePath, lastMediaImportance, shouldPrintDebug);
+            const mediaExtraction = extractMediaStyle(attr.value, jsxPath, mediaQueries, sourcePath, lastMediaImportance, shouldPrintDebug);
             if (mediaExtraction) {
               lastMediaImportance++;
               finalStyles = [...finalStyles, ...mediaExtraction.mediaStyles];
@@ -1974,10 +1927,12 @@ function extractToClassNames({
       }
     }
   }));
-  if (!res || !res.modified) {
+  if (!optimized) {
     return null;
   }
-  const styles = Array.from(cssMap.values()).map((x) => x.css).join("\n").trim();
+  const styles = Array.from(cssMap.values()).map((x) => {
+    return x.css;
+  }).join("\n").trim();
   if (styles) {
     const cssQuery = threaded ? `cssData=${Buffer.from(styles).toString("base64")}` : `cssPath=${cssPath}`;
     const remReq = (0, import_loader_utils.getRemainingRequest)(loader);
@@ -1997,7 +1952,7 @@ function extractToClassNames({
   }
   if (shouldLogTiming && mem) {
     const memUsed = Math.round((process.memoryUsage().heapUsed - mem.heapUsed) / 1024 / 1204 * 10) / 10;
-    console.log(`  \u{1F95A} ${(0, import_path3.basename)(sourcePath).padStart(40)} ${`${Date.now() - start}`.padStart(3)}ms \u05C1\xB7 ${`${res.optimized}`.padStart(4)} optimized \xB7 ${res.flattened} flattened ${memUsed > 10 ? `used ${memUsed}MB` : ""}`);
+    console.log(`  \u{1F351} ${(0, import_path3.basename)(sourcePath).padStart(40)} ${`${Date.now() - start}`.padStart(3)}ms \u05C1\xB7 ${`${optimized}`.padStart(4)} optimized \xB7 ${flattened} flattened ${memUsed > 10 ? `used ${memUsed}MB` : ""}`);
   }
   return {
     ast,
@@ -2013,24 +1968,8 @@ var fs = __toModule(require("fs"));
 var import_path4 = __toModule(require("path"));
 function patchReactNativeWeb() {
   const rootDir = require.resolve("react-native-web").replace(/\/dist.*/, "");
-  const modulePath = import_path4.default.join(rootDir, "dist", "tamagui-exports.js");
-  const cjsPath = import_path4.default.join(rootDir, "dist", "cjs", "tamagui-exports.js");
-  const isEqual = (() => {
-    let res = false;
-    try {
-      res = fs.readFileSync(modulePath, "utf-8") === moduleExports && fs.readFileSync(cjsPath, "utf-8") == cjsExports;
-    } catch {
-      res = false;
-    }
-    return res;
-  })();
-  if (!isEqual) {
-    console.log("\u{1F95A} Tamagui patching react-native-web to share atomic styling primitives");
-    console.log("   > adding", modulePath);
-    console.log("   > adding", cjsPath);
-    fs.writeFileSync(modulePath, moduleExports);
-    fs.writeFileSync(cjsPath, cjsExports);
-  }
+  fs.writeFileSync(import_path4.default.join(rootDir, "dist", "tamagui-exports.js"), moduleExports);
+  fs.writeFileSync(import_path4.default.join(rootDir, "dist", "cjs", "tamagui-exports.js"), cjsExports);
   const moduleEntry = import_path4.default.join(rootDir, "dist", "index.js");
   const moduleEntrySrc = fs.readFileSync(moduleEntry, "utf-8");
   if (!moduleEntrySrc.includes("// tamagui-patch-v4")) {
@@ -2051,6 +1990,7 @@ export const TamaguiExports = TExports
 exports.TamaguiExports = _interopRequireDefault(require("./tamagui-exports"));
 // tamagui-patch-end
 `);
+    console.log(`Tamagui patched react-native-web`);
   }
 }
 __name(patchReactNativeWeb, "patchReactNativeWeb");
@@ -2075,12 +2015,6 @@ var forwardedPropsObj = `{
 }
 `;
 var moduleExports = `
-export { atomic } from './exports/StyleSheet/compile'
-export { default as createCompileableStyle } from './exports/StyleSheet/createCompileableStyle'
-export { default as createReactDOMStyle } from './exports/StyleSheet/createReactDOMStyle'
-export { default as i18Style } from './exports/StyleSheet/i18nStyle'
-export { default as createDOMProps } from './modules/createDOMProps'
-export { default as AccessibilityUtil } from './modules/AccessibilityUtil'
 export { default as createElement } from './exports/createElement'
 export { default as css } from './exports/StyleSheet/css'
 export { default as TextAncestorContext } from './exports/Text/TextAncestorContext'
@@ -2093,12 +2027,6 @@ import * as fwdProps from './modules/forwardedProps'
 export const forwardedProps = ${forwardedPropsObj}
 `;
 var cjsExports = `
-exports.atomic = require('./exports/StyleSheet/compile').atomic
-exports.createCompileableStyle = require('./exports/StyleSheet/createCompileableStyle')
-exports.createReactDOMStyle = require('./exports/StyleSheet/createReactDOMStyle')
-exports.i18Style = require('./exports/StyleSheet/i18nStyle')
-exports.createDOMProps = require('./modules/createDOMProps')
-exports.AccessibilityUtil = require('./modules/AccessibilityUtil')
 exports.createElement = require('./exports/createElement')
 exports.css = require('./exports/StyleSheet/css')
 exports.TextAncestorContext = require('./exports/Text/TextAncestorContext')
@@ -2112,5 +2040,5 @@ exports.forwardedProps = ${forwardedPropsObj}
 `;
 
 // src/index.ts
-process.env.TAMAGUI_COMPILE_PROCESS = "1";
+process.env.SNACKUI_COMPILE_PROCESS = "1";
 //# sourceMappingURL=index.cjs.map