@tamagui/static 1.0.1-beta.102 → 1.0.1-beta.105

package/dist/jsx/extractor/defaultTamaguiConfig.js

@@ -0,0 +1,142 @@
+import { createFont, createTamagui, createTokens } from "@tamagui/core-node";
+import { shorthands } from "@tamagui/shorthands";
+const font = createFont({
+  family: "System",
+  size: {
+    1: 15
+  },
+  lineHeight: {
+    1: 15
+  },
+  transform: {},
+  weight: {
+    1: "400"
+  },
+  color: {
+    1: "$color"
+  },
+  letterSpacing: {
+    1: 0
+  }
+});
+const size = {
+  0: 0,
+  0.25: 2,
+  0.5: 4,
+  0.75: 8,
+  1: 20,
+  1.5: 24,
+  2: 28,
+  2.5: 32,
+  3: 36,
+  3.5: 40,
+  4: 44,
+  true: 44,
+  4.5: 48,
+  5: 52,
+  5.5: 59,
+  6: 64,
+  6.5: 69,
+  7: 74,
+  7.6: 79,
+  8: 84,
+  8.5: 89,
+  9: 94,
+  9.5: 99,
+  10: 104,
+  11: 124,
+  12: 144,
+  13: 164,
+  14: 184,
+  15: 204,
+  16: 224,
+  17: 224,
+  18: 244,
+  19: 264,
+  20: 284
+};
+const spaces = Object.entries(size).map(([k, v]) => [
+  k,
+  Math.max(0, v <= 16 ? Math.round(v * 0.333) : Math.floor(v * 0.7 - 12))
+]);
+const spacesNegative = spaces.map(([k, v]) => [`-${k}`, -v]);
+const space = {
+  ...Object.fromEntries(spaces),
+  ...Object.fromEntries(spacesNegative)
+};
+const zIndex = {
+  0: 0,
+  1: 100,
+  2: 200,
+  3: 300,
+  4: 400,
+  5: 500
+};
+const radius = {
+  0: 0,
+  1: 3,
+  2: 5,
+  3: 7,
+  4: 9,
+  5: 10,
+  6: 16,
+  7: 19,
+  8: 22,
+  9: 26,
+  10: 34,
+  11: 42,
+  12: 50
+};
+const tokens = createTokens({
+  color: {
+    white: "#fff",
+    black: "#000"
+  },
+  radius,
+  zIndex,
+  space,
+  size
+});
+const themes = {
+  light: {
+    background: tokens.color.white,
+    color: tokens.color.black
+  },
+  dark: {
+    background: tokens.color.black,
+    color: tokens.color.white
+  }
+};
+const config = createTamagui({
+  defaultTheme: "light",
+  shouldAddPrefersColorThemes: true,
+  themeClassNameOnRoot: true,
+  shorthands,
+  fonts: {
+    heading: font,
+    body: font
+  },
+  themes,
+  tokens,
+  media: {
+    xs: { maxWidth: 660 },
+    sm: { maxWidth: 800 },
+    md: { maxWidth: 1020 },
+    lg: { maxWidth: 1280 },
+    xl: { maxWidth: 1420 },
+    xxl: { maxWidth: 1600 },
+    gtXs: { minWidth: 660 + 1 },
+    gtSm: { minWidth: 800 + 1 },
+    gtMd: { minWidth: 1020 + 1 },
+    gtLg: { minWidth: 1280 + 1 },
+    short: { maxHeight: 820 },
+    tall: { minHeight: 820 },
+    hoverNone: { hover: "none" },
+    pointerCoarse: { pointer: "coarse" }
+  }
+});
+export {
+  config,
+  tokens
+};
+//# sourceMappingURL=defaultTamaguiConfig.js.map

