@tamagui/static 1.0.0-beta.207 → 1.0.0-beta.208

package/dist/esm/extractor/loadTamagui.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/extractor/loadTamagui.ts"],
-  "sourcesContent": ["import { join } from 'path'\n\nimport type { TamaguiComponent, TamaguiInternalConfig } from '@tamagui/core'\nimport { createTamagui } from '@tamagui/core-node'\n\nlet loadedTamagui: any = null\n\nexport function loadTamagui(props: { components: string[]; config: string }): {\n  components: Record<string, TamaguiComponent>\n  tamaguiConfig: TamaguiInternalConfig\n} {\n  if (loadedTamagui) {\n    return loadedTamagui\n  }\n\n  // lets shim require and avoid importing react-native + react-native-web\n  // we just need to read the config around them\n  process.env.IS_STATIC = 'is_static'\n  const proxyWorm = require('@tamagui/proxy-worm')\n  const rnw = require('react-native-web')\n  const Mod = require('module')\n  const og = Mod.prototype.require\n  Mod.prototype.require = function (path: string) {\n    if (path.endsWith('.css')) {\n      return {}\n    }\n    if (path === '@gorhom/bottom-sheet' || path.startsWith('react-native-reanimated')) {\n      return proxyWorm\n    }\n    if (\n      path.startsWith('react-native') &&\n      // allow our rnw.tsx imports through\n      !path.startsWith('react-native-web/dist/cjs/exports')\n    ) {\n      return rnw\n    }\n    try {\n      return og.apply(this, arguments)\n    } catch (err: any) {\n      console.error('Tamagui error loading file:\\n')\n      console.log('   ', path, '\\n')\n      console.log(err.message)\n      console.log(err.stack)\n      // avoid infinite loops\n      process.exit(1)\n    }\n  }\n\n  // import config\n  const configPath = join(process.cwd(), props.config)\n  const tamaguiConfigExport = require(configPath)\n  const tamaguiConfig = (tamaguiConfigExport['default'] ||\n    tamaguiConfigExport) as TamaguiInternalConfig\n\n  if (!tamaguiConfig || !tamaguiConfig.parsed) {\n    try {\n      const confPath = require.resolve(configPath)\n      console.log(`Received:`, tamaguiConfigExport)\n      throw new Error(`Can't find valid config in ${confPath}`)\n    } catch (err) {\n      throw err\n    }\n  }\n\n  // import components\n  const components = {}\n  for (const module of props.components) {\n    const exported = require(module)\n    Object.assign(components, exported)\n  }\n\n  // undo shims\n  process.env.IS_STATIC = undefined\n  Mod.prototype.require = og\n\n  // set up core-node\n  createTamagui(tamaguiConfig)\n\n  loadedTamagui = {\n    components,\n    tamaguiConfig,\n  }\n\n  return loadedTamagui\n}\n"],
-  "mappings": ";;AAAA;AAGA;AAEA,IAAI,gBAAqB;AAElB,qBAAqB,OAG1B;AACA,MAAI,eAAe;AACjB,WAAO;AAAA,EACT;AAIA,UAAQ,IAAI,YAAY;AACxB,QAAM,YAAY,QAAQ,qBAAqB;AAC/C,QAAM,MAAM,QAAQ,kBAAkB;AACtC,QAAM,MAAM,QAAQ,QAAQ;AAC5B,QAAM,KAAK,IAAI,UAAU;AACzB,MAAI,UAAU,UAAU,SAAU,MAAc;AAC9C,QAAI,KAAK,SAAS,MAAM,GAAG;AACzB,aAAO,CAAC;AAAA,IACV;AACA,QAAI,SAAS,0BAA0B,KAAK,WAAW,yBAAyB,GAAG;AACjF,aAAO;AAAA,IACT;AACA,QACE,KAAK,WAAW,cAAc,KAE9B,CAAC,KAAK,WAAW,mCAAmC,GACpD;AACA,aAAO;AAAA,IACT;AACA,QAAI;AACF,aAAO,GAAG,MAAM,MAAM,SAAS;AAAA,IACjC,SAAS,KAAP;AACA,cAAQ,MAAM,+BAA+B;AAC7C,cAAQ,IAAI,OAAO,MAAM,IAAI;AAC7B,cAAQ,IAAI,IAAI,OAAO;AACvB,cAAQ,IAAI,IAAI,KAAK;AAErB,cAAQ,KAAK,CAAC;AAAA,IAChB;AAAA,EACF;AAGA,QAAM,aAAa,KAAK,QAAQ,IAAI,GAAG,MAAM,MAAM;AACnD,QAAM,sBAAsB,QAAQ,UAAU;AAC9C,QAAM,gBAAiB,oBAAoB,cACzC;AAEF,MAAI,CAAC,iBAAiB,CAAC,cAAc,QAAQ;AAC3C,QAAI;AACF,YAAM,WAA2B,AAAhB,QAAQ,QAAQ;AACjC,cAAQ,IAAI,aAAa,mBAAmB;AAC5C,YAAM,IAAI,MAAM,8BAA8B,UAAU;AAAA,IAC1D,SAAS,KAAP;AACA,YAAM;AAAA,IACR;AAAA,EACF;AAGA,QAAM,aAAa,CAAC;AACpB,aAAW,UAAU,MAAM,YAAY;AACrC,UAAM,WAAW,QAAQ,MAAM;AAC/B,WAAO,OAAO,YAAY,QAAQ;AAAA,EACpC;AAGA,UAAQ,IAAI,YAAY;AACxB,MAAI,UAAU,UAAU;AAGxB,gBAAc,aAAa;AAE3B,kBAAgB;AAAA,IACd;AAAA,IACA;AAAA,EACF;AAEA,SAAO;AACT;AA7EgB;",
+  "sourcesContent": ["import { join } from 'path'\n\nimport type { TamaguiComponent, TamaguiInternalConfig } from '@tamagui/core'\nimport { createTamagui } from '@tamagui/core-node'\n\nlet loadedTamagui: any = null\n\nexport function loadTamagui(props: { components: string[]; config: string }): {\n  components: Record<string, TamaguiComponent>\n  tamaguiConfig: TamaguiInternalConfig\n} {\n  if (loadedTamagui) {\n    return loadedTamagui\n  }\n\n  // lets shim require and avoid importing react-native + react-native-web\n  // we just need to read the config around them\n  process.env.IS_STATIC = 'is_static'\n  const proxyWorm = require('@tamagui/proxy-worm')\n  const rnw = require('react-native-web')\n  const Mod = require('module')\n  const og = Mod.prototype.require\n  Mod.prototype.require = function (path: string) {\n    if (path.endsWith('.css')) {\n      return {}\n    }\n    if (path === '@gorhom/bottom-sheet' || path.startsWith('react-native-reanimated')) {\n      return proxyWorm\n    }\n    if (\n      path.startsWith('react-native') &&\n      // allow our rnw.tsx imports through\n      !path.startsWith('react-native-web/dist/cjs/exports')\n    ) {\n      return rnw\n    }\n    try {\n      return og.apply(this, arguments)\n    } catch (err: any) {\n      console.error('Tamagui error loading file:\\n')\n      console.log('   ', path, '\\n')\n      console.log(err.message)\n      console.log(err.stack)\n      // avoid infinite loops\n      process.exit(1)\n    }\n  }\n\n  // import config\n  const configPath = join(process.cwd(), props.config)\n  const tamaguiConfigExport = require(configPath)\n  const tamaguiConfig = (tamaguiConfigExport['default'] ||\n    tamaguiConfigExport) as TamaguiInternalConfig\n\n  if (!tamaguiConfig || !tamaguiConfig.parsed) {\n    try {\n      const confPath = require.resolve(configPath)\n      console.log(`Received:`, tamaguiConfigExport)\n      throw new Error(`Can't find valid config in ${confPath}`)\n    } catch (err) {\n      throw err\n    }\n  }\n\n  // import components\n  const components = {}\n  for (const module of props.components) {\n    const exported = require(module)\n    Object.assign(components, exported)\n  }\n\n  // undo shims\n  process.env.IS_STATIC = undefined\n  Mod.prototype.require = og\n\n  // set up core-node\n  createTamagui(tamaguiConfig as any)\n\n  loadedTamagui = {\n    components,\n    tamaguiConfig,\n  }\n\n  return loadedTamagui\n}\n"],
+  "mappings": ";;AAAA;AAGA;AAEA,IAAI,gBAAqB;AAElB,qBAAqB,OAG1B;AACA,MAAI,eAAe;AACjB,WAAO;AAAA,EACT;AAIA,UAAQ,IAAI,YAAY;AACxB,QAAM,YAAY,QAAQ,qBAAqB;AAC/C,QAAM,MAAM,QAAQ,kBAAkB;AACtC,QAAM,MAAM,QAAQ,QAAQ;AAC5B,QAAM,KAAK,IAAI,UAAU;AACzB,MAAI,UAAU,UAAU,SAAU,MAAc;AAC9C,QAAI,KAAK,SAAS,MAAM,GAAG;AACzB,aAAO,CAAC;AAAA,IACV;AACA,QAAI,SAAS,0BAA0B,KAAK,WAAW,yBAAyB,GAAG;AACjF,aAAO;AAAA,IACT;AACA,QACE,KAAK,WAAW,cAAc,KAE9B,CAAC,KAAK,WAAW,mCAAmC,GACpD;AACA,aAAO;AAAA,IACT;AACA,QAAI;AACF,aAAO,GAAG,MAAM,MAAM,SAAS;AAAA,IACjC,SAAS,KAAP;AACA,cAAQ,MAAM,+BAA+B;AAC7C,cAAQ,IAAI,OAAO,MAAM,IAAI;AAC7B,cAAQ,IAAI,IAAI,OAAO;AACvB,cAAQ,IAAI,IAAI,KAAK;AAErB,cAAQ,KAAK,CAAC;AAAA,IAChB;AAAA,EACF;AAGA,QAAM,aAAa,KAAK,QAAQ,IAAI,GAAG,MAAM,MAAM;AACnD,QAAM,sBAAsB,QAAQ,UAAU;AAC9C,QAAM,gBAAiB,oBAAoB,cACzC;AAEF,MAAI,CAAC,iBAAiB,CAAC,cAAc,QAAQ;AAC3C,QAAI;AACF,YAAM,WAA2B,AAAhB,QAAQ,QAAQ;AACjC,cAAQ,IAAI,aAAa,mBAAmB;AAC5C,YAAM,IAAI,MAAM,8BAA8B,UAAU;AAAA,IAC1D,SAAS,KAAP;AACA,YAAM;AAAA,IACR;AAAA,EACF;AAGA,QAAM,aAAa,CAAC;AACpB,aAAW,UAAU,MAAM,YAAY;AACrC,UAAM,WAAW,QAAQ,MAAM;AAC/B,WAAO,OAAO,YAAY,QAAQ;AAAA,EACpC;AAGA,UAAQ,IAAI,YAAY;AACxB,MAAI,UAAU,UAAU;AAGxB,gBAAc,aAAoB;AAElC,kBAAgB;AAAA,IACd;AAAA,IACA;AAAA,EACF;AAEA,SAAO;AACT;AA7EgB;",
   "names": []
 }

