astro 5.1.3 → 5.1.5

package/dist/env/schema.d.ts

@@ -192,62 +192,80 @@ declare const EnvFieldType: z.ZodUnion<[z.ZodObject<{
     optional?: boolean | undefined;
 }>]>;
 export type EnvFieldType = z.infer<typeof EnvFieldType>;
-declare const EnvFieldMetadata: z.ZodUnion<[z.ZodObject<{
-    context: z.ZodLiteral<"client">;
-    access: z.ZodLiteral<"public">;
-}, "strip", z.ZodTypeAny, {
+declare const EnvFieldMetadata: z.ZodEffects<z.ZodType<{
     context: "client";
     access: "public";
-}, {
+} | {
+    context: "server";
+    access: "public";
+} | {
+    context: "server";
+    access: "secret";
+}, z.ZodTypeDef, {
     context: "client";
     access: "public";
-}>, z.ZodObject<{
-    context: z.ZodLiteral<"server">;
-    access: z.ZodLiteral<"public">;
-}, "strip", z.ZodTypeAny, {
+} | {
     context: "server";
     access: "public";
-}, {
+} | {
     context: "server";
+    access: "secret";
+}>, {
+    context: "client";
     access: "public";
-}>, z.ZodObject<{
-    context: z.ZodLiteral<"server">;
-    access: z.ZodLiteral<"secret">;
-}, "strip", z.ZodTypeAny, {
+} | {
+    context: "server";
+    access: "public";
+} | {
     context: "server";
     access: "secret";
 }, {
+    context: "client";
+    access: "public";
+} | {
+    context: "server";
+    access: "public";
+} | {
     context: "server";
     access: "secret";
-}>]>;
-export declare const EnvSchema: z.ZodRecord<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, z.ZodIntersection<z.ZodUnion<[z.ZodObject<{
-    context: z.ZodLiteral<"client">;
-    access: z.ZodLiteral<"public">;
-}, "strip", z.ZodTypeAny, {
+}>;
+export declare const EnvSchema: z.ZodRecord<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, z.ZodIntersection<z.ZodEffects<z.ZodType<{
     context: "client";
     access: "public";
-}, {
+} | {
+    context: "server";
+    access: "public";
+} | {
+    context: "server";
+    access: "secret";
+}, z.ZodTypeDef, {
     context: "client";
     access: "public";
-}>, z.ZodObject<{
-    context: z.ZodLiteral<"server">;
-    access: z.ZodLiteral<"public">;
-}, "strip", z.ZodTypeAny, {
+} | {
     context: "server";
     access: "public";
-}, {
+} | {
     context: "server";
+    access: "secret";
+}>, {
+    context: "client";
     access: "public";
-}>, z.ZodObject<{
-    context: z.ZodLiteral<"server">;
-    access: z.ZodLiteral<"secret">;
-}, "strip", z.ZodTypeAny, {
+} | {
+    context: "server";
+    access: "public";
+} | {
     context: "server";
     access: "secret";
 }, {
+    context: "client";
+    access: "public";
+} | {
+    context: "server";
+    access: "public";
+} | {
     context: "server";
     access: "secret";
-}>]>, z.ZodUnion<[z.ZodObject<{
+}>, z.ZodUnion<[z.ZodObject<{
     type: z.ZodLiteral<"string">;
     optional: z.ZodOptional<z.ZodBoolean>;
     default: z.ZodOptional<z.ZodString>;

package/dist/env/schema.js

@@ -64,11 +64,30 @@ const SecretServerEnvFieldMetadata = z.object({
   context: z.literal("server"),
   access: z.literal("secret")
 });
-const EnvFieldMetadata = z.union([
+const _EnvFieldMetadata = z.union([
   PublicClientEnvFieldMetadata,
   PublicServerEnvFieldMetadata,
   SecretServerEnvFieldMetadata
 ]);
+const EnvFieldMetadata = z.custom().superRefine((data, ctx) => {
+  const result = _EnvFieldMetadata.safeParse(data);
+  if (result.success) {
+    return;
+  }
+  for (const issue of result.error.issues) {
+    if (issue.code === z.ZodIssueCode.invalid_union) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: `**Invalid combination** of "access" and "context" options:
+  Secret client variables are not supported. Please review the configuration of \`env.schema.${ctx.path.at(-1)}\`.
+  Learn more at https://docs.astro.build/en/guides/environment-variables/#variable-types`,
+        path: ["context", "access"]
+      });
+    } else {
+      ctx.addIssue(issue);
+    }
+  }
+});
 const EnvSchemaKey = z.string().min(1).refine(([firstChar]) => isNaN(Number.parseInt(firstChar)), {
   message: "A valid variable name cannot start with a number."
 }).refine((str) => /^[A-Z0-9_]+$/.test(str), {

package/dist/vite-plugin-astro/compile.js

@@ -12,8 +12,8 @@ async function compileAstro({
   try {
     transformResult = await compile(compileProps);
     esbuildResult = await transformWithEsbuild(transformResult.code, compileProps.filename, {
+      ...compileProps.viteConfig.esbuild,
       loader: "ts",
-      target: "esnext",
       sourcemap: "external",
       tsconfigRaw: {
         compilerOptions: {

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

@@ -17,7 +17,7 @@ async function handleRequest({
   if (config.trailingSlash === "never" && !incomingRequest.url) {
     pathname = "";
   } else {
-    pathname = url.pathname;
+    pathname = decodeURI(url.pathname);
   }
   url.pathname = removeTrailingForwardSlash(config.base) + url.pathname;
   let body = void 0;

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

@@ -179,7 +179,7 @@ async function handleRoute({
     const fourOhFourRoute = await matchRoute("/404", manifestData, pipeline);
     if (fourOhFourRoute) {
       renderContext = await RenderContext.create({
-        locals: {},
+        locals,
         pipeline,
         pathname,
         middleware: isDefaultPrerendered404(fourOhFourRoute.route) ? void 0 : middleware,

package/dist/vite-plugin-markdown/content-entry-type.js

@@ -17,12 +17,7 @@ const markdownContentEntryType = {
   async getRenderFunction(config) {
     const processor = await createMarkdownProcessor(config.markdown);
     return async function renderToString(entry) {
-      if (!entry.body) {
-        return {
-          html: ""
-        };
-      }
-      const result = await processor.render(entry.body, {
+      const result = await processor.render(entry.body ?? "", {
         frontmatter: entry.data,
         // @ts-expect-error Internal API
         fileURL: entry.filePath ? pathToFileURL(entry.filePath) : void 0

package/dist/vite-plugin-markdown/index.js

@@ -4,10 +4,10 @@ import {
   createMarkdownProcessor,
   isFrontmatterValid
 } from "@astrojs/markdown-remark";
-import { normalizePath } from "vite";
 import { safeParseFrontmatter } from "../content/utils.js";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { isMarkdownFile, isPage } from "../core/util.js";
+import { normalizePath } from "../core/viteUtils.js";
 import { shorthash } from "../runtime/server/shorthash.js";
 import { createDefaultAstroMetadata } from "../vite-plugin-astro/metadata.js";
 import { getFileInfo } from "../vite-plugin-utils/index.js";

package/dist/vite-plugin-scanner/index.js

@@ -1,11 +1,10 @@
 import { extname } from "node:path";
 import { fileURLToPath } from "node:url";
 import { bold } from "kleur/colors";
-import { normalizePath } from "vite";
 import { warnMissingAdapter } from "../core/dev/adapter-validation.js";
 import { getRoutePrerenderOption } from "../core/routing/manifest/prerender.js";
 import { isEndpoint, isPage } from "../core/util.js";
-import { rootRelativePath } from "../core/viteUtils.js";
+import { normalizePath, rootRelativePath } from "../core/viteUtils.js";
 const KNOWN_FILE_EXTENSIONS = [".astro", ".js", ".ts"];
 function astroScannerPlugin({
   settings,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.1.3",
+  "version": "5.1.5",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -211,6 +211,10 @@
   "publishConfig": {
     "provenance": true
   },
+  "funding": {
+    "type": "opencollective",
+    "url": "https://opencollective.com/astrodotbuild"
+  },
   "scripts": {
     "prebuild": "astro-scripts prebuild --to-string \"src/runtime/server/astro-island.ts\" \"src/runtime/client/{idle,load,media,only,visible}.ts\"",
     "build": "pnpm run prebuild && astro-scripts build \"src/**/*.{ts,js}\" --copy-wasm && tsc",