@tamagui/vite-plugin 1.112.12 → 1.112.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/vite-plugin",
-  "version": "1.112.12",
+  "version": "1.112.13",
   "types": "./types/index.d.ts",
   "main": "./dist/cjs/index.js",
   "type": "module",
@@ -33,19 +33,24 @@
     }
   },
   "dependencies": {
-    "@tamagui/fake-react-native": "1.112.12",
-    "@tamagui/proxy-worm": "1.112.12",
-    "@tamagui/react-native-svg": "1.112.12",
-    "@tamagui/static": "1.112.12",
+    "@tamagui/fake-react-native": "1.112.13",
+    "@tamagui/proxy-worm": "1.112.13",
+    "@tamagui/react-native-svg": "1.112.13",
+    "@tamagui/react-native-web-lite": "1.112.13",
+    "@tamagui/static": "1.112.13",
     "esm-resolve": "^1.0.8",
     "fs-extra": "^11.2.0",
     "outdent": "^0.8.0",
     "react-native-web": "^0.19.12"
   },
   "devDependencies": {
-    "@tamagui/build": "1.112.12"
+    "@tamagui/build": "1.112.13",
+    "vite": "6.0.0-beta.1"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "peerDependencies": {
+    "vite": "*"
   }
 }

package/src/plugin.ts

@@ -1,34 +1,26 @@
 import type { TamaguiOptions } from '@tamagui/static'
-import type { Plugin } from 'vite'
+import { version } from 'vite'
+import type { Plugin, UserConfig } from 'vite'
 import { transformWithEsbuild } from 'vite'
-import { tamaguiOptions, Static, loadTamaguiBuildConfig } from './loadTamagui'
 import { tamaguiExtractPlugin } from './extract'
+import { Static, loadTamaguiBuildConfig, tamaguiOptions } from './loadTamagui'
 
+const isVite6 = version.startsWith('6.')
 const resolve = (name: string) => import.meta.resolve?.(name).replace('file://', '')
 
