astro 1.7.2 → 1.9.0

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);

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';
@@ -8,25 +8,16 @@ declare type RawContentEvent = {
     name: ChokidarEvent;
     entry: string;
 };
-declare type EntryInfo = {
-    id: string;
-    slug: string;
-    collection: string;
-};
 export declare type GenerateContentTypes = {
     init(): Promise<void>;
     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 getEntryInfo({ entry, contentDir, }: Pick<ContentPaths, 'contentDir'> & {
-    entry: URL;
-}): EntryInfo | Error;
+export declare function createContentTypesGenerator({ contentConfigObserver, fs, logging, settings, }: CreateContentGeneratorParams): Promise<GenerateContentTypes>;
 export declare function getEntryType(entryPath: string, paths: ContentPaths): 'content' | 'config' | 'unknown' | 'generated-types';
 export {};

package/dist/content/types-generator.js

@@ -1,26 +1,30 @@
 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,
+  getEntryInfo,
+  loadContentConfig,
+  NoCollectionError
+} 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"
   );
@@ -77,23 +81,26 @@ async function createContentTypesGenerator({
       }
       return { shouldGenerateTypes: true };
     }
-    const entryInfo = getEntryInfo({
-      entry: event.entry,
-      contentDir: contentPaths.contentDir
-    });
-    if (entryInfo instanceof Error)
-      return { shouldGenerateTypes: false };
     if (fileType === "unknown") {
-      if (entryInfo.id.startsWith("_") && (event.name === "add" || event.name === "change")) {
+      const entryInfo2 = getEntryInfo({
+        entry: event.entry,
+        contentDir: contentPaths.contentDir,
+        allowFilesOutsideCollection: true
+      });
+      if (entryInfo2.id.startsWith("_") && (event.name === "add" || event.name === "change")) {
         return { shouldGenerateTypes: false };
       } else {
         return {
           shouldGenerateTypes: false,
-          error: new UnsupportedFileTypeError(entryInfo.id)
+          error: new UnsupportedFileTypeError(entryInfo2.id)
         };
       }
     }
-    if (entryInfo.collection === ".") {
+    const entryInfo = getEntryInfo({
+      entry: event.entry,
+      contentDir: contentPaths.contentDir
+    });
+    if (entryInfo instanceof NoCollectionError) {
       if (["info", "warn"].includes(logLevel)) {
         warn(
           logging,
@@ -194,23 +201,6 @@ function addEntry(contentTypes, collectionKey, entryKey, slug) {
 function removeEntry(contentTypes, collectionKey, entryKey) {
   delete contentTypes[collectionKey][entryKey];
 }
-function getEntryInfo({
-  entry,
-  contentDir
-}) {
-  const rawRelativePath = path.relative(fileURLToPath(contentDir), fileURLToPath(entry));
-  const rawCollection = path.dirname(rawRelativePath).split(path.sep).shift();
-  if (!rawCollection)
-    return new Error();
-  const rawId = path.relative(rawCollection, rawRelativePath);
-  const rawSlug = rawId.replace(path.extname(rawId), "");
-  const res = {
-    id: normalizePath(rawId),
-    slug: normalizePath(rawSlug),
-    collection: normalizePath(rawCollection)
-  };
-  return res;
-}
 function getEntryType(entryPath, paths) {
   const { dir: rawDir, ext, name, base } = path.parse(entryPath);
   const dir = appendForwardSlash(pathToFileURL(rawDir).href);
@@ -285,6 +275,5 @@ function warnNonexistentCollections({
 }
 export {
   createContentTypesGenerator,
-  getEntryInfo,
   getEntryType
 };

package/dist/content/utils.d.ts

@@ -120,11 +120,22 @@ declare type Entry = {
         filePath: string;
     };
 };
+export declare type EntryInfo = {
+    id: string;
+    slug: string;
+    collection: string;
+};
 export declare const msg: {
     collectionConfigMissing: (collection: string) => string;
 };
 export declare function getEntrySlug(entry: Entry, collectionConfig: CollectionConfig): Promise<string>;
 export declare function getEntryData(entry: Entry, collectionConfig: CollectionConfig): Promise<any>;
+export declare class NoCollectionError extends Error {
+}
+export declare function getEntryInfo(params: Pick<ContentPaths, 'contentDir'> & {
+    entry: URL;
+    allowFilesOutsideCollection?: true;
+}): EntryInfo;
 /**
  * Match YAML exception handling from Astro core errors
  * @see 'astro/src/core/errors.ts'

package/dist/content/utils.js

@@ -1,6 +1,8 @@
+import { slug as githubSlug } from "github-slugger";
 import matter from "gray-matter";
+import path from "node:path";
 import { fileURLToPath } from "node:url";
-import { createServer } from "vite";
+import { createServer, normalizePath } from "vite";
 import { z } from "zod";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { astroContentVirtualModPlugin } from "./vite-plugin-content-virtual-mod.js";
@@ -60,10 +62,33 @@ async function getEntryData(entry, collectionConfig) {
   }
   return data;
 }
-const flattenPath = (path) => path.join(".");
+class NoCollectionError extends Error {
+}
+function getEntryInfo({
+  entry,
+  contentDir,
+  allowFilesOutsideCollection = false
+}) {
+  const rawRelativePath = path.relative(fileURLToPath(contentDir), fileURLToPath(entry));
+  const rawCollection = path.dirname(rawRelativePath).split(path.sep).shift();
+  const isOutsideCollection = rawCollection === ".." || rawCollection === ".";
+  if (!rawCollection || !allowFilesOutsideCollection && isOutsideCollection)
+    return new NoCollectionError();
+  const rawId = path.relative(rawCollection, rawRelativePath);
+  const rawIdWithoutFileExt = rawId.replace(new RegExp(path.extname(rawId) + "$"), "");
+  const rawSlugSegments = rawIdWithoutFileExt.split(path.sep);
+  const slug = rawSlugSegments.map((segment) => githubSlug(segment)).join("/").replace(/\/index$/, "");
+  const res = {
+    id: normalizePath(rawId),
+    slug,
+    collection: normalizePath(rawCollection)
+  };
+  return res;
+}
+const flattenErrorPath = (errorPath) => errorPath.join(".");
 const errorMap = (error, ctx) => {
   if (error.code === "invalid_type") {
-    const badKeyPath = JSON.stringify(flattenPath(error.path));
+    const badKeyPath = JSON.stringify(flattenErrorPath(error.path));
     if (error.received === "undefined") {
       return { message: `${badKeyPath} is required.` };
     } else {
@@ -106,6 +131,7 @@ async function loadContentConfig({
   settings
 }) {
   const contentPaths = getContentPaths({ srcDir: settings.config.srcDir });
+  const nodeEnv = process.env.NODE_ENV;
   const tempConfigServer = await createServer({
     root: fileURLToPath(settings.config.root),
     server: { middlewareMode: true, hmr: false },
@@ -122,6 +148,7 @@ async function loadContentConfig({
     return new NotFoundError("Failed to resolve content config.");
   } finally {
     await tempConfigServer.close();
+    process.env.NODE_ENV = nodeEnv;
   }
   const config = contentConfigParser.safeParse(unparsedConfig);
   if (config.success) {
@@ -161,6 +188,7 @@ function getContentPaths({ srcDir }) {
   };
 }
 export {
+  NoCollectionError,
   NotFoundError,
   ZodParseError,
   collectionConfigParser,
@@ -168,6 +196,7 @@ export {
   contentObservable,
   getContentPaths,
   getEntryData,
+  getEntryInfo,
   getEntrySlug,
   loadContentConfig,
   msg,

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

@@ -9,7 +9,8 @@ import {
   LINKS_PLACEHOLDER,
   STYLES_PLACEHOLDER
 } from "./consts.js";
-function isDelayedAsset(url) {
+function isDelayedAsset(viteId) {
+  const url = new URL(viteId, "file://");
   return url.searchParams.has(DELAYED_ASSET_FLAG) && contentFileExts.some((ext) => url.pathname.endsWith(ext));
 }
 function astroDelayedAssetPlugin({ mode }) {
@@ -23,10 +24,10 @@ function astroDelayedAssetPlugin({ mode }) {
       }
     },
     load(id) {
-      const url = new URL(id, "file://");
-      if (isDelayedAsset(url)) {
+      if (isDelayedAsset(id)) {
+        const basePath = id.split("?")[0];
         const code = `
-					export { Content, getHeadings, _internal } from ${JSON.stringify(url.pathname)};
+					export { Content, getHeadings, _internal } from ${JSON.stringify(basePath)};
 					export const collectedLinks = ${JSON.stringify(LINKS_PLACEHOLDER)};
 					export const collectedStyles = ${JSON.stringify(STYLES_PLACEHOLDER)};
 				`;
@@ -37,14 +38,13 @@ function astroDelayedAssetPlugin({ mode }) {
       var _a;
       if (!(options == null ? void 0 : options.ssr))
         return;
-      const url = new URL(id, "file://");
-      if (devModuleLoader && isDelayedAsset(url)) {
-        const { pathname } = url;
-        if (!((_a = devModuleLoader.getModuleById(pathname)) == null ? void 0 : _a.ssrModule)) {
-          await devModuleLoader.import(pathname);
+      if (devModuleLoader && isDelayedAsset(id)) {
+        const basePath = id.split("?")[0];
+        if (!((_a = devModuleLoader.getModuleById(basePath)) == null ? void 0 : _a.ssrModule)) {
+          await devModuleLoader.import(basePath);
         }
         const { stylesMap, urls } = await getStylesForURL(
-          pathToFileURL(pathname),
+          pathToFileURL(basePath),
           devModuleLoader,
           "development"
         );

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

@@ -2,18 +2,17 @@ import * as devalue from "devalue";
 import { cyan } from "kleur/colors";
 import { pathToFileURL } from "node:url";
 import { info } from "../core/logger/core.js";
-import { prependForwardSlash } from "../core/path.js";
-import { escapeViteEnvReferences } from "../vite-plugin-utils/index.js";
+import { escapeViteEnvReferences, getFileInfo } from "../vite-plugin-utils/index.js";
 import { contentFileExts, CONTENT_FLAG } from "./consts.js";
 import {
   createContentTypesGenerator,
-  getEntryInfo,
   getEntryType
 } from "./types-generator.js";
 import {
   contentObservable,
   getContentPaths,
   getEntryData,
+  getEntryInfo,
   getEntrySlug,
   parseFrontmatter
 } from "./utils.js";
@@ -43,8 +42,7 @@ function astroContentServerPlugin({
             fs,
             settings,
             logging,
-            contentConfigObserver,
-            contentPaths
+            contentConfigObserver
           });
           await contentGenerator.init();
           info(logging, "content", "Types generated");
@@ -96,8 +94,8 @@ function astroContentServerPlugin({
     {
       name: "astro-content-flag-plugin",
       async load(id) {
-        const fileUrl = new URL(prependForwardSlash(id), "file://");
-        if (isContentFlagImport(fileUrl)) {
+        const { fileId } = getFileInfo(id, settings.config);
+        if (isContentFlagImport(id)) {
           const observable = contentConfigObserver.get();
           let contentConfig = observable.status === "loaded" ? observable.config : void 0;
           if (observable.status === "loading") {
@@ -113,19 +111,19 @@ function astroContentServerPlugin({
               });
             });
           }
-          const rawContents = await fs.promises.readFile(fileUrl, "utf-8");
+          const rawContents = await fs.promises.readFile(fileId, "utf-8");
           const {
             content: body,
             data: unparsedData,
             matter: rawData = ""
-          } = parseFrontmatter(rawContents, fileUrl.pathname);
+          } = parseFrontmatter(rawContents, fileId);
           const entryInfo = getEntryInfo({
-            entry: fileUrl,
+            entry: pathToFileURL(fileId),
             contentDir: contentPaths.contentDir
           });
           if (entryInfo instanceof Error)
             return;
-          const _internal = { filePath: fileUrl.pathname, rawData };
+          const _internal = { filePath: fileId, rawData };
           const partialEntry = { data: unparsedData, body, _internal, ...entryInfo };
           const collectionConfig = contentConfig == null ? void 0 : contentConfig.collections[entryInfo.collection];
           const data = collectionConfig ? await getEntryData(partialEntry, collectionConfig) : unparsedData;
@@ -137,7 +135,7 @@ export const slug = ${JSON.stringify(slug)};
 export const body = ${JSON.stringify(body)};
 export const data = ${devalue.uneval(data)};
 export const _internal = {
-	filePath: ${JSON.stringify(fileUrl.pathname)},
+	filePath: ${JSON.stringify(fileId)},
 	rawData: ${JSON.stringify(rawData)},
 };
 `);
@@ -148,7 +146,7 @@ export const _internal = {
         viteServer.watcher.on("all", async (event, entry) => {
           if (["add", "unlink", "change"].includes(event) && getEntryType(entry, contentPaths) === "config") {
             for (const modUrl of viteServer.moduleGraph.urlToModuleMap.keys()) {
-              if (isContentFlagImport(new URL(modUrl, "file://"))) {
+              if (isContentFlagImport(modUrl)) {
                 const mod = await viteServer.moduleGraph.getModuleByUrl(modUrl);
                 if (mod) {
                   viteServer.moduleGraph.invalidateModule(mod);
@@ -159,14 +157,15 @@ export const _internal = {
         });
       },
       async transform(code, id) {
-        if (isContentFlagImport(new URL(id, "file://"))) {
+        if (isContentFlagImport(id)) {
           return { code: escapeViteEnvReferences(code) };
         }
       }
     }
   ];
 }
-function isContentFlagImport({ searchParams, pathname }) {
+function isContentFlagImport(viteId) {
+  const { pathname, searchParams } = new URL(viteId, "file://");
   return searchParams.has(CONTENT_FLAG) && contentFileExts.some((ext) => pathname.endsWith(ext));
 }
 export {

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/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";
@@ -35,9 +36,7 @@ const _manifest = Object.assign(_deserializeManifest('${manifestReplace}'), {
 	renderers: _main.renderers
 });
 const _args = ${adapter.args ? JSON.stringify(adapter.args) : "undefined"};
-
 export * from '${pagesVirtualModuleId}';
-
 ${adapter.exports ? `const _exports = adapter.createExports(_manifest, _args);
 ${adapter.exports.map((name) => {
           if (name === "default") {
@@ -134,9 +133,11 @@ function buildManifest(opts, internals, staticFiles) {
   for (const pageData of eachServerPageData(internals)) {
     const scripts = [];
     if (pageData.hoistedScript) {
+      const hoistedValue = pageData.hoistedScript.value;
+      const value = hoistedValue.endsWith(".js") ? joinBase(hoistedValue) : hoistedValue;
       scripts.unshift(
         Object.assign({}, pageData.hoistedScript, {
-          value: joinBase(pageData.hoistedScript.value)
+          value
         })
       );
     }
@@ -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/config/vite-load.js

@@ -13,7 +13,13 @@ async function createViteLoader(root, fs) {
     clearScreen: false,
     appType: "custom",
     ssr: {
-      external: ["@astrojs/tailwind", "@astrojs/mdx", "@astrojs/react"]
+      external: [
+        "@astrojs/tailwind",
+        "@astrojs/mdx",
+        "@astrojs/react",
+        "@astrojs/preact",
+        "@astrojs/sitemap"
+      ]
     },
     plugins: [loadFallbackPlugin({ fs, root: pathToFileURL(root) })]
   });

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "1.7.2";
+const ASTRO_VERSION = "1.9.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.2";
+  const currentVersion = "1.9.0";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

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

@@ -479,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

@@ -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

@@ -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.2";
+  const version = "1.9.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.2"}`
+        `v${"1.9.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/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-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-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.2",
+  "version": "1.9.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,9 +121,10 @@
     "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",
+    "github-slugger": "^2.0.0",
     "gray-matter": "^4.0.3",
     "html-entities": "^2.3.3",
     "html-escaper": "^3.0.3",
@@ -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",
@@ -208,6 +209,7 @@
     "postbuild": "astro-scripts copy \"src/**/*.astro\"",
     "benchmark": "node test/benchmark/dev.bench.js && node test/benchmark/build.bench.js",
     "test:unit": "mocha --exit --timeout 30000 ./test/units/**/*.test.js",
+    "test:unit:match": "mocha --exit --timeout 30000 ./test/units/**/*.test.js -g",
     "test": "pnpm run test:unit && mocha --exit --timeout 20000 --ignore **/lit-element.test.js && mocha --timeout 20000 **/lit-element.test.js",
     "test:match": "mocha --timeout 20000 -g",
     "test:e2e": "playwright test",