package/dist/jsx/extractor/defaultTamaguiConfig.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/extractor/defaultTamaguiConfig.ts"],
+  "sourcesContent": ["import { TamaguiInternalConfig, createFont, createTamagui, createTokens } from '@tamagui/core-node'\nimport { shorthands } from '@tamagui/shorthands'\n\n// basic fallback theme just to have compiler load in decent tate\n\nconst font = createFont({\n  family: 'System',\n  size: {\n    1: 15,\n  },\n  lineHeight: {\n    1: 15,\n  },\n  transform: {},\n  weight: {\n    1: '400',\n  },\n  color: {\n    1: '$color',\n  },\n  letterSpacing: {\n    1: 0,\n  },\n})\n\nconst size = {\n  0: 0,\n  0.25: 2,\n  0.5: 4,\n  0.75: 8,\n  1: 20,\n  1.5: 24,\n  2: 28,\n  2.5: 32,\n  3: 36,\n  3.5: 40,\n  4: 44,\n  true: 44,\n  4.5: 48,\n  5: 52,\n  5.5: 59,\n  6: 64,\n  6.5: 69,\n  7: 74,\n  7.6: 79,\n  8: 84,\n  8.5: 89,\n  9: 94,\n  9.5: 99,\n  10: 104,\n  11: 124,\n  12: 144,\n  13: 164,\n  14: 184,\n  15: 204,\n  16: 224,\n  17: 224,\n  18: 244,\n  19: 264,\n  20: 284,\n}\n\nconst spaces = Object.entries(size).map(([k, v]) => [\n  k,\n  Math.max(0, v <= 16 ? Math.round(v * 0.333) : Math.floor(v * 0.7 - 12)),\n])\n\nconst spacesNegative = spaces.map(([k, v]) => [`-${k}`, -v])\n\nconst space = {\n  ...Object.fromEntries(spaces),\n  ...Object.fromEntries(spacesNegative),\n} as any\n\nconst zIndex = {\n  0: 0,\n  1: 100,\n  2: 200,\n  3: 300,\n  4: 400,\n  5: 500,\n}\n\nconst radius = {\n  0: 0,\n  1: 3,\n  2: 5,\n  3: 7,\n  4: 9,\n  5: 10,\n  6: 16,\n  7: 19,\n  8: 22,\n  9: 26,\n  10: 34,\n  11: 42,\n  12: 50,\n}\n\nexport const tokens = createTokens({\n  color: {\n    white: '#fff',\n    black: '#000',\n  },\n  radius,\n  zIndex,\n  space,\n  size,\n})\n\nconst themes = {\n  light: {\n    background: tokens.color.white,\n    color: tokens.color.black,\n  },\n  dark: {\n    background: tokens.color.black,\n    color: tokens.color.white,\n  },\n}\n\nexport const config = createTamagui({\n  defaultTheme: 'light',\n  shouldAddPrefersColorThemes: true,\n  themeClassNameOnRoot: true,\n  shorthands,\n  fonts: {\n    heading: font,\n    body: font,\n  },\n  themes,\n  tokens,\n  media: {\n    xs: { maxWidth: 660 },\n    sm: { maxWidth: 800 },\n    md: { maxWidth: 1020 },\n    lg: { maxWidth: 1280 },\n    xl: { maxWidth: 1420 },\n    xxl: { maxWidth: 1600 },\n    gtXs: { minWidth: 660 + 1 },\n    gtSm: { minWidth: 800 + 1 },\n    gtMd: { minWidth: 1020 + 1 },\n    gtLg: { minWidth: 1280 + 1 },\n    short: { maxHeight: 820 },\n    tall: { minHeight: 820 },\n    hoverNone: { hover: 'none' },\n    pointerCoarse: { pointer: 'coarse' },\n  },\n}) as TamaguiInternalConfig\n"],
+  "mappings": "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",
+  "names": []
+}

package/dist/jsx/extractor/loadTamagui.js

@@ -1,7 +1,11 @@
 import { join } from "path";
 import { createTamagui } from "@tamagui/core-node";
