astro 5.3.0 → 5.4.0

package/components/Image.astro

@@ -1,7 +1,6 @@
 ---
 import { type LocalImageProps, type RemoteImageProps, getImage, imageConfig } from 'astro:assets';
 import type { UnresolvedImageTransform } from '../dist/assets/types';
-import { applyResponsiveAttributes } from '../dist/assets/utils/imageAttributes.js';
 import { AstroError, AstroErrorData } from '../dist/core/errors/index.js';
 import type { HTMLAttributes } from '../types';
 
@@ -46,14 +45,7 @@ if (import.meta.env.DEV) {
 	additionalAttributes['data-image-component'] = 'true';
 }
 
-const { class: className, ...attributes } = useResponsive
-	? applyResponsiveAttributes({
-			layout,
-			image,
-			props,
-			additionalAttributes,
-		})
-	: { ...additionalAttributes, ...image.attributes };
+const { class: className, ...attributes } = { ...additionalAttributes, ...image.attributes };
 ---
 
 {/* Applying class outside of the spread prevents it from applying unnecessary astro-* classes */}

package/components/Picture.astro

@@ -1,8 +1,7 @@
 ---
 import { type LocalImageProps, type RemoteImageProps, getImage, imageConfig } from 'astro:assets';
 import * as mime from 'mrmime';
