@tamagui/static 1.0.0-alpha.45 → 1.0.0-alpha.49

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 { StaticComponent, 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, StaticComponent>\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/fake-react-native')\n  const Mod = require('module')\n  const og = Mod.prototype.require\n  Mod.prototype.require = function (path: string) {\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 proxyWorm\n    }\n    return og.apply(this, arguments)\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  // 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"],
+  "sourcesContent": ["import { join } from 'path'\n\nimport type { StaticComponent, 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, StaticComponent>\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('react-native-web')\n  const Mod = require('module')\n  const og = Mod.prototype.require\n  Mod.prototype.require = function (path: string) {\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 proxyWorm\n    }\n    return og.apply(this, arguments)\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  // 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;AAKT,UAAQ,IAAI,YAAY;AACxB,QAAM,YAAY,QAAQ;AAC1B,QAAM,MAAM,QAAQ;AACpB,QAAM,KAAK,IAAI,UAAU;AACzB,MAAI,UAAU,UAAU,SAAU,MAAc;AAC9C,QACE,KAAK,WAAW,mBAEhB,CAAC,KAAK,WAAW,sCACjB;AACA,aAAO;AAAA;AAET,WAAO,GAAG,MAAM,MAAM;AAAA;AAIxB,QAAM,aAAa,KAAK,QAAQ,OAAO,MAAM;AAC7C,QAAM,sBAAsB,QAAQ;AACpC,QAAM,gBAAiB,oBAAoB,cACzC;AAGF,QAAM,aAAa;AACnB,aAAW,UAAU,MAAM,YAAY;AACrC,UAAM,WAAW,QAAQ;AACzB,WAAO,OAAO,YAAY;AAAA;AAI5B,UAAQ,IAAI,YAAY;AACxB,MAAI,UAAU,UAAU;AAGxB,gBAAc;AAEd,kBAAgB;AAAA,IACd;AAAA,IACA;AAAA;AAGF,SAAO;AAAA;AAlDO;",
   "names": []
 }

package/dist/esm/patchReactNativeWeb.js

@@ -22,7 +22,7 @@ function patchReactNativeWeb() {
     fs.writeFileSync(modulePath, moduleExports);
     fs.writeFileSync(cjsPath, cjsExports);
   }
-  const classNamePatch = `if (props.className) { domProps.className = className ? className + ' ' + props.className : props.className }`;
+  const classNamePatch = `if (props.dataSet && props.dataSet['__className']) { domProps.className = className ? className + ' ' + props.dataSet['__className'] : props.dataSet['__className']; delete props.dataSet['__className'] }`;
   const domPropsPath = ["modules", "createDOMProps", "index.js"];
   const domPropsModulePath = path.join(rootDir, "dist", ...domPropsPath);
   const domPropsCjsPath = path.join(rootDir, "dist", "cjs", ...domPropsPath);
@@ -37,7 +37,7 @@ function patchReactNativeWeb() {
         const before = contents.slice(0, patchLocation);
         const after = contents.slice(patchLocation);
         const patched = before + "\n" + classNamePatch + "\n" + after;
-        console.log("Tamagui patch - adding className support to react-native-web", file);
+        console.log("   > adding className support to react-native-web", file);
         fs.writeFileSync(file, patched);
       }
     }

