astro 2.0.14 → 2.0.15

package/dist/@types/astro.d.ts

@@ -1262,6 +1262,7 @@ export interface RouteData {
     pattern: RegExp;
     segments: RoutePart[][];
     type: RouteType;
+    prerender: boolean;
 }
 export type SerializedRouteData = Omit<RouteData, 'generate' | 'pattern'> & {
     generate: undefined;

package/dist/content/server-listeners.js

@@ -13,9 +13,6 @@ async function attachContentServerListeners({
   settings
 }) {
   const contentPaths = getContentPaths(settings.config, fs);
-  const maybeTsConfigStats = getTSConfigStatsWhenAllowJsFalse({ contentPaths, settings });
-  if (maybeTsConfigStats)
-    warnAllowJsIsFalse({ ...maybeTsConfigStats, logging });
   if (fs.existsSync(contentPaths.contentDir)) {
     info(
       logging,
@@ -24,6 +21,9 @@ async function attachContentServerListeners({
         contentPaths.contentDir.href.replace(settings.config.root.href, "")
       )} for changes`
     );
+    const maybeTsConfigStats = getTSConfigStatsWhenAllowJsFalse({ contentPaths, settings });
+    if (maybeTsConfigStats)
+      warnAllowJsIsFalse({ ...maybeTsConfigStats, logging });
     await attachListeners();
   } else {
     viteServer.watcher.on("addDir", contentDirListener);

package/dist/content/types-generator.js

@@ -34,7 +34,10 @@ async function createContentTypesGenerator({
     if (!fs.existsSync(contentPaths.contentDir)) {
       return { typesGenerated: false, reason: "no-content-dir" };
     }
-    events.push(handleEvent({ name: "add", entry: contentPaths.config.url }, { logLevel: "warn" }));
+    events.push({
+      type: { name: "add", entry: contentPaths.config.url },
+      opts: { logLevel: "warn" }
+    });
     const globResult = await glob("**", {
       cwd: fileURLToPath(contentPaths.contentDir),
       fs: {
@@ -46,7 +49,7 @@ async function createContentTypesGenerator({
       (e) => !e.href.startsWith(contentPaths.config.url.href)
     );
     for (const entry of entries) {
-      events.push(handleEvent({ name: "add", entry }, { logLevel: "warn" }));
+      events.push({ type: { name: "add", entry }, opts: { logLevel: "warn" } });
     }
     await runEvents();
     return { typesGenerated: true };
@@ -156,12 +159,15 @@ async function createContentTypesGenerator({
   }
   function queueEvent(rawEvent, opts) {
     const event = {
-      entry: pathToFileURL(rawEvent.entry),
-      name: rawEvent.name
+      type: {
+        entry: pathToFileURL(rawEvent.entry),
+        name: rawEvent.name
+      },
+      opts
     };
-    if (!event.entry.pathname.startsWith(contentPaths.contentDir.pathname))
+    if (!event.type.entry.pathname.startsWith(contentPaths.contentDir.pathname))
       return;
-    events.push(handleEvent(event, opts));
+    events.push(event);
     debounceTimeout && clearTimeout(debounceTimeout);
     debounceTimeout = setTimeout(
       async () => runEvents(opts),
@@ -170,7 +176,11 @@ async function createContentTypesGenerator({
   }
   async function runEvents(opts) {
     const logLevel = (opts == null ? void 0 : opts.logLevel) ?? "info";
-    const eventResponses = await Promise.all(events);
+    const eventResponses = [];
+    for (const event of events) {
+      const response = await handleEvent(event.type, event.opts);
+      eventResponses.push(response);
+    }
     events = [];
     let unsupportedFiles = [];
     for (const response of eventResponses) {

package/dist/content/utils.d.ts

@@ -61,7 +61,7 @@ export declare function getEntryInfo(params: Pick<ContentPaths, 'contentDir'> &
     entry: URL;
     allowFilesOutsideCollection?: true;
 }): EntryInfo;
-export declare function getEntryType(entryPath: string, paths: Pick<ContentPaths, 'config'>): 'content' | 'config' | 'ignored' | 'unsupported';
+export declare function getEntryType(entryPath: string, paths: Pick<ContentPaths, 'config' | 'contentDir'>): 'content' | 'config' | 'ignored' | 'unsupported';
 /**
  * Match YAML exception handling from Astro core errors
  * @see 'astro/src/core/errors.ts'

package/dist/content/utils.js

@@ -106,7 +106,7 @@ function getEntryInfo({
 function getEntryType(entryPath, paths) {
   const { ext, base } = path.parse(entryPath);
   const fileUrl = pathToFileURL(entryPath);
-  if (hasUnderscoreInPath(fileUrl) || isOnIgnoreList(base)) {
+  if (hasUnderscoreBelowContentDirectoryPath(fileUrl, paths.contentDir) || isOnIgnoreList(base)) {
     return "ignored";
   } else if (contentFileExts.includes(ext)) {
     return "content";
@@ -119,8 +119,8 @@ function getEntryType(entryPath, paths) {
 function isOnIgnoreList(fileName) {
   return [".DS_Store"].includes(fileName);
 }
-function hasUnderscoreInPath(fileUrl) {
-  const parts = fileUrl.pathname.split("/");
+function hasUnderscoreBelowContentDirectoryPath(fileUrl, contentDir) {
+  const parts = fileUrl.pathname.replace(contentDir.pathname, "").split("/");
   for (const part of parts) {
     if (part.startsWith("_"))
       return true;

package/dist/core/add/index.js

@@ -381,7 +381,20 @@ async function setAdapter(ast, adapter, exportName) {
         }
         return false;
       });
-      const adapterCall = t.callExpression(adapterId, []);
+      let adapterCall;
+      switch (adapter.id) {
+        case "node": {
+          adapterCall = t.callExpression(adapterId, [
+            t.objectExpression([
+              t.objectProperty(t.identifier("mode"), t.stringLiteral("standalone"))
+            ])
+          ]);
+          break;
+        }
+        default: {
+          adapterCall = t.callExpression(adapterId, []);
+        }
+      }
       if (!adapterProp) {
         configObject.properties.push(t.objectProperty(t.identifier("adapter"), adapterCall));
         return;

package/dist/core/app/index.js

@@ -37,7 +37,7 @@ import {
   createLinkStylesheetElementSet,
   createModuleScriptElement
 } from "../render/ssr-element.js";
-import { matchAssets, matchRoute } from "../routing/match.js";
+import { matchRoute } from "../routing/match.js";
 import { deserializeManifest } from "./common.js";
 const pagesVirtualModuleId = "@astrojs-pages-virtual-entry";
 const resolvedPagesVirtualModuleId = "\0" + pagesVirtualModuleId;
@@ -104,8 +104,7 @@ class App {
     let pathname = "/" + this.removeBase(url.pathname);
     let routeData = matchRoute(pathname, __privateGet(this, _manifestData));
     if (routeData) {
-      const asset = matchAssets(routeData, __privateGet(this, _manifest).assets);
-      if (asset)
+      if (routeData.prerender)
         return void 0;
       return routeData;
     } else if (matchNotFound) {

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

@@ -12,6 +12,7 @@ function vitePluginPrerender(opts, internals) {
           const pageInfo = internals.pagesByViteID.get(id);
           if (pageInfo) {
             if ((_c = (_b = (_a = meta.getModuleInfo(id)) == null ? void 0 : _a.meta.astro) == null ? void 0 : _b.pageOptions) == null ? void 0 : _c.prerender) {
+              pageInfo.route.prerender = true;
               return "prerender";
             }
             return `pages/all`;

package/dist/core/constants.js

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

package/dist/core/dev/dev.js

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

package/dist/core/errors/errors-data.d.ts

@@ -6,16 +6,27 @@ export interface ErrorData {
     hint?: string | ((...params: any) => string);
 }
 export declare const AstroErrorData: {
-    readonly UnknownCompilerError: {
-        readonly title: "Unknown compiler error.";
-        readonly code: 1000;
-        readonly hint: "This is almost always a problem with the Astro compiler, not your code. Please open an issue at https://astro.build/issues/compiler.";
-    };
     /**
      * @docs
      * @kind heading
      * @name Astro Errors
      */
+    /**
+     * @docs
+     * @message
+     * Unknown compiler error.
+     * @see
+     * - [withastro/compiler issues list](https://astro.build/issues/compiler)
+     * @description
+     * Astro encountered an unknown error while compiling your files. In most cases, this is not your fault, but an issue in our compiler.
+     *
+     * If there isn't one already, please [create an issue](https://astro.build/issues/compiler).
+     */
+    readonly UnknownCompilerError: {
+        readonly title: "Unknown compiler error.";
+        readonly code: 1000;
+        readonly hint: "This is almost always a problem with the Astro compiler, not your code. Please open an issue at https://astro.build/issues/compiler.";
+    };
     /**
      * @docs
      * @see
@@ -386,6 +397,15 @@ export declare const AstroErrorData: {
         readonly message: (paramName: string) => string;
         readonly hint: "Rename your file to `[page].astro` or `[...page].astro`.";
     };
+    /**
+     * @docs
+     * @see
+     * - [Vite troubleshooting guide](https://vitejs.dev/guide/troubleshooting.html)
+     * @description
+     * Vite encountered an unknown error while rendering your project. We unfortunately do not know what happened (or we would tell you!)
+     *
+     * If you can reliably cause this error to happen, we'd appreciate if you could [open an issue](https://astro.build/issues/)
+     */
     readonly UnknownViteError: {
         readonly title: "Unknown Vite Error.";
         readonly code: 4000;
@@ -423,6 +443,13 @@ export declare const AstroErrorData: {
      * @kind heading
      * @name CSS Errors
      */
+    /**
+     * @docs
+     * @see
+     * 	- [Styles and CSS](https://docs.astro.build/en/guides/styling/)
+     * @description
+     * Astro encountered an unknown error while parsing your CSS. Oftentimes, this is caused by a syntax error and the error message should contain more information.
+     */
     readonly UnknownCSSError: {
         readonly title: "Unknown CSS Error.";
         readonly code: 5000;
@@ -434,7 +461,7 @@ export declare const AstroErrorData: {
      * CSSSyntaxError: Missed semicolon<br/>
      * CSSSyntaxError: Unclosed string<br/>
      * @description
-     * Astro encountered an error while parsing your CSS, due to a syntax error. This is often caused by a missing semicolon
+     * Astro encountered an error while parsing your CSS, due to a syntax error. This is often caused by a missing semicolon.
      */
     readonly CSSSyntaxError: {
         readonly title: "CSS Syntax Error.";
@@ -445,6 +472,11 @@ export declare const AstroErrorData: {
      * @kind heading
      * @name Markdown Errors
      */
+    /**
+     * @docs
+     * @description
+     * Astro encountered an unknown error while parsing your Markdown. Oftentimes, this is caused by a syntax error and the error message should contain more information.
+     */
     readonly UnknownMarkdownError: {
         readonly title: "Unknown Markdown Error.";
         readonly code: 6000;
@@ -490,6 +522,16 @@ export declare const AstroErrorData: {
         readonly message: (file: string) => string;
         readonly hint: "See the MDX integration docs for installation and usage instructions: https://docs.astro.build/en/guides/integrations-guide/mdx/";
     };
+    /**
+     * @docs
+     * @see
+     * - [Configuration Reference](https://docs.astro.build/en/reference/configuration-reference/)
+     * @description
+     * Astro encountered an unknown error loading your Astro configuration file.
+     * This is often caused by a syntax error in your config and the message should offer more information.
+     *
+     * If you can reliably cause this error to happen, we'd appreciate if you could [open an issue](https://astro.build/issues/)
+     */
     readonly UnknownConfigError: {
         readonly title: "Unknown configuration error.";
         readonly code: 7000;
@@ -524,6 +566,13 @@ export declare const AstroErrorData: {
      * @kind heading
      * @name CLI Errors
      */
+    /**
+     * @docs
+     * @description
+     * Astro encountered an unknown error while starting one of its CLI commands. The error message should contain more information.
+     *
+     * If you can reliably cause this error to happen, we'd appreciate if you could [open an issue](https://astro.build/issues/)
+     */
     readonly UnknownCLIError: {
         readonly title: "Unknown CLI Error.";
         readonly code: 8000;
@@ -546,6 +595,14 @@ export declare const AstroErrorData: {
      * @kind heading
      * @name Content Collection Errors
      */
+    /**
+     * @docs
+     * @description
+     * Astro encountered an unknown error loading your content collections.
+     * This can be caused by certain errors inside your `src/content/config.ts` file or some internal errors.
+     *
+     * If you can reliably cause this error to happen, we'd appreciate if you could [open an issue](https://astro.build/issues/)
+     */
     readonly UnknownContentCollectionError: {
         readonly title: "Unknown Content Collection Error.";
         readonly code: 9000;

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "2.0.14";
+  const version = "2.0.15";
   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.0.14"}`
+        `v${"2.0.15"}`
       )} ${headline}`
     );
   }

package/dist/core/routing/manifest/create.js

@@ -225,7 +225,8 @@ function createRouteManifest({ settings, cwd, fsMod }, logging) {
           params,
           component,
           generate,
-          pathname: pathname || void 0
+          pathname: pathname || void 0,
+          prerender: false
         });
       }
     });
@@ -275,7 +276,8 @@ This route collides with: "${collision.component}".`
       params,
       component,
       generate,
-      pathname: pathname || void 0
+      pathname: pathname || void 0,
+      prerender: false
     });
   });
   return {

package/dist/core/routing/manifest/serialization.js

@@ -16,7 +16,8 @@ function deserializeRouteData(rawRouteData) {
     component: rawRouteData.component,
     generate: getRouteGenerator(rawRouteData.segments, rawRouteData._meta.trailingSlash),
     pathname: rawRouteData.pathname || void 0,
-    segments: rawRouteData.segments
+    segments: rawRouteData.segments,
+    prerender: rawRouteData.prerender
   };
 }
 export {

package/dist/core/routing/match.d.ts

@@ -1,7 +1,5 @@
 import type { ManifestData, RouteData } from '../../@types/astro';
 /** Find matching route from pathname */
 export declare function matchRoute(pathname: string, manifest: ManifestData): RouteData | undefined;
-/** Find matching static asset from pathname */
-export declare function matchAssets(route: RouteData, assets: Set<string>): string | undefined;
 /** Finds all matching routes from pathname */
 export declare function matchAllRoutes(pathname: string, manifest: ManifestData): RouteData[];

package/dist/core/routing/match.js

@@ -1,23 +1,10 @@
 function matchRoute(pathname, manifest) {
   return manifest.routes.find((route) => route.pattern.test(decodeURI(pathname)));
 }
-function matchAssets(route, assets) {
-  for (const asset of assets) {
-    if (!asset.endsWith(".html"))
-      continue;
-    if (route.pattern.test(asset)) {
-      return asset;
-    }
-    if (route.pattern.test(asset.replace(/index\.html$/, ""))) {
-      return asset;
-    }
-  }
-}
 function matchAllRoutes(pathname, manifest) {
   return manifest.routes.filter((route) => route.pattern.test(pathname));
 }
 export {
   matchAllRoutes,
-  matchAssets,
   matchRoute
 };

package/dist/vite-plugin-astro-server/response.js

@@ -39,7 +39,7 @@ function writeHtmlResponse(res, statusCode, html) {
 async function writeWebResponse(res, webResponse) {
   const { status, headers, body } = webResponse;
   const _headers = Object.fromEntries(headers.entries());
-  if (headers["getSetCookie"]) {
+  if ("getSetCookie" in headers && typeof headers.getSetCookie === "function") {
     _headers["set-cookie"] = headers.getSetCookie();
   }
   const setCookieHeaders = Array.from(getSetCookiesFromResponse(webResponse));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.0.14",
+  "version": "2.0.15",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -174,7 +174,7 @@
     "rollup": "^3.9.0",
     "sass": "^1.52.2",
     "srcset-parse": "^1.1.0",
-    "undici": "^5.14.0",
+    "undici": "^5.20.0",
     "unified": "^10.1.2"
   },
   "engines": {