+import { SHOULD_DEBUG } from "../constants";
+import { getNameToPaths, registerRequire, unregisterRequire } from "../require";
+import { config as defaultTamaguiConfig } from "./defaultTamaguiConfig";
 let loadedTamagui = null;
 function loadTamagui(props) {
+  console.trace("load", !!loadedTamagui);
   if (loadedTamagui) {
     return loadedTamagui;
   }
@@ -15,85 +19,61 @@ function loadTamagui(props) {
     if (typeof globalThis["__DEV__"] === "undefined") {
       globalThis["__DEV__"] = process.env.NODE_ENV === "development";
     }
-    const proxyWorm = require("@tamagui/proxy-worm");
-    const rnw = require("react-native-web");
-    const Mod = require("module");
-    const og = Mod.prototype.require;
-    const nameToPaths = {};
-    Mod.prototype.require = function(path) {
-      var _a, _b, _c;
-      if (path.endsWith(".css")) {
-        return {};
-      }
-      if (path === "@gorhom/bottom-sheet" || path.startsWith("react-native-reanimated") || path === "expo-linear-gradient") {
-        return proxyWorm;
-      }
-      if (path.startsWith("react-native") && !path.startsWith("react-native-web/dist/cjs/exports")) {
-        return rnw;
-      }
-      try {
-        const out = og.apply(this, arguments);
-        if (!nameToPaths[path]) {
-          if (out && typeof out === "object") {
-            for (const key in out) {
-              try {
-                const conf = (_a = out[key]) == null ? void 0 : _a.staticConfig;
-                if (conf) {
-                  if (conf.componentName) {
-                    (_c = nameToPaths[_b = conf.componentName]) != null ? _c : nameToPaths[_b] = /* @__PURE__ */ new Set();
-                    const fullName = path.startsWith(".") ? join(`${this.path.replace(/dist(\/cjs)?/, "src")}`, path) : path;
-                    nameToPaths[conf.componentName].add(fullName);
-                  } else {
-                  }
-                }
-              } catch {
-              }
-            }
-          }
-        }
-        return out;
-      } catch (err) {
-        console.error("Tamagui error loading file:\n", path, err.message, "\n", err.stack);
-        process.exit(1);
-      }
-    };
-    const exp = require(configPath);
-    const tamaguiConfig = exp["default"] || exp;
-    if (!tamaguiConfig || !tamaguiConfig.parsed) {
-      try {
+    registerRequire();
+    try {
+      const exp = require(configPath);
+      const tamaguiConfig = exp["default"] || exp;
+      if (!tamaguiConfig || !tamaguiConfig.parsed) {
         const confPath = require.resolve(configPath);
         console.log(`Received:`, tamaguiConfig);
         throw new Error(`Can't find valid config in ${confPath}`);
-      } catch (err) {
-        throw err;
       }
-    }
-    const components = {};
-    for (const moduleName of props.components) {
-      const exported = require(moduleName);
-      for (const Name in exported) {
-        const val = exported[Name];
-        const staticConfig = val == null ? void 0 : val.staticConfig;
-        if (staticConfig) {
-          const { Component, reactNativeWebComponent, ...sc } = staticConfig;
-          Object.assign(components, { [Name]: { staticConfig: sc } });
+      const components = {};
+      for (const moduleName of props.components) {
+        const exported = require(moduleName);
+        for (const Name in exported) {
+          const val = exported[Name];
+          const staticConfig = val == null ? void 0 : val.staticConfig;
+          if (staticConfig) {
+            const { Component, reactNativeWebComponent, ...sc } = staticConfig;
+            Object.assign(components, { [Name]: { staticConfig: sc } });
+          }
+        }
+      }
+      process.env.IS_STATIC = void 0;
+      createTamagui(tamaguiConfig);
+      loadedTamagui = {
+        components,
+        tamaguiConfig,
+        nameToPaths: getNameToPaths()
+      };
+    } catch (err) {
+      if (err instanceof Error) {
+        console.warn(`Error loading tamagui.config.ts (set DEBUG=tamagui to see full stack), running tamagui without custom config`);
+        console.log(`
+
+    ${err.message}
+
+`);
+        if (SHOULD_DEBUG) {
+          console.log(err.stack);
         }
+      } else {
+        console.error(`Error loading tamagui.config.ts`, err);
       }
+      return {
+        components: {},
+        tamaguiConfig: defaultTamaguiConfig,
+        nameToPaths: {}
+      };
     }
-    process.env.IS_STATIC = void 0;
-    Mod.prototype.require = og;
-    createTamagui(tamaguiConfig);
-    loadedTamagui = {
-      components,
-      tamaguiConfig,
-      nameToPaths
-    };
     return loadedTamagui;
   } catch (err) {
     console.log("Error loading Tamagui", err);
     throw err;
   } finally {
     unregister();
+    unregisterRequire();
   }
 }
 export {

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/extractor/loadTamagui.ts"],
-  "sourcesContent": ["import { join } from 'path'\n\nimport type { StaticConfig, TamaguiComponent, TamaguiInternalConfig } from '@tamagui/core'\nimport { createTamagui } from '@tamagui/core-node'\n\nlet loadedTamagui: any = null\n\ntype NameToPaths = {\n  [key: string]: Set<string>\n}\n\nexport type TamaguiProjectInfo = {\n  components: Record<string, TamaguiComponent>\n  tamaguiConfig: TamaguiInternalConfig\n  nameToPaths: NameToPaths\n}\n\nexport function loadTamagui(props: { components: string[]; config: string }): TamaguiProjectInfo {\n  if (loadedTamagui) {\n    return loadedTamagui\n  }\n\n  const configPath = join(process.cwd(), props.config)\n\n  const { unregister } = require('esbuild-register/dist/node').register({\n    target: 'es2019',\n    format: 'cjs',\n  })\n\n  try {\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    // @ts-ignore\n    if (typeof globalThis['__DEV__'] === 'undefined') {\n      // @ts-ignore\n      globalThis['__DEV__'] = process.env.NODE_ENV === 'development'\n    }\n\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    const nameToPaths: NameToPaths = {}\n\n    Mod.prototype.require = function (path: string) {\n      if (path.endsWith('.css')) {\n        return {}\n      }\n      if (\n        path === '@gorhom/bottom-sheet' ||\n        path.startsWith('react-native-reanimated') ||\n        path === 'expo-linear-gradient'\n      ) {\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        const out = og.apply(this, arguments)\n        if (!nameToPaths[path]) {\n          if (out && typeof out === 'object') {\n            for (const key in out) {\n              try {\n                const conf = out[key]?.staticConfig as StaticConfig\n                if (conf) {\n                  if (conf.componentName) {\n                    nameToPaths[conf.componentName] ??= new Set()\n                    const fullName = path.startsWith('.')\n                      ? join(`${this.path.replace(/dist(\\/cjs)?/, 'src')}`, path)\n                      : path\n                    nameToPaths[conf.componentName].add(fullName)\n                  } else {\n                    // console.log('no name component', path)\n                  }\n                }\n              } catch {\n                // ok\n              }\n            }\n          }\n        }\n        return out\n      } catch (err: any) {\n        console.error('Tamagui error loading file:\\n', path, err.message, '\\n', err.stack)\n        // avoid infinite loops\n        process.exit(1)\n      }\n    }\n\n    // import config\n    const exp = require(configPath)\n    const tamaguiConfig = (exp['default'] || exp) as TamaguiInternalConfig\n\n    if (!tamaguiConfig || !tamaguiConfig.parsed) {\n      try {\n        const confPath = require.resolve(configPath)\n        console.log(`Received:`, tamaguiConfig)\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 moduleName of props.components) {\n      const exported = require(moduleName)\n      for (const Name in exported) {\n        const val = exported[Name]\n        const staticConfig = val?.staticConfig as StaticConfig | undefined\n        if (staticConfig) {\n          // remove non-stringifyable\n          const { Component, reactNativeWebComponent, ...sc } = staticConfig\n          Object.assign(components, { [Name]: { staticConfig: sc } })\n        }\n      }\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      nameToPaths,\n    }\n\n    return loadedTamagui\n  } catch (err) {\n    console.log('Error loading Tamagui', err)\n    throw err\n  } finally {\n    unregister()\n  }\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { join } from 'path'\n\nimport type { StaticConfig, TamaguiComponent, TamaguiInternalConfig } from '@tamagui/core-node'\nimport { createTamagui } from '@tamagui/core-node'\n\nimport { SHOULD_DEBUG } from '../constants'\nimport { getNameToPaths, registerRequire, unregisterRequire } from '../require'\nimport { config as defaultTamaguiConfig } from './defaultTamaguiConfig'\n\nlet loadedTamagui: any = null\n\ntype NameToPaths = {\n  [key: string]: Set<string>\n}\n\nexport type TamaguiProjectInfo = {\n  components: Record<string, TamaguiComponent>\n  tamaguiConfig: TamaguiInternalConfig\n  nameToPaths: NameToPaths\n}\n\nexport function loadTamagui(props: { components: string[]; config: string }): TamaguiProjectInfo {\n  console.trace('load', !!loadedTamagui)\n\n  if (loadedTamagui) {\n    return loadedTamagui\n  }\n\n  const configPath = join(process.cwd(), props.config)\n\n  const { unregister } = require('esbuild-register/dist/node').register({\n    target: 'es2019',\n    format: 'cjs',\n  })\n\n  try {\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    // @ts-ignore\n    if (typeof globalThis['__DEV__'] === 'undefined') {\n      // @ts-ignore\n      globalThis['__DEV__'] = process.env.NODE_ENV === 'development'\n    }\n\n    registerRequire()\n\n    try {\n      // import config\n      const exp = require(configPath)\n      const tamaguiConfig = (exp['default'] || exp) as TamaguiInternalConfig\n\n      if (!tamaguiConfig || !tamaguiConfig.parsed) {\n        const confPath = require.resolve(configPath)\n        console.log(`Received:`, tamaguiConfig)\n        throw new Error(`Can't find valid config in ${confPath}`)\n      }\n\n      // import components\n      const components = {}\n      for (const moduleName of props.components) {\n        const exported = require(moduleName)\n        for (const Name in exported) {\n          const val = exported[Name]\n          const staticConfig = val?.staticConfig as StaticConfig | undefined\n          if (staticConfig) {\n            // remove non-stringifyable\n            const { Component, reactNativeWebComponent, ...sc } = staticConfig\n            Object.assign(components, { [Name]: { staticConfig: sc } })\n          }\n        }\n      }\n\n      // undo shims\n      process.env.IS_STATIC = undefined\n\n      // set up core-node\n      createTamagui(tamaguiConfig as any)\n\n      loadedTamagui = {\n        components,\n        tamaguiConfig,\n        nameToPaths: getNameToPaths(),\n      }\n    } catch (err) {\n      if (err instanceof Error) {\n        console.warn(\n          `Error loading tamagui.config.ts (set DEBUG=tamagui to see full stack), running tamagui without custom config`\n        )\n        console.log(`\\n\\n    ${err.message}\\n\\n`)\n        if (SHOULD_DEBUG) {\n          console.log(err.stack)\n        }\n      } else {\n        console.error(`Error loading tamagui.config.ts`, err)\n      }\n      return {\n        components: {},\n        tamaguiConfig: defaultTamaguiConfig,\n        nameToPaths: {},\n      }\n    }\n\n    return loadedTamagui\n  } catch (err) {\n    console.log('Error loading Tamagui', err)\n    throw err\n  } finally {\n    unregister()\n    unregisterRequire()\n  }\n}\n"],
+  "mappings": "AAAA;AAGA;AAEA;AACA;AACA;AAEA,IAAI,gBAAqB;AAYlB,qBAAqB,OAAqE;AAC/F,UAAQ,MAAM,QAAQ,CAAC,CAAC,aAAa;AAErC,MAAI,eAAe;AACjB,WAAO;AAAA,EACT;AAEA,QAAM,aAAa,KAAK,QAAQ,IAAI,GAAG,MAAM,MAAM;AAEnD,QAAM,EAAE,eAAe,QAAQ,4BAA4B,EAAE,SAAS;AAAA,IACpE,QAAQ;AAAA,IACR,QAAQ;AAAA,EACV,CAAC;AAED,MAAI;AAGF,YAAQ,IAAI,YAAY;AAExB,QAAI,OAAO,WAAW,eAAe,aAAa;AAEhD,iBAAW,aAAa,QAAQ,IAAI,aAAa;AAAA,IACnD;AAEA,oBAAgB;AAEhB,QAAI;AAEF,YAAM,MAAM,QAAQ,UAAU;AAC9B,YAAM,gBAAiB,IAAI,cAAc;AAEzC,UAAI,CAAC,iBAAiB,CAAC,cAAc,QAAQ;AAC3C,cAAM,WAA2B,AAAhB,QAAQ,QAAQ;AACjC,gBAAQ,IAAI,aAAa,aAAa;AACtC,cAAM,IAAI,MAAM,8BAA8B,UAAU;AAAA,MAC1D;AAGA,YAAM,aAAa,CAAC;AACpB,iBAAW,cAAc,MAAM,YAAY;AACzC,cAAM,WAAW,QAAQ,UAAU;AACnC,mBAAW,QAAQ,UAAU;AAC3B,gBAAM,MAAM,SAAS;AACrB,gBAAM,eAAe,2BAAK;AAC1B,cAAI,cAAc;AAEhB,kBAAM,EAAE,WAAW,4BAA4B,OAAO;AACtD,mBAAO,OAAO,YAAY,EAAE,CAAC,OAAO,EAAE,cAAc,GAAG,EAAE,CAAC;AAAA,UAC5D;AAAA,QACF;AAAA,MACF;AAGA,cAAQ,IAAI,YAAY;AAGxB,oBAAc,aAAoB;AAElC,sBAAgB;AAAA,QACd;AAAA,QACA;AAAA,QACA,aAAa,eAAe;AAAA,MAC9B;AAAA,IACF,SAAS,KAAP;AACA,UAAI,eAAe,OAAO;AACxB,gBAAQ,KACN,8GACF;AACA,gBAAQ,IAAI;AAAA;AAAA,MAAW,IAAI;AAAA;AAAA,CAAa;AACxC,YAAI,cAAc;AAChB,kBAAQ,IAAI,IAAI,KAAK;AAAA,QACvB;AAAA,MACF,OAAO;AACL,gBAAQ,MAAM,mCAAmC,GAAG;AAAA,MACtD;AACA,aAAO;AAAA,QACL,YAAY,CAAC;AAAA,QACb,eAAe;AAAA,QACf,aAAa,CAAC;AAAA,MAChB;AAAA,IACF;AAEA,WAAO;AAAA,EACT,SAAS,KAAP;AACA,YAAQ,IAAI,yBAAyB,GAAG;AACxC,UAAM;AAAA,EACR,UAAE;AACA,eAAW;AACX,sBAAkB;AAAA,EACpB;AACF;",
   "names": []
 }

package/dist/jsx/index.js

@@ -7,6 +7,7 @@ export * from "./extractor/extractToClassNames";
 export * from "./extractor/extractHelpers";
 export * from "@tamagui/patch-rnw";
 export * from "./extractor/loadTamagui";
+export * from "./require";
 export {
   TamaguiOptions,
   createExtractor,

package/dist/jsx/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/index.ts"],
-  "sourcesContent": ["process.env.TAMAGUI_COMPILE_PROCESS = '1'\n\nexport { TamaguiOptions } from './types'\nexport { createExtractor } from './extractor/createExtractor'\nexport { literalToAst } from './extractor/literalToAst'\nexport * from './constants'\nexport * from './extractor/extractToClassNames'\nexport * from './extractor/extractHelpers'\nexport * from '@tamagui/patch-rnw'\nexport * from './extractor/loadTamagui'\n"],
-  "mappings": "AAAA,QAAQ,IAAI,0BAA0B;AAEtC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;",
+  "sourcesContent": ["process.env.TAMAGUI_COMPILE_PROCESS = '1'\n\nexport { TamaguiOptions } from './types'\nexport { createExtractor } from './extractor/createExtractor'\nexport { literalToAst } from './extractor/literalToAst'\nexport * from './constants'\nexport * from './extractor/extractToClassNames'\nexport * from './extractor/extractHelpers'\nexport * from '@tamagui/patch-rnw'\nexport * from './extractor/loadTamagui'\nexport * from './require'\n"],
+  "mappings": "AAAA,QAAQ,IAAI,0BAA0B;AAEtC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;",
   "names": []
 }

package/dist/jsx/require.js

@@ -0,0 +1,74 @@
+import { join } from "path";
+import { SHOULD_DEBUG } from "./constants";
+const nameToPaths = {};
+const Mod = require("module");
+const og = Mod.prototype.require;
+globalThis["ogRequire"] = og;
+const getNameToPaths = () => nameToPaths;
+let tries = 0;
+setInterval(() => {
+  tries = 0;
+}, 500);
+function registerRequire() {
+  if (Mod.prototype.require !== globalThis["ogRequire"]) {
+    console.warn("didnt unregister before re-registering");
+    process.exit(1);
+  }
+  const proxyWorm = require("@tamagui/proxy-worm");
+  const rnw = require("react-native-web");
+  Mod.prototype.require = function(path) {
+    var _a, _b, _c;
+    if (SHOULD_DEBUG) {
+      console.log("tamagui require", path);
+    }
+    if (path.endsWith(".css")) {
+      return {};
+    }
+    if (path === "@gorhom/bottom-sheet" || path.startsWith("react-native-reanimated") || path === "expo-linear-gradient") {
+      return proxyWorm;
+    }
+    if (path.startsWith("react-native") && !path.startsWith("react-native-web/dist/cjs/exports")) {
+      return rnw;
+    }
+    try {
+      const out = og.apply(this, arguments);
+      if (!nameToPaths[path]) {
+        if (out && typeof out === "object") {
+          for (const key in out) {
+            try {
+              const conf = (_a = out[key]) == null ? void 0 : _a.staticConfig;
+              if (conf) {
+                if (conf.componentName) {
+                  (_c = nameToPaths[_b = conf.componentName]) != null ? _c : nameToPaths[_b] = /* @__PURE__ */ new Set();
+                  const fullName = path.startsWith(".") ? join(`${this.path.replace(/dist(\/cjs)?/, "src")}`, path) : path;
+                  nameToPaths[conf.componentName].add(fullName);
+                } else {
+                }
+              }
+            } catch {
+            }
+          }
+        }
+      }
+      return out;
+    } catch (err) {
+      console.error(`Tamagui failed requiring ${path} from your tamagui.config.ts file, ignoring (set DEBUG=tamagui to see stack)
+`, err.message);
+      if (SHOULD_DEBUG) {
+        console.log(err.stack);
+      }
+      if (++tries > 10) {
+        process.exit(1);
+      }
+    }
+  };
+}
+function unregisterRequire() {
+  Mod.prototype.require = og;
+}
+export {
+  getNameToPaths,
+  registerRequire,
+  unregisterRequire
+};
+//# sourceMappingURL=require.js.map

package/dist/jsx/require.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/require.ts"],
+  "sourcesContent": ["import { join } from 'path'\n\nimport type { StaticConfig } from '@tamagui/core-node'\n\nimport { SHOULD_DEBUG } from './constants'\n\nconst nameToPaths = {}\nconst Mod = require('module')\nconst og = Mod.prototype.require\nglobalThis['ogRequire'] = og\n\nexport const getNameToPaths = () => nameToPaths\n\nlet tries = 0\nsetInterval(() => {\n  tries = 0\n}, 500)\n\nexport function registerRequire() {\n  if (Mod.prototype.require !== globalThis['ogRequire']) {\n    console.warn('didnt unregister before re-registering')\n    process.exit(1)\n  }\n\n  const proxyWorm = require('@tamagui/proxy-worm')\n  const rnw = require('react-native-web')\n\n  Mod.prototype.require = function (path: string) {\n    if (SHOULD_DEBUG) {\n      console.log('tamagui require', path)\n    }\n    if (path.endsWith('.css')) {\n      return {}\n    }\n    if (\n      path === '@gorhom/bottom-sheet' ||\n      path.startsWith('react-native-reanimated') ||\n      path === 'expo-linear-gradient'\n    ) {\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      // return og('react-native-web')\n    }\n    try {\n      const out = og.apply(this, arguments)\n      if (!nameToPaths[path]) {\n        if (out && typeof out === 'object') {\n          for (const key in out) {\n            try {\n              const conf = out[key]?.staticConfig as StaticConfig\n              if (conf) {\n                if (conf.componentName) {\n                  nameToPaths[conf.componentName] ??= new Set()\n                  const fullName = path.startsWith('.')\n                    ? join(`${this.path.replace(/dist(\\/cjs)?/, 'src')}`, path)\n                    : path\n                  nameToPaths[conf.componentName].add(fullName)\n                } else {\n                  // console.log('no name component', path)\n                }\n              }\n            } catch {\n              // ok\n            }\n          }\n        }\n      }\n      return out\n    } catch (err: any) {\n      console.error(\n        `Tamagui failed requiring ${path} from your tamagui.config.ts file, ignoring (set DEBUG=tamagui to see stack)\\n`,\n        err.message\n      )\n      if (SHOULD_DEBUG) {\n        console.log(err.stack)\n      }\n      if (++tries > 10) {\n        // avoid infinite loops\n        process.exit(1)\n      }\n    }\n  }\n}\n\nexport function unregisterRequire() {\n  Mod.prototype.require = og\n}\n"],
+  "mappings": "AAAA;AAIA;AAEA,MAAM,cAAc,CAAC;AACrB,MAAM,MAAM,QAAQ,QAAQ;AAC5B,MAAM,KAAK,IAAI,UAAU;AACzB,WAAW,eAAe;AAEnB,MAAM,iBAAiB,MAAM;AAEpC,IAAI,QAAQ;AACZ,YAAY,MAAM;AAChB,UAAQ;AACV,GAAG,GAAG;AAEC,2BAA2B;AAChC,MAAI,IAAI,UAAU,YAAY,WAAW,cAAc;AACrD,YAAQ,KAAK,wCAAwC;AACrD,YAAQ,KAAK,CAAC;AAAA,EAChB;AAEA,QAAM,YAAY,QAAQ,qBAAqB;AAC/C,QAAM,MAAM,QAAQ,kBAAkB;AAEtC,MAAI,UAAU,UAAU,SAAU,MAAc;AA3BlD;AA4BI,QAAI,cAAc;AAChB,cAAQ,IAAI,mBAAmB,IAAI;AAAA,IACrC;AACA,QAAI,KAAK,SAAS,MAAM,GAAG;AACzB,aAAO,CAAC;AAAA,IACV;AACA,QACE,SAAS,0BACT,KAAK,WAAW,yBAAyB,KACzC,SAAS,wBACT;AACA,aAAO;AAAA,IACT;AACA,QACE,KAAK,WAAW,cAAc,KAE9B,CAAC,KAAK,WAAW,mCAAmC,GACpD;AACA,aAAO;AAAA,IAET;AACA,QAAI;AACF,YAAM,MAAM,GAAG,MAAM,MAAM,SAAS;AACpC,UAAI,CAAC,YAAY,OAAO;AACtB,YAAI,OAAO,OAAO,QAAQ,UAAU;AAClC,qBAAW,OAAO,KAAK;AACrB,gBAAI;AACF,oBAAM,OAAO,UAAI,SAAJ,mBAAU;AACvB,kBAAI,MAAM;AACR,oBAAI,KAAK,eAAe;AACtB,yCAAY,KAAK,mBAAjB,8BAAoC,oBAAI,IAAI;AAC5C,wBAAM,WAAW,KAAK,WAAW,GAAG,IAChC,KAAK,GAAG,KAAK,KAAK,QAAQ,gBAAgB,KAAK,KAAK,IAAI,IACxD;AACJ,8BAAY,KAAK,eAAe,IAAI,QAAQ;AAAA,gBAC9C,OAAO;AAAA,gBAEP;AAAA,cACF;AAAA,YACF,QAAE;AAAA,YAEF;AAAA,UACF;AAAA,QACF;AAAA,MACF;AACA,aAAO;AAAA,IACT,SAAS,KAAP;AACA,cAAQ,MACN,4BAA4B;AAAA,GAC5B,IAAI,OACN;AACA,UAAI,cAAc;AAChB,gBAAQ,IAAI,IAAI,KAAK;AAAA,MACvB;AACA,UAAI,EAAE,QAAQ,IAAI;AAEhB,gBAAQ,KAAK,CAAC;AAAA,MAChB;AAAA,IACF;AAAA,EACF;AACF;AAEO,6BAA6B;AAClC,MAAI,UAAU,UAAU;AAC1B;",
+  "names": []
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/static",
-  "version": "1.0.1-beta.102",
+  "version": "1.0.1-beta.105",
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
   "main": "dist/cjs",
@@ -38,12 +38,13 @@
     "@babel/parser": "^7.15.7",
     "@babel/traverse": "^7.15.4",
     "@expo/match-media": "^0.3.0",
-    "@tamagui/build": "^1.0.1-beta.102",
-    "@tamagui/core-node": "^1.0.1-beta.102",
-    "@tamagui/fake-react-native": "^1.0.1-beta.102",
-    "@tamagui/helpers": "^1.0.1-beta.102",
-    "@tamagui/patch-rnw": "^1.0.1-beta.102",
-    "@tamagui/proxy-worm": "^1.0.1-beta.102",
+    "@tamagui/build": "^1.0.1-beta.105",
+    "@tamagui/core-node": "^1.0.1-beta.105",
+    "@tamagui/fake-react-native": "^1.0.1-beta.105",
+    "@tamagui/helpers": "^1.0.1-beta.105",
+    "@tamagui/patch-rnw": "^1.0.1-beta.105",
+    "@tamagui/proxy-worm": "^1.0.1-beta.105",
+    "@tamagui/shorthands": "^1.0.1-beta.105",
     "babel-literal-to-ast": "^2.1.0",
     "esbuild": "^0.14.48",
     "esbuild-register": "^3.3.2",
@@ -51,7 +52,7 @@
     "fs-extra": "^10.1.0",
     "invariant": "^2.2.4",
     "lodash": "^4.17.21",
-    "tamagui": "^1.0.1-beta.102"
+    "tamagui": "^1.0.1-beta.105"
   },
   "devDependencies": {
     "@babel/plugin-syntax-typescript": "^7.14.5",

package/src/constants.ts

@@ -11,3 +11,5 @@ export const cacheDir = findCacheDir({ name: 'tamagui', create: true })
 
 export const FAILED_EVAL = Symbol('failed_style_eval')
 export const CONCAT_CLASSNAME_IMPORT = 'concatClassName'
+
+export const SHOULD_DEBUG = process.env.DEBUG === '*' || process.env.DEBUG?.startsWith('tamagui')

package/src/extractor/createEvaluator.ts

@@ -3,7 +3,7 @@ import vm from 'vm'
 import generate from '@babel/generator'
 import { NodePath } from '@babel/traverse'
 import * as t from '@babel/types'
-import type { TamaguiConfig } from '@tamagui/core'
+import type { TamaguiConfig } from '@tamagui/core-node'
 import { createCSSVariable } from '@tamagui/core-node'
 import esbuild from 'esbuild'
 

package/src/extractor/createExtractor.ts

@@ -13,9 +13,7 @@ import {
   mediaQueryConfig,
   proxyThemeVariables,
   pseudoDescriptors,
-  stylePropsTransform,
 } from '@tamagui/core-node'
-import { difference, pick } from 'lodash'
 import type { ViewStyle } from 'react-native'
 
 import { FAILED_EVAL } from '../constants'
@@ -371,10 +369,8 @@ export function createExtractor() {
           }
 
           for (const atomic of atomics) {
-            for (const rule of atomic.rules) {
-              out.rulesToInsert = out.rulesToInsert || []
-              out.rulesToInsert.push([atomic.identifier, rule])
-            }
+            out.rulesToInsert = out.rulesToInsert || []
+            out.rulesToInsert.push(atomic)
             classNames[atomic.property] = atomic.identifier
           }
 
@@ -391,8 +387,8 @@ export function createExtractor() {
           }
 
           if (out.rulesToInsert) {
-            for (const [identifier, rule] of out.rulesToInsert) {
-              onStyleRule?.(identifier, [rule])
+            for (const { identifier, rules } of out.rulesToInsert) {
+              onStyleRule?.(identifier, rules)
             }
           }
 
@@ -1706,22 +1702,6 @@ export function createExtractor() {
               }
             }
 
-            function omitInvalidStyles(style: any) {
-              if (staticConfig.validStyles) {
-                for (const key in style) {
-                  if (
-                    stylePropsTransform[key] ||
-                    (!staticConfig.validStyles[key] &&
-                      !pseudoDescriptors[key] &&
-                      !/(hoverStyle|focusStyle|pressStyle)$/.test(key))
-                  ) {
-                    if (shouldPrintDebug) console.log(' delete invalid style', key)
-                    delete style[key]
-                  }
-                }
-              }
-            }
-
             // used to ensure we pass the entire prop bundle to getStyles
             const completeStyles = getStyles(completeProps, 'completeStyles')
 
@@ -1729,33 +1709,6 @@ export function createExtractor() {
               throw new Error(`Impossible, no styles`)
             }
 
-            // any extra styles added in postprocess should be added to first group as they wont be overriden
-            const addInitialStyleKeys = shouldFlatten
-              ? difference(Object.keys(completeStyles), Object.keys(foundStaticProps))
-              : []
-
-            if (addInitialStyleKeys.length) {
-              const toAdd = pick(completeStyles, ...addInitialStyleKeys)
-              const firstGroup = attrs.find((x) => x.type === 'style')
-              if (shouldPrintDebug) {
-                console.log('    toAdd', objToStr(toAdd))
-              }
-              if (!firstGroup) {
-                attrs.unshift({ type: 'style', value: toAdd })
-              } else {
-                // because were adding fully processed, remove any unprocessed from first group
-                omitInvalidStyles(firstGroup.value)
-                Object.assign(firstGroup.value, toAdd)
-              }
-            }
-
-            if (shouldPrintDebug) {
-              // prettier-ignore
-              if (shouldFlatten) console.log('   -- addInitialStyleKeys', addInitialStyleKeys.join(', '))
-              // prettier-ignore
-              // console.log('   -- completeStyles:\n', logLines(objToStr(completeStyles)))
-            }
-
             let getStyleError: any = null
 
             // fix up ternaries, combine final style values
@@ -1815,15 +1768,6 @@ export function createExtractor() {
                         // map to HTML only name
                         attr.value.name.name = INLINE_EXTRACTABLE[name]
                       }
-
-                      // if flattening expand turn variants into styles
-                      if (staticConfig.variants?.[name]) {
-                        const expanded = getStyles({})
-                        // attrs[i] = {
-                        //   type: 'style',
-                        //   value:
-                        // }
-                      }
                     }
                   }
                 }