@tamagui/static 1.121.10 → 1.121.12-1737177163952

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/static",
-  "version": "1.121.10",
+  "version": "1.121.12-1737177163952",
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
   "type": "commonjs",
@@ -44,23 +44,23 @@
     "@babel/runtime": "^7.25.4",
     "@babel/traverse": "^7.25.4",
     "@babel/types": "^7.25.4",
-    "@tamagui/build": "1.121.10",
-    "@tamagui/cli-color": "1.121.10",
-    "@tamagui/config-default": "1.121.10",
-    "@tamagui/core": "1.121.10",
-    "@tamagui/fake-react-native": "1.121.10",
-    "@tamagui/generate-themes": "1.121.10",
-    "@tamagui/helpers": "1.121.10",
-    "@tamagui/helpers-node": "1.121.10",
-    "@tamagui/proxy-worm": "1.121.10",
-    "@tamagui/react-native-web-internals": "1.121.10",
-    "@tamagui/react-native-web-lite": "1.121.10",
-    "@tamagui/shorthands": "1.121.10",
-    "@tamagui/types": "1.121.10",
+    "@tamagui/build": "1.121.12-1737177163952",
+    "@tamagui/cli-color": "1.121.12-1737177163952",
+    "@tamagui/config-default": "1.121.12-1737177163952",
+    "@tamagui/core": "1.121.12-1737177163952",
+    "@tamagui/fake-react-native": "1.121.12-1737177163952",
+    "@tamagui/generate-themes": "1.121.12-1737177163952",
+    "@tamagui/helpers": "1.121.12-1737177163952",
+    "@tamagui/helpers-node": "1.121.12-1737177163952",
+    "@tamagui/proxy-worm": "1.121.12-1737177163952",
+    "@tamagui/react-native-web-internals": "1.121.12-1737177163952",
+    "@tamagui/react-native-web-lite": "1.121.12-1737177163952",
+    "@tamagui/shorthands": "1.121.12-1737177163952",
+    "@tamagui/types": "1.121.12-1737177163952",
     "babel-literal-to-ast": "^2.1.0",
     "browserslist": "^4.22.2",
     "check-dependency-version-consistency": "^4.1.0",
-    "esbuild": "^0.24.0",
+    "esbuild": "^0.24.2",
     "esbuild-register": "^3.6.0",
     "fast-glob": "^3.2.11",
     "find-cache-dir": "^3.3.2",

package/src/extractor/bundle.ts

