astro 5.2.6 → 5.3.1

package/dist/container/index.js

@@ -38,6 +38,7 @@ function createManifest(manifest, renderers, middleware) {
     clientDirectives: manifest?.clientDirectives ?? getDefaultClientDirectives(),
     renderers: renderers ?? manifest?.renderers ?? [],
     base: manifest?.base ?? ASTRO_CONFIG_DEFAULTS.base,
+    userAssetsBase: manifest?.userAssetsBase ?? "",
     componentMetadata: manifest?.componentMetadata ?? /* @__PURE__ */ new Map(),
     inlinedScripts: manifest?.inlinedScripts ?? /* @__PURE__ */ new Map(),
     i18n: manifest?.i18n,

package/dist/content/content-layer.js

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

package/dist/content/loaders/glob.js

@@ -1,10 +1,10 @@
 import { promises as fs, existsSync } from "node:fs";
 import { relative } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
-import fastGlob from "fast-glob";
 import { bold, green } from "kleur/colors";
-import micromatch from "micromatch";
 import pLimit from "p-limit";
+import picomatch from "picomatch";
+import { glob as tinyglobby } from "tinyglobby";
 import { getContentEntryIdAndSlug, posixRelative } from "../utils.js";
 function generateIdDefault({ entry, base, data }) {
   if (data.slug) {
@@ -154,8 +154,9 @@ function glob(globOptions) {
       if (!exists) {
         logger.warn(`The base directory "${fileURLToPath(baseDir)}" does not exist.`);
       }
-      const files = await fastGlob(globOptions.pattern, {
-        cwd: fileURLToPath(baseDir)
+      const files = await tinyglobby(globOptions.pattern, {
+        cwd: fileURLToPath(baseDir),
+        expandDirectories: false
       });
       if (exists && files.length === 0) {
         logger.warn(
@@ -220,7 +221,7 @@ function glob(globOptions) {
         return;
       }
       watcher.add(filePath);
-      const matchesGlob = (entry) => !entry.startsWith("../") && micromatch.isMatch(entry, globOptions.pattern);
+      const matchesGlob = (entry) => !entry.startsWith("../") && picomatch.isMatch(entry, globOptions.pattern);
       const basePath = fileURLToPath(baseDir);
       async function onChange(changedPath) {
         const entry = posixRelative(basePath, changedPath);

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

@@ -4,8 +4,8 @@ export declare function createImage(pluginContext: PluginContext, shouldEmitFile
     ASTRO_ASSET: string;
     width: number;
     height: number;
-    format: import("../assets/types.js").ImageInputFormat;
     src: string;
+    format: import("../assets/types.js").ImageInputFormat;
     fsPath: string;
     orientation?: number | undefined;
 }, string>;

package/dist/content/types-generator.js

@@ -1,7 +1,7 @@
 import * as path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
-import glob from "fast-glob";
 import { bold, cyan } from "kleur/colors";
+import { glob } from "tinyglobby";
 import { normalizePath } from "vite";
 import { z } from "zod";
 import { zodToJsonSchema } from "zod-to-json-schema";
@@ -48,20 +48,15 @@ async function createContentTypesGenerator({
       }
       const globResult = await glob("**", {
         cwd: fileURLToPath(contentPaths.contentDir),
-        fs: {
-          readdir: fs.readdir.bind(fs),
-          readdirSync: fs.readdirSync.bind(fs)
-        },
-        onlyFiles: false,
-        objectMode: true
+        absolute: true
       });
-      for (const entry of globResult) {
-        const fullPath = path.join(fileURLToPath(contentPaths.contentDir), entry.path);
+      for (const fullPath of globResult) {
         const entryURL = pathToFileURL(fullPath);
         if (entryURL.href.startsWith(contentPaths.config.url.href)) continue;
-        if (entry.dirent.isFile()) {
+        const stat = fs.statSync(fullPath);
+        if (stat.isFile()) {
           events.push({ name: "add", entry: entryURL });
-        } else if (entry.dirent.isDirectory()) {
+        } else if (stat.isDirectory()) {
           events.push({ name: "addDir", entry: entryURL });
         }
       }

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

@@ -2,8 +2,8 @@ import nodeFs from "node:fs";
 import { extname } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { dataToEsm } from "@rollup/pluginutils";
-import glob from "fast-glob";
 import pLimit from "p-limit";
+import { glob } from "tinyglobby";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { rootRelativePath } from "../core/viteUtils.js";
 import { createDefaultAstroMetadata } from "../vite-plugin-astro/metadata.js";
@@ -225,7 +225,7 @@ async function generateLookupMap({
     {
       absolute: true,
       cwd: fileURLToPath(root),
-      fs
+      expandDirectories: false
     }
   );
   const limit = pLimit(10);

package/dist/core/app/middlewares.js

@@ -4,26 +4,27 @@ const FORM_CONTENT_TYPES = [
   "multipart/form-data",
   "text/plain"
 ];
+const SAFE_METHODS = ["GET", "HEAD", "OPTIONS"];
 function createOriginCheckMiddleware() {
   return defineMiddleware((context, next) => {
     const { request, url, isPrerendered } = context;
     if (isPrerendered) {
       return next();
     }
-    if (request.method === "GET") {
+    if (SAFE_METHODS.includes(request.method)) {
       return next();
     }
-    const sameOrigin = (request.method === "POST" || request.method === "PUT" || request.method === "PATCH" || request.method === "DELETE") && request.headers.get("origin") === url.origin;
+    const isSameOrigin = request.headers.get("origin") === url.origin;
     const hasContentType = request.headers.has("content-type");
     if (hasContentType) {
       const formLikeHeader = hasFormLikeHeader(request.headers.get("content-type"));
-      if (formLikeHeader && !sameOrigin) {
+      if (formLikeHeader && !isSameOrigin) {
         return new Response(`Cross-site ${request.method} form submissions are forbidden`, {
           status: 403
         });
       }
     } else {
-      if (!sameOrigin) {
+      if (!isSameOrigin) {
         return new Response(`Cross-site ${request.method} form submissions are forbidden`, {
           status: 403
         });

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

@@ -38,6 +38,13 @@ export type SSRManifest = {
     routes: RouteInfo[];
     site?: string;
     base: string;
+    /**
+     * The base of the assets generated **by the user**. For example, scripts created by the user falls under this category.
+     *
+     * The value of this field comes from `vite.base`. We aren't usually this tight to vite in our code base, so probably
+     * this should be refactored somehow.
+     */
+    userAssetsBase: string | undefined;
     trailingSlash: AstroConfig['trailingSlash'];
     buildFormat: NonNullable<AstroConfig['build']>['format'];
     compressHTML: boolean;

package/dist/core/build/generate.js

@@ -388,6 +388,7 @@ function createBuildManifest(settings, internals, renderers, middleware, key) {
     compressHTML: settings.config.compressHTML,
     renderers,
     base: settings.config.base,
+    userAssetsBase: settings.config?.vite?.base,
     assetsPrefix: settings.config.build.assetsPrefix,
     site: settings.config.site,
     componentMetadata: internals.componentMetadata,

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

@@ -1,5 +1,5 @@
 import { fileURLToPath } from "node:url";
-import glob from "fast-glob";
+import { glob } from "tinyglobby";
 import { getAssetsPrefix } from "../../../assets/utils/getAssetsPrefix.js";
 import { normalizeTheLocale } from "../../../i18n/index.js";
 import { toFallbackType, toRoutingStrategy } from "../../../i18n/utils.js";
@@ -41,9 +41,7 @@ function vitePluginManifest(options, internals) {
           `import { deserializeManifest as _deserializeManifest } from 'astro/app'`,
           `import { _privateSetManifestDontUseThis } from 'astro:ssr-manifest'`
         ];
-        const resolvedDriver = await resolveSessionDriver(
-          options.settings.config.experimental?.session?.driver
-        );
+        const resolvedDriver = await resolveSessionDriver(options.settings.config.session?.driver);
         const contents = [
           `const manifest = _deserializeManifest('${manifestReplace}');`,
           `if (manifest.sessionConfig) manifest.sessionConfig.driverModule = ${resolvedDriver ? `() => import(${JSON.stringify(resolvedDriver)})` : "null"};`,
@@ -218,6 +216,7 @@ function buildManifest(opts, internals, staticFiles, encodedKey) {
     routes,
     site: settings.config.site,
     base: settings.config.base,
+    userAssetsBase: settings.config?.vite?.base,
     trailingSlash: settings.config.trailingSlash,
     compressHTML: settings.config.compressHTML,
     assetsPrefix: settings.config.build.assetsPrefix,
@@ -232,7 +231,7 @@ function buildManifest(opts, internals, staticFiles, encodedKey) {
     checkOrigin: (settings.config.security?.checkOrigin && settings.buildOutput === "server") ?? false,
     serverIslandNameMap: Array.from(settings.serverIslandNameMap),
     key: encodedKey,
-    sessionConfig: settings.config.experimental.session
+    sessionConfig: settings.config.session
   };
 }
 export {

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

@@ -6,7 +6,6 @@ export declare function viteBuild(opts: StaticBuildOptions): Promise<{
     ssrOutputChunkNames: string[];
 }>;
 export declare function staticBuild(opts: StaticBuildOptions, internals: BuildInternals, ssrOutputChunkNames: 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
  * transforms it to generate a final `.mjs` output file.

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

@@ -2,8 +2,8 @@ import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { teardown } from "@astrojs/compiler";
-import glob from "fast-glob";
 import { bgGreen, black, green } from "kleur/colors";
+import { glob } from "tinyglobby";
 import * as vite from "vite";
 import { createBuildInternals } from "../../core/build/internal.js";
 import { emptyDir, removeEmptyDirs } from "../../core/fs/index.js";
@@ -185,8 +185,8 @@ async function clientBuild(opts, internals, input, container) {
   const ssr = settings.buildOutput === "server";
   const out = ssr ? settings.config.build.client : getOutDirWithinCwd(settings.config.outDir);
   if (!input.size) {
-    if (ssr) {
-      await copyFiles(settings.config.publicDir, out, true);
+    if (ssr && fs.existsSync(settings.config.publicDir)) {
+      await fs.promises.cp(settings.config.publicDir, out, { recursive: true, force: true });
     }
     return null;
   }
@@ -283,29 +283,11 @@ async function cleanServerOutput(opts, ssrOutputChunkNames, internals) {
     await Promise.all(
       fileNames.filter((fileName) => fileName.endsWith(".d.ts")).map((fileName) => fs.promises.rm(new URL(fileName, out)))
     );
-    await copyFiles(out, opts.settings.config.outDir, true);
+    await fs.promises.cp(out, opts.settings.config.outDir, { recursive: true, force: true });
     await fs.promises.rm(out, { recursive: true });
     return;
   }
 }
-async function copyFiles(fromFolder, toFolder, includeDotfiles = false) {
-  const files = await glob("**/*", {
-    cwd: fileURLToPath(fromFolder),
-    dot: includeDotfiles
-  });
-  if (files.length === 0) return;
-  return await Promise.all(
-    files.map(async function copyFile(filename) {
-      const from = new URL(filename, fromFolder);
-      const to = new URL(filename, toFolder);
-      const lastFolder = new URL("./", to);
-      return fs.promises.mkdir(lastFolder, { recursive: true }).then(async function fsCopyFile() {
-        const p = await fs.promises.copyFile(from, to, fs.constants.COPYFILE_FICLONE);
-        return p;
-      });
-    })
-  );
-}
 async function ssrMoveAssets(opts) {
   opts.logger.info("build", "Rearranging server assets...");
   const serverRoot = opts.settings.buildOutput === "static" ? opts.settings.config.build.client : opts.settings.config.build.server;
@@ -336,7 +318,6 @@ function makeAstroPageEntryPointFileName(prefix, facadeModuleId, routes) {
   return `pages${name.replace(/\/$/, "/index").replaceAll(/[[\]]/g, "_").replaceAll("...", "---")}.astro.mjs`;
 }
 export {
-  copyFiles,
   makeAstroPageEntryPointFileName,
   staticBuild,
   viteBuild