astro 1.0.0-beta.45 → 1.0.0-beta.46

package/dist/cli/index.js

@@ -40,7 +40,7 @@ function printAstroHelp() {
   });
 }
 async function printVersion() {
-  const version = "1.0.0-beta.45";
+  const version = "1.0.0-beta.46";
   console.log();
   console.log(`  ${colors.bgGreen(colors.black(` astro `))} ${colors.green(`v${version}`)}`);
 }
@@ -83,7 +83,7 @@ async function cli(args) {
   } else if (flags.silent) {
     logging.level = "silent";
   }
-  const telemetry = new AstroTelemetry({ version: "1.0.0-beta.45" });
+  const telemetry = new AstroTelemetry({ version: "1.0.0-beta.46" });
   if (cmd === "telemetry") {
     try {
       const subcommand = (_a = flags._[3]) == null ? void 0 : _a.toString();
@@ -97,7 +97,7 @@ async function cli(args) {
       try {
         const packages = flags._.slice(3);
         telemetry.record(event.eventCliSession({
-          astroVersion: "1.0.0-beta.45",
+          astroVersion: "1.0.0-beta.46",
           cliCommand: "add"
         }));
         return await add(packages, { cwd: root, flags, logging, telemetry });
@@ -108,7 +108,7 @@ async function cli(args) {
     case "dev": {
       try {
         const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
-        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.45", cliCommand: "dev" }, userConfig, flags));
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.46", cliCommand: "dev" }, userConfig, flags));
         await devServer(astroConfig, { logging, telemetry });
         return await new Promise(() => {
         });
@@ -119,7 +119,7 @@ async function cli(args) {
     case "build": {
       try {
         const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
-        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.45", cliCommand: "build" }, userConfig, flags));
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.46", cliCommand: "build" }, userConfig, flags));
         return await build(astroConfig, { logging, telemetry });
       } catch (err) {
         return throwAndExit(err);
@@ -127,14 +127,14 @@ async function cli(args) {
     }
     case "check": {
       const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
-      telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.45", cliCommand: "check" }, userConfig, flags));
+      telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.46", cliCommand: "check" }, userConfig, flags));
       const ret = await check(astroConfig);
       return process.exit(ret);
     }
     case "preview": {
       try {
         const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
-        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.45", cliCommand: "preview" }, userConfig, flags));
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.46", cliCommand: "preview" }, userConfig, flags));
         const server = await preview(astroConfig, { logging, telemetry });
         return await server.closed();
       } catch (err) {
@@ -144,7 +144,7 @@ async function cli(args) {
     case "docs": {
       try {
         await telemetry.record(event.eventCliSession({
-          astroVersion: "1.0.0-beta.45",
+          astroVersion: "1.0.0-beta.46",
           cliCommand: "docs"
         }));
         return await openInBrowser("https://docs.astro.build/");

package/dist/core/build/index.js

@@ -33,7 +33,7 @@ class AstroBuilder {
     this.logging = options.logging;
     this.routeCache = new RouteCache(this.logging);
     this.origin = config.site ? new URL(config.site).origin : `http://localhost:${config.server.port}`;
-    this.manifest = createRouteManifest({ config }, this.logging);
+    this.manifest = { routes: [] };
     this.timer = {};
   }
   async setup() {
@@ -42,6 +42,7 @@ class AstroBuilder {
     this.timer.init = performance.now();
     this.timer.viteStart = performance.now();
     this.config = await runHookConfigSetup({ config: this.config, command: "build" });
+    this.manifest = createRouteManifest({ config: this.config }, this.logging);
     const viteConfig = await createVite({
       mode: this.mode,
       server: {

package/dist/core/config.js

@@ -205,7 +205,7 @@ See https://astro.build/config for more information.`);
     }).optional().default({})
   });
   const result = __spreadProps(__spreadValues({}, await AstroConfigRelativeSchema.parseAsync(userConfig)), {
-    _ctx: { scripts: [], renderers: [], adapter: void 0 }
+    _ctx: { scripts: [], renderers: [], injectedRoutes: [], adapter: void 0 }
   });
   if (!((_a = result.experimental) == null ? void 0 : _a.integrations) && !result.integrations.every((int) => int.name.startsWith("@astrojs/"))) {
     throw new Error([

package/dist/core/dev/index.js

@@ -47,7 +47,7 @@ async function dev(config, options) {
     site,
     https: !!((_a = viteConfig.server) == null ? void 0 : _a.https)
   }));
-  const currentVersion = "1.0.0-beta.45";
+  const currentVersion = "1.0.0-beta.46";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function devStart({
   https,
   site
 }) {
-  const version = "1.0.0-beta.45";
+  const version = "1.0.0-beta.46";
   const rootPath = site ? site.pathname : "/";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
@@ -207,7 +207,7 @@ function printHelp({
   };
   let message = [];
   if (headline) {
-    message.push(linebreak(), `  ${bgGreen(black(` ${commandName} `))} ${green(`v${"1.0.0-beta.45"}`)} ${headline}`);
+    message.push(linebreak(), `  ${bgGreen(black(` ${commandName} `))} ${green(`v${"1.0.0-beta.46"}`)} ${headline}`);
   }
   if (usage) {
     message.push(linebreak(), `  ${green(commandName)} ${bold(usage)}`);

package/dist/core/routing/manifest/create.js

@@ -1,10 +1,12 @@
 import fs from "fs";
+import { createRequire } from "module";
 import path from "path";
 import slash from "slash";
 import { fileURLToPath } from "url";
 import { warn } from "../../logger/core.js";
 import { resolvePages } from "../../util.js";
 import { getRouteGenerator } from "./generator.js";
+const require2 = createRequire(import.meta.url);
 function countOccurrences(needle, haystack) {
   let count = 0;
   for (let i = 0; i < haystack.length; i += 1) {
@@ -54,6 +56,22 @@ function isSpread(str) {
   const spreadPattern = /\[\.{3}/g;
   return spreadPattern.test(str);
 }
+function validateSegment(segment, file = "") {
+  if (!file)
+    file = segment;
+  if (/^\$/.test(segment)) {
+    throw new Error(`Invalid route ${file} \u2014 Astro's Collections API has been replaced by dynamic route params.`);
+  }
+  if (/\]\[/.test(segment)) {
+    throw new Error(`Invalid route ${file} \u2014 parameters must be separated`);
+  }
+  if (countOccurrences("[", segment) !== countOccurrences("]", segment)) {
+    throw new Error(`Invalid route ${file} \u2014 brackets are unbalanced`);
+  }
+  if (/.+\[\.\.\.[^\]]+\]/.test(segment) || /\[\.\.\.[^\]]+\].+/.test(segment)) {
+    throw new Error(`Invalid route ${file} \u2014 rest parameter must be a standalone segment`);
+  }
+}
 function comparator(a, b) {
   if (a.isIndex !== b.isIndex) {
     if (a.isIndex)
@@ -86,6 +104,7 @@ function comparator(a, b) {
   return a.file < b.file ? -1 : 1;
 }
 function createRouteManifest({ config, cwd }, logging) {
+  var _a, _b, _c, _d;
   const components = [];
   const routes = [];
   const validPageExtensions = /* @__PURE__ */ new Set([".astro", ".md"]);
@@ -108,18 +127,7 @@ function createRouteManifest({ config, cwd }, logging) {
         return;
       }
       const segment = isDir ? basename : name;
-      if (/^\$/.test(segment)) {
-        throw new Error(`Invalid route ${file} \u2014 Astro's Collections API has been replaced by dynamic route params.`);
-      }
-      if (/\]\[/.test(segment)) {
-        throw new Error(`Invalid route ${file} \u2014 parameters must be separated`);
-      }
-      if (countOccurrences("[", segment) !== countOccurrences("]", segment)) {
-        throw new Error(`Invalid route ${file} \u2014 brackets are unbalanced`);
-      }
-      if (/.+\[\.\.\.[^\]]+\]/.test(segment) || /\[\.\.\.[^\]]+\].+/.test(segment)) {
-        throw new Error(`Invalid route ${file} \u2014 rest parameter must be a standalone segment`);
-      }
+      validateSegment(segment, file);
       const parts = getParts(segment, file);
       const isIndex = isDir ? false : basename.startsWith("index.");
       const routeSuffix = basename.slice(basename.indexOf("."), -ext.length);
@@ -175,7 +183,9 @@ function createRouteManifest({ config, cwd }, logging) {
         const pattern = getPattern(segments, trailingSlash);
         const generate = getRouteGenerator(segments, trailingSlash);
         const pathname = segments.every((segment) => segment.length === 1 && !segment[0].dynamic) ? `/${segments.map((segment) => segment[0].content).join("/")}` : null;
+        const route = `/${segments.map(([{ dynamic, content }]) => dynamic ? `[${content}]` : content).join("/")}`.toLowerCase();
         routes.push({
+          route,
           type: item.isPage ? "page" : "endpoint",
           pattern,
           segments,
@@ -190,10 +200,51 @@ function createRouteManifest({ config, cwd }, logging) {
   const pages = resolvePages(config);
   if (fs.existsSync(pages)) {
     walk(fileURLToPath(pages), [], []);
-  } else {
+  } else if (((_b = (_a = config == null ? void 0 : config._ctx) == null ? void 0 : _a.injectedRoutes) == null ? void 0 : _b.length) === 0) {
     const pagesDirRootRelative = pages.href.slice(config.root.href.length);
     warn(logging, "astro", `Missing pages directory: ${pagesDirRootRelative}`);
   }
+  (_d = (_c = config == null ? void 0 : config._ctx) == null ? void 0 : _c.injectedRoutes) == null ? void 0 : _d.forEach(({ pattern: name, entryPoint }) => {
+    const resolved = require2.resolve(entryPoint, { paths: [cwd || fileURLToPath(config.root)] });
+    const component = slash(path.relative(cwd || fileURLToPath(config.root), resolved));
+    const isDynamic = (str) => (str == null ? void 0 : str[0]) === "[";
+    const normalize = (str) => str == null ? void 0 : str.substring(1, (str == null ? void 0 : str.length) - 1);
+    const segments = name.split(path.sep).filter(Boolean).map((s) => {
+      validateSegment(s);
+      const dynamic = isDynamic(s);
+      const content = dynamic ? normalize(s) : s;
+      return [
+        {
+          content,
+          dynamic,
+          spread: isSpread(s)
+        }
+      ];
+    });
+    const type = resolved.endsWith(".astro") ? "page" : "endpoint";
+    const isPage = type === "page";
+    const trailingSlash = isPage ? config.trailingSlash : "never";
+    const pattern = getPattern(segments, trailingSlash);
+    const generate = getRouteGenerator(segments, trailingSlash);
+    const pathname = segments.every((segment) => segment.length === 1 && !segment[0].dynamic) ? `/${segments.map((segment) => segment[0].content).join("/")}` : null;
+    const params = segments.flat().filter((p) => p.dynamic).map((p) => p.content);
+    const route = `/${segments.map(([{ dynamic, content }]) => dynamic ? `[${content}]` : content).join("/")}`.toLowerCase();
+    const collision = routes.find(({ route: r }) => r === route);
+    if (collision) {
+      throw new Error(`An integration attempted to inject a route that is already used in your project: "${route}" at "${component}". 
+This route collides with: "${collision.component}".`);
+    }
+    routes.push({
+      type,
+      route,
+      pattern,
+      segments,
+      params,
+      component,
+      generate,
+      pathname: pathname || void 0
+    });
+  });
   return {
     routes
   };

package/dist/core/routing/manifest/serialization.js

@@ -27,6 +27,7 @@ function serializeRouteData(routeData, trailingSlash) {
 }
 function deserializeRouteData(rawRouteData) {
   return {
+    route: rawRouteData.route,
     type: rawRouteData.type,
     pattern: new RegExp(rawRouteData.pattern),
     params: rawRouteData.params,

package/dist/integrations/index.js

@@ -39,6 +39,9 @@ async function runHookConfigSetup({
         },
         updateConfig: (newConfig) => {
           updatedConfig = mergeConfig(updatedConfig, newConfig);
+        },
+        injectRoute: (injectRoute) => {
+          updatedConfig._ctx.injectedRoutes.push(injectRoute);
         }
       });
     }

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

@@ -655,10 +655,15 @@ export declare type InjectedScriptStage = 'before-hydration' | 'head-inline' | '
  * Resolved Astro Config
  * Config with user settings along with all defaults filled in.
  */
+export interface InjectedRoute {
+    pattern: string;
+    entryPoint: string;
+}
 export interface AstroConfig extends z.output<typeof AstroConfigSchema> {
     integrations: AstroIntegration[];
     adapter?: AstroIntegration;
     _ctx: {
+        injectedRoutes: InjectedRoute[];
         adapter: AstroAdapter | undefined;
         renderers: AstroRenderer[];
         scripts: {
@@ -692,7 +697,7 @@ export interface MarkdownInstance<T extends Record<string, any>> {
     getHeaders(): Promise<MarkdownHeader[]>;
     default: () => Promise<{
         metadata: MarkdownMetadata;
-        frontmatter: MarkdownContent;
+        frontmatter: MarkdownContent<T>;
         $$metadata: Metadata;
         default: AstroComponentFactory;
     }>;
@@ -738,10 +743,9 @@ export interface MarkdownParserResponse extends MarkdownRenderingResult {
  * The `content` prop given to a Layout
  * https://docs.astro.build/guides/markdown-content/#markdown-layouts
  */
-export interface MarkdownContent {
-    [key: string]: any;
+export declare type MarkdownContent<T extends Record<string, any> = Record<string, any>> = T & {
     astro: MarkdownMetadata;
-}
+};
 /**
  * paginate() Options
  * Docs: https://docs.astro.build/guides/pagination/#calling-the-paginate-function
@@ -835,6 +839,7 @@ export interface AstroIntegration {
             updateConfig: (newConfig: Record<string, any>) => void;
             addRenderer: (renderer: AstroRenderer) => void;
             injectScript: (stage: InjectedScriptStage, content: string) => void;
+            injectRoute: (injectRoute: InjectedRoute) => void;
         }) => void;
         'astro:config:done'?: (options: {
             config: AstroConfig;
@@ -875,6 +880,7 @@ export interface RoutePart {
     spread: boolean;
 }
 export interface RouteData {
+    route: string;
     component: string;
     generate: (data?: any) => string;
     params: string[];

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

@@ -116,7 +116,7 @@ function rollupPluginAstroBuildCSS(options) {
                     fileName: imp,
                     name: imp,
                     facadeModuleId: imp,
-                    code: `/* Pure CSS chunk ${imp} */ ${bindings.map((b) => `export const ${b} = {};`)}`,
+                    code: `/* Pure CSS chunk ${imp} */ ${bindings.map((b) => `export const ${b} = {};`).join("")}`,
                     dynamicImports: [],
                     implicitlyLoadedBefore: [],
                     importedBindings: {},

package/package.json

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