package/dist/esm/patchReactNativeWeb.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/patchReactNativeWeb.ts"],
-  "sourcesContent": ["import * as fs from 'fs'\nimport path from 'path'\n\n// were patching react-native-web so we can use some internal methods\n// we do it this way because we need to rely on webpack or bundler config to determine cjs vs esm\n// so we can't just require it all directly\n// would be nice in the future to be able to eject from react-native-web entirely optionally\n\n// keep it sync\nexport function patchReactNativeWeb() {\n  const rootDir = require.resolve('react-native-web').replace(/\\/dist.*/, '')\n  const modulePath = path.join(rootDir, 'dist', 'tamagui-exports.js')\n  const cjsPath = path.join(rootDir, 'dist', 'cjs', 'tamagui-exports.js')\n\n  const isEqual = (() => {\n    let res = false\n    try {\n      res =\n        fs.readFileSync(modulePath, 'utf-8') === moduleExports &&\n        fs.readFileSync(cjsPath, 'utf-8') == cjsExports\n    } catch {\n      res = false\n    }\n    return res\n  })()\n\n  if (!isEqual) {\n    console.log('\uD83E\uDD5A Tamagui patching react-native-web to share atomic styling primitives')\n    console.log('   > adding', modulePath)\n    console.log('   > adding', cjsPath)\n    fs.writeFileSync(modulePath, moduleExports)\n    fs.writeFileSync(cjsPath, cjsExports)\n  }\n\n  // patch to allow className prop\n  const classNamePatch = `if (props.className) { domProps.className = className ? className + ' ' + props.className : props.className }`\n  const domPropsPath = ['modules', 'createDOMProps', 'index.js']\n  const domPropsModulePath = path.join(rootDir, 'dist', ...domPropsPath)\n  const domPropsCjsPath = path.join(rootDir, 'dist', 'cjs', ...domPropsPath)\n  const patchClassName = (file: string) => {\n    const contents = fs.readFileSync(file, 'utf-8')\n    if (!contents.includes(classNamePatch)) {\n      const needle = `domProps.className = className`\n      const patchLocation = contents.indexOf(needle) + needle.length + 5\n      // its far down the file\n      if (patchLocation < 100) {\n        console.warn(\n          `\u26A0\uFE0F Couldn't apply className patch! Maybe using incompatible react-native-web version.`\n        )\n      } else {\n        const before = contents.slice(0, patchLocation)\n        const after = contents.slice(patchLocation)\n        const patched = before + '\\n' + classNamePatch + '\\n' + after\n        console.log('Tamagui patch - adding className support to react-native-web', file)\n        fs.writeFileSync(file, patched)\n      }\n    }\n  }\n  patchClassName(domPropsModulePath)\n  patchClassName(domPropsCjsPath)\n\n  // if (props.className) {\n  //   domProps.className = className ? className + ' ' + props.className : props.className\n  // }\n\n  // if entry files not patched, patch them:\n  const moduleEntry = path.join(rootDir, 'dist', 'index.js')\n  const moduleEntrySrc = fs.readFileSync(moduleEntry, 'utf-8')\n  if (!moduleEntrySrc.includes('// tamagui-patch-v4')) {\n    fs.writeFileSync(\n      moduleEntry,\n      `${removePatch(moduleEntrySrc)}\n\n// tamagui-patch-v4\nimport * as TExports from './tamagui-exports'\nexport const TamaguiExports = TExports\n// tamagui-patch-end\n`\n    )\n  }\n  const cjsEntry = path.join(rootDir, 'dist', 'cjs', 'index.js')\n  const cjsEntrySrc = fs.readFileSync(cjsEntry, 'utf-8')\n  if (!cjsEntrySrc.includes('// tamagui-patch-v4')) {\n    fs.writeFileSync(\n      cjsEntry,\n      `${removePatch(cjsEntrySrc)}\n\n// tamagui-patch-v4\nexports.TamaguiExports = _interopRequireDefault(require(\"./tamagui-exports\"));\n// tamagui-patch-end\n`\n    )\n  }\n}\n\nfunction removePatch(source: string) {\n  return source.replace(/\\/\\/ tamagui-patch([.\\s\\S]*)/g, '')\n}\n\n// view exports/View.ts\nconst forwardedPropsObj = `{\n  ...fwdProps.defaultProps,\n  ...fwdProps.accessibilityProps,\n  ...fwdProps.clickProps,\n  ...fwdProps.focusProps,\n  ...fwdProps.keyboardProps,\n  ...fwdProps.mouseProps,\n  ...fwdProps.touchProps,\n  ...fwdProps.styleProps,\n  href: true,\n  lang: true,\n  onScroll: true,\n  onWheel: true,\n  pointerEvents: true\n}\n`\n\nconst moduleExports = `\nexport { atomic } from './exports/StyleSheet/compile'\nexport { default as createCompileableStyle } from './exports/StyleSheet/createCompileableStyle'\nexport { default as createReactDOMStyle } from './exports/StyleSheet/createReactDOMStyle'\nexport { default as i18Style } from './exports/StyleSheet/i18nStyle'\nexport { default as createDOMProps } from './modules/createDOMProps'\nexport { default as AccessibilityUtil } from './modules/AccessibilityUtil'\nexport { default as createElement } from './exports/createElement'\nexport { default as css } from './exports/StyleSheet/css'\nexport { default as TextAncestorContext } from './exports/Text/TextAncestorContext'\nexport { default as pick } from './modules/pick'\nexport { default as useElementLayout } from './modules/useElementLayout'\nexport { default as useMergeRefs } from './modules/useMergeRefs'\nexport { default as usePlatformMethods } from './modules/usePlatformMethods'\nexport { default as useResponderEvents } from './modules/useResponderEvents'\nimport * as fwdProps from './modules/forwardedProps'\nexport const forwardedProps = ${forwardedPropsObj}\n`\n\nconst cjsExports = `\nexports.atomic = require('./exports/StyleSheet/compile').atomic\nexports.createCompileableStyle = require('./exports/StyleSheet/createCompileableStyle')\nexports.createReactDOMStyle = require('./exports/StyleSheet/createReactDOMStyle')\nexports.i18Style = require('./exports/StyleSheet/i18nStyle')\nexports.createDOMProps = require('./modules/createDOMProps')\nexports.AccessibilityUtil = require('./modules/AccessibilityUtil')\nexports.createElement = require('./exports/createElement')\nexports.css = require('./exports/StyleSheet/css')\nexports.TextAncestorContext = require('./exports/Text/TextAncestorContext')\nexports.pick = require('./modules/pick')\nexports.useElementLayout = require('./modules/useElementLayout')\nexports.useMergeRefs = require('./modules/useMergeRefs')\nexports.usePlatformMethods = require('./modules/usePlatformMethods')\nexports.useResponderEvents = require('./modules/useResponderEvents')\nconst fwdProps = require('./modules/forwardedProps')\nexports.forwardedProps = ${forwardedPropsObj}\n`\n"],
-  "mappings": ";;AAAA;AACA;AAQO,+BAA+B;AACpC,QAAM,UAAU,AAAgB,oCAAoB,QAAQ,YAAY;AACxE,QAAM,aAAa,KAAK,KAAK,SAAS,QAAQ;AAC9C,QAAM,UAAU,KAAK,KAAK,SAAS,QAAQ,OAAO;AAElD,QAAM,UAAW,OAAM;AACrB,QAAI,MAAM;AACV,QAAI;AACF,YACE,GAAG,aAAa,YAAY,aAAa,iBACzC,GAAG,aAAa,SAAS,YAAY;AAAA,YACvC;AACA,YAAM;AAAA;AAER,WAAO;AAAA;AAGT,MAAI,CAAC,SAAS;AACZ,YAAQ,IAAI;AACZ,YAAQ,IAAI,eAAe;AAC3B,YAAQ,IAAI,eAAe;AAC3B,OAAG,cAAc,YAAY;AAC7B,OAAG,cAAc,SAAS;AAAA;AAI5B,QAAM,iBAAiB;AACvB,QAAM,eAAe,CAAC,WAAW,kBAAkB;AACnD,QAAM,qBAAqB,KAAK,KAAK,SAAS,QAAQ,GAAG;AACzD,QAAM,kBAAkB,KAAK,KAAK,SAAS,QAAQ,OAAO,GAAG;AAC7D,QAAM,iBAAiB,wBAAC,SAAiB;AACvC,UAAM,WAAW,GAAG,aAAa,MAAM;AACvC,QAAI,CAAC,SAAS,SAAS,iBAAiB;AACtC,YAAM,SAAS;AACf,YAAM,gBAAgB,SAAS,QAAQ,UAAU,OAAO,SAAS;AAEjE,UAAI,gBAAgB,KAAK;AACvB,gBAAQ,KACN;AAAA,aAEG;AACL,cAAM,SAAS,SAAS,MAAM,GAAG;AACjC,cAAM,QAAQ,SAAS,MAAM;AAC7B,cAAM,UAAU,SAAS,OAAO,iBAAiB,OAAO;AACxD,gBAAQ,IAAI,gEAAgE;AAC5E,WAAG,cAAc,MAAM;AAAA;AAAA;AAAA,KAfN;AAmBvB,iBAAe;AACf,iBAAe;AAOf,QAAM,cAAc,KAAK,KAAK,SAAS,QAAQ;AAC/C,QAAM,iBAAiB,GAAG,aAAa,aAAa;AACpD,MAAI,CAAC,eAAe,SAAS,wBAAwB;AACnD,OAAG,cACD,aACA,GAAG,YAAY;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AASnB,QAAM,WAAW,KAAK,KAAK,SAAS,QAAQ,OAAO;AACnD,QAAM,cAAc,GAAG,aAAa,UAAU;AAC9C,MAAI,CAAC,YAAY,SAAS,wBAAwB;AAChD,OAAG,cACD,UACA,GAAG,YAAY;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AA5EL;AAsFhB,qBAAqB,QAAgB;AACnC,SAAO,OAAO,QAAQ,iCAAiC;AAAA;AADhD;AAKT,MAAM,oBAAoB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAiB1B,MAAM,gBAAgB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gCAgBU;AAAA;AAGhC,MAAM,aAAa;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,2BAgBQ;AAAA;",
+  "sourcesContent": ["import * as fs from 'fs'\nimport path from 'path'\n\n// were patching react-native-web so we can use some internal methods\n// we do it this way because we need to rely on webpack or bundler config to determine cjs vs esm\n// so we can't just require it all directly\n// would be nice in the future to be able to eject from react-native-web entirely optionally\n\n// keep it sync\nexport function patchReactNativeWeb() {\n  const rootDir = require.resolve('react-native-web').replace(/\\/dist.*/, '')\n  const modulePath = path.join(rootDir, 'dist', 'tamagui-exports.js')\n  const cjsPath = path.join(rootDir, 'dist', 'cjs', 'tamagui-exports.js')\n\n  const isEqual = (() => {\n    let res = false\n    try {\n      res =\n        fs.readFileSync(modulePath, 'utf-8') === moduleExports &&\n        fs.readFileSync(cjsPath, 'utf-8') == cjsExports\n    } catch {\n      res = false\n    }\n    return res\n  })()\n\n  if (!isEqual) {\n    console.log('\uD83E\uDD5A Tamagui patching react-native-web to share atomic styling primitives')\n    console.log('   > adding', modulePath)\n    console.log('   > adding', cjsPath)\n    fs.writeFileSync(modulePath, moduleExports)\n    fs.writeFileSync(cjsPath, cjsExports)\n  }\n\n  // patch to allow className prop\n  const classNamePatch = `if (props.dataSet && props.dataSet['__className']) { domProps.className = className ? className + ' ' + props.dataSet['__className'] : props.dataSet['__className']; delete props.dataSet['__className'] }`\n  const domPropsPath = ['modules', 'createDOMProps', 'index.js']\n  const domPropsModulePath = path.join(rootDir, 'dist', ...domPropsPath)\n  const domPropsCjsPath = path.join(rootDir, 'dist', 'cjs', ...domPropsPath)\n  const patchClassName = (file: string) => {\n    const contents = fs.readFileSync(file, 'utf-8')\n    if (!contents.includes(classNamePatch)) {\n      const needle = `domProps.className = className`\n      const patchLocation = contents.indexOf(needle) + needle.length + 5\n      // its far down the file\n      if (patchLocation < 100) {\n        console.warn(\n          `\u26A0\uFE0F Couldn't apply className patch! Maybe using incompatible react-native-web version.`\n        )\n      } else {\n        const before = contents.slice(0, patchLocation)\n        const after = contents.slice(patchLocation)\n        const patched = before + '\\n' + classNamePatch + '\\n' + after\n        console.log('   > adding className support to react-native-web', file)\n        fs.writeFileSync(file, patched)\n      }\n    }\n  }\n  patchClassName(domPropsModulePath)\n  patchClassName(domPropsCjsPath)\n\n  // if (props.className) {\n  //   domProps.className = className ? className + ' ' + props.className : props.className\n  // }\n\n  // if entry files not patched, patch them:\n  const moduleEntry = path.join(rootDir, 'dist', 'index.js')\n  const moduleEntrySrc = fs.readFileSync(moduleEntry, 'utf-8')\n  if (!moduleEntrySrc.includes('// tamagui-patch-v4')) {\n    fs.writeFileSync(\n      moduleEntry,\n      `${removePatch(moduleEntrySrc)}\n\n// tamagui-patch-v4\nimport * as TExports from './tamagui-exports'\nexport const TamaguiExports = TExports\n// tamagui-patch-end\n`\n    )\n  }\n  const cjsEntry = path.join(rootDir, 'dist', 'cjs', 'index.js')\n  const cjsEntrySrc = fs.readFileSync(cjsEntry, 'utf-8')\n  if (!cjsEntrySrc.includes('// tamagui-patch-v4')) {\n    fs.writeFileSync(\n      cjsEntry,\n      `${removePatch(cjsEntrySrc)}\n\n// tamagui-patch-v4\nexports.TamaguiExports = _interopRequireDefault(require(\"./tamagui-exports\"));\n// tamagui-patch-end\n`\n    )\n  }\n}\n\nfunction removePatch(source: string) {\n  return source.replace(/\\/\\/ tamagui-patch([.\\s\\S]*)/g, '')\n}\n\n// view exports/View.ts\nconst forwardedPropsObj = `{\n  ...fwdProps.defaultProps,\n  ...fwdProps.accessibilityProps,\n  ...fwdProps.clickProps,\n  ...fwdProps.focusProps,\n  ...fwdProps.keyboardProps,\n  ...fwdProps.mouseProps,\n  ...fwdProps.touchProps,\n  ...fwdProps.styleProps,\n  href: true,\n  lang: true,\n  onScroll: true,\n  onWheel: true,\n  pointerEvents: true\n}\n`\n\nconst moduleExports = `\nexport { atomic } from './exports/StyleSheet/compile'\nexport { default as createCompileableStyle } from './exports/StyleSheet/createCompileableStyle'\nexport { default as createReactDOMStyle } from './exports/StyleSheet/createReactDOMStyle'\nexport { default as i18Style } from './exports/StyleSheet/i18nStyle'\nexport { default as createDOMProps } from './modules/createDOMProps'\nexport { default as AccessibilityUtil } from './modules/AccessibilityUtil'\nexport { default as createElement } from './exports/createElement'\nexport { default as css } from './exports/StyleSheet/css'\nexport { default as TextAncestorContext } from './exports/Text/TextAncestorContext'\nexport { default as pick } from './modules/pick'\nexport { default as useElementLayout } from './modules/useElementLayout'\nexport { default as useMergeRefs } from './modules/useMergeRefs'\nexport { default as usePlatformMethods } from './modules/usePlatformMethods'\nexport { default as useResponderEvents } from './modules/useResponderEvents'\nimport * as fwdProps from './modules/forwardedProps'\nexport const forwardedProps = ${forwardedPropsObj}\n`\n\nconst cjsExports = `\nexports.atomic = require('./exports/StyleSheet/compile').atomic\nexports.createCompileableStyle = require('./exports/StyleSheet/createCompileableStyle')\nexports.createReactDOMStyle = require('./exports/StyleSheet/createReactDOMStyle')\nexports.i18Style = require('./exports/StyleSheet/i18nStyle')\nexports.createDOMProps = require('./modules/createDOMProps')\nexports.AccessibilityUtil = require('./modules/AccessibilityUtil')\nexports.createElement = require('./exports/createElement')\nexports.css = require('./exports/StyleSheet/css')\nexports.TextAncestorContext = require('./exports/Text/TextAncestorContext')\nexports.pick = require('./modules/pick')\nexports.useElementLayout = require('./modules/useElementLayout')\nexports.useMergeRefs = require('./modules/useMergeRefs')\nexports.usePlatformMethods = require('./modules/usePlatformMethods')\nexports.useResponderEvents = require('./modules/useResponderEvents')\nconst fwdProps = require('./modules/forwardedProps')\nexports.forwardedProps = ${forwardedPropsObj}\n`\n"],
+  "mappings": ";;AAAA;AACA;AAQO,+BAA+B;AACpC,QAAM,UAAU,AAAgB,oCAAoB,QAAQ,YAAY;AACxE,QAAM,aAAa,KAAK,KAAK,SAAS,QAAQ;AAC9C,QAAM,UAAU,KAAK,KAAK,SAAS,QAAQ,OAAO;AAElD,QAAM,UAAW,OAAM;AACrB,QAAI,MAAM;AACV,QAAI;AACF,YACE,GAAG,aAAa,YAAY,aAAa,iBACzC,GAAG,aAAa,SAAS,YAAY;AAAA,YACvC;AACA,YAAM;AAAA;AAER,WAAO;AAAA;AAGT,MAAI,CAAC,SAAS;AACZ,YAAQ,IAAI;AACZ,YAAQ,IAAI,eAAe;AAC3B,YAAQ,IAAI,eAAe;AAC3B,OAAG,cAAc,YAAY;AAC7B,OAAG,cAAc,SAAS;AAAA;AAI5B,QAAM,iBAAiB;AACvB,QAAM,eAAe,CAAC,WAAW,kBAAkB;AACnD,QAAM,qBAAqB,KAAK,KAAK,SAAS,QAAQ,GAAG;AACzD,QAAM,kBAAkB,KAAK,KAAK,SAAS,QAAQ,OAAO,GAAG;AAC7D,QAAM,iBAAiB,wBAAC,SAAiB;AACvC,UAAM,WAAW,GAAG,aAAa,MAAM;AACvC,QAAI,CAAC,SAAS,SAAS,iBAAiB;AACtC,YAAM,SAAS;AACf,YAAM,gBAAgB,SAAS,QAAQ,UAAU,OAAO,SAAS;AAEjE,UAAI,gBAAgB,KAAK;AACvB,gBAAQ,KACN;AAAA,aAEG;AACL,cAAM,SAAS,SAAS,MAAM,GAAG;AACjC,cAAM,QAAQ,SAAS,MAAM;AAC7B,cAAM,UAAU,SAAS,OAAO,iBAAiB,OAAO;AACxD,gBAAQ,IAAI,qDAAqD;AACjE,WAAG,cAAc,MAAM;AAAA;AAAA;AAAA,KAfN;AAmBvB,iBAAe;AACf,iBAAe;AAOf,QAAM,cAAc,KAAK,KAAK,SAAS,QAAQ;AAC/C,QAAM,iBAAiB,GAAG,aAAa,aAAa;AACpD,MAAI,CAAC,eAAe,SAAS,wBAAwB;AACnD,OAAG,cACD,aACA,GAAG,YAAY;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AASnB,QAAM,WAAW,KAAK,KAAK,SAAS,QAAQ,OAAO;AACnD,QAAM,cAAc,GAAG,aAAa,UAAU;AAC9C,MAAI,CAAC,YAAY,SAAS,wBAAwB;AAChD,OAAG,cACD,UACA,GAAG,YAAY;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AA5EL;AAsFhB,qBAAqB,QAAgB;AACnC,SAAO,OAAO,QAAQ,iCAAiC;AAAA;AADhD;AAKT,MAAM,oBAAoB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAiB1B,MAAM,gBAAgB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gCAgBU;AAAA;AAGhC,MAAM,aAAa;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,2BAgBQ;AAAA;",
   "names": []
 }

