@tamagui/cli 1.52.8 → 1.53.0

package/dist/dev/getVitePath.js

@@ -0,0 +1,58 @@
+"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 getVitePath_exports = {};
+__export(getVitePath_exports, {
+  getVitePath: () => getVitePath
+});
+module.exports = __toCommonJS(getVitePath_exports);
+var import_path = require("path");
+var import_esm_resolve = __toESM(require("esm-resolve"));
+var import_fs_extra = require("fs-extra");
+async function getVitePath(moduleName) {
+  if (moduleName[0] === ".") {
+    return (0, import_path.join)(`apps/tamastack/src`, moduleName) + ".js";
+  } else {
+    let id = "";
+    const resolved = (0, import_esm_resolve.default)((0, import_path.join)(process.cwd(), "index.js"))(id);
+    if (!resolved) {
+      throw new Error(`\u274C cant find`);
+    }
+    const real = await (0, import_fs_extra.realpath)(resolved);
+    id = (0, import_path.relative)(file, real);
+    if (id.endsWith(`/react/jsx-dev-runtime.js`)) {
+      id = "react/jsx-runtime";
+    }
+    return id;
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getVitePath
+});
+//# sourceMappingURL=getVitePath.js.map

package/dist/dev/getVitePath.js.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../src/dev/getVitePath.ts"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAA+B;AAE/B,yBAAoB;AACpB,sBAAyB;AAEzB,eAAsB,YAAY,YAAoB;AACpD,MAAI,WAAW,CAAC,MAAM,KAAK;AAEzB,eAAO,kBAAK,sBAAsB,UAAU,IAAI;AAAA,EAClD,OAAO;AACL,QAAI,KAAK;AACT,UAAM,eAAW,mBAAAA,aAAQ,kBAAK,QAAQ,IAAI,GAAG,UAAU,CAAC,EAAE,EAAE;AAE5D,QAAI,CAAC,UAAU;AACb,YAAM,IAAI,MAAM,kBAAa;AAAA,IAC/B;AACA,UAAM,OAAO,UAAM,0BAAS,QAAQ;AACpC,aAAK,sBAAS,MAAM,IAAI;AACxB,QAAI,GAAG,SAAS,2BAA2B,GAAG;AAC5C,WAAK;AAAA,IACP;AACA,WAAO;AAAA,EACT;AACF;",
+  "names": ["resolve"]
+}

package/dist/dev.js

@@ -36,32 +36,38 @@ var import_path = require("path");
 var import_vite_native_swc = __toESM(require("@tamagui/vite-native-swc"));
 var import_vite_plugin = require("@tamagui/vite-plugin");
 var import_chalk = __toESM(require("chalk"));
