astro 1.8.0 → 1.9.0

package/dist/content/types-generator.d.ts

@@ -8,11 +8,6 @@ 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;
@@ -24,8 +19,5 @@ declare type CreateContentGeneratorParams = {
     fs: typeof fsMod;
 };
 export declare function createContentTypesGenerator({ contentConfigObserver, fs, logging, settings, }: CreateContentGeneratorParams): Promise<GenerateContentTypes>;
-export declare function getEntryInfo({ entry, contentDir, }: Pick<ContentPaths, 'contentDir'> & {
-    entry: URL;
-}): EntryInfo | Error;
 export declare function getEntryType(entryPath: string, paths: ContentPaths): 'content' | 'config' | 'unknown' | 'generated-types';
 export {};

package/dist/content/types-generator.js

@@ -8,7 +8,9 @@ import { appendForwardSlash, isRelativePath } from "../core/path.js";
 import { contentFileExts, CONTENT_TYPES_FILE } from "./consts.js";
 import {
   getContentPaths,
-  loadContentConfig
+  getEntryInfo,
+  loadContentConfig,
+  NoCollectionError
 } from "./utils.js";
 class UnsupportedFileTypeError extends Error {
 }
@@ -79,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,
@@ -196,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);
@@ -287,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";
@@ -95,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") {
@@ -112,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;
@@ -136,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)},
 };
 `);
@@ -147,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);
@@ -158,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/vite-plugin-ssr.js

@@ -36,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") {
@@ -135,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
         })
       );
     }

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

package/dist/core/messages.js

@@ -49,7 +49,7 @@ function serverStart({
   site,
   isRestart = false
 }) {
-  const version = "1.8.0";
+  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.8.0"}`
+        `v${"1.9.0"}`
       )} ${headline}`
     );
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.8.0",
+  "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",
@@ -124,7 +124,7 @@
     "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",
@@ -209,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",