package/dist/jsx/extractor/createExtractor.js

@@ -155,7 +155,6 @@ function createExtractor() {
             node.attributes.unshift(t.jsxAttribute(t.jsxIdentifier("data-is"), t.stringLiteral(`  ${preName}${node.name.name}   ${filePath.replace("./", "")}:${lineNumbers}  `)));
           }
           if (disableExtraction) {
-            console.log("disableExtraction", disableExtraction);
             if (!hasLogged) {
               console.log("\u{1F95A} Tamagui disableExtraction set: no CSS or optimizations will be run");
               hasLogged = true;
@@ -283,8 +282,10 @@ function createExtractor() {
               }
               return res2;
             } catch (err) {
-              console.log("Error extracting attribute", err.message, err.stack);
-              console.log("node", path.node);
+              if (shouldPrintDebug) {
+                console.log("Error extracting attribute", err.message, err.stack);
+                console.log("node", path.node);
+              }
               return {
                 type: "attr",
                 value: path.node

package/dist/jsx/extractor/extractToClassNames.js

@@ -165,12 +165,17 @@ function extractToClassNames({
         const nameExpr = names ? hoistClassNames(jsxPath, existingHoists, names) : null;
         let expr = nameExpr;
         if (nameExpr && !t.isIdentifier(nameExpr)) {
-          ensureImportingConcat(programPath);
-          const simpleSpreads = attrs.filter((x) => t.isJSXSpreadAttribute(x.value) && isSimpleSpread(x.value));
-          expr = t.callExpression(t.identifier(CONCAT_CLASSNAME_IMPORT), [
-            expr,
-            ...simpleSpreads.map((val) => val.value["argument"])
-          ]);
+          if (!(res == null ? void 0 : res.flattened)) {
+            console.log("not flat");
+          } else {
+            console.log("flat");
+            ensureImportingConcat(programPath);
+            const simpleSpreads = attrs.filter((x) => t.isJSXSpreadAttribute(x.value) && isSimpleSpread(x.value));
+            expr = t.callExpression(t.identifier(CONCAT_CLASSNAME_IMPORT), [
+              expr,
+              ...simpleSpreads.map((val) => val.value["argument"])
+            ]);
+          }
         }
         node.attributes.push(t.jsxAttribute(t.jsxIdentifier("className"), t.jsxExpressionContainer(expr)));
       }

package/dist/jsx/extractor/loadTamagui.js

@@ -8,7 +8,7 @@ function loadTamagui(props) {
     return loadedTamagui;
   }
   process.env.IS_STATIC = "is_static";
-  const proxyWorm = require("@tamagui/fake-react-native");
+  const proxyWorm = require("react-native-web");
   const Mod = require("module");
   const og = Mod.prototype.require;
   Mod.prototype.require = function(path) {

package/dist/jsx/patchReactNativeWeb.js

@@ -22,7 +22,7 @@ function patchReactNativeWeb() {
     fs.writeFileSync(modulePath, moduleExports);
     fs.writeFileSync(cjsPath, cjsExports);
   }
-  const classNamePatch = `if (props.className) { domProps.className = className ? className + ' ' + props.className : props.className }`;
+  const classNamePatch = `if (props.dataSet && props.dataSet['__className']) { domProps.className = className ? className + ' ' + props.dataSet['__className'] : props.dataSet['__className']; delete props.dataSet['__className'] }`;
   const domPropsPath = ["modules", "createDOMProps", "index.js"];
   const domPropsModulePath = path.join(rootDir, "dist", ...domPropsPath);
   const domPropsCjsPath = path.join(rootDir, "dist", "cjs", ...domPropsPath);
@@ -37,7 +37,7 @@ function patchReactNativeWeb() {
         const before = contents.slice(0, patchLocation);
         const after = contents.slice(patchLocation);
         const patched = before + "\n" + classNamePatch + "\n" + after;
-        console.log("Tamagui patch - adding className support to react-native-web", file);
+        console.log("   > adding className support to react-native-web", file);
         fs.writeFileSync(file, patched);
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/static",
-  "version": "1.0.0-alpha.45",
+  "version": "1.0.0-alpha.49",
   "source": "src/index.ts",
   "typings": "types",
   "main": "dist/cjs",
@@ -24,6 +24,10 @@
   "publishConfig": {
     "access": "public"
   },
+  "volta": {
+    "node": "16.13.2",
+    "yarn": "1.22.17"
+  },
   "license": "MIT",
   "devDependencies": {
     "@babel/plugin-syntax-typescript": "^7.14.5",
@@ -54,10 +58,10 @@
     "@dish/babel-preset": "^0.0.6",
     "@expo/match-media": "^0.1.0",
     "@tamagui/build": "^1.0.0-alpha.44",
-    "@tamagui/core": "^1.0.0-alpha.45",
-    "@tamagui/core-node": "^1.0.0-alpha.44",
+    "@tamagui/core": "^1.0.0-alpha.48",
+    "@tamagui/core-node": "^1.0.0-alpha.48",
     "@tamagui/fake-react-native": "^1.0.0-alpha.17",
-    "@tamagui/helpers": "^1.0.0-alpha.44",
+    "@tamagui/helpers": "^1.0.0-alpha.48",
     "babel-literal-to-ast": "^2.1.0",
     "esbuild": "^0.13.12",
     "esbuild-register": "^3.1.2",
@@ -66,10 +70,10 @@
     "invariant": "^2.2.4",
     "loader-utils": "^2.0.0",
     "lodash": "^4.17.21",
-    "tamagui": "^1.0.0-alpha.45"
+    "tamagui": "^1.0.0-alpha.49"
   },
   "peerDependencies": {
     "react-native-web": "*"
   },
-  "gitHead": "b04707063cb83e42e438c0a528b830fac5292f3b"
+  "gitHead": "78288707c143087395f74c74dc95686e0a2bd938"
 }

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,KAAK,EAAsB,qBAAqB,EAAE,MAAM,eAAe,CAAA;AAM9E,OAAO,EAAoC,mBAAmB,EAAW,MAAM,UAAU,CAAA;AAyBzF,oBAAY,SAAS,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAI1D,wBAAgB,eAAe;;;;;;;;;;;;;;;;;;;;;wBAsBb,SAAS,EAAE,OAAO,CAAC,GAAG,MAAM,+MAcrC,mBAAmB;;;;;EAwkC3B"}
+{"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,KAAK,EAAsB,qBAAqB,EAAE,MAAM,eAAe,CAAA;AAM9E,OAAO,EAAoC,mBAAmB,EAAW,MAAM,UAAU,CAAA;AAyBzF,oBAAY,SAAS,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAI1D,wBAAgB,eAAe;;;;;;;;;;;;;;;;;;;;;wBAsBb,SAAS,EAAE,OAAO,CAAC,GAAG,MAAM,+MAcrC,mBAAmB;;;;;EAykC3B"}

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;AAQjC,OAAO,EAAgC,cAAc,EAAE,MAAM,UAAU,CAAA;AAGvE,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAc7C,wBAAgB,mBAAmB,CAAC,EAClC,MAAM,EACN,SAAS,EACT,MAAM,EACN,UAAU,EACV,OAAO,EACP,gBAAgB,EAChB,QAAQ,EACR,OAAO,GACR,EAAE;IACD,MAAM,EAAE,GAAG,CAAA;IACX,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,CAAA;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,GAAG,IAAI,GAAG;IACT,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,CAmRA"}
+{"version":3,"file":"extractToClassNames.d.ts","sourceRoot":"","sources":["../../src/extractor/extractToClassNames.ts"],"names":[],"mappings":";AAKA,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAQjC,OAAO,EAAgC,cAAc,EAAE,MAAM,UAAU,CAAA;AAGvE,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAc7C,wBAAgB,mBAAmB,CAAC,EAClC,MAAM,EACN,SAAS,EACT,MAAM,EACN,UAAU,EACV,OAAO,EACP,gBAAgB,EAChB,QAAQ,EACR,OAAO,GACR,EAAE;IACD,MAAM,EAAE,GAAG,CAAA;IACX,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,CAAA;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,GAAG,IAAI,GAAG;IACT,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,CAwRA"}