@tamagui/static 1.0.1-beta.103 → 1.0.1-beta.104

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/static",
-  "version": "1.0.1-beta.103",
+  "version": "1.0.1-beta.104",
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
   "main": "dist/cjs",
@@ -38,12 +38,12 @@
     "@babel/parser": "^7.15.7",
     "@babel/traverse": "^7.15.4",
     "@expo/match-media": "^0.3.0",
-    "@tamagui/build": "^1.0.1-beta.103",
-    "@tamagui/core-node": "^1.0.1-beta.103",
-    "@tamagui/fake-react-native": "^1.0.1-beta.103",
-    "@tamagui/helpers": "^1.0.1-beta.103",
-    "@tamagui/patch-rnw": "^1.0.1-beta.103",
-    "@tamagui/proxy-worm": "^1.0.1-beta.103",
+    "@tamagui/build": "^1.0.1-beta.104",
+    "@tamagui/core-node": "^1.0.1-beta.104",
+    "@tamagui/fake-react-native": "^1.0.1-beta.104",
+    "@tamagui/helpers": "^1.0.1-beta.104",
+    "@tamagui/patch-rnw": "^1.0.1-beta.104",
+    "@tamagui/proxy-worm": "^1.0.1-beta.104",
     "babel-literal-to-ast": "^2.1.0",
     "esbuild": "^0.14.48",
     "esbuild-register": "^3.3.2",
@@ -51,7 +51,7 @@
     "fs-extra": "^10.1.0",
     "invariant": "^2.2.4",
     "lodash": "^4.17.21",
-    "tamagui": "^1.0.1-beta.103"
+    "tamagui": "^1.0.1-beta.104"
   },
   "devDependencies": {
     "@babel/plugin-syntax-typescript": "^7.14.5",

package/src/extractor/createExtractor.ts

@@ -13,9 +13,7 @@ import {
   mediaQueryConfig,
   proxyThemeVariables,
   pseudoDescriptors,
-  stylePropsTransform,
 } from '@tamagui/core-node'
-import { difference, pick } from 'lodash'
 import type { ViewStyle } from 'react-native'
 
 import { FAILED_EVAL } from '../constants'
@@ -371,10 +369,8 @@ export function createExtractor() {
           }
 
           for (const atomic of atomics) {
-            for (const rule of atomic.rules) {
-              out.rulesToInsert = out.rulesToInsert || []
-              out.rulesToInsert.push([atomic.identifier, rule])
-            }
+            out.rulesToInsert = out.rulesToInsert || []
+            out.rulesToInsert.push(atomic)
             classNames[atomic.property] = atomic.identifier
           }
 
@@ -391,8 +387,8 @@ export function createExtractor() {
           }
 
           if (out.rulesToInsert) {
-            for (const [identifier, rule] of out.rulesToInsert) {
-              onStyleRule?.(identifier, [rule])
+            for (const { identifier, rules } of out.rulesToInsert) {
+              onStyleRule?.(identifier, rules)
             }
           }
 
@@ -1706,22 +1702,6 @@ export function createExtractor() {
               }
             }
 
-            function omitInvalidStyles(style: any) {
-              if (staticConfig.validStyles) {
-                for (const key in style) {
-                  if (
-                    stylePropsTransform[key] ||
-                    (!staticConfig.validStyles[key] &&
-                      !pseudoDescriptors[key] &&
-                      !/(hoverStyle|focusStyle|pressStyle)$/.test(key))
-                  ) {
-                    if (shouldPrintDebug) console.log(' delete invalid style', key)
-                    delete style[key]
-                  }
-                }
-              }
-            }
-
             // used to ensure we pass the entire prop bundle to getStyles
             const completeStyles = getStyles(completeProps, 'completeStyles')
 
@@ -1729,33 +1709,6 @@ export function createExtractor() {
               throw new Error(`Impossible, no styles`)
             }
 
-            // any extra styles added in postprocess should be added to first group as they wont be overriden
-            const addInitialStyleKeys = shouldFlatten
-              ? difference(Object.keys(completeStyles), Object.keys(foundStaticProps))
-              : []
-
-            if (addInitialStyleKeys.length) {
-              const toAdd = pick(completeStyles, ...addInitialStyleKeys)
-              const firstGroup = attrs.find((x) => x.type === 'style')
-              if (shouldPrintDebug) {
-                console.log('    toAdd', objToStr(toAdd))
-              }
-              if (!firstGroup) {
-                attrs.unshift({ type: 'style', value: toAdd })
-              } else {
-                // because were adding fully processed, remove any unprocessed from first group
-                omitInvalidStyles(firstGroup.value)
-                Object.assign(firstGroup.value, toAdd)
-              }
-            }
-
-            if (shouldPrintDebug) {
-              // prettier-ignore
-              if (shouldFlatten) console.log('   -- addInitialStyleKeys', addInitialStyleKeys.join(', '))
-              // prettier-ignore
-              // console.log('   -- completeStyles:\n', logLines(objToStr(completeStyles)))
-            }
-
             let getStyleError: any = null
 
             // fix up ternaries, combine final style values
@@ -1815,15 +1768,6 @@ export function createExtractor() {
                         // map to HTML only name
                         attr.value.name.name = INLINE_EXTRACTABLE[name]
                       }
-
-                      // if flattening expand turn variants into styles
-                      if (staticConfig.variants?.[name]) {
-                        const expanded = getStyles({})
-                        // attrs[i] = {
-                        //   type: 'style',
-                        //   value:
-                        // }
-                      }
                     }
                   }
                 }

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

@@ -1 +1 @@
-{"version":3,"file":"createExtractor.d.ts","sourceRoot":"","sources":["../../src/extractor/createExtractor.ts"],"names":[],"mappings":"AAEA,OAAiB,EAAE,QAAQ,EAAW,MAAM,iBAAiB,CAAA;AAC7D,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AACjC,OAAO,EAGL,qBAAqB,EAStB,MAAM,oBAAoB,CAAA;AAK3B,OAAO,EAIL,mBAAmB,EAEpB,MAAM,UAAU,CAAA;AAqCjB,oBAAY,SAAS,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAI1D,wBAAgB,eAAe;;;;;;;;;;;;;;wBAgCb,SAAS,EAAE,OAAO,CAAC,GAAG,MAAM,iSAoBrC,mBAAmB;;;;;;;EA+wD3B"}
+{"version":3,"file":"createExtractor.d.ts","sourceRoot":"","sources":["../../src/extractor/createExtractor.ts"],"names":[],"mappings":"AAEA,OAAiB,EAAE,QAAQ,EAAW,MAAM,iBAAiB,CAAA;AAC7D,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AACjC,OAAO,EAGL,qBAAqB,EAQtB,MAAM,oBAAoB,CAAA;AAI3B,OAAO,EAIL,mBAAmB,EAEpB,MAAM,UAAU,CAAA;AAqCjB,oBAAY,SAAS,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAI1D,wBAAgB,eAAe;;;;;;;;;;;;;;wBAgCb,SAAS,EAAE,OAAO,CAAC,GAAG,MAAM,iSAoBrC,mBAAmB;;;;;;;EAytD3B"}