astro 1.2.2 → 1.2.3

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

@@ -1,8 +1,8 @@
 import type { GetModuleInfo, ModuleInfo } from 'rollup';
 export declare function walkParentInfos(id: string, ctx: {
     getModuleInfo: GetModuleInfo;
-}, depth?: number, seen?: Set<string>): Generator<[ModuleInfo, number], void, unknown>;
+}, depth?: number, seen?: Set<string>, childId?: string): Generator<[ModuleInfo, number, number], void, unknown>;
 export declare function moduleIsTopLevelPage(info: ModuleInfo): boolean;
 export declare function getTopLevelPages(id: string, ctx: {
     getModuleInfo: GetModuleInfo;
-}): Generator<[ModuleInfo, number], void, unknown>;
+}): Generator<[ModuleInfo, number, number], void, unknown>;

package/dist/core/build/graph.js

@@ -1,16 +1,17 @@
 import { resolvedPagesVirtualModuleId } from "../app/index.js";
-function* walkParentInfos(id, ctx, depth = 0, seen = /* @__PURE__ */ new Set()) {
+function* walkParentInfos(id, ctx, depth = 0, seen = /* @__PURE__ */ new Set(), childId = "") {
   seen.add(id);
   const info = ctx.getModuleInfo(id);
   if (info) {
-    yield [info, depth];
+    let order = childId ? info.importedIds.indexOf(childId) : 0;
+    yield [info, depth, order];
   }
   const importers = ((info == null ? void 0 : info.importers) || []).concat((info == null ? void 0 : info.dynamicImporters) || []);
   for (const imp of importers) {
     if (seen.has(imp)) {
       continue;
     }
-    yield* walkParentInfos(imp, ctx, ++depth, seen);
+    yield* walkParentInfos(imp, ctx, ++depth, seen, id);
   }
 }
 function moduleIsTopLevelPage(info) {

package/dist/core/build/internal.js

@@ -78,13 +78,23 @@ function* eachPageData(internals) {
 }
 function sortedCSS(pageData) {
   return Array.from(pageData.css).sort((a, b) => {
-    let depthA = a[1].depth, depthB = b[1].depth;
-    if (depthA === -1) {
+    let depthA = a[1].depth, depthB = b[1].depth, orderA = a[1].order, orderB = b[1].order;
+    if (orderA === -1 && orderB >= 0) {
+      return 1;
+    } else if (orderB === -1 && orderA >= 0) {
       return -1;
-    } else if (depthB === -1) {
+    } else if (orderA > orderB) {
       return 1;
+    } else if (orderA < orderB) {
+      return -1;
     } else {
-      return depthA > depthB ? -1 : 1;
+      if (depthA === -1) {
+        return -1;
+      } else if (depthB === -1) {
+        return 1;
+      } else {
+        return depthA > depthB ? -1 : 1;
+      }
     }
   }).map(([id]) => id);
 }

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

@@ -10,6 +10,7 @@ export interface PageBuildData {
     moduleSpecifier: string;
     css: Map<string, {
         depth: number;
+        order: number;
     }>;
     hoistedScript: {
         type: 'inline' | 'external';

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

@@ -65,15 +65,20 @@ function rollupPluginAstroBuildCSS(options) {
         };
       },
       async generateBundle(_outputOptions, bundle) {
-        const appendCSSToPage = (pageData, meta, depth) => {
+        const appendCSSToPage = (pageData, meta, depth, order) => {
           for (const importedCssImport of meta.importedCss) {
             if (pageData == null ? void 0 : pageData.css.has(importedCssImport)) {
               const cssInfo = pageData == null ? void 0 : pageData.css.get(importedCssImport);
               if (depth < cssInfo.depth) {
                 cssInfo.depth = depth;
               }
+              if (cssInfo.order === -1) {
+                cssInfo.order = order;
+              } else if (order < cssInfo.order && order > -1) {
+                cssInfo.order = order;
+              }
             } else {
-              pageData == null ? void 0 : pageData.css.set(importedCssImport, { depth });
+              pageData == null ? void 0 : pageData.css.set(importedCssImport, { depth, order });
             }
           }
         };
@@ -101,25 +106,25 @@ function rollupPluginAstroBuildCSS(options) {
                   for (const id of Object.keys(c.modules)) {
                     for (const pageData of getParentClientOnlys(id, this)) {
                       for (const importedCssImport of meta.importedCss) {
-                        pageData.css.set(importedCssImport, { depth: -1 });
+                        pageData.css.set(importedCssImport, { depth: -1, order: -1 });
                       }
                     }
                   }
                 }
                 for (const id of Object.keys(c.modules)) {
-                  for (const [pageInfo, depth] of walkParentInfos(id, this)) {
+                  for (const [pageInfo, depth, order] of walkParentInfos(id, this)) {
                     if (moduleIsTopLevelPage(pageInfo)) {
                       const pageViteID = pageInfo.id;
                       const pageData = getPageDataByViteID(internals, pageViteID);
                       if (pageData) {
-                        appendCSSToPage(pageData, meta, depth);
+                        appendCSSToPage(pageData, meta, depth, order);
                       }
                     } else if (options.target === "client" && isHoistedScript(internals, pageInfo.id)) {
                       for (const pageData of getPageDatasByHoistedScriptId(
                         internals,
                         pageInfo.id
                       )) {
-                        appendCSSToPage(pageData, meta, -1);
+                        appendCSSToPage(pageData, meta, -1, order);
                       }
                     }
                   }
@@ -143,7 +148,7 @@ function rollupPluginAstroBuildCSS(options) {
           );
           if (cssChunk) {
             for (const pageData of eachPageData(internals)) {
-              pageData.css.set(cssChunk.fileName, { depth: -1 });
+              pageData.css.set(cssChunk.fileName, { depth: -1, order: -1 });
             }
           }
         }

package/dist/core/dev/index.js

@@ -48,7 +48,7 @@ async function dev(config, options) {
       isRestart
     })
   );
-  const currentVersion = "1.2.2";
+  const currentVersion = "1.2.3";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

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

package/dist/core/util.js

@@ -5,7 +5,7 @@ import resolve from "resolve";
 import slash from "slash";
 import { fileURLToPath, pathToFileURL } from "url";
 import { prependForwardSlash, removeTrailingForwardSlash } from "./path.js";
-const ASTRO_VERSION = "1.2.2";
+const ASTRO_VERSION = "1.2.3";
 function isObject(value) {
   return typeof value === "object" && value != null;
 }

package/dist/runtime/server/astro-global.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "1.2.2";
+const ASTRO_VERSION = "1.2.3";
 function createDeprecatedFetchContentFn() {
   return () => {
     throw new Error("Deprecated: Astro.fetchContent() has been replaced with Astro.glob().");

package/package.json

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