@tamagui/static 1.79.8 → 1.79.9

package/dist/esm/getPragmaOptions.native.js

@@ -11,7 +11,7 @@ function getPragmaOptions({
   let shouldPrintDebug = !1, shouldDisable = !1;
   const firstLine = source.slice(0, 800).split(`
 `)[0];
-  return firstLine.includes("tamagui-ignore") && (shouldDisable = !0), firstLine.includes("debug") && (shouldPrintDebug = !0), firstLine.includes("debug-verbose") && (shouldPrintDebug = "verbose"), process.env.TAMAGUI_DEBUG_FILE && path.includes(process.env.TAMAGUI_DEBUG_FILE) && (shouldPrintDebug = "verbose"), process.env.DEBUG?.includes("tamagui") && (shouldPrintDebug = !0), process.env.DEBUG?.includes("tamagui-verbose") && (shouldPrintDebug = "verbose"), {
+  return firstLine.includes("tamagui-ignore") && (shouldDisable = !0), firstLine.includes("debug") && (shouldPrintDebug = !0), firstLine.includes("debug-verbose") && (shouldPrintDebug = "verbose"), process.env.TAMAGUI_DEBUG_FILE && path.includes(process.env.TAMAGUI_DEBUG_FILE) && (shouldPrintDebug = "verbose"), process.env.DEBUG?.includes("tamagui") && (shouldPrintDebug ||= !0), process.env.DEBUG?.includes("tamagui-verbose") && (shouldPrintDebug = "verbose"), {
     shouldPrintDebug,
     shouldDisable
   };

package/dist/esm/getPragmaOptions.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/getPragmaOptions.ts"],
-  "mappings": "AAAO,SAAS,iBAAiB;AAAA,EAC/B;AAAA,EACA;AAAA,EACA;AACF,GAIG;AACD,MAAI,CAAC,uBAAuB,CAAC,OAAO,WAAW,IAAI,KAAK,CAAC,OAAO,WAAW,IAAI;AAC7E,WAAO;AAAA,MACL,kBAAkB;AAAA,MAClB,eAAe;AAAA,IACjB;AAGF,MAAI,mBAAwC,IACxC,gBAAgB;AAGpB,QAAM,YAAY,OAAO,MAAM,GAAG,GAAG,EAAE,MAAM;AAAA,CAAI,EAAE,CAAC;AAEpD,SAAI,UAAU,SAAS,gBAAgB,MACrC,gBAAgB,KAGd,UAAU,SAAS,OAAO,MAC5B,mBAAmB,KAGjB,UAAU,SAAS,eAAe,MACpC,mBAAmB,YAGjB,QAAQ,IAAI,sBACV,KAAK,SAAS,QAAQ,IAAI,kBAAkB,MAC9C,mBAAmB,YAInB,QAAQ,IAAI,OAAO,SAAS,SAAS,MACvC,mBAAmB,KAGjB,QAAQ,IAAI,OAAO,SAAS,iBAAiB,MAC/C,mBAAmB,YAGd;AAAA,IACL;AAAA,IACA;AAAA,EACF;AACF;",
+  "mappings": "AAAO,SAAS,iBAAiB;AAAA,EAC/B;AAAA,EACA;AAAA,EACA;AACF,GAIG;AACD,MAAI,CAAC,uBAAuB,CAAC,OAAO,WAAW,IAAI,KAAK,CAAC,OAAO,WAAW,IAAI;AAC7E,WAAO;AAAA,MACL,kBAAkB;AAAA,MAClB,eAAe;AAAA,IACjB;AAGF,MAAI,mBAAwC,IACxC,gBAAgB;AAGpB,QAAM,YAAY,OAAO,MAAM,GAAG,GAAG,EAAE,MAAM;AAAA,CAAI,EAAE,CAAC;AAEpD,SAAI,UAAU,SAAS,gBAAgB,MACrC,gBAAgB,KAGd,UAAU,SAAS,OAAO,MAC5B,mBAAmB,KAGjB,UAAU,SAAS,eAAe,MACpC,mBAAmB,YAGjB,QAAQ,IAAI,sBACV,KAAK,SAAS,QAAQ,IAAI,kBAAkB,MAC9C,mBAAmB,YAInB,QAAQ,IAAI,OAAO,SAAS,SAAS,MACvC,qBAAqB,KAGnB,QAAQ,IAAI,OAAO,SAAS,iBAAiB,MAC/C,mBAAmB,YAGd;AAAA,IACL;AAAA,IACA;AAAA,EACF;AACF;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/static",
-  "version": "1.79.8",
+  "version": "1.79.9",
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
   "main": "dist/cjs/index.js",
@@ -35,17 +35,17 @@
     "@babel/runtime": "^7.23.2",
     "@babel/traverse": "^7.23.3",
     "@babel/types": "^7.23.3",
-    "@tamagui/build": "1.79.8",
-    "@tamagui/cli-color": "1.79.8",
-    "@tamagui/config-default": "1.79.8",
-    "@tamagui/core": "1.79.8",
-    "@tamagui/fake-react-native": "1.79.8",
-    "@tamagui/generate-themes": "1.79.8",
-    "@tamagui/helpers": "1.79.8",
-    "@tamagui/helpers-node": "1.79.8",
-    "@tamagui/proxy-worm": "1.79.8",
-    "@tamagui/shorthands": "1.79.8",
-    "@tamagui/types": "1.79.8",
+    "@tamagui/build": "1.79.9",
+    "@tamagui/cli-color": "1.79.9",
+    "@tamagui/config-default": "1.79.9",
+    "@tamagui/core": "1.79.9",
+    "@tamagui/fake-react-native": "1.79.9",
+    "@tamagui/generate-themes": "1.79.9",
+    "@tamagui/helpers": "1.79.9",
+    "@tamagui/helpers-node": "1.79.9",
+    "@tamagui/proxy-worm": "1.79.9",
+    "@tamagui/shorthands": "1.79.9",
+    "@tamagui/types": "1.79.9",
     "babel-literal-to-ast": "^2.1.0",
     "esbuild": "~0.19.3",
     "esbuild-register": "^3.4.2",
@@ -55,13 +55,13 @@
     "invariant": "^2.2.4",
     "lodash": "^4.17.21",
     "react-native-web": "^0.19.6",
-    "react-native-web-internals": "1.79.8",
-    "react-native-web-lite": "1.79.8"
+    "react-native-web-internals": "1.79.9",
+    "react-native-web-lite": "1.79.9"
   },
   "devDependencies": {
     "@babel/plugin-syntax-typescript": "^7.23.3",
     "@expo/match-media": "^0.4.0",
-    "@tamagui/test-design-system": "1.79.8",
+    "@tamagui/test-design-system": "1.79.9",
     "@testing-library/react": "^14.0.0",
     "@types/babel__generator": "^7.6.4",
     "@types/babel__traverse": "^7.18.2",

package/src/extractor/bundleConfig.ts

@@ -197,7 +197,8 @@ export async function bundleConfig(props: TamaguiOptions) {
     // map from built back to original module names
     for (const component of components) {
       component.moduleName =
-        baseComponents[componentOutPaths.indexOf(component.moduleName)]
+        baseComponents[componentOutPaths.indexOf(component.moduleName)] ||
+        component.moduleName
 
       if (!component.moduleName) {
         if (process.env.DEBUG?.includes('tamagui') || process.env.IS_TAMAGUI_DEV) {
@@ -210,16 +211,6 @@ export async function bundleConfig(props: TamaguiOptions) {
       }
     }
 
-    // always load core so we can optimize if directly importing
-    const coreComponents = loadComponents({
-      ...props,
-      components: ['@tamagui/core'],
-    })
-    if (coreComponents) {
-      coreComponents[0].moduleName = '@tamagui/core'
-      components = [...components, ...coreComponents]
-    }
-
     if (
       process.env.NODE_ENV === 'development' &&
       process.env.DEBUG?.startsWith('tamagui')
@@ -250,7 +241,32 @@ export async function bundleConfig(props: TamaguiOptions) {
   }
 }
 
-export function loadComponents(
+export function loadComponents(props: TamaguiOptions, forceExports = false) {
+  const coreComponents = getCoreComponents(props)
+  const otherComponents = loadComponentsInner(props, forceExports)
+  return [...coreComponents, ...(otherComponents || [])]
+}
+
+function getCoreComponents(props: TamaguiOptions) {
+  const loaded = loadComponentsInner({
+    ...props,
+    components: ['@tamagui/core'],
+  })
+
+  if (!loaded) {
+    throw new Error(`Core should always load`)
+  }
+
+  // always load core so we can optimize if directly importing
+  return [
+    {
+      ...loaded[0],
+      moduleName: '@tamagui/core',
+    },
+  ]
+}
+
+export function loadComponentsInner(
   props: TamaguiOptions,
   forceExports = false
 ): null | LoadedComponents[] {

package/src/extractor/createExtractor.ts

@@ -328,9 +328,7 @@ export function createExtractor(
       )
       logger.info(
         `valid import paths: ${JSON.stringify(
-          getValidComponentsPaths(propsWithFileInfo),
-          null,
-          2
+          getValidComponentsPaths(propsWithFileInfo)
         )}`
       )
     }
@@ -2300,7 +2298,12 @@ export function createExtractor(
           })
         } catch (err: any) {
           node.attributes = ogAttributes
-          console.error(`@tamagui/static Error: ${err.message} ${err.stack}`)
+          console.error(
+            `@tamagui/static error, reverting optimization. In ${filePath} ${lineNumbers} on ${originalNodeName}: ${err.message}. For stack trace set environment TAMAGUI_DEBUG=1`
+          )
+          if (process.env.TAMAGUI_DEBUG === '1') {
+            console.error(err.stack)
+          }
         } finally {
           if (debugPropValue) {
             shouldPrintDebug = ogDebug

package/src/getPragmaOptions.ts

@@ -39,7 +39,7 @@ export function getPragmaOptions({
   }
 
   if (process.env.DEBUG?.includes('tamagui')) {
-    shouldPrintDebug = true
+    shouldPrintDebug ||= true
   }
 
   if (process.env.DEBUG?.includes('tamagui-verbose')) {

package/types/extractor/bundleConfig.d.ts

@@ -36,6 +36,7 @@ export declare function bundleConfig(props: TamaguiOptions): Promise<{
     nameToPaths: {};
     tamaguiConfig: any;
 } | undefined>;
-export declare function loadComponents(props: TamaguiOptions, forceExports?: boolean): null | LoadedComponents[];
+export declare function loadComponents(props: TamaguiOptions, forceExports?: boolean): LoadedComponents[];
+export declare function loadComponentsInner(props: TamaguiOptions, forceExports?: boolean): null | LoadedComponents[];
 export {};
 //# sourceMappingURL=bundleConfig.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"bundleConfig.d.ts","sourceRoot":"","sources":["../../src/extractor/bundleConfig.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAKvE,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAKzC,KAAK,WAAW,GAAG;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAChB,MAAM,EACN;QACE,YAAY,EAAE,YAAY,CAAA;KAC3B,CACF,CAAA;CACF,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,UAAU,CAAC,EAAE,gBAAgB,EAAE,CAAA;IAC/B,aAAa,CAAC,EAAE,qBAAqB,GAAG,IAAI,CAAA;IAC5C,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,CAAA;AAgBD,eAAO,MAAM,cAAc;;;;;;;;CAMK,CAAA;AAEhC,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,EAAE,SAAS,CAAC,CAAA;AAQxF,wBAAgB,uBAAuB,YAMtC;AAED,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,cAAc,EAAE,OAAO,UAAQ;;;;sBAS5E;AAED,wBAAsB,YAAY,CAAC,KAAK,EAAE,cAAc;;;;eAmKvD;AAED,wBAAgB,cAAc,CAC5B,KAAK,EAAE,cAAc,EACrB,YAAY,UAAQ,GACnB,IAAI,GAAG,gBAAgB,EAAE,CAoI3B"}
+{"version":3,"file":"bundleConfig.d.ts","sourceRoot":"","sources":["../../src/extractor/bundleConfig.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAKvE,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAKzC,KAAK,WAAW,GAAG;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAChB,MAAM,EACN;QACE,YAAY,EAAE,YAAY,CAAA;KAC3B,CACF,CAAA;CACF,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,UAAU,CAAC,EAAE,gBAAgB,EAAE,CAAA;IAC/B,aAAa,CAAC,EAAE,qBAAqB,GAAG,IAAI,CAAA;IAC5C,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,CAAA;AAgBD,eAAO,MAAM,cAAc;;;;;;;;CAMK,CAAA;AAEhC,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,EAAE,SAAS,CAAC,CAAA;AAQxF,wBAAgB,uBAAuB,YAMtC;AAED,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,cAAc,EAAE,OAAO,UAAQ;;;;sBAS5E;AAED,wBAAsB,YAAY,CAAC,KAAK,EAAE,cAAc;;;;eA0JvD;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,cAAc,EAAE,YAAY,UAAQ,sBAIzE;AAqBD,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,cAAc,EACrB,YAAY,UAAQ,GACnB,IAAI,GAAG,gBAAgB,EAAE,CAoI3B"}

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;;;;;;;EAooE1D"}
+{"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;;;;;;;EAuoE1D"}