-import { applyResponsiveAttributes } from '../dist/assets/utils/imageAttributes';
-import { isESMImportedImage, resolveSrc } from '../dist/assets/utils/imageKind';
+import { isESMImportedImage, resolveSrc } from '../dist/assets/utils/imageKind.js';
 import { AstroError, AstroErrorData } from '../dist/core/errors/index.js';
 import type {
 	GetImageResult,
@@ -101,18 +100,14 @@ if (fallbackImage.srcSet.values.length > 0) {
 	imgAdditionalAttributes.srcset = fallbackImage.srcSet.attribute;
 }
 
-const { class: className, ...attributes } = useResponsive
-	? applyResponsiveAttributes({
-			layout,
-			image: fallbackImage,
-			props,
-			additionalAttributes: imgAdditionalAttributes,
-		})
-	: { ...imgAdditionalAttributes, ...fallbackImage.attributes };
-
 if (import.meta.env.DEV) {
 	imgAdditionalAttributes['data-image-component'] = 'true';
 }
+
+const { class: className, ...attributes } = {
+	...imgAdditionalAttributes,
+	...fallbackImage.attributes,
+};
 ---
 
 <picture {...pictureAttributes}>

package/dist/assets/endpoint/generic.js

@@ -1,9 +1,9 @@
 import { imageConfig } from "astro:assets";
 import { isRemotePath } from "@astrojs/internal-helpers/path";
+import { isRemoteAllowed } from "@astrojs/internal-helpers/remote";
 import * as mime from "mrmime";
 import { getConfiguredImageService } from "../internal.js";
 import { etag } from "../utils/etag.js";
-import { isRemoteAllowed } from "../utils/remotePattern.js";
 async function loadRemoteImage(src, headers) {
   try {
     const res = await fetch(src, {

package/dist/assets/endpoint/node.js

@@ -4,10 +4,10 @@ import { isAbsolute } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { assetsDir, imageConfig, outDir } from "astro:assets";
 import { isRemotePath, removeQueryString } from "@astrojs/internal-helpers/path";
+import { isRemoteAllowed } from "@astrojs/internal-helpers/remote";
 import * as mime from "mrmime";
 import { getConfiguredImageService } from "../internal.js";
 import { etag } from "../utils/etag.js";
-import { isRemoteAllowed } from "../utils/remotePattern.js";
 function replaceFileSystemReferences(src) {
   return os.platform().includes("win32") ? src.replace(/^\/@fs\//, "") : src.replace(/^\/@fs/, "");
 }

package/dist/assets/internal.js

@@ -11,6 +11,7 @@ import { isLocalService } from "./services/service.js";
 import {
   isImageMetadata
 } from "./types.js";
+import { addCSSVarsToStyle, cssFitValues } from "./utils/imageAttributes.js";
 import { isESMImportedImage, isRemoteImage, resolveSrc } from "./utils/imageKind.js";
 import { inferRemoteSize } from "./utils/remoteProbe.js";
 async function getConfiguredImageService() {
@@ -108,6 +109,18 @@ async function getImage(options, imageConfig) {
     }
     delete resolvedOptions.priority;
     delete resolvedOptions.densities;
+    if (layout !== "none") {
+      resolvedOptions.style = addCSSVarsToStyle(
+        {
+          w: String(resolvedOptions.width),
+          h: String(resolvedOptions.height),
+          fit: cssFitValues.includes(resolvedOptions.fit ?? "") && resolvedOptions.fit,
+          pos: resolvedOptions.position
+        },
+        resolvedOptions.style
+      );
+      resolvedOptions["data-astro-image"] = layout;
+    }
   }
   const validatedOptions = service.validateOptions ? await service.validateOptions(resolvedOptions, imageConfig) : resolvedOptions;
   const srcSetTransforms = service.getSrcSet ? await service.getSrcSet(validatedOptions, imageConfig) : [];

package/dist/assets/services/service.js

@@ -1,8 +1,8 @@
+import { isRemoteAllowed } from "@astrojs/internal-helpers/remote";
 import { AstroError, AstroErrorData } from "../../core/errors/index.js";
 import { isRemotePath, joinPaths } from "../../core/path.js";
 import { DEFAULT_HASH_PROPS, DEFAULT_OUTPUT_FORMAT, VALID_SUPPORTED_FORMATS } from "../consts.js";
 import { isESMImportedImage, isRemoteImage } from "../utils/imageKind.js";
-import { isRemoteAllowed } from "../utils/remotePattern.js";
 function isLocalService(service) {
   if (!service) {
     return false;

package/dist/assets/utils/imageAttributes.d.ts

@@ -1,10 +1,2 @@
-import type { GetImageResult, ImageLayout, LocalImageProps, RemoteImageProps } from '../types.js';
+export declare const cssFitValues: string[];
 export declare function addCSSVarsToStyle(vars: Record<string, string | false | undefined>, styles?: string | Record<string, any>): string;
-export declare function applyResponsiveAttributes<T extends LocalImageProps<unknown> | RemoteImageProps<unknown>>({ layout, image, props, additionalAttributes, }: {
-    layout: Exclude<ImageLayout, 'none'>;
-    image: GetImageResult;
-    additionalAttributes: Record<string, any>;
-    props: T;
-}): {
-    [x: string]: any;
-};

package/dist/assets/utils/imageAttributes.js

@@ -1,4 +1,5 @@
 import { toStyleString } from "../../runtime/server/render/util.js";
+const cssFitValues = ["fill", "contain", "cover", "scale-down"];
 function addCSSVarsToStyle(vars, styles) {
   const cssVars = Object.entries(vars).filter(([_, value]) => value !== void 0 && value !== false).map(([key, value]) => `--${key}: ${value};`).join(" ");
   if (!styles) {
@@ -7,27 +8,7 @@ function addCSSVarsToStyle(vars, styles) {
   const style = typeof styles === "string" ? styles : toStyleString(styles);
   return `${cssVars} ${style}`;
 }
-const cssFitValues = ["fill", "contain", "cover", "scale-down"];
-function applyResponsiveAttributes({
-  layout,
-  image,
-  props,
-  additionalAttributes
-}) {
-  const attributes = { ...additionalAttributes, ...image.attributes };
-  attributes.style = addCSSVarsToStyle(
-    {
-      w: image.attributes.width ?? props.width ?? image.options.width,
-      h: image.attributes.height ?? props.height ?? image.options.height,
-      fit: cssFitValues.includes(props.fit ?? "") && props.fit,
-      pos: props.position
-    },
-    attributes.style
-  );
-  attributes["data-astro-image"] = layout;
-  return attributes;
-}
 export {
   addCSSVarsToStyle,
-  applyResponsiveAttributes
+  cssFitValues
 };

package/dist/assets/utils/index.d.ts

@@ -2,7 +2,6 @@ export { emitESMImage } from './node/emitAsset.js';
 export { isESMImportedImage, isRemoteImage } from './imageKind.js';
 export { imageMetadata } from './metadata.js';
 export { getOrigQueryParams } from './queryParams.js';
-export { isRemoteAllowed, matchHostname, matchPathname, matchPattern, matchPort, matchProtocol, type RemotePattern, } from './remotePattern.js';
 export { hashTransform, propsToFilename } from './transformToPath.js';
 export { inferRemoteSize } from './remoteProbe.js';
 export { makeSvgComponent } from './svg.js';

package/dist/assets/utils/index.js

@@ -2,14 +2,6 @@ import { emitESMImage } from "./node/emitAsset.js";
 import { isESMImportedImage, isRemoteImage } from "./imageKind.js";
 import { imageMetadata } from "./metadata.js";
 import { getOrigQueryParams } from "./queryParams.js";
-import {
-  isRemoteAllowed,
-  matchHostname,
-  matchPathname,
-  matchPattern,
-  matchPort,
-  matchProtocol
-} from "./remotePattern.js";
 import { hashTransform, propsToFilename } from "./transformToPath.js";
 import { inferRemoteSize } from "./remoteProbe.js";
 import { makeSvgComponent } from "./svg.js";
@@ -20,13 +12,7 @@ export {
   imageMetadata,
   inferRemoteSize,
   isESMImportedImage,
-  isRemoteAllowed,
   isRemoteImage,
   makeSvgComponent,
-  matchHostname,
-  matchPathname,
-  matchPattern,
-  matchPort,
-  matchProtocol,
   propsToFilename
 };

package/dist/cli/dev/index.js

@@ -15,6 +15,10 @@ async function dev({ flags }) {
           ["--host <custom-address>", `Expose on a network IP address at <custom-address>`],
           ["--open", "Automatically open the app in the browser on server start"],
           ["--force", "Clear the content layer cache, forcing a full rebuild."],
+          [
+            "--allowed-hosts",
+            "Specify a comma-separated list of allowed hosts or allow any hostname."
+          ],
           ["--help (-h)", "See all available flags."]
         ]
       },

package/dist/cli/flags.js

@@ -15,7 +15,8 @@ function flagsToAstroInlineConfig(flags) {
     server: {
       port: typeof flags.port === "number" ? flags.port : void 0,
       host: typeof flags.host === "string" || typeof flags.host === "boolean" ? flags.host : void 0,
-      open: typeof flags.open === "string" || typeof flags.open === "boolean" ? flags.open : void 0
+      open: typeof flags.open === "string" || typeof flags.open === "boolean" ? flags.open : void 0,
+      allowedHosts: typeof flags.allowedHosts === "string" ? flags.allowedHosts.split(",") : typeof flags.allowedHosts === "boolean" && flags.allowedHosts === true ? flags.allowedHosts : []
     }
   };
 }

package/dist/cli/preview/index.js

@@ -13,6 +13,10 @@ async function preview({ flags }) {
           ["--host", `Listen on all addresses, including LAN and public addresses.`],
           ["--host <custom-address>", `Expose on a network IP address at <custom-address>`],
           ["--open", "Automatically open the app in the browser on server start"],
+          [
+            "--allowed-hosts",
+            "Specify a comma-separated list of allowed hosts or allow any hostname."
+          ],
           ["--help (-h)", "See all available flags."]
         ]
       },

package/dist/config/entrypoint.d.ts

@@ -2,6 +2,8 @@ import type { SharpImageServiceConfig } from '../assets/services/sharp.js';
 import type { ImageServiceConfig } from '../types/public/index.js';
 export { defineConfig, getViteConfig } from './index.js';
 export { envField } from '../env/config.js';
+export { mergeConfig } from '../core/config/merge.js';
+export { validateConfig } from '../core/config/validate.js';
 /**
  * Return the configuration needed to use the Sharp-based image service
  */

package/dist/config/entrypoint.js

@@ -1,5 +1,7 @@
 import { defineConfig, getViteConfig } from "./index.js";
 import { envField } from "../env/config.js";
+import { mergeConfig } from "../core/config/merge.js";
+import { validateConfig } from "../core/config/validate.js";
 function sharpImageService(config = {}) {
   return {
     entrypoint: "astro/assets/services/sharp",
@@ -16,6 +18,8 @@ export {
   defineConfig,
   envField,
   getViteConfig,
+  mergeConfig,
   passthroughImageService,
-  sharpImageService
+  sharpImageService,
+  validateConfig
 };

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.4.0") {
       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.4.0") {
+      await this.#store.metaStore().set("astro-version", "5.4.0");
     }
     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/runtime.js

@@ -298,12 +298,17 @@ async function updateImageReferencesInBody(html, fileName) {
   for (const [_full, imagePath] of html.matchAll(CONTENT_LAYER_IMAGE_REGEX)) {
     try {
       const decodedImagePath = JSON.parse(imagePath.replaceAll(""", '"'));
-      const id = imageSrcToImportId(decodedImagePath.src, fileName);
-      const imported = imageAssetMap.get(id);
-      if (!id || imageObjects.has(id) || !imported) {
-        continue;
+      let image;
+      if (URL.canParse(decodedImagePath.src)) {
+        image = await getImage(decodedImagePath);
+      } else {
+        const id = imageSrcToImportId(decodedImagePath.src, fileName);
+        const imported = imageAssetMap.get(id);
+        if (!id || imageObjects.has(id) || !imported) {
+          continue;
+        }
+        image = await getImage({ ...decodedImagePath, src: imported });
       }
-      const image = await getImage({ ...decodedImagePath, src: imported });
       imageObjects.set(imagePath, image);
     } catch {
       throw new Error(`Failed to parse image reference: ${imagePath}`);

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/index.js

@@ -115,7 +115,7 @@ class App {
     if (!pathname) {
       pathname = prependForwardSlash(this.removeBase(url.pathname));
     }
-    let routeData = matchRoute(pathname, this.#manifestData);
+    let routeData = matchRoute(decodeURI(pathname), this.#manifestData);
     if (!routeData || routeData.prerender) return void 0;
     return routeData;
   }

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

@@ -208,7 +208,7 @@ async function getPathsForRoute(route, mod, pipeline, builtPaths) {
       if (!builtPaths.has(removeTrailingForwardSlash(staticPath))) {
         return true;
       }
-      const matchedRoute = matchRoute(staticPath, options.routesList);
+      const matchedRoute = matchRoute(decodeURI(staticPath), options.routesList);
       return matchedRoute === route;
     });
     for (const staticPath of paths) {
@@ -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/index.d.ts

@@ -7,6 +7,16 @@ export interface BuildOptions {
      * @default false
      */
     devOutput?: boolean;
+    /**
+     * Teardown the compiler WASM instance after build. This can improve performance when
+     * building once, but may cause a performance hit if building multiple times in a row.
+     *
+     * When building multiple projects in the same execution (e.g. during tests), disabling
+     * this option can greatly improve performance at the cost of some extra memory usage.
+     *
+     * @default true
+     */
+    teardownCompiler?: boolean;
 }
 /**
  * Builds your site for deployment. By default, this will generate static files and place them in a dist/ directory.

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/config/merge.d.ts

@@ -1 +1,3 @@
-export declare function mergeConfig(defaults: Record<string, any>, overrides: Record<string, any>, isRoot?: boolean): Record<string, any>;
+import type { DeepPartial } from '../../type-utils.js';
+import type { AstroConfig, AstroInlineConfig } from '../../types/public/index.js';
+export declare function mergeConfig<C extends AstroConfig | AstroInlineConfig>(defaults: C, overrides: DeepPartial<C>): C;

package/dist/core/config/merge.js

@@ -47,8 +47,8 @@ function mergeConfigRecursively(defaults, overrides, rootPath) {
   }
   return merged;
 }
-function mergeConfig(defaults, overrides, isRoot = true) {
-  return mergeConfigRecursively(defaults, overrides, isRoot ? "" : ".");
+function mergeConfig(defaults, overrides) {
+  return mergeConfigRecursively(defaults, overrides, "");
 }
 export {
   mergeConfig