@@ -67,7 +67,7 @@ function getESBuildConfig(
     bundle: true,
     entryPoints: resolvedEntryPoints,
     format: 'cjs',
-    target: 'node16',
+    target: 'node20',
     jsx: 'transform',
     jsxFactory: 'react',
     allowOverwrite: true,

package/src/extractor/bundleConfig.ts

@@ -148,7 +148,7 @@ export async function bundleConfig(props: TamaguiOptions) {
                 entryPoints: [configEntry],
                 external,
                 outfile: configOutPath,
-                target: 'node16',
+                target: 'node20',
                 ...esbuildExtraOptions,
               },
               props.platform || 'web'
@@ -161,7 +161,7 @@ export async function bundleConfig(props: TamaguiOptions) {
               resolvePlatformSpecificEntries: true,
               external,
               outfile: componentOutPaths[i],
-              target: 'node16',
+              target: 'node20',
               ...esbuildExtraOptions,
             },
             props.platform || 'web'

package/src/extractor/createExtractor.ts

@@ -952,11 +952,17 @@ export function createExtractor(
             .get('openingElement')
             .get('attributes')
             .flatMap((path) => {
+              // avoid work
+              if (shouldDeopt) {
+                return
+              }
+
               try {
                 const res = evaluateAttribute(path)
                 if (!res) {
                   path.remove()
                 }
+
                 return res
               } catch (err: any) {
                 if (shouldPrintDebug) {
@@ -1047,6 +1053,14 @@ export function createExtractor(
 
             const name = attribute.name.name
 
+            // in tamagui style is handled at the end of the style loop so its not as simple as just
+            // adding this as a "style" property
+            // its not used often when using tamagui so not optimizing it for now
+            if (name === 'style') {
+              shouldDeopt = true
+              return null
+            }
+
             if (excludeProps?.has(name)) {
               if (shouldPrintDebug) {
                 logger.info(['  excluding prop', name].join(' '))
@@ -1174,23 +1188,15 @@ export function createExtractor(
             // never flatten if a prop isn't a valid static attribute
             // only post prop-mapping
             if (!variants[name] && !isValidStyleKey(name, staticConfig)) {
-              let keys = [name]
               let out: any = null
 
               // for now passing empty props {}, a bit odd, need to at least document
               // for now we don't expose custom components so just noting behavior
-              out = propMapper(name, styleValue, propMapperStyleState)
+              propMapper(name, styleValue, propMapperStyleState, false, (key, val) => {
+                out ||= {}
+                out[key] = val
+              })
 
-              if (out) {
-                if (!Array.isArray(out)) {
-                  logger.warn(`Error expected array but got`, out)
-                  couldntParse = true
-                  shouldDeopt = true
-                } else {
-                  out = Object.fromEntries(out)
-                  keys = Object.keys(out)
-                }
-              }
               if (out) {
                 if (isTargetingHTML) {
                   // translate to DOM-compat
@@ -1201,12 +1207,10 @@ export function createExtractor(
                   // remove className - we dont use rnw styling
                   delete out.className
                 }
-
-                keys = Object.keys(out)
               }
 
               let didInline = false
-              const attributes = keys.map((key) => {
+              const attributes = Object.keys(out).map((key) => {
                 const val = out[key]
                 const isStyle = isValidStyleKey(key, staticConfig)
                 if (isStyle) {
@@ -1898,9 +1902,17 @@ export function createExtractor(
                       props: completeProps,
                     }
 
-                    let out = Object.fromEntries(
-                      propMapper(name, variantValues.get(name), styleState) || []
+                    let out: Record<string, any> = {}
+                    propMapper(
+                      name,
+                      variantValues.get(name),
+                      styleState,
+                      false,
+                      (key, val) => {
+                        out[key] = val
+                      }
                     )
+
                     if (out && isTargetingHTML) {
                       const cn = out.className
                       // translate to DOM-compat

package/src/extractor/loadTamagui.ts

@@ -189,6 +189,10 @@ export function loadTamaguiSync({
         const configPath = getTamaguiConfigPathFromOptionsConfig(propsIn.config)
         const exp = require(configPath)
 
+        if (!exp || exp._isProxyWorm) {
+          throw new Error(`Got a empty / proxied config!`)
+        }
+
         tamaguiConfig = (exp['default'] || exp['config'] || exp) as TamaguiInternalConfig
 
         if (!tamaguiConfig || !tamaguiConfig.parsed) {
@@ -365,7 +369,7 @@ export async function esbuildWatchFiles(entry: string, onChanged: () => void) {
 
     alias: {
       '@react-native/normalize-color': '@tamagui/proxy-worm',
-      'react-native-web': '@tamagui/proxy-worm',
+      'react-native-web': '@tamagui/react-native-web-lite',
       'react-native': '@tamagui/proxy-worm',
     },
 

package/src/registerRequire.ts

@@ -1,17 +1,15 @@
 import { register } from 'esbuild-register/dist/node'
 
+import { esbuildIgnoreFilesRegex } from './extractor/bundle'
 import { requireTamaguiCore } from './helpers/requireTamaguiCore'
 import type { TamaguiPlatform } from './types'
-import { esbuildIgnoreFilesRegex } from './extractor/bundle'
 
 const nameToPaths = {}
 
 export const getNameToPaths = () => nameToPaths
 
 const Module = require('node:module')
-const packageJson = require('react-native-web/package.json')
 const proxyWorm = require('@tamagui/proxy-worm')
-const rnw = require('react-native-web')
 
 let isRegistered = false
 let og: any
@@ -62,37 +60,36 @@ export function registerRequire(
       })
     }
 
-    if (path in compiled) {
-      return compiled[path]
+    if (
+      path in knownIgnorableModules ||
+      path.startsWith('react-native-reanimated') ||
+      esbuildIgnoreFilesRegex.test(path)
+    ) {
+      return proxyWorm
     }
 
-    if (esbuildIgnoreFilesRegex.test(path)) {
-      return {}
+    if (path in compiled) {
+      return compiled[path]
     }
 
     if (path === 'react-native-svg') {
       return og.apply(this, ['@tamagui/react-native-svg'])
     }
 
-    if (
-      path === '@gorhom/bottom-sheet' ||
-      path.startsWith('react-native-reanimated') ||
-      path === 'expo-linear-gradient' ||
-      path === '@expo/vector-icons' ||
-      path === 'tamagui/linear-gradient'
-    ) {
-      return proxyWorm
-    }
     if (path === 'react-native/package.json') {
-      return packageJson
-    }
-
-    if (path === '@tamagui/react-native-web-lite' || path.startsWith('react-native')) {
-      return rnw
+      return og.apply(this, ['react-native-web/package.json'])
     }
 
-    if (path in knownIgnorableModules) {
-      return proxyWorm
+    if (
+      path === '@tamagui/react-native-web-lite' ||
+      path === 'react-native' ||
+      path.startsWith('react-native/')
+    ) {
+      try {
+        return og.apply('react-native')
+      } catch {
+        return og.apply(this, ['@tamagui/react-native-web-lite'])
+      }
     }
 
     if (!whitelisted[path]) {
@@ -156,7 +153,7 @@ export function registerRequire(
          */
 
         console.error(
-          `Tamagui failed loading "${path}"
+          `Tamagui failed to require() "${path}"
   
   ${err.message}
   ${err.stack}
@@ -184,8 +181,12 @@ const extraIgnores =
   IGNORES === 'true' ? [] : process.env.TAMAGUI_IGNORE_BUNDLE_ERRORS?.split(',')
 
 const knownIgnorableModules = {
+  '@gorhom/bottom-sheet': true,
   'expo-modules': true,
   solito: true,
+  'expo-linear-gradient': true,
+  '@expo/vector-icons': true,
+  'tamagui/linear-gradient': true,
   ...Object.fromEntries(extraIgnores?.map((k) => [k, true]) || []),
 }
 

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;AAiBjC,OAAO,KAAK,EAGV,gBAAgB,EAChB,mBAAmB,EACnB,cAAc,EAGf,MAAM,UAAU,CAAA;AACjB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAcxD,OAAO,EAAE,iBAAiB,EAA6B,MAAM,6BAA6B,CAAA;AAkB1F,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,QAAgB,EAAE,GAAE,gBAAsC;;;;;yBAyDnD,cAAc;6BAPhB,cAAc;;mBAwBtB,UAAU,SAAS,mBAAmB;;;;;;;eAIpC,UAAU,SAAS,mBAAmB;;;;;;;EAgvE1D"}
+{"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;AAiBjC,OAAO,KAAK,EAGV,gBAAgB,EAChB,mBAAmB,EACnB,cAAc,EAGf,MAAM,UAAU,CAAA;AACjB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAcxD,OAAO,EAAE,iBAAiB,EAA6B,MAAM,6BAA6B,CAAA;AAkB1F,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,QAAgB,EAAE,GAAE,gBAAsC;;;;;yBAyDnD,cAAc;6BAPhB,cAAc;;mBAwBtB,UAAU,SAAS,mBAAmB;;;;;;;eAIpC,UAAU,SAAS,mBAAmB;;;;;;;EA4vE1D"}

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

@@ -1 +1 @@
-{"version":3,"file":"loadTamagui.d.ts","sourceRoot":"","sources":["../../src/extractor/loadTamagui.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAQxF,OAAO,EACL,KAAK,kBAAkB,EAMxB,MAAM,gBAAgB,CAAA;AAkBvB,wBAAsB,WAAW,CAC/B,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,GAC/B,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CA0CpC;AAKD,eAAO,MAAM,oBAAoB,YAAmB,cAAc,mCA6BjE,CAAA;AAKD,wBAAgB,0BAA0B,CACxC,cAAc,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,SAAS,GA2B9C,cAAc,CACpB;AAGD,wBAAgB,eAAe,CAAC,EAC9B,YAAY,EACZ,QAAQ,EACR,GAAG,OAAO,EACX,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG;IAC3B,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,GAAG,kBAAkB,CA+GrB;AAED,wBAAsB,UAAU,CAAC,EAC/B,IAAoB,EACpB,YAA8B,EAC9B,cAAc,EACd,IAAI,EACJ,KAAK,GACN,GAAE,OAAO,CAAC,cAAc,CAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAgC5D;AAED,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,MAAM,UAW5D;AA0BD,YAAY,EAAE,kBAAkB,EAAE,CAAA;AAElC,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,IAAI,uBAyD3E"}
+{"version":3,"file":"loadTamagui.d.ts","sourceRoot":"","sources":["../../src/extractor/loadTamagui.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAQxF,OAAO,EACL,KAAK,kBAAkB,EAMxB,MAAM,gBAAgB,CAAA;AAkBvB,wBAAsB,WAAW,CAC/B,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,GAC/B,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CA0CpC;AAKD,eAAO,MAAM,oBAAoB,YAAmB,cAAc,mCA6BjE,CAAA;AAKD,wBAAgB,0BAA0B,CACxC,cAAc,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,SAAS,GA2B9C,cAAc,CACpB;AAGD,wBAAgB,eAAe,CAAC,EAC9B,YAAY,EACZ,QAAQ,EACR,GAAG,OAAO,EACX,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG;IAC3B,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,GAAG,kBAAkB,CAmHrB;AAED,wBAAsB,UAAU,CAAC,EAC/B,IAAoB,EACpB,YAA8B,EAC9B,cAAc,EACd,IAAI,EACJ,KAAK,GACN,GAAE,OAAO,CAAC,cAAc,CAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAgC5D;AAED,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,MAAM,UAW5D;AA0BD,YAAY,EAAE,kBAAkB,EAAE,CAAA;AAElC,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,IAAI,uBAyD3E"}

package/types/registerRequire.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registerRequire.d.ts","sourceRoot":"","sources":["../src/registerRequire.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAK9C,eAAO,MAAM,cAAc,UAAoB,CAAA;AAe/C,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,QAEzD;AAED,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,eAAe,EACzB,EAAE,gBAAgB,EAAE;;CAEnB;2BAsB6B,GAAG,QAAQ,MAAM;;EA8HhD"}
+{"version":3,"file":"registerRequire.d.ts","sourceRoot":"","sources":["../src/registerRequire.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAI9C,eAAO,MAAM,cAAc,UAAoB,CAAA;AAa/C,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,QAEzD;AAED,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,eAAe,EACzB,EAAE,gBAAgB,EAAE;;CAEnB;2BAsB6B,GAAG,QAAQ,MAAM;;EA6HhD"}