astro 4.16.13 → 4.16.15

package/dist/assets/build/generate.js

@@ -83,6 +83,8 @@ async function generateImagesForPath(originalFilePath, transformsAndPath, env, q
   async function generateImageInternal(filepath, options) {
     const isLocalImage = isESMImportedImage(options.src);
     const finalFileURL = new URL("." + filepath, env.clientRoot);
+    const finalFolderURL = new URL("./", finalFileURL);
+    await fs.promises.mkdir(finalFolderURL, { recursive: true });
     const cacheFile = basename(filepath) + (isLocalImage ? "" : ".json");
     const cachedFileURL = new URL(cacheFile, env.assetsCacheDir);
     try {
@@ -113,8 +115,6 @@ async function generateImagesForPath(originalFilePath, transformsAndPath, env, q
         throw new Error(`An error was encountered while reading the cache file. Error: ${e}`);
       }
     }
-    const finalFolderURL = new URL("./", finalFileURL);
-    await fs.promises.mkdir(finalFolderURL, { recursive: true });
     const originalImagePath = isLocalImage ? options.src.src : options.src;
     if (!originalImage) {
       originalImage = await loadImage(originalFilePath, env);

package/dist/content/content-layer.js

@@ -121,7 +121,7 @@ class ContentLayer {
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion !== "4.16.13") {
+    if (previousAstroVersion !== "4.16.15") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -129,8 +129,8 @@ class ContentLayer {
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("4.16.13") {
-      await this.#store.metaStore().set("astro-version", "4.16.13");
+    if ("4.16.15") {
+      await this.#store.metaStore().set("astro-version", "4.16.15");
     }
     if (currentConfigDigest) {
       await this.#store.metaStore().set("config-digest", currentConfigDigest);

package/dist/content/loaders/glob.js

@@ -57,6 +57,7 @@ function glob(globOptions) {
         untouchedEntries.delete(id);
         const existingEntry = store.get(id);
         const digest = generateDigest(contents);
+        const filePath = fileURLToPath(fileUrl);
         if (existingEntry && existingEntry.digest === digest && existingEntry.filePath) {
           if (existingEntry.deferredRender) {
             store.addModuleImport(existingEntry.filePath);
@@ -64,9 +65,9 @@ function glob(globOptions) {
           if (existingEntry.assetImports?.length) {
             store.addAssetImports(existingEntry.assetImports, existingEntry.filePath);
           }
+          fileToIdMap.set(filePath, id);
           return;
         }
-        const filePath = fileURLToPath(fileUrl);
         const relativePath = posixRelative(fileURLToPath(config.root), filePath);
         const parsedData = await parseData({
           id,

package/dist/core/app/pipeline.js

@@ -30,7 +30,6 @@ class AppPipeline extends Pipeline {
       void 0,
       void 0,
       void 0,
-      false,
       defaultRoutes
     );
     pipeline.#manifestData = manifestData;

package/dist/core/base-pipeline.d.ts

@@ -35,7 +35,6 @@ export declare abstract class Pipeline {
      * Used for `Astro.site`.
      */
     readonly site: URL | undefined;
-    readonly callSetGetEnv: boolean;
     /**
      * Array of built-in, internal, routes.
      * Used to find the route module
@@ -64,7 +63,7 @@ export declare abstract class Pipeline {
     /**
      * Used for `Astro.site`.
      */
-    site?: URL | undefined, callSetGetEnv?: boolean, 
+    site?: URL | undefined, 
     /**
      * Array of built-in, internal, routes.
      * Used to find the route module

package/dist/core/base-pipeline.js

@@ -8,7 +8,7 @@ import { NOOP_MIDDLEWARE_FN } from "./middleware/noop-middleware.js";
 import { RouteCache } from "./render/route-cache.js";
 import { createDefaultRoutes } from "./routing/default.js";
 class Pipeline {
-  constructor(logger, manifest, mode, renderers, resolve, serverLike, streaming, adapterName = manifest.adapterName, clientDirectives = manifest.clientDirectives, inlinedScripts = manifest.inlinedScripts, compressHTML = manifest.compressHTML, i18n = manifest.i18n, middleware = manifest.middleware, routeCache = new RouteCache(logger, mode), site = manifest.site ? new URL(manifest.site) : void 0, callSetGetEnv = true, defaultRoutes = createDefaultRoutes(manifest)) {
+  constructor(logger, manifest, mode, renderers, resolve, serverLike, streaming, adapterName = manifest.adapterName, clientDirectives = manifest.clientDirectives, inlinedScripts = manifest.inlinedScripts, compressHTML = manifest.compressHTML, i18n = manifest.i18n, middleware = manifest.middleware, routeCache = new RouteCache(logger, mode), site = manifest.site ? new URL(manifest.site) : void 0, defaultRoutes = createDefaultRoutes(manifest)) {
     this.logger = logger;
     this.manifest = manifest;
     this.mode = mode;
@@ -24,7 +24,6 @@ class Pipeline {
     this.middleware = middleware;
     this.routeCache = routeCache;
     this.site = site;
-    this.callSetGetEnv = callSetGetEnv;
     this.defaultRoutes = defaultRoutes;
     this.internalMiddleware = [];
     if (i18n?.strategy !== "manual") {
@@ -32,11 +31,6 @@ class Pipeline {
         createI18nMiddleware(i18n, manifest.base, manifest.trailingSlash, manifest.buildFormat)
       );
     }
-    if (callSetGetEnv && manifest.experimentalEnvGetSecretEnabled) {
-      setGetEnv(() => {
-        throw new AstroError(AstroErrorData.EnvUnsupportedGetSecret);
-      }, true);
-    }
   }
   internalMiddleware;
   resolvedMiddleware = void 0;

package/dist/core/build/generate.js

@@ -20,6 +20,7 @@ import { runHookBuildGenerated } from "../../integrations/hooks.js";
 import { getOutputDirectory } from "../../prerender/utils.js";
 import { NoPrerenderedRoutesWithDomains } from "../errors/errors-data.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
+import { NOOP_MIDDLEWARE_FN } from "../middleware/noop-middleware.js";
 import { getRedirectLocationOrThrow, routeIsRedirect } from "../redirects/index.js";
 import { RenderContext } from "../render-context.js";
 import { callGetStaticPaths } from "../render/route-cache.js";
@@ -44,13 +45,7 @@ async function generatePages(options, internals) {
     const baseDirectory = getOutputDirectory(options.settings.config);
     const renderersEntryUrl = new URL("renderers.mjs", baseDirectory);
     const renderers = await import(renderersEntryUrl.toString());
-    let middleware = (_, next) => next();
-    try {
-      middleware = await import(new URL("middleware.mjs", baseDirectory).toString()).then(
-        (mod) => mod.onRequest
-      );
-    } catch {
-    }
+    const middleware = internals.middlewareEntryPoint ? await import(internals.middlewareEntryPoint.toString()).then((mod) => mod.onRequest) : NOOP_MIDDLEWARE_FN;
     manifest = createBuildManifest(
       options.settings,
       internals,

package/dist/core/build/pipeline.js

@@ -102,11 +102,11 @@ class BuildPipeline extends Pipeline {
     }
     const renderersEntryUrl = new URL(`renderers.mjs?time=${Date.now()}`, baseDirectory);
     const renderers = await import(renderersEntryUrl.toString());
-    const middleware = await import(new URL("middleware.mjs", baseDirectory).toString()).then((mod) => {
+    const middleware = internals.middlewareEntryPoint ? await import(internals.middlewareEntryPoint.toString()).then((mod) => {
       return function() {
         return { onRequest: mod.onRequest };
       };
-    }).catch(() => manifest.middleware);
+    }) : manifest.middleware;
     if (!renderers) {
       throw new Error(
         "Astro couldn't find the emitted renderers. This is an internal error, please file an issue."

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

@@ -229,7 +229,6 @@ function generateSSRCode(settings, adapter, middlewareId) {
     `import { renderers } from '${RENDERERS_MODULE_ID}';`,
     `import * as serverEntrypointModule from '${ADAPTER_VIRTUAL_MODULE_ID}';`,
     `import { manifest as defaultManifest } from '${SSR_MANIFEST_VIRTUAL_MODULE_ID}';`,
-    edgeMiddleware ? `` : `import { onRequest as middleware } from '${middlewareId}';`,
     settings.config.experimental.serverIslands ? `import { serverIslandMap } from '${VIRTUAL_ISLAND_MAP_ID}';` : ""
   ];
   const contents = [

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.16.13";
+const ASTRO_VERSION = "4.16.15";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";
 const REWRITE_DIRECTIVE_HEADER_VALUE = "yes";

package/dist/core/dev/dev.js

@@ -22,7 +22,7 @@ async function dev(inlineConfig) {
   await telemetry.record([]);
   const restart = await createContainerWithAutomaticRestart({ inlineConfig, fs });
   const logger = restart.container.logger;
-  const currentVersion = "4.16.13";
+  const currentVersion = "4.16.15";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

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

@@ -1050,16 +1050,6 @@ export declare const EnvInvalidVariables: {
     title: string;
     message: (errors: Array<string>) => string;
 };
-/**
- * @docs
- * @description
- * The `astro:env/server` exported function `getSecret()` is not supported by your adapter.
- */
-export declare const EnvUnsupportedGetSecret: {
-    name: string;
-    title: string;
-    message: string;
-};
 /**
  * @docs
  * @description

package/dist/core/errors/errors-data.js

@@ -381,11 +381,6 @@ const EnvInvalidVariables = {
 ${errors.map((err) => `- ${err}`).join("\n")}
 `
 };
-const EnvUnsupportedGetSecret = {
-  name: "EnvUnsupportedGetSecret",
-  title: "Unsupported astro:env getSecret",
-  message: "`astro:env/server` exported function `getSecret` is not supported by your adapter."
-};
 const ServerOnlyModule = {
   name: "ServerOnlyModule",
   title: "Module is only available server-side",
@@ -580,7 +575,6 @@ export {
   DuplicateContentEntrySlugError,
   EndpointDidNotReturnAResponse,
   EnvInvalidVariables,
-  EnvUnsupportedGetSecret,
   ExpectedImage,
   ExpectedImageOptions,
   ExpectedNotESMImage,

package/dist/core/messages.js

@@ -38,7 +38,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.16.13";
+  const version = "4.16.15";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -274,7 +274,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"4.16.13"}`
+        `v${"4.16.15"}`
       )} ${headline}`
     );
   }

package/dist/core/middleware/noop-middleware.js

@@ -1,7 +1,8 @@
 import { NOOP_MIDDLEWARE_HEADER } from "../constants.js";
-const NOOP_MIDDLEWARE_FN = (ctx, next) => {
-  ctx.request.headers.set(NOOP_MIDDLEWARE_HEADER, "true");
-  return next();
+const NOOP_MIDDLEWARE_FN = async (_ctx, next) => {
+  const response = await next();
+  response.headers.set(NOOP_MIDDLEWARE_HEADER, "true");
+  return response;
 };
 export {
   NOOP_MIDDLEWARE_FN

package/dist/core/middleware/vite-plugin.js

@@ -7,15 +7,11 @@ import { AstroError } from "../errors/index.js";
 const MIDDLEWARE_MODULE_ID = "\0astro-internal:middleware";
 const NOOP_MIDDLEWARE = "\0noop-middleware";
 function vitePluginMiddleware({ settings }) {
-  let isCommandBuild = false;
   let resolvedMiddlewareId = void 0;
   const hasIntegrationMiddleware = settings.middlewares.pre.length > 0 || settings.middlewares.post.length > 0;
   let userMiddlewareIsPresent = false;
   return {
     name: "@astro/plugin-middleware",
-    config(_, { command }) {
-      isCommandBuild = command === "build";
-    },
     async resolveId(id) {
       if (id === MIDDLEWARE_MODULE_ID) {
         const middlewareId = await this.resolve(
@@ -45,14 +41,6 @@ function vitePluginMiddleware({ settings }) {
         if (!userMiddlewareIsPresent && settings.config.i18n?.routing === "manual") {
           throw new AstroError(MissingMiddlewareForInternationalization);
         }
-        if (isCommandBuild) {
-          this.emitFile({
-            type: "chunk",
-            preserveSignature: "strict",
-            fileName: "middleware.mjs",
-            id
-          });
-        }
         const preMiddleware = createMiddlewareImports(settings.middlewares.pre, "pre");
         const postMiddleware = createMiddlewareImports(settings.middlewares.post, "post");
         const source = `
@@ -95,7 +83,7 @@ function vitePluginMiddlewareBuild(opts, internals) {
     },
     writeBundle(_, bundle) {
       for (const [chunkName, chunk] of Object.entries(bundle)) {
-        if (chunk.type !== "asset" && chunk.fileName === "middleware.mjs") {
+        if (chunk.type !== "asset" && chunk.facadeModuleId === MIDDLEWARE_MODULE_ID) {
           const outputDirectory = getOutputDirectory(opts.settings.config);
           internals.middlewareEntryPoint = new URL(chunkName, outputDirectory);
         }

package/dist/core/render-context.js

@@ -24,6 +24,7 @@ import { callMiddleware } from "./middleware/callMiddleware.js";
 import { sequence } from "./middleware/index.js";
 import { renderRedirect } from "./redirects/render.js";
 import { Slots, getParams, getProps } from "./render/index.js";
+import { isRoute404or500 } from "./routing/match.js";
 import { copyRequest, setOriginPathname } from "./routing/rewrite.js";
 const apiContextRoutesSymbol = Symbol.for("context.routes");
 class RenderContext {
@@ -437,11 +438,8 @@ class RenderContext {
       return this.#currentLocale;
     }
     let computedLocale;
-    if (routeData.pathname) {
-      computedLocale = computeCurrentLocale(routeData.pathname, locales, defaultLocale);
-    } else {
-      computedLocale = computeCurrentLocale(url.pathname, locales, defaultLocale);
-    }
+    const pathname = routeData.pathname && !isRoute404or500(routeData) ? routeData.pathname : url.pathname;
+    computedLocale = computeCurrentLocale(pathname, locales, defaultLocale);
     this.#currentLocale = computedLocale ?? fallbackTo;
     return this.#currentLocale;
   }

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

@@ -3,3 +3,10 @@ import type { ManifestData, RouteData } from '../../@types/astro.js';
 export declare function matchRoute(pathname: string, manifest: ManifestData): RouteData | undefined;
 /** Finds all matching routes from pathname */
 export declare function matchAllRoutes(pathname: string, manifest: ManifestData): RouteData[];
+/**
+ * Determines if the given route matches a 404 or 500 error page.
+ *
+ * @param {RouteData} route - The route data to check.
+ * @returns {boolean} `true` if the route matches a 404 or 500 error page, otherwise `false`.
+ */
+export declare function isRoute404or500(route: RouteData): boolean;

package/dist/core/routing/match.js

@@ -7,7 +7,11 @@ function matchRoute(pathname, manifest) {
 function matchAllRoutes(pathname, manifest) {
   return manifest.routes.filter((route) => route.pattern.test(decodeURI(pathname)));
 }
+function isRoute404or500(route) {
+  return route.pattern.test("/404") || route.pattern.test("/500");
+}
 export {
+  isRoute404or500,
   matchAllRoutes,
   matchRoute
 };

package/dist/runtime/server/render/server-islands.js

@@ -56,8 +56,8 @@ let response = await fetch('${serverIslandUrl}', {
 	method: 'POST',
 	body: JSON.stringify(data),
 });
-
-if(response.status === 200 && response.headers.get('content-type') === 'text/html') {
+if (script) {
+	if(response.status === 200 && response.headers.get('content-type') === 'text/html') {
 	let html = await response.text();
 
 	// Swap!
@@ -72,6 +72,7 @@ if(response.status === 200 && response.headers.get('content-type') === 'text/htm
 	script.before(frag);
 }
 script.remove();
+}
 </script>`);
     }
   };

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "astro",
-  "version": "4.16.13",
+  "version": "4.16.15",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/withastro/astro.git",
+    "url": "git+https://github.com/withastro/astro.git",
     "directory": "packages/astro"
   },
   "bugs": "https://github.com/withastro/astro/issues",