@nasti-toolchain/nasti 1.3.4 → 1.3.6

package/README.md

@@ -30,7 +30,7 @@
 
 ```bash
 # 安装
-npm install -D nasti-build
+npm install -D @nasti-toolchain/nasti
 
 # 启动开发服务器
 npx nasti dev

package/dist/cli.cjs

@@ -786,17 +786,36 @@ async function doBundlePackage(entryFile) {
     /^(import\s+)(['"])([^'"./][^'"]*)(\2)/gm,
     (_, prefix, q, spec) => `${prefix}${q}/@modules/${spec}${q}`
   );
+  code = rewriteExternalRequires(code);
   if (code.includes("__commonJSMin")) {
     code = await injectCjsNamedExports(code, entryFile);
   }
   return code;
 }
+function rewriteExternalRequires(code) {
+  const pkgs = /* @__PURE__ */ new Set();
+  const re = /__require\(["']([^"']+)["']\)/g;
+  let m;
+  while ((m = re.exec(code)) !== null) {
+    pkgs.add(m[1]);
+  }
+  if (pkgs.size === 0) return code;
+  let result = code;
+  const imports = [];
+  for (const pkg of pkgs) {
+    const safe = pkg.replace(/[^a-zA-Z0-9_$]/g, "_");
+    imports.push(`import __req_${safe} from "/@modules/${pkg}";`);
+    result = result.replaceAll(`__require("${pkg}")`, `__req_${safe}`);
+    result = result.replaceAll(`__require('${pkg}')`, `__req_${safe}`);
+  }
+  return imports.join("\n") + "\n" + result;
+}
 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;
+    if (!cjsExports || typeof cjsExports !== "object" && typeof cjsExports !== "function" || Array.isArray(cjsExports)) return code;
     const namedKeys = Object.keys(cjsExports).filter(
       (k) => k !== "__esModule" && k !== "default" && VALID_IDENT.test(k)
     );
@@ -1388,7 +1407,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(import_picocolors.default.cyan("  nasti dev server") + import_picocolors.default.dim(` v${"1.3.4"}`));
+          console.log(import_picocolors.default.cyan("  nasti dev server") + import_picocolors.default.dim(` v${"1.3.6"}`));
           console.log();
           console.log(`  ${import_picocolors.default.green(">")} Local:   ${import_picocolors.default.cyan(localUrl)}`);
           if (networkUrl) {
@@ -1466,7 +1485,7 @@ __export(build_exports, {
 async function build(inlineConfig = {}) {
   const config = await resolveConfig(inlineConfig, "build");
   const startTime = performance.now();
-  console.log(import_picocolors2.default.cyan("\n\u{1F528} nasti build") + import_picocolors2.default.dim(` v${"1.3.4"}`));
+  console.log(import_picocolors2.default.cyan("\n\u{1F528} nasti build") + import_picocolors2.default.dim(` v${"1.3.6"}`));
   console.log(import_picocolors2.default.dim(`  root: ${config.root}`));
   console.log(import_picocolors2.default.dim(`  mode: ${config.mode}`));
   const outDir = import_node_path10.default.resolve(config.root, config.build.outDir);
@@ -1691,6 +1710,6 @@ cli.command("preview [root]", "Preview production build").option("--port <port>"
   }
 });
 cli.help();
-cli.version("1.3.4");
+cli.version("1.3.6");
 cli.parse();
 //# sourceMappingURL=cli.cjs.map