@ecopages/core 0.2.0-alpha.45 → 0.2.0-alpha.47

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecopages/core",
-  "version": "0.2.0-alpha.45",
+  "version": "0.2.0-alpha.47",
   "description": "Core package for Ecopages",
   "keywords": [
     "ecopages",
@@ -17,7 +17,7 @@
     "directory": "packages/core"
   },
   "dependencies": {
-    "@ecopages/file-system": "0.2.0-alpha.45",
+    "@ecopages/file-system": "0.2.0-alpha.47",
     "@ecopages/logger": "^0.2.3",
     "@ecopages/scripts-injector": "^0.1.5",
     "@worker-tools/html-rewriter": "0.1.0-pre.19",

package/src/services/module-loading/node-bootstrap-plugin.js

@@ -46,6 +46,70 @@ function resolveRuntimePackageRoot(specifier, resolvedPath, parentPath) {
   const packageName = getPackageNameFromSpecifier(specifier);
   return findInstalledPackageDir(packageName, parentPath) ?? findPackageRoot(resolvedPath);
 }
+function isPackageExportedSubpath(specifier, resolvedPath, parentPath) {
+  const packageName = getPackageNameFromSpecifier(specifier);
+  if (specifier === packageName) {
+    return false;
+  }
+  const packageRoot = resolveRuntimePackageRoot(specifier, resolvedPath, parentPath);
+  const manifest = readPackageManifest(packageRoot);
+  if (!manifest?.exports || typeof manifest.exports !== "object" || Array.isArray(manifest.exports)) {
+    return false;
+  }
+  const subpath = `.${specifier.slice(packageName.length)}`;
+  return subpath in manifest.exports;
+}
+function getNodeExternalSpecifier(specifier, resolvedPath, parentPath) {
+  const packageName = getPackageNameFromSpecifier(specifier);
+  if (specifier === packageName) {
+    return specifier;
+  }
+  if (path.extname(specifier)) {
+    return specifier;
+  }
+  if (isPackageExportedSubpath(specifier, resolvedPath, parentPath)) {
+    return specifier;
+  }
+  for (const extension of [".js", ".mjs", ".cjs", ".json"]) {
+    const candidateSpecifier = `${specifier}${extension}`;
+    try {
+      const candidateResolvedPath = resolveSpecifier(candidateSpecifier, parentPath);
+      if (existsSync(candidateResolvedPath)) {
+        return candidateSpecifier;
+      }
+    } catch {
+    }
+  }
+  for (const candidatePath of [
+    resolvedPath,
+    ...[".js", ".mjs", ".cjs", ".json"].map((extension) => `${specifier}${extension}`)
+  ]) {
+    const candidateResolvedPath = candidatePath === resolvedPath ? resolvedPath : (() => {
+      try {
+        return resolveSpecifier(candidatePath, parentPath);
+      } catch {
+        return void 0;
+      }
+    })();
+    if (!candidateResolvedPath) {
+      continue;
+    }
+    if (!existsSync(candidateResolvedPath)) {
+      continue;
+    }
+    const resolvedExtension = path.extname(candidateResolvedPath);
+    if (![".js", ".mjs", ".cjs", ".json"].includes(resolvedExtension)) {
+      continue;
+    }
+    const packageRoot = resolveRuntimePackageRoot(specifier, candidateResolvedPath, parentPath);
+    const requestedSubpath = specifier.slice(packageName.length + 1);
+    const resolvedSubpath = path.relative(packageRoot, candidateResolvedPath);
+    if (resolvedSubpath === `${requestedSubpath}${resolvedExtension}`) {
+      return `${specifier}${resolvedExtension}`;
+    }
+  }
+  return specifier;
+}
 function ensureRuntimePackageLink(nodeModulesDir, specifier, resolvedPath, parentPath) {
   const packageName = getPackageNameFromSpecifier(specifier);
   const packageRoot = resolveRuntimePackageRoot(specifier, resolvedPath, parentPath);
@@ -256,7 +320,7 @@ function resolveNodeBootstrapDependency(args, options) {
   const resolvedPath = resolveSpecifier(args.path, resolveParent);
   ensureRuntimePackageLink(options.runtimeNodeModulesDir, args.path, resolvedPath, resolveParent);
   return {
-    path: args.path,
+    path: getNodeExternalSpecifier(args.path, resolvedPath, resolveParent),
     external: true
   };
 }