astro 1.5.2 → 1.6.0

package/client-base.d.ts

@@ -1,19 +1,106 @@
 /// <reference path="./import-meta.d.ts" />
 
+type MD = import('./dist/@types/astro').MarkdownInstance<Record<string, any>>;
+interface ExportedMarkdownModuleEntities {
+	frontmatter: MD['frontmatter'];
+	file: MD['file'];
+	url: MD['url'];
+	getHeadings: MD['getHeadings'];
+	/** @deprecated Renamed to `getHeadings()` */
+	getHeaders: () => void;
+	Content: MD['Content'];
+	rawContent: MD['rawContent'];
+	compiledContent: MD['compiledContent'];
+	load: MD['default'];
+}
+
 declare module '*.md' {
-	type MD = import('./dist/@types/astro').MarkdownInstance<Record<string, any>>;
+	const { load }: ExportedMarkdownModuleEntities;
+	export const {
+		frontmatter,
+		file,
+		url,
+		getHeadings,
+		getHeaders,
+		Content,
+		rawContent,
+		compiledContent,
+	}: ExportedMarkdownModuleEntities;
+	export default load;
+}
 
-	export const frontmatter: MD['frontmatter'];
-	export const file: MD['file'];
-	export const url: MD['url'];
-	export const getHeadings: MD['getHeadings'];
-	/** @deprecated Renamed to `getHeadings()` */
-	export const getHeaders: () => void;
-	export const Content: MD['Content'];
-	export const rawContent: MD['rawContent'];
-	export const compiledContent: MD['compiledContent'];
+declare module '*.markdown' {
+	const { load }: ExportedMarkdownModuleEntities;
+	export const {
+		frontmatter,
+		file,
+		url,
+		getHeadings,
+		getHeaders,
+		Content,
+		rawContent,
+		compiledContent,
+	}: ExportedMarkdownModuleEntities;
+	export default load;
+}
+
+declare module '*.mkdn' {
+	const { load }: ExportedMarkdownModuleEntities;
+	export const {
+		frontmatter,
+		file,
+		url,
+		getHeadings,
+		getHeaders,
+		Content,
+		rawContent,
+		compiledContent,
+	}: ExportedMarkdownModuleEntities;
+	export default load;
+}
+
+declare module '*.mkd' {
+	const { load }: ExportedMarkdownModuleEntities;
+	export const {
+		frontmatter,
+		file,
+		url,
+		getHeadings,
+		getHeaders,
+		Content,
+		rawContent,
+		compiledContent,
+	}: ExportedMarkdownModuleEntities;
+	export default load;
+}
+
+declare module '*.mdwn' {
+	const { load }: ExportedMarkdownModuleEntities;
+	export const {
+		frontmatter,
+		file,
+		url,
+		getHeadings,
+		getHeaders,
+		Content,
+		rawContent,
+		compiledContent,
+	}: ExportedMarkdownModuleEntities;
+	export default load;
+}
 
-	const load: MD['default'];
+declare module '*.mdown' {
+	const { load }: ExportedMarkdownModuleEntities;
+	export const {
+		frontmatter,
+		file,
+		url,
+		getHeadings,
+		getHeaders,
+		Content,
+		rawContent,
+		compiledContent,
+	}: ExportedMarkdownModuleEntities;
 	export default load;
 }
 

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

@@ -10,7 +10,8 @@ import type { SerializedSSRManifest } from '../core/app/types';
 import type { PageBuildData } from '../core/build/types';
 import type { AstroConfigSchema } from '../core/config';
 import type { AstroCookies } from '../core/cookies';
