astro 2.0.0-beta.3 → 2.0.0

package/astro.js

@@ -4,7 +4,6 @@
 
 // ISOMORPHIC FILE: NO TOP-LEVEL IMPORT/REQUIRE() ALLOWED
 // This file has to run as both ESM and CJS on older Node.js versions
-// Assume ESM to start, and then call `require()` below once CJS is confirmed.
 // Needed for Stackblitz: https://github.com/stackblitz/webcontainer-core/issues/281
 
 const CI_INSTRUCTIONS = {
@@ -14,64 +13,41 @@ const CI_INSTRUCTIONS = {
 	VERCEL: 'https://vercel.com/docs/runtimes#official-runtimes/node-js/node-js-version',
 };
 
+// Hardcode supported Node.js version so we don't have to read differently in CJS & ESM.
+const engines = '>=16.12.0';
+const skipSemverCheckIfAbove = 16;
+
 /** `astro *` */
 async function main() {
-	// Check for ESM support.
-	// Load the "supports-esm" package in an way that works in both ESM & CJS.
-	let supportsESM =
-		typeof require !== 'undefined'
-			? require('supports-esm')
-			: (await import('supports-esm')).default;
-
-	// Check for CJS->ESM named export support.
-	// "path-to-regexp" is a real-world package that we depend on, that only
-	// works in later versions of Node with advanced CJS->ESM support.
-	// If `import {compile} from 'path-to-regexp'` will fail, we need to know.
-	if (supportsESM) {
-		const testNamedExportsModule = await import('path-to-regexp');
-		supportsESM = !!testNamedExportsModule.compile;
-	}
-
-	// Preflight check complete. Enjoy! ✨
-	if (supportsESM) {
-		return import('./dist/cli/index.js')
-			.then(({ cli }) => cli(process.argv))
-			.catch((error) => {
-				console.error(error);
-				process.exit(1);
-			});
-	}
-
 	const version = process.versions.node;
-
-	// Not supported (incomplete ESM): It's very difficult (impossible?) to load the
-	// dependencies below in an unknown module type. If `require` is undefined, then this file
-	// actually was run as ESM but one of the ESM preflight checks above failed. In that case,
-	// it's okay to hard-code the valid Node versions here since they will not change over time.
-	if (typeof require === 'undefined') {
-		console.error(`\nNode.js v${version} is not supported by Astro!
-Please upgrade to a supported version of Node.js: ">=16.12.0"\n`);
+	// Fast-path for higher Node.js versions
+	if ((parseInt(version) || 0) <= skipSemverCheckIfAbove) {
+		try {
+			const semver = await import('semver');
+			if (!semver.satisfies(version, engines)) {
+				await errorNodeUnsupported();
+				return;
+			}
+		} catch {
+			await errorNodeUnsupported();
+			return;
+		}
 	}
 
-	// Not supported: Report the most helpful error message possible.
-	const pkg = require('./package.json');
-	const ci = require('ci-info');
-	const semver = require('semver');
-	const engines = pkg.engines.node;
+	return import('./dist/cli/index.js')
+		.then(({ cli }) => cli(process.argv))
+		.catch((error) => {
+			console.error(error);
+			process.exit(1);
+		});
+}
 
-	// TODO: Remove "semver" in Astro v1.0: This is mainly just to check our work. Once run in
-	// the wild for a bit without error, we can assume our engine range is correct and won't
-	// change over time.
-	const isSupported = semver.satisfies(version, engines);
-	if (isSupported) {
-		console.error(`\nNode.js v${version} is not supported by Astro!
-Supported versions: ${engines}\n
-Issue Detected! This Node.js version was expected to work, but failed a system check.
-Please file an issue so that we can take a look: https://github.com/withastro/astro/issues/new\n`);
-	} else {
-		console.error(`\nNode.js v${version} is not supported by Astro!
+async function errorNodeUnsupported() {
+	console.error(`\
+Node.js v${process.versions.node} is not supported by Astro!
 Please upgrade Node.js to a supported version: "${engines}"\n`);
-	}
+
+	const ci = typeof require !== 'undefined' ? require('ci-info') : await import('ci-info');
 
 	// Special instructions for CI environments, which may have special steps needed.
 	// This is a common issue that we can help users with proactively.

package/dist/content/types-generator.js

@@ -9,8 +9,10 @@ import { contentFileExts, CONTENT_TYPES_FILE } from "./consts.js";
 import {
   getContentPaths,
   getEntryInfo,
+  getEntrySlug,
   loadContentConfig,
-  NoCollectionError
+  NoCollectionError,
+  parseFrontmatter
 } from "./utils.js";
 class UnsupportedFileTypeError extends Error {
 }
@@ -47,6 +49,7 @@ async function createContentTypesGenerator({
     return { typesGenerated: true };
   }
   async function handleEvent(event, opts) {
+    var _a, _b;
     const logLevel = (opts == null ? void 0 : opts.logLevel) ?? "info";
     if (event.name === "addDir" || event.name === "unlinkDir") {
       const collection2 = normalizePath(
@@ -115,16 +118,17 @@ async function createContentTypesGenerator({
       }
       return { shouldGenerateTypes: false };
     }
-    const { id, slug, collection } = entryInfo;
+    const { id, collection } = entryInfo;
     const collectionKey = JSON.stringify(collection);
     const entryKey = JSON.stringify(id);
     switch (event.name) {
       case "add":
+        const addedSlug = await parseSlug({ fs, event, entryInfo });
         if (!(collectionKey in contentTypes)) {
           addCollection(contentTypes, collectionKey);
         }
         if (!(entryKey in contentTypes[collectionKey])) {
-          addEntry(contentTypes, collectionKey, entryKey, slug);
+          setEntry(contentTypes, collectionKey, entryKey, addedSlug);
         }
         return { shouldGenerateTypes: true };
       case "unlink":
@@ -133,6 +137,11 @@ async function createContentTypesGenerator({
         }
         return { shouldGenerateTypes: true };
       case "change":
+        const changedSlug = await parseSlug({ fs, event, entryInfo });
+        if (((_b = (_a = contentTypes[collectionKey]) == null ? void 0 : _a[entryKey]) == null ? void 0 : _b.slug) !== changedSlug) {
+          setEntry(contentTypes, collectionKey, entryKey, changedSlug);
+          return { shouldGenerateTypes: true };
+        }
         return { shouldGenerateTypes: false };
     }
   }
@@ -196,7 +205,16 @@ function addCollection(contentMap, collectionKey) {
 function removeCollection(contentMap, collectionKey) {
   delete contentMap[collectionKey];
 }
-function addEntry(contentTypes, collectionKey, entryKey, slug) {
+async function parseSlug({
+  fs,
+  event,
+  entryInfo
+}) {
+  const rawContents = await fs.promises.readFile(event.entry, "utf-8");
+  const { data: frontmatter } = parseFrontmatter(rawContents, fileURLToPath(event.entry));
+  return getEntrySlug({ ...entryInfo, data: frontmatter });
+}
+function setEntry(contentTypes, collectionKey, entryKey, slug) {
   contentTypes[collectionKey][entryKey] = { slug };
 }
 function removeEntry(contentTypes, collectionKey, entryKey) {
@@ -232,7 +250,7 @@ async function writeContentFiles({
     for (const entryKey of entryKeys) {
       const entryMetadata = contentTypes[collectionKey][entryKey];
       const dataType = (collectionConfig == null ? void 0 : collectionConfig.schema) ? `InferEntrySchema<${collectionKey}>` : "any";
-      const slugType = (collectionConfig == null ? void 0 : collectionConfig.slug) ? "string" : JSON.stringify(entryMetadata.slug);
+      const slugType = JSON.stringify(entryMetadata.slug);
       contentTypesStr += `${entryKey}: {
   id: ${entryKey},
   slug: ${slugType},

package/dist/content/utils.d.ts

@@ -5,43 +5,10 @@ import { z } from 'zod';
 import { AstroConfig, AstroSettings } from '../@types/astro.js';
 export declare const collectionConfigParser: z.ZodObject<{
     schema: z.ZodOptional<z.ZodAny>;
-    slug: z.ZodOptional<z.ZodFunction<z.ZodTuple<[z.ZodObject<{
-        id: z.ZodString;
-        collection: z.ZodString;
-        defaultSlug: z.ZodString;
-        body: z.ZodString;
-        data: z.ZodRecord<z.ZodString, z.ZodAny>;
-    }, "strip", z.ZodTypeAny, {
-        id: string;
-        data: Record<string, any>;
-        body: string;
-        collection: string;
-        defaultSlug: string;
-    }, {
-        id: string;
-        data: Record<string, any>;
-        body: string;
-        collection: string;
-        defaultSlug: string;
-    }>], z.ZodUnknown>, z.ZodUnion<[z.ZodString, z.ZodPromise<z.ZodString>]>>>;
 }, "strip", z.ZodTypeAny, {
     schema?: any;
-    slug?: ((args_0: {
-        id: string;
-        data: Record<string, any>;
-        body: string;
-        collection: string;
-        defaultSlug: string;
-    }, ...args_1: unknown[]) => string | Promise<string>) | undefined;
 }, {
     schema?: any;
-    slug?: ((args_0: {
-        id: string;
-        data: Record<string, any>;
-        body: string;
-        collection: string;
-        defaultSlug: string;
-    }, ...args_1: unknown[]) => string | Promise<string>) | undefined;
 }>;
 export declare function getDotAstroTypeReference({ root, srcDir }: {
     root: URL;
@@ -50,65 +17,18 @@ export declare function getDotAstroTypeReference({ root, srcDir }: {
 export declare const contentConfigParser: z.ZodObject<{
     collections: z.ZodRecord<z.ZodString, z.ZodObject<{
         schema: z.ZodOptional<z.ZodAny>;
-        slug: z.ZodOptional<z.ZodFunction<z.ZodTuple<[z.ZodObject<{
-            id: z.ZodString;
-            collection: z.ZodString;
-            defaultSlug: z.ZodString;
-            body: z.ZodString;
-            data: z.ZodRecord<z.ZodString, z.ZodAny>;
-        }, "strip", z.ZodTypeAny, {
-            id: string;
-            data: Record<string, any>;
-            body: string;
-            collection: string;
-            defaultSlug: string;
-        }, {
-            id: string;
-            data: Record<string, any>;
-            body: string;
-            collection: string;
-            defaultSlug: string;
-        }>], z.ZodUnknown>, z.ZodUnion<[z.ZodString, z.ZodPromise<z.ZodString>]>>>;
     }, "strip", z.ZodTypeAny, {
         schema?: any;
-        slug?: ((args_0: {
-            id: string;
-            data: Record<string, any>;
-            body: string;
-            collection: string;
-            defaultSlug: string;
-        }, ...args_1: unknown[]) => string | Promise<string>) | undefined;
     }, {
         schema?: any;
-        slug?: ((args_0: {
-            id: string;
-            data: Record<string, any>;
-            body: string;
-            collection: string;
-            defaultSlug: string;
-        }, ...args_1: unknown[]) => string | Promise<string>) | undefined;
     }>>;
 }, "strip", z.ZodTypeAny, {
     collections: Record<string, {
         schema?: any;
-        slug?: ((args_0: {
-            id: string;
-            data: Record<string, any>;
-            body: string;
-            collection: string;
-            defaultSlug: string;
-        }, ...args_1: unknown[]) => string | Promise<string>) | undefined;
     }>;
 }, {
     collections: Record<string, {
         schema?: any;
-        slug?: ((args_0: {
-            id: string;
-            data: Record<string, any>;
-            body: string;
-            collection: string;
-            defaultSlug: string;
-        }, ...args_1: unknown[]) => string | Promise<string>) | undefined;
     }>;
 }>;
 export type CollectionConfig = z.infer<typeof collectionConfigParser>;
@@ -132,7 +52,7 @@ export type EntryInfo = {
 export declare const msg: {
     collectionConfigMissing: (collection: string) => string;
 };
-export declare function getEntrySlug(entry: Entry, collectionConfig: CollectionConfig): Promise<string>;
+export declare function getEntrySlug({ id, collection, slug, data: unparsedData, }: Pick<Entry, 'id' | 'collection' | 'slug' | 'data'>): string;
 export declare function getEntryData(entry: Entry, collectionConfig: CollectionConfig): Promise<any>;
 export declare class NoCollectionError extends Error {
 }

package/dist/content/utils.js

@@ -8,16 +8,7 @@ import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { CONTENT_TYPES_FILE } from "./consts.js";
 import { astroContentVirtualModPlugin } from "./vite-plugin-content-virtual-mod.js";
 const collectionConfigParser = z.object({
-  schema: z.any().optional(),
-  slug: z.function().args(
-    z.object({
-      id: z.string(),
-      collection: z.string(),
-      defaultSlug: z.string(),
-      body: z.string(),
-      data: z.record(z.any())
-    })
-  ).returns(z.union([z.string(), z.promise(z.string())])).optional()
+  schema: z.any().optional()
 });
 function getDotAstroTypeReference({ root, srcDir }) {
   const { cacheDir } = getContentPaths({ root, srcDir });
@@ -32,18 +23,23 @@ const contentConfigParser = z.object({
 const msg = {
   collectionConfigMissing: (collection) => `${collection} does not have a config. We suggest adding one for type safety!`
 };
-async function getEntrySlug(entry, collectionConfig) {
-  var _a;
-  return ((_a = collectionConfig.slug) == null ? void 0 : _a.call(collectionConfig, {
-    id: entry.id,
-    data: entry.data,
-    defaultSlug: entry.slug,
-    collection: entry.collection,
-    body: entry.body
-  })) ?? entry.slug;
+function getEntrySlug({
+  id,
+  collection,
+  slug,
+  data: unparsedData
+}) {
+  try {
+    return z.string().default(slug).parse(unparsedData.slug);
+  } catch {
+    throw new AstroError({
+      ...AstroErrorData.InvalidContentEntrySlugError,
+      message: AstroErrorData.InvalidContentEntrySlugError.message(collection, id)
+    });
+  }
 }
 async function getEntryData(entry, collectionConfig) {
-  let data = entry.data;
+  let { slug, ...data } = entry.data;
   if (collectionConfig.schema) {
     if (typeof collectionConfig.schema === "object" && !("safeParseAsync" in collectionConfig.schema)) {
       throw new AstroError({
@@ -53,13 +49,19 @@ async function getEntryData(entry, collectionConfig) {
         code: 99999
       });
     }
+    if (typeof collectionConfig.schema === "object" && "shape" in collectionConfig.schema && collectionConfig.schema.shape.slug) {
+      throw new AstroError({
+        ...AstroErrorData.ContentSchemaContainsSlugError,
+        message: AstroErrorData.ContentSchemaContainsSlugError.message(entry.collection)
+      });
+    }
     const parsed = await collectionConfig.schema.safeParseAsync(entry.data, { errorMap });
     if (parsed.success) {
       data = parsed.data;
     } else {
       const formattedError = new AstroError({
-        ...AstroErrorData.MarkdownContentSchemaValidationError,
-        message: AstroErrorData.MarkdownContentSchemaValidationError.message(
+        ...AstroErrorData.InvalidContentEntryFrontmatterError,
+        message: AstroErrorData.InvalidContentEntryFrontmatterError.message(
           entry.collection,
           entry.id,
           parsed.error

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

@@ -121,9 +121,9 @@ function astroContentServerPlugin({
             return;
           const _internal = { filePath: fileId, rawData };
           const partialEntry = { data: unparsedData, body, _internal, ...entryInfo };
+          const slug = getEntrySlug(partialEntry);
           const collectionConfig = contentConfig == null ? void 0 : contentConfig.collections[entryInfo.collection];
           const data = collectionConfig ? await getEntryData(partialEntry, collectionConfig) : unparsedData;
-          const slug = collectionConfig ? await getEntrySlug({ ...partialEntry, data }, collectionConfig) : entryInfo.slug;
           const code = escapeViteEnvReferences(`
 export const id = ${JSON.stringify(entryInfo.id)};
 export const collection = ${JSON.stringify(entryInfo.collection)};

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

@@ -14,6 +14,7 @@ import { appendForwardSlash, prependForwardSlash } from "../../core/path.js";
 import { isModeServerWithNoAdapter } from "../../core/util.js";
 import { runHookBuildSetup } from "../../integrations/index.js";
 import { PAGE_SCRIPT_ID } from "../../vite-plugin-scripts/index.js";
+import { resolvedPagesVirtualModuleId } from "../app/index.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
 import { info } from "../logger/core.js";
 import { getOutDirWithinCwd } from "./common.js";
@@ -105,7 +106,13 @@ async function ssrBuild(opts, internals, input) {
           chunkFileNames: `chunks/[name].[hash].mjs`,
           assetFileNames: `${settings.config.build.assets}/[name].[hash][extname]`,
           ...(_c = (_b = viteConfig.build) == null ? void 0 : _b.rollupOptions) == null ? void 0 : _c.output,
-          entryFileNames: opts.buildConfig.serverEntry
+          entryFileNames(chunkInfo) {
+            if (chunkInfo.facadeModuleId === resolvedPagesVirtualModuleId) {
+              return opts.buildConfig.serverEntry;
+            } else {
+              return "[name].mjs";
+            }
+          }
         }
       },
       ssr: true,

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "2.0.0-beta.3";
+const ASTRO_VERSION = "2.0.0";
 const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
   ".markdown",
   ".mdown",

package/dist/core/dev/dev.js

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

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

@@ -437,25 +437,6 @@ export declare const AstroErrorData: {
         readonly title: "Failed to parse Markdown frontmatter.";
         readonly code: 6001;
     };
-    /**
-     * @docs
-     * @message
-     * **Example error message:**<br/>
-     * Could not parse frontmatter in **blog** → **post.md**<br/>
-     * "title" is required.<br/>
-     * "date" must be a valid date.
-     * @description
-     * 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.
-     */
-    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.";
-    };
     /**
      * @docs
      * @see
@@ -533,6 +514,60 @@ export declare const AstroErrorData: {
         readonly message: "`astro sync` command failed to generate content collection types.";
         readonly hint: "Check your `src/content/config.*` file for typos.";
     };
+    /**
+     * @docs
+     * @kind heading
+     * @name Content Collection Errors
+     */
+    readonly UnknownContentCollectionError: {
+        readonly title: "Unknown Content Collection Error.";
+        readonly code: 9000;
+    };
+    /**
+     * @docs
+     * @message
+     * **Example error message:**<br/>
+     * **blog** → **post.md** frontmatter does not match collection schema.<br/>
+     * "title" is required.<br/>
+     * "date" must be a valid date.
+     * @description
+     * A Markdown or MDX entry 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.
+     */
+    readonly InvalidContentEntryFrontmatterError: {
+        readonly title: "Content entry frontmatter does not match schema.";
+        readonly code: 9001;
+        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.";
+    };
+    /**
+     * @docs
+     * @see
+     * - [The reserved entry `slug` field](https://docs.astro.build/en/guides/content-collections/)
+     * @description
+     * An entry in `src/content/` has an invalid `slug`. This field is reserved for generating entry slugs, and must be a string when present.
+     */
+    readonly InvalidContentEntrySlugError: {
+        readonly title: "Invalid content entry slug.";
+        readonly code: 9002;
+        readonly message: (collection: string, entryId: string) => string;
+        readonly hint: "See https://docs.astro.build/en/guides/content-collections/ for more on the `slug` field.";
+    };
+    /**
+     * @docs
+     * @see
+     * - [The reserved entry `slug` field](https://docs.astro.build/en/guides/content-collections/)
+     * @description
+     * A content collection schema should not contain the `slug` field. This is reserved by Astro for generating entry slugs. Remove the `slug` field from your schema, or choose a different name.
+     */
+    readonly ContentSchemaContainsSlugError: {
+        readonly title: "Content Schema should not contain `slug`.";
+        readonly code: 9003;
+        readonly message: (collection: string) => string;
+        readonly hint: "See https://docs.astro.build/en/guides/content-collections/ for more on the `slug` field.";
+    };
     readonly UnknownError: {
         readonly title: "Unknown Error.";
         readonly code: 99999;

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

@@ -165,17 +165,6 @@ Expected \`true\` value but got \`${suffix}\`.`;
     title: "Failed to parse Markdown frontmatter.",
     code: 6001
   },
-  MarkdownContentSchemaValidationError: {
-    title: "Content collection frontmatter invalid.",
-    code: 6002,
-    message: (collection, entryId, error) => {
-      return [
-        `${String(collection)} \u2192 ${String(entryId)} frontmatter does not match collection schema.`,
-        ...error.errors.map((zodError) => zodError.message)
-      ].join("\n");
-    },
-    hint: "See https://docs.astro.build/en/guides/content-collections/ for more information on content schemas."
-  },
   InvalidFrontmatterInjectionError: {
     title: "Invalid frontmatter injection.",
     code: 6003,
@@ -213,6 +202,39 @@ Expected \`true\` value but got \`${suffix}\`.`;
     message: "`astro sync` command failed to generate content collection types.",
     hint: "Check your `src/content/config.*` file for typos."
   },
+  UnknownContentCollectionError: {
+    title: "Unknown Content Collection Error.",
+    code: 9e3
+  },
+  InvalidContentEntryFrontmatterError: {
+    title: "Content entry frontmatter does not match schema.",
+    code: 9001,
+    message: (collection, entryId, error) => {
+      return [
+        `${String(collection)} \u2192 ${String(entryId)} frontmatter does not match collection schema.`,
+        ...error.errors.map((zodError) => zodError.message)
+      ].join("\n");
+    },
+    hint: "See https://docs.astro.build/en/guides/content-collections/ for more information on content schemas."
+  },
+  InvalidContentEntrySlugError: {
+    title: "Invalid content entry slug.",
+    code: 9002,
+    message: (collection, entryId) => {
+      return `${String(collection)} \u2192 ${String(
+        entryId
+      )} has an invalid slug. \`slug\` must be a string.`;
+    },
+    hint: "See https://docs.astro.build/en/guides/content-collections/ for more on the `slug` field."
+  },
+  ContentSchemaContainsSlugError: {
+    title: "Content Schema should not contain `slug`.",
+    code: 9003,
+    message: (collection) => {
+      return `A content collection schema should not contain \`slug\` since it is reserved for slug generation. Remove this from your ${collection} collection schema.`;
+    },
+    hint: "See https://docs.astro.build/en/guides/content-collections/ for more on the `slug` field."
+  },
   UnknownError: {
     title: "Unknown Error.",
     code: 99999

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "2.0.0-beta.3";
+  const version = "2.0.0";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -233,7 +233,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"2.0.0-beta.3"}`
+        `v${"2.0.0"}`
       )} ${headline}`
     );
   }

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

@@ -2,7 +2,7 @@ import { fileURLToPath } from "url";
 import { PAGE_SCRIPT_ID } from "../../../vite-plugin-scripts/index.js";
 import { enhanceViteSSRError } from "../../errors/dev/index.js";
 import { AggregateError, CSSError, MarkdownError } from "../../errors/index.js";
-import { isPage, resolveIdToUrl } from "../../util.js";
+import { isPage, resolveIdToUrl, viteID } from "../../util.js";
 import { createRenderContext, renderPage as coreRenderPage } from "../index.js";
 import { filterFoundRenderers, loadRenderer } from "../renderer.js";
 import { getStylesForURL } from "./css.js";
@@ -78,7 +78,10 @@ async function getScriptsAndStyles({ env, filePath }) {
       children: ""
     });
     styles.add({
-      props: {},
+      props: {
+        type: "text/css",
+        "data-astro-dev-id": viteID(new URL(`.${url}`, env.settings.config.root))
+      },
       children: content
     });
   });

package/dist/runtime/client/hmr.js

@@ -5,7 +5,7 @@ if (import.meta.hot) {
     for (const record of records) {
       for (const node of record.addedNodes) {
         if (isViteInjectedStyle(node)) {
-          (_a = injectedStyles.get(node.innerHTML.trim())) == null ? void 0 : _a.remove();
+          (_a = injectedStyles.get(node.getAttribute("data-vite-dev-id"))) == null ? void 0 : _a.remove();
         }
       }
     }
@@ -24,8 +24,8 @@ if (import.meta.hot) {
 }
 function getInjectedStyles() {
   const injectedStyles = /* @__PURE__ */ new Map();
-  document.querySelectorAll("style").forEach((el) => {
-    injectedStyles.set(el.innerHTML.trim(), el);
+  document.querySelectorAll("style[data-astro-dev-id]").forEach((el) => {
+    injectedStyles.set(el.getAttribute("data-astro-dev-id"), el);
   });
   return injectedStyles;
 }
@@ -33,5 +33,5 @@ function isStyle(node) {
   return node.nodeType === node.ELEMENT_NODE && node.tagName.toLowerCase() === "style";
 }
 function isViteInjectedStyle(node) {
-  return isStyle(node) && node.getAttribute("type") === "text/css";
+  return isStyle(node) && node.getAttribute("type") === "text/css" && !!node.getAttribute("data-vite-dev-id");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -85,11 +85,11 @@
     "src/content/template"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^1.0.0",
+    "@astrojs/compiler": "^1.0.1",
     "@astrojs/language-server": "^0.28.3",
-    "@astrojs/markdown-remark": "^2.0.0-beta.2",
-    "@astrojs/telemetry": "^2.0.0-beta.0",
-    "@astrojs/webapi": "^2.0.0-beta.0",
+    "@astrojs/markdown-remark": "^2.0.0",
+    "@astrojs/telemetry": "^2.0.0",
+    "@astrojs/webapi": "^2.0.0",
     "@babel/core": "^7.18.2",
     "@babel/generator": "^7.18.2",
     "@babel/parser": "^7.18.4",
@@ -160,7 +160,7 @@
     "@types/send": "^0.17.1",
     "@types/server-destroy": "^1.0.1",
     "@types/unist": "^2.0.6",
-    "astro-scripts": "0.0.10-beta.0",
+    "astro-scripts": "0.0.10",
     "chai": "^4.3.6",
     "cheerio": "^1.0.0-rc.11",
     "eol": "^0.9.1",