@tamagui/static 1.0.1-beta.66 → 1.0.1-beta.69

package/src/extractor/extractToClassNames.ts

@@ -97,6 +97,10 @@ export function extractToClassNames({
     shouldPrintDebug,
     ...options,
     target: 'html',
+    extractStyledDefinitions: true,
+    onStyleRule(identifier, rules) {
+      cssMap.set(`.${identifier}`, { css: rules.join(';'), commentTexts: [] })
+    },
     getFlattenedNode: ({ tag }) => {
       hasFlattened = true
       return tag
@@ -112,6 +116,10 @@ export function extractToClassNames({
       programPath,
       isFlattened,
     }) => {
+      // reset hasFlattened
+      const didFlattenThisTag = hasFlattened
+      hasFlattened = false
+
       let finalClassNames: ClassNameObject[] = []
       let finalAttrs: (t.JSXAttribute | t.JSXSpreadAttribute)[] = []
       let finalStyles: StyleObject[] = []
@@ -156,37 +164,17 @@ export function extractToClassNames({
         switch (attr.type) {
           case 'style':
             if (!isFlattened) {
-              // only ever one at a time i believe so we can be lazy with this access
-              const { hoverStyle, pressStyle, focusStyle } = attr.value
-              const pseudos = [
-                ['hoverStyle', hoverStyle],
-                ['pressStyle', pressStyle],
-                ['focusStyle', focusStyle],
-              ] as const
-
               const styles = getStylesAtomic(attr.value, {
                 splitTransforms: true,
               })
-              finalStyles = [...finalStyles, ...styles]
 
-              for (const [key, value] of pseudos) {
-                if (value && Object.keys(value).length) {
-                  finalAttrs.push(
-                    t.jsxAttribute(
-                      t.jsxIdentifier(key),
-                      t.jsxExpressionContainer(literalToAst(value))
-                    )
-                  )
-                }
-              }
+              finalStyles = [...finalStyles, ...styles]
 
               for (const style of styles) {
-                if (style.pseudo) {
-                  continue
-                }
                 //  leave them  as attributes
+                const prop = style.pseudo ? `${style.property}-${style.pseudo}` : style.property
                 finalAttrs.push(
-                  t.jsxAttribute(t.jsxIdentifier(style.property), t.stringLiteral(style.identifier))
+                  t.jsxAttribute(t.jsxIdentifier(prop), t.stringLiteral(style.identifier))
                 )
               }
             } else {
@@ -305,7 +293,7 @@ export function extractToClassNames({
 
         // if has some spreads, use concat helper
         if (nameExpr && !t.isIdentifier(nameExpr)) {
-          if (!hasFlattened) {
+          if (!didFlattenThisTag) {
             // not flat
           } else {
             ensureImportingConcat(programPath)
@@ -326,7 +314,8 @@ export function extractToClassNames({
 
       const comment = util.format('/* %s:%s (%s) */', filePath, lineNumbers, originalNodeName)
 
-      for (const { className, rules } of finalStyles) {
+      for (const { identifier, rules } of finalStyles) {
+        const className = `.${identifier}`
         if (cssMap.has(className)) {
           if (comment) {
             const val = cssMap.get(className)!
@@ -347,7 +336,7 @@ export function extractToClassNames({
     },
   })
 
-  if (!res || (!res.modified && !res.optimized && !res.flattened)) {
+  if (!res || (!res.modified && !res.optimized && !res.flattened && !res.styled)) {
     if (shouldPrintDebug) {
       console.log('no res or none modified', res)
     }
@@ -401,6 +390,8 @@ export function extractToClassNames({
       .slice(0, 22)
       .trim()
       .padStart(24)
+
+    const numStyled = `${res.styled}`.padStart(3)
     const numOptimized = `${res.optimized}`.padStart(3)
     const numFound = `${res.found}`.padStart(3)
     const numFlattened = `${res.flattened}`.padStart(3)
@@ -408,12 +399,10 @@ export function extractToClassNames({
     const timing = Date.now() - start
     const timingWarning = timing > 50 ? '⚠️' : timing > 150 ? '☢️' : ''
     const timingStr = `${timing}ms${timingWarning}`.padStart(6)
+    const pre = getPrefixLogs(options)
+    const memStr = memory ? `(${memory})` : ''
     console.log(
-      `${getPrefixLogs(
-        options
-      )} ${path}  ${numFound}   · ${numOptimized}   · ${numFlattened}  ${timingStr} ${
-        memory ? `(${memory})` : ''
-      }`
+      `${pre} ${path}  ${numFound} · ${numOptimized} · ${numFlattened} · ${numStyled}  ${timingStr} ${memStr}`
     )
   }
 

package/src/patchReactNativeWeb.ts

@@ -7,98 +7,87 @@ import * as fs from 'fs-extra'
 // so we can't just require it all directly
 // would be nice in the future to be able to eject from react-native-web entirely optionally
 
+const PATCH_PREFIX = 'tamagui-patch-'
+const PATCH_VERSION = `${PATCH_PREFIX}-v5`
+const PATCH_COMMENT = `// ${PATCH_VERSION}`
+const PATCH_END_COMMENT = `// tamagui-patch-end`
+
 // keep it sync
 export function patchReactNativeWeb(dir: string = require.resolve('react-native-web')) {
   const rootDir = dir.replace(/[\/\\]dist.*/, '')
+
+  const pkgJSON = fs.readJSONSync(path.join(rootDir, 'package.json'))
+  if (pkgJSON.version.split('.')[1] !== '18') {
+    console.error(
+      `⛔️ Error! Tamagui as of beta 69 only works with react-native-web version 0.18.x`,
+      pkgJSON.version
+    )
+    process.exit(1)
+  }
+
+  // patch exports for tamagui
   const modulePath = path.join(rootDir, 'dist', 'tamagui-exports.js')
   const cjsPath = path.join(rootDir, 'dist', 'cjs', 'tamagui-exports.js')
-  const shouldPatchExports =
+  const alreadyPatchedImports =
     fs.existsSync(modulePath) &&
     fs.readFileSync(modulePath, 'utf-8') === moduleExports &&
     fs.existsSync(cjsPath) &&
     fs.readFileSync(cjsPath, 'utf-8') === cjsExports
-  if (!shouldPatchExports) {
+
+  if (!alreadyPatchedImports) {
     console.log('      | patch ' + path.relative(rootDir, modulePath))
-    console.log('      | patch ' + path.relative(rootDir, cjsPath))
     fs.writeFileSync(modulePath, moduleExports)
+    console.log('      | patch ' + path.relative(rootDir, cjsPath))
     fs.writeFileSync(cjsPath, cjsExports)
   }
 
-  // patch to allow className prop
-  const patches = [
-    {
-      id: 'dom-props',
-      filePath: ['modules', 'createDOMProps', 'index.js'],
-      replacee: `  if (dataSet != null) {`,
-      replacer: `
-  if (props.dataSet && props.dataSet.className) {
-    const { className, ...dataSetRest } = props.dataSet
-    classList = className
-    dataSet = dataSetRest
-  }
-  if (props.dataSet && props.dataSet.id) {
-    domProps['id'] = props.dataSet.id
-  }
-  if (dataSet != null) {`,
-    },
-    {
-      id: 'forward-props',
-      filePath: ['modules', 'forwardedProps', 'index.js'],
-      replacee: `dataSet: true,`,
-      replacer: `id: true, dataSet: true,`,
-    },
-  ]
+  // patch createDOMProps
+  const dpFile = path.join(rootDir, 'dist', 'modules', 'createDOMProps', 'index.js')
+  const dpPatched = fs.readFileSync(
+    path.join(__dirname, '..', '..', 'patches', '18', 'createDOMProps.js'),
+    'utf-8'
+  )
+  const dpFileCJS = path.join(rootDir, 'dist', 'cjs', 'modules', 'createDOMProps', 'index.js')
+  const dpCJSPatched = fs.readFileSync(
+    path.join(__dirname, '..', '..', 'patches', '18', 'createDOMProps.cjs.js'),
+    'utf-8'
+  )
+  const alreadyPatchedDOMProps =
+    fs.readFileSync(dpFile, 'utf-8') === dpPatched &&
+    fs.readFileSync(dpFileCJS, 'utf-8') === dpCJSPatched
 
-  for (const { filePath, replacee, replacer } of patches) {
-    const files = [
-      path.join(rootDir, 'dist', ...filePath),
-      path.join(rootDir, 'dist', 'cjs', ...filePath),
-    ]
-    for (const file of files) {
-      const contents = fs.readFileSync(file, 'utf-8')
-      if (contents.includes(replacer)) {
-        continue
-      }
-      if (!contents.includes(replacee)) {
-        console.warn(
-          `⚠️ Error: couldn't apply className patch! Maybe using incompatible react-native-web version.`,
-          {
-            replacee,
-            contents,
-          }
-        )
-        continue
-      }
-      console.log('      | patch ' + path.relative(rootDir, file))
-      fs.writeFileSync(file, contents.replace(replacee, replacer))
-    }
+  if (!alreadyPatchedDOMProps) {
+    console.log('      | patch ' + path.relative(rootDir, dpFile))
+    fs.writeFileSync(dpFile, dpPatched)
+    console.log('      | patch ' + path.relative(rootDir, dpFileCJS))
+    fs.writeFileSync(dpFileCJS, dpCJSPatched)
   }
 
-  // if entry files not patched, patch them:
+  // export tamagui exports from root
   const moduleEntry = path.join(rootDir, 'dist', 'index.js')
   const moduleEntrySrc = fs.readFileSync(moduleEntry, 'utf-8')
-  if (!moduleEntrySrc.includes('// tamagui-patch-v4')) {
+  if (!moduleEntrySrc.includes(PATCH_COMMENT)) {
     fs.writeFileSync(
       moduleEntry,
       `${removePatch(moduleEntrySrc)}
 
-// tamagui-patch-v4
+${PATCH_COMMENT}
 import * as TExports from './tamagui-exports'
 export const TamaguiExports = TExports
-// tamagui-patch-end
+${PATCH_END_COMMENT}
 `
     )
   }
   const cjsEntry = path.join(rootDir, 'dist', 'cjs', 'index.js')
   const cjsEntrySrc = fs.readFileSync(cjsEntry, 'utf-8')
-  if (!cjsEntrySrc.includes('// tamagui-patch-v4')) {
+  if (!cjsEntrySrc.includes(PATCH_COMMENT)) {
     fs.writeFileSync(
       cjsEntry,
       `${removePatch(cjsEntrySrc)}
 
-// tamagui-patch-v4
-exports.TamaguiExports = _interopRequireDefault(require("./tamagui-exports"));
-// tamagui-patch-end
+${PATCH_COMMENT}
+exports.TamaguiExports = require("./tamagui-exports");
+${PATCH_END_COMMENT}
 `
     )
   }
@@ -108,58 +97,20 @@ function removePatch(source: string) {
   return source.replace(/\/\/ tamagui-patch([.\s\S]*)/g, '')
 }
 
-// view exports/View.ts
-const forwardedPropsObj = `{
-  ...fwdProps.defaultProps,
-  ...fwdProps.accessibilityProps,
-  ...fwdProps.clickProps,
-  ...fwdProps.focusProps,
-  ...fwdProps.keyboardProps,
-  ...fwdProps.mouseProps,
-  ...fwdProps.touchProps,
-  ...fwdProps.styleProps,
-  href: true,
-  lang: true,
-  onScroll: true,
-  onWheel: true,
-  pointerEvents: true
-}
-`
-
 const moduleExports = `
-export { atomic } from './exports/StyleSheet/compile'
-export { default as createCompileableStyle } from './exports/StyleSheet/createCompileableStyle'
-export { default as createReactDOMStyle } from './exports/StyleSheet/createReactDOMStyle'
-export { default as i18Style } from './exports/StyleSheet/i18nStyle'
 export { default as createDOMProps } from './modules/createDOMProps'
-export { default as AccessibilityUtil } from './modules/AccessibilityUtil'
-export { default as createElement } from './exports/createElement'
-export { default as css } from './exports/StyleSheet/css'
 export { default as TextAncestorContext } from './exports/Text/TextAncestorContext'
-export { default as pick } from './modules/pick'
 export { default as useElementLayout } from './modules/useElementLayout'
 export { default as useMergeRefs } from './modules/useMergeRefs'
 export { default as usePlatformMethods } from './modules/usePlatformMethods'
 export { default as useResponderEvents } from './modules/useResponderEvents'
-import * as fwdProps from './modules/forwardedProps'
-export const forwardedProps = ${forwardedPropsObj}
 `
 
 const cjsExports = `
-exports.atomic = require('./exports/StyleSheet/compile').atomic
-exports.createCompileableStyle = require('./exports/StyleSheet/createCompileableStyle')
-exports.createReactDOMStyle = require('./exports/StyleSheet/createReactDOMStyle')
-exports.i18Style = require('./exports/StyleSheet/i18nStyle')
 exports.createDOMProps = require('./modules/createDOMProps')
-exports.AccessibilityUtil = require('./modules/AccessibilityUtil')
-exports.createElement = require('./exports/createElement')
-exports.css = require('./exports/StyleSheet/css')
 exports.TextAncestorContext = require('./exports/Text/TextAncestorContext')
-exports.pick = require('./modules/pick')
 exports.useElementLayout = require('./modules/useElementLayout')
 exports.useMergeRefs = require('./modules/useMergeRefs')
 exports.usePlatformMethods = require('./modules/usePlatformMethods')
 exports.useResponderEvents = require('./modules/useResponderEvents')
-const fwdProps = require('./modules/forwardedProps')
-exports.forwardedProps = ${forwardedPropsObj}
 `

package/src/types.ts

@@ -1,8 +1,11 @@
 import { NodePath } from '@babel/traverse'
 import * as t from '@babel/types'
 import { PseudoStyles } from '@tamagui/core-node'
+import { StyleObject } from '@tamagui/core-node'
 import { ViewStyle } from 'react-native'
 
+export type { StyleObject } from '@tamagui/helpers'
+
 export type ClassNameObject = t.StringLiteral | t.Expression
 
 export interface CacheObject {
@@ -69,6 +72,9 @@ export type ExtractorParseProps = TamaguiOptions & {
   shouldPrintDebug?: boolean | 'verbose'
   onExtractTag: (props: ExtractTagProps) => void
   getFlattenedNode: (props: { isTextView: boolean; tag: string }) => string
+  extractStyledDefinitions?: boolean
+  // identifer, rule
+  onStyleRule?: (identifier: string, rules: string[]) => void
 }
 
 export interface Ternary {
@@ -80,14 +86,6 @@ export interface Ternary {
   alternate: Object | null
 }
 
-export type StyleObject = {
-  property: string
-  value: string
-  className: string
-  identifier: string
-  rules: string[]
-}
-
 export type ClassNameToStyleObj = {
   [key: string]: StyleObject
 }

package/types/extractor/createEvaluator.d.ts

@@ -5,7 +5,7 @@ export declare function createEvaluator({ tamaguiConfig, staticNamespace, source
     tamaguiConfig: TamaguiConfig;
     staticNamespace: Record<string, any>;
     sourcePath: string;
-    traversePath: NodePath<t.JSXElement>;
+    traversePath?: NodePath<t.JSXElement>;
     shouldPrintDebug: boolean | 'verbose';
 }): (n: t.Node) => any;
 export declare function createSafeEvaluator(attemptEval: (n: t.Node) => any): (n: t.Node) => any;

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

@@ -1 +1 @@
-{"version":3,"file":"createEvaluator.d.ts","sourceRoot":"","sources":["../../src/extractor/createEvaluator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC1C,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AACjC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAQlD,wBAAgB,eAAe,CAAC,EAC9B,aAAa,EACb,eAAe,EACf,UAAU,EACV,YAAY,EACZ,gBAAgB,GACjB,EAAE;IACD,aAAa,EAAE,aAAa,CAAA;IAC5B,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACpC,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAA;IACpC,gBAAgB,EAAE,OAAO,GAAG,SAAS,CAAA;CACtC,OAmCY,MAAM,SAGlB;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,KAAK,GAAG,OACtD,MAAM,SAOlB"}
+{"version":3,"file":"createEvaluator.d.ts","sourceRoot":"","sources":["../../src/extractor/createEvaluator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC1C,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AACjC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAQlD,wBAAgB,eAAe,CAAC,EAC9B,aAAa,EACb,eAAe,EACf,UAAU,EACV,YAAY,EACZ,gBAAgB,GACjB,EAAE;IACD,aAAa,EAAE,aAAa,CAAA;IAC5B,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACpC,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAA;IACrC,gBAAgB,EAAE,OAAO,GAAG,SAAS,CAAA;CACtC,OAoCY,MAAM,SAGlB;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,KAAK,GAAG,OACtD,MAAM,SAOlB"}

package/types/extractor/createExtractor.d.ts

@@ -17,7 +17,8 @@ export declare function createExtractor(): {
             [key: string]: any;
         };
     }, import("@tamagui/core-node").GenericFonts>;
-    parse: (fileOrPath: NodePath<t.Program> | t.File, { config, importsWhitelist, evaluateVars, shouldPrintDebug, sourcePath, onExtractTag, getFlattenedNode, disable, disableExtraction, disableExtractInlineMedia, disableExtractVariables, disableDebugAttr, prefixLogs, excludeProps, target, ...props }: ExtractorParseProps) => {
+    parse: (fileOrPath: NodePath<t.Program> | t.File, { config, importsWhitelist, evaluateVars, shouldPrintDebug, sourcePath, onExtractTag, onStyleRule, getFlattenedNode, disable, disableExtraction, disableExtractInlineMedia, disableExtractVariables, disableDebugAttr, extractStyledDefinitions, prefixLogs, excludeProps, target, ...props }: ExtractorParseProps) => {
+        styled: number;
         flattened: number;
         optimized: number;
         modified: number;

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

@@ -1 +1 @@
-{"version":3,"file":"createExtractor.d.ts","sourceRoot":"","sources":["../../src/extractor/createExtractor.ts"],"names":[],"mappings":"AAEA,OAAiB,EAAE,QAAQ,EAAW,MAAM,iBAAiB,CAAA;AAC7D,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AACjC,OAAO,EAGL,qBAAqB,EAStB,MAAM,oBAAoB,CAAA;AAK3B,OAAO,EAIL,mBAAmB,EAEpB,MAAM,UAAU,CAAA;AAqCjB,oBAAY,SAAS,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAI1D,wBAAgB,eAAe;;;;;;;;;;;;;;wBAqBb,SAAS,EAAE,OAAO,CAAC,GAAG,MAAM,0PAkBrC,mBAAmB;;;;;;EAmlD3B"}
+{"version":3,"file":"createExtractor.d.ts","sourceRoot":"","sources":["../../src/extractor/createExtractor.ts"],"names":[],"mappings":"AAEA,OAAiB,EAAE,QAAQ,EAAW,MAAM,iBAAiB,CAAA;AAC7D,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AACjC,OAAO,EAGL,qBAAqB,EAUtB,MAAM,oBAAoB,CAAA;AAK3B,OAAO,EAIL,mBAAmB,EAEpB,MAAM,UAAU,CAAA;AAqCjB,oBAAY,SAAS,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAI1D,wBAAgB,eAAe;;;;;;;;;;;;;;wBAkCb,SAAS,EAAE,OAAO,CAAC,GAAG,MAAM,iSAoBrC,mBAAmB;;;;;;;EAswD3B"}

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;AAiB7C,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,aAAa,EACb,QAAQ,EACR,OAAO,GACR,EAAE;IACD,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,CAAA;IAC1B,aAAa,EAAE,MAAM,CAAA;IACrB,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;AAiB7C,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,aAAa,EACb,QAAQ,EACR,OAAO,GACR,EAAE;IACD,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,CAAA;IAC1B,aAAa,EAAE,MAAM,CAAA;IACrB,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,CAiW3B"}

package/types/patchReactNativeWeb.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"patchReactNativeWeb.d.ts","sourceRoot":"","sources":["../src/patchReactNativeWeb.ts"],"names":[],"mappings":"AAUA,wBAAgB,mBAAmB,CAAC,GAAG,GAAE,MAA4C,QA8FpF"}
+{"version":3,"file":"patchReactNativeWeb.d.ts","sourceRoot":"","sources":["../src/patchReactNativeWeb.ts"],"names":[],"mappings":"AAeA,wBAAgB,mBAAmB,CAAC,GAAG,GAAE,MAA4C,QA8EpF"}

package/types/types.d.ts

@@ -1,7 +1,9 @@
 import { NodePath } from '@babel/traverse';
 import * as t from '@babel/types';
 import { PseudoStyles } from '@tamagui/core-node';
+import { StyleObject } from '@tamagui/core-node';
 import { ViewStyle } from 'react-native';
+export type { StyleObject } from '@tamagui/helpers';
 export declare type ClassNameObject = t.StringLiteral | t.Expression;
 export interface CacheObject {
     [key: string]: any;
@@ -60,6 +62,8 @@ export declare type ExtractorParseProps = TamaguiOptions & {
         isTextView: boolean;
         tag: string;
     }) => string;
+    extractStyledDefinitions?: boolean;
+    onStyleRule?: (identifier: string, rules: string[]) => void;
 };
 export interface Ternary {
     test: t.Expression;
@@ -68,13 +72,6 @@ export interface Ternary {
     consequent: Object | null;
     alternate: Object | null;
 }
-export declare type StyleObject = {
-    property: string;
-    value: string;
-    className: string;
-    identifier: string;
-    rules: string[];
-};
 export declare type ClassNameToStyleObj = {
     [key: string]: StyleObject;
 };

package/types/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}