@ecopages/core 0.2.0-alpha.17 → 0.2.0-alpha.18

package/CHANGELOG.md

@@ -24,6 +24,7 @@ All notable changes to `@ecopages/core` are documented here.
 
 - Fixed mixed-integration page, layout, document, and component rendering to resolve foreign boundaries inside their owning renderer across the built-in integrations.
 - Fixed host/runtime module loading, published build-helper exports, asset output normalization, explicit render flows, and static or preview build stability across Bun, Node, Vite, and Nitro.
+- Fixed Node bootstrap runtime package linking to refresh dangling `.eco/node_modules` symlinks instead of failing with `EEXIST` during page transpilation.
 - Fixed request-time and static-generation page inspection to preserve integration-specific page loading without reusing the normal render module identity.
 - Fixed Node preview and static-generation React runtime resolution so app-owned page modules and server rendering share one React module identity.
 - Fixed Bun browser output normalization so batched multi-entrypoint HMR rebuilds match emitted files to their expected served paths instead of Bun output order.

package/package.json

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

package/src/services/module-loading/node-bootstrap-plugin.d.ts

@@ -16,7 +16,6 @@ export interface NodeBootstrapResolutionOptions {
      * package roots so transpiled Node imports share one package graph.
      */
     runtimeNodeModulesDir: string;
-    preserveImportMetaPaths?: string[];
 }
 /**
  * Builds the user-facing error for Bun-native imports that cannot run on the
@@ -40,6 +39,4 @@ export declare function createNodeBootstrapPlugin(options: NodeBootstrapResoluti
  * directory so transpiled server modules can externalize packages into one
  * stable runtime node_modules graph.
  */
-export declare function createAppNodeBootstrapPlugin(appConfig: Pick<EcoPagesAppConfig, 'rootDir' | 'workDir' | 'absolutePaths'>, options?: {
-    preserveImportMetaPaths?: string[];
-}): EcoBuildPlugin;
+export declare function createAppNodeBootstrapPlugin(appConfig: Pick<EcoPagesAppConfig, 'rootDir' | 'workDir' | 'absolutePaths'>): EcoBuildPlugin;

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

@@ -1,5 +1,5 @@
 import path from "node:path";
-import { existsSync, mkdirSync, readFileSync, realpathSync, rmSync, symlinkSync } from "node:fs";
+import { existsSync, lstatSync, mkdirSync, readFileSync, realpathSync, rmSync, symlinkSync } from "node:fs";
 import { createRequire } from "node:module";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { resolveInternalExecutionDir } from "../../utils/resolve-work-dir.js";
@@ -27,18 +27,44 @@ function findPackageRoot(resolvedPath) {
     currentPath = parentPath;
   }
 }
