@tamagui/static 1.75.5 → 1.75.7

package/src/extractor/createExtractor.ts

@@ -326,6 +326,13 @@ export function createExtractor(
           .map((k) => k.moduleName)
           .join(', ')}`
       )
+      logger.info(
+        `valid import paths: ${JSON.stringify(
+          getValidComponentsPaths(propsWithFileInfo),
+          null,
+          2
+        )}`
+      )
     }
 
     let doesUseValidImport = false
@@ -345,6 +352,10 @@ export function createExtractor(
         importDeclarations.push(node)
       }
 
+      if (shouldPrintDebug === 'verbose') {
+        logger.info(` - import ${moduleName} ${valid}`)
+      }
+
       if (extractStyledDefinitions) {
         if (valid) {
           if (node.specifiers.some((specifier) => specifier.local.name === 'styled')) {
@@ -672,11 +683,19 @@ export function createExtractor(
         const componentName = findComponentName(traversePath.scope)
         const closingElement = traversePath.node.closingElement
 
+        if (shouldPrintDebug) {
+          logger.info(` start ${node.name}`)
+        }
+
         // skip non-identifier opening elements (member expressions, etc.)
         if (
-          t.isJSXMemberExpression(closingElement?.name) ||
+          (closingElement && t.isJSXMemberExpression(closingElement?.name)) ||
           !t.isJSXIdentifier(node.name)
         ) {
+          if (shouldPrintDebug) {
+            logger.info(` skip non-identifier element`)
+          }
+
           return
         }
 
@@ -812,6 +831,8 @@ export function createExtractor(
             'animation',
             'disableOptimization',
 
+            ...(!isTargetingHTML ? ['pressStyle', 'focusStyle'] : []),
+
             // when using a non-CSS driver, de-opt on enterStyle/exitStyle
             ...(tamaguiConfig?.animations.isReactNative
               ? ['enterStyle', 'exitStyle']
@@ -1593,8 +1614,11 @@ export function createExtractor(
 
           // if it accesses any theme values during evaluation
           themeAccessListeners.add((key) => {
-            usedThemeKeys.add(key)
+            if (options.experimentalFlattenThemesOnNative) {
+              usedThemeKeys.add(key)
+            }
             if (disableExtractVariables) {
+              usedThemeKeys.add(key)
               shouldFlatten = false
               if (shouldPrintDebug === 'verbose') {
                 logger.info([' ! accessing theme key, avoid flatten', key].join(' '))
@@ -1719,7 +1743,10 @@ export function createExtractor(
               if (staticConfig.variants && key in staticConfig.variants) {
                 mergeToEnd(res, key, style[key])
               } else {
-                const expanded = expandStylesAndRemoveNullishValues({ [key]: style[key] })
+                const expanded = expandStylesAndRemoveNullishValues(
+                  { [key]: style[key] },
+                  true
+                )
                 for (const key in expanded) {
                   mergeToEnd(res, key, expanded[key])
                 }
@@ -1942,6 +1969,13 @@ export function createExtractor(
                 ...out.pseudos,
               }
 
+              // check de-opt props again
+              for (const key in outProps) {
+                if (deoptProps.has(key)) {
+                  shouldFlatten = false
+                }
+              }
+
               if (options.experimentalFlattenThemesOnNative) {
                 if (usedThemeKeys.size > 0) {
                   Object.entries(props).forEach(([key, value]) => {

package/src/extractor/extractHelpers.ts

@@ -203,8 +203,9 @@ const getValidComponentPackages = memoize((props: TamaguiOptionsWithFileInfo) =>
 })
 
 export const getValidComponentsPaths = memoize((props: TamaguiOptionsWithFileInfo) => {
-  return getValidComponentPackages(props).map((pkg) => {
+  return getValidComponentPackages(props).flatMap((pkg) => {
     const root = findRoot(pkg)
-    return basename(root)
+    const based = basename(root)
+    return [based, pkg].filter(Boolean)
   })
 })

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

@@ -1 +1 @@
-{"version":3,"file":"createExtractor.d.ts","sourceRoot":"","sources":["../../src/extractor/createExtractor.ts"],"names":[],"mappings":"AAGA,OAAiB,EAAE,QAAQ,EAAmB,MAAM,iBAAiB,CAAA;AACrE,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAcjC,OAAO,KAAK,EAGV,gBAAgB,EAChB,mBAAmB,EACnB,cAAc,EAGf,MAAM,UAAU,CAAA;AACjB,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAcnD,OAAO,EAAE,iBAAiB,EAA6B,MAAM,6BAA6B,CAAA;AAmC1F,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;AAQ9C,wBAAgB,eAAe,CAC7B,EAAE,MAAgB,EAAE,GAAE,gBAAsC;;;;;yBA0CjC,cAAc;6BAPhB,cAAc;;mBAwBtB,UAAU,SAAS,mBAAmB;;;;;;;eAIpC,UAAU,SAAS,mBAAmB;;;;;;;EA8jE1D"}
+{"version":3,"file":"createExtractor.d.ts","sourceRoot":"","sources":["../../src/extractor/createExtractor.ts"],"names":[],"mappings":"AAGA,OAAiB,EAAE,QAAQ,EAAmB,MAAM,iBAAiB,CAAA;AACrE,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAcjC,OAAO,KAAK,EAGV,gBAAgB,EAChB,mBAAmB,EACnB,cAAc,EAGf,MAAM,UAAU,CAAA;AACjB,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAcnD,OAAO,EAAE,iBAAiB,EAA6B,MAAM,6BAA6B,CAAA;AAmC1F,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;AAQ9C,wBAAgB,eAAe,CAC7B,EAAE,MAAgB,EAAE,GAAE,gBAAsC;;;;;yBA0CjC,cAAc;6BAPhB,cAAc;;mBAwBtB,UAAU,SAAS,mBAAmB;;;;;;;eAIpC,UAAU,SAAS,mBAAmB;;;;;;;EAgmE1D"}

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

@@ -1 +1 @@
-{"version":3,"file":"extractHelpers.d.ts","sourceRoot":"","sources":["../../src/extractor/extractHelpers.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAIjC,OAAO,KAAK,EAAE,aAAa,EAAE,0BAA0B,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAIlF,wBAAgB,SAAS,CAAC,CAAC,SAAS,MAAM,EACxC,KAAK,EAAE,IAAI,GAAG,IAAI,GAAG,SAAS,GAAG,CAAC,GACjC,KAAK,IAAI,CAAC,CAEZ;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC,kBAAkB,WAExD;AAED,eAAO,MAAM,OAAO,UAAW,aAAa,6BAQ3C,CAAA;AAED,eAAO,MAAM,QAAQ,QAAS,GAAG,yBAgBhC,CAAA;AASD,eAAO,MAAM,UAAU,MAAO,OAAO,WAgBpC,CAAA;AAID,wBAAgB,iBAAiB,CAAC,KAAK,KAAA,sBAoBtC;AAED,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,0BAA0B,EACjC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,EAC/B,CAAC,EAAE,CAAC,CAAC,gBAAgB,EACrB,UAAU,CAAC,EAAE,MAAM,WAkBpB;AAED,eAAO,MAAM,wBAAwB,UAC5B,0BAA0B,cACrB,MAAM,QAKnB,CAAA;AAED,eAAO,MAAM,kBAAkB,UACtB,0BAA0B,WACxB,MAAM,QAKhB,CAAA;AAED,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,0BAA0B,EACjC,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM;;SAiBtB;AAED,eAAO,MAAM,aAAa,UAAW,0BAA0B,cAAc,MAAM;;;CAWlF,CAAA;AAED,eAAO,MAAM,cAAc,UAClB,0BAA0B,cACrB,MAAM,kBACF,MAAM;;QAOvB,CAAA;AAED,eAAO,MAAM,aAAa,UACjB,0BAA0B,cACrB,MAAM,kBACF,MAAM,QAMvB,CAAA;AAOD,eAAO,MAAM,uBAAuB;;;CAKlC,CAAA"}
+{"version":3,"file":"extractHelpers.d.ts","sourceRoot":"","sources":["../../src/extractor/extractHelpers.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAIjC,OAAO,KAAK,EAAE,aAAa,EAAE,0BAA0B,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAIlF,wBAAgB,SAAS,CAAC,CAAC,SAAS,MAAM,EACxC,KAAK,EAAE,IAAI,GAAG,IAAI,GAAG,SAAS,GAAG,CAAC,GACjC,KAAK,IAAI,CAAC,CAEZ;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC,kBAAkB,WAExD;AAED,eAAO,MAAM,OAAO,UAAW,aAAa,6BAQ3C,CAAA;AAED,eAAO,MAAM,QAAQ,QAAS,GAAG,yBAgBhC,CAAA;AASD,eAAO,MAAM,UAAU,MAAO,OAAO,WAgBpC,CAAA;AAID,wBAAgB,iBAAiB,CAAC,KAAK,KAAA,sBAoBtC;AAED,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,0BAA0B,EACjC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,EAC/B,CAAC,EAAE,CAAC,CAAC,gBAAgB,EACrB,UAAU,CAAC,EAAE,MAAM,WAkBpB;AAED,eAAO,MAAM,wBAAwB,UAC5B,0BAA0B,cACrB,MAAM,QAKnB,CAAA;AAED,eAAO,MAAM,kBAAkB,UACtB,0BAA0B,WACxB,MAAM,QAKhB,CAAA;AAED,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,0BAA0B,EACjC,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM;;SAiBtB;AAED,eAAO,MAAM,aAAa,UAAW,0BAA0B,cAAc,MAAM;;;CAWlF,CAAA;AAED,eAAO,MAAM,cAAc,UAClB,0BAA0B,cACrB,MAAM,kBACF,MAAM;;QAOvB,CAAA;AAED,eAAO,MAAM,aAAa,UACjB,0BAA0B,cACrB,MAAM,kBACF,MAAM,QAMvB,CAAA;AAOD,eAAO,MAAM,uBAAuB;;;CAMlC,CAAA"}