astro 5.11.2 → 5.12.0

package/dist/content/content-layer.js

@@ -164,7 +164,7 @@ ${contentConfig.error.message}`);
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "5.11.2") {
+    if (previousAstroVersion && previousAstroVersion !== "5.12.0") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -172,8 +172,8 @@ ${contentConfig.error.message}`);
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("5.11.2") {
-      await this.#store.metaStore().set("astro-version", "5.11.2");
+    if ("5.12.0") {
+      await this.#store.metaStore().set("astro-version", "5.12.0");
     }
     if (currentConfigDigest) {
       await this.#store.metaStore().set("content-config-digest", currentConfigDigest);

package/dist/content/loaders/file.js

@@ -1,6 +1,7 @@
 import { existsSync, promises as fs } from "node:fs";
 import { fileURLToPath } from "node:url";
 import yaml from "js-yaml";
+import toml from "smol-toml";
 import { FileGlobNotSupported, FileParserNotFound } from "../../core/errors/errors-data.js";
 import { AstroError } from "../../core/errors/index.js";
 import { posixRelative } from "../utils.js";
@@ -16,6 +17,8 @@ function file(fileName, options) {
     parse = (text) => yaml.load(text, {
       filename: fileName
     });
+  } else if (ext === "toml") {
+    parse = toml.parse;
   }
   if (options?.parser) parse = options.parser;
   if (parse === null) {

package/dist/core/config/schemas/base.d.ts

@@ -75,6 +75,7 @@ export declare const ASTRO_CONFIG_DEFAULTS: {
         preserveScriptOrder: false;
         liveContentCollections: false;
         csp: false;
+        rawEnvValues: false;
     };
 };
 export declare const AstroConfigSchema: z.ZodObject<{
@@ -975,6 +976,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
                 strictDynamic?: boolean | undefined;
             } | undefined;
         }>]>>>;
+        rawEnvValues: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     }, "strict", z.ZodTypeAny, {
         clientPrerender: boolean;
         contentIntellisense: boolean;
@@ -994,6 +996,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
                 strictDynamic?: boolean | undefined;
             } | undefined;
         };
+        rawEnvValues: boolean;
         fonts?: ({
             name: string;
             cssVariable: string;
@@ -1123,6 +1126,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
                 strictDynamic?: boolean | undefined;
             } | undefined;
         } | undefined;
+        rawEnvValues?: boolean | undefined;
     }>>;
     legacy: z.ZodDefault<z.ZodObject<{
         collections: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
@@ -1282,6 +1286,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
                 strictDynamic?: boolean | undefined;
             } | undefined;
         };
+        rawEnvValues: boolean;
         fonts?: ({
             name: string;
             cssVariable: string;
@@ -1610,6 +1615,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
                 strictDynamic?: boolean | undefined;
             } | undefined;
         } | undefined;
+        rawEnvValues?: boolean | undefined;
     } | undefined;
     legacy?: {
         collections?: boolean | undefined;

package/dist/core/config/schemas/base.js

@@ -58,7 +58,8 @@ const ASTRO_CONFIG_DEFAULTS = {
     headingIdCompat: false,
     preserveScriptOrder: false,
     liveContentCollections: false,
-    csp: false
+    csp: false,
+    rawEnvValues: false
   }
 };
 const highlighterTypesSchema = z.union([z.literal("shiki"), z.literal("prism")]).default(syntaxHighlightDefaults.type);
@@ -283,7 +284,8 @@ const AstroConfigSchema = z.object({
           strictDynamic: z.boolean().optional()
         }).optional()
       })
