astro 1.6.6 → 1.6.7

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

@@ -920,6 +920,7 @@ export interface MarkdownInstance<T extends Record<string, any>> {
     getHeaders(): void;
     default: AstroComponentFactory;
 }
+declare type MD = MarkdownInstance<Record<string, any>>;
 export interface MDXInstance<T extends Record<string, any>> extends Omit<MarkdownInstance<T>, 'rawContent' | 'compiledContent'> {
     /** MDX does not support rawContent! If you need to read the Markdown contents to calculate values (ex. reading time), we suggest injecting frontmatter via remark plugins. Learn more on our docs: https://docs.astro.build/en/guides/integrations-guide/mdx/#inject-frontmatter-via-remark-or-rehype-plugins */
     rawContent: never;
@@ -978,9 +979,7 @@ export interface ManifestData {
     routes: RouteData[];
 }
 export interface MarkdownParserResponse extends MarkdownRenderingResult {
-    frontmatter: {
-        [key: string]: any;
-    };
+    frontmatter: MD['frontmatter'];
 }
 /**
  * The `content` prop given to a Layout
@@ -1275,7 +1274,7 @@ export interface SSRResult {
     _metadata: SSRMetadata;
 }
 export declare type MarkdownAstroData = {
-    frontmatter: object;
+    frontmatter: MD['frontmatter'];
 };
 export interface PreviewServer {
     host?: string;

package/dist/core/build/css-asset-name.d.ts

@@ -0,0 +1,8 @@
+import type { GetModuleInfo } from 'rollup';
+import { AstroSettings } from '../../@types/astro';
+export declare function shortHashedName(id: string, ctx: {
+    getModuleInfo: GetModuleInfo;
+}): string;
+export declare function createSlugger(settings: AstroSettings): (id: string, ctx: {
+    getModuleInfo: GetModuleInfo;
+}) => string;

package/dist/core/build/css-asset-name.js

@@ -0,0 +1,61 @@
+import crypto from "crypto";
+import npath from "path";
+import { viteID } from "../util.js";
+import { getTopLevelPages } from "./graph.js";
+function shortHashedName(id, ctx) {
+  var _a;
+  const parents = Array.from(getTopLevelPages(id, ctx));
+  const firstParentId = (_a = parents[0]) == null ? void 0 : _a[0].id;
+  const firstParentName = firstParentId ? npath.parse(firstParentId).name : "index";
+  const hash = crypto.createHash("sha256");
+  for (const [page] of parents) {
+    hash.update(page.id, "utf-8");
+  }
+  const h = hash.digest("hex").slice(0, 8);
+  const proposedName = firstParentName + "." + h;
+  return proposedName;
+}
+function createSlugger(settings) {
+  const pagesDir = viteID(new URL("./pages", settings.config.srcDir));
+  const map = /* @__PURE__ */ new Map();
+  const sep = "-";
+  return function(id, ctx) {
+    var _a;
+    const parents = Array.from(getTopLevelPages(id, ctx));
+    const allParentsKey = parents.map(([page]) => page.id).sort().join("-");
+    const firstParentId = ((_a = parents[0]) == null ? void 0 : _a[0].id) || "index";
+    let dir = firstParentId;
+    let key = "";
+    let i = 0;
+    while (i < 2) {
+      if (dir === pagesDir) {
+        break;
+      }
+      const name2 = npath.parse(npath.basename(dir)).name;
+      key = key.length ? name2 + sep + key : name2;
+      dir = npath.dirname(dir);
+      i++;
+    }
+    let name = key;
+    if (!map.has(key)) {
+      map.set(key, /* @__PURE__ */ new Map([[allParentsKey, 0]]));
+    } else {
+      const inner = map.get(key);
+      if (inner.has(allParentsKey)) {
+        const num = inner.get(allParentsKey);
+        if (num > 0) {
+          name = name + sep + num;
+        }
+      } else {
+        const num = inner.size;
+        inner.set(allParentsKey, num);
+        name = name + sep + num;
+      }
+    }
+    return name;
+  };
+}
+export {
+  createSlugger,
+  shortHashedName
+};

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

@@ -1,8 +1,7 @@
-import crypto from "crypto";
 import esbuild from "esbuild";
-import npath from "path";
 import { isCSSRequest } from "../render/util.js";
-import { getTopLevelPages, moduleIsTopLevelPage, walkParentInfos } from "./graph.js";
+import * as assetName from "./css-asset-name.js";
+import { moduleIsTopLevelPage, walkParentInfos } from "./graph.js";
 import {
   eachPageData,
   getPageDataByViteID,
@@ -14,19 +13,6 @@ function rollupPluginAstroBuildCSS(options) {
   const { internals, buildOptions } = options;
   const { settings } = buildOptions;
   let resolvedConfig;
-  function createNameForParentPages(id, ctx) {
-    var _a;
-    const parents = Array.from(getTopLevelPages(id, ctx));
-    const firstParentId = (_a = parents[0]) == null ? void 0 : _a[0].id;
-    const firstParentName = firstParentId ? npath.parse(firstParentId).name : "index";
-    const hash = crypto.createHash("sha256");
-    for (const [page] of parents) {
-      hash.update(page.id, "utf-8");
-    }
-    const h = hash.digest("hex").slice(0, 8);
-    const proposedName = firstParentName + "." + h;
-    return proposedName;
-  }
   function* getParentClientOnlys(id, ctx) {
     for (const [info] of walkParentInfos(id, ctx)) {
       yield* getPageDatasByClientOnlyID(internals, info.id);
@@ -37,6 +23,9 @@ function rollupPluginAstroBuildCSS(options) {
       name: "astro:rollup-plugin-build-css",
       outputOptions(outputOptions) {
         const manualChunks = outputOptions.manualChunks || Function.prototype;
+        const assetFileNames = outputOptions.assetFileNames;
+        const namingIncludesHash = assetFileNames == null ? void 0 : assetFileNames.toString().includes("[hash]");
+        const createNameForParentPages = namingIncludesHash ? assetName.shortHashedName : assetName.createSlugger(settings);
         outputOptions.manualChunks = function(id, ...args) {
           if (typeof manualChunks == "object") {
             if (id in manualChunks) {

package/dist/core/constants.js

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

package/dist/core/messages.js

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

package/package.json

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