@nasti-toolchain/nasti 2.0.1 → 2.0.2

package/dist/index.js

@@ -2877,7 +2877,7 @@ async function build(inlineConfig = {}) {
   const startTime = performance.now();
   logger.info(
     pc4.cyan(`
-nasti v${"2.0.1"} `) + pc4.green(`building for ${config.mode}...`)
+nasti v${"2.0.2"} `) + pc4.green(`building for ${config.mode}...`)
   );
   debug4?.(`root: ${config.root}`);
   const buildableNames = Object.keys(config.environments).filter(
@@ -3406,15 +3406,15 @@ async function doBundlePackage(entryFile, root) {
   const externalBaseDir = path11.dirname(entryFile);
   code = code.replace(
     /^(import\b[^;'"]*?\bfrom\s+)(['"])([^'"./][^'"]*)(\2)/gm,
-    (_, prefix, q, spec) => `${prefix}${q}${externalSpecToModuleUrl(spec, externalBaseDir)}${q}`
+    (_, prefix, q, spec) => `${prefix}${q}${externalSpecToModuleUrl(spec, externalBaseDir, root)}${q}`
   ).replace(
     /^(export\b[^;'"]*?\bfrom\s+)(['"])([^'"./][^'"]*)(\2)/gm,
-    (_, prefix, q, spec) => `${prefix}${q}${externalSpecToModuleUrl(spec, externalBaseDir)}${q}`
+    (_, prefix, q, spec) => `${prefix}${q}${externalSpecToModuleUrl(spec, externalBaseDir, root)}${q}`
   ).replace(
     /^(import\s+)(['"])([^'"./][^'"]*)(\2)/gm,
-    (_, prefix, q, spec) => `${prefix}${q}${externalSpecToModuleUrl(spec, externalBaseDir)}${q}`
+    (_, prefix, q, spec) => `${prefix}${q}${externalSpecToModuleUrl(spec, externalBaseDir, root)}${q}`
   );
-  code = rewriteExternalRequires(code, externalBaseDir);
+  code = rewriteExternalRequires(code, externalBaseDir, root);
   if (code.includes("__commonJSMin")) {
     code = await injectCjsNamedExports(code, entryFile);
   }
@@ -3519,7 +3519,7 @@ function pickMainEntryByExtension(pkgDir, preferredExt) {
   }
   return null;
 }
-function rewriteExternalRequires(code, baseDir) {
+function rewriteExternalRequires(code, baseDir, root) {
   const pkgs = /* @__PURE__ */ new Set();
   const re = /__require\(["']([^"']+)["']\)/g;
   let m;
@@ -3531,7 +3531,7 @@ function rewriteExternalRequires(code, baseDir) {
   const imports = [];
   for (const pkg of pkgs) {
     const safe = pkg.replace(/[^a-zA-Z0-9_$]/g, "_");
-    imports.push(`import * as __ns_${safe} from "${externalSpecToModuleUrl(pkg, baseDir)}";`);
+    imports.push(`import * as __ns_${safe} from "${externalSpecToModuleUrl(pkg, baseDir, root)}";`);
     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}`);
@@ -3628,9 +3628,12 @@ function isUnderRoot(abs, root) {
   const rel = path11.relative(root, abs);
   return !!rel && !rel.startsWith("..") && !path11.isAbsolute(rel);
 }
-function externalSpecToModuleUrl(spec, baseDir) {
+function externalSpecToModuleUrl(spec, baseDir, root) {
   const resolved = resolveNodeModule(baseDir, spec);
-  return resolved ? `/@modules/${spec}?id=${encodeURIComponent(resolved)}` : `/@modules/${spec}`;
+  if (!resolved) return `/@modules/${spec}`;
+  const rootResolved = resolveNodeModule(root, spec);
+  if (rootResolved && rootResolved === resolved) return `/@modules/${spec}`;
+  return `/@modules/${spec}?id=${encodeURIComponent(resolved)}`;
 }
 function resolveNodeModule(baseDir, moduleName) {
   const resolved = resolveNodeModuleEntry(baseDir, moduleName);
@@ -4755,7 +4758,7 @@ async function createServer(inlineConfig = {}) {
           const readyIn = Math.ceil(performance.now() - startTime);
           logger.info(
             `
-  ${pc9.cyan(pc9.bold("NASTI"))} ${pc9.cyan(`v${"2.0.1"}`)}  ${pc9.dim("ready in")} ${pc9.bold(readyIn)} ${pc9.dim("ms")}
+  ${pc9.cyan(pc9.bold("NASTI"))} ${pc9.cyan(`v${"2.0.2"}`)}  ${pc9.dim("ready in")} ${pc9.bold(readyIn)} ${pc9.dim("ms")}
 `
           );
           printServerUrls(
@@ -4883,7 +4886,7 @@ async function buildElectron(inlineConfig = {}) {
   const config = await resolveConfig({ ...inlineConfig, target: "electron" }, "build");
   const startTime = performance.now();
   assertElectronVersion(config);
-  console.log(pc5.cyan("\n\u26A1 nasti build (electron)") + pc5.dim(` v${"2.0.1"}`));
+  console.log(pc5.cyan("\n\u26A1 nasti build (electron)") + pc5.dim(` v${"2.0.2"}`));
   console.log(pc5.dim(`  root: ${config.root}`));
   console.log(pc5.dim(`  mode: ${config.mode}`));
   console.log(pc5.dim(`  target: electron (\u2265 ${config.electron.minVersion})`));
@@ -5034,7 +5037,7 @@ async function startElectronDev(inlineConfig = {}) {
   const { noSpawn, ...rest } = inlineConfig;
   const config = await resolveConfig({ ...rest, target: "electron" }, "serve");
   warnElectronVersion(config);
-  console.log(pc10.cyan("\n\u26A1 nasti electron dev") + pc10.dim(` v${"2.0.1"}`));
+  console.log(pc10.cyan("\n\u26A1 nasti electron dev") + pc10.dim(` v${"2.0.2"}`));
   const { createServer: createServer2 } = await Promise.resolve().then(() => (init_server(), server_exports));
   const server = await createServer2({ ...rest, target: "electron" });
   await server.listen();