@tamagui/vite-plugin 1.61.3 → 1.62.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/vite-plugin",
-  "version": "1.61.3",
+  "version": "1.62.0",
   "types": "./types/index.d.ts",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
@@ -32,10 +32,10 @@
     "@rollup/plugin-babel": "^6.0.3",
     "@rollup/plugin-commonjs": "^25.0.4",
     "@rollup/plugin-node-resolve": "^15.0.1",
-    "@tamagui/fake-react-native": "1.61.3",
-    "@tamagui/proxy-worm": "1.61.3",
-    "@tamagui/react-native-svg": "1.61.3",
-    "@tamagui/static": "1.61.3",
+    "@tamagui/fake-react-native": "1.62.0",
+    "@tamagui/proxy-worm": "1.62.0",
+    "@tamagui/react-native-svg": "1.62.0",
+    "@tamagui/static": "1.62.0",
     "esbuild": "^0.19.0",
     "esm-resolve": "^1.0.8",
     "fs-extra": "^11.1.0",
@@ -48,7 +48,7 @@
     "vite-plugin-externals": "^0.6.2"
   },
   "devDependencies": {
-    "@tamagui/build": "1.61.3"
+    "@tamagui/build": "1.62.0"
   },
   "publishConfig": {
     "access": "public"

package/src/extract.ts

@@ -14,7 +14,7 @@ const { createExtractor, extractToClassNames, getPragmaOptions } =
 const styleUpdateEvent = (fileId: string) => `tamagui-style-update:${fileId}`
 const GLOBAL_CSS_VIRTUAL_PATH = '__tamagui_global_css__.css'
 
-export function tamaguiExtractPlugin(options: TamaguiOptions): Plugin {
+export function tamaguiExtractPlugin(options: Partial<TamaguiOptions>): Plugin {
   const disableStatic =
     options.disable || (options.disableDebugAttr && options.disableExtraction)
 

package/src/plugin.ts

@@ -8,15 +8,23 @@ import type { Plugin } from 'vite'
  */
 
 export function tamaguiPlugin(
-  options: TamaguiOptions & {
-    target?: 'web' | 'native'
+  options: Partial<TamaguiOptions> & {
     useReactNativeWebLite?: boolean
     disableWatchTamaguiConfig?: boolean
   }
 ): Plugin {
-  const watcher = options.disableWatchTamaguiConfig ? null : watchTamaguiConfig(options)
+  const watcher = options.disableWatchTamaguiConfig
+    ? null
+    : watchTamaguiConfig({
+        platform: 'web',
+        components: ['tamagui'],
+        config: './src/tamagui.config.ts',
+        ...options,
+      })
 
-  const components = [...new Set([...options.components, 'tamagui', '@tamagui/core'])]
+  const components = [
+    ...new Set([...(options.components || []), 'tamagui', '@tamagui/core']),
+  ]
   const noExternalSSR = new RegExp(
     `${components.join('|')}|react-native|expo-linear-gradient`,
     'ig'
@@ -45,9 +53,6 @@ export function tamaguiPlugin(
           _WORKLET: false,
           __DEV__: `${env.mode === 'development' ? true : false}`,
           'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || env.mode),
-          'process.env.TAMAGUI_TARGET': JSON.stringify(
-            options.target || process.env.TAMAGUI_TARGET || 'web'
-          ),
           '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),
@@ -62,7 +67,7 @@ export function tamaguiPlugin(
         },
         optimizeDeps: {
           // disabled: false,
-          include: options.target !== 'native' ? ['styleq'] : [],
+          include: options.platform !== 'native' ? ['styleq'] : [],
           esbuildOptions: {
             jsx: 'transform',
             // plugins: [
@@ -107,7 +112,7 @@ export function tamaguiPlugin(
             '.mjs',
           ],
           alias: {
-            ...(options.target !== 'native' && {
+            ...(options.platform !== 'native' && {
               'react-native/Libraries/Renderer/shims/ReactFabric': '@tamagui/proxy-worm',
               'react-native/Libraries/Utilities/codegenNativeComponent':
                 '@tamagui/proxy-worm',

package/types/extract.d.ts

@@ -1,4 +1,4 @@
 import { TamaguiOptions } from '@tamagui/static';
 import type { Plugin } from 'vite';
-export declare function tamaguiExtractPlugin(options: TamaguiOptions): Plugin;
+export declare function tamaguiExtractPlugin(options: Partial<TamaguiOptions>): Plugin;
 //# sourceMappingURL=extract.d.ts.map

package/types/extract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extract.d.ts","sourceRoot":"","sources":["../src/extract.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAGhD,OAAO,KAAK,EAAE,MAAM,EAAiC,MAAM,MAAM,CAAA;AASjE,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,CA8OpE"}
+{"version":3,"file":"extract.d.ts","sourceRoot":"","sources":["../src/extract.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAGhD,OAAO,KAAK,EAAE,MAAM,EAAiC,MAAM,MAAM,CAAA;AASjE,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,MAAM,CA8O7E"}

package/types/plugin.d.ts

@@ -3,8 +3,7 @@ import type { Plugin } from 'vite';
 /**
  * For some reason envPlugin doesnt work for vitest, but process: { env: {} } breaks vitest
  */
-export declare function tamaguiPlugin(options: TamaguiOptions & {
-    target?: 'web' | 'native';
+export declare function tamaguiPlugin(options: Partial<TamaguiOptions> & {
     useReactNativeWebLite?: boolean;
     disableWatchTamaguiConfig?: boolean;
 }): Plugin;

package/types/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAErD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAElC;;GAEG;AAEH,wBAAgB,aAAa,CAC3B,OAAO,EAAE,cAAc,GAAG;IACxB,MAAM,CAAC,EAAE,KAAK,GAAG,QAAQ,CAAA;IACzB,qBAAqB,CAAC,EAAE,OAAO,CAAA;IAC/B,yBAAyB,CAAC,EAAE,OAAO,CAAA;CACpC,GACA,MAAM,CAgHR"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAErD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAElC;;GAEG;AAEH,wBAAgB,aAAa,CAC3B,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG;IACjC,qBAAqB,CAAC,EAAE,OAAO,CAAA;IAC/B,yBAAyB,CAAC,EAAE,OAAO,CAAA;CACpC,GACA,MAAM,CAsHR"}

package/dist/cjs/nativePrebuild.js

@@ -1,133 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var nativePrebuild_exports = {};
-__export(nativePrebuild_exports, {
-  nativePrebuild: () => nativePrebuild,
-  prebuiltFiles: () => prebuiltFiles
-});
-module.exports = __toCommonJS(nativePrebuild_exports);
-var import_promises = require("fs/promises");
-var import_path = require("path");
-var babel = __toESM(require("@babel/core"));
-var import_esbuild = require("esbuild");
-var import_extensions = require("./extensions");
-async function nativeBabelFlowTransform(input) {
-  return await new Promise((res, rej) => {
-    babel.transform(
-      input,
-      {
-        presets: ["module:metro-react-native-babel-preset"]
-      },
-      (err, { code }) => {
-        if (err)
-          rej(err);
-        res(code);
-      }
-    );
-  });
-}
-const prebuiltDir = (0, import_path.join)(process.cwd(), "testing-area");
-const prebuiltFiles = {
-  react: (0, import_path.join)(prebuiltDir, "react.js"),
-  reactJSXRuntime: (0, import_path.join)(prebuiltDir, "react-jsx-runtime.js"),
-  reactNative: (0, import_path.join)(prebuiltDir, "react-native.js")
-};
-async function nativePrebuild() {
-  if (process.env.SKIP_PREBUILD_RN) {
-    return;
-  }
-  console.log(`Prebuilding React Native (one time cost...)`);
-  await Promise.all([
-    (0, import_esbuild.build)({
-      bundle: true,
-      entryPoints: [require.resolve("react-native")],
-      outfile: prebuiltFiles.reactNative,
-      format: "cjs",
-      target: "node20",
-      jsx: "transform",
-      jsxFactory: "react",
-      allowOverwrite: true,
-      platform: "node",
-      loader: {
-        ".png": "dataurl",
-        ".jpg": "dataurl",
-        ".jpeg": "dataurl",
-        ".gif": "dataurl"
-      },
-      define: {
-        __DEV__: "true",
-        "process.env.NODE_ENV": `"development"`,
-        // TODO
-        "process.env.REACT_NATIVE_SERVER_PUBLIC_PORT": JSON.stringify("8081")
-      },
-      logLevel: "warning",
-      resolveExtensions: import_extensions.extensions,
-      plugins: [
-        {
-          name: "remove-flow",
-          setup(build2) {
-            build2.onResolve(
-              {
-                filter: /HMRClient/
-              },
-              async (input) => {
-                return {
-                  path: require.resolve("@tamagui/vite-native-hmr")
-                };
-              }
-            );
-            build2.onLoad(
-              {
-                filter: /.*.js/
-              },
-              async (input) => {
-                if (!input.path.includes("react-native") && !input.path.includes(`vite-native-hmr`)) {
-                  return;
-                }
-                const code = await (0, import_promises.readFile)(input.path, "utf-8");
-                const outagain = await nativeBabelFlowTransform(code);
-                return {
-                  contents: outagain,
-                  loader: "jsx"
-                };
-              }
-            );
-          }
-        }
-      ]
-    }),
-    ,
-  ]);
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  nativePrebuild,
-  prebuiltFiles
-});
-//# sourceMappingURL=nativePrebuild.js.map

package/dist/cjs/nativePrebuild.js.map

@@ -1,6 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../src/nativePrebuild.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAyB;AACzB,kBAAqB;AAErB,YAAuB;AACvB,qBAAsB;AAEtB,wBAA2B;AAE3B,eAAe,yBAAyB,OAAe;AACrD,SAAO,MAAM,IAAI,QAAgB,CAAC,KAAK,QAAQ;AAC7C,UAAM;AAAA,MACJ;AAAA,MACA;AAAA,QACE,SAAS,CAAC,wCAAwC;AAAA,MACpD;AAAA,MACA,CAAC,KAAU,EAAE,KAAK,MAAM;AACtB,YAAI;AAAK,cAAI,GAAG;AAChB,YAAI,IAAI;AAAA,MACV;AAAA,IACF;AAAA,EACF,CAAC;AACH;AAEA,MAAM,kBAAc,kBAAK,QAAQ,IAAI,GAAG,cAAc;AAC/C,MAAM,gBAAgB;AAAA,EAC3B,WAAO,kBAAK,aAAa,UAAU;AAAA,EACnC,qBAAiB,kBAAK,aAAa,sBAAsB;AAAA,EACzD,iBAAa,kBAAK,aAAa,iBAAiB;AAClD;AAEA,eAAsB,iBAAiB;AA8BrC,MAAI,QAAQ,IAAI,kBAAkB;AAChC;AAAA,EACF;AAEA,UAAQ,IAAI,6CAA6C;AAEzD,QAAM,QAAQ,IAAI;AAAA,QAChB,sBAAM;AAAA,MACJ,QAAQ;AAAA,MACR,aAAa,CAAC,gBAAgB,cAAc,CAAC;AAAA,MAC7C,SAAS,cAAc;AAAA,MACvB,QAAQ;AAAA,MACR,QAAQ;AAAA,MACR,KAAK;AAAA,MACL,YAAY;AAAA,MACZ,gBAAgB;AAAA,MAChB,UAAU;AAAA,MACV,QAAQ;AAAA,QACN,QAAQ;AAAA,QACR,QAAQ;AAAA,QACR,SAAS;AAAA,QACT,QAAQ;AAAA,MACV;AAAA,MACA,QAAQ;AAAA,QACN,SAAS;AAAA,QACT,wBAAwB;AAAA;AAAA,QAExB,+CAA+C,KAAK,UAAU,MAAM;AAAA,MACtE;AAAA,MACA,UAAU;AAAA,MACV,mBAAmB;AAAA,MACnB,SAAS;AAAA,QACP;AAAA,UACE,MAAM;AAAA,UACN,MAAMA,QAAO;AACX,YAAAA,OAAM;AAAA,cACJ;AAAA,gBACE,QAAQ;AAAA,cACV;AAAA,cACA,OAAO,UAAU;AACf,uBAAO;AAAA,kBACL,MAAM,gBAAgB,0BAA0B;AAAA,gBAClD;AAAA,cACF;AAAA,YACF;AAEA,YAAAA,OAAM;AAAA,cACJ;AAAA,gBACE,QAAQ;AAAA,cACV;AAAA,cACA,OAAO,UAAU;AACf,oBACE,CAAC,MAAM,KAAK,SAAS,cAAc,KACnC,CAAC,MAAM,KAAK,SAAS,iBAAiB,GACtC;AACA;AAAA,gBACF;AAEA,sBAAM,OAAO,UAAM,0BAAS,MAAM,MAAM,OAAO;AAG/C,sBAAM,WAAW,MAAM,yBAAyB,IAAI;AAEpD,uBAAO;AAAA,kBACL,UAAU;AAAA,kBACV,QAAQ;AAAA,gBACV;AAAA,cACF;AAAA,YACF;AAAA,UACF;AAAA,QACF;AAAA,MACF;AAAA,IACF,CAAC;AAAA,IAED;AAAA,EACF,CAAC;AACH;",
-  "names": ["build"]
-}

package/dist/esm/nativePrebuild.js

@@ -1,98 +0,0 @@
-import { readFile } from "fs/promises";
-import { join } from "path";
-import * as babel from "@babel/core";
-import { build } from "esbuild";
-import { extensions } from "./extensions";
-async function nativeBabelFlowTransform(input) {
-  return await new Promise((res, rej) => {
-    babel.transform(
-      input,
-      {
-        presets: ["module:metro-react-native-babel-preset"]
-      },
-      (err, { code }) => {
-        if (err)
-          rej(err);
-        res(code);
-      }
-    );
-  });
-}
-const prebuiltDir = join(process.cwd(), "testing-area");
-const prebuiltFiles = {
-  react: join(prebuiltDir, "react.js"),
-  reactJSXRuntime: join(prebuiltDir, "react-jsx-runtime.js"),
-  reactNative: join(prebuiltDir, "react-native.js")
-};
-async function nativePrebuild() {
-  if (process.env.SKIP_PREBUILD_RN) {
-    return;
-  }
-  console.log(`Prebuilding React Native (one time cost...)`);
-  await Promise.all([
-    build({
-      bundle: true,
-      entryPoints: [require.resolve("react-native")],
-      outfile: prebuiltFiles.reactNative,
-      format: "cjs",
-      target: "node20",
-      jsx: "transform",
-      jsxFactory: "react",
-      allowOverwrite: true,
-      platform: "node",
-      loader: {
-        ".png": "dataurl",
-        ".jpg": "dataurl",
-        ".jpeg": "dataurl",
-        ".gif": "dataurl"
-      },
-      define: {
-        __DEV__: "true",
-        "process.env.NODE_ENV": `"development"`,
-        // TODO
-        "process.env.REACT_NATIVE_SERVER_PUBLIC_PORT": JSON.stringify("8081")
-      },
-      logLevel: "warning",
-      resolveExtensions: extensions,
-      plugins: [
-        {
-          name: "remove-flow",
-          setup(build2) {
-            build2.onResolve(
-              {
-                filter: /HMRClient/
-              },
-              async (input) => {
-                return {
-                  path: require.resolve("@tamagui/vite-native-hmr")
-                };
-              }
-            );
-            build2.onLoad(
-              {
-                filter: /.*.js/
-              },
-              async (input) => {
-                if (!input.path.includes("react-native") && !input.path.includes(`vite-native-hmr`)) {
-                  return;
-                }
-                const code = await readFile(input.path, "utf-8");
-                const outagain = await nativeBabelFlowTransform(code);
-                return {
-                  contents: outagain,
-                  loader: "jsx"
-                };
-              }
-            );
-          }
-        }
-      ]
-    }),
-    ,
-  ]);
-}
-export {
-  nativePrebuild,
-  prebuiltFiles
-};
-//# sourceMappingURL=nativePrebuild.js.map

package/dist/esm/nativePrebuild.js.map

@@ -1,6 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../src/nativePrebuild.ts"],
-  "mappings": "AAAA,SAAS,gBAAgB;AACzB,SAAS,YAAY;AAErB,YAAY,WAAW;AACvB,SAAS,aAAa;AAEtB,SAAS,kBAAkB;AAE3B,eAAe,yBAAyB,OAAe;AACrD,SAAO,MAAM,IAAI,QAAgB,CAAC,KAAK,QAAQ;AAC7C,UAAM;AAAA,MACJ;AAAA,MACA;AAAA,QACE,SAAS,CAAC,wCAAwC;AAAA,MACpD;AAAA,MACA,CAAC,KAAU,EAAE,KAAK,MAAM;AACtB,YAAI;AAAK,cAAI,GAAG;AAChB,YAAI,IAAI;AAAA,MACV;AAAA,IACF;AAAA,EACF,CAAC;AACH;AAEA,MAAM,cAAc,KAAK,QAAQ,IAAI,GAAG,cAAc;AAC/C,MAAM,gBAAgB;AAAA,EAC3B,OAAO,KAAK,aAAa,UAAU;AAAA,EACnC,iBAAiB,KAAK,aAAa,sBAAsB;AAAA,EACzD,aAAa,KAAK,aAAa,iBAAiB;AAClD;AAEA,eAAsB,iBAAiB;AA8BrC,MAAI,QAAQ,IAAI,kBAAkB;AAChC;AAAA,EACF;AAEA,UAAQ,IAAI,6CAA6C;AAEzD,QAAM,QAAQ,IAAI;AAAA,IAChB,MAAM;AAAA,MACJ,QAAQ;AAAA,MACR,aAAa,CAAC,gBAAgB,cAAc,CAAC;AAAA,MAC7C,SAAS,cAAc;AAAA,MACvB,QAAQ;AAAA,MACR,QAAQ;AAAA,MACR,KAAK;AAAA,MACL,YAAY;AAAA,MACZ,gBAAgB;AAAA,MAChB,UAAU;AAAA,MACV,QAAQ;AAAA,QACN,QAAQ;AAAA,QACR,QAAQ;AAAA,QACR,SAAS;AAAA,QACT,QAAQ;AAAA,MACV;AAAA,MACA,QAAQ;AAAA,QACN,SAAS;AAAA,QACT,wBAAwB;AAAA;AAAA,QAExB,+CAA+C,KAAK,UAAU,MAAM;AAAA,MACtE;AAAA,MACA,UAAU;AAAA,MACV,mBAAmB;AAAA,MACnB,SAAS;AAAA,QACP;AAAA,UACE,MAAM;AAAA,UACN,MAAMA,QAAO;AACX,YAAAA,OAAM;AAAA,cACJ;AAAA,gBACE,QAAQ;AAAA,cACV;AAAA,cACA,OAAO,UAAU;AACf,uBAAO;AAAA,kBACL,MAAM,gBAAgB,0BAA0B;AAAA,gBAClD;AAAA,cACF;AAAA,YACF;AAEA,YAAAA,OAAM;AAAA,cACJ;AAAA,gBACE,QAAQ;AAAA,cACV;AAAA,cACA,OAAO,UAAU;AACf,oBACE,CAAC,MAAM,KAAK,SAAS,cAAc,KACnC,CAAC,MAAM,KAAK,SAAS,iBAAiB,GACtC;AACA;AAAA,gBACF;AAEA,sBAAM,OAAO,MAAM,SAAS,MAAM,MAAM,OAAO;AAG/C,sBAAM,WAAW,MAAM,yBAAyB,IAAI;AAEpD,uBAAO;AAAA,kBACL,UAAU;AAAA,kBACV,QAAQ;AAAA,gBACV;AAAA,cACF;AAAA,YACF;AAAA,UACF;AAAA,QACF;AAAA,MACF;AAAA,IACF,CAAC;AAAA,IAED;AAAA,EACF,CAAC;AACH;",
-  "names": ["build"]
-}

package/types/nativePrebuild.d.ts

@@ -1,7 +0,0 @@
-export declare const prebuiltFiles: {
-    react: string;
-    reactJSXRuntime: string;
-    reactNative: string;
-};
-export declare function nativePrebuild(): Promise<void>;
-//# sourceMappingURL=nativePrebuild.d.ts.map

package/types/nativePrebuild.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"nativePrebuild.d.ts","sourceRoot":"","sources":["../src/nativePrebuild.ts"],"names":[],"mappings":"AAwBA,eAAO,MAAM,aAAa;;;;CAIzB,CAAA;AAED,wBAAsB,cAAc,kBA0GnC"}