@tamagui/static 2.4.0-1783099846627 → 2.4.0-1783110557100

package/dist/extractor/createExtractor.cjs

@@ -891,6 +891,13 @@ function createExtractor({
                 return [];
               }
               const styleValue = attemptEvalSafe(value);
+              if (name[0] === "$" && (name.startsWith("$theme-") || name.startsWith("$group-")) && styleValue && typeof styleValue === "object" && Object.keys(styleValue).some(k => k[0] === "$")) {
+                if (shouldPrintDebug) {
+                  logger.info(`  ! nested media-like key inside ${name}, deopt to runtime`);
+                }
+                inlined.set(name, true);
+                return attr;
+              }
               if (!variants[name] && !isValidStyleKey(name, staticConfig)) {
                 let out = null;
                 propMapper(name, styleValue, propMapperStyleState, false, (key, val) => {
@@ -1673,6 +1680,23 @@ function createExtractor({
                   resolveValues: "except-theme"
                 })
               }, void 0, void 0, void 0, void 0, false, debugPropValue || shouldPrintDebug);
+              if (extractedMediaLikeProps && platform2 !== "native") {
+                for (const k in extractedMediaLikeProps) {
+                  const block = extractedMediaLikeProps[k];
+                  if (!block || typeof block !== "object") continue;
+                  const blockOut = getSplitStyles(block, staticConfig, defaultTheme, "", componentState, {
+                    ...styleProps,
+                    noClass: true,
+                    fallbackProps: completeProps
+                  }, void 0, void 0, void 0, void 0, false, debugPropValue || shouldPrintDebug);
+                  if (blockOut) {
+                    extractedMediaLikeProps[k] = {
+                      ...blockOut.style,
+                      ...blockOut.pseudos
+                    };
+                  }
+                }
+              }
               let outProps = {
                 ...(includeProps ? out.viewProps : {}),
                 ...out.style,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/static",
-  "version": "2.4.0-1783099846627",
+  "version": "2.4.0-1783110557100",
   "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
   "license": "MIT",
   "source": "src/index.ts",
@@ -50,19 +50,19 @@
     "@babel/template": "^7.25.0",
     "@babel/traverse": "^7.25.4",
     "@babel/types": "^7.25.4",
-    "@tamagui/cli-color": "2.4.0-1783099846627",
-    "@tamagui/config-default": "2.4.0-1783099846627",
-    "@tamagui/core": "2.4.0-1783099846627",
-    "@tamagui/fake-react-native": "2.4.0-1783099846627",
-    "@tamagui/generate-themes": "2.4.0-1783099846627",
-    "@tamagui/helpers": "2.4.0-1783099846627",
-    "@tamagui/helpers-node": "2.4.0-1783099846627",
-    "@tamagui/proxy-worm": "2.4.0-1783099846627",
-    "@tamagui/react-native-web-internals": "2.4.0-1783099846627",
-    "@tamagui/react-native-web-lite": "2.4.0-1783099846627",
-    "@tamagui/shorthands": "2.4.0-1783099846627",
-    "@tamagui/types": "2.4.0-1783099846627",
-    "@tamagui/web": "2.4.0-1783099846627",
+    "@tamagui/cli-color": "2.4.0-1783110557100",
+    "@tamagui/config-default": "2.4.0-1783110557100",
+    "@tamagui/core": "2.4.0-1783110557100",
+    "@tamagui/fake-react-native": "2.4.0-1783110557100",
+    "@tamagui/generate-themes": "2.4.0-1783110557100",
+    "@tamagui/helpers": "2.4.0-1783110557100",
+    "@tamagui/helpers-node": "2.4.0-1783110557100",
+    "@tamagui/proxy-worm": "2.4.0-1783110557100",
+    "@tamagui/react-native-web-internals": "2.4.0-1783110557100",
+    "@tamagui/react-native-web-lite": "2.4.0-1783110557100",
+    "@tamagui/shorthands": "2.4.0-1783110557100",
+    "@tamagui/types": "2.4.0-1783110557100",
+    "@tamagui/web": "2.4.0-1783110557100",
     "babel-literal-to-ast": "^2.1.0",
     "browserslist": "^4.28.1",
     "check-dependency-version-consistency": "^4.1.0",
@@ -79,7 +79,7 @@
   },
   "devDependencies": {
     "@babel/plugin-syntax-typescript": "^7.25.4",
-    "@tamagui/build": "2.4.0-1783099846627",
+    "@tamagui/build": "2.4.0-1783110557100",
     "@types/babel__core": "^7.20.5",
     "@types/find-root": "^1.1.2",
     "@types/node": "^22.1.0",

package/src/extractor/createExtractor.ts

@@ -1514,6 +1514,22 @@ export function createExtractor(
             // if value can be evaluated, extract it and filter it out
             const styleValue = attemptEvalSafe(value)
 
+            // media-like blocks with nested $-keys (eg $theme-dark={{ $sm: {…} }})
+            // can't resolve to static CSS in one pass — keep them on the runtime path
+            if (
+              name[0] === '$' &&
+              (name.startsWith('$theme-') || name.startsWith('$group-')) &&
+              styleValue &&
+              typeof styleValue === 'object' &&
+              Object.keys(styleValue).some((k) => k[0] === '$')
+            ) {
+              if (shouldPrintDebug) {
+                logger.info(`  ! nested media-like key inside ${name}, deopt to runtime`)
+              }
+              inlined.set(name, true)
+              return attr
+            }
+
             // never flatten if a prop isn't a valid static attribute
             // only post prop-mapping
             if (!variants[name] && !isValidStyleKey(name, staticConfig)) {
@@ -2501,6 +2517,42 @@ export function createExtractor(
                 debugPropValue || shouldPrintDebug
               )!
 
+              // resolve tokens inside the plucked blocks: they skipped the main
+              // split, so values like "$color5" would flow raw into the emitted
+              // CSS where browsers reject the declaration. run each block through
+              // its own static split so tokens become var(--x) references.
+              // (native never extracts these — it deopts below — so web only.)
+              if (extractedMediaLikeProps && platform !== 'native') {
+                for (const k in extractedMediaLikeProps) {
+                  const block = extractedMediaLikeProps[k]
+                  if (!block || typeof block !== 'object') continue
+                  const blockOut = getSplitStyles(
+                    block,
+                    staticConfig,
+                    defaultTheme,
+                    '',
+                    componentState,
+                    {
+                      ...styleProps,
+                      noClass: true,
+                      fallbackProps: completeProps,
+                    },
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    false,
+                    debugPropValue || shouldPrintDebug
+                  )
+                  if (blockOut) {
+                    extractedMediaLikeProps[k] = {
+                      ...blockOut.style,
+                      ...blockOut.pseudos,
+                    }
+                  }
+                }
+              }
+
               let outProps = {
                 ...(includeProps ? out.viewProps : {}),
                 ...out.style,

package/types/extractor/createExtractor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createExtractor.d.ts","sourceRoot":"","sources":["../../src/extractor/createExtractor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAmB,MAAM,iBAAiB,CAAA;AAEhE,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAmBjC,OAAO,KAAK,EAGV,gBAAgB,EAChB,mBAAmB,EACnB,cAAc,EAGf,MAAM,UAAU,CAAA;AACjB,OAAO,KAAK,EAAoB,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAc1E,OAAO,EAAE,iBAAiB,EAA6B,MAAM,6BAA6B,CAAA;AAwB1F,MAAM,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAE1D,KAAK,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAA;AAuD9C,wBAAgB,eAAe,CAC7B,EAAE,MAAgB,EAAE,QAAgB,EAAE,GAAE,gBAAsC;;;;;yBAsJnD,cAAc;6BAPhB,cAAc;;mBAwBtB,UAAU,SAAS,mBAAmB;;;;;;;eAKpC,UAAU,SAAS,mBAAmB;;;;;;;EAwiF1D"}
+{"version":3,"file":"createExtractor.d.ts","sourceRoot":"","sources":["../../src/extractor/createExtractor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAmB,MAAM,iBAAiB,CAAA;AAEhE,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAmBjC,OAAO,KAAK,EAGV,gBAAgB,EAChB,mBAAmB,EACnB,cAAc,EAGf,MAAM,UAAU,CAAA;AACjB,OAAO,KAAK,EAAoB,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAc1E,OAAO,EAAE,iBAAiB,EAA6B,MAAM,6BAA6B,CAAA;AAwB1F,MAAM,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAE1D,KAAK,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAA;AAuD9C,wBAAgB,eAAe,CAC7B,EAAE,MAAgB,EAAE,QAAgB,EAAE,GAAE,gBAAsC;;;;;yBAsJnD,cAAc;6BAPhB,cAAc;;mBAwBtB,UAAU,SAAS,mBAAmB;;;;;;;eAKpC,UAAU,SAAS,mBAAmB;;;;;;;EA4lF1D"}