@nasti-toolchain/nasti 1.3.8 → 1.3.10

package/dist/cli.js

@@ -790,7 +790,8 @@ function rewriteExternalRequires(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}";`);
+    imports.push(`import * as __ns_${safe} from "/@modules/${pkg}";`);
+    imports.push(`var __req_${safe} = "default" in __ns_${safe} ? __ns_${safe}["default"] : __ns_${safe};`);
     result = result.replaceAll(`__require("${pkg}")`, `__req_${safe}`);
     result = result.replaceAll(`__require('${pkg}')`, `__req_${safe}`);
   }
@@ -877,10 +878,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;
   }
@@ -1416,7 +1426,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.8"}`));
+          console.log(pc.cyan("  nasti dev server") + pc.dim(` v${"1.3.10"}`));
           console.log();
           console.log(`  ${pc.green(">")} Local:   ${pc.cyan(localUrl)}`);
           if (networkUrl) {
@@ -1490,7 +1500,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.8"}`));
+  console.log(pc2.cyan("\n\u{1F528} nasti build") + pc2.dim(` v${"1.3.10"}`));
   console.log(pc2.dim(`  root: ${config.root}`));
   console.log(pc2.dim(`  mode: ${config.mode}`));
   const outDir = path10.resolve(config.root, config.build.outDir);
@@ -1710,6 +1720,6 @@ cli.command("preview [root]", "Preview production build").option("--port <port>"
   }
 });
 cli.help();
-cli.version("1.3.8");
+cli.version("1.3.10");
 cli.parse();
 //# sourceMappingURL=cli.js.map