astro 5.3.0 → 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.3.0") {
+    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.3.0") {
-      await this.#store.metaStore().set("astro-version", "5.3.0");
+    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/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";
@@ -216,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,

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

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "5.3.0";
+const ASTRO_VERSION = "5.3.1";
 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

@@ -1,6 +1,6 @@
 import nodeFs from "node:fs";
 import { fileURLToPath } from "node:url";
-import glob from "fast-glob";
+import { convertPathToPattern } from "tinyglobby";
 import * as vite from "vite";
 import { crawlFrameworkPkgs } from "vitefu";
 import { vitePluginActions, vitePluginUserActions } from "../actions/plugins.js";
@@ -84,7 +84,7 @@ async function createVite(commandConfig, { settings, logger, mode, command, fs =
       }
     }
   });
-  const srcDirPattern = glob.convertPathToPattern(fileURLToPath(settings.config.srcDir));
+  const srcDirPattern = convertPathToPattern(fileURLToPath(settings.config.srcDir));
   const envLoader = createEnvLoader(mode, settings.config);
   const commonConfig = {
     // Tell Vite not to combine config from vite.config.js with our provided inline config

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

package/dist/core/messages.js

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

package/dist/core/render-context.js

@@ -316,6 +316,7 @@ class RenderContext {
     };
     const result = {
       base: manifest.base,
+      userAssetsBase: manifest.userAssetsBase,
       cancelled: false,
       clientDirectives,
       inlinedScripts,

package/dist/core/routing/rewrite.js

@@ -1,7 +1,12 @@
 import { shouldAppendForwardSlash } from "../build/util.js";
 import { originPathnameSymbol } from "../constants.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
-import { appendForwardSlash, removeTrailingForwardSlash } from "../path.js";
+import {
+  appendForwardSlash,
+  joinPaths,
+  prependForwardSlash,
+  removeTrailingForwardSlash
+} from "../path.js";
 import { createRequest } from "../request.js";
 import { DEFAULT_404_ROUTE } from "./astro-designed-error-pages.js";
 function findRouteToRewrite({
@@ -21,10 +26,18 @@ function findRouteToRewrite({
     newUrl = new URL(payload, new URL(request.url).origin);
   }
   let pathname = newUrl.pathname;
+  const shouldAppendSlash = shouldAppendForwardSlash(trailingSlash, buildFormat);
   if (base !== "/" && newUrl.pathname.startsWith(base)) {
-    pathname = shouldAppendForwardSlash(trailingSlash, buildFormat) ? appendForwardSlash(newUrl.pathname) : removeTrailingForwardSlash(newUrl.pathname);
+    pathname = shouldAppendSlash ? appendForwardSlash(newUrl.pathname) : removeTrailingForwardSlash(newUrl.pathname);
     pathname = pathname.slice(base.length);
   }
+  if (!pathname.startsWith("/") && shouldAppendSlash && newUrl.pathname.endsWith("/")) {
+    pathname = prependForwardSlash(pathname);
+  }
+  if (pathname === "/" && base !== "/" && !shouldAppendSlash) {
+    pathname = "";
+  }
+  newUrl.pathname = joinPaths(...[base, pathname].filter(Boolean));
   const decodedPathname = decodeURI(pathname);
   let foundRoute;
   for (const route of routes) {

package/dist/runtime/server/render/head.js

@@ -13,6 +13,9 @@ function renderAllHeadContent(result) {
   );
   result.styles.clear();
   const scripts = Array.from(result.scripts).filter(uniqueElements).map((script) => {
+    if (result.userAssetsBase) {
+      script.props.src = (result.base === "/" ? "" : result.base) + result.userAssetsBase + script.props.src;
+    }
     return renderElement("script", script, false);
   });
   const links = Array.from(result.links).filter(uniqueElements).map((link) => renderElement("link", link, false));

package/dist/runtime/server/render/script.js

@@ -11,7 +11,9 @@ async function renderScript(result, id) {
     }
   }
   const resolved = await result.resolve(id);
-  return markHTMLString(`<script type="module" src="${resolved}"></script>`);
+  return markHTMLString(
+    `<script type="module" src="${result.userAssetsBase ? (result.base === "/" ? "" : result.base) + result.userAssetsBase : ""}${resolved}"></script>`
+  );
 }
 export {
   renderScript

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

@@ -195,6 +195,7 @@ export interface SSRResult {
      */
     cancelled: boolean;
     base: string;
+    userAssetsBase: string | undefined;
     styles: Set<SSRElement>;
     scripts: Set<SSRElement>;
     links: Set<SSRElement>;

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

@@ -150,6 +150,7 @@ function createDevelopmentManifest(settings) {
     clientDirectives: settings.clientDirectives,
     renderers: [],
     base: settings.config.base,
+    userAssetsBase: settings.config?.vite?.base,
     assetsPrefix: settings.config.build.assetsPrefix,
     site: settings.config.site,
     componentMetadata: /* @__PURE__ */ new Map(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.3.0",
+  "version": "5.3.1",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -125,7 +125,6 @@
     "es-module-lexer": "^1.6.0",
     "esbuild": "^0.24.2",
     "estree-walker": "^3.0.3",
-    "fast-glob": "^3.3.3",
     "flattie": "^1.1.1",
     "github-slugger": "^2.0.0",
     "html-escaper": "3.0.3",
@@ -134,17 +133,18 @@
     "kleur": "^4.1.5",
     "magic-string": "^0.30.17",
     "magicast": "^0.3.5",
-    "micromatch": "^4.0.8",
     "mrmime": "^2.0.0",
     "neotraverse": "^0.6.18",
     "p-limit": "^6.2.0",
     "p-queue": "^8.1.0",
+    "picomatch": "^4.0.2",
     "preferred-pm": "^4.1.1",
     "prompts": "^2.4.2",
     "rehype": "^13.0.2",
     "semver": "^7.7.1",
     "shiki": "^1.29.2",
     "tinyexec": "^0.3.2",
+    "tinyglobby": "^0.2.12",
     "tsconfck": "^3.1.4",
     "ultrahtml": "^1.5.3",
     "unist-util-visit": "^5.0.0",
@@ -159,9 +159,9 @@
     "zod": "^3.24.1",
     "zod-to-json-schema": "^3.24.1",
     "zod-to-ts": "^1.2.0",
+    "@astrojs/internal-helpers": "0.5.1",
     "@astrojs/markdown-remark": "6.1.0",
-    "@astrojs/telemetry": "3.2.0",
-    "@astrojs/internal-helpers": "0.5.1"
+    "@astrojs/telemetry": "3.2.0"
   },
   "optionalDependencies": {
     "sharp": "^0.33.3"
@@ -179,7 +179,7 @@
     "@types/html-escaper": "3.0.4",
     "@types/http-cache-semantics": "^4.0.4",
     "@types/js-yaml": "^4.0.9",
-    "@types/micromatch": "^4.0.9",
+    "@types/picomatch": "^3.0.2",
     "@types/prompts": "^2.4.9",
     "@types/semver": "^7.5.8",
     "@types/yargs-parser": "^21.0.3",