astro 1.7.1 → 1.8.0

package/README.md

@@ -26,7 +26,7 @@ Looking for quick examples? [Open a starter project](https://astro.new/) right i
 
 ## Documentation
 
-Visit our [offical documentation](https://docs.astro.build/).
+Visit our [official documentation](https://docs.astro.build/).
 
 ## Support
 

package/components/Shiki.js

@@ -2,7 +2,7 @@ import { getHighlighter as getShikiHighlighter } from 'shiki';
 import { themes } from './shiki-themes.js';
 import { languages } from './shiki-languages.js';
 
-// Caches Promise<Highligher> for reuse when the same theme and langs are provided
+// Caches Promise<Highlighter> for reuse when the same theme and langs are provided
 const _resolvedHighlighters = new Map();
 
 /** @type {Promise<any>} */

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

@@ -1,7 +1,9 @@
 /// <reference types="node" />
 /// <reference types="node" />
+/// <reference types="node" />
 import type { MarkdownHeading, MarkdownMetadata, MarkdownRenderingResult, RehypePlugins, RemarkPlugins, RemarkRehype, ShikiConfig } from '@astrojs/markdown-remark';
 import type * as babel from '@babel/core';
+import type { OutgoingHttpHeaders } from 'http';
 import type { AddressInfo } from 'net';
 import type { TsConfigJson } from 'tsconfig-resolver';
 import type * as vite from 'vite';
@@ -287,6 +289,15 @@ declare type ServerConfig = {
      * If the given port is already in use, Astro will automatically try the next available port.
      */
     port?: number;
+    /**
+     * @name server.headers
+     * @typeraw {OutgoingHttpHeaders}
+     * @default `{}`
+     * @version 1.7.0
+     * @description
+     * Set custom HTTP response headers to be sent in `astro dev` and `astro preview`.
+     */
+    headers?: OutgoingHttpHeaders;
 };
 export interface ViteUserConfig extends vite.UserConfig {
     ssr?: vite.SSROptions;
@@ -618,6 +629,15 @@ export interface AstroUserConfig {
      * }
      * ```
      */
+    /**
+     * @docs
+     * @name server.headers
+     * @typeraw {OutgoingHttpHeaders}
+     * @default `{}`
+     * @version 1.7.0
+     * @description
+     * Set custom HTTP response headers to be sent in `astro dev` and `astro preview`.
+     */
     server?: ServerConfig | ((options: {
         command: 'dev' | 'preview';
     }) => ServerConfig);
@@ -763,7 +783,7 @@ export interface AstroUserConfig {
      *
      * Extend Astro with custom integrations. Integrations are your one-stop-shop for adding framework support (like Solid.js), new features (like sitemaps), and new libraries (like Partytown and Turbolinks).
      *
-     * Read our [Integrations Guide](/en/guides/integrations-guide/) for help getting started with Astro Integrations.
+     * Read our [Integrations Guide](https://docs.astro.build/en/guides/integrations-guide/) for help getting started with Astro Integrations.
      *
      * ```js
      * import react from '@astrojs/react';
@@ -826,9 +846,9 @@ export interface AstroUserConfig {
          * @version 1.0.0-rc.1
          * @description
          * Enable Astro's pre-v1.0 support for components and JSX expressions in `.md` (and alternative extensions for markdown files like ".markdown") Markdown files.
-         * In Astro `1.0.0-rc`, this original behavior was removed as the default, in favor of our new [MDX integration](/en/guides/integrations-guide/mdx/).
+         * In Astro `1.0.0-rc`, this original behavior was removed as the default, in favor of our new [MDX integration](https://docs.astro.build/en/guides/integrations-guide/mdx/).
          *
-         * To enable this behavior, set `legacy.astroFlavoredMarkdown` to `true` in your [`astro.config.mjs` configuration file](/en/guides/configuring-astro/#the-astro-config-file).
+         * To enable this behavior, set `legacy.astroFlavoredMarkdown` to `true` in your [`astro.config.mjs` configuration file](https://docs.astro.build/en/guides/configuring-astro/#the-astro-config-file).
          *
          * ```js
          * {
@@ -851,8 +871,23 @@ export interface AstroUserConfig {
      */
     experimental?: {
         /**
-         * @hidden
+         * @docs
+         * @name experimental.errorOverlay
+         * @type {boolean}
+         * @default `false`
+         * @version 1.7.0
+         * @description
          * Turn on experimental support for the new error overlay component.
+         *
+         * To enable this feature, set `experimental.errorOverlay` to `true` in your Astro config:
+         *
+         * ```js
+         * {
+         * 	experimental: {
+         * 		errorOverlay: true,
+         * 	},
+         * }
+         * ```
          */
         errorOverlay?: boolean;
         /**
@@ -882,7 +917,7 @@ export interface AstroUserConfig {
          * @default `false`
          * @version 1.7.0
          * @description
-         * Enable experimental support for [Content Collections](/en/guides/content-collections). This makes the `src/content/` directory a reserved directory for Astro to manage, and introduces the `astro:content` module for querying this content.
+         * Enable experimental support for [Content Collections](https://docs.astro.build/en/guides/content-collections/). This makes the `src/content/` directory a reserved directory for Astro to manage, and introduces the `astro:content` module for querying this content.
          *
          * To enable this feature, set `experimental.contentCollections` to `true` in your Astro config:
          *

package/dist/cli/index.js

@@ -31,6 +31,7 @@ function printAstroHelp() {
         ["dev", "Start the development server."],
         ["docs", "Open documentation in your web browser."],
         ["preview", "Preview your build locally."],
+        ["sync", "Generate content collection types."],
         ["telemetry", "Configure telemetry settings."]
       ],
       "Global Flags": [
@@ -54,6 +55,8 @@ function resolveCommand(flags) {
   const cmd = flags._[2];
   if (cmd === "add")
     return "add";
+  if (cmd === "sync")
+    return "sync";
   if (cmd === "telemetry")
     return "telemetry";
   if (flags.version)
@@ -153,6 +156,11 @@ async function runCommand(cmd, flags) {
       const ret = await check(settings);
       return process.exit(ret);
     }
+    case "sync": {
+      const { sync } = await import("./sync/index.js");
+      const ret = await sync(settings, { logging, fs });
+      return process.exit(ret);
+    }
     case "preview": {
       const { default: preview } = await import("../core/preview/index.js");
       const server = await preview(settings, { logging, telemetry });

package/dist/cli/sync/index.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="node" />
+import type fsMod from 'node:fs';
+import type { AstroSettings } from '../../@types/astro';
+import { LogOptions } from '../../core/logger/core.js';
+export declare function sync(settings: AstroSettings, { logging, fs }: {
+    logging: LogOptions;
+    fs: typeof fsMod;
+}): Promise<0 | 1>;

package/dist/cli/sync/index.js

@@ -0,0 +1,25 @@
+import { dim } from "kleur/colors";
+import { performance } from "node:perf_hooks";
+import { contentObservable, createContentTypesGenerator } from "../../content/index.js";
+import { getTimeStat } from "../../core/build/util.js";
+import { AstroError, AstroErrorData } from "../../core/errors/index.js";
+import { info } from "../../core/logger/core.js";
+async function sync(settings, { logging, fs }) {
+  const timerStart = performance.now();
+  try {
+    const contentTypesGenerator = await createContentTypesGenerator({
+      contentConfigObserver: contentObservable({ status: "loading" }),
+      logging,
+      fs,
+      settings
+    });
+    await contentTypesGenerator.init();
+  } catch (e) {
+    throw new AstroError(AstroErrorData.GenerateContentTypesError);
+  }
+  info(logging, "content", `Types generated ${dim(getTimeStat(timerStart, performance.now()))}`);
+  return 0;
+}
+export {
+  sync
+};

package/dist/content/index.d.ts

@@ -1,3 +1,5 @@
+export { createContentTypesGenerator } from './types-generator.js';
+export { contentObservable, getContentPaths } from './utils.js';
 export { astroBundleDelayedAssetPlugin, astroDelayedAssetPlugin, } from './vite-plugin-content-assets.js';
 export { astroContentServerPlugin } from './vite-plugin-content-server.js';
 export { astroContentVirtualModPlugin } from './vite-plugin-content-virtual-mod.js';

package/dist/content/index.js

@@ -1,3 +1,5 @@
+import { createContentTypesGenerator } from "./types-generator.js";
+import { contentObservable, getContentPaths } from "./utils.js";
 import {
   astroBundleDelayedAssetPlugin,
   astroDelayedAssetPlugin
@@ -8,5 +10,8 @@ export {
   astroBundleDelayedAssetPlugin,
   astroContentServerPlugin,
   astroContentVirtualModPlugin,
-  astroDelayedAssetPlugin
+  astroDelayedAssetPlugin,
+  contentObservable,
+  createContentTypesGenerator,
+  getContentPaths
 };

package/dist/content/types-generator.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import fsMod from 'node:fs';
+import type fsMod from 'node:fs';
 import type { AstroSettings } from '../@types/astro.js';
 import { LogOptions } from '../core/logger/core.js';
 import { ContentObservable, ContentPaths } from './utils.js';
@@ -18,13 +18,12 @@ export declare type GenerateContentTypes = {
     queueEvent(event: RawContentEvent): void;
 };
 declare type CreateContentGeneratorParams = {
-    contentPaths: ContentPaths;
     contentConfigObserver: ContentObservable;
     logging: LogOptions;
     settings: AstroSettings;
     fs: typeof fsMod;
 };
-export declare function createContentTypesGenerator({ contentPaths, contentConfigObserver, fs, logging, settings, }: CreateContentGeneratorParams): Promise<GenerateContentTypes>;
+export declare function createContentTypesGenerator({ contentConfigObserver, fs, logging, settings, }: CreateContentGeneratorParams): Promise<GenerateContentTypes>;
 export declare function getEntryInfo({ entry, contentDir, }: Pick<ContentPaths, 'contentDir'> & {
     entry: URL;
 }): EntryInfo | Error;

package/dist/content/types-generator.js

@@ -1,26 +1,28 @@
 import glob from "fast-glob";
 import { cyan } from "kleur/colors";
-import fsMod from "node:fs";
 import * as path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { normalizePath } from "vite";
 import { info, warn } from "../core/logger/core.js";
 import { appendForwardSlash, isRelativePath } from "../core/path.js";
 import { contentFileExts, CONTENT_TYPES_FILE } from "./consts.js";
-import { loadContentConfig } from "./utils.js";
+import {
+  getContentPaths,
+  loadContentConfig
+} from "./utils.js";
 class UnsupportedFileTypeError extends Error {
 }
 async function createContentTypesGenerator({
-  contentPaths,
   contentConfigObserver,
   fs,
   logging,
   settings
 }) {
   const contentTypes = {};
+  const contentPaths = getContentPaths({ srcDir: settings.config.srcDir });
   let events = [];
   let debounceTimeout;
-  const contentTypesBase = await fsMod.promises.readFile(
+  const contentTypesBase = await fs.promises.readFile(
     new URL(CONTENT_TYPES_FILE, contentPaths.generatedInputDir),
     "utf-8"
   );

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

@@ -43,8 +43,7 @@ function astroContentServerPlugin({
             fs,
             settings,
             logging,
-            contentConfigObserver,
-            contentPaths
+            contentConfigObserver
           });
           await contentGenerator.init();
           info(logging, "content", "Types generated");

package/dist/core/build/generate.js

@@ -3,6 +3,7 @@ import * as colors from "kleur/colors";
 import { bgGreen, black, cyan, dim, green, magenta } from "kleur/colors";
 import npath from "path";
 import { fileURLToPath } from "url";
+import { getContentPaths } from "../../content/index.js";
 import { hasPrerenderedPages } from "../../core/build/internal.js";
 import {
   prependForwardSlash,
@@ -237,7 +238,9 @@ async function generatePath(pathname, opts, gopts) {
     logging,
     markdown: {
       ...settings.config.markdown,
-      isAstroFlavoredMd: settings.config.legacy.astroFlavoredMarkdown
+      isAstroFlavoredMd: settings.config.legacy.astroFlavoredMarkdown,
+      isExperimentalContentCollections: settings.config.experimental.contentCollections,
+      contentDir: getContentPaths(settings.config).contentDir
     },
     mode: opts.mode,
     renderers,

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

@@ -293,7 +293,9 @@ async function cleanServerOutput(opts) {
     await Promise.all(
       Array.from(directories).map(async (filename) => {
         const url = new URL(filename, out);
-        const dir = await glob(fileURLToPath(url), { absolute: true });
+        const dir = await glob(fileURLToPath(url));
+        if (filename === "chunks")
+          return;
         if (!dir.length) {
           await fs.promises.rm(url, { recursive: true, force: true });
         }

package/dist/core/build/vite-plugin-pages.js

@@ -21,8 +21,8 @@ function vitePluginPages(opts, internals) {
         let i = 0;
         for (const pageData of eachPageData(internals)) {
           const variable = `_page${i}`;
-          imports.push(`import * as ${variable} from '${pageData.moduleSpecifier}';`);
-          importMap += `['${pageData.component}', ${variable}],`;
+          imports.push(`import * as ${variable} from ${JSON.stringify(pageData.moduleSpecifier)};`);
+          importMap += `[${JSON.stringify(pageData.component)}, ${variable}],`;
           i++;
         }
         i = 0;

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

@@ -1,6 +1,7 @@
 import glob from "fast-glob";
 import * as fs from "fs";
 import { fileURLToPath } from "url";
+import { getContentPaths } from "../../content/index.js";
 import { runHookBuildSsr } from "../../integrations/index.js";
 import { BEFORE_HYDRATION_SCRIPT_ID, PAGE_SCRIPT_ID } from "../../vite-plugin-scripts/index.js";
 import { pagesVirtualModuleId } from "../app/index.js";
@@ -168,7 +169,9 @@ function buildManifest(opts, internals, staticFiles) {
     base: settings.config.base,
     markdown: {
       ...settings.config.markdown,
-      isAstroFlavoredMd: settings.config.legacy.astroFlavoredMarkdown
+      isAstroFlavoredMd: settings.config.legacy.astroFlavoredMarkdown,
+      isExperimentalContentCollections: settings.config.experimental.contentCollections,
+      contentDir: getContentPaths(settings.config).contentDir
     },
     pageMap: null,
     renderers: [],

package/dist/core/constants.js

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

package/dist/core/create-vite.js

@@ -93,7 +93,7 @@ async function createVite(commandConfig, { settings, logging, mode, fs = nodeFs
     root: fileURLToPath(settings.config.root),
     envPrefix: "PUBLIC_",
     define: {
-      "import.meta.env.SITE": settings.config.site ? `'${settings.config.site}'` : "undefined"
+      "import.meta.env.SITE": settings.config.site ? JSON.stringify(settings.config.site) : "undefined"
     },
     server: {
       hmr: process.env.NODE_ENV === "test" || process.env.NODE_ENV === "production" ? false : void 0,

package/dist/core/dev/container.js

@@ -40,7 +40,7 @@ async function createContainer(params = {}) {
         include: rendererClientEntries
       },
       define: {
-        "import.meta.env.BASE_URL": settings.config.base ? `'${settings.config.base}'` : "undefined"
+        "import.meta.env.BASE_URL": settings.config.base ? JSON.stringify(settings.config.base) : "undefined"
       }
     },
     { settings, logging, mode: "dev", fs }

package/dist/core/dev/dev.js

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

package/dist/core/errors/errors-data.d.ts

@@ -147,7 +147,7 @@ export declare const AstroErrorData: {
      * - [`client:only`](https://docs.astro.build/en/reference/directives-reference/#clientonly)
      * @description
      *
-     * `client:only` components are not ran on the server, as such Astro does not know (and cannot guess) which renderer to use and require a hint. Like such:
+     * `client:only` components are not run on the server, as such Astro does not know (and cannot guess) which renderer to use and require a hint. Like such:
      *
      * ```astro
      *	<SomeReactComponent client:only="react" />
@@ -319,7 +319,7 @@ export declare const AstroErrorData: {
      * - [Server-side Rendering](https://docs.astro.build/en/guides/server-side-rendering/)
      * - [Adding an Adapter](https://docs.astro.build/en/guides/server-side-rendering/#adding-an-adapter)
      * @description
-     * To use server-side rendering, an adapter needs to be installed so Astro knows how to generate the proper output for your targetted deployment platform.
+     * To use server-side rendering, an adapter needs to be installed so Astro knows how to generate the proper output for your targeted deployment platform.
      */
     readonly NoAdapterInstalled: {
         readonly title: "Cannot use Server-side Rendering without an adapter.";
@@ -340,8 +340,11 @@ export declare const AstroErrorData: {
     };
     /**
      * @docs
+     * @message
+     * **Example error messages:**<br/>
+     * InvalidPrerenderExport: A `prerender` export has been detected, but its value cannot be statically analyzed.
      * @description
-     * A `prerender` export was detected, but the value was not statically analyzable. Values computed at runtime are not supported, so `export const prerender` can only be set to `true` or `false`. Variables are not supported.
+     * The `prerender` feature only supports a subset of valid JavaScript — be sure to use exactly `export const prerender = true` so that our compiler can detect this directive at build time. Variables, `let`, and `var` declarations are not supported.
      */
     readonly InvalidPrerenderExport: {
         readonly title: "Invalid prerender export.";
@@ -438,13 +441,13 @@ export declare const AstroErrorData: {
      * A Markdown document's frontmatter in `src/content/` does not match its collection schema.
      * Make sure that all required fields are present, and that all fields are of the correct type.
      * You can check against the collection schema in your `src/content/config.*` file.
-     * See the [Content collections documentation](https://docs.astro.build/en/guides/content-collections) for more information.
+     * See the [Content collections documentation](https://docs.astro.build/en/guides/content-collections/) for more information.
      */
     readonly MarkdownContentSchemaValidationError: {
         readonly title: "Content collection frontmatter invalid.";
         readonly code: 6002;
         readonly message: (collection: string, entryId: string, error: ZodError) => string;
-        readonly hint: "See https://docs.astro.build/en/guides/content-collections for more information on content schemas.";
+        readonly hint: "See https://docs.astro.build/en/guides/content-collections/ for more information on content schemas.";
     };
     readonly UnknownConfigError: {
         readonly title: "Unknown configuration error.";
@@ -476,6 +479,28 @@ export declare const AstroErrorData: {
         readonly message: (legacyConfigKey: string) => string;
         readonly hint: "Please update your configuration to the new format.\nSee https://astro.build/config for more information.";
     };
+    /**
+     * @docs
+     * @kind heading
+     * @name CLI Errors
+     */
+    readonly UnknownCLIError: {
+        readonly title: "Unknown CLI Error.";
+        readonly code: 8000;
+    };
+    /**
+     * @docs
+     * @description
+     * `astro sync` command failed to generate content collection types.
+     * @see
+     * - [Content collections documentation](https://docs.astro.build/en/guides/content-collections/)
+     */
+    readonly GenerateContentTypesError: {
+        readonly title: "Failed to generate content types.";
+        readonly code: 8001;
+        readonly message: "`astro sync` command failed to generate content collection types.";
+        readonly hint: "Check your `src/content/config.*` file for typos.";
+    };
     readonly UnknownError: {
         readonly title: "Unknown Error.";
         readonly code: 99999;

package/dist/core/errors/errors-data.js

@@ -173,7 +173,7 @@ Expected \`true\` value but got \`${suffix}\`.`;
         ...error.errors.map((zodError) => zodError.message)
       ].join("\n");
     },
-    hint: "See https://docs.astro.build/en/guides/content-collections for more information on content schemas."
+    hint: "See https://docs.astro.build/en/guides/content-collections/ for more information on content schemas."
   },
   UnknownConfigError: {
     title: "Unknown configuration error.",
@@ -190,6 +190,16 @@ Expected \`true\` value but got \`${suffix}\`.`;
     message: (legacyConfigKey) => `Legacy configuration detected: \`${legacyConfigKey}\`.`,
     hint: "Please update your configuration to the new format.\nSee https://astro.build/config for more information."
   },
+  UnknownCLIError: {
+    title: "Unknown CLI Error.",
+    code: 8e3
+  },
+  GenerateContentTypesError: {
+    title: "Failed to generate content types.",
+    code: 8001,
+    message: "`astro sync` command failed to generate content collection types.",
+    hint: "Check your `src/content/config.*` file for typos."
+  },
   UnknownError: {
     title: "Unknown Error.",
     code: 99999

package/dist/core/errors/utils.d.ts

@@ -3,7 +3,7 @@ import { AstroErrorCodes } from './errors-data.js';
 /**
  * Get the line and character based on the offset
  * @param offset The index of the position
- * @param text The text for which the position should be retrived
+ * @param text The text for which the position should be retrieved
  */
 export declare function positionAt(offset: number, text: string): {
     line: number;
@@ -138,7 +138,7 @@ export declare function getErrorDataByCode(code: AstroErrorCodes | DiagnosticCod
         readonly title: "Content collection frontmatter invalid.";
         readonly code: 6002;
         readonly message: (collection: string, entryId: string, error: import("zod").ZodError<any>) => string;
-        readonly hint: "See https://docs.astro.build/en/guides/content-collections for more information on content schemas.";
+        readonly hint: "See https://docs.astro.build/en/guides/content-collections/ for more information on content schemas.";
     } | {
         readonly title: "Unknown configuration error.";
         readonly code: 7000;
@@ -151,6 +151,14 @@ export declare function getErrorDataByCode(code: AstroErrorCodes | DiagnosticCod
         readonly code: 7002;
         readonly message: (legacyConfigKey: string) => string;
         readonly hint: "Please update your configuration to the new format.\nSee https://astro.build/config for more information.";
+    } | {
+        readonly title: "Unknown CLI Error.";
+        readonly code: 8000;
+    } | {
+        readonly title: "Failed to generate content types.";
+        readonly code: 8001;
+        readonly message: "`astro sync` command failed to generate content collection types.";
+        readonly hint: "Check your `src/content/config.*` file for typos.";
     } | {
         readonly title: "Unknown Error.";
         readonly code: 99999;

package/dist/core/messages.js

@@ -49,7 +49,7 @@ function serverStart({
   site,
   isRestart = false
 }) {
-  const version = "1.7.1";
+  const version = "1.8.0";
   const rootPath = site ? site.pathname : "/";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
@@ -272,7 +272,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"1.7.1"}`
+        `v${"1.8.0"}`
       )} ${headline}`
     );
   }

package/dist/core/render/dev/environment.js

@@ -1,3 +1,4 @@
+import { getContentPaths } from "../../../content/index.js";
 import { createEnvironment } from "../index.js";
 import { RouteCache } from "../route-cache.js";
 import { createResolve } from "./resolve.js";
@@ -9,7 +10,9 @@ function createDevelopmentEnvironment(settings, logging, loader) {
     logging,
     markdown: {
       ...settings.config.markdown,
-      isAstroFlavoredMd: settings.config.legacy.astroFlavoredMarkdown
+      isAstroFlavoredMd: settings.config.legacy.astroFlavoredMarkdown,
+      isExperimentalContentCollections: settings.config.experimental.contentCollections,
+      contentDir: getContentPaths(settings.config).contentDir
     },
     mode,
     renderers: [],

package/dist/core/render/environment.js

@@ -6,7 +6,10 @@ function createBasicEnvironment(options) {
   const mode = options.mode ?? "development";
   return createEnvironment({
     ...options,
-    markdown: options.markdown ?? {},
+    markdown: {
+      ...options.markdown ?? {},
+      contentDir: new URL("file:///src/content/")
+    },
     mode,
     renderers: options.renderers ?? [],
     resolve: options.resolve ?? ((s) => Promise.resolve(s)),

package/dist/core/render/route-cache.d.ts

@@ -12,7 +12,7 @@ export interface RouteCacheEntry {
     staticPaths: GetStaticPathsResultKeyed;
 }
 /**
- * Manange the route cache, responsible for caching data related to each route,
+ * Manage the route cache, responsible for caching data related to each route,
  * including the result of calling getStaticPath() so that it can be reused across
  * responses during dev and only ever called once during build.
  */

package/dist/runtime/server/index.d.ts

@@ -6,7 +6,7 @@ export { renderJSX } from './jsx.js';
 export { addAttribute, createHeadAndContent, defineScriptVars, Fragment, maybeRenderHead, renderAstroTemplateResult as renderAstroComponent, renderComponent, renderComponentToIterable, Renderer as Renderer, renderHead, renderHTMLElement, renderPage, renderSlot, renderStyleElement, renderTemplate as render, renderTemplate, renderToString, renderUniqueStylesheet, stringifyChunk, voidElementNames, } from './render/index.js';
 export type { AstroComponentFactory, AstroComponentInstance, AstroComponentSlots, AstroComponentSlotsWithValues, RenderInstruction, } from './render/index.js';
 export declare function mergeSlots(...slotted: unknown[]): Record<string, () => any>;
-/** @internal Assosciate JSX components with a specific renderer (see /src/vite-plugin-jsx/tag.ts) */
+/** @internal Associate JSX components with a specific renderer (see /src/vite-plugin-jsx/tag.ts) */
 export declare function __astro_tag_component__(Component: unknown, rendererName: string): void;
 export declare function spreadAttributes(values: Record<any, any>, _name?: string, { class: scopedClassName }?: {
     class?: string;

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

@@ -15,7 +15,12 @@ async function cachedFullCompilation({
     esbuildResult = await transformWithEsbuild(transformResult.code, rawId, {
       loader: "ts",
       target: "esnext",
-      sourcemap: "external"
+      sourcemap: "external",
+      tsconfigRaw: {
+        compilerOptions: {
+          importsNotUsedAsValues: "remove"
+        }
+      }
     });
   } catch (err) {
     await enhanceCompileError({

package/dist/vite-plugin-astro-postprocess/index.js

@@ -1,5 +1,6 @@
-import { parse as babelParser } from "@babel/parser";
-import { parse, print, types, visit } from "recast";
+import { parse } from "acorn";
+import { walk } from "estree-walker";
+import MagicString from "magic-string";
 import { isMarkdownFile } from "../core/util.js";
 const ASTRO_GLOB_REGEX = /Astro2?\s*\.\s*glob\s*\(/;
 function astro(_opts) {
@@ -12,43 +13,36 @@ function astro(_opts) {
       if (!ASTRO_GLOB_REGEX.test(code)) {
         return null;
       }
+      let s;
       const ast = parse(code, {
-        parser: { parse: babelParser }
+        ecmaVersion: "latest",
+        sourceType: "module"
       });
-      visit(ast, {
-        visitCallExpression: function(path) {
-          if (!types.namedTypes.MemberExpression.check(path.node.callee) || !types.namedTypes.Identifier.check(path.node.callee.property) || !(path.node.callee.property.name === "glob") || !types.namedTypes.Identifier.check(path.node.callee.object) || !(path.node.callee.object.name === "Astro" || path.node.callee.object.name === "Astro2")) {
-            this.traverse(path);
-            return;
-          }
-          const argsPath = path.get("arguments", 0);
-          const args = argsPath.value;
-          argsPath.replace(
-            {
-              type: "CallExpression",
-              callee: {
-                type: "MemberExpression",
-                object: {
-                  type: "MetaProperty",
-                  meta: { type: "Identifier", name: "import" },
-                  property: { type: "Identifier", name: "meta" }
-                },
-                property: { type: "Identifier", name: "glob" },
-                computed: false
-              },
-              arguments: [args]
-            },
-            {
-              type: "ArrowFunctionExpression",
-              body: args,
-              params: []
+      walk(ast, {
+        enter(node) {
+          if (node.type === "CallExpression" && node.callee.type === "MemberExpression" && node.callee.property.name === "glob" && (node.callee.object.name === "Astro" || node.callee.object.name === "Astro2") && node.arguments.length) {
+            const firstArgStart = node.arguments[0].start;
+            const firstArgEnd = node.arguments[0].end;
+            const lastArgEnd = node.arguments[node.arguments.length - 1].end;
+            let firstArg = code.slice(firstArgStart, firstArgEnd);
+            if (firstArg.startsWith("`") && firstArg.endsWith("`") && !firstArg.includes("${")) {
+              firstArg = JSON.stringify(firstArg.slice(1, -1));
             }
-          );
-          return false;
+            s ?? (s = new MagicString(code));
+            s.overwrite(
+              firstArgStart,
+              lastArgEnd,
+              `import.meta.glob(${firstArg}), () => ${firstArg}`
+            );
+          }
         }
       });
-      const result = print(ast);
-      return { code: result.code, map: result.map };
+      if (s) {
+        return {
+          code: s.toString(),
+          map: s.generateMap()
+        };
+      }
     }
   };
 }

package/dist/vite-plugin-config-alias/index.d.ts

@@ -5,7 +5,7 @@ export declare interface Alias {
     find: RegExp;
     replacement: string;
 }
-/** Returns a Vite plugin used to alias pathes from tsconfig.json and jsconfig.json. */
+/** Returns a Vite plugin used to alias paths from tsconfig.json and jsconfig.json. */
 export default function configAliasVitePlugin({ settings, }: {
     settings: AstroSettings;
 }): vite.PluginOption;

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

@@ -21,9 +21,9 @@ function getPrivateEnv(viteConfig, astroConfig) {
       }
     }
   }
-  privateEnv.SITE = astroConfig.site ? `'${astroConfig.site}'` : "undefined";
+  privateEnv.SITE = astroConfig.site ? JSON.stringify(astroConfig.site) : "undefined";
   privateEnv.SSR = JSON.stringify(true);
-  privateEnv.BASE_URL = astroConfig.base ? `'${astroConfig.base}'` : "undefined";
+  privateEnv.BASE_URL = astroConfig.base ? JSON.stringify(astroConfig.base) : "undefined";
   return privateEnv;
 }
 function getReferencedPrivateKeys(source, privateEnv) {

package/dist/vite-plugin-head-propagation/index.d.ts

@@ -4,7 +4,7 @@ import * as vite from 'vite';
  * If any component is marked as doing head injection, walk up the tree
  * and mark parent Astro components as having head injection in the tree.
  * This is used at runtime to determine if we should wait for head content
- * to be be populated before rendering the entire tree.
+ * to be populated before rendering the entire tree.
  */
 export default function configHeadPropagationVitePlugin({ settings, }: {
     settings: AstroSettings;

package/dist/vite-plugin-head-propagation/index.js

@@ -9,6 +9,8 @@ function configHeadPropagationVitePlugin({
       if (parent.id) {
         if (seen.has(parent.id)) {
           continue;
+        } else {
+          seen.add(parent.id);
         }
         const info = getInfo(parent.id);
         if (info == null ? void 0 : info.meta.astro) {

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

@@ -104,7 +104,12 @@ function jsx({ settings, logging }) {
         const { code: jsxCode2 } = await transformWithEsbuild(code, id, {
           loader: getEsbuildLoader(id),
           jsx: "preserve",
-          sourcemap: "inline"
+          sourcemap: "inline",
+          tsconfigRaw: {
+            compilerOptions: {
+              importsNotUsedAsValues: "remove"
+            }
+          }
         });
         return transformJSX({
           code: jsxCode2,

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

@@ -3,6 +3,7 @@ import fs from "fs";
 import matter from "gray-matter";
 import { fileURLToPath } from "node:url";
 import { normalizePath } from "vite";
+import { getContentPaths } from "../content/index.js";
 import { AstroErrorData, MarkdownError } from "../core/errors/index.js";
 import { warn } from "../core/logger/core.js";
 import { isMarkdownFile } from "../core/util.js";
@@ -50,7 +51,9 @@ function markdown({ settings, logging }) {
         const renderResult = await renderMarkdown(raw.content, {
           ...settings.config.markdown,
           fileURL: new URL(`file://${fileId}`),
-          isAstroFlavoredMd: false
+          isAstroFlavoredMd: false,
+          isExperimentalContentCollections: settings.config.experimental.contentCollections,
+          contentDir: getContentPaths(settings.config).contentDir
         });
         const html = renderResult.code;
         const { headings } = renderResult.metadata;
@@ -68,7 +71,7 @@ function markdown({ settings, logging }) {
           );
         }
         const code = escapeViteEnvReferences(`
-				import { Fragment, jsx as h } from '${astroJsxRuntimeModulePath}';
+				import { Fragment, jsx as h } from ${JSON.stringify(astroJsxRuntimeModulePath)};
 				${layout ? `import Layout from ${JSON.stringify(layout)};` : ""}
 
 				const html = ${JSON.stringify(html)};

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

@@ -3,6 +3,7 @@ import fs from "fs";
 import matter from "gray-matter";
 import { fileURLToPath } from "url";
 import { transformWithEsbuild } from "vite";
+import { getContentPaths } from "../content/index.js";
 import { pagesVirtualModuleId } from "../core/app/index.js";
 import { cachedCompilation } from "../core/compile/index.js";
 import { AstroErrorData, MarkdownError } from "../core/errors/index.js";
@@ -115,7 +116,9 @@ function markdown({ settings }) {
         let renderResult = await renderMarkdown(markdownContent, {
           ...renderOpts,
           fileURL: fileUrl,
-          isAstroFlavoredMd: true
+          isAstroFlavoredMd: true,
+          isExperimentalContentCollections: settings.config.experimental.contentCollections,
+          contentDir: getContentPaths(settings.config).contentDir
         });
         let { code: astroResult, metadata } = renderResult;
         const { layout = "", components = "", setup = "", ...content } = frontmatter;
@@ -124,8 +127,8 @@ function markdown({ settings }) {
         content.file = filename;
         const prelude = `---
 import Slugger from 'github-slugger';
-${layout ? `import Layout from '${layout}';` : ""}
-${components ? `import * from '${components}';` : ""}
+${layout ? `import Layout from ${JSON.stringify(layout)};` : ""}
+${components ? `import * from ${JSON.stringify(components)};` : ""}
 ${setup}
 
 const slugger = new Slugger();
@@ -142,7 +145,7 @@ Object.defineProperty($$content.astro, 'headers', {
 	}
 });
 ---`;
-        const imports = `${layout ? `import Layout from '${layout}';` : ""}
+        const imports = `${layout ? `import Layout from ${JSON.stringify(layout)};` : ""}
 ${setup}`.trim();
         if (/\bLayout\b/.test(imports)) {
           astroResult = `${prelude}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.7.1",
+  "version": "1.8.0",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -97,7 +97,7 @@
   "dependencies": {
     "@astrojs/compiler": "^0.31.0",
     "@astrojs/language-server": "^0.28.3",
-    "@astrojs/markdown-remark": "^1.1.3",
+    "@astrojs/markdown-remark": "^1.2.0",
     "@astrojs/telemetry": "^1.0.1",
     "@astrojs/webapi": "^1.1.1",
     "@babel/core": "^7.18.2",
@@ -111,6 +111,7 @@
     "@types/babel__core": "^7.1.19",
     "@types/html-escaper": "^3.0.0",
     "@types/yargs-parser": "^21.0.0",
+    "acorn": "^8.8.1",
     "boxen": "^6.2.1",
     "ci-info": "^3.3.1",
     "common-ancestor-path": "^1.0.1",
@@ -120,6 +121,7 @@
     "devalue": "^4.2.0",
     "diff": "^5.1.0",
     "es-module-lexer": "^1.1.0",
+    "estree-walker": "^3.0.1",
     "execa": "^6.1.0",
     "fast-glob": "^3.2.11",
     "github-slugger": "^1.4.0",
@@ -179,7 +181,6 @@
     "@types/rimraf": "^3.0.2",
     "@types/send": "^0.17.1",
     "@types/unist": "^2.0.6",
-    "ast-types": "^0.14.2",
     "astro-scripts": "0.0.9",
     "chai": "^4.3.6",
     "cheerio": "^1.0.0-rc.11",