@tamagui/static 1.63.0 → 1.64.0

package/src/extractor/loadTamagui.ts

@@ -61,7 +61,8 @@ export async function loadTamagui(
 
     if (props.outputCSS) {
       colorLog(Color.FgYellow, `    ➡ [tamagui] outputCSS: ${props.outputCSS}\n`)
-      await writeFile(props.outputCSS, config.getCSS())
+      const css = config.getCSS()
+      await writeFile(props.outputCSS, css)
     }
   }
 
@@ -94,14 +95,28 @@ const generateThemesAndLog = async (options: TamaguiOptions) => {
   }
 }
 
-let last: TamaguiProjectInfo | null = null
+const last: Record<string, TamaguiProjectInfo | null> = {}
+const lastVersion: Record<string, string> = {}
 
 // loads in-process using esbuild-register
-export function loadTamaguiSync(propsIn: Partial<TamaguiOptions>): TamaguiProjectInfo {
-  if (last && !hasBundledConfigChanged()) {
-    return last
+export function loadTamaguiSync({
+  forceExports,
+  cacheKey,
+  ...propsIn
+}: Partial<TamaguiOptions> & {
+  forceExports?: boolean
+  cacheKey?: string
+}): TamaguiProjectInfo {
+  const key = JSON.stringify(propsIn)
+
+  if (last[key] && !hasBundledConfigChanged()) {
+    if (!lastVersion[key] || lastVersion[key] === cacheKey) {
+      return last[key]!
+    }
   }
 
+  lastVersion[key] = cacheKey || ''
+
   const props = getFilledOptions(propsIn)
 
   // lets shim require and avoid importing react-native + react-native-web
@@ -109,8 +124,10 @@ export function loadTamaguiSync(propsIn: Partial<TamaguiOptions>): TamaguiProjec
   process.env.IS_STATIC = 'is_static'
   process.env.TAMAGUI_IS_SERVER = 'true'
 
-  const { createTamagui } = requireTamaguiCore(props.platform)
-  const { unregister, tamaguiRequire } = registerRequire(props.platform)
+  const { unregister } = registerRequire(props.platform, {
+    proxyWormImports: !!forceExports,
+  })
+
   try {
     const devValueOG = globalThis['__DEV__' as any]
     globalThis['__DEV__' as any] = process.env.NODE_ENV === 'development'
@@ -118,9 +135,9 @@ export function loadTamaguiSync(propsIn: Partial<TamaguiOptions>): TamaguiProjec
     try {
       // config
       let tamaguiConfig: TamaguiInternalConfig | null = null
-      if (props.config) {
-        const configPath = getTamaguiConfigPathFromOptionsConfig(props.config)
-        const exp = tamaguiRequire(configPath)
+      if (propsIn.config) {
+        const configPath = getTamaguiConfigPathFromOptionsConfig(propsIn.config)
+        const exp = require(configPath)
         tamaguiConfig = (exp['default'] || exp) as TamaguiInternalConfig
         if (!tamaguiConfig || !tamaguiConfig.parsed) {
           const confPath = require.resolve(configPath)
@@ -128,10 +145,16 @@ export function loadTamaguiSync(propsIn: Partial<TamaguiOptions>): TamaguiProjec
           
   Be sure you "export default" the config.`)
         }
+
+        // set up core
+        if (tamaguiConfig) {
+          const { createTamagui } = requireTamaguiCore(props.platform)
+          createTamagui(tamaguiConfig as any)
+        }
       }
 
       // components
-      const components = loadComponents(props)
+      const components = loadComponents(props, forceExports)
       if (!components) {
         throw new Error(`No components loaded`)
       }
@@ -144,36 +167,40 @@ export function loadTamaguiSync(propsIn: Partial<TamaguiOptions>): TamaguiProjec
       process.env.IS_STATIC = undefined
       globalThis['__DEV__' as any] = devValueOG
 
-      // set up core
-      if (props.config && tamaguiConfig) {
-        createTamagui(tamaguiConfig as any)
-      }
-
       const info = {
         components,
         tamaguiConfig,
         nameToPaths: getNameToPaths(),
       } satisfies TamaguiProjectInfo
 
-      generateTamaguiStudioConfigSync(props, info)
+      if (propsIn.config) {
+        generateTamaguiStudioConfigSync(props, info)
+      }
 
-      last = info
+      last[key] = {
+        ...info,
+        cached: true,
+      }
 
       return info as any
     } 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`
-        )
-        // rome-ignore lint/suspicious/noConsoleLog: <explanation>
-        console.log(`\n\n    ${err.message}\n\n`)
-        if (SHOULD_DEBUG) {
-          console.error(err.stack)
+        if (!SHOULD_DEBUG && !forceExports) {
+          console.warn(
+            `Error loading tamagui.config.ts (set DEBUG=tamagui to see full stack), running tamagui without custom config`
+          )
+          // rome-ignore lint/suspicious/noConsoleLog: <explanation>
+          console.log(`\n\n    ${err.message}\n\n`)
+        } else {
+          if (SHOULD_DEBUG) {
+            console.error(err)
+          }
         }
       } else {
         console.error(`Error loading tamagui.config.ts`, err)
       }
 
+      const { createTamagui } = requireTamaguiCore(props.platform)
       return {
         components: [],
         tamaguiConfig: createTamagui(getDefaultTamaguiConfig()),

package/src/registerRequire.ts

@@ -1,4 +1,4 @@
-import { relative, sep } from 'path'
+import { register } from 'esbuild-register/dist/node'
 
 import { requireTamaguiCore } from './helpers/requireTamaguiCore'
 import { TamaguiPlatform } from './types'
@@ -15,7 +15,21 @@ const rnw = require('react-native-web')
 let isRegistered = false
 let og: any
 
-export function registerRequire(platform: TamaguiPlatform) {
+const whitelisted = {
+  react: true,
+}
+
+const compiled = {}
+export function setRequireResult(name: string, result: any) {
+  compiled[name] = result
+}
+
+export function registerRequire(
+  platform: TamaguiPlatform,
+  { proxyWormImports } = {
+    proxyWormImports: false,
+  }
+) {
   // already registered
   if (isRegistered) {
     return {
@@ -24,48 +38,68 @@ export function registerRequire(platform: TamaguiPlatform) {
     }
   }
 
-  const { unregister } = require('esbuild-register/dist/node').register({
+  const { unregister } = register({
     hookIgnoreNodeModules: false,
   })
 
-  og = Module.prototype.require // capture esbuild require
+  if (!og) {
+    og = Module.prototype.require // capture esbuild require
+  }
+
   isRegistered = true
 
   Module.prototype.require = tamaguiRequire
 
   function tamaguiRequire(this: any, path: string) {
+    if (path === 'tamagui') {
+      return og.apply(this, ['tamagui/native'])
+    }
+
+    if (path === '@tamagui/core' || path === '@tamagui/web') {
+      return requireTamaguiCore(platform, (path) => {
+        return og.apply(this, [path])
+      })
+    }
+
+    if (path in compiled) {
+      return compiled[path]
+    }
+
     if (/\.(gif|jpe?g|png|svg|ttf|otf|woff2?|bmp|webp)$/i.test(path)) {
       return {}
     }
+
     if (
       path === '@gorhom/bottom-sheet' ||
       path.startsWith('react-native-reanimated') ||
       path === 'expo-linear-gradient' ||
-      path === '@expo/vector-icons'
+      path === '@expo/vector-icons' ||
+      path === 'tamagui/linear-gradient' ||
+      path === 'react-native-svg'
     ) {
       return proxyWorm
     }
     if (path === 'react-native/package.json') {
       return packageJson
     }
-    if (
-      path === 'react-native-web-lite' ||
-      (path.startsWith('react-native') &&
-        // allow our rnw.tsx imports through
-        !path.startsWith('react-native-web/dist/cjs/exports'.replace(/\//g, sep)))
-    ) {
+
+    if (path === 'react-native-web-lite' || path.startsWith('react-native')) {
       return rnw
     }
-    if (path === '@tamagui/core' || path === '@tamagui/web') {
-      return requireTamaguiCore(platform, (path) => {
-        return og.apply(this, [path])
-      })
-    }
 
     if (path in knownIgnorableModules) {
       return proxyWorm
     }
 
+    if (!whitelisted[path]) {
+      if (proxyWormImports && !path.includes('.tamagui-dynamic-eval')) {
+        if (path === 'tamagui') {
+          return og.apply(this, [path])
+        }
+        return proxyWorm
+      }
+    }
+
     try {
       const out = og.apply(this, arguments)
       // only for studio disable for now
@@ -93,6 +127,13 @@ export function registerRequire(platform: TamaguiPlatform) {
       // }
       return out
     } catch (err: any) {
+      if (
+        !process.env.TAMAGUI_ENABLE_WARN_DYNAMIC_LOAD &&
+        path.includes('tamagui-dynamic-eval')
+      ) {
+        // ok, dynamic eval fails
+        return
+      }
       if (allowedIgnores[path] || IGNORES === 'true') {
         // ignore
       } else if (!process.env.TAMAGUI_SHOW_FULL_BUNDLE_ERRORS) {
@@ -112,15 +153,11 @@ export function registerRequire(platform: TamaguiPlatform) {
          */
 
         console.error(
-          `Tamagui failed loading the pre-built tamagui.config.ts
+          `Tamagui failed loading "${path}"
   
   ${err.message}
   ${err.stack}
-  
-  You can see if it loads in the node repl:
-  
-  require("./${relative(process.cwd(), path)}").default
-  
+
   `
         )
       }

package/types/extractor/bundleConfig.d.ts

@@ -13,6 +13,7 @@ export type TamaguiProjectInfo = {
     components?: LoadedComponents[];
     tamaguiConfig?: TamaguiInternalConfig | null;
     nameToPaths?: NameToPaths;
+    cached?: boolean;
 };
 export declare const esbuildOptions: {
     define: {
@@ -35,6 +36,6 @@ export declare function bundleConfig(props: TamaguiOptions): Promise<{
     nameToPaths: {};
     tamaguiConfig: any;
 } | undefined>;
-export declare function loadComponents(props: TamaguiOptions): null | LoadedComponents[];
+export declare function loadComponents(props: TamaguiOptions, forceExports?: boolean): null | LoadedComponents[];
 export {};
 //# sourceMappingURL=bundleConfig.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"bundleConfig.d.ts","sourceRoot":"","sources":["../../src/extractor/bundleConfig.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAKvE,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAKzC,KAAK,WAAW,GAAG;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAChB,MAAM,EACN;QACE,YAAY,EAAE,YAAY,CAAA;KAC3B,CACF,CAAA;CACF,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,UAAU,CAAC,EAAE,gBAAgB,EAAE,CAAA;IAC/B,aAAa,CAAC,EAAE,qBAAqB,GAAG,IAAI,CAAA;IAC5C,WAAW,CAAC,EAAE,WAAW,CAAA;CAC1B,CAAA;AAgBD,eAAO,MAAM,cAAc;;;;;;;;CAMK,CAAA;AAEhC,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,EAAE,SAAS,CAAC,CAAA;AAQxF,wBAAgB,uBAAuB,YAMtC;AAED,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,cAAc,EAAE,OAAO,UAAQ;;;;sBAS5E;AAED,wBAAsB,YAAY,CAAC,KAAK,EAAE,cAAc;;;;eAgKvD;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI,GAAG,gBAAgB,EAAE,CA8H/E"}
+{"version":3,"file":"bundleConfig.d.ts","sourceRoot":"","sources":["../../src/extractor/bundleConfig.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAKvE,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAKzC,KAAK,WAAW,GAAG;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAChB,MAAM,EACN;QACE,YAAY,EAAE,YAAY,CAAA;KAC3B,CACF,CAAA;CACF,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,UAAU,CAAC,EAAE,gBAAgB,EAAE,CAAA;IAC/B,aAAa,CAAC,EAAE,qBAAqB,GAAG,IAAI,CAAA;IAC5C,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,CAAA;AAgBD,eAAO,MAAM,cAAc;;;;;;;;CAMK,CAAA;AAEhC,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,EAAE,SAAS,CAAC,CAAA;AAQxF,wBAAgB,uBAAuB,YAMtC;AAED,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,cAAc,EAAE,OAAO,UAAQ;;;;sBAS5E;AAED,wBAAsB,YAAY,CAAC,KAAK,EAAE,cAAc;;;;eAgKvD;AAED,wBAAgB,cAAc,CAC5B,KAAK,EAAE,cAAc,EACrB,YAAY,UAAQ,GACnB,IAAI,GAAG,gBAAgB,EAAE,CAwI3B"}

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

@@ -1 +1 @@
-{"version":3,"file":"createExtractor.d.ts","sourceRoot":"","sources":["../../src/extractor/createExtractor.ts"],"names":[],"mappings":"AAGA,OAAiB,EAAE,QAAQ,EAAmB,MAAM,iBAAiB,CAAA;AACrE,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAajC,OAAO,KAAK,EAGV,gBAAgB,EAChB,mBAAmB,EACnB,cAAc,EAGf,MAAM,UAAU,CAAA;AACjB,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAcnD,OAAO,EAAE,iBAAiB,EAA6B,MAAM,6BAA6B,CAAA;AAmC1F,MAAM,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAE1D,KAAK,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAA;AAQ9C,wBAAgB,eAAe,CAC7B,EAAE,MAAgB,EAAE,GAAE,gBAAsC;;;;;yBA0CjC,cAAc;6BAPhB,cAAc;;mBAwBtB,UAAU,SAAS,mBAAmB;;;;;;;eAIpC,UAAU,SAAS,mBAAmB;;;;;;;EA0jE1D"}
+{"version":3,"file":"createExtractor.d.ts","sourceRoot":"","sources":["../../src/extractor/createExtractor.ts"],"names":[],"mappings":"AAGA,OAAiB,EAAE,QAAQ,EAAmB,MAAM,iBAAiB,CAAA;AACrE,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAcjC,OAAO,KAAK,EAGV,gBAAgB,EAChB,mBAAmB,EACnB,cAAc,EAGf,MAAM,UAAU,CAAA;AACjB,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAcnD,OAAO,EAAE,iBAAiB,EAA6B,MAAM,6BAA6B,CAAA;AAmC1F,MAAM,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAE1D,KAAK,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAA;AAQ9C,wBAAgB,eAAe,CAC7B,EAAE,MAAgB,EAAE,GAAE,gBAAsC;;;;;yBA0CjC,cAAc;6BAPhB,cAAc;;mBAwBtB,UAAU,SAAS,mBAAmB;;;;;;;eAIpC,UAAU,SAAS,mBAAmB;;;;;;;EAwjE1D"}

package/types/extractor/loadTamagui.d.ts

@@ -1,7 +1,10 @@
 import { CLIResolvedOptions, CLIUserOptions, TamaguiOptions } from '@tamagui/types';
 import { TamaguiProjectInfo } from './bundleConfig';
 export declare function loadTamagui(propsIn: Partial<TamaguiOptions>): Promise<TamaguiProjectInfo | null>;
-export declare function loadTamaguiSync(propsIn: Partial<TamaguiOptions>): TamaguiProjectInfo;
+export declare function loadTamaguiSync({ forceExports, cacheKey, ...propsIn }: Partial<TamaguiOptions> & {
+    forceExports?: boolean;
+    cacheKey?: string;
+}): TamaguiProjectInfo;
 export declare function getOptions({ root, tsconfigPath, tamaguiOptions, host, debug, }?: Partial<CLIUserOptions>): Promise<CLIResolvedOptions>;
 export declare function resolveWebOrNativeSpecificEntry(entry: string): string;
 export { TamaguiProjectInfo };

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

@@ -1 +1 @@
-{"version":3,"file":"loadTamagui.d.ts","sourceRoot":"","sources":["../../src/extractor/loadTamagui.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAQnF,OAAO,EACL,kBAAkB,EAInB,MAAM,gBAAgB,CAAA;AAgBvB,wBAAsB,WAAW,CAC/B,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,GAC/B,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAiCpC;AA+BD,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,kBAAkB,CAsFpF;AAED,wBAAsB,UAAU,CAAC,EAC/B,IAAoB,EACpB,YAA8B,EAC9B,cAAc,EACd,IAAI,EACJ,KAAK,GACN,GAAE,OAAO,CAAC,cAAc,CAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA6B5D;AAED,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,MAAM,UAW5D;AA0BD,OAAO,EAAE,kBAAkB,EAAE,CAAA;AAE7B,wBAAsB,kBAAkB,CAAC,cAAc,EAAE,cAAc;;GAyCtE"}
+{"version":3,"file":"loadTamagui.d.ts","sourceRoot":"","sources":["../../src/extractor/loadTamagui.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAQnF,OAAO,EACL,kBAAkB,EAInB,MAAM,gBAAgB,CAAA;AAgBvB,wBAAsB,WAAW,CAC/B,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,GAC/B,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAkCpC;AAgCD,wBAAgB,eAAe,CAAC,EAC9B,YAAY,EACZ,QAAQ,EACR,GAAG,OAAO,EACX,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG;IAC3B,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,GAAG,kBAAkB,CAwGrB;AAED,wBAAsB,UAAU,CAAC,EAC/B,IAAoB,EACpB,YAA8B,EAC9B,cAAc,EACd,IAAI,EACJ,KAAK,GACN,GAAE,OAAO,CAAC,cAAc,CAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA6B5D;AAED,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,MAAM,UAW5D;AA0BD,OAAO,EAAE,kBAAkB,EAAE,CAAA;AAE7B,wBAAsB,kBAAkB,CAAC,cAAc,EAAE,cAAc;;GAyCtE"}

package/types/registerRequire.d.ts

@@ -1,6 +1,9 @@
 import { TamaguiPlatform } from './types';
 export declare const getNameToPaths: () => {};
-export declare function registerRequire(platform: TamaguiPlatform): {
+export declare function setRequireResult(name: string, result: any): void;
+export declare function registerRequire(platform: TamaguiPlatform, { proxyWormImports }?: {
+    proxyWormImports: boolean;
+}): {
     tamaguiRequire: (this: any, path: string) => any;
     unregister: () => void;
 };

package/types/registerRequire.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registerRequire.d.ts","sourceRoot":"","sources":["../src/registerRequire.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAKzC,eAAO,MAAM,cAAc,UAAoB,CAAA;AAS/C,wBAAgB,eAAe,CAAC,QAAQ,EAAE,eAAe;2BAkBzB,GAAG,QAAQ,MAAM;;EAwGhD"}
+{"version":3,"file":"registerRequire.d.ts","sourceRoot":"","sources":["../src/registerRequire.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAKzC,eAAO,MAAM,cAAc,UAAoB,CAAA;AAc/C,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,QAEzD;AAED,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,eAAe,EACzB,EAAE,gBAAgB,EAAE;;CAEnB;2BAsB6B,GAAG,QAAQ,MAAM;;EA4HhD"}