@nasti-toolchain/nasti 1.3.1 → 1.3.3

package/dist/cli.js

@@ -628,7 +628,6 @@ __export(middleware_exports, {
 });
 import path4 from "path";
 import fs4 from "fs";
-import { createRequire } from "module";
 function transformMiddleware(ctx) {
   ctx.envDefine = buildEnvDefine(
     loadEnv(ctx.config.mode, ctx.config.root, ctx.config.envPrefix),
@@ -704,6 +703,13 @@ async function transformRequest(url, ctx) {
   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 };
+    mod.transformResult = transformResult2;
+    return transformResult2;
+  }
   let code = fs4.readFileSync(filePath, "utf-8");
   const pluginResult = await pluginContainer.transform(code, filePath);
   if (pluginResult) {
@@ -728,6 +734,67 @@ async function transformRequest(url, ctx) {
   mod.transformResult = transformResult;
   return transformResult;
 }
+async function bundlePackageAsEsm(entryFile) {
+  if (!esmBundleCache.has(entryFile)) {
+    esmBundleCache.set(entryFile, doBundlePackage(entryFile));
+  }
+  return esmBundleCache.get(entryFile);
+}
+async function doBundlePackage(entryFile) {
+  const { rolldown: rolldown2 } = await import("rolldown");
+  const bundle = await rolldown2({
+    input: entryFile,
+    // 仅将其他 npm 包外部化；相对路径（包内部文件）全部内联打包
+    external: (id) => {
+      if (id.startsWith(".") || id.startsWith("/") || /^[A-Za-z]:\\/.test(id)) return false;
+      return true;
+    },
+    define: {
+      // CJS 包（如 react）通过 process.env.NODE_ENV 判断环境，需在打包时替换
+      "process.env.NODE_ENV": '"development"'
+    }
+  });
+  const result = await bundle.generate({ format: "esm", exports: "named" });
+  await bundle.close();
+  let code = result.output[0].code;
+  code = code.replace(/process\.env\.NODE_ENV/g, '"development"');
+  code = code.replace(
+    /^(import\b[^;'"]*?\bfrom\s+)(['"])([^'"./][^'"]*)(\2)/gm,
+    (_, prefix, q, spec) => `${prefix}${q}/@modules/${spec}${q}`
+  ).replace(
+    /^(export\b[^;'"]*?\bfrom\s+)(['"])([^'"./][^'"]*)(\2)/gm,
+    (_, prefix, q, spec) => `${prefix}${q}/@modules/${spec}${q}`
+  ).replace(
+    /^(import\s+)(['"])([^'"./][^'"]*)(\2)/gm,
+    (_, prefix, q, spec) => `${prefix}${q}/@modules/${spec}${q}`
+  );
+  if (code.includes("__commonJSMin")) {
+    code = await injectCjsNamedExports(code, entryFile);
+  }
+  return code;
+}
+async function injectCjsNamedExports(code, entryFile) {
+  try {
+    const { createRequire: createRequire2 } = await import("module");
+    const req = createRequire2(entryFile);
+    const cjsExports = req(entryFile);
+    if (!cjsExports || typeof cjsExports !== "object" || Array.isArray(cjsExports)) return code;
+    const namedKeys = Object.keys(cjsExports).filter(
+      (k) => k !== "__esModule" && k !== "default" && VALID_IDENT.test(k)
+    );
+    if (namedKeys.length === 0) return code;
+    return code.replace(
+      /^export default (\w+\(\));?\s*$/m,
+      (_, call) => [
+        `const __cjsMod = ${call};`,
+        `export default __cjsMod;`,
+        ...namedKeys.map((k) => `export const ${k} = __cjsMod[${JSON.stringify(k)}];`)
+      ].join("\n")
+    );
+  } catch {
+    return code;
+  }
+}
 function rewriteImports(code, _config) {
   return code.replace(
     /\bfrom\s+(['"])([^'"./][^'"]*)\1/g,
@@ -748,16 +815,92 @@ function rewriteImports(code, _config) {
     }
   );
 }
+function resolveNodeModule(root, moduleName) {
+  let pkgName;
+  let subpath;
+  if (moduleName.startsWith("@")) {
+    const parts = moduleName.split("/");
+    pkgName = parts.slice(0, 2).join("/");
+    subpath = parts.slice(2).join("/");
+  } else {
+    const slash = moduleName.indexOf("/");
+    pkgName = slash === -1 ? moduleName : moduleName.slice(0, slash);
+    subpath = slash === -1 ? "" : moduleName.slice(slash + 1);
+  }
+  let pkgDir = null;
+  let dir = root;
+  for (; ; ) {
+    const candidate = path4.join(dir, "node_modules", pkgName);
+    if (fs4.existsSync(candidate)) {
+      pkgDir = candidate;
+      break;
+    }
+    const parent = path4.dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  if (!pkgDir) return null;
+  const pkgJsonPath = path4.join(pkgDir, "package.json");
+  if (!fs4.existsSync(pkgJsonPath)) return null;
+  let pkg;
+  try {
+    pkg = JSON.parse(fs4.readFileSync(pkgJsonPath, "utf-8"));
+  } catch {
+    return null;
+  }
+  if (pkg.exports) {
+    const exportKey = subpath ? `./${subpath}` : ".";
+    const resolved = resolvePackageExports(pkg.exports, exportKey, pkgDir);
+    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;
+    }
+    return null;
+  }
+  for (const field of ["module", "jsnext:main", "jsnext", "main"]) {
+    if (typeof pkg[field] === "string") {
+      const entry = path4.join(pkgDir, pkg[field]);
+      if (fs4.existsSync(entry)) return entry;
+    }
+  }
+  return null;
+}
+function resolvePackageExports(exports, key, pkgDir) {
+  if (typeof exports === "string") {
+    return key === "." ? path4.join(pkgDir, exports) : null;
+  }
+  const entry = exports[key];
+  if (entry === void 0) return null;
+  return resolveExportValue(entry, pkgDir);
+}
+function resolveExportValue(value, pkgDir) {
+  if (typeof value === "string") return path4.join(pkgDir, value);
+  if (Array.isArray(value)) {
+    for (const item of value) {
+      const r = resolveExportValue(item, pkgDir);
+      if (r) return r;
+    }
+    return null;
+  }
+  if (value && typeof value === "object") {
+    for (const cond of ESM_CONDITIONS) {
+      if (cond in value) {
+        const r = resolveExportValue(value[cond], pkgDir);
+        if (r) return r;
+      }
+    }
+  }
+  return null;
+}
 function resolveUrlToFile(url, root) {
   const cleanUrl = url.split("?")[0];
   if (cleanUrl.startsWith("/@modules/")) {
     const moduleName = cleanUrl.slice("/@modules/".length);
-    try {
-      const req = createRequire(path4.resolve(root, "package.json"));
-      return req.resolve(moduleName);
-    } catch {
-      return null;
-    }
+    return resolveNodeModule(root, moduleName);
   }
   const filePath = path4.resolve(root, cleanUrl.replace(/^\//, ""));
   if (fs4.existsSync(filePath) && fs4.statSync(filePath).isFile()) {
@@ -878,14 +1021,17 @@ if (!window.__nasti_hot_map) window.__nasti_hot_map = new Map();
 window.__NASTI_HMR__ = { createHotContext };
 `;
 }
-var RESOLVE_EXTENSIONS;
+var esmBundleCache, VALID_IDENT, RESOLVE_EXTENSIONS, ESM_CONDITIONS;
 var init_middleware = __esm({
   "src/server/middleware.ts"() {
     "use strict";
     init_transformer();
     init_html();
     init_env();
+    esmBundleCache = /* @__PURE__ */ new Map();
+    VALID_IDENT = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/;
     RESOLVE_EXTENSIONS = [".tsx", ".ts", ".jsx", ".js", ".mjs", ".json", ".vue"];
+    ESM_CONDITIONS = ["import", "browser", "module", "default"];
   }
 });
 
@@ -948,10 +1094,10 @@ var init_hmr = __esm({
 // src/plugins/resolve.ts
 import path6 from "path";
 import fs6 from "fs";
-import { createRequire as createRequire2 } from "module";
+import { createRequire } from "module";
 function resolvePlugin(config) {
   const { alias, extensions } = config.resolve;
-  const require2 = createRequire2(path6.resolve(config.root, "package.json"));
+  const require2 = createRequire(path6.resolve(config.root, "package.json"));
   return {
     name: "nasti:resolve",
     enforce: "pre",
@@ -1226,7 +1372,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.1"}`));
+          console.log(pc.cyan("  nasti dev server") + pc.dim(` v${"1.3.3"}`));
           console.log();
           console.log(`  ${pc.green(">")} Local:   ${pc.cyan(localUrl)}`);
           if (networkUrl) {
@@ -1300,7 +1446,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.1"}`));
+  console.log(pc2.cyan("\n\u{1F528} nasti build") + pc2.dim(` v${"1.3.3"}`));
   console.log(pc2.dim(`  root: ${config.root}`));
   console.log(pc2.dim(`  mode: ${config.mode}`));
   const outDir = path10.resolve(config.root, config.build.outDir);
@@ -1520,6 +1666,6 @@ cli.command("preview [root]", "Preview production build").option("--port <port>"
   }
 });
 cli.help();
-cli.version("1.3.1");
+cli.version("1.3.3");
 cli.parse();
 //# sourceMappingURL=cli.js.map