astro 1.0.0-beta.5 → 1.0.0-beta.8

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.8";
   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,4 +1,3 @@
-import astroRemark from "@astrojs/markdown-remark";
 import fs from "fs";
 import { bgGreen, black, cyan, dim, green, magenta } from "kleur/colors";
 import npath from "path";
@@ -122,7 +121,7 @@ async function generatePath(pathname, opts, gopts) {
     legacyBuild: false,
     links,
     logging,
-    markdownRender: [astroRemark, astroConfig.markdown],
+    markdown: astroConfig.markdown,
     mod,
     origin,
     pathname,

package/dist/core/build/static-build.js

@@ -204,11 +204,11 @@ async function copyFiles(fromFolder, toFolder) {
   const files = await glob("**/*", {
     cwd: fileURLToPath(fromFolder)
   });
-  await fs.promises.mkdir(toFolder, { recursive: true });
   await Promise.all(files.map(async (filename) => {
     const from = new URL(filename, fromFolder);
     const to = new URL(filename, toFolder);
-    return fs.promises.copyFile(from, to);
+    const lastFolder = new URL("./", to);
+    return fs.promises.mkdir(lastFolder, { recursive: true }).then(() => fs.promises.copyFile(from, to));
   }));
 }
 async function ssrMoveAssets(opts) {

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.8";
   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.8";
   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.8"}`)} ${headline}`);
   }
   if (usage) {
     message.push(linebreak(), `  ${green(commandName)} ${bold(usage)}`);

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/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';
@@ -62,21 +62,107 @@ export interface BuildConfig {
     staticMode: boolean | undefined;
 }
 /**
- * Astro.* available in all components
- * Docs: https://docs.astro.build/reference/api-reference/#astro-global
+ * Astro global available in all contexts in .astro files
+ *
+ * [Astro reference](https://docs.astro.build/reference/api-reference/#astro-global)
  */
 export interface AstroGlobal extends AstroGlobalPartial {
-    /** get the current canonical URL */
+    /** Canonical URL of the current page. If the [site](https://docs.astro.build/en/reference/configuration-reference/#site) config option is set, its origin will be the origin of this URL.
+     *
+     * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astrocanonicalurl)
+     */
     canonicalURL: URL;
-    /** get page params (dynamic pages only) */
+    /** Parameters passed to a dynamic page generated using [getStaticPaths](https://docs.astro.build/en/reference/api-reference/#getstaticpaths)
+     *
+     * Example usage:
+     * ```astro
+     * ---
+     * export async function getStaticPaths() {
+     *    return [
+     *     { params: { id: '1' } },
+     *   ];
+     * }
+     *
+     * const { id } = Astro.params;
+     * ---
+     * <h1>{id}</h1>
+     * ```
+     *
+     * [Astro reference](https://docs.astro.build/en/reference/api-reference/#params)
+     */
     params: Params;
-    /** set props for this astro component (along with default values) */
+    /** List of props passed to this component
+     *
+     * A common way to get specific props is through [destructuring](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Destructuring_assignment), ex:
+     * ```typescript
+     * const { name } = Astro.props
+     * ```
+     *
+     * [Astro reference](https://docs.astro.build/en/core-concepts/astro-components/#component-props)
+     */
     props: Record<string, number | string | any>;
-    /** get information about this page */
+    /** Information about the current request. This is a standard [Request](https://developer.mozilla.org/en-US/docs/Web/API/Request) object
+     *
+     * For example, to get a URL object of the current URL, you can use:
+     * ```typescript
+     * const url = new URL(Astro.request.url);
+     * ```
+     *
+     * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astrorequest)
+     */
     request: Request;
-    /** see if slots are used */
+    /** Redirect to another page (**SSR Only**)
+     *
+     * Example usage:
+     * ```typescript
+     * if(!isLoggedIn) {
+     *   return Astro.redirect('/login');
+     * }
+     * ```
+     *
+     * [Astro reference](https://docs.astro.build/en/guides/server-side-rendering/#astroredirect)
+     */
+    redirect(path: string): Response;
+    /**
+     * The <Astro.self /> element allows a component to reference itself recursively.
+     *
+     * [Astro reference](https://docs.astro.build/en/guides/server-side-rendering/#astroself)
+     */
+    self: AstroComponentFactory;
+    /** Utility functions for modifying an Astro component’s slotted children
+     *
+     * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astroslots)
+     */
     slots: Record<string, true | undefined> & {
+        /**
+         * Check whether content for this slot name exists
+         *
+         * Example usage:
+         * ```typescript
+         *	if (Astro.slots.has('default')) {
+         *   // Do something...
+         *	}
+         * ```
+         *
+         * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astroslots)
+         */
         has(slotName: string): boolean;
+        /**
+         * Asychronously renders this slot and returns HTML
+         *
+         * Example usage:
+         * ```astro
+         * ---
+         * let html: string = '';
+         * if (Astro.slots.has('default')) {
+         *   html = await Astro.slots.render('default')
+         * }
+         * ---
+         * <Fragment set:html={html} />
+         * ```
+         *
+         * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astroslots)
+         */
         render(slotName: string, args?: any[]): Promise<string>;
     };
 }
@@ -84,12 +170,29 @@ export interface AstroGlobalPartial {
     /**
      * @deprecated since version 0.24. See the {@link https://astro.build/deprecated/resolve upgrade guide} for more details.
      */
-    resolve: (path: string) => string;
-    /** @deprecated Use `Astro.glob()` instead. */
+    resolve(path: string): string;
+    /** @deprecated since version 0.26. Use [Astro.glob()](https://docs.astro.build/en/reference/api-reference/#astroglob) instead. */
     fetchContent(globStr: string): Promise<any[]>;
+    /**
+     * Fetch local files into your static site setup
+     *
+     * Example usage:
+     * ```typescript
+     * const posts = await Astro.glob('../pages/post/*.md');
+     * ```
+     *
+     * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astroglob)
+     */
     glob(globStr: `${any}.astro`): Promise<ComponentInstance[]>;
     glob<T extends Record<string, any>>(globStr: `${any}.md`): Promise<MarkdownInstance<T>[]>;
     glob<T extends Record<string, any>>(globStr: string): Promise<T[]>;
+    /**
+     * Returns a [URL](https://developer.mozilla.org/en-US/docs/Web/API/URL) object built from the [site](https://docs.astro.build/en/reference/configuration-reference/#site) config option
+     *
+     * If `site` is undefined, the URL object will instead be built from `localhost`
+     *
+     * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astrosite)
+     */
     site: URL;
 }
 declare type ServerConfig = {
@@ -352,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
@@ -384,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.
          *
@@ -399,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.
          *
@@ -418,7 +530,7 @@ export interface AstroUserConfig {
          * };
          * ```
          */
-        rehypePlugins?: Plugin[];
+        rehypePlugins?: RehypePlugins;
     };
     /**
      * @name adapter
@@ -485,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;
@@ -594,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/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/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/env.d.ts

@@ -4,8 +4,9 @@ type Astro = import('astro').AstroGlobal;
 
 // We duplicate the description here because editors won't show the JSDoc comment from the imported type (but will for its properties, ex: Astro.request will show the AstroGlobal.request description)
 /**
- * Astro.* available in all components
- * Docs: https://docs.astro.build/reference/api-reference/#astro-global
+ * Astro global available in all contexts in .astro files
+ *
+ * [Astro documentation](https://docs.astro.build/reference/api-reference/#astro-global)
  */
 declare const Astro: Readonly<Astro>;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.8",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -76,14 +76,14 @@
   },
   "dependencies": {
     "@astrojs/compiler": "^0.14.1",
-    "@astrojs/language-server": "^0.13.3",
-    "@astrojs/markdown-remark": "^0.8.1",
+    "@astrojs/language-server": "^0.13.4",
+    "@astrojs/markdown-remark": "^0.8.2",
     "@astrojs/prism": "0.4.1",
     "@astrojs/webapi": "^0.11.0",
-    "@babel/core": "^7.17.8",
-    "@babel/generator": "^7.17.7",
-    "@babel/parser": "^7.17.8",
-    "@babel/traverse": "^7.17.3",
+    "@babel/core": "^7.17.9",
+    "@babel/generator": "^7.17.9",
+    "@babel/parser": "^7.17.9",
+    "@babel/traverse": "^7.17.9",
     "@proload/core": "^0.2.2",
     "@proload/plugin-tsm": "^0.1.1",
     "@web/parse5-utils": "^1.3.0",
@@ -94,12 +94,13 @@
     "debug": "^4.3.4",
     "diff": "^5.0.0",
     "eol": "^0.9.1",
-    "es-module-lexer": "^0.10.4",
-    "esbuild": "0.14.25",
+    "es-module-lexer": "^0.10.5",
+    "esbuild": "^0.14.34",
     "estree-walker": "^3.0.1",
     "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",
@@ -120,7 +121,7 @@
     "rehype-slug": "^5.0.1",
     "resolve": "^1.22.0",
     "rollup": "^2.70.1",
-    "semver": "^7.3.5",
+    "semver": "^7.3.6",
     "serialize-javascript": "^6.0.0",
     "shiki": "^0.10.1",
     "shorthash": "^0.0.2",
@@ -134,7 +135,7 @@
     "tsconfig-resolver": "^3.0.1",
     "vite": "^2.9.1",
     "yargs-parser": "^21.0.1",
-    "zod": "^3.14.3"
+    "zod": "^3.14.4"
   },
   "devDependencies": {
     "@babel/types": "^7.17.0",
@@ -152,16 +153,17 @@
     "@types/mocha": "^9.1.0",
     "@types/parse5": "^6.0.3",
     "@types/path-browserify": "^1.0.0",
-    "@types/prettier": "^2.4.4",
+    "@types/prettier": "^2.6.0",
     "@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": "workspace:*",
     "chai": "^4.3.6",
     "cheerio": "^1.0.0-rc.10",
     "mocha": "^9.2.2",
-    "sass": "^1.49.11"
+    "sass": "^1.50.0"
   },
   "engines": {
     "node": "^14.15.0 || >=16.0.0",