@tamagui/static 1.2.4 → 1.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/static",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
   "main": "dist/cjs/index.js",
@@ -35,16 +35,16 @@
     "@babel/runtime": "^7.19.4",
     "@babel/traverse": "^7.19.6",
     "@expo/match-media": "^0.3.0",
-    "@tamagui/build": "^1.2.4",
-    "@tamagui/cli-color": "^1.2.4",
-    "@tamagui/config-default-node": "^1.2.4",
-    "@tamagui/core-node": "^1.2.4",
-    "@tamagui/fake-react-native": "^1.2.4",
-    "@tamagui/helpers": "^1.2.4",
-    "@tamagui/helpers-node": "^1.2.4",
-    "@tamagui/proxy-worm": "^1.2.4",
-    "@tamagui/shorthands": "^1.2.4",
-    "@tamagui/types": "^1.2.4",
+    "@tamagui/build": "^1.2.6",
+    "@tamagui/cli-color": "^1.2.6",
+    "@tamagui/config-default-node": "^1.2.6",
+    "@tamagui/core-node": "^1.2.6",
+    "@tamagui/fake-react-native": "^1.2.6",
+    "@tamagui/helpers": "^1.2.6",
+    "@tamagui/helpers-node": "^1.2.6",
+    "@tamagui/proxy-worm": "^1.2.6",
+    "@tamagui/shorthands": "^1.2.6",
+    "@tamagui/types": "^1.2.6",
     "babel-literal-to-ast": "^2.1.0",
     "esbuild": "^0.17.5",
     "esbuild-register": "^3.4.2",
@@ -53,14 +53,14 @@
     "fs-extra": "^11.1.0",
     "invariant": "^2.2.4",
     "lodash": "^4.17.21",
-    "react-native-web-internals": "^1.2.4",
-    "react-native-web-lite": "^1.2.4"
+    "react-native-web-internals": "^1.2.6",
+    "react-native-web-lite": "^1.2.6"
   },
   "devDependencies": {
     "@babel/plugin-syntax-typescript": "^7.18.6",
     "@babel/types": "^7.19.4",
     "@dish/babel-preset": "^0.0.6",
-    "@tamagui/test-design-system": "^1.2.4",
+    "@tamagui/test-design-system": "^1.2.6",
     "@testing-library/react": "^13.4.0",
     "@types/babel__generator": "^7.6.4",
     "@types/babel__traverse": "^7.18.2",

package/src/extractor/createExtractor.ts

@@ -1950,15 +1950,6 @@ export function createExtractor(
             throw new Error(`Impossible, no styles`)
           }
 
-          const isNativeNotFlat = !shouldFlatten && target === 'native'
-          if (isNativeNotFlat) {
-            if (shouldPrintDebug) {
-              logger.info(`Disabled flattening except for simple cases on native for now`)
-            }
-            node.attributes = ogAttributes
-            return null
-          }
-
           let getStyleError: any = null
 
           // fix up ternaries, combine final style values
@@ -2083,9 +2074,19 @@ export function createExtractor(
             }
           }
 
+          const isNativeNotFlat = !shouldFlatten && target === 'native'
+          if (isNativeNotFlat) {
+            if (shouldPrintDebug) {
+              logger.info(`Disabled flattening except for simple cases on native for now`)
+            }
+            node.attributes = ogAttributes
+            return null
+          }
+
           if (shouldPrintDebug) {
             // prettier-ignore
-            logger.info([` ❊❊ inline props (${inlined.size}):`, shouldDeopt ? ' deopted' : '', hasSpread ? ' has spread' : '', staticConfig.neverFlatten ? 'neverFlatten' : ''].join(' '))
+            logger.info([` - inlined props (${inlined.size}):`, shouldDeopt ? ' deopted' : '', hasSpread ? ' has spread' : '', staticConfig.neverFlatten ? 'neverFlatten' : ''].join(' '))
+            logger.info(`  - shouldFlatten/isFlattened: ${shouldFlatten}`)
             logger.info(`  - attrs (end):\n ${logLines(attrs.map(attrStr).join(', '))}`)
           }
 
@@ -2103,6 +2104,9 @@ export function createExtractor(
             completeProps,
             staticConfig,
           })
