astro 5.0.2 → 5.0.4

package/components/Image.astro

@@ -47,7 +47,7 @@ if (import.meta.env.DEV) {
 	additionalAttributes['data-image-component'] = 'true';
 }
 
-const attributes = useResponsive
+const { class: className, ...attributes } = useResponsive
 	? applyResponsiveAttributes({
 			layout,
 			image,
@@ -58,4 +58,4 @@ const attributes = useResponsive
 ---
 
 {/* Applying class outside of the spread prevents it from applying unnecessary astro-* classes */}
-<img src={image.src} {...attributes} class={attributes.class} />
+<img src={image.src} {...attributes} class={className} />

package/components/Picture.astro

@@ -102,7 +102,7 @@ if (fallbackImage.srcSet.values.length > 0) {
 	imgAdditionalAttributes.srcset = fallbackImage.srcSet.attribute;
 }
 
-const attributes = useResponsive
+const { class: className, ...attributes } = useResponsive
 	? applyResponsiveAttributes({
 			layout,
 			image: fallbackImage,
@@ -133,5 +133,5 @@ if (import.meta.env.DEV) {
 		})
 	}
 	{/* Applying class outside of the spread prevents it from applying unnecessary astro-* classes */}
-	<img src={fallbackImage.src} {...attributes} class={attributes.class} />
+	<img src={fallbackImage.src} {...attributes} class={className} />
 </picture>

package/dist/assets/utils/resolveImports.js

@@ -7,7 +7,7 @@ function imageSrcToImportId(imageSrc, filePath) {
   if (isRemotePath(imageSrc)) {
     return;
   }
-  const ext = imageSrc.split(".").at(-1);
+  const ext = imageSrc.split(".").at(-1)?.toLowerCase();
   if (!ext || !VALID_INPUT_FORMATS.includes(ext)) {
     return;
   }

package/dist/cli/info/index.d.ts

@@ -8,4 +8,6 @@ export declare function getInfoOutput({ userConfig, print, }: {
     print: boolean;
 }): Promise<string>;
 export declare function printInfo({ flags }: InfoOptions): Promise<void>;
+export declare function copyToClipboard(text: string, force?: boolean): Promise<void>;
+export declare function readFromClipboard(): string;
 export {};

package/dist/cli/info/index.js

@@ -1,4 +1,4 @@
-import { execSync } from "node:child_process";
+import { spawnSync } from "node:child_process";
 import { arch, platform } from "node:os";
 import * as colors from "kleur/colors";
 import prompts from "prompts";
@@ -33,48 +33,55 @@ async function printInfo({ flags }) {
   applyPolyfill();
   const { userConfig } = await resolveConfig(flagsToAstroInlineConfig(flags), "info");
   const output = await getInfoOutput({ userConfig, print: true });
-  await copyToClipboard(output);
+  await copyToClipboard(output, flags.copy);
 }
-async function copyToClipboard(text) {
+async function copyToClipboard(text, force) {
   text = text.trim();
   const system = platform();
   let command = "";
+  let args = [];
   if (system === "darwin") {
     command = "pbcopy";
   } else if (system === "win32") {
     command = "clip";
   } else {
     const unixCommands = [
-      ["xclip", "-sel clipboard -l 1"],
-      ["wl-copy", '"$0"']
+      ["xclip", ["-sel", "clipboard", "-l", "1"]],
+      ["wl-copy", []]
     ];
-    for (const [unixCommand, args] of unixCommands) {
+    for (const [unixCommand, unixArgs] of unixCommands) {
       try {
-        const output = execSync(`which ${unixCommand}`, { encoding: "utf8", stdio: "pipe" });
-        if (output[0] !== "/") {
-          continue;
+        const output = spawnSync("which", [unixCommand], { encoding: "utf8" });
+        if (output.stdout.trim()) {
+          command = unixCommand;
+          args = unixArgs;
+          break;
         }
-        command = `${unixCommand} ${args}`;
       } catch {
         continue;
       }
     }
-    if (!command) return;
   }
-  console.log();
-  const { shouldCopy } = await prompts({
-    type: "confirm",
-    name: "shouldCopy",
-    message: "Copy to clipboard?",
-    initial: true
-  });
-  if (!shouldCopy) return;
-  try {
-    execSync(command.replaceAll("$0", text), {
-      stdio: "ignore",
-      input: text,
-      encoding: "utf8"
+  if (!command) {
+    console.error(colors.red("\nClipboard command not found!"));
+    console.info("Please manually copy the text above.");
+    return;
+  }
+  if (!force) {
+    const { shouldCopy } = await prompts({
+      type: "confirm",
+      name: "shouldCopy",
+      message: "Copy to clipboard?",
+      initial: true
     });
+    if (!shouldCopy) return;
+  }
+  try {
+    const result = spawnSync(command, args, { input: text });
+    if (result.error) {
+      throw result.error;
+    }
+    console.info(colors.green("Copied to clipboard!"));
   } catch {
     console.error(
       colors.red(`
@@ -82,6 +89,42 @@ Sorry, something went wrong!`) + ` Please copy the text above manually.`
     );
   }
 }
+function readFromClipboard() {
+  const system = platform();
+  let command = "";
+  let args = [];
+  if (system === "darwin") {
+    command = "pbpaste";
+  } else if (system === "win32") {
+    command = "powershell";
+    args = ["-command", "Get-Clipboard"];
+  } else {
+    const unixCommands = [
+      ["xclip", ["-sel", "clipboard", "-o"]],
+      ["wl-paste", []]
+    ];
+    for (const [unixCommand, unixArgs] of unixCommands) {
+      try {
+        const output = spawnSync("which", [unixCommand], { encoding: "utf8" });
+        if (output.stdout.trim()) {
+          command = unixCommand;
+          args = unixArgs;
+          break;
+        }
+      } catch {
+        continue;
+      }
+    }
+  }
+  if (!command) {
+    throw new Error("Clipboard read command not found!");
+  }
+  const result = spawnSync(command, args, { encoding: "utf8" });
+  if (result.error) {
+    throw result.error;
+  }
+  return result.stdout.trim();
+}
 const PLATFORM_TO_OS = {
   darwin: "macOS",
   win32: "Windows",
@@ -115,11 +158,13 @@ ${" ".repeat(MAX_PADDING)}${colors.green(entry)}`;
   }
   plaintext += "\n";
   if (print) {
-    console.log(richtext);
+    console.info(richtext);
   }
   return plaintext;
 }
 export {
+  copyToClipboard,
   getInfoOutput,
-  printInfo
+  printInfo,
+  readFromClipboard
 };

package/dist/container/index.js

@@ -36,7 +36,6 @@ function createManifest(manifest, renderers, middleware) {
     i18n: manifest?.i18n,
     checkOrigin: false,
     middleware: manifest?.middleware ?? middlewareInstance,
-    envGetSecretEnabled: false,
     key: createKey()
   };
 }
@@ -267,7 +266,8 @@ class experimental_AstroContainer {
       request,
       pathname: url.pathname,
       locals: options?.locals ?? {},
-      partial: options?.partial ?? true
+      partial: options?.partial ?? true,
+      clientAddress: ""
     });
     if (options.params) {
       renderContext.params = options.params;

package/dist/content/content-layer.js

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

package/dist/content/vite-plugin-content-assets.js

@@ -26,7 +26,7 @@ function astroContentAssetPropagationPlugin({
         const params = new URLSearchParams(query);
         const importerParam = params.get("importer");
         const importerPath = importerParam ? fileURLToPath(new URL(importerParam, settings.config.root)) : importer;
-        const resolved = this.resolve(base, importerPath, { skipSelf: true, ...opts });
+        const resolved = await this.resolve(base, importerPath, { skipSelf: true, ...opts });
         if (!resolved) {
           throw new AstroError({
             ...AstroErrorData.ImageNotFound,

package/dist/content/vite-plugin-content-virtual-mod.js

@@ -40,14 +40,12 @@ function astroContentVirtualModPlugin({
   settings,
   fs
 }) {
-  let IS_DEV = false;
   let dataStoreFile;
   return {
     name: "astro-content-virtual-mod-plugin",
     enforce: "pre",
-    configResolved(config) {
-      IS_DEV = !config.isProduction;
-      dataStoreFile = getDataStoreFile(settings, IS_DEV);
+    config(_, env) {
+      dataStoreFile = getDataStoreFile(settings, env.command === "serve");
     },
     async resolveId(id) {
       if (id === VIRTUAL_MODULE_ID) {

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

@@ -44,6 +44,7 @@ export interface RenderErrorOptions {
      * Allows passing an error to 500.astro. It will be available through `Astro.props.error`.
      */
     error?: unknown;
+    clientAddress: string | undefined;
 }
 export declare class App {
     #private;

package/dist/core/app/index.js

@@ -156,7 +156,7 @@ class App {
     let clientAddress;
     let addCookieHeader;
     addCookieHeader = renderOptions?.addCookieHeader;
-    clientAddress = renderOptions?.clientAddress;
+    clientAddress = renderOptions?.clientAddress ?? Reflect.get(request, clientAddressSymbol);
     routeData = renderOptions?.routeData;
     locals = renderOptions?.locals;
     if (routeData) {
@@ -171,12 +171,8 @@ class App {
       if (typeof locals !== "object") {
         const error = new AstroError(AstroErrorData.LocalsNotAnObject);
         this.#logger.error(null, error.stack);
-        return this.#renderError(request, { status: 500, error });
+        return this.#renderError(request, { status: 500, error, clientAddress });
       }
-      Reflect.set(request, clientLocalsSymbol, locals);
-    }
-    if (clientAddress) {
-      Reflect.set(request, clientAddressSymbol, clientAddress);
     }
     if (!routeData) {
       routeData = this.match(request);
@@ -186,7 +182,7 @@ class App {
     if (!routeData) {
       this.#logger.debug("router", "Astro hasn't found routes that match " + request.url);
       this.#logger.debug("router", "Here's the available routes:\n", this.#manifestData);
-      return this.#renderError(request, { locals, status: 404 });
+      return this.#renderError(request, { locals, status: 404, clientAddress });
     }
     const pathname = this.#getPathnameFromRequest(request);
     const defaultStatus = this.#getDefaultStatusCode(routeData, pathname);
@@ -199,12 +195,13 @@ class App {
         pathname,
         request,
         routeData,
-        status: defaultStatus
+        status: defaultStatus,
+        clientAddress
       });
       response = await renderContext.render(await mod.page());
     } catch (err) {
       this.#logger.error(null, err.stack || err.message || String(err));
-      return this.#renderError(request, { locals, status: 500, error: err });
+      return this.#renderError(request, { locals, status: 500, error: err, clientAddress });
     }
     if (REROUTABLE_STATUS_CODES.includes(response.status) && response.headers.get(REROUTE_DIRECTIVE_HEADER) !== "no") {
       return this.#renderError(request, {
@@ -213,7 +210,8 @@ class App {
         status: response.status,
         // We don't have an error to report here. Passing null means we pass nothing intentionally
         // while undefined means there's no error
-        error: response.status === 500 ? null : void 0
+        error: response.status === 500 ? null : void 0,
+        clientAddress
       });
     }
     if (response.headers.has(REROUTE_DIRECTIVE_HEADER)) {
@@ -251,7 +249,8 @@ class App {
     status,
     response: originalResponse,
     skipMiddleware = false,
-    error
+    error,
+    clientAddress
   }) {
     const errorRoutePath = `/${status}${this.#manifest.trailingSlash === "always" ? "/" : ""}`;
     const errorRouteData = matchRoute(errorRoutePath, this.#manifestData);
@@ -279,7 +278,8 @@ class App {
           request,
           routeData: errorRouteData,
           status,
-          props: { error }
+          props: { error },
+          clientAddress
         });
         const response2 = await renderContext.render(await mod.page());
         return this.#mergeResponses(response2, originalResponse);
@@ -289,7 +289,8 @@ class App {
             locals,
             status,
             response: originalResponse,
-            skipMiddleware: true
+            skipMiddleware: true,
+            clientAddress
           });
         }
       }
@@ -314,6 +315,14 @@ class App {
       originalResponse.headers.delete("Content-type");
     } catch {
     }
+    const mergedHeaders = new Map([
+      ...Array.from(newResponse.headers),
+      ...Array.from(originalResponse.headers)
+    ]);
+    const newHeaders = new Headers();
+    for (const [name, value] of mergedHeaders) {
+      newHeaders.set(name, value);
+    }
     return new Response(newResponse.body, {
       status,
       statusText: status === 200 ? newResponse.statusText : originalResponse.statusText,
@@ -322,10 +331,7 @@ class App {
       // If users see something weird, it's because they are setting some headers they should not.
       //
       // Although, we don't want it to replace the content-type, because the error page must return `text/html`
-      headers: new Headers([
-        ...Array.from(newResponse.headers),
-        ...Array.from(originalResponse.headers)
-      ])
+      headers: newHeaders
     });
   }
   #getDefaultStatusCode(routeData, pathname) {

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

@@ -59,7 +59,6 @@ export type SSRManifest = {
     i18n: SSRManifestI18n | undefined;
     middleware?: () => Promise<AstroMiddlewareInstance> | AstroMiddlewareInstance;
     checkOrigin: boolean;
-    envGetSecretEnabled: boolean;
 };
 export type SSRManifestI18n = {
     fallback: Record<string, string> | undefined;

package/dist/core/base-pipeline.js

@@ -1,8 +1,5 @@
-import { setGetEnv } from "../env/runtime.js";
 import { createI18nMiddleware } from "../i18n/middleware.js";
 import { createOriginCheckMiddleware } from "./app/middlewares.js";
-import { AstroError } from "./errors/errors.js";
-import { AstroErrorData } from "./errors/index.js";
 import { NOOP_MIDDLEWARE_FN } from "./middleware/noop-middleware.js";
 import { sequence } from "./middleware/sequence.js";
 import { RouteCache } from "./render/route-cache.js";

package/dist/core/build/generate.js

@@ -295,13 +295,15 @@ async function generatePath(pathname, pipeline, gopts, route) {
     url,
     headers: new Headers(),
     logger,
-    isPrerendered: true
+    isPrerendered: true,
+    routePattern: route.component
   });
   const renderContext = await RenderContext.create({
     pipeline,
     pathname,
     request,
-    routeData: route
+    routeData: route,
+    clientAddress: void 0
   });
   let body;
   let response;
@@ -387,8 +389,7 @@ function createBuildManifest(settings, internals, renderers, middleware, key) {
       };
     },
     checkOrigin: (settings.config.security?.checkOrigin && settings.buildOutput === "server") ?? false,
-    key,
-    envGetSecretEnabled: false
+    key
   };
 }
 export {

package/dist/core/build/index.js

@@ -144,12 +144,12 @@ class AstroBuilder {
       viteConfig,
       key: keyPromise
     };
-    const { internals, ssrOutputChunkNames, contentFileNames } = await viteBuild(opts);
+    const { internals, ssrOutputChunkNames, ssrOutputAssetNames, contentFileNames } = await viteBuild(opts);
     const hasServerIslands = this.settings.serverIslandNameMap.size > 0;
     if (hasServerIslands && this.settings.buildOutput !== "server") {
       throw new AstroError(AstroErrorData.NoAdapterInstalledServerIslands);
     }
-    await staticBuild(opts, internals, ssrOutputChunkNames, contentFileNames);
+    await staticBuild(opts, internals, ssrOutputChunkNames, ssrOutputAssetNames, contentFileNames);
     this.timer.assetsStart = performance.now();
     Object.keys(assets).map((k) => {
       if (!assets[k]) return;

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

@@ -208,8 +208,7 @@ function buildManifest(opts, internals, staticFiles, encodedKey) {
     buildFormat: settings.config.build.format,
     checkOrigin: (settings.config.security?.checkOrigin && settings.buildOutput === "server") ?? false,
     serverIslandNameMap: Array.from(settings.serverIslandNameMap),
-    key: encodedKey,
-    envGetSecretEnabled: (unwrapSupportKind(settings.adapter?.supportedAstroFeatures.envGetSecret) ?? "unsupported") !== "unsupported"
+    key: encodedKey
   };
 }
 export {

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

@@ -21,7 +21,7 @@ function vitePluginRenderers(opts) {
           let rendererItems = "";
           for (const renderer of opts.settings.renderers) {
             const variable = `_renderer${i}`;
-            imports.push(`import ${variable} from '${renderer.serverEntrypoint}';`);
+            imports.push(`import ${variable} from ${JSON.stringify(renderer.serverEntrypoint)};`);
             rendererItems += `Object.assign(${JSON.stringify(renderer)}, { ssr: ${variable} }),`;
             i++;
           }

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

@@ -21,7 +21,7 @@ function vitePluginAdapter(adapter) {
     },
     async load(id) {
       if (id === RESOLVED_ADAPTER_VIRTUAL_MODULE_ID) {
-        return `export * from '${adapter.serverEntrypoint}';`;
+        return `export * from ${JSON.stringify(adapter.serverEntrypoint)};`;
       }
     }
   };

package/dist/core/build/static-build.d.ts

@@ -4,9 +4,10 @@ import type { StaticBuildOptions } from './types.js';
 export declare function viteBuild(opts: StaticBuildOptions): Promise<{
     internals: BuildInternals;
     ssrOutputChunkNames: string[];
+    ssrOutputAssetNames: string[];
     contentFileNames: undefined;
 }>;
-export declare function staticBuild(opts: StaticBuildOptions, internals: BuildInternals, ssrOutputChunkNames: string[], contentFileNames?: string[]): Promise<void>;
+export declare function staticBuild(opts: StaticBuildOptions, internals: BuildInternals, ssrOutputChunkNames: string[], ssrOutputAssetNames: string[], contentFileNames?: string[]): Promise<void>;
 export declare function copyFiles(fromFolder: URL, toFolder: URL, includeDotfiles?: boolean): Promise<void[] | undefined>;
 /**
  * This function takes the virtual module name of any page entrypoint and

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

@@ -69,16 +69,20 @@ async function viteBuild(opts) {
     teardown();
   }
   const ssrOutputChunkNames = [];
+  const ssrOutputAssetNames = [];
   for (const output of ssrOutputs) {
     for (const chunk of output.output) {
       if (chunk.type === "chunk") {
         ssrOutputChunkNames.push(chunk.fileName);
       }
+      if (chunk.type === "asset") {
+        ssrOutputAssetNames.push(chunk.fileName);
+      }
     }
   }
-  return { internals, ssrOutputChunkNames, contentFileNames };
+  return { internals, ssrOutputChunkNames, ssrOutputAssetNames, contentFileNames };
 }
-async function staticBuild(opts, internals, ssrOutputChunkNames, contentFileNames) {
+async function staticBuild(opts, internals, ssrOutputChunkNames, ssrOutputAssetNames, contentFileNames) {
   const { settings } = opts;
   if (settings.buildOutput === "static") {
     settings.timer.start("Static generate");
@@ -89,7 +93,7 @@ async function staticBuild(opts, internals, ssrOutputChunkNames, contentFileName
     settings.timer.start("Server generate");
     await generatePages(opts, internals);
     await cleanStaticOutput(opts, internals);
-    await ssrMoveAssets(opts);
+    await ssrMoveAssets(opts, ssrOutputAssetNames);
     settings.timer.end("Server generate");
   }
 }
@@ -305,27 +309,21 @@ async function copyFiles(fromFolder, toFolder, includeDotfiles = false) {
     })
   );
 }
-async function ssrMoveAssets(opts) {
+async function ssrMoveAssets(opts, ssrOutputAssetNames) {
   opts.logger.info("build", "Rearranging server assets...");
   const serverRoot = opts.settings.buildOutput === "static" ? opts.settings.config.build.client : opts.settings.config.build.server;
   const clientRoot = opts.settings.config.build.client;
-  const assets = opts.settings.config.build.assets;
-  const serverAssets = new URL(`./${assets}/`, appendForwardSlash(serverRoot.toString()));
-  const clientAssets = new URL(`./${assets}/`, appendForwardSlash(clientRoot.toString()));
-  const files = await glob(`**/*`, {
-    cwd: fileURLToPath(serverAssets)
-  });
-  if (files.length > 0) {
+  if (ssrOutputAssetNames.length > 0) {
     await Promise.all(
-      files.map(async function moveAsset(filename) {
-        const currentUrl = new URL(filename, appendForwardSlash(serverAssets.toString()));
-        const clientUrl = new URL(filename, appendForwardSlash(clientAssets.toString()));
+      ssrOutputAssetNames.map(async function moveAsset(filename) {
+        const currentUrl = new URL(filename, appendForwardSlash(serverRoot.toString()));
+        const clientUrl = new URL(filename, appendForwardSlash(clientRoot.toString()));
         const dir = new URL(path.parse(clientUrl.href).dir);
         if (!fs.existsSync(dir)) await fs.promises.mkdir(dir, { recursive: true });
         return fs.promises.rename(currentUrl, clientUrl);
       })
     );
-    removeEmptyDirs(fileURLToPath(serverAssets));
+    removeEmptyDirs(fileURLToPath(serverRoot));
   }
 }
 function makeAstroPageEntryPointFileName(prefix, facadeModuleId, routes) {