package/dist/jsx/extractor/createExtractor.js

@@ -442,7 +442,7 @@ function createExtractor() {
               let keys = [name];
               let out = null;
               if (staticConfig.propMapper) {
-                out = staticConfig.propMapper(name, styleValue, defaultTheme, staticConfig.defaultProps, staticConfig);
+                out = staticConfig.propMapper(name, styleValue, defaultTheme, staticConfig.defaultProps, "auto");
                 if (out) {
                   out = rnw.createDOMProps(isTextView ? "span" : "div", out);
                   delete out.className;
@@ -938,6 +938,10 @@ function createExtractor() {
           if (shouldPrintDebug) {
             console.log("  - attrs (combined \u{1F500}): \n", logLines(attrs.map(attrStr).join(", ")));
           }
+          const completeProps = {
+            ...staticConfig.defaultProps,
+            ...completeStaticProps
+          };
           const getStyles = /* @__PURE__ */ __name((props2, debugName = "") => {
             if (!props2)
               return;
@@ -951,12 +955,25 @@ function createExtractor() {
               }
             }
             const out = getSplitStyles(props2, staticConfig, defaultTheme, {
-              noClassNames: true
+              noClassNames: true,
+              fallbackProps: completeProps,
+              focus: false,
+              hover: false,
+              mounted: true,
+              press: false,
+              pressIn: false
             });
             const outStyle = {
               ...out.style,
               ...out.pseudos
             };
+            for (const key in outStyle) {
+              if (staticConfig.validStyles) {
+                if (!staticConfig.validStyles[key] && !pseudos[key]) {
+                  delete outStyle[key];
+                }
+              }
+            }
             if (shouldPrintDebug === "verbose") {
               console.log(`       getStyles ${debugName} (props):
 `, logLines(objToStr(props2)));
@@ -965,19 +982,9 @@ function createExtractor() {
               console.log(`       getStyles ${debugName} (out.style):
 `, logLines(objToStr(outStyle || {}), true));
             }
-            for (const key in outStyle) {
-              if (staticConfig.validStyles) {
-                if (!staticConfig.validStyles[key] && !pseudos[key]) {
-                  delete outStyle[key];
-                }
-              }
-            }
             return outStyle;
           }, "getStyles");
-          const completeStylesProcessed = getStyles({
-            ...staticConfig.defaultProps,
-            ...completeStaticProps
-          }, "completeStylesProcessed");
+          const completeStylesProcessed = getStyles(completeProps, "completeStylesProcessed");
           if (!completeStylesProcessed) {
             throw new Error(`Impossible, no styles`);
           }
@@ -1058,9 +1065,6 @@ function createExtractor() {
               }
             }
           }
-          if (shouldPrintDebug) {
-            console.log("  - attrs (after):\n", logLines(attrs.map(attrStr).join(", ")));
-          }
           if (shouldFlatten) {
             if (shouldPrintDebug) {
               console.log("  [\u2705] flattening", originalNodeName, flatNode);

package/dist/jsx/extractor/extractMediaStyle.js

@@ -57,8 +57,8 @@ function extractMediaStyle(ternary, jsxPath, tamaguiConfig, sourcePath, importan
         rules: [styleRule]
       };
     });
-    if (shouldPrintDebug) {
-      console.log("  media styles:", importance, singleMediaStyles.map((x) => x.identifier).join(", "));
+    if (shouldPrintDebug === "verbose") {
+      console.log("  media styles:", importance, styleObj, singleMediaStyles.map((x) => x.identifier).join(", "));
     }
     mediaStyles = [...mediaStyles, ...singleMediaStyles];
   }

package/dist/jsx/extractor/extractToClassNames.js

@@ -109,9 +109,6 @@ function extractToClassNames({
         switch (attr.type) {
           case "style":
             if (!isFlattened) {
-              if (!attr.name) {
-                throw new Error(`No name`);
-              }
               const { hoverStyle, pressStyle, focusStyle } = attr.value;
               const pseudos = [
                 ["hoverStyle", hoverStyle],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/static",
-  "version": "1.0.0-beta.207+3fd10ea6",
+  "version": "1.0.0-beta.208+f5ae07b4",
   "source": "src/index.ts",
   "typings": "types",
   "main": "dist/cjs",
@@ -57,10 +57,10 @@
     "@babel/parser": "^7.15.7",
     "@babel/traverse": "^7.15.4",
     "@expo/match-media": "^0.1.0",
-    "@tamagui/build": "^1.0.0-beta.207+3fd10ea6",
-    "@tamagui/core-node": "^1.0.0-beta.207+3fd10ea6",
-    "@tamagui/fake-react-native": "^1.0.0-beta.207+3fd10ea6",
-    "@tamagui/helpers": "^1.0.0-beta.207+3fd10ea6",
+    "@tamagui/build": "^1.0.0-beta.208+f5ae07b4",
+    "@tamagui/core-node": "^1.0.0-beta.208+f5ae07b4",
+    "@tamagui/fake-react-native": "^1.0.0-beta.208+f5ae07b4",
+    "@tamagui/helpers": "^1.0.0-beta.208+f5ae07b4",
     "babel-literal-to-ast": "^2.1.0",
     "esbuild": "^0.14.36",
     "esbuild-register": "^3.1.2",
@@ -68,10 +68,10 @@
     "fs-extra": "^9.1.0",
     "invariant": "^2.2.4",
     "lodash": "^4.17.21",
-    "tamagui": "^1.0.0-beta.207+3fd10ea6"
+    "tamagui": "^1.0.0-beta.208+f5ae07b4"
   },
   "peerDependencies": {
     "react-native-web": "*"
   },
-  "gitHead": "3fd10ea6d026fac0339fbc1a501ee304f4985b05"
+  "gitHead": "f5ae07b474577e5546139d5a187dde4e1d08df4b"
 }

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

@@ -1 +1 @@
-{"version":3,"file":"createExtractor.d.ts","sourceRoot":"","sources":["../../src/extractor/createExtractor.ts"],"names":[],"mappings":"AAAA,OAAiB,EAAE,QAAQ,EAAW,MAAM,iBAAiB,CAAA;AAC7D,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AACjC,OAAO,EAGL,qBAAqB,EAKtB,MAAM,oBAAoB,CAAA;AAK3B,OAAO,EAIL,mBAAmB,EAEpB,MAAM,UAAU,CAAA;AAoCjB,oBAAY,SAAS,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAI1D,wBAAgB,eAAe;;;;;;;;;;;;;;wBA2Bb,SAAS,EAAE,OAAO,CAAC,GAAG,MAAM,kPAiBrC,mBAAmB;;;;;;EAu6C3B"}
+{"version":3,"file":"createExtractor.d.ts","sourceRoot":"","sources":["../../src/extractor/createExtractor.ts"],"names":[],"mappings":"AAAA,OAAiB,EAAE,QAAQ,EAAW,MAAM,iBAAiB,CAAA;AAC7D,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AACjC,OAAO,EAGL,qBAAqB,EAKtB,MAAM,oBAAoB,CAAA;AAK3B,OAAO,EAIL,mBAAmB,EAEpB,MAAM,UAAU,CAAA;AAoCjB,oBAAY,SAAS,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAI1D,wBAAgB,eAAe;;;;;;;;;;;;;;wBA2Bb,SAAS,EAAE,OAAO,CAAC,GAAG,MAAM,kPAiBrC,mBAAmB;;;;;;EAi6C3B"}

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

@@ -1 +1 @@
-{"version":3,"file":"extractToClassNames.d.ts","sourceRoot":"","sources":["../../src/extractor/extractToClassNames.ts"],"names":[],"mappings":";AAKA,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAKjC,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAGvC,OAAO,EAAgC,cAAc,EAAW,MAAM,UAAU,CAAA;AAGhF,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAgB7C,oBAAY,iBAAiB,GAAG;IAC9B,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,GAAG,EAAE,CAAC,CAAC,IAAI,CAAA;IACX,GAAG,EAAE,GAAG,CAAA;CACT,CAAA;AAED,wBAAgB,mBAAmB,CAAC,EAClC,MAAM,EACN,SAAS,EACT,MAAM,EACN,UAAU,EACV,OAAO,EACP,gBAAgB,EAChB,QAAQ,EACR,OAAO,GACR,EAAE;IACD,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,CAAA;IAC1B,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;IACvB,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,cAAc,CAAA;IACvB,gBAAgB,EAAE,OAAO,GAAG,SAAS,CAAA;IACrC,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,GAAG,iBAAiB,GAAG,IAAI,CA4W3B"}
+{"version":3,"file":"extractToClassNames.d.ts","sourceRoot":"","sources":["../../src/extractor/extractToClassNames.ts"],"names":[],"mappings":";AAKA,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAKjC,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAGvC,OAAO,EAAgC,cAAc,EAAW,MAAM,UAAU,CAAA;AAGhF,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAgB7C,oBAAY,iBAAiB,GAAG;IAC9B,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,GAAG,EAAE,CAAC,CAAC,IAAI,CAAA;IACX,GAAG,EAAE,GAAG,CAAA;CACT,CAAA;AAED,wBAAgB,mBAAmB,CAAC,EAClC,MAAM,EACN,SAAS,EACT,MAAM,EACN,UAAU,EACV,OAAO,EACP,gBAAgB,EAChB,QAAQ,EACR,OAAO,GACR,EAAE;IACD,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,CAAA;IAC1B,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;IACvB,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,cAAc,CAAA;IACvB,gBAAgB,EAAE,OAAO,GAAG,SAAS,CAAA;IACrC,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,GAAG,iBAAiB,GAAG,IAAI,CAwW3B"}