+        } catch (err) {
+          node.attributes = ogAttributes
+          console.error(`err: ${err}`)
         } finally {
           if (debugPropValue) {
             shouldPrintDebug = ogDebug

package/types/extractor/createExtractor.d.ts

@@ -12,19 +12,7 @@ export declare function createExtractor({ logger }?: ExtractorOptions): {
     cleanupBeforeExit: typeof cleanupBeforeExit;
     loadTamagui: (props: TamaguiOptions) => Promise<TamaguiProjectInfo>;
     loadTamaguiSync: (props: TamaguiOptions) => TamaguiProjectInfo;
-    getTamagui(): import("@tamagui/core-node").TamaguiInternalConfig<import("@tamagui/core-node").CreateTokens<import("@tamagui/core-node").VariableVal>, {
-        [key: string]: Partial<import("@tamagui/core-node").TamaguiBaseTheme> & {
-            [key: string]: import("@tamagui/core-node").VariableVal;
-        };
-    }, import("@tamagui/core-node").GenericShorthands, {
-        [key: string]: {
-            [key: string]: string | number;
-        };
-    }, {
-        [key: string]: string | any[] | {
-            [key: string]: any;
-        };
-    }, import("@tamagui/core-node").GenericFonts> | undefined;
+    getTamagui(): any;
     parseSync: (f: FileOrPath, props: ExtractorParseProps) => {
         styled: number;
         flattened: number;

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,EAIV,gBAAgB,EAChB,mBAAmB,EACnB,cAAc,EAGf,MAAM,aAAa,CAAA;AAapB,OAAO,EACL,iBAAiB,EAElB,MAAM,gCAAgC,CAAA;AAEvC,OAAO,EAAE,kBAAkB,EAAgC,MAAM,kBAAkB,CAAA;AAiCnF,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;AAI9C,wBAAgB,eAAe,CAC7B,EAAE,MAAgB,EAAE,GAAE,gBAAsC;;;;;yBA4BjC,cAAc;6BAPhB,cAAc;;;;;;;;;;;;;;mBAwBtB,UAAU,SAAS,mBAAmB;;;;;;;eAIpC,UAAU,SAAS,mBAAmB;;;;;;;EA88D1D"}
+{"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,EAIV,gBAAgB,EAChB,mBAAmB,EACnB,cAAc,EAGf,MAAM,aAAa,CAAA;AAapB,OAAO,EACL,iBAAiB,EAElB,MAAM,gCAAgC,CAAA;AAEvC,OAAO,EAAE,kBAAkB,EAAgC,MAAM,kBAAkB,CAAA;AAiCnF,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;AAI9C,wBAAgB,eAAe,CAC7B,EAAE,MAAgB,EAAE,GAAE,gBAAsC;;;;;yBA4BjC,cAAc;6BAPhB,cAAc;;mBAwBtB,UAAU,SAAS,mBAAmB;;;;;;;eAIpC,UAAU,SAAS,mBAAmB;;;;;;;EAk9D1D"}

package/types/extractor/extractHelpers.d.ts

@@ -11,14 +11,14 @@ export declare function isValidThemeHook(props: TamaguiOptionsWithFileInfo, jsxP
 export declare const isInsideComponentPackage: (props: TamaguiOptionsWithFileInfo, moduleName: string) => any;
 export declare const isComponentPackage: (props: TamaguiOptionsWithFileInfo, srcName: string) => any;
 export declare function getValidComponent(props: TamaguiOptionsWithFileInfo, moduleName: string, componentName: string): false | {
-    staticConfig: import("@tamagui/core-node").StaticConfigParsed;
+    staticConfig: StaticConfigParsed;
 } | null;
 export declare const isValidModule: (props: TamaguiOptionsWithFileInfo, moduleName: string) => {
     isLocal: boolean;
     isValid: any;
 };
 export declare const getValidImport: (props: TamaguiOptionsWithFileInfo, moduleName: string, componentName?: string) => {
-    staticConfig: import("@tamagui/core-node").StaticConfigParsed;
+    staticConfig: StaticConfigParsed;
 } | null;
 export declare const isValidImport: (props: TamaguiOptionsWithFileInfo, moduleName: string, componentName?: string) => any;
 //# sourceMappingURL=extractHelpers.d.ts.map