astro 2.5.0 → 2.5.1

package/dist/content/types-generator.js

@@ -49,14 +49,22 @@ async function createContentTypesGenerator({
       fs: {
         readdir: fs.readdir.bind(fs),
         readdirSync: fs.readdirSync.bind(fs)
-      }
+      },
+      onlyFiles: false,
+      objectMode: true
     });
-    const entries = globResult.map((e) => new URL(e, contentPaths.contentDir)).filter(
-      // Config loading handled first. Avoid running twice.
-      (e) => !e.href.startsWith(contentPaths.config.url.href)
-    );
-    for (const entry of entries) {
-      events.push({ type: { name: "add", entry }, opts: { logLevel: "warn" } });
+    for (const entry of globResult) {
+      const entryURL = new URL(entry.path, contentPaths.contentDir);
+      if (entryURL.href.startsWith(contentPaths.config.url.href))
+        continue;
+      if (entry.dirent.isFile()) {
+        events.push({
+          type: { name: "add", entry: entryURL },
+          opts: { logLevel: "warn" }
+        });
+      } else if (entry.dirent.isDirectory()) {
+        events.push({ type: { name: "addDir", entry: entryURL }, opts: { logLevel: "warn" } });
+      }
     }
     await runEvents();
     return { typesGenerated: true };
@@ -416,9 +424,9 @@ function warnNonexistentCollections({
       warn(
         logging,
         "content",
-        `${JSON.stringify(
+        `The ${JSON.stringify(
           configuredCollection
-        )} is not a collection. Check your content config for typos.`
+        )} collection does not have an associated folder in your \`content\` directory. Make sure the folder exists, or check your content config for typos.`
       );
     }
   }

package/dist/core/app/index.js

@@ -115,13 +115,13 @@ class App {
     if (routeData.route === "/404") {
       defaultStatus = 404;
     }
-    let mod = this.#manifest.pageMap.get(routeData.component);
+    let mod = await this.#manifest.pageMap.get(routeData.component)();
     if (routeData.type === "page") {
       let response = await this.#renderPage(request, routeData, mod, defaultStatus);
       if (response.status === 500) {
         const fiveHundredRouteData = matchRoute("/500", this.#manifestData);
         if (fiveHundredRouteData) {
-          mod = this.#manifest.pageMap.get(fiveHundredRouteData.component);
+          mod = await this.#manifest.pageMap.get(fiveHundredRouteData.component)();
           try {
             let fiveHundredResponse = await this.#renderPage(
               request,

package/dist/core/app/types.d.ts

@@ -24,6 +24,7 @@ export interface RouteInfo {
 export type SerializedRouteInfo = Omit<RouteInfo, 'routeData'> & {
     routeData: SerializedRouteData;
 };
+type ImportComponentInstance = () => Promise<ComponentInstance>;
 export interface SSRManifest {
     adapterName: string;
     routes: RouteInfo[];
@@ -31,7 +32,7 @@ export interface SSRManifest {
     base?: string;
     assetsPrefix?: string;
     markdown: MarkdownRenderingOptions;
-    pageMap: Map<ComponentPath, ComponentInstance>;
+    pageMap: Map<ComponentPath, ImportComponentInstance>;
     renderers: SSRLoadedRenderer[];
     /**
      * Map of directive name (e.g. `load`) to the directive script code
@@ -49,3 +50,4 @@ export type SerializedSSRManifest = Omit<SSRManifest, 'routes' | 'assets' | 'com
     clientDirectives: [string, string][];
 };
 export type AdapterCreateExports<T = any> = (manifest: SSRManifest, args?: T) => Record<string, any>;
+export {};

package/dist/core/build/generate.js

@@ -115,13 +115,14 @@ async function generatePage(opts, internals, pageData, ssrEntry, builtPaths) {
   const linkIds = [];
   const scripts = (pageInfo == null ? void 0 : pageInfo.hoistedScript) ?? null;
   const styles = pageData.styles.sort(cssOrder).map(({ sheet }) => sheet).reduce(mergeInlineCss, []);
-  const pageModule = (_a = ssrEntry.pageMap) == null ? void 0 : _a.get(pageData.component);
+  const pageModulePromise = (_a = ssrEntry.pageMap) == null ? void 0 : _a.get(pageData.component);
   const middleware = ssrEntry.middleware;
-  if (!pageModule) {
+  if (!pageModulePromise) {
     throw new Error(
       `Unable to find the module for ${pageData.component}. This is unexpected and likely a bug in Astro, please report.`
     );
   }
+  const pageModule = await pageModulePromise();
   if (shouldSkipDraft(pageModule, opts.settings)) {
     info(opts.logging, null, `${magenta("\u26A0\uFE0F")}  Skipping draft ${pageData.route.component}`);
     return;

package/dist/core/build/graph.js

@@ -25,7 +25,7 @@ function* walkParentInfos(id, ctx, until, depth = 0, order = 0, seen = /* @__PUR
   }
 }
 function moduleIsTopLevelPage(info) {
-  return info.importers[0] === resolvedPagesVirtualModuleId;
+  return info.importers[0] === resolvedPagesVirtualModuleId || info.dynamicImporters[0] == resolvedPagesVirtualModuleId;
 }
 function* getTopLevelPages(id, ctx) {
   for (const res of walkParentInfos(id, ctx)) {

package/dist/core/build/plugins/index.js

@@ -6,6 +6,7 @@ import { pluginComponentEntry } from "./plugin-component-entry.js";
 import { pluginCSS } from "./plugin-css.js";
 import { pluginHoistedScripts } from "./plugin-hoisted-scripts.js";
 import { pluginInternals } from "./plugin-internals.js";
+import { pluginMiddleware } from "./plugin-middleware.js";
 import { pluginPages } from "./plugin-pages.js";
 import { pluginPrerender } from "./plugin-prerender.js";
 import { pluginSSR } from "./plugin-ssr.js";
@@ -14,6 +15,7 @@ function registerAllPlugins({ internals, options, register }) {
   register(pluginAliasResolve(internals));
   register(pluginAnalyzer(internals));
   register(pluginInternals(internals));
+  register(pluginMiddleware(options, internals));
   register(pluginPages(options, internals));
   register(pluginCSS(options, internals));
   register(astroHeadBuildPlugin(options, internals));

package/dist/core/build/plugins/plugin-middleware.d.ts

@@ -0,0 +1,8 @@
+import type { Plugin as VitePlugin } from 'vite';
+import type { BuildInternals } from '../internal.js';
+import type { AstroBuildPlugin } from '../plugin';
+import type { StaticBuildOptions } from '../types';
+export declare const MIDDLEWARE_MODULE_ID = "@astro-middleware";
+export declare const RESOLVED_MIDDLEWARE_MODULE_ID = "\0@astro-middleware";
+export declare function vitePluginMiddleware(opts: StaticBuildOptions, _internals: BuildInternals): VitePlugin;
+export declare function pluginMiddleware(opts: StaticBuildOptions, internals: BuildInternals): AstroBuildPlugin;

package/dist/core/build/plugins/plugin-middleware.js

@@ -0,0 +1,53 @@
+import { MIDDLEWARE_PATH_SEGMENT_NAME } from "../../constants.js";
+import { addRollupInput } from "../add-rollup-input.js";
+const MIDDLEWARE_MODULE_ID = "@astro-middleware";
+const RESOLVED_MIDDLEWARE_MODULE_ID = "\0@astro-middleware";
+let inputs = /* @__PURE__ */ new Set();
+function vitePluginMiddleware(opts, _internals) {
+  return {
+    name: "@astro/plugin-middleware",
+    options(options) {
+      if (opts.settings.config.experimental.middleware) {
+        return addRollupInput(options, [MIDDLEWARE_MODULE_ID]);
+      }
+    },
+    resolveId(id) {
+      if (id === MIDDLEWARE_MODULE_ID && opts.settings.config.experimental.middleware) {
+        return RESOLVED_MIDDLEWARE_MODULE_ID;
+      }
+    },
+    async load(id) {
+      if (id === RESOLVED_MIDDLEWARE_MODULE_ID && opts.settings.config.experimental.middleware) {
+        const imports = [];
+        const exports = [];
+        let middlewareId = await this.resolve(
+          `${opts.settings.config.srcDir.pathname}/${MIDDLEWARE_PATH_SEGMENT_NAME}`
+        );
+        if (middlewareId) {
+          imports.push(`import { onRequest } from "${middlewareId.id}"`);
+          exports.push(`export { onRequest }`);
+        }
+        const result = [imports.join("\n"), exports.join("\n")];
+        return result.join("\n");
+      }
+    }
+  };
+}
+function pluginMiddleware(opts, internals) {
+  return {
+    build: "ssr",
+    hooks: {
+      "build:before": () => {
+        return {
+          vitePlugin: vitePluginMiddleware(opts, internals)
+        };
+      }
+    }
+  };
+}
+export {
+  MIDDLEWARE_MODULE_ID,
+  RESOLVED_MIDDLEWARE_MODULE_ID,
+  pluginMiddleware,
+  vitePluginMiddleware
+};

package/dist/core/build/plugins/plugin-pages.js

@@ -1,7 +1,7 @@
 import { pagesVirtualModuleId, resolvedPagesVirtualModuleId } from "../../app/index.js";
-import { MIDDLEWARE_PATH_SEGMENT_NAME } from "../../constants.js";
 import { addRollupInput } from "../add-rollup-input.js";
 import { eachPageData } from "../internal.js";
+import { MIDDLEWARE_MODULE_ID } from "./plugin-middleware.js";
 function vitePluginPages(opts, internals) {
   return {
     name: "@astro/plugin-build-pages",
@@ -17,18 +17,14 @@ function vitePluginPages(opts, internals) {
     },
     async load(id) {
       if (id === resolvedPagesVirtualModuleId) {
-        let middlewareId = null;
-        if (opts.settings.config.experimental.middleware) {
-          middlewareId = await this.resolve(
-            `${opts.settings.config.srcDir.pathname}/${MIDDLEWARE_PATH_SEGMENT_NAME}`
-          );
-        }
         let importMap = "";
         let imports = [];
         let i = 0;
         for (const pageData of eachPageData(internals)) {
           const variable = `_page${i}`;
-          imports.push(`import * as ${variable} from ${JSON.stringify(pageData.moduleSpecifier)};`);
+          imports.push(
+            `const ${variable} = () => import(${JSON.stringify(pageData.moduleSpecifier)});`
+          );
           importMap += `[${JSON.stringify(pageData.component)}, ${variable}],`;
           i++;
         }
@@ -42,11 +38,11 @@ function vitePluginPages(opts, internals) {
         }
         const def = `${imports.join("\n")}
 
-${middlewareId ? `import * as _middleware from "${middlewareId.id}";` : ""}
+${opts.settings.config.experimental.middleware ? `import * as _middleware from "${MIDDLEWARE_MODULE_ID}";` : ""}
 
 export const pageMap = new Map([${importMap}]);
 export const renderers = [${rendererItems}];
-${middlewareId ? `export const middleware = _middleware;` : ""}
+${opts.settings.config.experimental.middleware ? `export const middleware = _middleware;` : ""}
 `;
         return def;
       }

package/dist/core/build/plugins/plugin-prerender.js

@@ -1,3 +1,4 @@
+import path from "node:path";
 import { extendManualChunks } from "./util.js";
 function vitePluginPrerender(opts, internals) {
   return {
@@ -16,7 +17,7 @@ function vitePluginPrerender(opts, internals) {
               return "prerender";
             }
             pageInfo.route.prerender = false;
-            return `pages/all`;
+            return `pages/${path.basename(pageInfo.component)}`;
           }
         }
       });

package/dist/core/build/plugins/plugin-ssr.js

@@ -8,7 +8,7 @@ import { joinPaths, prependForwardSlash } from "../../path.js";
 import { serializeRouteData } from "../../routing/index.js";
 import { addRollupInput } from "../add-rollup-input.js";
 import { getOutFile, getOutFolder } from "../common.js";
-import { cssOrder, eachPageData, mergeInlineCss } from "../internal.js";
+import { cssOrder, mergeInlineCss } from "../internal.js";
 const virtualModuleId = "@astrojs-ssr-virtual-entry";
 const resolvedVirtualModuleId = "\0" + virtualModuleId;
 const manifestReplace = "@@ASTRO_MANIFEST_REPLACE@@";
@@ -118,34 +118,26 @@ function buildManifest(opts, internals, staticFiles) {
       return prependForwardSlash(joinPaths(settings.config.base, pth));
     }
   };
-  for (const pageData of eachPageData(internals)) {
-    if (!pageData.route.prerender)
+  for (const route of opts.manifest.routes) {
+    if (!route.prerender)
       continue;
-    if (!pageData.route.pathname)
+    if (!route.pathname)
       continue;
-    const outFolder = getOutFolder(
-      opts.settings.config,
-      pageData.route.pathname,
-      pageData.route.type
-    );
-    const outFile = getOutFile(
-      opts.settings.config,
-      outFolder,
-      pageData.route.pathname,
-      pageData.route.type
-    );
+    const outFolder = getOutFolder(opts.settings.config, route.pathname, route.type);
+    const outFile = getOutFile(opts.settings.config, outFolder, route.pathname, route.type);
     const file = outFile.toString().replace(opts.settings.config.build.client.toString(), "");
     routes.push({
       file,
       links: [],
       scripts: [],
       styles: [],
-      routeData: serializeRouteData(pageData.route, settings.config.trailingSlash)
+      routeData: serializeRouteData(route, settings.config.trailingSlash)
     });
     staticFiles.push(file);
   }
-  for (const pageData of eachPageData(internals)) {
-    if (pageData.route.prerender)
+  for (const route of opts.manifest.routes) {
+    const pageData = internals.pagesByComponent.get(route.component);
+    if (route.prerender || !pageData)
       continue;
     const scripts = [];
     if (pageData.hoistedScript) {
@@ -174,7 +166,7 @@ function buildManifest(opts, internals, staticFiles) {
         ...settings.scripts.filter((script) => script.stage === "head-inline").map(({ stage, content }) => ({ stage, children: content }))
       ],
       styles,
-      routeData: serializeRouteData(pageData.route, settings.config.trailingSlash)
+      routeData: serializeRouteData(route, settings.config.trailingSlash)
     });
   }
   if (!(BEFORE_HYDRATION_SCRIPT_ID in entryModules)) {

package/dist/core/build/static-build.js

@@ -24,6 +24,7 @@ import { generatePages } from "./generate.js";
 import { trackPageData } from "./internal.js";
 import { createPluginContainer } from "./plugin.js";
 import { registerAllPlugins } from "./plugins/index.js";
+import { RESOLVED_MIDDLEWARE_MODULE_ID } from "./plugins/plugin-middleware.js";
 import { getTimeStat } from "./util.js";
 async function viteBuild(opts) {
   var _a, _b, _c;
@@ -129,6 +130,8 @@ async function ssrBuild(opts, internals, input, container) {
           entryFileNames(chunkInfo) {
             if (chunkInfo.facadeModuleId === resolvedPagesVirtualModuleId) {
               return opts.buildConfig.serverEntry;
+            } else if (chunkInfo.facadeModuleId === RESOLVED_MIDDLEWARE_MODULE_ID) {
+              return "middleware.mjs";
             } else {
               return "[name].mjs";
             }

package/dist/core/build/types.d.ts

@@ -43,8 +43,9 @@ export interface StaticBuildOptions {
     viteConfig: InlineConfig;
     teardownCompiler: boolean;
 }
+type ImportComponentInstance = () => Promise<ComponentInstance>;
 export interface SingleFileBuiltModule {
-    pageMap: Map<ComponentPath, ComponentInstance>;
+    pageMap: Map<ComponentPath, ImportComponentInstance>;
     middleware: AstroMiddlewareInstance<unknown>;
     renderers: SSRLoadedRenderer[];
 }
@@ -55,3 +56,4 @@ export type RollupOutput = Extract<Extract<ViteBuildReturn, Exclude<ViteBuildRet
 export type OutputChunk = Extract<RollupOutput['output'][number], {
     type: 'chunk';
 }>;
+export {};

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "2.5.0";
+const ASTRO_VERSION = "2.5.1";
 const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
   ".markdown",
   ".mdown",

package/dist/core/dev/dev.js

@@ -53,7 +53,7 @@ async function dev(settings, options) {
       isRestart: options.isRestart
     })
   );
-  const currentVersion = "2.5.0";
+  const currentVersion = "2.5.1";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "2.5.0";
+  const version = "2.5.1";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -233,7 +233,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"2.5.0"}`
+        `v${"2.5.1"}`
       )} ${headline}`
     );
   }

package/dist/core/routing/validation.js

@@ -1,3 +1,4 @@
+import { bold } from "kleur/colors";
 import { AstroError, AstroErrorData } from "../errors/index.js";
 import { warn } from "../logger/core.js";
 const VALID_PARAM_TYPES = ["string", "number", "undefined"];
@@ -18,7 +19,11 @@ function validateDynamicRouteModule(mod, {
   route
 }) {
   if (ssr && mod.getStaticPaths && !mod.prerender) {
-    warn(logging, "getStaticPaths", 'getStaticPaths() is ignored when "output: server" is set.');
+    warn(
+      logging,
+      "getStaticPaths",
+      `getStaticPaths() in ${bold(route.component)} is ignored when "output: server" is set.`
+    );
   }
   if ((!ssr || mod.prerender) && !mod.getStaticPaths) {
     throw new AstroError({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",