@ecopages/core 0.2.0-beta.6 → 0.2.0-beta.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecopages/core",
-  "version": "0.2.0-beta.6",
+  "version": "0.2.0-beta.7",
   "description": "Core package for Ecopages",
   "keywords": [
     "ecopages",
@@ -17,7 +17,7 @@
     "directory": "packages/core"
   },
   "dependencies": {
-    "@ecopages/file-system": "0.2.0-beta.6",
+    "@ecopages/file-system": "0.2.0-beta.7",
     "@ecopages/logger": "^0.2.3",
     "@ecopages/scripts-injector": "^0.1.5",
     "@oxc-project/runtime": "0.134.0",

package/src/adapters/shared/server-static-builder.d.ts

@@ -55,7 +55,6 @@ export declare class ServerStaticBuilder {
     private readonly previewServerFactory;
     private readonly entryFile;
     constructor({ appConfig, staticSiteGenerator, serveOptions, apiHandlers, logger, previewServerFactory, entryFile, }: ServerStaticBuilderParams);
-    private warnApiHandlersUnavailableInStaticMode;
     private prepareExportDirectory;
     private refreshRuntimeAssets;
     /**

package/src/adapters/shared/server-static-builder.js

@@ -30,21 +30,6 @@ class ServerStaticBuilder {
     this.previewServerFactory = previewServerFactory ?? StaticContentServer;
     this.entryFile = resolveEntryFile({ entryFile });
   }
-  warnApiHandlersUnavailableInStaticMode() {
-    if (this.apiHandlers.length === 0) {
-      return;
-    }
-    const uniqueHandlers = Array.from(
-      new Set(this.apiHandlers.map((handler) => `${handler.method} ${handler.path}`))
-    );
-    const visibleHandlers = uniqueHandlers.slice(0, 5).join(", ");
-    const remainingCount = uniqueHandlers.length - Math.min(uniqueHandlers.length, 5);
-    const summary = remainingCount > 0 ? `${visibleHandlers}, +${remainingCount} more` : visibleHandlers;
-    this.logger.warn(
-      "Registered API endpoints are not available in static build or preview modes because no server runtime is started. They are excluded from the generated output.\n",
-      `\u27A4 ${summary}`
-    );
-  }
   prepareExportDirectory() {
     const exportDir = this.appConfig.absolutePaths?.distDir ?? path.join(this.appConfig.rootDir, this.appConfig.distDir);
     fileSystem.ensureDir(exportDir, true);
@@ -131,7 +116,6 @@ ${errorMessages}`);
   async build(options, dependencies) {
     const { preview = false, baseUrl: explicitBaseUrl } = options ?? {};
     const baseUrl = explicitBaseUrl ?? `http://${this.serveOptions.hostname || DEFAULT_ECOPAGES_HOSTNAME}:${this.serveOptions.port || DEFAULT_ECOPAGES_PORT}`;
-    this.warnApiHandlersUnavailableInStaticMode();
     this.prepareExportDirectory();
     await this.refreshRuntimeAssets();
     await this.bundleServerEntry();

package/src/build/rolldown-adapter-helpers.js

@@ -1,10 +1,41 @@
 import { createRequire } from "node:module";
+import { readFileSync } from "node:fs";
 import path from "node:path";
 import { collectBrowserRuntimeImportRewriteMap, rewriteBrowserRuntimeImports } from "./browser-runtime-plugin.js";
 import { createServerSideCssShimPlugin } from "./server-side-css-shim-plugin.js";
 import { createRolldownPluginBridge } from "./rolldown-plugin-bridge.js";
-import { isDeclaredAppPackageImport, normalizeNodeRuntimeBuildOutputs } from "./runtime-build-output-normalizer.js";
+import {
+  isDeclaredAppPackageImport,
+  isWorkspacePackageImport,
+  normalizeNodeRuntimeBuildOutputs
+} from "./runtime-build-output-normalizer.js";
 const corePackageRequire = createRequire(new URL("../../package.json", import.meta.url));
+let corePackageNames;
+function getCorePackageNames() {
+  if (corePackageNames) {
+    return corePackageNames;
+  }
+  const packageJsonPath = new URL("../../package.json", import.meta.url);
+  corePackageNames = /* @__PURE__ */ new Set();
+  try {
+    const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
+    for (const field of ["dependencies", "devDependencies", "peerDependencies", "optionalDependencies"]) {
+      const entries = packageJson[field];
+      if (!entries || typeof entries !== "object") {
+        continue;
+      }
+      for (const name of Object.keys(entries)) {
+        corePackageNames.add(name);
+      }
+    }
+  } catch {
+  }
+  return corePackageNames;
+}
+function isCoreDeclaredPackageImport(specifier) {
+  const name = specifier.startsWith("@") ? specifier.split("/").slice(0, 2).join("/") : specifier.split("/")[0] ?? specifier;
+  return getCorePackageNames().has(name);
+}
 function transpileProfileToOptions(profile) {
   switch (profile) {
     case "browser-script":
@@ -37,13 +68,21 @@ function getAppRootRequire(cache, contextRoot) {
   return req;
 }
 function shouldBundlePackageImport(id, contextRoot, appRootRequireCache) {
+  if (isWorkspacePackageImport(id, contextRoot)) {
+    return true;
+  }
   if (isDeclaredAppPackageImport(id, contextRoot)) {
     const appRootRequire = getAppRootRequire(appRootRequireCache, contextRoot);
     const appResolvedPath = tryResolveModule(id, appRootRequire);
     return Boolean(appResolvedPath && /\.(?:[cm]?ts|tsx|jsx)$/u.test(appResolvedPath));
   }
-  const coreResolvedPath = tryResolveModule(id, corePackageRequire);
-  return Boolean(coreResolvedPath && /\.(?:[cm]?ts|tsx|jsx)$/u.test(coreResolvedPath));
+  if (isCoreDeclaredPackageImport(id)) {
+    const coreResolvedPath = tryResolveModule(id, corePackageRequire);
+    if (coreResolvedPath && !/\.(?:[cm]?ts|tsx|jsx)$/u.test(coreResolvedPath)) {
+      return false;
+    }
+  }
+  return true;
 }
 function createExternalMatcher(options, appRootRequireCache) {
   const explicitExternals = new Set(options.external ?? []);

package/src/build/runtime-build-output-normalizer.d.ts

@@ -1,3 +1,10 @@
+/**
+ * Returns true if the given specifier is a workspace package.
+ *
+ * Workspace packages are declared with the `workspace:` protocol and are
+ * typically source-only, requiring bundling rather than externalization.
+ */
+export declare function isWorkspacePackageImport(specifier: string, rootDir: string): boolean;
 export declare function isDeclaredAppPackageImport(specifier: string, rootDir: string): boolean;
 export declare function normalizeNodeRuntimeBuildOutputFile(filePath: string, rootDir: string): void;
 export declare function normalizeNodeRuntimeBuildOutputs(outputPaths: string[], rootDir: string): void;

package/src/build/runtime-build-output-normalizer.js

@@ -4,6 +4,7 @@ import path from "node:path";
 import { pathToFileURL } from "node:url";
 const corePackageRequire = createRequire(new URL("../../package.json", import.meta.url));
 const appDeclaredPackageCache = /* @__PURE__ */ new Map();
+const appWorkspacePackageCache = /* @__PURE__ */ new Map();
 const CORE_RUNTIME_BARE_SPECIFIER_PACKAGES = /* @__PURE__ */ new Set(["ws"]);
 function tryResolveRuntimeImport(specifier, resolver) {
   try {
@@ -15,6 +16,24 @@ function tryResolveRuntimeImport(specifier, resolver) {
 function isBareRuntimeImport(specifier) {
   return !specifier.startsWith(".") && !path.isAbsolute(specifier) && !specifier.startsWith("/") && !specifier.startsWith("node:") && !specifier.startsWith("@/") && !specifier.startsWith("~/") && !specifier.startsWith("#") && !specifier.includes(":");
 }
+function extractPackageNameFromFileUrl(specifier) {
+  if (!specifier.startsWith("file://")) {
+    return void 0;
+  }
+  const lastNodeModulesIndex = specifier.lastIndexOf("/node_modules/");
+  if (lastNodeModulesIndex === -1) {
+    return void 0;
+  }
+  const afterNodeModules = specifier.slice(lastNodeModulesIndex + "/node_modules/".length);
+  const parts = afterNodeModules.split("/");
+  if (parts.length === 0) {
+    return void 0;
+  }
+  if (parts[0]?.startsWith("@") && parts.length > 1) {
+    return `${parts[0]}/${parts[1]}`;
+  }
+  return parts[0];
+}
 function getPackageNameFromSpecifier(specifier) {
   if (specifier.startsWith("@")) {
     return specifier.split("/").slice(0, 2).join("/");
@@ -47,6 +66,37 @@ function getDeclaredAppPackages(rootDir) {
   appDeclaredPackageCache.set(cacheKey, declaredPackages);
   return declaredPackages;
 }
+function getWorkspacePackages(rootDir) {
+  const cacheKey = path.resolve(rootDir);
+  const cached = appWorkspacePackageCache.get(cacheKey);
+  if (cached) {
+    return cached;
+  }
+  const packageJsonPath = path.resolve(rootDir, "package.json");
+  const workspacePackages = /* @__PURE__ */ new Set();
+  try {
+    const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
+    for (const field of ["dependencies", "devDependencies", "peerDependencies", "optionalDependencies"]) {
+      const entries = packageJson[field];
+      if (!entries || typeof entries !== "object") {
+        continue;
+      }
+      for (const [packageName, version] of Object.entries(entries)) {
+        if (typeof version === "string" && version.startsWith("workspace:")) {
+          workspacePackages.add(packageName);
+        }
+      }
+    }
+  } catch {
+    appWorkspacePackageCache.set(cacheKey, workspacePackages);
+    return workspacePackages;
+  }
+  appWorkspacePackageCache.set(cacheKey, workspacePackages);
+  return workspacePackages;
+}
+function isWorkspacePackageImport(specifier, rootDir) {
+  return getWorkspacePackages(rootDir).has(getPackageNameFromSpecifier(specifier));
+}
 function isDeclaredAppPackageImport(specifier, rootDir) {
   return getDeclaredAppPackages(rootDir).has(getPackageNameFromSpecifier(specifier));
 }
@@ -75,6 +125,23 @@ function rewriteRuntimeBuildOutputImports(code, rootDir) {
     const rewrittenSpecifier = rewriteRuntimeImportSpecifier(specifier, quote, rootDir);
     return `${prefix}${rewrittenSpecifier ?? `${quote}${specifier}${quote}`}`;
   };
+  const rewriteFileUrl = (prefix, quote, specifier) => {
+    const packageName = extractPackageNameFromFileUrl(specifier);
+    if (!packageName) {
+      return `${prefix}${quote}${specifier}${quote}`;
+    }
+    if (!isDeclaredInResolutionChain(packageName, rootDir)) {
+      return `${prefix}${quote}${specifier}${quote}`;
+    }
+    const lastNodeModulesIndex = specifier.lastIndexOf("/node_modules/");
+    if (lastNodeModulesIndex === -1) {
+      return `${prefix}${quote}${specifier}${quote}`;
+    }
+    const afterNodeModules = specifier.slice(lastNodeModulesIndex + "/node_modules/".length);
+    const afterPackage = afterNodeModules.slice(packageName.length);
+    const bareSpecifier = packageName + afterPackage;
+    return `${prefix}${quote}${bareSpecifier}${quote}`;
+  };
   const withResolvedPackages = code.replace(
     /(\bfrom\s+)(['"])([^'"\\]+)\2/g,
     (_match, prefix, quote, specifier) => rewriteSpecifier(prefix, quote, specifier)
@@ -85,7 +152,17 @@ function rewriteRuntimeBuildOutputImports(code, rootDir) {
     /(\bimport\s*\(\s*)(['"])([^'"\\]+)\2/g,
     (_match, prefix, quote, specifier) => rewriteSpecifier(prefix, quote, specifier)
   );
-  return withResolvedPackages.replace(
+  const withBareSpecifiers = withResolvedPackages.replace(
+    /(\bfrom\s+)(['"])(file:\/\/[^'"\\]+)\2/g,
+    (_match, prefix, quote, specifier) => rewriteFileUrl(prefix, quote, specifier)
+  ).replace(
+    /(\bimport\s+)(['"])(file:\/\/[^'"\\]+)\2/g,
+    (_match, prefix, quote, specifier) => rewriteFileUrl(prefix, quote, specifier)
+  ).replace(
+    /(\bimport\s*\(\s*)(['"])(file:\/\/[^'"\\]+)\2/g,
+    (_match, prefix, quote, specifier) => rewriteFileUrl(prefix, quote, specifier)
+  );
+  return withBareSpecifiers.replace(
     /(['"])(@oxc-project\/runtime\/(?:helpers(?:\/esm)?\/[^'"\\]+))\1/g,
     (match, quote, specifier) => {
       const resolvedPath = tryResolveRuntimeImport(specifier, corePackageRequire);
@@ -94,6 +171,9 @@ function rewriteRuntimeBuildOutputImports(code, rootDir) {
   );
 }
 function normalizeNodeRuntimeBuildOutputFile(filePath, rootDir) {
+  if (process.env.ECOPAGES_LOGGER_DEBUG === "true") {
+    console.log(`[normalizeNodeRuntimeBuildOutputFile] Checking ${filePath}`);
+  }
   if (!/\.(?:[cm]?js)$/u.test(filePath)) {
     return;
   }
@@ -104,6 +184,9 @@ function normalizeNodeRuntimeBuildOutputFile(filePath, rootDir) {
   const code = fileSystem.readFileSync(filePath, "utf-8");
   const rewritten = rewriteRuntimeBuildOutputImports(code, rootDir);
   if (rewritten !== code) {
+    if (process.env.ECOPAGES_LOGGER_DEBUG === "true") {
+      console.log(`[normalizeNodeRuntimeBuildOutputFile] Rewriting ${filePath}`);
+    }
     fileSystem.writeFileSync(filePath, rewritten);
   }
 }
@@ -114,6 +197,7 @@ function normalizeNodeRuntimeBuildOutputs(outputPaths, rootDir) {
 }
 export {
   isDeclaredAppPackageImport,
+  isWorkspacePackageImport,
   normalizeNodeRuntimeBuildOutputFile,
   normalizeNodeRuntimeBuildOutputs
 };

package/src/static-site-generator/static-site-generator.d.ts

@@ -34,19 +34,7 @@ export declare class StaticSiteGenerator {
         appConfig: EcoPagesAppConfig;
     });
     private getExportDir;
-    /**
-     * Logs the standardized warning emitted when a dynamic-cache page is skipped.
-     */
-    private warnDynamicPageSkipped;
-    /**
-     * Determines whether one filesystem-discovered page should be excluded from
-     * static generation.
-     */
     private shouldSkipStaticPageFile;
-    /**
-     * Determines whether one explicit static route view should be excluded from
-     * static generation.
-     */
     private shouldSkipStaticView;
     /**
      * Writes the robots.txt file declared by the app config.
@@ -71,7 +59,7 @@ export declare class StaticSiteGenerator {
      * issuing a request against the running server origin. Render-strategy routes
      * go through the normal route renderer directly.
      */
-    generateStaticPages(router: StaticGenerationRouteSource, baseUrl: string, routeRendererFactory?: StaticPageRouteRendererFactory): Promise<void>;
+    generateStaticPages(router: StaticGenerationRouteSource, baseUrl: string, routeRendererFactory?: StaticPageRouteRendererFactory, skipped?: string[]): Promise<void>;
     private resolveStaticFetchUrl;
     /**
      * Executes the full static-generation workflow for one app run.

package/src/static-site-generator/static-site-generator.js

@@ -21,39 +21,14 @@ class StaticSiteGenerator {
   getExportDir() {
     return this.appConfig.absolutePaths?.distDir ?? path.join(this.appConfig.rootDir, this.appConfig.distDir);
   }
-  /**
-   * Logs the standardized warning emitted when a dynamic-cache page is skipped.
-   */
-  warnDynamicPageSkipped(filePath) {
-    appLogger.warn(
-      "Pages with cache: 'dynamic' are not supported in static generation or preview, so they will be skipped\n",
-      `\u27A4 ${filePath}`
-    );
-  }
-  /**
-   * Determines whether one filesystem-discovered page should be excluded from
-   * static generation.
-   */
   async shouldSkipStaticPageFile(filePath, routeRendererFactory) {
     const module = await routeRendererFactory.getPageRenderer(filePath).loadPageModule(filePath, {
       cacheScope: "static-page-probe"
     });
-    if (module.default?.cache !== "dynamic") {
-      return false;
-    }
-    this.warnDynamicPageSkipped(filePath);
-    return true;
+    return module.default?.cache === "dynamic";
   }
-  /**
-   * Determines whether one explicit static route view should be excluded from
-   * static generation.
-   */
-  shouldSkipStaticView(routePath, view) {
-    if (view.cache !== "dynamic") {
-      return false;
-    }
-    this.warnDynamicPageSkipped(routePath);
-    return true;
+  shouldSkipStaticView(_routePath, view) {
+    return view.cache === "dynamic";
   }
   /**
    * Writes the robots.txt file declared by the app config.
@@ -105,7 +80,7 @@ class StaticSiteGenerator {
     const integration = this.appConfig.integrations.find((plugin) => plugin.extensions.includes(ext));
     return integration?.staticBuildStep || "render";
   }
-  async createFilesystemStaticContents(route, baseUrl, routeRendererFactory) {
+  async createFilesystemStaticContents(route, baseUrl, routeRendererFactory, skipped) {
     const {
       templateRoute: { filePath },
       params
@@ -123,6 +98,7 @@ class StaticSiteGenerator {
       throw new Error(STATIC_SITE_GENERATOR_ERRORS.ROUTE_RENDERER_FACTORY_REQUIRED);
     }
     if (await this.shouldSkipStaticPageFile(filePath, routeRendererFactory)) {
+      skipped?.push(filePath);
       return null;
     }
     const renderer = routeRendererFactory.getPageRenderer(filePath);
@@ -147,7 +123,7 @@ class StaticSiteGenerator {
    * issuing a request against the running server origin. Render-strategy routes
    * go through the normal route renderer directly.
    */
-  async generateStaticPages(router, baseUrl, routeRendererFactory) {
+  async generateStaticPages(router, baseUrl, routeRendererFactory, skipped) {
     const routes = await router.listStaticGenerationRoutes({ runtimeOrigin: baseUrl });
     appLogger.debug(
       "Static Pages",
@@ -156,7 +132,12 @@ class StaticSiteGenerator {
     const directories = this.getDirectories(routes.map((route) => route.requestUrl));
     for (const route of routes) {
       try {
-        const contents = await this.createFilesystemStaticContents(route, baseUrl, routeRendererFactory);
+        const contents = await this.createFilesystemStaticContents(
+          route,
+          baseUrl,
+          routeRendererFactory,
+          skipped
+        );
         if (contents === null) {
           continue;
         }
@@ -189,17 +170,24 @@ class StaticSiteGenerator {
     routeRendererFactory,
     staticRoutes
   }) {
+    const skippedDynamicPages = [];
     this.generateRobotsTxt();
-    await this.generateStaticPages(router, baseUrl, routeRendererFactory);
+    await this.generateStaticPages(router, baseUrl, routeRendererFactory, skippedDynamicPages);
     if (staticRoutes && staticRoutes.length > 0 && routeRendererFactory) {
-      await this.generateExplicitStaticPages(staticRoutes, routeRendererFactory);
+      await this.generateExplicitStaticPages(staticRoutes, routeRendererFactory, skippedDynamicPages);
+    }
+    if (skippedDynamicPages.length > 0) {
+      appLogger.debug(
+        `Skipped ${skippedDynamicPages.length} page(s) with cache: 'dynamic' (not supported in static generation)`,
+        skippedDynamicPages
+      );
     }
   }
   /**
    * Generates static pages from explicit static routes registered via app.static().
    * These routes use eco.page views via loader functions for HMR support.
    */
-  async generateExplicitStaticPages(staticRoutes, routeRendererFactory) {
+  async generateExplicitStaticPages(staticRoutes, routeRendererFactory, skipped) {
     appLogger.debug(
       "Generating explicit static routes",
       staticRoutes.map((r) => r.path)
@@ -209,6 +197,7 @@ class StaticSiteGenerator {
         const mod = await route.loader();
         const view = mod.default;
         if (this.shouldSkipStaticView(route.path, view)) {
+          skipped?.push(route.path);
           continue;
         }
         await this.generateExplicitStaticRoute(route.path, view, routeRendererFactory);