astro 2.7.0 → 2.7.1

package/README.md

@@ -8,10 +8,8 @@
   <br/><br/>
 </p>
 
-
 ## Install
 
-
 ```bash
 # Recommended!
 npm create astro@latest
@@ -20,7 +18,7 @@ npm create astro@latest
 npm install --save-dev astro
 ```
 
-Looking for help? Start with our [Getting Started](https://docs.astro.build/en/getting-started/) guide.  
+Looking for help? Start with our [Getting Started](https://docs.astro.build/en/getting-started/) guide.
 
 Looking for quick examples? [Open a starter project](https://astro.new/) right in your browser.
 
@@ -31,9 +29,10 @@ Visit our [official documentation](https://docs.astro.build/).
 ## Support
 
 Having trouble? Get help in the official [Astro Discord](https://astro.build/chat).
+
 ## Contributing
 
-**New contributors welcome!** Check out our [Contributors Guide](/CONTRIBUTING.md) for help getting started. 
+**New contributors welcome!** Check out our [Contributors Guide](/CONTRIBUTING.md) for help getting started.
 
 Join us on [Discord](https://astro.build/chat) to meet other maintainers. We'll help you get your first contribution in no time!
 
@@ -42,5 +41,3 @@ Join us on [Discord](https://astro.build/chat) to meet other maintainers. We'll
 Astro is generously supported by [Netlify](https://www.netlify.com/), [Vercel](https://vercel.com/), and several other amazing organizations [listed here.](https://astro.build/)
 
 [❤️ Sponsor Astro! ❤️](https://github.com/withastro/.github/blob/main/FUNDING.md)
-
-

package/dist/@types/astro.d.ts

@@ -75,20 +75,6 @@ export interface CLIFlags {
     experimentalAssets?: boolean;
     experimentalRedirects?: boolean;
 }
-export interface BuildConfig {
-    /**
-     * @deprecated Use config.build.client instead.
-     */
-    client: URL;
-    /**
-     * @deprecated Use config.build.server instead.
-     */
-    server: URL;
-    /**
-     * @deprecated Use config.build.serverEntry instead.
-     */
-    serverEntry: string;
-}
 /**
  * Astro global available in all contexts in .astro files
  *

package/dist/assets/utils/emitAsset.js

@@ -1,8 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
-import slash from "slash";
-import { prependForwardSlash } from "../../core/path.js";
+import { prependForwardSlash, slash } from "../../core/path.js";
 import { imageMetadata } from "./metadata.js";
 async function emitESMImage(id, watchMode, fileEmitter) {
   if (!id) {

package/dist/content/vite-plugin-content-imports.js

@@ -277,7 +277,6 @@ function stringifyEntryData(data) {
       });
     } else {
       throw new AstroError({
-        code: 99999,
         message: "Unexpected error processing content collection data."
       });
     }

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

@@ -4,6 +4,7 @@ import { extname } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import pLimit from "p-limit";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
+import { appendForwardSlash } from "../core/path.js";
 import { rootRelativePath } from "../core/util.js";
 import { VIRTUAL_MODULE_ID } from "./consts.js";
 import {
@@ -164,7 +165,12 @@ const UnexpectedLookupMapError = new AstroError({
 });
 function globWithUnderscoresIgnored(relContentDir, exts) {
   const extGlob = getExtGlob(exts);
-  return [`${relContentDir}/**/*${extGlob}`, `!**/_*/**${extGlob}`, `!**/_*${extGlob}`];
+  const contentDir = appendForwardSlash(relContentDir);
+  return [
+    `${contentDir}**/*${extGlob}`,
+    `!${contentDir}_*/**${extGlob}`,
+    `!${contentDir}_*${extGlob}`
+  ];
 }
 export {
   astroContentVirtualModPlugin,

package/dist/core/build/generate.js

@@ -91,8 +91,7 @@ function chunkIsPage(settings, output, internals) {
 async function generatePages(opts, internals) {
   const timer = performance.now();
   const ssr = isServerLikeOutput(opts.settings.config);
-  const serverEntry = opts.buildConfig.serverEntry;
-  const outFolder = ssr ? opts.buildConfig.server : getOutDirWithinCwd(opts.settings.config.outDir);
+  const outFolder = ssr ? opts.settings.config.build.server : getOutDirWithinCwd(opts.settings.config.outDir);
   if (ssr && !hasPrerenderedPages(internals))
     return;
   const verb = ssr ? "prerendering" : "generating";
@@ -132,7 +131,6 @@ ${bgGreen(black(` generating optimized images `))}`);
   }
   await runHookBuildGenerated({
     config: opts.settings.config,
-    buildConfig: opts.buildConfig,
     logging: opts.logging
   });
   info(opts.logging, null, dim(`Completed in ${getTimeStat(timer, performance.now())}.

package/dist/core/build/index.js

@@ -81,11 +81,6 @@ class AstroBuilder {
   }
   /** Run the build logic. build() is marked private because usage should go through ".run()" */
   async build({ viteConfig }) {
-    const buildConfig = {
-      client: this.settings.config.build.client,
-      server: this.settings.config.build.server,
-      serverEntry: this.settings.config.build.serverEntry
-    };
     await runHookBuildStart({ config: this.settings.config, logging: this.logging });
     this.validateConfig();
     info(this.logging, "build", `output target: ${colors.green(this.settings.config.output)}`);
@@ -117,8 +112,7 @@ class AstroBuilder {
       pageNames,
       routeCache: this.routeCache,
       teardownCompiler: this.teardownCompiler,
-      viteConfig,
-      buildConfig
+      viteConfig
     };
     const { internals } = await viteBuild(opts);
     await staticBuild(opts, internals);
@@ -134,7 +128,6 @@ class AstroBuilder {
     debug("build", timerMessage("Additional assets copied", this.timer.assetsStart));
     await runHookBuildDone({
       config: this.settings.config,
-      buildConfig,
       pages: pageNames,
       routes: Object.values(allPages).map((pd) => pd.route),
       logging: this.logging

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

@@ -293,7 +293,7 @@ function storeEntryPoint(moduleKey, options, internals, fileName) {
   const componentPath = getPathFromVirtualModulePageName(RESOLVED_SPLIT_MODULE_ID, moduleKey);
   for (const [page, pageData] of Object.entries(options.allPages)) {
     if (componentPath == page) {
-      const publicPath = fileURLToPath(options.settings.config.outDir);
+      const publicPath = fileURLToPath(options.settings.config.build.server);
       internals.entryPoints.set(pageData.route, pathToFileURL(join(publicPath, fileName)));
     }
   }

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

@@ -104,7 +104,7 @@ async function ssrBuild(opts, internals, input, container) {
   var _a, _b, _c, _d, _e;
   const { allPages, settings, viteConfig } = opts;
   const ssr = isServerLikeOutput(settings.config);
-  const out = ssr ? opts.buildConfig.server : getOutDirWithinCwd(settings.config.outDir);
+  const out = ssr ? settings.config.build.server : getOutDirWithinCwd(settings.config.outDir);
   const routes = Object.values(allPages).map((pd) => pd.route);
   const { lastVitePlugins, vitePlugins } = container.runBeforeHook("ssr", input);
   const viteBuildConfig = {
@@ -178,7 +178,7 @@ async function clientBuild(opts, internals, input, container) {
   const { settings, viteConfig } = opts;
   const timer = performance.now();
   const ssr = isServerLikeOutput(settings.config);
-  const out = ssr ? opts.buildConfig.client : getOutDirWithinCwd(settings.config.outDir);
+  const out = ssr ? settings.config.build.client : getOutDirWithinCwd(settings.config.outDir);
   if (!input.size) {
     if (ssr) {
       await copyFiles(settings.config.publicDir, out, true);
@@ -229,9 +229,9 @@ ${bgGreen(black(" building client "))}`);
 async function runPostBuildHooks(container, ssrReturn, clientReturn) {
   const mutations = await container.runPostHook(ssrReturn, clientReturn);
   const config = container.options.settings.config;
-  const buildConfig = container.options.settings.config.build;
+  const build = container.options.settings.config.build;
   for (const [fileName, mutation] of mutations) {
-    const root = isServerLikeOutput(config) ? mutation.build === "server" ? buildConfig.server : buildConfig.client : config.outDir;
+    const root = isServerLikeOutput(config) ? mutation.build === "server" ? build.server : build.client : config.outDir;
     const fileURL = new URL(fileName, root);
     await fs.promises.mkdir(new URL("./", fileURL), { recursive: true });
     await fs.promises.writeFile(fileURL, mutation.code, "utf-8");
@@ -244,7 +244,7 @@ async function cleanStaticOutput(opts, internals) {
       allStaticFiles.add(internals.pageToBundleMap.get(pageData.moduleSpecifier));
   }
   const ssr = isServerLikeOutput(opts.settings.config);
-  const out = ssr ? opts.buildConfig.server : getOutDirWithinCwd(opts.settings.config.outDir);
+  const out = ssr ? opts.settings.config.build.server : getOutDirWithinCwd(opts.settings.config.outDir);
   const files = await glob("**/*.mjs", {
     cwd: fileURLToPath(out)
   });
@@ -305,8 +305,8 @@ async function copyFiles(fromFolder, toFolder, includeDotfiles = false) {
 }
 async function ssrMoveAssets(opts) {
   info(opts.logging, "build", "Rearranging server assets...");
-  const serverRoot = opts.settings.config.output === "static" ? opts.buildConfig.client : opts.buildConfig.server;
-  const clientRoot = opts.buildConfig.client;
+  const serverRoot = opts.settings.config.output === "static" ? opts.settings.config.build.client : opts.settings.config.build.server;
+  const clientRoot = opts.settings.config.build.client;
   const assets = opts.settings.config.build.assets;
   const serverAssets = new URL(`./${assets}/`, appendForwardSlash(serverRoot.toString()));
   const clientAssets = new URL(`./${assets}/`, appendForwardSlash(clientRoot.toString()));

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

@@ -1,5 +1,5 @@
 import type { default as vite, InlineConfig } from 'vite';
-import type { AstroConfig, AstroSettings, BuildConfig, ComponentInstance, ManifestData, MiddlewareHandler, RouteData, RuntimeMode, SSRLoadedRenderer } from '../../@types/astro';
+import type { AstroConfig, AstroSettings, ComponentInstance, ManifestData, MiddlewareHandler, RouteData, RuntimeMode, SSRLoadedRenderer } from '../../@types/astro';
 import type { LogOptions } from '../logger/core';
 import type { RouteCache } from '../render/route-cache';
 export type ComponentPath = string;
@@ -33,7 +33,6 @@ export type AllPagesData = Record<ComponentPath, PageBuildData>;
 export interface StaticBuildOptions {
     allPages: AllPagesData;
     settings: AstroSettings;
-    buildConfig: BuildConfig;
     logging: LogOptions;
     manifest: ManifestData;
     mode: RuntimeMode;

package/dist/core/compile/compile.js

@@ -55,7 +55,6 @@ function handleCompileResultErrors(result, cssTransformErrors) {
   const compilerError = result.diagnostics.find((diag) => diag.severity === 1);
   if (compilerError) {
     throw new CompilerError({
-      code: compilerError.code,
       message: compilerError.text,
       location: {
         line: compilerError.location.line,
@@ -70,15 +69,11 @@ function handleCompileResultErrors(result, cssTransformErrors) {
       break;
     case 1: {
       const error = cssTransformErrors[0];
-      if (!error.errorCode) {
-        error.errorCode = AstroErrorData.UnknownCSSError.code;
-      }
       throw cssTransformErrors[0];
     }
     default: {
       throw new AggregateError({
         ...cssTransformErrors[0],
-        code: cssTransformErrors[0].errorCode,
         errors: cssTransformErrors
       });
     }

package/dist/core/compile/style.js

@@ -69,7 +69,6 @@ function enhanceCSSError(err, filename) {
   const errorPosition = positionAt(styleTagBeginning, fileContent);
   errorPosition.line += 1;
   return new CSSError({
-    code: AstroErrorData.UnknownCSSError.code,
     message: err.message,
     location: {
       file: filename,

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "2.7.0";
+const ASTRO_VERSION = "2.7.1";
 const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
   ".markdown",
   ".mdown",

package/dist/core/dev/dev.js

@@ -53,7 +53,7 @@ async function dev(settings, options) {
       isRestart: options.isRestart
     })
   );
-  const currentVersion = "2.7.0";
+  const currentVersion = "2.7.1";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/errors/dev/vite.js

@@ -29,7 +29,6 @@ function enhanceViteSSRError({
       safeError.name = "FailedToLoadModuleSSR";
       safeError.message = AstroErrorData.FailedToLoadModuleSSR.message(importName);
       safeError.hint = AstroErrorData.FailedToLoadModuleSSR.hint;
-      safeError.code = AstroErrorData.FailedToLoadModuleSSR.code;
       const line = lns.findIndex((ln) => ln.includes(importName));
       if (line !== -1) {
         const column = (_b = lns[line]) == null ? void 0 : _b.indexOf(importName);
@@ -55,7 +54,6 @@ function enhanceViteSSRError({
         safeError.message = AstroErrorData.InvalidGlob.message(globPattern);
         safeError.name = "InvalidGlob";
         safeError.hint = AstroErrorData.InvalidGlob.hint;
-        safeError.code = AstroErrorData.InvalidGlob.code;
         safeError.title = AstroErrorData.InvalidGlob.title;
         const line = lns.findIndex((ln) => ln.includes(globPattern));
         if (line !== -1) {
@@ -81,13 +79,7 @@ async function getViteErrorPayload(err) {
   }
   const message = renderErrorMarkdown(err.message.trim(), "html");
   const hint = err.hint ? renderErrorMarkdown(err.hint.trim(), "html") : void 0;
-  const hasDocs = err.type && err.name && [
-    "AstroError",
-    "AggregateError",
-    /* 'CompilerError' ,*/
-    "CSSError",
-    "MarkdownError"
-  ] || ["FailedToLoadModuleSSR", "InvalidGlob"].includes(err.name);
+  const hasDocs = err.name in AstroErrorData;
   const docslink = hasDocs ? `https://docs.astro.build/en/reference/errors/${getKebabErrorName(err.name)}/` : void 0;
   const highlighter = await getHighlighter({ theme: "css-variables" });
   let highlighterLang = (_b = (_a = err.loc) == null ? void 0 : _a.file) == null ? void 0 : _b.split(".").pop();