@nasti-toolchain/nasti 1.3.7 → 1.3.9

package/dist/cli.js

@@ -695,15 +695,18 @@ function transformMiddleware(ctx) {
 }
 async function transformRequest(url, ctx) {
   const { config, pluginContainer, moduleGraph } = ctx;
+  const cleanReqUrl = url.split("?")[0];
   const cached = moduleGraph.getModuleByUrl(url);
   if (cached?.transformResult) {
     return cached.transformResult;
   }
+  if (cleanReqUrl === "/@react-refresh") {
+    return { code: REACT_REFRESH_RUNTIME };
+  }
   const filePath = resolveUrlToFile(url, config.root);
   if (!filePath || !fs4.existsSync(filePath)) return null;
   const mod = await moduleGraph.ensureEntryFromUrl(url);
   moduleGraph.registerModule(mod, filePath);
-  const cleanReqUrl = url.split("?")[0];
   if (cleanReqUrl.startsWith("/@modules/")) {
     const code2 = await bundlePackageAsEsm(filePath);
     const transformResult2 = { code: code2 };
@@ -716,13 +719,18 @@ async function transformRequest(url, ctx) {
     code = typeof pluginResult === "string" ? pluginResult : pluginResult.code;
   }
   if (shouldTransform(filePath)) {
+    const isJsx = /\.[jt]sx$/.test(filePath);
+    const useRefresh = isJsx && config.framework !== "vue";
     const result = transformCode(filePath, code, {
       sourcemap: true,
       jsxRuntime: "automatic",
       jsxImportSource: config.framework === "vue" ? "vue" : "react",
-      reactRefresh: config.framework !== "vue"
+      reactRefresh: useRefresh
     });
     code = result.code;
+    if (useRefresh) {
+      code = REACT_REFRESH_PREAMBLE + code + REACT_REFRESH_FOOTER;
+    }
   }
   const envDefine = ctx.envDefine ?? buildEnvDefine(
     loadEnv(config.mode, config.root, config.envPrefix),
@@ -869,10 +877,19 @@ function resolveNodeModule(root, moduleName) {
     if (resolved) return resolved;
   }
   if (subpath) {
-    const direct = path4.join(pkgDir, subpath);
-    if (fs4.existsSync(direct) && fs4.statSync(direct).isFile()) return direct;
-    for (const ext of RESOLVE_EXTENSIONS) {
-      if (fs4.existsSync(direct + ext)) return direct + ext;
+    const subDirs = [""];
+    for (const field of ["module", "main"]) {
+      if (typeof pkg[field] === "string") {
+        const dir2 = path4.dirname(pkg[field]);
+        if (dir2 && dir2 !== "." && !subDirs.includes(dir2)) subDirs.push(dir2);
+      }
+    }
+    for (const dir2 of subDirs) {
+      const direct = path4.join(pkgDir, dir2, subpath);
+      if (fs4.existsSync(direct) && fs4.statSync(direct).isFile()) return direct;
+      for (const ext of RESOLVE_EXTENSIONS) {
+        if (fs4.existsSync(direct + ext)) return direct + ext;
+      }
     }
     return null;
   }
@@ -1038,13 +1055,32 @@ if (!window.__nasti_hot_map) window.__nasti_hot_map = new Map();
 window.__NASTI_HMR__ = { createHotContext };
 `;
 }
-var esmBundleCache, VALID_IDENT, RESOLVE_EXTENSIONS, ESM_CONDITIONS;
+var REACT_REFRESH_RUNTIME, REACT_REFRESH_PREAMBLE, REACT_REFRESH_FOOTER, esmBundleCache, VALID_IDENT, RESOLVE_EXTENSIONS, ESM_CONDITIONS;
 var init_middleware = __esm({
   "src/server/middleware.ts"() {
     "use strict";
     init_transformer();
     init_html();
     init_env();
+    REACT_REFRESH_RUNTIME = `
+export function createSignatureFunctionForTransform() {
+  return function(type, key, forceReset, getCustomHooks) { return type; };
+}
+export function register(type, id) {}
+export default { createSignatureFunctionForTransform, register };
+`;
+    REACT_REFRESH_PREAMBLE = `
+import RefreshRuntime from '/@react-refresh';
+if (!window.$RefreshReg$) {
+  window.$RefreshReg$ = (type, id) => RefreshRuntime.register(type, import.meta.url + ' ' + id);
+  window.$RefreshSig$ = RefreshRuntime.createSignatureFunctionForTransform;
+}
+`;
+    REACT_REFRESH_FOOTER = `
+if (import.meta.hot) {
+  import.meta.hot.accept();
+}
+`;
     esmBundleCache = /* @__PURE__ */ new Map();
     VALID_IDENT = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/;
     RESOLVE_EXTENSIONS = [".tsx", ".ts", ".jsx", ".js", ".mjs", ".json", ".vue"];
@@ -1389,7 +1425,7 @@ async function createServer(inlineConfig = {}) {
           const localUrl = `http://localhost:${actualPort}`;
           const networkUrl = host === "0.0.0.0" ? `http://${getNetworkAddress()}:${actualPort}` : null;
           console.log();
-          console.log(pc.cyan("  nasti dev server") + pc.dim(` v${"1.3.7"}`));
+          console.log(pc.cyan("  nasti dev server") + pc.dim(` v${"1.3.9"}`));
           console.log();
           console.log(`  ${pc.green(">")} Local:   ${pc.cyan(localUrl)}`);
           if (networkUrl) {
@@ -1463,7 +1499,7 @@ import pc2 from "picocolors";
 async function build(inlineConfig = {}) {
   const config = await resolveConfig(inlineConfig, "build");
   const startTime = performance.now();
-  console.log(pc2.cyan("\n\u{1F528} nasti build") + pc2.dim(` v${"1.3.7"}`));
+  console.log(pc2.cyan("\n\u{1F528} nasti build") + pc2.dim(` v${"1.3.9"}`));
   console.log(pc2.dim(`  root: ${config.root}`));
   console.log(pc2.dim(`  mode: ${config.mode}`));
   const outDir = path10.resolve(config.root, config.build.outDir);
@@ -1683,6 +1719,6 @@ cli.command("preview [root]", "Preview production build").option("--port <port>"
   }
 });
 cli.help();
-cli.version("1.3.7");
+cli.version("1.3.9");
 cli.parse();
 //# sourceMappingURL=cli.js.map