astro 1.0.0-beta.6 → 1.0.0-beta.9

package/dist/cli/index.js

@@ -30,7 +30,6 @@ function printAstroHelp() {
       ["--config <path>", "Specify the path to the Astro config file."],
       ["--root <path>", "Specify the path to the project root folder."],
       ["--legacy-build", "Use the build strategy prior to 0.24.0"],
-      ["--experimental-ssr", "Enable SSR compilation fot 3rd-party adapters."],
       ["--drafts", "Include markdown draft pages in the build."],
       ["--verbose", "Enable verbose logging"],
       ["--silent", "Disable logging"]
@@ -38,7 +37,7 @@ function printAstroHelp() {
   });
 }
 async function printVersion() {
-  const version = "1.0.0-beta.5";
+  const version = "1.0.0-beta.9";
   console.log();
   console.log(`  ${colors.bgGreen(colors.black(` astro `))} ${colors.green(`v${version}`)}`);
 }

package/dist/core/app/index.js

@@ -95,7 +95,7 @@ renderPage_fn = async function(request, routeData, mod) {
     legacyBuild: false,
     links,
     logging: __privateGet(this, _logging),
-    markdownRender: manifest.markdown.render,
+    markdown: manifest.markdown,
     mod,
     origin: url.origin,
     pathname: url.pathname,

package/dist/core/build/generate.js

@@ -1,10 +1,9 @@
-import astroRemark from "@astrojs/markdown-remark";
 import fs from "fs";
 import { bgGreen, black, cyan, dim, green, magenta } from "kleur/colors";
 import npath from "path";
 import { fileURLToPath } from "url";
 import { debug, info } from "../logger/core.js";
-import { prependForwardSlash } from "../../core/path.js";
+import { prependForwardSlash, removeLeadingForwardSlash } from "../../core/path.js";
 import { BEFORE_HYDRATION_SCRIPT_ID } from "../../vite-plugin-scripts/index.js";
 import { call as callEndpoint } from "../endpoint/index.js";
 import { render } from "../render/core.js";
@@ -117,12 +116,12 @@ async function generatePath(pathname, opts, gopts) {
     }
   }
   const ssr = isBuildingToSSR(opts.astroConfig);
