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

package/src/extractor/loadTamagui.ts

@@ -1,8 +1,12 @@
 import { join } from 'path'
 
-import type { StaticConfig, TamaguiComponent, TamaguiInternalConfig } from '@tamagui/core'
+import type { StaticConfig, TamaguiComponent, TamaguiInternalConfig } from '@tamagui/core-node'
 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: any = null
 
 type NameToPaths = {
@@ -16,6 +20,8 @@ export type TamaguiProjectInfo = {
 }
 
 export function loadTamagui(props: { components: string[]; config: string }): TamaguiProjectInfo {
+  console.trace('load', !!loadedTamagui)
+
   if (loadedTamagui) {
     return loadedTamagui
   }
@@ -37,102 +43,62 @@ export function loadTamagui(props: { components: string[]; config: string }): Ta
       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: NameToPaths = {}
+    registerRequire()
 
-    Mod.prototype.require = function (path: string) {
-      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') &&
-        // allow our rnw.tsx imports through
-        !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 = out[key]?.staticConfig as StaticConfig
-                if (conf) {
-                  if (conf.componentName) {
-                    nameToPaths[conf.componentName] ??= new Set()
-                    const fullName = path.startsWith('.')
-                      ? join(`${this.path.replace(/dist(\/cjs)?/, 'src')}`, path)
-                      : path
-                    nameToPaths[conf.componentName].add(fullName)
-                  } else {
-                    // console.log('no name component', path)
-                  }
-                }
-              } catch {
-                // ok
-              }
-            }
-          }
-        }
-        return out
-      } catch (err: any) {
-        console.error('Tamagui error loading file:\n', path, err.message, '\n', err.stack)
-        // avoid infinite loops
-        process.exit(1)
-      }
-    }
+    try {
+      // import config
+      const exp = require(configPath)
+      const tamaguiConfig = (exp['default'] || exp) as TamaguiInternalConfig
 
-    // import config
-    const exp = require(configPath)
-    const tamaguiConfig = (exp['default'] || exp) as TamaguiInternalConfig
-
-    if (!tamaguiConfig || !tamaguiConfig.parsed) {
-      try {
+      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
       }
-    }
 
-    // import components
-    const components = {}
-    for (const moduleName of props.components) {
-      const exported = require(moduleName)
-      for (const Name in exported) {
-        const val = exported[Name]
-        const staticConfig = val?.staticConfig as StaticConfig | undefined
-        if (staticConfig) {
-          // remove non-stringifyable
-          const { Component, reactNativeWebComponent, ...sc } = staticConfig
-          Object.assign(components, { [Name]: { staticConfig: sc } })
+      // import components
+      const components = {}
+      for (const moduleName of props.components) {
+        const exported = require(moduleName)
+        for (const Name in exported) {
+          const val = exported[Name]
+          const staticConfig = val?.staticConfig as StaticConfig | undefined
+          if (staticConfig) {
+            // remove non-stringifyable
+            const { Component, reactNativeWebComponent, ...sc } = staticConfig
+            Object.assign(components, { [Name]: { staticConfig: sc } })
+          }
         }
       }
-    }
 
-    // undo shims
-    process.env.IS_STATIC = undefined
-    Mod.prototype.require = og
+      // undo shims
+      process.env.IS_STATIC = undefined
 
-    // set up core-node
-    createTamagui(tamaguiConfig as any)
+      // set up core-node
+      createTamagui(tamaguiConfig as any)
 
-    loadedTamagui = {
-      components,
-      tamaguiConfig,
-      nameToPaths,
+      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(`\n\n    ${err.message}\n\n`)
+        if (SHOULD_DEBUG) {
+          console.log(err.stack)
+        }
+      } else {
+        console.error(`Error loading tamagui.config.ts`, err)
+      }
+      return {
+        components: {},
+        tamaguiConfig: defaultTamaguiConfig,
+        nameToPaths: {},
+      }
     }
 
     return loadedTamagui
@@ -141,5 +107,6 @@ export function loadTamagui(props: { components: string[]; config: string }): Ta
     throw err
   } finally {
     unregister()
+    unregisterRequire()
   }
 }