+function pathEntryExists(filePath) {
+  try {
+    lstatSync(filePath);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function linkPointsToPackage(linkPath, packageRoot) {
+  try {
+    return realpathSync(linkPath) === realpathSync(packageRoot);
+  } catch {
+    return false;
+  }
+}
 function ensureRuntimePackageLink(nodeModulesDir, specifier, resolvedPath) {
   const packageName = getPackageNameFromSpecifier(specifier);
   const packageRoot = findPackageRoot(resolvedPath);
   const linkPath = path.join(nodeModulesDir, packageName);
-  if (existsSync(linkPath)) {
-    if (realpathSync(linkPath) === realpathSync(packageRoot)) {
+  mkdirSync(path.dirname(linkPath), { recursive: true });
+  if (pathEntryExists(linkPath)) {
+    if (linkPointsToPackage(linkPath, packageRoot)) {
       return;
     }
     rmSync(linkPath, { recursive: true, force: true });
   }
-  mkdirSync(path.dirname(linkPath), { recursive: true });
-  symlinkSync(packageRoot, linkPath, "dir");
+  try {
+    symlinkSync(packageRoot, linkPath, "dir");
+  } catch (error) {
+    if (error.code !== "EEXIST") {
+      throw error;
+    }
+    if (linkPointsToPackage(linkPath, packageRoot)) {
+      return;
+    }
+    rmSync(linkPath, { recursive: true, force: true });
+    symlinkSync(packageRoot, linkPath, "dir");
+  }
 }
 function getNodeUnsupportedBuiltinError(specifier, importer) {
   return `Node bootstrap transpilation does not support Bun builtin specifier ${JSON.stringify(specifier)}${importer ? ` imported from ${importer}` : ""}.`;
@@ -86,26 +112,6 @@ function getBootstrapBuildLoaderForPath(filePath) {
       return "js";
   }
 }
-const REEXPORT_FROM_STATEMENT_PATTERN = /^\s*export\s+(?!type\b)(?:\*|\{[\s\S]*?\})\s+from\s+(['"][^'"]+['"])\s*;?\s*$/gm;
-function injectBootstrapReexportImports(source) {
-  const sideEffectImports = [];
-  const importedSpecifiers = /* @__PURE__ */ new Set();
-  let importIndex = 0;
-  const rewrittenSource = source.replace(REEXPORT_FROM_STATEMENT_PATTERN, (statement, specifierLiteral) => {
-    if (!importedSpecifiers.has(specifierLiteral)) {
-      importedSpecifiers.add(specifierLiteral);
-      const importBinding = `__eco_bootstrap_reexport_${importIndex++}`;
-      sideEffectImports.push(`import * as ${importBinding} from ${specifierLiteral};`);
-      sideEffectImports.push(`void ${importBinding};`);
-    }
-    return statement;
-  });
-  if (sideEffectImports.length === 0) {
-    return source;
-  }
-  return `${sideEffectImports.join("\n")}
-${rewrittenSource}`;
-}
 function shouldRewriteBootstrapSource(filePath, projectDir) {
   const normalizedPath = path.resolve(filePath);
   const normalizedProjectDir = path.resolve(projectDir);
@@ -154,9 +160,6 @@ function resolveNodeBootstrapDependency(args, options) {
 }
 function createNodeBootstrapPlugin(options) {
   const projectDir = path.resolve(options.projectDir);
-  const importMetaRewritePaths = new Set(
-    (options.preserveImportMetaPaths ?? []).map((filePath) => path.resolve(filePath))
-  );
   return {
     name: "node-bootstrap-plugin",
     setup(build) {
@@ -165,20 +168,12 @@ function createNodeBootstrapPlugin(options) {
       });
       build.onLoad({ filter: /\.[cm]?[jt]sx?$/ }, async (args) => {
         const absolutePath = path.resolve(args.path);
-        const isProjectSource = shouldRewriteBootstrapSource(absolutePath, projectDir);
-        const shouldPreserveImportMeta = isProjectSource || importMetaRewritePaths.has(absolutePath);
-        const shouldRewriteReexports = isProjectSource;
-        if (!shouldPreserveImportMeta && !shouldRewriteReexports) {
+        const shouldRewriteImportMeta = shouldRewriteBootstrapSource(absolutePath, projectDir);
+        if (!shouldRewriteImportMeta) {
           return void 0;
         }
         const originalContents = readFileSync(args.path, "utf8");
-        let contents = originalContents;
-        if (shouldPreserveImportMeta) {
-          contents = contents.replaceAll("import.meta.dirname", JSON.stringify(path.dirname(args.path))).replaceAll("import.meta.filename", JSON.stringify(args.path));
-        }
-        if (shouldRewriteReexports) {
-          contents = injectBootstrapReexportImports(contents);
-        }
+        const contents = originalContents.replaceAll("import.meta.dirname", JSON.stringify(path.dirname(args.path))).replaceAll("import.meta.filename", JSON.stringify(args.path));
         if (contents === originalContents) {
           return void 0;
         }
@@ -194,11 +189,10 @@ function createNodeBootstrapPlugin(options) {
     }
   };
 }
-function createAppNodeBootstrapPlugin(appConfig, options) {
+function createAppNodeBootstrapPlugin(appConfig) {
   return createNodeBootstrapPlugin({
     projectDir: appConfig.rootDir,
-    runtimeNodeModulesDir: getAppRuntimeNodeModulesDir(appConfig),
-    preserveImportMetaPaths: options?.preserveImportMetaPaths
+    runtimeNodeModulesDir: getAppRuntimeNodeModulesDir(appConfig)
   });
 }
 export {