astro 2.0.7 → 2.0.9

package/dist/cli/sync/index.js

@@ -29,6 +29,10 @@ async function sync(settings, { logging, fs }) {
       viteServer: tempViteServer
     });
     const typesResult = await contentTypesGenerator.init();
+    const contentConfig = globalContentConfigObserver.get();
+    if (contentConfig.status === "error") {
+      throw contentConfig.error;
+    }
     if (typesResult.typesGenerated === false) {
       switch (typesResult.reason) {
         case "no-content-dir":

package/dist/content/types-generator.js

@@ -3,6 +3,7 @@ import { cyan } from "kleur/colors";
 import * as path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { normalizePath } from "vite";
+import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { info, warn } from "../core/logger/core.js";
 import { isRelativePath } from "../core/path.js";
 import { CONTENT_TYPES_FILE } from "./consts.js";
@@ -79,11 +80,18 @@ async function createContentTypesGenerator({
     }
     if (fileType === "config") {
       contentConfigObserver.set({ status: "loading" });
-      const config = await loadContentConfig({ fs, settings, viteServer });
-      if (config) {
-        contentConfigObserver.set({ status: "loaded", config });
-      } else {
-        contentConfigObserver.set({ status: "error" });
+      try {
+        const config = await loadContentConfig({ fs, settings, viteServer });
+        if (config) {
+          contentConfigObserver.set({ status: "loaded", config });
+        } else {
+          contentConfigObserver.set({ status: "does-not-exist" });
+        }
+      } catch (e) {
+        contentConfigObserver.set({
+          status: "error",
+          error: e instanceof Error ? e : new AstroError(AstroErrorData.UnknownContentCollectionError)
+        });
       }
       return { shouldGenerateTypes: true };
     }

package/dist/content/utils.d.ts

@@ -83,10 +83,13 @@ type ContentCtx = {
 } | {
     status: 'loading';
 } | {
-    status: 'error';
+    status: 'does-not-exist';
 } | {
     status: 'loaded';
     config: ContentConfig;
+} | {
+    status: 'error';
+    error: Error;
 };
 type Observable<C> = {
     get: () => C;

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

@@ -34,6 +34,9 @@ function astroContentImportPlugin({
             message: "Content config failed to load."
           });
         }
+        if (observable.status === "error") {
+          throw observable.error;
+        }
         let contentConfig = observable.status === "loaded" ? observable.config : void 0;
         if (observable.status === "loading") {
           contentConfig = await new Promise((resolve) => {

package/dist/core/build/graph.js

@@ -4,7 +4,13 @@ function* walkParentInfos(id, ctx, until, depth = 0, order = 0, seen = /* @__PUR
   const info = ctx.getModuleInfo(id);
   if (info) {
     if (childId) {
-      order += info.importedIds.indexOf(childId);
+      const idx = info.importedIds.indexOf(childId);
+      if (idx === -1) {
+        order += info.importedIds.length;
+        order += info.dynamicallyImportedIds.indexOf(childId);
+      } else {
+        order += idx;
+      }
     }
     yield [info, depth, order];
   }

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

@@ -29,7 +29,11 @@ function vitePluginInternals(input, internals) {
         promises.push(
           this.resolve(specifier).then((result) => {
             if (result) {
-              mapping.set(result.id, specifier);
+              if (mapping.has(result.id)) {
+                mapping.get(result.id).add(specifier);
+              } else {
+                mapping.set(result.id, /* @__PURE__ */ new Set([specifier]));
+              }
             }
           })
         );
@@ -37,8 +41,10 @@ function vitePluginInternals(input, internals) {
       await Promise.all(promises);
       for (const [, chunk] of Object.entries(bundle)) {
         if (chunk.type === "chunk" && chunk.facadeModuleId) {
-          const specifier = mapping.get(chunk.facadeModuleId) || chunk.facadeModuleId;
-          internals.entrySpecifierToBundleMap.set(specifier, chunk.fileName);
+          const specifiers = mapping.get(chunk.facadeModuleId) || /* @__PURE__ */ new Set([chunk.facadeModuleId]);
+          for (const specifier of specifiers) {
+            internals.entrySpecifierToBundleMap.set(specifier, chunk.fileName);
+          }
         } else if (chunk.type === "chunk") {
           for (const id of Object.keys(chunk.modules)) {
             const pageData = internals.pagesByViteID.get(id);

package/dist/core/constants.js

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

package/dist/core/dev/dev.js

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

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "2.0.7";
+  const version = "2.0.9";
   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.7"}`
+        `v${"2.0.9"}`
       )} ${headline}`
     );
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.0.7",
+  "version": "2.0.9",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",