package/src/index.ts

@@ -8,3 +8,4 @@ export * from './extractor/extractToClassNames'
 export * from './extractor/extractHelpers'
 export * from '@tamagui/patch-rnw'
 export * from './extractor/loadTamagui'
+export * from './require'

package/src/require.ts

@@ -0,0 +1,93 @@
+import { join } from 'path'
+
+import type { StaticConfig } from '@tamagui/core-node'
+
+import { SHOULD_DEBUG } from './constants'
+
+const nameToPaths = {}
+const Mod = require('module')
+const og = Mod.prototype.require
+globalThis['ogRequire'] = og
+
+export const getNameToPaths = () => nameToPaths
+
+let tries = 0
+setInterval(() => {
+  tries = 0
+}, 500)
+
+export 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: string) {
+    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') &&
+      // allow our rnw.tsx imports through
+      !path.startsWith('react-native-web/dist/cjs/exports')
+    ) {
+      return rnw
+      // return og('react-native-web')
+    }
+    try {
+      const out = og.apply(this, arguments)
+      if (!nameToPaths[path]) {
+        if (out && typeof out === 'object') {
+          for (const key in out) {
+            try {
+              const conf = out[key]?.staticConfig as StaticConfig
+              if (conf) {
+                if (conf.componentName) {
+                  nameToPaths[conf.componentName] ??= new Set()
+                  const fullName = path.startsWith('.')
+                    ? join(`${this.path.replace(/dist(\/cjs)?/, 'src')}`, path)
+                    : path
+                  nameToPaths[conf.componentName].add(fullName)
+                } else {
+                  // console.log('no name component', path)
+                }
+              }
+            } catch {
+              // ok
+            }
+          }
+        }
+      }
+      return out
+    } catch (err: any) {
+      console.error(
+        `Tamagui failed requiring ${path} from your tamagui.config.ts file, ignoring (set DEBUG=tamagui to see stack)\n`,
+        err.message
+      )
+      if (SHOULD_DEBUG) {
+        console.log(err.stack)
+      }
+      if (++tries > 10) {
+        // avoid infinite loops
+        process.exit(1)
+      }
+    }
+  }
+}
+
+export function unregisterRequire() {
+  Mod.prototype.require = og
+}

package/types/constants.d.ts

@@ -3,4 +3,5 @@ export declare const MEDIA_SEP = "_";
 export declare const cacheDir: any;
 export declare const FAILED_EVAL: unique symbol;
 export declare const CONCAT_CLASSNAME_IMPORT = "concatClassName";
+export declare const SHOULD_DEBUG: boolean | undefined;
 //# sourceMappingURL=constants.d.ts.map

package/types/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,aAAa,gBAAgB,CAAA;AAI1C,eAAO,MAAM,SAAS,MAAM,CAAA;AAG5B,eAAO,MAAM,QAAQ,KAAkD,CAAA;AAEvE,eAAO,MAAM,WAAW,eAA8B,CAAA;AACtD,eAAO,MAAM,uBAAuB,oBAAoB,CAAA"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,aAAa,gBAAgB,CAAA;AAI1C,eAAO,MAAM,SAAS,MAAM,CAAA;AAG5B,eAAO,MAAM,QAAQ,KAAkD,CAAA;AAEvE,eAAO,MAAM,WAAW,eAA8B,CAAA;AACtD,eAAO,MAAM,uBAAuB,oBAAoB,CAAA;AAExD,eAAO,MAAM,YAAY,qBAAwE,CAAA"}

package/types/extractor/createEvaluator.d.ts

@@ -1,6 +1,6 @@
 import { NodePath } from '@babel/traverse';
 import * as t from '@babel/types';
