astro 1.0.0-beta.4 → 1.0.0-beta.40

package/LICENSE

@@ -0,0 +1,61 @@
+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.
+"""
+
+
+"""
+This license applies to parts of the `packages/create-astro` and `packages/astro` subdirectories originating from the https://github.com/vitejs/vite repository:
+
+MIT License
+
+Copyright (c) 2019-present, Yuxi (Evan) You and Vite 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.
+"""

package/README.md

@@ -1,106 +1,46 @@
-<a href="https://astro.build">
-  <img src="https://raw.githubusercontent.com/withastro/astro/main/assets/social/banner.svg" />
-</a>
+<br/>
+<p align="center">
+  <img src="../../assets/social/banner-minimal.png" alt="Astro logo">
+  <br/><br/>
+  <a href="https://astro.build">Astro</a> is a website build tool for the modern web &mdash;
+  <br/>
+  powerful developer experience meets lightweight output.
+  <br/><br/>
+</p>
 
-<div center>
 
-**Astro** is a new kind of static site builder for the modern web&mdash;powerful developer experience meets lightweight output.
+## Install
 
-</div>
 
-### [🚀 Read the launch post →](https://astro.build/blog/introducing-astro)
+```bash
+# Recommended!
+npm create astro@latest
 
-### [📚 Learn Astro →](https://docs.astro.build/en/getting-started/)
+# Manual:
+npm install --save-dev astro
+```
 
-## Project Status
+Looking for help? Start with our [Getting Started](https://docs.astro.build/en/getting-started/) guide.  
 
-⚠️ **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.
+Looking for quick examples? [Open a starter project](https://astro.new/) right in your browser.
 
-That 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!
+## Documentation
 
-## Quick Start
+Visit our [offical documentation](https://docs.astro.build/).
 
-<table>
-  <tbody>
-    <tr>
-      <td>
-        <img width="441" height="1px">
-        <strong>👾 Online</strong>
-      </td>
-      <td>
-        <img width="441" height="1px">
-        <strong>📦 Local</strong>
-      </td>
-    </tr>
-    <tr>
-<td>
+## Support
 
-Try Astro in your browser!
+Having trouble? Get help in the official [Astro Discord](https://astro.build/chat).
+## Contributing
 
-[Launch astro.new →](https://astro.new)
+**New contributors welcome!** Check out our [Contributors Guide](CONTRIBUTING.md) for help getting started. 
 
-</td>
-<td>
+Join us on [Discord](https://astro.build/chat) to meet other maintainers. We'll help you get your first contribution in no time!
 
-Get started with Astro using our interactive CLI!
+## Sponsors
 
-```bash
-npm init astro my-astro-project
-```
+Astro is generously supported by [Netlify](https://www.netlify.com/), [Vercel](https://vercel.com/), and several other amazing organizations [listed here.](https://astro.build/)
 
-</td>
-    </tr>
-  </tbody>
-</table>
+[❤️ Sponsor Astro! ❤️](https://github.com/withastro/astro/blob/main/FUNDING.md)
 
-## Sponsors
 
-You can sponsor Astro's development on [Open Collective](https://opencollective.com/astrodotbuild). Astro is generously supported by the following companies and individuals:
-
-### Platinum Sponsors
-
-<table>
-  <tbody>
-    <tr>
-      <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" />
-      </a></td>
-      <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" />
-      </a></td>
-    </tr>
-  </tbody>
-</table>
-
-### Gold Sponsors
-
-<table>
-  <tbody>
-    <tr>
-      <td align="center">
-        <a href="https://divRIOTS.com#gh-light-mode-only" target="_blank">
-        <img width="150" height="40" src="https://raw.githubusercontent.com/withastro/astro/main/.github/assets/divriots.svg#gh-light-mode-only" alt="‹div›RIOTS" />
-        </a>
-        <a href="https://divRIOTS.com#gh-dark-mode-only" target="_blank">
-        <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" />
-        </a>
-      </td>
-      <td align="center">
-        <a href="https://stackupdigital.co.uk/#gh-light-mode-only" target="_blank">
-        <img width="162" height="40" src="https://raw.githubusercontent.com/withastro/astro/main/.github/assets/stackup.svg#gh-light-mode-only" alt="StackUp Digital" />
-        </a>
-        <a href="https://stackupdigital.co.uk/#gh-dark-mode-only" target="_blank">
-        <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" />
-        </a>
-      </td>
-    </tr>
-  </tbody>
-</table>
-
-### Sponsors
-
-<table>
-  <tbody>
-    <tr>
-      <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>
-    </tr>
-  </tbody>
-</table>

package/astro-jsx.d.ts

@@ -621,7 +621,10 @@ declare namespace astroHTML.JSX {
 	//   - "number | string"
 	//   - "string"
 	//   - union of string literals
-	interface SVGAttributes<T extends EventTarget> extends AriaAttributes, DOMAttributes<T> {
+	interface SVGAttributes<T extends EventTarget>
+		extends AriaAttributes,
+			DOMAttributes<T>,
+			AstroBuiltinAttributes {
 		// Attributes which also defined in HTMLAttributes
 		className?: string | undefined | null;
 		class?: string | undefined | null;

package/components/Code.astro

@@ -1,6 +1,6 @@
 ---
 import type * as shiki from 'shiki';
-import { getHighlighter } from 'shiki';
+import { getHighlighter } from './Shiki.js';
 
 export interface Props {
 	/** The code to highlight. Required. */

package/components/Markdown.astro

@@ -3,6 +3,13 @@ export interface Props {
 	content?: string;
 }
 
+// NOTE(fks): We are most likely moving this component out of Astro core
+// in a few weeks. Checking the name like this is a bit of a hack, but we
+// intentionally don't want to add an SSR flag for others to read from, just yet.
+if (Astro.redirect.name !== '_onlyAvailableInSSR') {
+	console.error(`\x1B[31mThe <Markdown> component is not available in SSR. See https://github.com/withastro/rfcs/discussions/179 for more info.\x1B[39m`);
+}
+
 const dedent = (str: string) => {
 	const _str = str.split('\n').filter(s => s.trimStart().length > 0);
 	if (_str.length === 0) {

package/components/Shiki.js

@@ -0,0 +1,24 @@
+import { getHighlighter as getShikiHighlighter } from 'shiki';
+
+// Caches Promise<Highligher> for reuse when the same theme and langs are provided
+const _resolvedHighlighters = new Map();
+
+function stringify(opts) {
+	// Always sort keys before stringifying to make sure objects match regardless of parameter ordering
+	return JSON.stringify(opts, Object.keys(opts).sort());
+}
+
+export function getHighlighter(opts) {
+	const key = stringify(opts);
+
+	// Highlighter has already been requested, reuse the same instance
+	if (_resolvedHighlighters.has(key)) {
+		return _resolvedHighlighters.get(key);
+	}
+
+	// Start the async getHighlighter call and cache the Promise
+	const highlighter = getShikiHighlighter(opts);
+	_resolvedHighlighters.set(key, highlighter);
+
+	return highlighter;
+}

package/dist/cli/index.js

@@ -1,6 +1,8 @@
 import * as colors from "kleur/colors";
 import yargs from "yargs-parser";
 import { z } from "zod";
+import { AstroTelemetry } from "@astrojs/telemetry";
+import * as event from "@astrojs/telemetry/events";
 import { nodeLogDestination, enableVerboseLogging } from "../core/logger/node.js";
 import build from "../core/build/index.js";
 import add from "../core/add/index.js";
@@ -8,7 +10,8 @@ import devServer from "../core/dev/index.js";
 import preview from "../core/preview/index.js";
 import { check } from "./check.js";
 import { openInBrowser } from "./open.js";
-import { loadConfig } from "../core/config.js";
+import * as telemetryHandler from "./telemetry.js";
+import { openConfig } from "../core/config.js";
 import { printHelp, formatErrorMessage, formatConfigErrorMessage } from "../core/messages.js";
 import { createSafeError } from "../core/util.js";
 function printAstroHelp() {
@@ -22,6 +25,7 @@ function printAstroHelp() {
       ["build", "Build a pre-compiled production-ready site."],
       ["preview", "Preview your build locally before deploying."],
       ["check", "Check your project for errors."],
+      ["telemetry", "Enable/disable anonymous data collection."],
       ["--version", "Show the version number and exit."],
       ["--help", "Show this help message."]
     ],
@@ -29,8 +33,6 @@ function printAstroHelp() {
       ["--host [optional IP]", "Expose server on network"],
       ["--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 +40,7 @@ function printAstroHelp() {
   });
 }
 async function printVersion() {
-  const version = "1.0.0-beta.4";
+  const version = "1.0.0-beta.40";
   console.log();
   console.log(`  ${colors.bgGreen(colors.black(` astro `))} ${colors.green(`v${version}`)}`);
 }
@@ -46,6 +48,8 @@ function resolveCommand(flags) {
   const cmd = flags._[2];
   if (cmd === "add")
     return "add";
+  if (cmd === "telemetry")
+    return "telemetry";
   if (flags.version)
     return "version";
   else if (flags.help)
@@ -57,6 +61,7 @@ function resolveCommand(flags) {
   return "help";
 }
 async function cli(args) {
+  var _a;
   const flags = yargs(args);
   const cmd = resolveCommand(flags);
   const root = flags.root;
@@ -78,24 +83,33 @@ async function cli(args) {
   } else if (flags.silent) {
     logging.level = "silent";
   }
-  let config;
-  try {
-    config = await loadConfig({ cwd: root, flags, cmd });
-  } catch (err) {
-    return throwAndExit(err);
+  const telemetry = new AstroTelemetry({ version: "1.0.0-beta.40" });
+  if (cmd === "telemetry") {
+    try {
+      const subcommand = (_a = flags._[3]) == null ? void 0 : _a.toString();
+      return await telemetryHandler.update(subcommand, { flags, telemetry });
+    } catch (err) {
+      return throwAndExit(err);
+    }
   }
   switch (cmd) {
     case "add": {
       try {
         const packages = flags._.slice(3);
-        return await add(packages, { cwd: root, flags, logging });
+        telemetry.record(event.eventCliSession({
+          astroVersion: "1.0.0-beta.40",
+          cliCommand: "add"
+        }));
+        return await add(packages, { cwd: root, flags, logging, telemetry });
       } catch (err) {
         return throwAndExit(err);
       }
     }
     case "dev": {
       try {
-        await devServer(config, { logging });
+        const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.40", cliCommand: "dev" }, userConfig, flags));
+        await devServer(astroConfig, { logging, telemetry });
         return await new Promise(() => {
         });
       } catch (err) {
@@ -104,18 +118,24 @@ async function cli(args) {
     }
     case "build": {
       try {
-        return await build(config, { logging });
+        const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.40", cliCommand: "build" }, userConfig, flags));
+        return await build(astroConfig, { logging, telemetry });
       } catch (err) {
         return throwAndExit(err);
       }
     }
     case "check": {
-      const ret = await check(config);
+      const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
+      telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.40", cliCommand: "check" }, userConfig, flags));
+      const ret = await check(astroConfig);
       return process.exit(ret);
     }
     case "preview": {
       try {
-        const server = await preview(config, { logging });
+        const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.40", cliCommand: "preview" }, userConfig, flags));
+        const server = await preview(astroConfig, { logging, telemetry });
         return await server.closed();
       } catch (err) {
         return throwAndExit(err);
@@ -123,6 +143,10 @@ async function cli(args) {
     }
     case "docs": {
       try {
+        await telemetry.record(event.eventCliSession({
+          astroVersion: "1.0.0-beta.40",
+          cliCommand: "docs"
+        }));
         return await openInBrowser("https://docs.astro.build/");
       } catch (err) {
         return throwAndExit(err);

package/dist/cli/telemetry.js

@@ -0,0 +1,36 @@
+import * as msg from "../core/messages.js";
+async function update(subcommand, { flags, telemetry }) {
+  const isValid = ["enable", "disable", "reset"].includes(subcommand);
+  if (flags.help || !isValid) {
+    msg.printHelp({
+      commandName: "astro telemetry",
+      usage: "<enable|disable|reset>",
+      commands: [
+        ["enable", "Enable anonymous data collection."],
+        ["disable", "Disable anonymous data collection."],
+        ["reset", "Reset anonymous data collection settings."]
+      ]
+    });
+    return;
+  }
+  switch (subcommand) {
+    case "enable": {
+      telemetry.setEnabled(true);
+      console.log(msg.telemetryEnabled());
+      return;
+    }
+    case "disable": {
+      telemetry.setEnabled(false);
+      console.log(msg.telemetryDisabled());
+      return;
+    }
+    case "reset": {
+      telemetry.clear();
+      console.log(msg.telemetryReset());
+      return;
+    }
+  }
+}
+export {
+  update
+};

package/dist/core/add/consts.js

@@ -20,7 +20,7 @@ const CONFIG_STUB = `import { defineConfig } from 'astro/config';
 
 export default defineConfig({});`;
 const TAILWIND_CONFIG_STUB = `module.exports = {
-	content: ['./src/**/*.{astro,html,js,jsx,svelte,ts,tsx,vue}'],
+	content: ['./src/**/*.{astro,html,js,jsx,md,svelte,ts,tsx,vue}'],
 	theme: {
 		extend: {},
 	},

package/dist/core/add/index.js

@@ -18,7 +18,8 @@ import { parseNpmName } from "../util.js";
 import { wrapDefaultExport } from "./wrapper.js";
 import { ensureImport } from "./imports.js";
 import { t, parse, visit, generate } from "./babel.js";
-async function add(names, { cwd, flags, logging }) {
+import { appendForwardSlash } from "../path.js";
+async function add(names, { cwd, flags, logging, telemetry }) {
   if (flags.help) {
     printHelp({
       commandName: "astro add",
@@ -65,7 +66,7 @@ async function add(names, { cwd, flags, logging }) {
     debug("add", `Found config at ${configURL}`);
   } else {
     info(logging, "add", `Unable to locate a config file, generating one for you.`);
-    configURL = new URL("./astro.config.mjs", root);
+    configURL = new URL("./astro.config.mjs", appendForwardSlash(root.href));
     await fs.writeFile(fileURLToPath(configURL), CONSTS.CONFIG_STUB, { encoding: "utf-8" });
   }
   const integrations = await validateIntegrations(names);

package/dist/core/app/common.js

@@ -27,7 +27,9 @@ function deserializeManifest(serializedManifest) {
     const route = serializedRoute;
     route.routeData = deserializeRouteData(serializedRoute.routeData);
   }
+  const assets = new Set(serializedManifest.assets);
   return __spreadProps(__spreadValues({}, serializedManifest), {
+    assets,
     routes
   });
 }

package/dist/core/app/index.js

@@ -32,7 +32,9 @@ import {
   createLinkStylesheetElementSet,
   createModuleScriptElementWithSrcSet
 } from "../render/ssr-element.js";
-import { prependForwardSlash } from "../path.js";
+import { joinPaths, prependForwardSlash } from "../path.js";
+const pagesVirtualModuleId = "@astrojs-pages-virtual-entry";
+const resolvedPagesVirtualModuleId = "\0" + pagesVirtualModuleId;
 class App {
   constructor(manifest) {
     __privateAdd(this, _renderPage);
@@ -90,12 +92,20 @@ renderPage_fn = async function(request, routeData, mod) {
   const renderers = manifest.renderers;
   const info = __privateGet(this, _routeDataToRouteInfo).get(routeData);
   const links = createLinkStylesheetElementSet(info.links, manifest.site);
-  const scripts = createModuleScriptElementWithSrcSet(info.scripts, manifest.site);
+  const filteredScripts = info.scripts.filter((script) => typeof script !== "string" && (script == null ? void 0 : script.stage) !== "head-inline");
+  const scripts = createModuleScriptElementWithSrcSet(filteredScripts, manifest.site);
+  for (const script of info.scripts) {
+    if (typeof script !== "string" && script.stage === "head-inline") {
+      scripts.add({
+        props: {},
+        children: script.children
+      });
+    }
+  }
   const result = await render({
-    legacyBuild: false,
     links,
     logging: __privateGet(this, _logging),
-    markdownRender: manifest.markdown.render,
+    markdown: manifest.markdown,
     mod,
     origin: url.origin,
     pathname: url.pathname,
@@ -106,7 +116,7 @@ renderPage_fn = async function(request, routeData, mod) {
         throw new Error(`Unable to resolve [${specifier}]`);
       }
       const bundlePath = manifest.entryModules[specifier];
-      return bundlePath.startsWith("data:") ? bundlePath : prependForwardSlash(bundlePath);
+      return bundlePath.startsWith("data:") ? bundlePath : prependForwardSlash(joinPaths(manifest.base, bundlePath));
     },
     route: routeData,
     routeCache: __privateGet(this, _routeCache),
@@ -118,14 +128,12 @@ renderPage_fn = async function(request, routeData, mod) {
     return result.response;
   }
   let html = result.html;
+  let init = result.response;
+  let headers = init.headers;
   let bytes = __privateGet(this, _encoder).encode(html);
-  return new Response(bytes, {
-    status: 200,
-    headers: {
-      "Content-Type": "text/html",
-      "Content-Length": bytes.byteLength.toString()
-    }
-  });
+  headers.set("Content-Type", "text/html");
+  headers.set("Content-Length", bytes.byteLength.toString());
+  return new Response(bytes, init);
 };
 _callEndpoint = new WeakSet();
 callEndpoint_fn = async function(request, routeData, mod) {
@@ -159,5 +167,7 @@ callEndpoint_fn = async function(request, routeData, mod) {
 };
 export {
   App,
-  deserializeManifest
+  deserializeManifest,
+  pagesVirtualModuleId,
+  resolvedPagesVirtualModuleId
 };

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 { joinPaths, 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";
@@ -99,13 +98,14 @@ function addPageName(pathname, opts) {
   opts.pageNames.push(pathname.replace(/\/?$/, "/").replace(/^\//, ""));
 }
 async function generatePath(pathname, opts, gopts) {
+  var _a;
   const { astroConfig, logging, origin, routeCache } = opts;
   const { mod, internals, linkIds, hoistedId, pageData, renderers } = gopts;
   if (pageData.route.type === "page") {
     addPageName(pathname, opts);
   }
   debug("build", `Generating: ${pathname}`);
-  const site = astroConfig.site;
+  const site = astroConfig.base !== "/" ? joinPaths(((_a = astroConfig.site) == null ? void 0 : _a.toString()) || "http://localhost/", astroConfig.base) : astroConfig.site;
   const links = createLinkStylesheetElementSet(linkIds.reverse(), site);
   const scripts = createModuleScriptElementWithSrcSet(hoistedId ? [hoistedId] : [], site);
   for (const script of astroConfig._ctx.scripts) {
@@ -116,12 +116,12 @@ async function generatePath(pathname, opts, gopts) {
       });
     }
   }
-  const url = new URL(origin + pathname);
+  const ssr = isBuildingToSSR(opts.astroConfig);
+  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,
@@ -135,15 +135,13 @@ async function generatePath(pathname, opts, gopts) {
         }
         throw new Error(`Cannot find the built path for ${specifier}`);
       }
-      const relPath = npath.posix.relative(pathname, "/" + hashedFilePath);
-      const fullyRelativePath = relPath[0] === "." ? relPath : "./" + relPath;
-      return fullyRelativePath;
+      return prependForwardSlash(npath.posix.join(astroConfig.base, hashedFilePath));
     },
-    request: createRequest({ url, headers: new Headers(), logging }),
+    request: createRequest({ url, headers: new Headers(), logging, ssr }),
     route: pageData.route,
     routeCache,
     site: astroConfig.site ? new URL(astroConfig.base, astroConfig.site).toString() : astroConfig.site,
-    ssr: isBuildingToSSR(opts.astroConfig)
+    ssr
   };
   let body;
   if (pageData.route.type === "endpoint") {
@@ -161,6 +159,7 @@ async function generatePath(pathname, opts, gopts) {
   }
   const outFolder = getOutFolder(astroConfig, pathname, pageData.route.type);
   const outFile = getOutFile(astroConfig, outFolder, pathname, pageData.route.type);
+  pageData.route.distURL = outFile;
   await fs.promises.mkdir(outFolder, { recursive: true });
   await fs.promises.writeFile(outFile, body, "utf-8");
 }

package/dist/core/build/index.js

@@ -11,7 +11,6 @@ import {
   timerMessage,
   warnIfUsingExperimentalSSR
 } from "../logger/core.js";
-import { nodeLogOptions } from "../logger/node.js";
 import { createRouteManifest } from "../routing/index.js";
 import { collectPagesData } from "./page-data.js";
 import { staticBuild } from "./static-build.js";
@@ -25,7 +24,7 @@ import {
 import { getTimeStat } from "./util.js";
 import { createSafeError, isBuildingToSSR } from "../util.js";
 import { fixViteErrorMessage } from "../errors.js";
-async function build(config, options = { logging: nodeLogOptions }) {
+async function build(config, options) {
   applyPolyfill();
   const builder = new AstroBuilder(config, options);
   await builder.run();
@@ -141,7 +140,6 @@ class AstroBuilder {
     try {
       await this.build(setupData);
     } catch (_err) {
-      debugger;
       throw fixViteErrorMessage(createSafeError(_err), setupData.viteServer);
     }
   }
@@ -151,7 +149,6 @@ class AstroBuilder {
     pageCount,
     buildMode
   }) {
-    const buildTime = performance.now() - timeStart;
     const total = getTimeStat(timeStart, performance.now());
     let messages = [];
     if (buildMode === "static") {