-  const url = new URL(origin + pathname);
+  const url = new URL(opts.astroConfig.base + removeLeadingForwardSlash(pathname), origin);
   const options = {
     legacyBuild: false,
     links,
     logging,
-    markdownRender: [astroRemark, astroConfig.markdown],
+    markdown: astroConfig.markdown,
     mod,
     origin,
     pathname,

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

@@ -1,4 +1,3 @@
-import astroRemark from "@astrojs/markdown-remark";
 import { serializeRouteData } from "../routing/index.js";
 import { eachPageData } from "./internal.js";
 import { addRollupInput } from "./add-rollup-input.js";
@@ -83,9 +82,7 @@ function buildManifest(opts, internals) {
   const ssrManifest = {
     routes,
     site: astroConfig.site,
-    markdown: {
-      render: [astroRemark, astroConfig.markdown]
-    },
+    markdown: astroConfig.markdown,
     pageMap: null,
     renderers: [],
     entryModules

package/dist/core/config.js

@@ -21,6 +21,7 @@ import * as colors from "kleur/colors";
 import path from "path";
 import { pathToFileURL, fileURLToPath } from "url";
 import { mergeConfig as mergeViteConfig } from "vite";
+import { BUNDLED_THEMES } from "shiki";
 import { z } from "zod";
 import load, { ProloadError } from "@proload/core";
 import loadTypeScript from "@proload/plugin-tsm";
@@ -88,13 +89,27 @@ const AstroConfigSchema = z.object({
     }).optional().default({ options: {}, plugins: [] })
   }).optional().default({}),
   markdown: z.object({
-    drafts: z.boolean().optional().default(false),
-    mode: z.union([z.literal("md"), z.literal("mdx")]).optional().default("mdx"),
-    syntaxHighlight: z.union([z.literal("shiki"), z.literal("prism"), z.literal(false)]).optional().default("shiki"),
-    shikiConfig: z.any().optional().default({}),
-    remarkPlugins: z.array(z.any()).optional().default([]),
-    rehypePlugins: z.array(z.any()).optional().default([])
-  }).passthrough().optional().default({}),
+    mode: z.enum(["md", "mdx"]).default("mdx"),
+    drafts: z.boolean().default(false),
+    syntaxHighlight: z.union([z.literal("shiki"), z.literal("prism"), z.literal(false)]).default("shiki"),
+    shikiConfig: z.object({
+      langs: z.custom().array().default([]),
+      theme: z.enum(BUNDLED_THEMES).or(z.custom()).default("github-dark"),
+      wrap: z.boolean().or(z.null()).default(false)
+    }).default({}),
+    remarkPlugins: z.union([
+      z.string(),
+      z.tuple([z.string(), z.any()]),
+      z.custom((data) => typeof data === "function"),
+      z.tuple([z.custom((data) => typeof data === "function"), z.any()])
+    ]).array().default([]),
+    rehypePlugins: z.union([
+      z.string(),
+      z.tuple([z.string(), z.any()]),
+      z.custom((data) => typeof data === "function"),
+      z.tuple([z.custom((data) => typeof data === "function"), z.any()])
+    ]).array().default([])
+  }).default({}),
   vite: z.any().optional().default({}),
   experimental: z.object({
     ssr: z.boolean().optional().default(false),

package/dist/core/dev/index.js

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

package/dist/core/messages.js

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

package/dist/core/path.js

@@ -4,9 +4,15 @@ function appendForwardSlash(path) {
 function prependForwardSlash(path) {
   return path[0] === "/" ? path : "/" + path;
 }
-function removeEndingForwardSlash(path) {
+function removeTrailingForwardSlash(path) {
   return path.endsWith("/") ? path.slice(0, path.length - 1) : path;
 }
+function removeLeadingForwardSlash(path) {
+  return path.startsWith("/") ? path.substring(1) : path;
+}
+function trimSlashes(path) {
+  return path.replace(/^\/|\/$/g, "");
+}
 function startsWithForwardSlash(path) {
   return path[0] === "/";
 }
@@ -30,15 +36,13 @@ function prependDotSlash(path) {
   }
   return "./" + path;
 }
-function trimSlashes(path) {
-  return path.replace(/^\/|\/$/g, "");
-}
 export {
   appendForwardSlash,
   isRelativePath,
   prependDotSlash,
   prependForwardSlash,
-  removeEndingForwardSlash,
+  removeLeadingForwardSlash,
+  removeTrailingForwardSlash,
   startsWithDotDotSlash,
   startsWithDotSlash,
   startsWithForwardSlash,

package/dist/core/render/core.js

@@ -54,7 +54,7 @@ async function render(opts) {
     links,
     logging,
     origin,
-    markdownRender,
+    markdown,
     mod,
     pathname,
     scripts,
@@ -87,7 +87,7 @@ async function render(opts) {
     legacyBuild,
     links,
     logging,
-    markdownRender,
+    markdown,
     origin,
     params,
     pathname,

package/dist/core/render/dev/index.js

@@ -17,7 +17,6 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-import astroRemark from "@astrojs/markdown-remark";
 import { fileURLToPath } from "url";
 import { render as coreRender } from "../core.js";
 import { prependForwardSlash } from "../../../core/path.js";
@@ -105,7 +104,7 @@ async function render(renderers, mod, ssrOpts) {
     legacyBuild: isLegacyBuild,
     links,
     logging,
-    markdownRender: [astroRemark, astroConfig.markdown],
+    markdown: astroConfig.markdown,
     mod,
     origin,
     pathname,

package/dist/core/render/result.js

@@ -105,8 +105,9 @@ Please update the name of this slot.`);
 _cache = new WeakMap();
 _result = new WeakMap();
 _slots = new WeakMap();
+let renderMarkdown = null;
 function createResult(args) {
-  const { legacyBuild, markdownRender, params, pathname, renderers, request, resolve, site } = args;
+  const { legacyBuild, markdown, params, pathname, renderers, request, resolve, site } = args;
   const url = new URL(request.url);
   const canonicalURL = createCanonicalURL("." + pathname, site ?? url.origin);
   const result = {
@@ -162,24 +163,14 @@ ${extra}`);
         enumerable: false,
         writable: false,
         value: async function(content, opts) {
-          let [mdRender, renderOpts] = markdownRender;
-          let parser = null;
-          if (Array.isArray(mdRender)) {
-            renderOpts = mdRender[1];
-            mdRender = mdRender[0];
+          if (typeof Deno !== "undefined") {
+            throw new Error("Markdown is not supported in Deno SSR");
           }
-          if (typeof mdRender === "string") {
-            const mod = await import(mdRender);
-            parser = mod.default;
-          } else if (mdRender instanceof Promise) {
-            const mod = await mdRender;
-            parser = mod.default;
-          } else if (typeof mdRender === "function") {
-            parser = mdRender;
-          } else {
-            throw new Error("No Markdown parser found.");
+          if (!renderMarkdown) {
+            let astroRemark = "@astrojs/markdown-remark";
+            renderMarkdown = (await import(astroRemark)).renderMarkdown;
           }
-          const { code } = await parser(content, __spreadValues(__spreadValues({}, renderOpts), opts ?? {}));
+          const { code } = await renderMarkdown(content, __spreadValues(__spreadValues({}, markdown), opts ?? {}));
           return code;
         }
       });

package/dist/core/util.js

@@ -4,7 +4,7 @@ import path from "path";
 import resolve from "resolve";
 import slash from "slash";
 import { fileURLToPath, pathToFileURL } from "url";
-import { removeEndingForwardSlash } from "./path.js";
+import { removeTrailingForwardSlash } from "./path.js";
 function isObject(value) {
   return typeof value === "object" && value != null;
 }
@@ -24,7 +24,7 @@ function getOutputFilename(astroConfig, name) {
   if (astroConfig.build.format === "directory" && !STATUS_CODE_REGEXP.test(name)) {
     return path.posix.join(name, "index.html");
   }
-  return `${removeEndingForwardSlash(name || "index")}.html`;
+  return `${removeTrailingForwardSlash(name || "index")}.html`;
 }
 function parseNpmName(spec) {
   if (!spec || spec[0] === "." || spec[0] === "/")

package/dist/runtime/server/index.js

@@ -192,7 +192,7 @@ but ${plural ? "none were" : "it was not"} able to server-side render ${metadata
 Did you mean to enable ${formatList(probableRendererNames.map((r) => "`" + r + "`"))}?`);
       } else if (matchingRenderers.length === 1) {
         renderer = matchingRenderers[0];
-        ({ html } = await renderer.ssr.renderToStaticMarkup(Component, props, children));
+        ({ html } = await renderer.ssr.renderToStaticMarkup(Component, props, children, metadata));
       } else {
         throw new Error(`Unable to render ${metadata.displayName}!
 
@@ -211,7 +211,7 @@ If you're still stuck, please open an issue on GitHub or join us at https://astr
     if (metadata.hydrate === "only") {
       html = await renderSlot(result, slots == null ? void 0 : slots.fallback);
     } else {
-      ({ html } = await renderer.ssr.renderToStaticMarkup(Component, props, children));
+      ({ html } = await renderer.ssr.renderToStaticMarkup(Component, props, children, metadata));
     }
   }
   if (!html && typeof Component === "string") {
@@ -310,10 +310,22 @@ function defineScriptVars(vars) {
   }
   return markHTMLString(output);
 }
+function getHandlerFromModule(mod, method) {
+  if (mod[method]) {
+    return mod[method];
+  }
+  if (method === "delete" && mod["del"]) {
+    return mod["del"];
+  }
+  if (mod["all"]) {
+    return mod["all"];
+  }
+  return void 0;
+}
 async function renderEndpoint(mod, request, params) {
   var _a;
-  const chosenMethod = ((_a = request.method) == null ? void 0 : _a.toLowerCase()) ?? "get";
-  const handler = mod[chosenMethod];
+  const chosenMethod = (_a = request.method) == null ? void 0 : _a.toLowerCase();
+  const handler = getHandlerFromModule(mod, chosenMethod);
   if (!handler || typeof handler !== "function") {
     throw new Error(`Endpoint handler not found! Expected an exported function for "${chosenMethod}"`);
   }

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

@@ -3,7 +3,7 @@ import type { AddressInfo } from 'net';
 import type * as babel from '@babel/core';
 import type * as vite from 'vite';
 import { z } from 'zod';
-import type { ShikiConfig, Plugin } from '@astrojs/markdown-remark';
+import type { ShikiConfig, RemarkPlugins, RehypePlugins } from '@astrojs/markdown-remark';
 import type { AstroConfigSchema } from '../core/config';
 import type { AstroComponentFactory, Metadata } from '../runtime/server';
 import type { ViteConfigWithSSR } from '../core/create-vite';
@@ -455,14 +455,23 @@ export interface AstroUserConfig {
          * ```
          */
         drafts?: boolean;
+        /**
+         * @docs
+         * @name markdown.mode
+         * @type {'md' | 'mdx'}
+         * @default `mdx`
+         * @description
+         * Control wheater to allow components inside markdown files ('mdx') or not ('md').
+         */
+        mode?: 'md' | 'mdx';
         /**
          * @docs
          * @name markdown.shikiConfig
-         * @type {ShikiConfig}
+         * @typeraw {Partial<ShikiConfig>}
          * @description
          * Shiki configuration options. See [the markdown configuration docs](https://docs.astro.build/en/guides/markdown-content/#shiki-configuration) for usage.
          */
-        shikiConfig?: ShikiConfig;
+        shikiConfig?: Partial<ShikiConfig>;
         /**
          * @docs
          * @name markdown.syntaxHighlight
@@ -487,7 +496,7 @@ export interface AstroUserConfig {
         /**
          * @docs
          * @name markdown.remarkPlugins
-         * @type {Plugin[]}
+         * @type {RemarkPlugins}
          * @description
          * Pass a custom [Remark](https://github.com/remarkjs/remark) plugin to customize how your Markdown is built.
          *
@@ -502,11 +511,11 @@ export interface AstroUserConfig {
          * };
          * ```
          */
-        remarkPlugins?: Plugin[];
+        remarkPlugins?: RemarkPlugins;
         /**
          * @docs
          * @name markdown.rehypePlugins
-         * @type {Plugin[]}
+         * @type {RehypePlugins}
          * @description
          * Pass a custom [Rehype](https://github.com/remarkjs/remark-rehype) plugin to customize how your Markdown is built.
          *
@@ -521,7 +530,7 @@ export interface AstroUserConfig {
          * };
          * ```
          */
-        rehypePlugins?: Plugin[];
+        rehypePlugins?: RehypePlugins;
     };
     /**
      * @name adapter
@@ -588,12 +597,12 @@ export interface AstroUserConfig {
     };
     experimental?: {
         /**
-         * Enable experimental support for 3rd-party integrations.
+         * Enable support for 3rd-party integrations.
          * Default: false
          */
         integrations?: boolean;
         /**
-         * Enable a build for SSR support.
+         * Enable support for 3rd-party SSR adapters.
          * Default: false
          */
         ssr?: boolean;
@@ -697,8 +706,6 @@ export declare type JSXTransformFn = (options: {
 export interface ManifestData {
     routes: RouteData[];
 }
-export declare type MarkdownRenderOptions = [string | MarkdownParser, Record<string, any>];
-export declare type MarkdownParser = (contents: string, options?: Record<string, any>) => MarkdownParserResponse | PromiseLike<MarkdownParserResponse>;
 export interface MarkdownParserResponse {
     frontmatter: {
         [key: string]: any;

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

@@ -1,4 +1,5 @@
-import type { RouteData, SerializedRouteData, MarkdownRenderOptions, ComponentInstance, SSRLoadedRenderer } from '../../@types/astro';
+import type { RouteData, SerializedRouteData, ComponentInstance, SSRLoadedRenderer } from '../../@types/astro';
+import type { MarkdownRenderingOptions } from '@astrojs/markdown-remark';
 export declare type ComponentPath = string;
 export interface RouteInfo {
     routeData: RouteData;
@@ -12,9 +13,7 @@ export declare type SerializedRouteInfo = Omit<RouteInfo, 'routeData'> & {
 export interface SSRManifest {
     routes: RouteInfo[];
     site?: string;
-    markdown: {
-        render: MarkdownRenderOptions;
-    };
+    markdown: MarkdownRenderingOptions;
     pageMap: Map<ComponentPath, ComponentInstance>;
     renderers: SSRLoadedRenderer[];
     entryModules: Record<string, string>;

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

@@ -1,5 +1,7 @@
 import type { AstroConfig, AstroUserConfig, CLIFlags } from '../@types/astro';
 import type { Arguments as Flags } from 'yargs-parser';
+import type { ILanguageRegistration, IThemeRegistration, Theme } from 'shiki';
+import type { RemarkPlugin, RehypePlugin } from '@astrojs/markdown-remark';
 import { z } from 'zod';
 export declare const LEGACY_ASTRO_CONFIG_KEYS: Set<string>;
 export declare const AstroConfigSchema: z.ZodObject<{
@@ -81,28 +83,48 @@ export declare const AstroConfigSchema: z.ZodObject<{
             plugins: any[];
         } | undefined;
     }>>>;
-    markdown: z.ZodDefault<z.ZodOptional<z.ZodObject<{
-        drafts: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-        mode: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"md">, z.ZodLiteral<"mdx">]>>>;
-        syntaxHighlight: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"shiki">, z.ZodLiteral<"prism">, z.ZodLiteral<false>]>>>;
-        shikiConfig: z.ZodDefault<z.ZodOptional<z.ZodAny>>;
-        remarkPlugins: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodAny, "many">>>;
-        rehypePlugins: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodAny, "many">>>;
-    }, "passthrough", z.ZodTypeAny, {
-        shikiConfig?: any;
-        drafts: boolean;
+    markdown: z.ZodDefault<z.ZodObject<{
+        mode: z.ZodDefault<z.ZodEnum<["md", "mdx"]>>;
+        drafts: z.ZodDefault<z.ZodBoolean>;
+        syntaxHighlight: z.ZodDefault<z.ZodUnion<[z.ZodLiteral<"shiki">, z.ZodLiteral<"prism">, z.ZodLiteral<false>]>>;
+        shikiConfig: z.ZodDefault<z.ZodObject<{
+            langs: z.ZodDefault<z.ZodArray<z.ZodType<ILanguageRegistration, z.ZodTypeDef, ILanguageRegistration>, "many">>;
+            theme: z.ZodDefault<z.ZodUnion<[z.ZodEnum<[Theme, ...Theme[]]>, z.ZodType<IThemeRegistration, z.ZodTypeDef, IThemeRegistration>]>>;
+            wrap: z.ZodDefault<z.ZodUnion<[z.ZodBoolean, z.ZodNull]>>;
+        }, "strip", z.ZodTypeAny, {
+            langs: ILanguageRegistration[];
+            theme: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {});
+            wrap: boolean | null;
+        }, {
+            langs?: ILanguageRegistration[] | undefined;
+            theme?: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {}) | undefined;
+            wrap?: boolean | null | undefined;
+        }>>;
+        remarkPlugins: z.ZodDefault<z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodTuple<[z.ZodString, z.ZodAny], null>, z.ZodType<RemarkPlugin<any[]>, z.ZodTypeDef, RemarkPlugin<any[]>>, z.ZodTuple<[z.ZodType<RemarkPlugin<any[]>, z.ZodTypeDef, RemarkPlugin<any[]>>, z.ZodAny], null>]>, "many">>;
+        rehypePlugins: z.ZodDefault<z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodTuple<[z.ZodString, z.ZodAny], null>, z.ZodType<RehypePlugin<any[]>, z.ZodTypeDef, RehypePlugin<any[]>>, z.ZodTuple<[z.ZodType<RehypePlugin<any[]>, z.ZodTypeDef, RehypePlugin<any[]>>, z.ZodAny], null>]>, "many">>;
+    }, "strip", z.ZodTypeAny, {
         mode: "md" | "mdx";
+        drafts: boolean;
         syntaxHighlight: false | "shiki" | "prism";
-        remarkPlugins: any[];
-        rehypePlugins: any[];
+        shikiConfig: {
+            langs: ILanguageRegistration[];
+            theme: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {});
+            wrap: boolean | null;
+        };
+        remarkPlugins: (string | [string, any] | RemarkPlugin<any[]> | [RemarkPlugin<any[]>, any])[];
+        rehypePlugins: (string | [string, any] | RehypePlugin<any[]> | [RehypePlugin<any[]>, any])[];
     }, {
-        drafts?: boolean | undefined;
         mode?: "md" | "mdx" | undefined;
+        drafts?: boolean | undefined;
         syntaxHighlight?: false | "shiki" | "prism" | undefined;
-        shikiConfig?: any;
-        remarkPlugins?: any[] | undefined;
-        rehypePlugins?: any[] | undefined;
-    }>>>;
+        shikiConfig?: {
+            langs?: ILanguageRegistration[] | undefined;
+            theme?: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {}) | undefined;
+            wrap?: boolean | null | undefined;
+        } | undefined;
+        remarkPlugins?: (string | [string, any] | RemarkPlugin<any[]> | [RemarkPlugin<any[]>, any])[] | undefined;
+        rehypePlugins?: (string | [string, any] | RehypePlugin<any[]> | [RehypePlugin<any[]>, any])[] | undefined;
+    }>>;
     vite: z.ZodDefault<z.ZodOptional<z.ZodAny>>;
     experimental: z.ZodDefault<z.ZodOptional<z.ZodObject<{
         ssr: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
@@ -145,12 +167,16 @@ export declare const AstroConfigSchema: z.ZodObject<{
         };
     };
     markdown: {
-        shikiConfig?: any;
-        drafts: boolean;
         mode: "md" | "mdx";
+        drafts: boolean;
         syntaxHighlight: false | "shiki" | "prism";
-        remarkPlugins: any[];
-        rehypePlugins: any[];
+        shikiConfig: {
+            langs: ILanguageRegistration[];
+            theme: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {});
+            wrap: boolean | null;
+        };
+        remarkPlugins: (string | [string, any] | RemarkPlugin<any[]> | [RemarkPlugin<any[]>, any])[];
+        rehypePlugins: (string | [string, any] | RehypePlugin<any[]> | [RehypePlugin<any[]>, any])[];
     };
     experimental: {
         integrations: boolean;
@@ -186,12 +212,16 @@ export declare const AstroConfigSchema: z.ZodObject<{
         } | undefined;
     } | undefined;
     markdown?: {
-        drafts?: boolean | undefined;
         mode?: "md" | "mdx" | undefined;
+        drafts?: boolean | undefined;
         syntaxHighlight?: false | "shiki" | "prism" | undefined;
-        shikiConfig?: any;
-        remarkPlugins?: any[] | undefined;
-        rehypePlugins?: any[] | undefined;
+        shikiConfig?: {
+            langs?: ILanguageRegistration[] | undefined;
+            theme?: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {}) | undefined;
+            wrap?: boolean | null | undefined;
+        } | undefined;
+        remarkPlugins?: (string | [string, any] | RemarkPlugin<any[]> | [RemarkPlugin<any[]>, any])[] | undefined;
+        rehypePlugins?: (string | [string, any] | RehypePlugin<any[]> | [RehypePlugin<any[]>, any])[] | undefined;
     } | undefined;
     vite?: any;
     experimental?: {

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

@@ -1,9 +1,10 @@
 export declare function appendForwardSlash(path: string): string;
 export declare function prependForwardSlash(path: string): string;
-export declare function removeEndingForwardSlash(path: string): string;
+export declare function removeTrailingForwardSlash(path: string): string;
+export declare function removeLeadingForwardSlash(path: string): string;
+export declare function trimSlashes(path: string): string;
 export declare function startsWithForwardSlash(path: string): boolean;
 export declare function startsWithDotDotSlash(path: string): boolean;
 export declare function startsWithDotSlash(path: string): boolean;
 export declare function isRelativePath(path: string): boolean;
 export declare function prependDotSlash(path: string): string;
-export declare function trimSlashes(path: string): string;

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

@@ -1,4 +1,5 @@
-import type { ComponentInstance, MarkdownRenderOptions, Params, Props, SSRLoadedRenderer, RouteData, SSRElement } from '../../@types/astro';
+import type { ComponentInstance, Params, Props, SSRLoadedRenderer, RouteData, SSRElement } from '../../@types/astro';
+import type { MarkdownRenderingOptions } from '@astrojs/markdown-remark';
 import type { LogOptions } from '../logger/core.js';
 import { RouteCache } from './route-cache.js';
 interface GetParamsAndPropsOptions {
@@ -17,7 +18,7 @@ export interface RenderOptions {
     legacyBuild: boolean;
     logging: LogOptions;
     links: Set<SSRElement>;
-    markdownRender: MarkdownRenderOptions;
+    markdown: MarkdownRenderingOptions;
     mod: ComponentInstance;
     origin: string;
     pathname: string;

package/dist/types/core/render/result.d.ts

@@ -1,11 +1,12 @@
-import type { MarkdownRenderOptions, Params, SSRElement, SSRLoadedRenderer, SSRResult } from '../../@types/astro';
+import type { Params, SSRElement, SSRLoadedRenderer, SSRResult } from '../../@types/astro';
+import type { MarkdownRenderingOptions } from '@astrojs/markdown-remark';
 import { LogOptions } from '../logger/core.js';
 export interface CreateResultArgs {
     ssr: boolean;
     legacyBuild: boolean;
     logging: LogOptions;
     origin: string;
-    markdownRender: MarkdownRenderOptions;
+    markdown: MarkdownRenderingOptions;
     params: Params;
     pathname: string;
     renderers: SSRLoadedRenderer[];

package/dist/types/runtime/server/index.d.ts

@@ -23,6 +23,7 @@ export declare function addAttribute(value: any, key: string, shouldEscape?: boo
 export declare function spreadAttributes(values: Record<any, any>, shouldEscape?: boolean): any;
 export declare function defineStyleVars(selector: string, vars: Record<any, any>): any;
 export declare function defineScriptVars(vars: Record<any, any>): any;
+/** Renders an endpoint request to completion, returning the body. */
 export declare function renderEndpoint(mod: EndpointHandler, request: Request, params: Params): Promise<Response | import("../../@types/astro").EndpointOutput<string>>;
 export declare function renderToString(result: SSRResult, componentFactory: AstroComponentFactory, props: any, children: any): Promise<string>;
 export declare function renderPage(result: SSRResult, componentFactory: AstroComponentFactory, props: any, children: any): Promise<{

package/dist/vite-plugin-astro-server/index.js

@@ -117,7 +117,8 @@ async function handleRequest(routeCache, viteServer, logging, manifest, config,
   const pathname = decodeURI(url.pathname);
   const rootRelativeUrl = pathname.substring(devRoot.length - 1);
   if (!buildingToSSR) {
-    for (const [key] of url.searchParams) {
+    const allSearchParams = Array.from(url.searchParams);
+    for (const [key] of allSearchParams) {
       url.searchParams.delete(key);
     }
   }

package/dist/vite-plugin-markdown/index.js

@@ -26,7 +26,7 @@ var __objRest = (source, exclude) => {
     }
   return target;
 };
-import astroRemark from "@astrojs/markdown-remark";
+import { renderMarkdown } from "@astrojs/markdown-remark";
 import { transform } from "@astrojs/compiler";
 import ancestor from "common-ancestor-path";
 import esbuild from "esbuild";
@@ -110,14 +110,13 @@ function markdown({ config }) {
       }
       if (id.endsWith(".md")) {
         const source = await fs.promises.readFile(id, "utf8");
-        const render = astroRemark;
         const renderOpts = config.markdown;
         const filename = normalizeFilename(id);
         const fileUrl = new URL(`file://${filename}`);
         const isPage = fileUrl.pathname.startsWith(resolvePages(config).pathname);
         const hasInjectedScript = isPage && config._ctx.scripts.some((s) => s.stage === "page-ssr");
         const { data: frontmatter, content: markdownContent } = matter(source);
-        let renderResult = await render(markdownContent, renderOpts);
+        let renderResult = await renderMarkdown(markdownContent, renderOpts);
         let { code: astroResult, metadata } = renderResult;
         const _a = frontmatter, { layout = "", components = "", setup = "" } = _a, content = __objRest(_a, ["layout", "components", "setup"]);
         content.astro = metadata;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.0.0-beta.6",
+  "version": "1.0.0-beta.9",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -65,10 +65,19 @@
     "README.md",
     "vendor"
   ],
+  "scripts": {
+    "build": "astro-scripts build \"src/**/*.ts\" && tsc",
+    "build:ci": "astro-scripts build \"src/**/*.ts\"",
+    "dev": "astro-scripts dev \"src/**/*.ts\"",
+    "postbuild": "astro-scripts copy \"src/**/*.astro\"",
+    "benchmark": "node test/benchmark/dev.bench.js && node test/benchmark/build.bench.js",
+    "test": "mocha --exit --timeout 20000 --ignore **/lit-element.test.js && mocha --timeout 20000 **/lit-element.test.js",
+    "test:match": "mocha --timeout 20000 -g"
+  },
   "dependencies": {
     "@astrojs/compiler": "^0.14.1",
     "@astrojs/language-server": "^0.13.4",
-    "@astrojs/markdown-remark": "^0.8.1",
+    "@astrojs/markdown-remark": "^0.9.0",
     "@astrojs/prism": "0.4.1",
     "@astrojs/webapi": "^0.11.0",
     "@babel/core": "^7.17.9",
@@ -91,6 +100,7 @@
     "execa": "^6.1.0",
     "fast-glob": "^3.2.11",
     "fast-xml-parser": "^4.0.7",
+    "gray-matter": "^4.0.3",
     "html-entities": "^2.3.3",
     "html-escaper": "^3.0.3",
     "htmlparser2": "^7.2.0",
@@ -147,8 +157,9 @@
     "@types/resolve": "^1.20.1",
     "@types/rimraf": "^3.0.2",
     "@types/send": "^0.17.1",
+    "@types/unist": "^2.0.6",
     "@types/yargs-parser": "^21.0.0",
-    "astro-scripts": "0.0.2",
+    "astro-scripts": "workspace:*",
     "chai": "^4.3.6",
     "cheerio": "^1.0.0-rc.10",
     "mocha": "^9.2.2",
@@ -157,15 +168,5 @@
   "engines": {
     "node": "^14.15.0 || >=16.0.0",
     "npm": ">=6.14.0"
-  },
-  "scripts": {
-    "build": "astro-scripts build \"src/**/*.ts\" && tsc",
-    "build:ci": "astro-scripts build \"src/**/*.ts\"",
-    "dev": "astro-scripts dev \"src/**/*.ts\"",
-    "postbuild": "astro-scripts copy \"src/**/*.astro\"",
-    "benchmark": "node test/benchmark/dev.bench.js && node test/benchmark/build.bench.js",
-    "test": "mocha --exit --timeout 20000 --ignore **/lit-element.test.js && mocha --timeout 20000 **/lit-element.test.js",
-    "test:match": "mocha --timeout 20000 -g"
-  },
-  "readme": "<a href=\"https://astro.build\">\n  <img src=\"https://raw.githubusercontent.com/withastro/astro/main/assets/social/banner.svg\" />\n</a>\n\n<div center>\n\n**Astro** is a new kind of static site builder for the modern web&mdash;powerful developer experience meets lightweight output.\n\n</div>\n\n### [🚀 Read the launch post →](https://astro.build/blog/introducing-astro)\n\n### [📚 Learn Astro →](https://docs.astro.build/en/getting-started/)\n\n## Project Status\n\n⚠️ **Astro is still beta software&mdash;missing features and bugs are to be expected!** We are quickly working our way towards a stable, production-ready v1.0 release, but we are still finalizing some of Astro's APIs.\n\nThat being said, there are quite a few Astro sites in production already. We're incredibly grateful to everyone who has made an early bet on Astro!\n\n## Quick Start\n\n<table>\n  <tbody>\n    <tr>\n      <td>\n        <img width=\"441\" height=\"1px\">\n        <strong>👾 Online</strong>\n      </td>\n      <td>\n        <img width=\"441\" height=\"1px\">\n        <strong>📦 Local</strong>\n      </td>\n    </tr>\n    <tr>\n<td>\n\nTry Astro in your browser!\n\n[Launch astro.new →](https://astro.new)\n\n</td>\n<td>\n\nGet started with Astro using our interactive CLI!\n\n```bash\nnpm init astro my-astro-project\n```\n\n</td>\n    </tr>\n  </tbody>\n</table>\n\n## Sponsors\n\nYou can sponsor Astro's development on [Open Collective](https://opencollective.com/astrodotbuild). Astro is generously supported by the following companies and individuals:\n\n### Platinum Sponsors\n\n<table>\n  <tbody>\n    <tr>\n      <td align=\"center\"><a href=\"https://www.netlify.com/#gh-light-mode-only\" target=\"_blank\"><img width=\"147\" height=\"40\" src=\"https://raw.githubusercontent.com/withastro/astro/main/.github/assets/netlify.svg#gh-light-mode-only\" alt=\"Netlify\" /></a><a href=\"https://www.netlify.com/#gh-dark-mode-only\" target=\"_blank\"><img width=\"147\" height=\"40\" src=\"https://raw.githubusercontent.com/withastro/astro/main/.github/assets/netlify-dark.svg#gh-dark-mode-only\" alt=\"Netlify\" />\n      </a></td>\n      <td align=\"center\"><a href=\"https://www.vercel.com/#gh-light-mode-only\" target=\"_blank\"><img width=\"150\" height=\"34\" src=\"https://raw.githubusercontent.com/withastro/astro/main/.github/assets/vercel.svg#gh-light-mode-only\" alt=\"Vercel\" /></a><a href=\"https://www.vercel.com/#gh-dark-mode-only\"><img width=\"150\" height=\"34\" src=\"https://raw.githubusercontent.com/withastro/astro/main/.github/assets/vercel-dark.svg#gh-dark-mode-only\" alt=\"Vercel\" />\n      </a></td>\n    </tr>\n  </tbody>\n</table>\n\n### Gold Sponsors\n\n<table>\n  <tbody>\n    <tr>\n      <td align=\"center\">\n        <a href=\"https://divRIOTS.com#gh-light-mode-only\" target=\"_blank\">\n        <img width=\"150\" height=\"40\" src=\"https://raw.githubusercontent.com/withastro/astro/main/.github/assets/divriots.svg#gh-light-mode-only\" alt=\"‹div›RIOTS\" />\n        </a>\n        <a href=\"https://divRIOTS.com#gh-dark-mode-only\" target=\"_blank\">\n        <img width=\"150\" height=\"40\" src=\"https://raw.githubusercontent.com/withastro/astro/main/.github/assets/divriots-dark.svg#gh-dark-mode-only\" alt=\"‹div›RIOTS\" />\n        </a>\n      </td>\n      <td align=\"center\">\n        <a href=\"https://stackupdigital.co.uk/#gh-light-mode-only\" target=\"_blank\">\n        <img width=\"162\" height=\"40\" src=\"https://raw.githubusercontent.com/withastro/astro/main/.github/assets/stackup.svg#gh-light-mode-only\" alt=\"StackUp Digital\" />\n        </a>\n        <a href=\"https://stackupdigital.co.uk/#gh-dark-mode-only\" target=\"_blank\">\n        <img width=\"130\" height=\"32\" src=\"https://raw.githubusercontent.com/withastro/astro/main/.github/assets/stackup-dark.svg#gh-dark-mode-only\" alt=\"StackUp Digital\" />\n        </a>\n      </td>\n    </tr>\n  </tbody>\n</table>\n\n### Sponsors\n\n<table>\n  <tbody>\n    <tr>\n      <td align=\"center\"><a href=\"https://sentry.io\" target=\"_blank\"><img width=\"147\" height=\"40\" src=\"https://raw.githubusercontent.com/withastro/astro/main/.github/assets/sentry.svg\" alt=\"Sentry\" /></a></td><td align=\"center\"><a href=\"https://qoddi.com\" target=\"_blank\"><img width=\"147\" height=\"40\" src=\"https://devcenter.qoddi.com/wp-content/uploads/2021/11/blog-transparent-logo-1.png\" alt=\"Qoddi App Platform\" /></a></td>\n    </tr>\n  </tbody>\n</table>\n"
-}
+  }
+}

package/LICENSE

@@ -1,34 +0,0 @@
-MIT License
-
-Copyright (c) 2021 Fred K. Schott
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
-"""
-This license applies to parts of the `packages/create-astro` and `packages/astro` subdirectories originating from the https://github.com/sveltejs/kit repository:
-
-Copyright (c) 2020 [these people](https://github.com/sveltejs/kit/graphs/contributors)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-"""