-    ]).optional().default(ASTRO_CONFIG_DEFAULTS.experimental.csp)
+    ]).optional().default(ASTRO_CONFIG_DEFAULTS.experimental.csp),
+    rawEnvValues: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.rawEnvValues)
   }).strict(
     `Invalid or outdated experimental feature.
 Check for incorrect spelling or outdated Astro version.

package/dist/core/config/schemas/relative.d.ts

@@ -898,6 +898,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
                 strictDynamic?: boolean | undefined;
             } | undefined;
         }>]>>>;
+        rawEnvValues: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     }, "strict", z.ZodTypeAny, {
         clientPrerender: boolean;
         contentIntellisense: boolean;
@@ -917,6 +918,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
                 strictDynamic?: boolean | undefined;
             } | undefined;
         };
+        rawEnvValues: boolean;
         fonts?: ({
             name: string;
             cssVariable: string;
@@ -1046,6 +1048,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
                 strictDynamic?: boolean | undefined;
             } | undefined;
         } | undefined;
+        rawEnvValues?: boolean | undefined;
     }>>;
     legacy: z.ZodDefault<z.ZodObject<{
         collections: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
@@ -1283,6 +1286,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
                 strictDynamic?: boolean | undefined;
             } | undefined;
         };
+        rawEnvValues: boolean;
         fonts?: ({
             name: string;
             cssVariable: string;
@@ -1611,6 +1615,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
                 strictDynamic?: boolean | undefined;
             } | undefined;
         } | undefined;
+        rawEnvValues?: boolean | undefined;
     } | undefined;
     legacy?: {
         collections?: boolean | undefined;
@@ -1767,6 +1772,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
                 strictDynamic?: boolean | undefined;
             } | undefined;
         };
+        rawEnvValues: boolean;
         fonts?: ({
             name: string;
             cssVariable: string;
@@ -2095,6 +2101,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
                 strictDynamic?: boolean | undefined;
             } | undefined;
         } | undefined;
+        rawEnvValues?: boolean | undefined;
     } | undefined;
     legacy?: {
         collections?: boolean | undefined;

package/dist/core/config/settings.js

@@ -1,13 +1,19 @@
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import yaml from "js-yaml";
+import toml from "smol-toml";
 import { getContentPaths } from "../../content/index.js";
 import createPreferences from "../../preferences/index.js";
 import { markdownContentEntryType } from "../../vite-plugin-markdown/content-entry-type.js";
 import { getDefaultClientDirectives } from "../client-directive/index.js";
 import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from "./../constants.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
-import { formatYAMLException, isYAMLException } from "../errors/utils.js";
+import {
+  formatTOMLError,
+  formatYAMLException,
+  isTOMLError,
+  isYAMLException
+} from "../errors/utils.js";
 import { AstroTimer } from "./timer.js";
 import { loadTSConfig } from "./tsconfig.js";
 function createBaseSettings(config) {
@@ -86,6 +92,31 @@ function createBaseSettings(config) {
             });
           }
         }
+      },
+      {
+        extensions: [".toml"],
+        getEntryInfo({ contents, fileUrl }) {
+          try {
+            const data = toml.parse(contents);
+            const rawData = contents;
+            return { data, rawData };
+          } catch (e) {
+            const pathRelToContentDir = path.relative(
+              fileURLToPath(contentDir),
+              fileURLToPath(fileUrl)
+            );
+            const formattedError = isTOMLError(e) ? formatTOMLError(e) : new Error("contains invalid TOML.");
+            throw new AstroError({
+              ...AstroErrorData.DataCollectionEntryParseError,
+              message: AstroErrorData.DataCollectionEntryParseError.message(
+                pathRelToContentDir,
+                formattedError.message
+              ),
+              stack: formattedError.stack,
+              location: "loc" in formattedError ? { file: fileUrl.pathname, ...formattedError.loc } : { file: fileUrl.pathname }
+            });
+          }
+        }
       }
     ],
     renderers: [],

package/dist/core/constants.js

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

package/dist/core/create-vite.js

@@ -85,7 +85,12 @@ async function createVite(commandConfig, { settings, logger, mode, command, fs =
     }
   });
   const srcDirPattern = convertPathToPattern(fileURLToPath(settings.config.srcDir));
-  const envLoader = createEnvLoader(mode, settings.config);
+  const astroEnvLoader = createEnvLoader(mode, settings.config, false);
+  const importMetaEnvLoader = createEnvLoader(
+    mode,
+    settings.config,
+    settings.config.experimental.rawEnvValues
+  );
   const commonConfig = {
     // Tell Vite not to combine config from vite.config.js with our provided inline config
     configFile: false,
@@ -111,8 +116,8 @@ async function createVite(commandConfig, { settings, logger, mode, command, fs =
       // the build to run very slow as the filewatcher is triggered often.
       command === "dev" && vitePluginAstroServer({ settings, logger, fs, routesList, manifest }),
       // manifest is only required in dev mode, where it gets created before a Vite instance is created, and get passed to this function
-      importMetaEnv({ envLoader }),
-      astroEnv({ settings, sync, envLoader }),
+      importMetaEnv({ envLoader: importMetaEnvLoader }),
+      astroEnv({ settings, sync, envLoader: astroEnvLoader }),
       markdownVitePlugin({ settings, logger }),
       htmlVitePlugin(),
       astroPostprocessVitePlugin(),

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.11.2";
+  const currentVersion = "5.12.0";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

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

@@ -1597,7 +1597,7 @@ export declare const ContentCollectionTypeMismatchError: {
  * @docs
  * @message `COLLECTION_ENTRY_NAME` failed to parse.
  * @description
- * Collection entries of `type: 'data'` must return an object with valid JSON (for `.json` entries) or YAML (for `.yaml` entries).
+ * Collection entries of `type: 'data'` must return an object with valid JSON (for `.json` entries), YAML (for `.yaml` entries) or TOML (for `.toml` entries).
  */
 export declare const DataCollectionEntryParseError: {
     name: string;
@@ -1634,7 +1634,7 @@ export declare const UnsupportedConfigTransformError: {
  * @see
  *  - [Passing a `parser` to the `file` loader](https://docs.astro.build/en/guides/content-collections/#parser-function)
  * @description
- * The `file` loader can’t determine which parser to use. Please provide a custom parser (e.g. `toml.parse` or `csv-parse`) to create a collection from your file type.
+ * The `file` loader can’t determine which parser to use. Please provide a custom parser (e.g. `csv-parse`) to create a collection from your file type.
  */
 export declare const FileParserNotFound: {
     name: string;

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

@@ -635,7 +635,7 @@ const DataCollectionEntryParseError = {
   message(entryId, errorMessage) {
     return `**${entryId}** failed to parse: ${errorMessage}`;
   },
-  hint: "Ensure your data entry is an object with valid JSON (for `.json` entries) or YAML (for `.yaml` entries)."
+  hint: "Ensure your data entry is an object with valid JSON (for `.json` entries), YAML (for `.yaml` entries) or TOML (for `.toml` entries)."
 };
 const DuplicateContentEntrySlugError = {
   name: "DuplicateContentEntrySlugError",

package/dist/core/errors/utils.d.ts

@@ -1,4 +1,5 @@
 import type { YAMLException } from 'js-yaml';
+import type { TomlError } from 'smol-toml';
 import type { ErrorPayload as ViteErrorPayload } from 'vite';
 /**
  * Get the line and character based on the offset
@@ -12,6 +13,9 @@ export declare function positionAt(offset: number, text: string): {
 export declare function isYAMLException(err: unknown): err is YAMLException;
 /** Format YAML exceptions as Vite errors */
 export declare function formatYAMLException(e: YAMLException): ViteErrorPayload['err'];
+export declare function isTOMLError(err: unknown): err is TomlError;
+/** Format TOML exceptions as Vite errors */
+export declare function formatTOMLError(e: TomlError): ViteErrorPayload['err'];
 /** Coalesce any throw variable to an Error instance. */
 export declare function createSafeError(err: any): Error;
 export declare function normalizeLF(code: string): string;

package/dist/core/errors/utils.js

@@ -57,6 +57,18 @@ function formatYAMLException(e) {
     stack: e.stack ?? ""
   };
 }
+function isTOMLError(err) {
+  return err instanceof Error && err.name === "TomlError";
+}
+function formatTOMLError(e) {
+  return {
+    name: e.name,
+    id: e.name,
+    loc: { line: e.line + 1, column: e.column },
+    message: e.message,
+    stack: e.stack ?? ""
+  };
+}
 function createSafeError(err) {
   if (err instanceof Error || err?.name && err.message) {
     return err;
@@ -71,7 +83,9 @@ function normalizeLF(code) {
 }
 export {
   createSafeError,
+  formatTOMLError,
   formatYAMLException,
+  isTOMLError,
   isYAMLException,
   normalizeLF,
   positionAt

package/dist/core/messages.js

@@ -37,7 +37,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "5.11.2";
+  const version = "5.12.0";
   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${"5.11.2"}`
+        `v${"5.12.0"}`
       )} ${headline}`
     );
   }

package/dist/env/env-loader.d.ts

@@ -1,5 +1,5 @@
 import type { AstroConfig } from '../types/public/index.js';
-export declare const createEnvLoader: (mode: string, config: AstroConfig) => {
+export declare const createEnvLoader: (mode: string, config: AstroConfig, useRawValues: boolean) => {
     get: () => Record<string, string>;
     getPrivateEnv: () => Record<string, string>;
 };

package/dist/env/env-loader.js

@@ -1,7 +1,7 @@
 import { fileURLToPath } from "node:url";
 import { loadEnv } from "vite";
 const isValidIdentifierRe = /^[_$a-zA-Z][\w$]*$/;
-function getPrivateEnv(fullEnv, astroConfig) {
+function getPrivateEnv(fullEnv, astroConfig, useRawValues) {
   const viteConfig = astroConfig.vite;
   let envPrefixes = ["PUBLIC_"];
   if (viteConfig.envPrefix) {
@@ -15,7 +15,7 @@ function getPrivateEnv(fullEnv, astroConfig) {
         if (typeof value !== "string") {
           value = `${value}`;
         }
-        if (value === "0" || value === "1" || value === "true" || value === "false") {
+        if (!useRawValues && (value === "0" || value === "1" || value === "true" || value === "false")) {
           privateEnv[key] = value;
         } else {
           privateEnv[key] = `process.env.${key}`;
@@ -27,9 +27,9 @@ function getPrivateEnv(fullEnv, astroConfig) {
   }
   return privateEnv;
 }
-const createEnvLoader = (mode, config) => {
+const createEnvLoader = (mode, config, useRawValues) => {
   const loaded = loadEnv(mode, config.vite.envDir ?? fileURLToPath(config.root), "");
-  const privateEnv = getPrivateEnv(loaded, config);
+  const privateEnv = getPrivateEnv(loaded, config, useRawValues);
   return {
     get: () => loaded,
     getPrivateEnv: () => privateEnv

package/dist/types/public/config.d.ts

@@ -2307,6 +2307,24 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
          *
          */
         liveContentCollections?: boolean;
+        /**
+         * @name experimental.rawEnvValues
+         * @type {boolean}
+         * @default `false`
+         * @version 5.12
+         * @description
+         *
+         * Disables coercion of `import.meta.env` values that are populated from `process.env`, allowing you to use the raw value.
+         *
+         * By default, Astro converts your environment variables used through `import.meta.env` in some cases, and this can prevent
+         * access to some values such as the strings `"true"` (which is converted to a boolean value), and `"1"` (which is converted
+         * to a number).
+         *
+         * This flag aligns `import.meta.env`'s behavior in Astro with [Vite](https://vite.dev/guide/env-and-mode.html#env-variables).
+         *
+         * See the [experimental raw environment variables guide](https://docs.astro.build/en/reference/experimental-flags/raw-env-values/) for more information.
+         */
+        rawEnvValues?: boolean;
     };
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.11.2",
+  "version": "5.12.0",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -141,6 +141,7 @@
     "rehype": "^13.0.2",
     "semver": "^7.7.1",
     "shiki": "^3.2.1",
+    "smol-toml": "^1.3.4",
     "tinyexec": "^0.3.2",
     "tinyglobby": "^0.2.12",
     "tsconfck": "^3.1.5",
@@ -157,9 +158,9 @@
     "zod": "^3.24.2",
     "zod-to-json-schema": "^3.24.5",
     "zod-to-ts": "^1.2.0",
-    "@astrojs/internal-helpers": "0.6.1",
+    "@astrojs/markdown-remark": "6.3.3",
     "@astrojs/telemetry": "3.3.0",
-    "@astrojs/markdown-remark": "6.3.2"
+    "@astrojs/internal-helpers": "0.6.1"
   },
   "optionalDependencies": {
     "sharp": "^0.33.3"