-import type { AstroComponentFactory, Metadata } from '../runtime/server';
+import type { AstroComponentFactory } from '../runtime/server';
+import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from './../core/constants.js';
 export type { MarkdownHeading, MarkdownMetadata, MarkdownRenderingResult, RehypePlugins, RemarkPlugins, ShikiConfig, } from '@astrojs/markdown-remark';
 export type { SSRManifest } from '../core/app/types';
 export interface AstroBuiltinProps {
@@ -54,6 +55,7 @@ export interface AstroComponentMetadata {
 export interface CLIFlags {
     root?: string;
     site?: string;
+    base?: string;
     host?: string | boolean;
     port?: number;
     config?: string;
@@ -219,6 +221,8 @@ export interface AstroGlobal<Props extends Record<string, any> = Record<string,
         render(slotName: string, args?: any[]): Promise<string>;
     };
 }
+/** Union type of supported markdown file extensions */
+declare type MarkdowFileExtension = typeof SUPPORTED_MARKDOWN_FILE_EXTENSIONS[number];
 export interface AstroGlobalPartial {
     /**
      * @deprecated since version 0.24. See the {@link https://astro.build/deprecated/resolve upgrade guide} for more details.
@@ -237,7 +241,7 @@ export interface AstroGlobalPartial {
      * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astroglob)
      */
     glob(globStr: `${any}.astro`): Promise<AstroInstance[]>;
-    glob<T extends Record<string, any>>(globStr: `${any}.md`): Promise<MarkdownInstance<T>[]>;
+    glob<T extends Record<string, any>>(globStr: `${any}${MarkdowFileExtension}`): Promise<MarkdownInstance<T>[]>;
     glob<T extends Record<string, any>>(globStr: `${any}.mdx`): Promise<MDXInstance<T>[]>;
     glob<T extends Record<string, any>>(globStr: string): Promise<T[]>;
     /**
@@ -675,7 +679,7 @@ export interface AstroUserConfig {
          * Pass [remark plugins](https://github.com/remarkjs/remark) to customize how your Markdown is built. You can import and apply the plugin function (recommended), or pass the plugin name as a string.
          *
          * :::caution
-         * Providing a list of plugins will **remove** our default plugins. To preserve these defaults, see the `extendDefaultPlugins` flag.
+         * Providing a list of plugins will **remove** our default plugins. To preserve these defaults, see the [`extendDefaultPlugins`](#markdownextenddefaultplugins) flag.
          * :::
          *
          * ```js
@@ -696,7 +700,7 @@ export interface AstroUserConfig {
          * Pass [rehype plugins](https://github.com/remarkjs/remark-rehype) to customize how your Markdown's output HTML is processed. You can import and apply the plugin function (recommended), or pass the plugin name as a string.
          *
          * :::caution
-         * Providing a list of plugins will **remove** our default plugins. To preserve these defaults, see the `extendDefaultPlugins` flag.
+         * Providing a list of plugins will **remove** our default plugins. To preserve these defaults, see the [`extendDefaultPlugins`](#markdownextenddefaultplugins) flag.
          * :::
          *
          * ```js
@@ -816,7 +820,7 @@ export interface AstroUserConfig {
          * @default `false`
          * @version 1.0.0-rc.1
          * @description
-         * Enable Astro's pre-v1.0 support for components and JSX expressions in `.md` Markdown files.
+         * Enable Astro's pre-v1.0 support for components and JSX expressions in `.md` (and alternative extensions for markdown files like ".markdown") Markdown files.
          * In Astro `1.0.0-rc`, this original behavior was removed as the default, in favor of our new [MDX integration](/en/guides/integrations-guide/mdx/).
          *
          * To enable this behavior, set `legacy.astroFlavoredMarkdown` to `true` in your [`astro.config.mjs` configuration file](/en/guides/configuring-astro/#the-astro-config-file).
@@ -889,7 +893,6 @@ export interface AstroSettings {
 export declare type AsyncRendererComponentFn<U> = (Component: any, props: any, slots: Record<string, string>, metadata?: AstroComponentMetadata) => Promise<U>;
 /** Generic interface for a component (Astro, Svelte, React, etc.) */
 export interface ComponentInstance {
-    $$metadata: Metadata;
     default: AstroComponentFactory;
     css?: string[];
     getStaticPaths?: (options: GetStaticPathsOptions) => GetStaticPathsResult;

package/dist/cli/index.js

@@ -44,6 +44,8 @@ function printAstroHelp() {
       "Global Flags": [
         ["--config <path>", "Specify your config file."],
         ["--root <path>", "Specify your project root folder."],
+        ["--site <url>", "Specify your project site."],
+        ["--base <pathname>", "Specify your project base."],
         ["--verbose", "Enable verbose logging."],
         ["--silent", "Disable all logging."],
         ["--version", "Show the version number and exit."],

package/dist/core/add/index.js

@@ -545,6 +545,7 @@ async function validateIntegrations(integrations) {
   try {
     const integrationEntries = await Promise.all(
       integrations.map(async (integration) => {
+        var _a;
         const parsed = parseIntegrationName(integration);
         if (!parsed) {
           throw new Error(`${bold(integration)} does not appear to be a valid package name!`);
@@ -594,8 +595,12 @@ async function validateIntegrations(integrations) {
           [pkgJson["name"], `^${pkgJson["version"]}`]
         ];
         if (pkgJson["peerDependencies"]) {
+          const meta = pkgJson["peerDependenciesMeta"] || {};
           for (const peer in pkgJson["peerDependencies"]) {
-            dependencies.push([peer, pkgJson["peerDependencies"][peer]]);
+            const optional = ((_a = meta[peer]) == null ? void 0 : _a.optional) || false;
+            if (!optional) {
+              dependencies.push([peer, pkgJson["peerDependencies"][peer]]);
+            }
           }
         }
         let integrationType;

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

@@ -161,29 +161,6 @@ function rollupPluginAstroBuildCSS(options) {
                 });
                 output.source = minifiedCSS;
               }
-            } else if (output.type === "chunk") {
-              for (const [imp, bindings] of Object.entries(output.importedBindings)) {
-                if (imp.startsWith("chunks/") && !bundle[imp] && output.code.includes(imp)) {
-                  const depChunk = {
-                    type: "chunk",
-                    fileName: imp,
-                    name: imp,
-                    facadeModuleId: imp,
-                    code: `/* Pure CSS chunk ${imp} */ ${bindings.map((b) => `export const ${b} = {};`).join("")}`,
-                    dynamicImports: [],
-                    implicitlyLoadedBefore: [],
-                    importedBindings: {},
-                    imports: [],
-                    referencedFiles: [],
-                    exports: Array.from(bindings),
-                    isDynamicEntry: false,
-                    isEntry: false,
-                    isImplicitEntry: false,
-                    modules: {}
-                  };
-                  bundle[imp] = depChunk;
-                }
-              }
             }
           }
         }

package/dist/core/compile/compile.js

@@ -1,8 +1,7 @@
-import path from "path";
 import { transform } from "@astrojs/compiler";
 import { AstroErrorCodes } from "../errors.js";
-import { prependForwardSlash, removeLeadingForwardSlashWindows } from "../path.js";
-import { AggregateError, resolveJsToTs, viteID } from "../util.js";
+import { prependForwardSlash } from "../path.js";
+import { AggregateError, resolvePath, viteID } from "../util.js";
 import { createStylePreprocessor } from "./style.js";
 const configCache = /* @__PURE__ */ new WeakMap();
 async function compile({
@@ -15,7 +14,7 @@ async function compile({
   let cssDeps = /* @__PURE__ */ new Set();
   let cssTransformErrors = [];
   const transformResult = await transform(source, {
-    pathname: prependForwardSlash(filename),
+    pathname: filename,
     projectRoot: config.root.toString(),
     site: (_a = config.site) == null ? void 0 : _a.toString(),
     sourcefile: filename,
@@ -24,7 +23,10 @@ async function compile({
       viteID(new URL("../../runtime/server/index.js", import.meta.url))
     )}`,
     experimentalStaticExtraction: true,
-    preprocessStyle: createStylePreprocessor(transformStyle, cssDeps, cssTransformErrors)
+    preprocessStyle: createStylePreprocessor(transformStyle, cssDeps, cssTransformErrors),
+    async resolvePath(specifier) {
+      return resolvePath(specifier, filename);
+    }
   }).catch((err) => {
     err.code = err.code || AstroErrorCodes.UnknownCompilerError;
     throw err;
@@ -54,24 +56,6 @@ async function compile({
       value: source
     }
   });
-  for (const c of compileResult.clientOnlyComponents) {
-    c.resolvedPath = removeLeadingForwardSlashWindows(c.resolvedPath);
-    if (c.specifier.endsWith(".jsx") && !c.resolvedPath.endsWith(".jsx")) {
-      c.resolvedPath += ".jsx";
-    }
-    if (path.isAbsolute(c.resolvedPath)) {
-      c.resolvedPath = resolveJsToTs(c.resolvedPath);
-    }
-  }
-  for (const c of compileResult.hydratedComponents) {
-    c.resolvedPath = removeLeadingForwardSlashWindows(c.resolvedPath);
-    if (c.specifier.endsWith(".jsx") && !c.resolvedPath.endsWith(".jsx")) {
-      c.resolvedPath += ".jsx";
-    }
-    if (path.isAbsolute(c.resolvedPath)) {
-      c.resolvedPath = resolveJsToTs(c.resolvedPath);
-    }
-  }
   return compileResult;
 }
 function isCached(config, filename) {

package/dist/core/config/config.js

@@ -72,6 +72,7 @@ function resolveFlags(flags) {
   return {
     root: typeof flags.root === "string" ? flags.root : void 0,
     site: typeof flags.site === "string" ? flags.site : void 0,
+    base: typeof flags.base === "string" ? flags.base : void 0,
     port: typeof flags.port === "number" ? flags.port : void 0,
     config: typeof flags.config === "string" ? flags.config : void 0,
     host: typeof flags.host === "string" || typeof flags.host === "boolean" ? flags.host : void 0,
@@ -86,6 +87,8 @@ function mergeCLIFlags(astroConfig, flags, cmd) {
   astroConfig.markdown = astroConfig.markdown || {};
   if (typeof flags.site === "string")
     astroConfig.site = flags.site;
+  if (typeof flags.base === "string")
+    astroConfig.base = flags.base;
   if (typeof flags.drafts === "boolean")
     astroConfig.markdown.drafts = flags.drafts;
   if (typeof flags.port === "number") {

package/dist/core/config/settings.js

@@ -1,3 +1,4 @@
+import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from "./../constants.js";
 import jsxRenderer from "../../jsx/renderer.js";
 import { loadTSConfig } from "./tsconfig.js";
 function createSettings(config, cwd) {
@@ -8,7 +9,7 @@ function createSettings(config, cwd) {
     tsConfigPath: tsconfig == null ? void 0 : tsconfig.path,
     adapter: void 0,
     injectedRoutes: [],
-    pageExtensions: [".astro", ".md", ".html"],
+    pageExtensions: [".astro", ".html", ...SUPPORTED_MARKDOWN_FILE_EXTENSIONS],
     renderers: [jsxRenderer],
     scripts: [],
     watchFiles: (tsconfig == null ? void 0 : tsconfig.exists) ? [tsconfig.path, ...tsconfig.extendedPaths] : []

package/dist/core/constants.d.ts

@@ -1 +1,2 @@
 export declare const ASTRO_VERSION: string;
+export declare const SUPPORTED_MARKDOWN_FILE_EXTENSIONS: readonly [".markdown", ".mdown", ".mkdn", ".mkd", ".mdwn", ".md"];

package/dist/core/constants.js

@@ -1,4 +1,13 @@
-const ASTRO_VERSION = "1.5.2";
+const ASTRO_VERSION = "1.6.0";
+const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
+  ".markdown",
+  ".mdown",
+  ".mkdn",
+  ".mkd",
+  ".mdwn",
+  ".md"
+];
 export {
-  ASTRO_VERSION
+  ASTRO_VERSION,
+  SUPPORTED_MARKDOWN_FILE_EXTENSIONS
 };

package/dist/core/create-vite.js

@@ -1,8 +1,6 @@
-import fs from "fs";
-import { createRequire } from "module";
-import path from "path";
 import { fileURLToPath } from "url";
 import * as vite from "vite";
+import { crawlFrameworkPkgs } from "vitefu";
 import astroPostprocessVitePlugin from "../vite-plugin-astro-postprocess/index.js";
 import astroViteServerPlugin from "../vite-plugin-astro-server/index.js";
 import astroVitePlugin from "../vite-plugin-astro/index.js";
@@ -35,7 +33,22 @@ function getSsrNoExternalDeps(projectRoot) {
   return noExternalDeps;
 }
 async function createVite(commandConfig, { settings, logging, mode }) {
-  const thirdPartyAstroPackages = await getAstroPackages(settings);
+  const astroPkgsConfig = await crawlFrameworkPkgs({
+    root: fileURLToPath(settings.config.root),
+    isBuild: mode === "build",
+    isFrameworkPkgByJson(pkgJson) {
+      var _a, _b, _c, _d;
+      return ((_a = pkgJson.peerDependencies) == null ? void 0 : _a.astro) || ((_b = pkgJson.dependencies) == null ? void 0 : _b.astro) || ((_c = pkgJson.keywords) == null ? void 0 : _c.includes("astro")) || ((_d = pkgJson.keywords) == null ? void 0 : _d.includes("astro-component")) || /^(@[^\/]+\/)?astro\-/.test(pkgJson.name);
+    },
+    isFrameworkPkgByName(pkgName) {
+      const isNotAstroPkg = isCommonNotAstro(pkgName);
+      if (isNotAstroPkg) {
+        return false;
+      } else {
+        return void 0;
+      }
+    }
+  });
   const commonConfig = {
     cacheDir: fileURLToPath(new URL("./node_modules/.vite/", settings.config.root)),
     clearScreen: false,
@@ -88,8 +101,11 @@ async function createVite(commandConfig, { settings, logging, mode }) {
       conditions: ["astro"]
     },
     ssr: {
-      noExternal: [...getSsrNoExternalDeps(settings.config.root), ...thirdPartyAstroPackages],
-      external: mode === "dev" ? ["shiki"] : []
+      noExternal: [
+        ...getSsrNoExternalDeps(settings.config.root),
+        ...astroPkgsConfig.ssr.noExternal
+      ],
+      external: [...mode === "dev" ? ["shiki"] : [], ...astroPkgsConfig.ssr.external]
     }
   };
   let result = commonConfig;
@@ -118,84 +134,6 @@ function sortPlugins(pluginOptions) {
   pluginOptions.splice(mdxPluginIndex, 1);
   pluginOptions.splice(jsxPluginIndex, 0, mdxPlugin);
 }
-async function getAstroPackages(settings) {
-  const { astroPackages } = new DependencyWalker(settings.config.root);
-  return astroPackages;
-}
-class DependencyWalker {
-  constructor(root) {
-    this.astroDeps = /* @__PURE__ */ new Set();
-    this.nonAstroDeps = /* @__PURE__ */ new Set();
-    const pkgUrl = new URL("./package.json", root);
-    this.require = createRequire(pkgUrl);
-    const pkgPath = fileURLToPath(pkgUrl);
-    if (!fs.existsSync(pkgPath))
-      return;
-    const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
-    const deps = [
-      ...Object.keys(pkg.dependencies || {}),
-      ...Object.keys(pkg.devDependencies || {})
-    ];
-    this.scanDependencies(deps);
-  }
-  get astroPackages() {
-    return Array.from(this.astroDeps);
-  }
-  seen(dep) {
-    return this.astroDeps.has(dep) || this.nonAstroDeps.has(dep);
-  }
-  readPkgJSON(dir) {
-    try {
-      const filePath = path.join(dir, "package.json");
-      return JSON.parse(fs.readFileSync(filePath, "utf-8"));
-    } catch (e) {
-    }
-  }
-  resolvePkgJSON(dep) {
-    try {
-      const pkgJson = this.require(dep + "/package.json");
-      return pkgJson;
-    } catch (e) {
-      try {
-        let dir = path.dirname(this.require.resolve(dep));
-        while (dir) {
-          const pkgJSON = this.readPkgJSON(dir);
-          if (pkgJSON && pkgJSON.name === dep)
-            return pkgJSON;
-          const parentDir = path.dirname(dir);
-          if (parentDir === dir)
-            break;
-          dir = parentDir;
-        }
-      } catch {
-      }
-    }
-  }
-  scanDependencies(deps) {
-    const newDeps = [];
-    for (const dep of deps) {
-      if (isCommonNotAstro(dep)) {
-        this.nonAstroDeps.add(dep);
-        continue;
-      }
-      const pkgJson = this.resolvePkgJSON(dep);
-      if (!pkgJson) {
-        this.nonAstroDeps.add(dep);
-        continue;
-      }
-      const { dependencies = {}, peerDependencies = {}, keywords = [] } = pkgJson;
-      if (peerDependencies.astro || dependencies.astro || keywords.includes("astro") || keywords.includes("astro-component") || /^(@[^\/]+\/)?astro\-/.test(dep)) {
-        this.astroDeps.add(dep);
-        const unknownDependencies = Object.keys(dependencies).filter((d) => !this.seen(d));
-        newDeps.push(...unknownDependencies);
-      } else {
-        this.nonAstroDeps.add(dep);
-      }
-    }
-    if (newDeps.length)
-      this.scanDependencies(newDeps);
-  }
-}
 const COMMON_DEPENDENCIES_NOT_ASTRO = [
   "autoprefixer",
   "react",

package/dist/core/dev/index.js

@@ -54,7 +54,7 @@ async function dev(settings, options) {
       isRestart
     })
   );
-  const currentVersion = "1.5.2";
+  const currentVersion = "1.6.0";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

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

package/dist/core/preview/index.js

@@ -19,7 +19,9 @@ async function preview(_settings, { logging }) {
     throw new Error(`[preview] No adapter found.`);
   }
   if (!settings.adapter.previewEntrypoint) {
-    throw new Error(`[preview] adapter does not have previewEntrypoint.`);
+    throw new Error(
+      `[preview] The ${settings.adapter.name} adapter does not support the preview command.`
+    );
   }
   const require2 = createRequire(settings.config.root);
   const previewEntrypoint = require2.resolve(settings.adapter.previewEntrypoint);

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

@@ -3,7 +3,6 @@ import { PAGE_SCRIPT_ID } from "../../../vite-plugin-scripts/index.js";
 import { isPage, resolveIdToUrl } from "../../util.js";
 import { createRenderContext, renderPage as coreRenderPage } from "../index.js";
 import { filterFoundRenderers, loadRenderer } from "../renderer.js";
-import { collectMdMetadata } from "../util.js";
 import { getStylesForURL } from "./css.js";
 import { getScriptsForURL } from "./scripts.js";
 import { createDevelopmentEnvironment } from "./environment.js";
@@ -18,13 +17,6 @@ async function preload({
 }) {
   const renderers = await loadRenderers(env.viteServer, env.settings);
   const mod = await env.viteServer.ssrLoadModule(fileURLToPath(filePath));
-  if (env.viteServer.config.mode === "development" || !(mod == null ? void 0 : mod.$$metadata)) {
-    return [renderers, mod];
-  }
-  const modGraph = await env.viteServer.moduleGraph.getModuleByUrl(fileURLToPath(filePath));
-  if (modGraph) {
-    await collectMdMetadata(mod.$$metadata, modGraph, env.viteServer);
-  }
   return [renderers, mod];
 }
 async function getScriptsAndStyles({ env, filePath }) {

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

@@ -1,7 +1,8 @@
 import npath from "path";
+import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from "../../constants.js";
 import { unwrapId } from "../../util.js";
 import { STYLE_EXTENSIONS } from "../util.js";
-const fileExtensionsToSSR = /* @__PURE__ */ new Set([".astro", ".md"]);
+const fileExtensionsToSSR = /* @__PURE__ */ new Set([".astro", ...SUPPORTED_MARKDOWN_FILE_EXTENSIONS]);
 const STRIP_QUERY_PARAMS_REGEX = /\?.*$/;
 async function* crawlGraph(viteServer, _id, isRootFile, scanned = /* @__PURE__ */ new Set()) {
   const id = unwrapId(_id);

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

@@ -1,7 +1,2 @@
-import type { ModuleNode, ViteDevServer } from 'vite';
-import type { Metadata } from '../../runtime/server/metadata.js';
-/** Check if a URL is already valid */
-export declare function isValidURL(url: string): boolean;
 export declare const STYLE_EXTENSIONS: Set<string>;
 export declare const isCSSRequest: (request: string) => boolean;
-export declare function collectMdMetadata(metadata: Metadata, modGraph: ModuleNode, viteServer: ViteDevServer): Promise<void>;

package/dist/core/render/util.js

@@ -1,11 +1,3 @@
-function isValidURL(url) {
-  try {
-    new URL(url);
-    return true;
-  } catch (e) {
-  }
-  return false;
-}
 const STYLE_EXTENSIONS = /* @__PURE__ */ new Set([
   ".css",
   ".pcss",
@@ -16,49 +8,11 @@ const STYLE_EXTENSIONS = /* @__PURE__ */ new Set([
   ".stylus",
   ".less"
 ]);
-const MARKDOWN_IMPORT_FLAG = "?mdImport";
 const cssRe = new RegExp(
   `\\.(${Array.from(STYLE_EXTENSIONS).map((s) => s.slice(1)).join("|")})($|\\?)`
 );
 const isCSSRequest = (request) => cssRe.test(request);
-const seenMdMetadata = /* @__PURE__ */ new Set();
-async function collectMdMetadata(metadata, modGraph, viteServer) {
-  const importedModules = [...(modGraph == null ? void 0 : modGraph.importedModules) ?? []];
-  await Promise.all(
-    importedModules.map(async (importedModule) => {
-      var _a, _b;
-      if (!importedModule.id || seenMdMetadata.has(importedModule.id))
-        return;
-      seenMdMetadata.add(importedModule.id);
-      await collectMdMetadata(metadata, importedModule, viteServer);
-      if (!((_a = importedModule == null ? void 0 : importedModule.id) == null ? void 0 : _a.endsWith(MARKDOWN_IMPORT_FLAG)))
-        return;
-      const mdSSRMod = await viteServer.ssrLoadModule(importedModule.id);
-      const mdMetadata = await ((_b = mdSSRMod.$$loadMetadata) == null ? void 0 : _b.call(mdSSRMod));
-      if (!mdMetadata)
-        return;
-      for (let mdMod of mdMetadata.modules) {
-        mdMod.specifier = mdMetadata.resolvePath(mdMod.specifier);
-        metadata.modules.push(mdMod);
-      }
-      for (let mdHoisted of mdMetadata.hoisted) {
-        metadata.hoisted.push(mdHoisted);
-      }
-      for (let mdHydrated of mdMetadata.hydratedComponents) {
-        metadata.hydratedComponents.push(mdHydrated);
-      }
-      for (let mdClientOnly of mdMetadata.clientOnlyComponents) {
-        metadata.clientOnlyComponents.push(mdClientOnly);
-      }
-      for (let mdHydrationDirective of mdMetadata.hydrationDirectives) {
-        metadata.hydrationDirectives.add(mdHydrationDirective);
-      }
-    })
-  );
-}
 export {
   STYLE_EXTENSIONS,
-  collectMdMetadata,
-  isCSSRequest,
-  isValidURL
+  isCSSRequest
 };

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

@@ -3,6 +3,7 @@ import { createRequire } from "module";
 import path from "path";
 import slash from "slash";
 import { fileURLToPath } from "url";
+import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from "../../constants.js";
 import { warn } from "../../logger/core.js";
 import { removeLeadingForwardSlash } from "../../path.js";
 import { resolvePages } from "../../util.js";
@@ -135,7 +136,11 @@ function createRouteManifest({ settings, cwd }, logging) {
   var _a;
   const components = [];
   const routes = [];
-  const validPageExtensions = /* @__PURE__ */ new Set([".astro", ".md", ...settings.pageExtensions]);
+  const validPageExtensions = /* @__PURE__ */ new Set([
+    ".astro",
+    ...SUPPORTED_MARKDOWN_FILE_EXTENSIONS,
+    ...settings.pageExtensions
+  ]);
   const validEndpointExtensions = /* @__PURE__ */ new Set([".js", ".ts"]);
   function walk(dir, parentSegments, parentParams) {
     let items = [];

package/dist/core/util.d.ts

@@ -1,9 +1,14 @@
-import type { ErrorPayload, ViteDevServer } from 'vite';
+import { ErrorPayload, ViteDevServer } from 'vite';
 import type { AstroConfig, AstroSettings, RouteType } from '../@types/astro';
 /** Returns true if argument is an object of any prototype/class (but not null). */
 export declare function isObject(value: unknown): value is Record<string, any>;
 /** Cross-realm compatible URL */
 export declare function isURL(value: unknown): value is URL;
+/** Check if a file is a markdown file based on its extension */
+export declare function isMarkdownFile(fileId: string, option: {
+    criteria: 'endsWith' | 'includes';
+    suffix?: string;
+}): boolean;
 /** Wraps an object in an array. If an array is passed, ignore it. */
 export declare function arraify<T>(target: T | T[]): T[];
 export declare function padMultilineString(source: string, n?: number): string;
@@ -45,4 +50,8 @@ export declare function getLocalAddress(serverAddress: string, host: string | bo
  */
 export declare function resolveIdToUrl(viteServer: ViteDevServer, id: string): Promise<string>;
 export declare function resolveJsToTs(filePath: string): string;
+/**
+ * Resolve the hydration paths so that it can be imported in the client
+ */
+export declare function resolvePath(specifier: string, importer: string): string;
 export declare const AggregateError: any;

package/dist/core/util.js

@@ -4,6 +4,8 @@ import path from "path";
 import resolve from "resolve";
 import slash from "slash";
 import { fileURLToPath, pathToFileURL } from "url";
+import { normalizePath } from "vite";
+import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from "./constants.js";
 import { prependForwardSlash, removeTrailingForwardSlash } from "./path.js";
 function isObject(value) {
   return typeof value === "object" && value != null;
@@ -11,6 +13,21 @@ function isObject(value) {
 function isURL(value) {
   return Object.prototype.toString.call(value) === "[object URL]";
 }
+function isMarkdownFile(fileId, option) {
+  const _suffix = option.suffix ?? "";
+  if (option.criteria === "endsWith") {
+    for (let markdownFileExtension of SUPPORTED_MARKDOWN_FILE_EXTENSIONS) {
+      if (fileId.endsWith(`${markdownFileExtension}${_suffix}`))
+        return true;
+    }
+    return false;
+  }
+  for (let markdownFileExtension of SUPPORTED_MARKDOWN_FILE_EXTENSIONS) {
+    if (fileId.includes(`${markdownFileExtension}${_suffix}`))
+      return true;
+  }
+  return false;
+}
 function arraify(target) {
   return Array.isArray(target) ? target : [target];
 }
@@ -169,6 +186,14 @@ function resolveJsToTs(filePath) {
   }
   return filePath;
 }
+function resolvePath(specifier, importer) {
+  if (specifier.startsWith(".")) {
+    const absoluteSpecifier = path.resolve(path.dirname(importer), specifier);
+    return resolveJsToTs(normalizePath(absoluteSpecifier));
+  } else {
+    return specifier;
+  }
+}
 const AggregateError = typeof globalThis.AggregateError !== "undefined" ? globalThis.AggregateError : class extends Error {
   constructor(errors, message) {
     super(message);
@@ -185,6 +210,7 @@ export {
   emoji,
   getLocalAddress,
   getOutputFilename,
+  isMarkdownFile,
   isModeServerWithNoAdapter,
   isObject,
   isPage,
@@ -196,6 +222,7 @@ export {
   resolveIdToUrl,
   resolveJsToTs,
   resolvePages,
+  resolvePath,
   unwrapId,
   viteID
 };

package/dist/jsx/babel.js

@@ -1,7 +1,5 @@
 import * as t from "@babel/types";
-import npath from "path";
-import { normalizePath } from "vite";
-import { resolveJsToTs } from "../core/util.js";
+import { resolvePath } from "../core/util.js";
 import { HydrationDirectiveProps } from "../runtime/server/hydration.js";
 const ClientOnlyPlaceholder = "astro-client-only";
 function isComponent(tagName) {
@@ -194,13 +192,7 @@ function astroJSX() {
         }
         const meta = path.getData("import");
         if (meta) {
-          let resolvedPath;
-          if (meta.path.startsWith(".")) {
-            resolvedPath = normalizePath(npath.resolve(npath.dirname(state.filename), meta.path));
-            resolvedPath = resolveJsToTs(resolvedPath);
-          } else {
-            resolvedPath = meta.path;
-          }
+          const resolvedPath = resolvePath(meta.path, state.filename);
           if (isClientOnly) {
             state.file.metadata.astro.clientOnlyComponents.push({
               exportName: meta.name,
@@ -270,13 +262,7 @@ function astroJSX() {
               }
             }
           }
-          let resolvedPath;
-          if (meta.path.startsWith(".")) {
-            resolvedPath = normalizePath(npath.resolve(npath.dirname(state.filename), meta.path));
-            resolvedPath = resolveJsToTs(resolvedPath);
-          } else {
-            resolvedPath = meta.path;
-          }
+          const resolvedPath = resolvePath(meta.path, state.filename);
           if (isClientOnly) {
             state.file.metadata.astro.clientOnlyComponents.push({
               exportName: meta.name,

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

@@ -2,8 +2,6 @@ export { createAstro } from './astro-global.js';
 export { renderEndpoint } from './endpoint.js';
 export { escapeHTML, HTMLBytes, HTMLString, markHTMLString, unescapeHTML } from './escape.js';
 export { renderJSX } from './jsx.js';
-export type { Metadata } from './metadata';
-export { createMetadata } from './metadata.js';
 export { addAttribute, defineScriptVars, Fragment, maybeRenderHead, renderAstroComponent, renderComponent, Renderer as Renderer, renderHead, renderHTMLElement, renderPage, renderSlot, renderTemplate as render, renderTemplate, renderToString, stringifyChunk, voidElementNames, } from './render/index.js';
 export type { AstroComponentFactory, RenderInstruction } from './render/index.js';
 import type { AstroComponentFactory } from './render/index.js';

package/dist/runtime/server/index.js

@@ -2,7 +2,6 @@ import { createAstro } from "./astro-global.js";
 import { renderEndpoint } from "./endpoint.js";
 import { escapeHTML, HTMLBytes, HTMLString, markHTMLString, unescapeHTML } from "./escape.js";
 import { renderJSX } from "./jsx.js";
-import { createMetadata } from "./metadata.js";
 import {
   addAttribute,
   defineScriptVars,
@@ -89,7 +88,6 @@ export {
   addAttribute,
   createAstro,
   createComponent,
-  createMetadata,
   defineScriptVars,
   defineStyleVars,
   escapeHTML,

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

@@ -1,19 +1,15 @@
 import { parse as babelParser } from "@babel/parser";
-import npath from "path";
 import { parse, print, types, visit } from "recast";
-import { removeLeadingForwardSlashWindows } from "../core/path.js";
-import { resolveJsToTs } from "../core/util.js";
+import { isMarkdownFile } from "../core/util.js";
 const ASTRO_GLOB_REGEX = /Astro2?\s*\.\s*glob\s*\(/;
-const CLIENT_COMPONENT_PATH_REGEX = /['"]client:component-path['"]:/;
-const validAstroGlobalNames = /* @__PURE__ */ new Set(["Astro", "Astro2"]);
 function astro(_opts) {
   return {
     name: "astro:postprocess",
     async transform(code, id) {
-      if (!id.endsWith(".astro") && !id.endsWith(".md")) {
+      if (!id.endsWith(".astro") && !isMarkdownFile(id, { criteria: "endsWith" })) {
         return null;
       }
-      if (!ASTRO_GLOB_REGEX.test(code) && !CLIENT_COMPONENT_PATH_REGEX.test(code)) {
+      if (!ASTRO_GLOB_REGEX.test(code)) {
         return null;
       }
       const ast = parse(code, {
@@ -49,24 +45,6 @@ function astro(_opts) {
             }
           );
           return false;
-        },
-        visitObjectProperty: function(path) {
-          if (!types.namedTypes.StringLiteral.check(path.node.key) || path.node.key.value !== "client:component-path" || !types.namedTypes.StringLiteral.check(path.node.value)) {
-            this.traverse(path);
-            return;
-          }
-          const valuePath = path.get("value");
-          let value = valuePath.value.value;
-          value = removeLeadingForwardSlashWindows(value);
-          if (code.includes(npath.basename(value) + ".jsx")) {
-            value += ".jsx";
-          }
-          value = resolveJsToTs(value);
-          valuePath.replace({
-            type: "StringLiteral",
-            value
-          });
-          return false;
         }
       });
       const result = print(ast);

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

@@ -4,7 +4,7 @@ import esbuild from "esbuild";
 import * as colors from "kleur/colors";
 import path from "path";
 import { error } from "../core/logger/core.js";
-import { parseNpmName } from "../core/util.js";
+import { isMarkdownFile, parseNpmName } from "../core/util.js";
 import tagExportsPlugin from "./tag.js";
 const JSX_EXTENSIONS = /* @__PURE__ */ new Set([".jsx", ".tsx", ".mdx"]);
 const IMPORT_STATEMENTS = {
@@ -131,7 +131,7 @@ function jsx({ settings, logging }) {
         return null;
       }
       const { mode } = viteConfig;
-      if (id.includes(".mdx") || id.includes(".md")) {
+      if (id.includes(".mdx") || isMarkdownFile(id, { criteria: "includes" })) {
         const { code: jsxCode2 } = await esbuild.transform(code, {
           loader: getEsbuildLoader(path.extname(id)),
           jsx: "preserve",

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

@@ -5,6 +5,7 @@ import { fileURLToPath } from "node:url";
 import { normalizePath } from "vite";
 import { collectErrorMetadata } from "../core/errors.js";
 import { warn } from "../core/logger/core.js";
+import { isMarkdownFile } from "../core/util.js";
 import { getFileInfo, safelyGetAstroData } from "../vite-plugin-utils/index.js";
 function safeMatter(source, id) {
   try {
@@ -22,7 +23,7 @@ function markdown({ settings, logging }) {
     enforce: "pre",
     name: "astro:markdown",
     async load(id) {
-      if (id.endsWith(".md")) {
+      if (isMarkdownFile(id, { criteria: "endsWith" })) {
         const { fileId, fileUrl } = getFileInfo(id, settings.config);
         const rawFile = await fs.promises.readFile(fileId, "utf-8");
         const raw = safeMatter(rawFile, id);
@@ -43,7 +44,7 @@ function markdown({ settings, logging }) {
           warn(
             logging,
             "markdown",
-            `[${id}] Astro now supports MDX! Support for components in ".md" files using the "setup" frontmatter is no longer enabled by default. Migrate this file to MDX or add the "legacy.astroFlavoredMarkdown" config flag to re-enable support.`
+            `[${id}] Astro now supports MDX! Support for components in ".md" (or alternative extensions like ".markdown") files using the "setup" frontmatter is no longer enabled by default. Migrate this file to MDX or add the "legacy.astroFlavoredMarkdown" config flag to re-enable support.`
           );
         }
         const code = escapeViteEnvReferences(`

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

@@ -7,6 +7,7 @@ import { fileURLToPath } from "url";
 import { pagesVirtualModuleId } from "../core/app/index.js";
 import { cachedCompilation } from "../core/compile/index.js";
 import { collectErrorMetadata } from "../core/errors.js";
+import { isMarkdownFile } from "../core/util.js";
 import { getFileInfo } from "../vite-plugin-utils/index.js";
 import {
   createTransformStyles,
@@ -57,11 +58,11 @@ function markdown({ settings }) {
       styleTransformer.viteDevServer = server;
     },
     async resolveId(id, importer, options) {
-      if (id.endsWith(`.md${MARKDOWN_CONTENT_FLAG}`)) {
+      if (isMarkdownFile(id, { criteria: "endsWith", suffix: MARKDOWN_CONTENT_FLAG })) {
         const resolvedId = await this.resolve(id, importer, { skipSelf: true, ...options });
         return resolvedId == null ? void 0 : resolvedId.id.replace(MARKDOWN_CONTENT_FLAG, "");
       }
-      if (id.endsWith(".md") && !isRootImport(importer)) {
+      if (isMarkdownFile(id, { criteria: "endsWith" }) && !isRootImport(importer)) {
         const resolvedId = await this.resolve(id, importer, { skipSelf: true, ...options });
         if (resolvedId) {
           return resolvedId.id + MARKDOWN_IMPORT_FLAG;
@@ -70,7 +71,7 @@ function markdown({ settings }) {
       return void 0;
     },
     async load(id, opts) {
-      if (id.endsWith(`.md${MARKDOWN_IMPORT_FLAG}`)) {
+      if (isMarkdownFile(id, { criteria: "endsWith", suffix: MARKDOWN_IMPORT_FLAG })) {
         const { fileId, fileUrl } = getFileInfo(id, config);
         const source = await fs.promises.readFile(fileId, "utf8");
         const { data: frontmatter, content: rawContent } = safeMatter(source, fileId);
@@ -86,9 +87,6 @@ function markdown({ settings }) {
 						export async function compiledContent() {
 							return load().then((m) => m.compiledContent());
 						}
-						export function $$loadMetadata() {
-							return load().then((m) => m.$$metadata);
-						}
 
 						// Deferred
 						export default async function load() {
@@ -108,7 +106,7 @@ function markdown({ settings }) {
           map: null
         };
       }
-      if (id.endsWith(".md")) {
+      if (isMarkdownFile(id, { criteria: "endsWith" })) {
         const filename = normalizeFilename(id);
         const source = await fs.promises.readFile(filename, "utf8");
         const renderOpts = config.markdown;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.5.2",
+  "version": "1.6.0",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -29,6 +29,7 @@
       "default": "./astro.js"
     },
     "./env": "./env.d.ts",
+    "./types": "./types.d.ts",
     "./client": "./client.d.ts",
     "./client-base": "./client-base.d.ts",
     "./import-meta": "./import-meta.d.ts",
@@ -85,7 +86,7 @@
     "vendor"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^0.27.1",
+    "@astrojs/compiler": "^0.28.0",
     "@astrojs/language-server": "^0.26.2",
     "@astrojs/markdown-remark": "^1.1.3",
     "@astrojs/telemetry": "^1.0.1",
@@ -144,6 +145,7 @@
     "unist-util-visit": "^4.1.0",
     "vfile": "^5.3.2",
     "vite": "~3.1.3",
+    "vitefu": "^0.1.0",
     "yargs-parser": "^21.0.1",
     "zod": "^3.17.3"
   },

package/dist/runtime/server/metadata.d.ts

@@ -1,29 +0,0 @@
-interface ModuleInfo {
-    module: Record<string, any>;
-    specifier: string;
-}
-interface CreateMetadataOptions {
-    modules: ModuleInfo[];
-    hydratedComponents: any[];
-    clientOnlyComponents: any[];
-    hydrationDirectives: Set<string>;
-    hoisted: any[];
-}
-export declare class Metadata {
-    filePath: string;
-    modules: ModuleInfo[];
-    hoisted: any[];
-    hydratedComponents: any[];
-    clientOnlyComponents: any[];
-    hydrationDirectives: Set<string>;
-    private mockURL;
-    private metadataCache;
-    constructor(filePathname: string, opts: CreateMetadataOptions);
-    resolvePath(specifier: string): string;
-    getPath(Component: any): string | null;
-    getExport(Component: any): string | null;
-    private getComponentMetadata;
-    private findComponentMetadata;
-}
-export declare function createMetadata(filePathname: string, options: CreateMetadataOptions): Metadata;
-export {};

package/dist/runtime/server/metadata.js

@@ -1,66 +0,0 @@
-import { removeLeadingForwardSlashWindows } from "../../core/path.js";
-class Metadata {
-  constructor(filePathname, opts) {
-    this.modules = opts.modules;
-    this.hoisted = opts.hoisted;
-    this.hydratedComponents = opts.hydratedComponents;
-    this.clientOnlyComponents = opts.clientOnlyComponents;
-    this.hydrationDirectives = opts.hydrationDirectives;
-    this.filePath = removeLeadingForwardSlashWindows(filePathname);
-    this.mockURL = new URL(filePathname, "http://example.com");
-    this.metadataCache = /* @__PURE__ */ new Map();
-  }
-  resolvePath(specifier) {
-    if (specifier.startsWith(".")) {
-      const url = new URL(specifier, this.mockURL);
-      return removeLeadingForwardSlashWindows(decodeURI(url.pathname));
-    } else {
-      return specifier;
-    }
-  }
-  getPath(Component) {
-    const metadata = this.getComponentMetadata(Component);
-    return (metadata == null ? void 0 : metadata.componentUrl) || null;
-  }
-  getExport(Component) {
-    const metadata = this.getComponentMetadata(Component);
-    return (metadata == null ? void 0 : metadata.componentExport) || null;
-  }
-  getComponentMetadata(Component) {
-    if (this.metadataCache.has(Component)) {
-      return this.metadataCache.get(Component);
-    }
-    const metadata = this.findComponentMetadata(Component);
-    this.metadataCache.set(Component, metadata);
-    return metadata;
-  }
-  findComponentMetadata(Component) {
-    const isCustomElement = typeof Component === "string";
-    for (const { module, specifier } of this.modules) {
-      const id = this.resolvePath(specifier);
-      for (const [key, value] of Object.entries(module)) {
-        if (isCustomElement) {
-          if (key === "tagName" && Component === value) {
-            return {
-              componentExport: key,
-              componentUrl: id
-            };
-          }
-        } else if (Component === value) {
-          return {
-            componentExport: key,
-            componentUrl: id
-          };
-        }
-      }
-    }
-    return null;
-  }
-}
-function createMetadata(filePathname, options) {
-  return new Metadata(filePathname, options);
-}
-export {
-  Metadata,
-  createMetadata
-};