@tamagui/static 1.0.0-beta.202 → 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

@@ -42,6 +42,10 @@ const validHooks = {
 };
 const createTernary = /* @__PURE__ */ __name((x) => x, "createTernary");
 function createExtractor() {
+  if (!process.env.TAMAGUI_TARGET) {
+    console.log('\u26A0\uFE0F Please set process.env.TAMAGUI_TARGET to either "web" or "native"');
+    process.exit(1);
+  }
   const shouldAddDebugProp = !process.env.npm_package_dependencies_next && process.env.TAMAGUI_TARGET !== "native" && process.env.IDENTIFY_TAGS !== "false" && (process.env.NODE_ENV === "development" || process.env.DEBUG || process.env.IDENTIFY_TAGS);
   require("esbuild-register/dist/node").register({
     target: "es2019",
@@ -166,16 +170,17 @@ function createExtractor() {
           }
           const originalNodeName = node.name.name;
           res.found++;
+          const filePath = sourcePath.replace(process.cwd(), ".");
+          const lineNumbers = node.loc ? node.loc.start.line + (node.loc.start.line !== node.loc.end.line ? `-${node.loc.end.line}` : "") : "";
+          const preName = componentName ? `${componentName}.` : "";
+          const tagId = `${preName}${node.name.name}@${filePath.replace("./", "")}:${lineNumbers}`;
           if (shouldPrintDebug) {
             console.log(`
-<${originalNodeName} />`);
+<${originalNodeName} /> (${tagId})`);
           }
-          const filePath = sourcePath.replace(process.cwd(), ".");
-          const lineNumbers = node.loc ? node.loc.start.line + (node.loc.start.line !== node.loc.end.line ? `-${node.loc.end.line}` : "") : "";
           if (shouldAddDebugProp && !disableDebugAttr) {
-            const preName = componentName ? `${componentName}.` : "";
             res.modified++;
-            node.attributes.unshift(t.jsxAttribute(t.jsxIdentifier("data-is"), t.stringLiteral(`${preName}${node.name.name}@${filePath.replace("./", "")}:${lineNumbers}`)));
+            node.attributes.unshift(t.jsxAttribute(t.jsxIdentifier("data-is"), t.stringLiteral(tagId)));
           }
           const shouldLog = !hasLogged;
           if (shouldLog) {
@@ -212,6 +217,7 @@ function createExtractor() {
             ...staticConfig.inlineProps || []
           ]);
           const deoptProps = /* @__PURE__ */ new Set([
+            "animation",
             ...props.deoptProps || [],
             ...staticConfig.deoptProps || []
           ]);
@@ -436,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;
@@ -446,6 +452,10 @@ function createExtractor() {
               let didInline = false;
               const attributes = keys.map((key) => {
                 const val = out[key];
+                if (key === "theme") {
+                  inlined.set(key, val);
+                  return attr;
+                }
                 if (isValidStyleKey(key)) {
                   return {
                     type: "style",
@@ -455,10 +465,7 @@ function createExtractor() {
                   };
                 }
                 if (validHTMLAttributes[key]) {
-                  return {
-                    type: "attr",
-                    value: t.jsxAttribute(t.jsxIdentifier(key), t.jsxExpressionContainer(literalToAst(val)))
-                  };
+                  return attr;
                 }
                 if (shouldPrintDebug) {
                   console.log("  ! inlining, non-static", key);
@@ -468,7 +475,9 @@ function createExtractor() {
                 return val;
               });
               if (didInline) {
-                console.log("we inlined something off", { attributes });
+                if (shouldPrintDebug) {
+                  console.log("  bailing flattening due to attributes", attributes);
+                }
                 return attr;
               }
               return attributes;
@@ -773,28 +782,24 @@ function createExtractor() {
           const themeVal = inlined.get("theme");
           inlined.delete("theme");
           const allOtherPropsExtractable = [...inlined].every(([k, v]) => INLINE_EXTRACTABLE[k]);
-          const shouldWrapInnerTheme = !!(hasOnlyStringChildren && themeVal);
-          const canFlattenProps = inlined.size === 0 || allOtherPropsExtractable && shouldWrapInnerTheme || allOtherPropsExtractable;
+          const shouldWrapInnerTheme = allOtherPropsExtractable && !!(hasOnlyStringChildren && themeVal);
+          const canFlattenProps = inlined.size === 0 || shouldWrapInnerTheme || allOtherPropsExtractable;
           let shouldFlatten = !shouldDeopt && canFlattenProps && !hasSpread && staticConfig.neverFlatten !== true && (staticConfig.neverFlatten === "jsx" ? hasOnlyStringChildren : true);
-          if (shouldWrapInnerTheme) {
-            const parents = traversePath.parentPath.node;
-            if (!t.isJSXElement(parents) && !t.isJSXFragment(parents)) {
-              shouldFlatten = false;
-            } else {
-              if (typeof themeVal === "string") {
-                if (!hasImportedTheme) {
-                  hasImportedTheme = true;
-                  programPath.node.body.push(t.importDeclaration([t.importSpecifier(t.identifier("_TamaguiTheme"), t.identifier("Theme"))], t.stringLiteral("@tamagui/core")));
-                }
-                const children = parents.children;
-                parents.children = [
-                  t.jsxElement(t.jsxOpeningElement(t.jsxIdentifier("_TamaguiTheme"), [
-                    t.jsxAttribute(t.jsxIdentifier("name"), t.stringLiteral(`${themeVal}`))
-                  ]), t.jsxClosingElement(t.jsxIdentifier("_TamaguiTheme")), children)
-                ];
-              } else {
-              }
+          if (shouldFlatten && shouldWrapInnerTheme) {
+            if (typeof themeVal !== "string") {
+              console.warn("??");
+              return;
+            }
+            if (shouldPrintDebug) {
+              console.log("  - wrapping theme", allOtherPropsExtractable, themeVal);
             }
+            if (!hasImportedTheme) {
+              hasImportedTheme = true;
+              programPath.node.body.push(t.importDeclaration([t.importSpecifier(t.identifier("_TamaguiTheme"), t.identifier("Theme"))], t.stringLiteral("@tamagui/core")));
+            }
+            traversePath.replaceWith(t.jsxElement(t.jsxOpeningElement(t.jsxIdentifier("_TamaguiTheme"), [
+              t.jsxAttribute(t.jsxIdentifier("name"), t.stringLiteral(`${themeVal}`))
+            ]), t.jsxClosingElement(t.jsxIdentifier("_TamaguiTheme")), [traversePath.node]));
           }
           if (shouldFlatten && staticConfig.defaultProps) {
             const defaultStyleAttrs = Object.keys(staticConfig.defaultProps).flatMap((key) => {
@@ -933,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;
@@ -946,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)));
@@ -960,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`);
           }
@@ -1053,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.202+a1a54793",
+  "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.202+a1a54793",
-    "@tamagui/core-node": "^1.0.0-beta.202+a1a54793",
-    "@tamagui/fake-react-native": "^1.0.0-beta.202+a1a54793",
-    "@tamagui/helpers": "^1.0.0-beta.202+a1a54793",
+    "@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.202+a1a54793"
+    "tamagui": "^1.0.0-beta.208+f5ae07b4"
   },
   "peerDependencies": {
     "react-native-web": "*"
   },
-  "gitHead": "a1a54793ee1890507fc934f42f2eb3a4020b57c5"
+  "gitHead": "f5ae07b474577e5546139d5a187dde4e1d08df4b"
 }