+var import_es_module_lexer = require("es-module-lexer");
 var import_fs_extra = require("fs-extra");
 var import_vite = require("vite");
 var import_clientInjectPlugin = require("./dev/clientInjectPlugin");
 var import_createDevServer = require("./dev/createDevServer");
 var import_utils = require("./utils");
 const dev = async (options) => {
-  const { root, mode, paths } = options;
-  const projectRoot = root;
+  const { root } = options;
+  process.on("uncaughtException", (err) => {
+    console.log((err == null ? void 0 : err.message) || err);
+  });
   const packageRootDir = (0, import_path.join)(__dirname, "..");
   await (0, import_vite_plugin.nativePrebuild)();
   const port = options.port || 8081;
   const plugins = [
-    (0, import_vite_plugin.tamaguiPlugin)({
-      ...options.tamaguiOptions,
-      target: "native"
-    }),
-    (0, import_vite_native_swc.default)({
-      tsDecorators: true
-    }),
-    (0, import_vite_plugin.nativePlugin)({
-      port
-    })
+    // tamaguiPlugin({
+    //   ...options.tamaguiOptions,
+    //   target: 'native',
+    // }),
+    {
+      name: "tamagui",
+      config() {
+        return {
+          define: {
+            "process.env.TAMAGUI_TARGET": JSON.stringify("native")
+          }
+        };
+      }
+    }
   ];
   if (process.env.IS_TAMAGUI_DEV) {
     const inspect = require("vite-plugin-inspect");
-    console.log("\u{1F41E} enabling inspect plugin");
     plugins.push(inspect());
   }
   const hmrListeners = [];
@@ -69,9 +75,74 @@ const dev = async (options) => {
   let serverConfig = {
     root,
     mode: "development",
+    esbuild: false,
     clearScreen: false,
     appType: "custom",
-    plugins,
+    plugins: [
+      ...plugins,
+      (0, import_vite_native_swc.default)({
+        tsDecorators: true,
+        mode: "serve"
+      }),
+      (0, import_vite_plugin.nativePlugin)({
+        port,
+        mode: "serve"
+      }),
+      {
+        name: "tamagui-client-transform",
+        async handleHotUpdate({ read, modules, file }) {
+          var _a, _b;
+          try {
+            if (!file.includes("/src/")) {
+              return;
+            }
+            const [module2] = modules;
+            if (!module2)
+              return;
+            const id = (module2 == null ? void 0 : module2.url) || file.replace(root, "");
+            const code = await read();
+            if (code.startsWith(`'use strict';`))
+              return;
+            if (!code) {
+              return;
+            }
+            let source = code;
+            source = ((_a = await (0, import_vite_native_swc.transformForBuild)(id, source)) == null ? void 0 : _a.code) || "";
+            const importsMap = {};
+            const [imports] = (0, import_es_module_lexer.parse)(source);
+            let accumulatedSliceOffset = 0;
+            for (const specifier of imports) {
+              const { n: importName, s: start } = specifier;
+              if (importName) {
+                const id2 = await (0, import_vite_plugin.getVitePath)(file, importName);
+                if (!id2) {
+                  console.warn("???");
+                  continue;
+                }
+                importsMap[id2] = id2.replace(/^(\.\.\/)+/, "");
+                const len = importName.length;
+                const extraLen = id2.length - len;
+                source = source.slice(0, start + accumulatedSliceOffset) + id2 + source.slice(start + accumulatedSliceOffset + len);
+                accumulatedSliceOffset += extraLen;
+              }
+            }
+            source = ((_b = await (0, import_vite_native_swc.swcTransform)(id, source, {
+              mode: "serve-cjs"
+            })) == null ? void 0 : _b.code) || "";
+            if (!source) {
+              throw "\u274C no source";
+            }
+            const hotUpdateSource = `exports = ((exports) => {
+              const require = createRequire(${JSON.stringify(importsMap, null, 2)})
+              ${source.replace(`import.meta.hot.accept(() => {})`, ``)};
+              return exports })({})`;
+            hotUpdatedCJSFiles.set(id, hotUpdateSource);
+          } catch (err) {
+            console.log(`Error processing hmr update:`, err);
+          }
+        }
+      }
+    ],
     server: {
       cors: true,
       port: options.port,
@@ -86,37 +157,28 @@ const dev = async (options) => {
     plugins: [...serverConfig.plugins]
   };
   const server = await (0, import_vite.createServer)(serverConfig);
-  resolvedConfig.plugins = resolvedConfig.plugins.filter((x) => {
-    if (x.name === "vite:import-analysis") {
-      return false;
-    }
-    return true;
-  });
   server.watcher.addListener("change", async (path) => {
     const id = path.replace(process.cwd(), "");
     if (!id.endsWith("tsx") && !id.endsWith("jsx")) {
       return;
     }
-    const out = await server.transformRequest(id);
-    if (!out)
-      return;
-    let contents = await (0, import_vite_plugin.nativeBabelTransform)(out.code);
-    contents = contents.replace("import.meta.hot.accept(() => {})", "").replace("react_jsx-dev-runtime", "react/jsx-dev-runtime").replace(/\.js\?v=[0-9a-z]+"/gi, '"').replaceAll("/node_modules/.vite/deps/", "").replace(`import.meta.hot = (0, _client.createHotContext)("/src/App.tsx");`, "").replace('var _client = require("/@vite/client");', "");
-    contents = `exports = ((exports) => { ${contents}; return exports })({})`;
-    hotUpdatedCJSFiles.set(id, contents);
+    try {
+      void server.transformRequest(id);
+    } catch (err) {
+      console.log("err", err);
+    }
   });
   await server.listen();
+  let isBuilding = null;
   const dispose = await (0, import_createDevServer.createDevServer)(options, {
     hotUpdatedCJSFiles,
     listenForHMR(cb) {
       hmrListeners.push(cb);
     },
-    getIndexBundle: async function getBundle() {
-      const outputCode = await getBundleCode();
-      return outputCode;
-    },
+    getIndexBundle: getBundleCode,
     indexJson: getIndexJsonReponse({ port, root })
   });
+  getBundleCode();
   console.log(`Listening on:`, import_chalk.default.green(`http://localhost:${port}`));
   server.printUrls();
   (0, import_utils.registerDispose)(() => {
@@ -128,6 +190,14 @@ const dev = async (options) => {
     return (_a = server.httpServer) == null ? void 0 : _a.on("close", res);
   });
   async function getBundleCode() {
+    if (isBuilding) {
+      const res = await isBuilding;
+      return res;
+    }
+    let done;
+    isBuilding = new Promise((res) => {
+      done = res;
+    });
     const tmpBundle = (0, import_path.join)(process.cwd(), "bundle.tmp.js");
     if (await (0, import_fs_extra.pathExists)(tmpBundle)) {
       console.log(
@@ -137,12 +207,30 @@ const dev = async (options) => {
       return await (0, import_promises.readFile)(tmpBundle, "utf-8");
     }
     const buildOutput = await (0, import_vite.build)({
-      plugins,
+      plugins: [
+        ...plugins,
+        (0, import_vite_plugin.nativePlugin)({
+          port,
+          mode: "build"
+        }),
+        (0, import_vite_native_swc.default)({
+          tsDecorators: true,
+          mode: "build"
+        })
+      ],
       appType: "custom",
       root,
       clearScreen: false,
       build: {
-        ssr: false
+        ssr: false,
+        minify: false,
+        rollupOptions: {
+          treeshake: false,
+          preserveEntrySignatures: "strict",
+          output: {
+            format: "cjs"
+          }
+        }
       },
       mode: "development",
       define: {
@@ -150,44 +238,53 @@ const dev = async (options) => {
         "process.env.NODE_ENV": `"development"`
       }
     });
-    const appCodeIn = "output" in buildOutput ? buildOutput.output[0].code : null;
-    if (!appCodeIn) {
+    if (!("output" in buildOutput)) {
       throw `\u274C`;
     }
-    const appCode = await (0, import_vite_plugin.nativeBabelTransform)(appCodeIn);
-    const paths2 = [
-      (0, import_path.join)(process.cwd(), "testing-area", "react.js"),
-      (0, import_path.join)(process.cwd(), "testing-area", "react-jsx-runtime.js"),
-      (0, import_path.join)(process.cwd(), "testing-area", "react-native.js")
-    ];
-    const [react, reactJsxRuntime, reactNative] = await Promise.all(
-      paths2.map((p) => (0, import_promises.readFile)(p, "utf-8"))
-    );
-    const reactCode = react.replace(
-      `module.exports = require_react_development();`,
-      `return require_react_development()`
-    );
-    const reactJSXRuntimeCode = reactJsxRuntime.replace(
-      `module.exports = require_react_jsx_runtime_production_min();`,
-      `return require_react_jsx_runtime_production_min()`
-      // `module.exports = require_react_jsx_dev_runtime_development();`,
-      // `return require_react_jsx_dev_runtime_development();`
-    );
-    const reactNativeCode = reactNative.replace(
-      `module.exports = require_react_native();`,
-      `require_ReactNative();
-globalThis["ReactPressability"] = require_Pressability;
-globalThis["ReactUsePressability"] = require_usePressability;
-return require_react_native()`
+    let appCode = buildOutput.output.sort((a, b) => a["isEntry"] ? 1 : -1).map((module2) => {
+      if (module2.type == "chunk") {
+        const importsMap = {};
+        for (const imp of module2.imports) {
+          const relativePath = (0, import_path.relative)((0, import_path.dirname)(module2.fileName), imp);
+          importsMap[relativePath[0] === "." ? relativePath : "./" + relativePath] = imp;
+        }
+        return `
+___modules___["${module2.fileName}"] = ((exports, module2) => {
+  const require = createRequire(${JSON.stringify(importsMap, null, 2)})
+
+  ${module2.code.replace(`'use strict';`, "").replace("module.exports = ", "module2.exports = ")}
+})
+
+${module2.isEntry ? `
+// run entry
+__specialRequire("node_modules/react-native/index.js")
+__specialRequire("${module2.fileName}")
+` : ""}
+`;
+      }
+    }).join("\n");
+    if (!appCode) {
+      throw `\u274C`;
+    }
+    appCode = appCode.replace("undefined.accept(() => {})", "").replace("undefined.accept(function() {});", "").replace(
+      `var require_react_refresh_runtime_development =`,
+      `var require_react_refresh_runtime_development = globalThis['__RequireReactRefreshRuntime__'] = `
+    ).replace(
+      `var require_Pressability = `,
+      `var require_Pressability = globalThis['__ReactPressability__'] =`
     ).replace(
-      `ReactRefreshRuntime.injectIntoGlobalHook(global);`,
-      `globalThis['_ReactRefreshRuntime'] = ReactRefreshRuntime; ReactRefreshRuntime.injectIntoGlobalHook(global);`
+      `var require_Pressability = `,
+      `var require_Pressability = globalThis['__ReactPressability__'] =`
+    ).replace(
+      `var require_usePressability = `,
+      `var require_usePressability = globalThis['__ReactUsePressability__'] =`
     );
     const templateFile = (0, import_path.join)(packageRootDir, "react-native-template.js");
-    return (await (0, import_promises.readFile)(templateFile, "utf-8")).replace(`// -- react --`, reactCode).replace(`// -- react-native --`, reactNativeCode).replace(`// -- react/jsx-runtime --`, reactJSXRuntimeCode).replace(
-      `// -- app --`,
-      appCode.replace('"use strict";', "").replace("undefined.accept(() => {})", "")
-    );
+    const out = await (0, import_promises.readFile)(templateFile, "utf-8") + appCode;
+    await (0, import_promises.writeFile)((0, import_path.join)(process.cwd(), ".tamagui", "bundle.js"), out, "utf-8");
+    done(out);
+    isBuilding = null;
+    return out;
   }
 };
 function getIndexJsonReponse({ port, root }) {

package/dist/dev.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/dev.ts"],
-  "mappings": "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",
-  "names": ["viteReactPlugin", "chalk", "paths"]
+  "mappings": "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",
+  "names": ["viteReactPlugin", "module", "id", "chalk"]
 }

package/dist/getVitePath.js

@@ -0,0 +1,58 @@
+"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 getVitePath_exports = {};
+__export(getVitePath_exports, {
+  getVitePath: () => getVitePath
+});
+module.exports = __toCommonJS(getVitePath_exports);
+var import_path = require("path");
+var import_esm_resolve = __toESM(require("esm-resolve"));
+var import_fs_extra = require("fs-extra");
+async function getVitePath(moduleName) {
+  if (moduleName[0] === ".") {
+    return (0, import_path.join)(`apps/tamastack/src`, moduleName) + ".js";
+  } else {
+    let id = "";
+    const resolved = (0, import_esm_resolve.default)((0, import_path.join)(process.cwd(), "index.js"))(id);
+    if (!resolved) {
+      throw new Error(`\u274C cant find`);
+    }
+    const real = await (0, import_fs_extra.realpath)(resolved);
+    id = (0, import_path.relative)(file, real);
+    if (id.endsWith(`/react/jsx-dev-runtime.js`)) {
+      id = "react/jsx-runtime";
+    }
+    return id;
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getVitePath
+});
+//# sourceMappingURL=getVitePath.js.map

package/dist/getVitePath.js.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../src/getVitePath.ts"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAA+B;AAE/B,yBAAoB;AACpB,sBAAyB;AAEzB,eAAsB,YAAY,YAAoB;AACpD,MAAI,WAAW,CAAC,MAAM,KAAK;AAEzB,eAAO,kBAAK,sBAAsB,UAAU,IAAI;AAAA,EAClD,OAAO;AACL,QAAI,KAAK;AACT,UAAM,eAAW,mBAAAA,aAAQ,kBAAK,QAAQ,IAAI,GAAG,UAAU,CAAC,EAAE,EAAE;AAE5D,QAAI,CAAC,UAAU;AACb,YAAM,IAAI,MAAM,kBAAa;AAAA,IAC/B;AACA,UAAM,OAAO,UAAM,0BAAS,QAAQ;AACpC,aAAK,sBAAS,MAAM,IAAI;AACxB,QAAI,GAAG,SAAS,2BAA2B,GAAG;AAC5C,WAAK;AAAA,IACP;AACA,WAAO;AAAA,EACT;AACF;",
+  "names": ["resolve"]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/cli",
-  "version": "1.52.8",
+  "version": "1.53.0",
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
   "main": "dist",
@@ -24,17 +24,18 @@
   },
   "dependencies": {
     "@babel/code-frame": "^7.21.4",
+    "@babel/plugin-transform-react-jsx": "^7.22.5",
     "@callstack/repack-debugger-app": "^1.0.0",
     "@fastify/sensible": "^4.1.0",
     "@fastify/static": "^5.0.2",
-    "@tamagui/build": "1.52.8",
-    "@tamagui/create-theme": "1.52.8",
-    "@tamagui/generate-themes": "1.52.8",
-    "@tamagui/static": "1.52.8",
-    "@tamagui/types": "1.52.8",
-    "@tamagui/vite-native-hmr": "1.52.8",
-    "@tamagui/vite-native-swc": "1.52.8",
-    "@tamagui/vite-plugin": "1.52.8",
+    "@tamagui/build": "1.53.0",
+    "@tamagui/create-theme": "1.53.0",
+    "@tamagui/generate-themes": "1.53.0",
+    "@tamagui/static": "1.53.0",
+    "@tamagui/types": "1.53.0",
+    "@tamagui/vite-native-hmr": "1.53.0",
+    "@tamagui/vite-native-swc": "1.53.0",
+    "@tamagui/vite-plugin": "1.53.0",
     "@types/compression": "^1.7.2",
     "@types/morgan": "^1.9.3",
     "@vitejs/plugin-react": "^4.0.4",
@@ -44,13 +45,16 @@
     "change-case": "^4.1.2",
     "chokidar": "^3.5.2",
     "compression": "^1.7.4",
+    "es-module-lexer": "^1.3.0",
     "esbuild": "^0.19.0",
+    "esm-resolve": "^1.0.8",
     "execa": "^5.0.0",
     "express": "^4.18.1",
     "fast-glob": "^3.2.11",
     "fastify": "^3.29.0",
     "fastify-favicon": "^3.2.0",
     "fastify-plugin": "^3.0.1",
+    "flow-remove-types": "^2.214.0",
     "fs-extra": "^11.1.0",
     "get-port": "^6.1.2",
     "graphology": "^0.24.1",
@@ -72,6 +76,7 @@
     "url": "^0.11.0",
     "vite": "^4.4.9",
     "vite-plugin-entry-shaking": "^0.3.2",
+    "vite-plugin-externals": "^0.6.2",
     "vite-tsconfig-paths": "^4.2.0",
     "ws": "^8.7.0",
     "zx": "^7.1.1"

package/src/dev.ts

@@ -1,16 +1,15 @@
-import { readFile } from 'fs/promises'
-import { join } from 'path'
+import { readFile, writeFile } from 'fs/promises'
+import { dirname, join, relative } from 'path'
 
 import { CLIResolvedOptions } from '@tamagui/types'
-import viteReactPlugin, { swcTransform } from '@tamagui/vite-native-swc'
-import {
-  nativeBabelTransform,
-  nativePlugin,
-  nativePrebuild,
-  tamaguiPlugin,
-} from '@tamagui/vite-plugin'
+import viteReactPlugin, {
+  swcTransform,
+  transformForBuild,
+} from '@tamagui/vite-native-swc'
+import { getVitePath, nativePlugin, nativePrebuild } from '@tamagui/vite-plugin'
 import chalk from 'chalk'
-import fs, { pathExists } from 'fs-extra'
+import { parse } from 'es-module-lexer'
+import { pathExists } from 'fs-extra'
 import { InlineConfig, build, createServer, resolveConfig } from 'vite'
 
 import { clientInjectionsPlugin } from './dev/clientInjectPlugin'
@@ -19,8 +18,11 @@ import { HMRListener } from './dev/types'
 import { registerDispose } from './utils'
 
 export const dev = async (options: CLIResolvedOptions) => {
-  const { root, mode, paths } = options
-  const projectRoot = root
+  const { root } = options
+
+  process.on('uncaughtException', (err) => {
+    console.log(err?.message || err)
+  })
 
   const packageRootDir = join(__dirname, '..')
 
@@ -31,21 +33,25 @@ export const dev = async (options: CLIResolvedOptions) => {
   const port = options.port || 8081
 
   const plugins = [
-    tamaguiPlugin({
-      ...options.tamaguiOptions,
-      target: 'native',
-    }),
-    viteReactPlugin({
-      tsDecorators: true,
-    }),
-    nativePlugin({
-      port,
-    }),
-  ]
+    // tamaguiPlugin({
+    //   ...options.tamaguiOptions,
+    //   target: 'native',
+    // }),
+    {
+      name: 'tamagui',
+      config() {
+        return {
+          define: {
+            'process.env.TAMAGUI_TARGET': JSON.stringify('native'),
+          },
+        }
+      },
+    },
+  ] satisfies InlineConfig['plugins']
 
   if (process.env.IS_TAMAGUI_DEV) {
     const inspect = require('vite-plugin-inspect')
-    console.log('🐞 enabling inspect plugin')
+    // @ts-ignore
     plugins.push(inspect())
   }
 
@@ -55,9 +61,106 @@ export const dev = async (options: CLIResolvedOptions) => {
   let serverConfig = {
     root,
     mode: 'development',
+    esbuild: false,
     clearScreen: false,
     appType: 'custom',
-    plugins,
+
+    plugins: [
+      ...plugins,
+
+      viteReactPlugin({
+        tsDecorators: true,
+        mode: 'serve',
+      }),
+
+      nativePlugin({
+        port,
+        mode: 'serve',
+      }),
+
+      {
+        name: 'tamagui-client-transform',
+
+        async handleHotUpdate({ read, modules, file }) {
+          try {
+            if (!file.includes('/src/')) {
+              return
+            }
+
+            const [module] = modules
+            if (!module) return
+
+            const id = module?.url || file.replace(root, '')
+
+            const code = await read()
+
+            // got a weird pre compiled file on startup
+            if (code.startsWith(`'use strict';`)) return
+
+            if (!code) {
+              return
+            }
+
+            let source = code
+
+            // we have to remove jsx before we can parse imports...
+            source = (await transformForBuild(id, source))?.code || ''
+
+            const importsMap = {}
+
+            // parse imports of modules into ids:
+            // eg `import x from '@tamagui/core'` => `import x from '/me/node_modules/@tamagui/core/index.js'`
+            const [imports] = parse(source)
+
+            let accumulatedSliceOffset = 0
+
+            for (const specifier of imports) {
+              const { n: importName, s: start } = specifier
+
+              if (importName) {
+                const id = await getVitePath(file, importName)
+                if (!id) {
+                  console.warn('???')
+                  continue
+                }
+
+                importsMap[id] = id.replace(/^(\.\.\/)+/, '')
+
+                // replace module name with id for hmr
+                const len = importName.length
+                const extraLen = id.length - len
+                source =
+                  source.slice(0, start + accumulatedSliceOffset) +
+                  id +
+                  source.slice(start + accumulatedSliceOffset + len)
+                accumulatedSliceOffset += extraLen
+              }
+            }
+
+            // then we have to convert to commonjs..
+            source =
+              (
+                await swcTransform(id, source, {
+                  mode: 'serve-cjs',
+                })
+              )?.code || ''
+
+            if (!source) {
+              throw '❌ no source'
+            }
+
+            const hotUpdateSource = `exports = ((exports) => {
+              const require = createRequire(${JSON.stringify(importsMap, null, 2)})
+              ${source.replace(`import.meta.hot.accept(() => {})`, ``)};
+              return exports })({})`
+
+            hotUpdatedCJSFiles.set(id, hotUpdateSource)
+          } catch (err) {
+            console.log(`Error processing hmr update:`, err)
+          }
+        },
+      },
+    ],
     server: {
       cors: true,
       port: options.port,
@@ -67,8 +170,10 @@ export const dev = async (options: CLIResolvedOptions) => {
 
   // first resolve config so we can pass into client plugin, then add client plugin:
   const resolvedConfig = await resolveConfig(serverConfig, 'serve')
+
   const viteRNClient = clientInjectionsPlugin(resolvedConfig)
 
+  // @ts-ignore
   plugins.push(viteRNClient)
 
   serverConfig = {
@@ -78,54 +183,35 @@ export const dev = async (options: CLIResolvedOptions) => {
 
   const server = await createServer(serverConfig)
 
-  // @ts-ignore
-  resolvedConfig.plugins = resolvedConfig.plugins.filter((x) => {
-    if (x.name === 'vite:import-analysis') {
-      return false
-    }
-    return true
-  })
-
   server.watcher.addListener('change', async (path) => {
     const id = path.replace(process.cwd(), '')
-
     if (!id.endsWith('tsx') && !id.endsWith('jsx')) {
       return
     }
-
-    const out = await server.transformRequest(id)
-    if (!out) return
-
-    let contents = await nativeBabelTransform(out.code)
-
-    contents = contents
-      .replace('import.meta.hot.accept(() => {})', '')
-      .replace('react_jsx-dev-runtime', 'react/jsx-dev-runtime')
-      .replace(/\.js\?v=[0-9a-z]+"/gi, '"')
-      .replaceAll('/node_modules/.vite/deps/', '')
-      .replace(`import.meta.hot = (0, _client.createHotContext)("/src/App.tsx");`, '')
-      .replace('var _client = require("/@vite/client");', '')
-
-    contents = `exports = ((exports) => { ${contents}; return exports })({})`
-
-    hotUpdatedCJSFiles.set(id, contents)
+    // just so it thinks its loaded
+    try {
+      void server.transformRequest(id)
+    } catch(err) {
+      // ok
+      console.log('err', err)
+    }
   })
 
   await server.listen()
 
+  let isBuilding: Promise<string> | null = null
+
   const dispose = await createDevServer(options, {
     hotUpdatedCJSFiles,
     listenForHMR(cb) {
       hmrListeners.push(cb)
     },
-    getIndexBundle: async function getBundle() {
-      const outputCode = await getBundleCode()
-
-      return outputCode
-    },
+    getIndexBundle: getBundleCode,
     indexJson: getIndexJsonReponse({ port, root }),
   })
 
+  getBundleCode()
+
   // rome-ignore lint/nursery/noConsoleLog: ok
   console.log(`Listening on:`, chalk.green(`http://localhost:${port}`))
   server.printUrls()
@@ -138,6 +224,16 @@ export const dev = async (options: CLIResolvedOptions) => {
   await new Promise((res) => server.httpServer?.on('close', res))
 
   async function getBundleCode() {
+    if (isBuilding) {
+      const res = await isBuilding
+      return res
+    }
+
+    let done
+    isBuilding = new Promise((res) => {
+      done = res
+    })
+
     // for easier quick testing things:
     const tmpBundle = join(process.cwd(), 'bundle.tmp.js')
     if (await pathExists(tmpBundle)) {
@@ -151,12 +247,30 @@ export const dev = async (options: CLIResolvedOptions) => {
 
     // build app
     const buildOutput = await build({
-      plugins,
+      plugins: [
+        ...plugins,
+        nativePlugin({
+          port,
+          mode: 'build',
+        }),
+        viteReactPlugin({
+          tsDecorators: true,
+          mode: 'build',
+        }),
+      ],
       appType: 'custom',
       root,
       clearScreen: false,
       build: {
         ssr: false,
+        minify: false,
+        rollupOptions: {
+          treeshake: false,
+          preserveEntrySignatures: 'strict',
+          output: {
+            format: 'cjs',
+          },
+        },
       },
       mode: 'development',
       define: {
@@ -165,60 +279,79 @@ export const dev = async (options: CLIResolvedOptions) => {
       },
     })
 
-    const appCodeIn = 'output' in buildOutput ? buildOutput.output[0].code : null
-
-    if (!appCodeIn) {
+    if (!('output' in buildOutput)) {
       throw `❌`
     }
 
-    const appCode = await nativeBabelTransform(appCodeIn)
-
-    const paths = [
-      join(process.cwd(), 'testing-area', 'react.js'),
-      join(process.cwd(), 'testing-area', 'react-jsx-runtime.js'),
-      join(process.cwd(), 'testing-area', 'react-native.js'),
-    ]
-
-    const [react, reactJsxRuntime, reactNative] = await Promise.all(
-      paths.map((p) => readFile(p, 'utf-8'))
-    )
-
-    const reactCode = react.replace(
-      `module.exports = require_react_development();`,
-      `return require_react_development()`
-    )
+    let appCode = buildOutput.output
+      // entry last
+      .sort((a, b) => (a['isEntry'] ? 1 : -1))
+      .map((module) => {
+        if (module.type == 'chunk') {
+          const importsMap = {}
+          for (const imp of module.imports) {
+            const relativePath = relative(dirname(module.fileName), imp)
+            importsMap[relativePath[0] === '.' ? relativePath : './' + relativePath] = imp
+          }
+
+          return `
+___modules___["${module.fileName}"] = ((exports, module2) => {
+  const require = createRequire(${JSON.stringify(importsMap, null, 2)})
+
+  ${module.code
+    .replace(`'use strict';`, '')
+    .replace('module.exports = ', 'module2.exports = ')}
+})
+
+${
+  module.isEntry
+    ? `
+// run entry
+__specialRequire("node_modules/react-native/index.js")
+__specialRequire("${module.fileName}")
+`
+    : ''
+}
+`
+        }
+      })
+      .join('\n')
 
-    const reactJSXRuntimeCode = reactJsxRuntime.replace(
-      `module.exports = require_react_jsx_runtime_production_min();`,
-      `return require_react_jsx_runtime_production_min()`
-      // `module.exports = require_react_jsx_dev_runtime_development();`,
-      // `return require_react_jsx_dev_runtime_development();`
-    )
+    if (!appCode) {
+      throw `❌`
+    }
 
-    const reactNativeCode = reactNative
+    appCode = appCode
+      // this can be done in the individual file transform
+      .replace('undefined.accept(() => {})', '')
+      .replace('undefined.accept(function() {});', '') // swc
+      .replace(
+        `var require_react_refresh_runtime_development =`,
+        `var require_react_refresh_runtime_development = globalThis['__RequireReactRefreshRuntime__'] = `
+      )
+      .replace(
+        `var require_Pressability = `,
+        `var require_Pressability = globalThis['__ReactPressability__'] =`
+      )
       .replace(
-        `module.exports = require_react_native();`,
-        `require_ReactNative();
-globalThis["ReactPressability"] = require_Pressability;
-globalThis["ReactUsePressability"] = require_usePressability;
-return require_react_native()`
+        `var require_Pressability = `,
+        `var require_Pressability = globalThis['__ReactPressability__'] =`
       )
-      // forcing onto global so i can re-thread it into require
       .replace(
-        `ReactRefreshRuntime.injectIntoGlobalHook(global);`,
-        `globalThis['_ReactRefreshRuntime'] = ReactRefreshRuntime; ReactRefreshRuntime.injectIntoGlobalHook(global);`
+        `var require_usePressability = `,
+        `var require_usePressability = globalThis['__ReactUsePressability__'] =`
       )
 
     const templateFile = join(packageRootDir, 'react-native-template.js')
 
-    return (await readFile(templateFile, 'utf-8'))
-      .replace(`// -- react --`, reactCode)
-      .replace(`// -- react-native --`, reactNativeCode)
-      .replace(`// -- react/jsx-runtime --`, reactJSXRuntimeCode)
-      .replace(
-        `// -- app --`,
-        appCode.replace('"use strict";', '').replace('undefined.accept(() => {})', '')
-      )
+    const out = (await readFile(templateFile, 'utf-8')) + appCode
+
+    await writeFile(join(process.cwd(), '.tamagui', 'bundle.js'), out, 'utf-8')
+
+    done(out)
+    isBuilding = null
+
+    return out
   }
 }
 

package/types/dev/getVitePath.d.ts

@@ -0,0 +1,2 @@
+export declare function getVitePath(moduleName: string): Promise<string>;
+//# sourceMappingURL=getVitePath.d.ts.map

package/types/dev/getVitePath.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getVitePath.d.ts","sourceRoot":"","sources":["../../src/dev/getVitePath.ts"],"names":[],"mappings":"AAKA,wBAAsB,WAAW,CAAC,UAAU,EAAE,MAAM,mBAkBnD"}

package/types/dev.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../src/dev.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAiBnD,eAAO,MAAM,GAAG,YAAmB,kBAAkB,kBA0MpD,CAAA"}
+{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../src/dev.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAgBnD,eAAO,MAAM,GAAG,YAAmB,kBAAkB,kBAgVpD,CAAA"}

package/types/getVitePath.d.ts

@@ -0,0 +1,2 @@
+export declare function getVitePath(moduleName: string): Promise<string>;
+//# sourceMappingURL=getVitePath.d.ts.map

package/types/getVitePath.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getVitePath.d.ts","sourceRoot":"","sources":["../src/getVitePath.ts"],"names":[],"mappings":"AAKA,wBAAsB,WAAW,CAAC,UAAU,EAAE,MAAM,mBAkBnD"}