astro 5.0.4 → 5.0.5

package/dist/assets/utils/node/emitAsset.d.ts

@@ -6,5 +6,5 @@ type ImageMetadataWithContents = ImageMetadata & {
 };
 export declare function emitESMImage(id: string | undefined, 
 /** @deprecated */
-_watchMode: boolean, fileEmitter?: FileEmitter): Promise<ImageMetadataWithContents | undefined>;
+_watchMode: boolean, experimentalSvgEnabled: boolean, fileEmitter?: FileEmitter): Promise<ImageMetadataWithContents | undefined>;
 export {};

package/dist/assets/utils/node/emitAsset.js

@@ -3,7 +3,7 @@ import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { prependForwardSlash, slash } from "../../../core/path.js";
 import { imageMetadata } from "../metadata.js";
-async function emitESMImage(id, _watchMode, fileEmitter) {
+async function emitESMImage(id, _watchMode, experimentalSvgEnabled, fileEmitter) {
   if (!id) {
     return void 0;
   }
@@ -24,7 +24,7 @@ async function emitESMImage(id, _watchMode, fileEmitter) {
     writable: false,
     value: id
   });
-  if (fileMetadata.format === "svg") {
+  if (fileMetadata.format === "svg" && experimentalSvgEnabled === true) {
     emittedImage.contents = fileData;
   }
   let isBuild = typeof fileEmitter === "function";

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

@@ -167,7 +167,12 @@ function assets({ settings }) {
             return;
           }
           const emitFile = shouldEmitFile ? this.emitFile : void 0;
-          const imageMetadata = await emitESMImage(id, this.meta.watchMode, emitFile);
+          const imageMetadata = await emitESMImage(
+            id,
+            this.meta.watchMode,
+            !!settings.config.experimental.svg,
+            emitFile
+          );
           if (!imageMetadata) {
             throw new AstroError({
               ...AstroErrorData.ImageNotFound,

package/dist/cli/info/index.js

@@ -46,7 +46,7 @@ async function copyToClipboard(text, force) {
     command = "clip";
   } else {
     const unixCommands = [
-      ["xclip", ["-sel", "clipboard", "-l", "1"]],
+      ["xclip", ["-selection", "clipboard", "-l", "1"]],
       ["wl-copy", []]
     ];
     for (const [unixCommand, unixArgs] of unixCommands) {
@@ -77,7 +77,7 @@ async function copyToClipboard(text, force) {
     if (!shouldCopy) return;
   }
   try {
-    const result = spawnSync(command, args, { input: text });
+    const result = spawnSync(command, args, { input: text, stdio: ["pipe", "ignore", "ignore"] });
     if (result.error) {
       throw result.error;
     }

package/dist/content/content-layer.js

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

package/dist/content/mutable-data-store.js

@@ -73,7 +73,7 @@ class MutableDataStore extends ImmutableDataStore {
     const exports = [];
     this.#assetImports.forEach((id) => {
       const symbol = importIdToSymbolName(id);
-      imports.push(`import ${symbol} from '${id}';`);
+      imports.push(`import ${symbol} from ${JSON.stringify(id)};`);
       exports.push(`[${JSON.stringify(id)}, ${symbol}]`);
     });
     const code = (
@@ -104,7 +104,7 @@ export default new Map([${exports.join(", ")}]);
     }
     const lines = [];
     for (const [fileName, specifier] of this.#moduleImports) {
-      lines.push(`['${fileName}', () => import('${specifier}')]`);
+      lines.push(`[${JSON.stringify(fileName)}, () => import(${JSON.stringify(specifier)})]`);
     }
     const code = `
 export default new Map([

package/dist/content/runtime-assets.d.ts

@@ -1,6 +1,6 @@
 import type { PluginContext } from 'rollup';
 import { z } from 'zod';
-export declare function createImage(pluginContext: PluginContext, shouldEmitFile: boolean, entryFilePath: string): () => z.ZodEffects<z.ZodString, z.ZodNever | {
+export declare function createImage(pluginContext: PluginContext, shouldEmitFile: boolean, entryFilePath: string, experimentalSvgEnabled: boolean): () => z.ZodEffects<z.ZodString, z.ZodNever | {
     ASTRO_ASSET: string;
     width: number;
     height: number;

package/dist/content/runtime-assets.js

@@ -1,12 +1,13 @@
 import { z } from "zod";
 import { emitESMImage } from "../assets/utils/node/emitAsset.js";
-function createImage(pluginContext, shouldEmitFile, entryFilePath) {
+function createImage(pluginContext, shouldEmitFile, entryFilePath, experimentalSvgEnabled) {
   return () => {
     return z.string().transform(async (imagePath, ctx) => {
       const resolvedFilePath = (await pluginContext.resolve(imagePath, entryFilePath))?.id;
       const metadata = await emitESMImage(
         resolvedFilePath,
         pluginContext.meta.watchMode,
+        experimentalSvgEnabled,
         shouldEmitFile ? pluginContext.emitFile : void 0
       );
       if (!metadata) {

package/dist/content/utils.d.ts

@@ -469,7 +469,7 @@ export declare function getEntryDataAndImages<TInputData extends Record<string,
     collection: string;
     unvalidatedData: TInputData;
     _internal: EntryInternal;
-}, collectionConfig: CollectionConfig, shouldEmitFile: boolean, pluginContext?: PluginContext): Promise<{
+}, collectionConfig: CollectionConfig, shouldEmitFile: boolean, experimentalSvgEnabled: boolean, pluginContext?: PluginContext): Promise<{
     data: TOutputData;
     imageImports: Array<string>;
 }>;
@@ -478,7 +478,7 @@ export declare function getEntryData(entry: {
     collection: string;
     unvalidatedData: Record<string, unknown>;
     _internal: EntryInternal;
-}, collectionConfig: CollectionConfig, shouldEmitFile: boolean, pluginContext?: PluginContext): Promise<Record<string, unknown>>;
+}, collectionConfig: CollectionConfig, shouldEmitFile: boolean, experimentalSvgEnabled: boolean, pluginContext?: PluginContext): Promise<Record<string, unknown>>;
 export declare function getContentEntryExts(settings: Pick<AstroSettings, 'contentEntryTypes'>): string[];
 export declare function getDataEntryExts(settings: Pick<AstroSettings, 'dataEntryTypes'>): string[];
 export declare function getEntryConfigByExtMap<TEntryType extends ContentEntryType | DataEntryType>(entryTypes: TEntryType[]): Map<string, TEntryType>;

package/dist/content/utils.js

@@ -110,7 +110,7 @@ function parseEntrySlug({
     });
   }
 }
-async function getEntryDataAndImages(entry, collectionConfig, shouldEmitFile, pluginContext) {
+async function getEntryDataAndImages(entry, collectionConfig, shouldEmitFile, experimentalSvgEnabled, pluginContext) {
   let data;
   if (collectionConfig.type === "content" || collectionConfig._legacy) {
     const { slug, ...unvalidatedData } = entry.unvalidatedData;
@@ -123,7 +123,12 @@ async function getEntryDataAndImages(entry, collectionConfig, shouldEmitFile, pl
   if (typeof schema === "function") {
     if (pluginContext) {
       schema = schema({
-        image: createImage(pluginContext, shouldEmitFile, entry._internal.filePath)
+        image: createImage(
+          pluginContext,
+          shouldEmitFile,
+          entry._internal.filePath,
+          experimentalSvgEnabled
+        )
       });
     } else if (collectionConfig.type === CONTENT_LAYER_TYPE) {
       schema = schema({
@@ -173,11 +178,12 @@ async function getEntryDataAndImages(entry, collectionConfig, shouldEmitFile, pl
   }
   return { data, imageImports: Array.from(imageImports) };
 }
-async function getEntryData(entry, collectionConfig, shouldEmitFile, pluginContext) {
+async function getEntryData(entry, collectionConfig, shouldEmitFile, experimentalSvgEnabled, pluginContext) {
   const { data } = await getEntryDataAndImages(
     entry,
     collectionConfig,
     shouldEmitFile,
+    experimentalSvgEnabled,
     pluginContext
   );
   return data;

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

@@ -171,6 +171,7 @@ async function getContentEntryModule(params) {
     { id, collection, _internal, unvalidatedData },
     collectionConfig,
     params.shouldEmitFile,
+    !!params.config.experimental.svg,
     pluginContext
   ) : unvalidatedData;
   const contentEntryModule = {
@@ -196,6 +197,7 @@ async function getDataEntryModule(params) {
     { id, collection, _internal, unvalidatedData },
     collectionConfig,
     params.shouldEmitFile,
+    !!params.config.experimental.svg,
     pluginContext
   ) : unvalidatedData;
   const dataEntryModule = {

package/dist/core/build/pipeline.js

@@ -94,11 +94,10 @@ class BuildPipeline extends Pipeline {
     }
     const renderersEntryUrl = new URL(`renderers.mjs?time=${Date.now()}`, baseDirectory);
     const renderers = await import(renderersEntryUrl.toString());
-    const middleware = internals.middlewareEntryPoint ? await import(internals.middlewareEntryPoint.toString()).then((mod) => {
-      return function() {
-        return { onRequest: mod.onRequest };
-      };
-    }) : manifest.middleware;
+    const middleware = internals.middlewareEntryPoint ? async function() {
+      const mod = await import(internals.middlewareEntryPoint.toString());
+      return { onRequest: mod.onRequest };
+    } : 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/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "5.0.4";
+const ASTRO_VERSION = "5.0.5";
 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 = "5.0.4";
+  const currentVersion = "5.0.5";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/messages.js

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

package/dist/core/util.js

@@ -2,7 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from "./constants.js";
-import { removeTrailingForwardSlash, slash } from "./path.js";
+import { removeQueryString, removeTrailingForwardSlash, slash } from "./path.js";
 function isObject(value) {
   return typeof value === "object" && value != null;
 }
@@ -10,9 +10,10 @@ function isURL(value) {
   return Object.prototype.toString.call(value) === "[object URL]";
 }
 function isMarkdownFile(fileId, option) {
+  const id = removeQueryString(fileId);
   const _suffix = option?.suffix ?? "";
   for (let markdownFileExtension of SUPPORTED_MARKDOWN_FILE_EXTENSIONS) {
-    if (fileId.endsWith(`${markdownFileExtension}${_suffix}`)) return true;
+    if (id.endsWith(`${markdownFileExtension}${_suffix}`)) return true;
   }
   return false;
 }

package/package.json

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