-export function tamaguiPlugin(
-  tamaguiOptionsIn: TamaguiOptions & { optimize?: boolean } = {}
-): Plugin | Plugin[] {
-  const shouldAddCompiler = !!tamaguiOptionsIn?.optimize
+export function tamaguiPlugin({
+  optimize,
+  disableResolveConfig,
+  ...tamaguiOptionsIn
+}: TamaguiOptions & { optimize?: boolean; disableResolveConfig?: boolean } = {}):
+  | Plugin
+  | Plugin[] {
+  const shouldAddCompiler = !!optimize
   let watcher
   let loaded = false
 
-  const extensions = [
-    `.web.mjs`,
-    `.web.js`,
-    `.web.jsx`,
-    `.web.ts`,
-    `.web.tsx`,
-    '.mjs',
-    '.js',
-    '.mts',
-    '.ts',
-    '.jsx',
-    '.tsx',
-    '.json',
-  ]
-
-  let noExternalSSR = /react-native|expo-linear-gradient/gi
+  // TODO temporary fix
+  const enableNativeEnv = !!globalThis.__vxrnEnableNativeEnv
 
   async function load() {
     if (loaded) return
@@ -51,15 +43,6 @@ export function tamaguiPlugin(
     }).catch((err) => {
       console.error(` [Tamagui] Error watching config: ${err}`)
     })
-
-    const components = [
-      ...new Set([...(tamaguiOptions!.components || []), 'tamagui', '@tamagui/core']),
-    ]
-
-    noExternalSSR = new RegExp(
-      `${components.join('|')}|react-native|expo-linear-gradient`,
-      'ig'
-    )
   }
 
   const compatPlugins = [
@@ -83,6 +66,29 @@ export function tamaguiPlugin(
         }
       },
 
+      resolveId(id) {
+        if (disableResolveConfig || enableNativeEnv) {
+          return
+        }
+        if (!tamaguiOptions) {
+          throw new Error(`No options loaded`)
+        }
+        if (tamaguiOptions.platform !== 'native') {
+          return
+        }
+        if (
+          id === 'react-native/Libraries/Renderer/shims/ReactFabric' ||
+          id === 'react-native/Libraries/Utilities/codegenNativeComponent'
+        ) {
+          return resolve('@tamagui/proxy-worm')
+        }
+        if (!tamaguiOptions?.useReactNativeWebLite) {
+          if (id === 'react-native') {
+            return resolve('react-native-web')
+          }
+        }
+      },
+
       async config(_, env) {
         await load()
 
@@ -90,84 +96,105 @@ export function tamaguiPlugin(
           throw new Error(`No options loaded`)
         }
 
-        return {
-          environments: {
-            client: {
-              define: {
-                'process.env.TAMAGUI_IS_CLIENT': JSON.stringify(true),
+        const reactNativeResolve: UserConfig['resolve'] =
+          disableResolveConfig || enableNativeEnv
+            ? {}
+            : {
+                extensions: [
+                  `.web.mjs`,
+                  `.web.js`,
+                  `.web.jsx`,
+                  `.web.ts`,
+                  `.web.tsx`,
+                  '.mjs',
+                  '.js',
+                  '.mts',
+                  '.ts',
+                  '.jsx',
+                  '.tsx',
+                  '.json',
+                ],
+              }
+
+        const serverAndClientDefine: UserConfig['define'] = {
+          // reanimated support
+          _frameTimestamp: undefined,
+          _WORKLET: false,
+          __DEV__: `${env.mode === 'development'}`,
+          'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || env.mode),
+          'process.env.IS_STATIC': JSON.stringify(false),
+          ...(env.mode === 'production' && {
+            'process.env.TAMAGUI_OPTIMIZE_THEMES': JSON.stringify(true),
+          }),
+        }
+
+        if (isVite6) {
+          return {
+            resolve: reactNativeResolve,
+            environments: {
+              client: {
+                define: {
+                  'process.env.TAMAGUI_IS_CLIENT': JSON.stringify(true),
+                  ...serverAndClientDefine,
+                },
+              },
+
+              ssr: {
+                define: serverAndClientDefine,
               },
             },
-          },
+            // vite 5 + 6 compat
+          } as any
+        }
+
+        return {
+          define: serverAndClientDefine,
+          resolve: reactNativeResolve,
 
-          define: {
-            // reanimated support
-            _frameTimestamp: undefined,
-            _WORKLET: false,
-            __DEV__: `${env.mode === 'development'}`,
-            'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || env.mode),
-            'process.env.ENABLE_RSC': JSON.stringify(process.env.ENABLE_RSC || ''),
-            'process.env.ENABLE_STEPS': JSON.stringify(process.env.ENABLE_STEPS || ''),
-            'process.env.IS_STATIC': JSON.stringify(false),
-            ...(env.mode === 'production' && {
-              'process.env.TAMAGUI_OPTIMIZE_THEMES': JSON.stringify(true),
-            }),
-          },
           ssr: {
-            noExternal: noExternalSSR,
-          },
-          resolve: {
-            extensions: extensions,
-            alias: {
-              ...(tamaguiOptions.platform !== 'native' && {
-                'react-native/Libraries/Renderer/shims/ReactFabric':
-                  resolve('@tamagui/proxy-worm'),
-                'react-native/Libraries/Utilities/codegenNativeComponent':
-                  resolve('@tamagui/proxy-worm'),
-                'react-native-svg': resolve('@tamagui/react-native-svg'),
-                ...(!tamaguiOptions?.useReactNativeWebLite && {
-                  'react-native': resolve('react-native-web'),
-                }),
-              }),
+            optimizeDeps: {
+              include: [
+                'tamagui',
+                '@tamagui/core',
+                '@tamagui/web',
+                '@react-native/normalize-color',
+                'react',
+                'react/jsx-runtime',
+              ],
             },
           },
         }
       },
     },
+
     {
       name: 'tamagui-rnw-lite',
-      config() {
+
+      resolveId(id) {
+        const envName = this['environment']?.name as any // vite 5 + 6 compat
+
+        if (isVite6 && (envName === 'client' || envName === 'ssr')) {
+          return
+        }
+
         if (tamaguiOptions?.useReactNativeWebLite) {
-          const rnwl = resolve('@tamagui/react-native-web-lite')
-          const rnwlSS = resolve(
-            '@tamagui/react-native-web-lite/dist/exports/StyleSheet/compiler/createReactDOMStyle'
-          )
+          if (
+            /react-native.*\/dist\/exports\/StyleSheet\/compiler\/createReactDOMStyle/.test(
+              id
+            )
+          ) {
+            return resolve(
+              '@tamagui/react-native-web-lite/dist/exports/StyleSheet/compiler/createReactDOMStyle'
+            )
+          }
 
-          return {
-            resolve: {
-              alias: [
-                // fix reanimated issue not finding this
-                {
-                  find: /react-native.*\/dist\/exports\/StyleSheet\/compiler\/createReactDOMStyle/,
-                  replacement: rnwlSS,
-                },
-                {
-                  find: /^react-native$/,
-                  replacement: rnwl,
-                },
-                {
-                  find: /^react-native\/(.*)$/,
-                  replacement: rnwl,
-                },
-                {
-                  find: /^react-native-web$/,
-                  replacement: rnwl,
-                },
-                {
-                  find: /^react-native-web\/(.*)$/,
-                  replacement: rnwl,
-                },
-              ],
-            },
+          if (
+            /^react-native$/.test(id) ||
+            /^react-native\/(.*)$/.test(id) ||
+            /^react-native-web$/.test(id) ||
+            /^react-native-web\/(.*)$/.test(id)
+          ) {
+            return resolve('@tamagui/react-native-web-lite')
           }
         }
       },

package/types/plugin.d.ts

@@ -1,6 +1,7 @@
 import type { TamaguiOptions } from '@tamagui/static';
 import type { Plugin } from 'vite';
-export declare function tamaguiPlugin(tamaguiOptionsIn?: TamaguiOptions & {
+export declare function tamaguiPlugin({ optimize, disableResolveConfig, ...tamaguiOptionsIn }?: TamaguiOptions & {
     optimize?: boolean;
+    disableResolveConfig?: boolean;
 }): Plugin | Plugin[];
 //# sourceMappingURL=plugin.d.ts.map

package/types/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AACrD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAOlC,wBAAgB,aAAa,CAC3B,gBAAgB,GAAE,cAAc,GAAG;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAO,GAC7D,MAAM,GAAG,MAAM,EAAE,CA2KnB"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAErD,OAAO,KAAK,EAAE,MAAM,EAAc,MAAM,MAAM,CAAA;AAQ9C,wBAAgB,aAAa,CAAC,EAC5B,QAAQ,EACR,oBAAoB,EACpB,GAAG,gBAAgB,EACpB,GAAE,cAAc,GAAG;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAAO,GAC3E,MAAM,GACN,MAAM,EAAE,CAgMX"}