-import type { TamaguiConfig } from '@tamagui/core';
+import type { TamaguiConfig } from '@tamagui/core-node';
 export declare function createEvaluator({ tamaguiConfig, staticNamespace, sourcePath, traversePath, shouldPrintDebug, }: {
     tamaguiConfig: TamaguiConfig;
     staticNamespace: Record<string, 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,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"}
+{"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,oBAAoB,CAAA;AAQvD,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/defaultTamaguiConfig.d.ts

@@ -0,0 +1,83 @@
+import { TamaguiInternalConfig } from '@tamagui/core-node';
+export declare const tokens: {
+    color: {
+        white: import("@tamagui/core-node").Variable<any>;
+        black: import("@tamagui/core-node").Variable<any>;
+    };
+    space: {
+        [x: string]: import("@tamagui/core-node").Variable<any>;
+    };
+    size: {
+        0: import("@tamagui/core-node").Variable<any>;
+        0.25: import("@tamagui/core-node").Variable<any>;
+        0.5: import("@tamagui/core-node").Variable<any>;
+        0.75: import("@tamagui/core-node").Variable<any>;
+        1: import("@tamagui/core-node").Variable<any>;
+        1.5: import("@tamagui/core-node").Variable<any>;
+        2: import("@tamagui/core-node").Variable<any>;
+        2.5: import("@tamagui/core-node").Variable<any>;
+        3: import("@tamagui/core-node").Variable<any>;
+        3.5: import("@tamagui/core-node").Variable<any>;
+        4: import("@tamagui/core-node").Variable<any>;
+        true: import("@tamagui/core-node").Variable<any>;
+        4.5: import("@tamagui/core-node").Variable<any>;
+        5: import("@tamagui/core-node").Variable<any>;
+        5.5: import("@tamagui/core-node").Variable<any>;
+        6: import("@tamagui/core-node").Variable<any>;
+        6.5: import("@tamagui/core-node").Variable<any>;
+        7: import("@tamagui/core-node").Variable<any>;
+        7.6: import("@tamagui/core-node").Variable<any>;
+        8: import("@tamagui/core-node").Variable<any>;
+        8.5: import("@tamagui/core-node").Variable<any>;
+        9: import("@tamagui/core-node").Variable<any>;
+        9.5: import("@tamagui/core-node").Variable<any>;
+        10: import("@tamagui/core-node").Variable<any>;
+        11: import("@tamagui/core-node").Variable<any>;
+        12: import("@tamagui/core-node").Variable<any>;
+        13: import("@tamagui/core-node").Variable<any>;
+        14: import("@tamagui/core-node").Variable<any>;
+        15: import("@tamagui/core-node").Variable<any>;
+        16: import("@tamagui/core-node").Variable<any>;
+        17: import("@tamagui/core-node").Variable<any>;
+        18: import("@tamagui/core-node").Variable<any>;
+        19: import("@tamagui/core-node").Variable<any>;
+        20: import("@tamagui/core-node").Variable<any>;
+    };
+    radius: {
+        0: import("@tamagui/core-node").Variable<any>;
+        1: import("@tamagui/core-node").Variable<any>;
+        2: import("@tamagui/core-node").Variable<any>;
+        3: import("@tamagui/core-node").Variable<any>;
+        4: import("@tamagui/core-node").Variable<any>;
+        5: import("@tamagui/core-node").Variable<any>;
+        6: import("@tamagui/core-node").Variable<any>;
+        7: import("@tamagui/core-node").Variable<any>;
+        8: import("@tamagui/core-node").Variable<any>;
+        9: import("@tamagui/core-node").Variable<any>;
+        10: import("@tamagui/core-node").Variable<any>;
+        11: import("@tamagui/core-node").Variable<any>;
+        12: import("@tamagui/core-node").Variable<any>;
+    };
+    zIndex: {
+        0: import("@tamagui/core-node").Variable<any>;
+        1: import("@tamagui/core-node").Variable<any>;
+        2: import("@tamagui/core-node").Variable<any>;
+        3: import("@tamagui/core-node").Variable<any>;
+        4: import("@tamagui/core-node").Variable<any>;
+        5: import("@tamagui/core-node").Variable<any>;
+    };
+};
+export declare const config: TamaguiInternalConfig<import("@tamagui/core-node").CreateTokens<import("@tamagui/core-node").VariableVal>, {
+    [key: string]: Partial<import("@tamagui/core-node").TamaguiBaseTheme> & {
+        [key: string]: import("@tamagui/core-node").VariableVal;
+    };
+}, {}, {
+    [x: string]: {
+        [key: string]: string | number;
+    };
+}, {
+    [key: string]: string | {
+        [key: string]: any;
+    };
+}, import("@tamagui/core-node").GenericFonts>;
+//# sourceMappingURL=defaultTamaguiConfig.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"defaultTamaguiConfig.d.ts","sourceRoot":"","sources":["../../src/extractor/defaultTamaguiConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAA2C,MAAM,oBAAoB,CAAA;AAmGnG,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CASjB,CAAA;AAaF,eAAO,MAAM,MAAM;;;;;;;;;;;;6CA2BQ,CAAA"}

package/types/extractor/loadTamagui.d.ts

@@ -1,4 +1,4 @@
-import type { TamaguiComponent, TamaguiInternalConfig } from '@tamagui/core';
+import type { TamaguiComponent, TamaguiInternalConfig } from '@tamagui/core-node';
 declare type NameToPaths = {
     [key: string]: Set<string>;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"loadTamagui.d.ts","sourceRoot":"","sources":["../../src/extractor/loadTamagui.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAgB,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAA;AAK1F,aAAK,WAAW,GAAG;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAA;CAC3B,CAAA;AAED,oBAAY,kBAAkB,GAAG;IAC/B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAA;IAC5C,aAAa,EAAE,qBAAqB,CAAA;IACpC,WAAW,EAAE,WAAW,CAAA;CACzB,CAAA;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE;IAAE,UAAU,EAAE,MAAM,EAAE,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,kBAAkB,CA+H/F"}
+{"version":3,"file":"loadTamagui.d.ts","sourceRoot":"","sources":["../../src/extractor/loadTamagui.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAgB,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAA;AAS/F,aAAK,WAAW,GAAG;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAA;CAC3B,CAAA;AAED,oBAAY,kBAAkB,GAAG;IAC/B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAA;IAC5C,aAAa,EAAE,qBAAqB,CAAA;IACpC,WAAW,EAAE,WAAW,CAAA;CACzB,CAAA;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE;IAAE,UAAU,EAAE,MAAM,EAAE,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,kBAAkB,CA0F/F"}

package/types/index.d.ts

@@ -6,4 +6,5 @@ export * from './extractor/extractToClassNames';
 export * from './extractor/extractHelpers';
 export * from '@tamagui/patch-rnw';
 export * from './extractor/loadTamagui';
+export * from './require';
 //# sourceMappingURL=index.d.ts.map

package/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AACvD,cAAc,aAAa,CAAA;AAC3B,cAAc,iCAAiC,CAAA;AAC/C,cAAc,4BAA4B,CAAA;AAC1C,cAAc,oBAAoB,CAAA;AAClC,cAAc,yBAAyB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AACvD,cAAc,aAAa,CAAA;AAC3B,cAAc,iCAAiC,CAAA;AAC/C,cAAc,4BAA4B,CAAA;AAC1C,cAAc,oBAAoB,CAAA;AAClC,cAAc,yBAAyB,CAAA;AACvC,cAAc,WAAW,CAAA"}

package/types/require.d.ts

@@ -0,0 +1,4 @@
+export declare const getNameToPaths: () => {};
+export declare function registerRequire(): void;
+export declare function unregisterRequire(): void;
+//# sourceMappingURL=require.d.ts.map

package/types/require.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"require.d.ts","sourceRoot":"","sources":["../src/require.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,cAAc,UAAoB,CAAA;AAO/C,wBAAgB,eAAe,SAsE9B;AAED,wBAAgB,iBAAiB,SAEhC"}