astro 1.0.0-beta.26 → 1.0.0-beta.29

package/dist/cli/index.js

@@ -11,7 +11,7 @@ import preview from "../core/preview/index.js";
 import { check } from "./check.js";
 import { openInBrowser } from "./open.js";
 import * as telemetryHandler from "./telemetry.js";
-import { loadConfig } from "../core/config.js";
+import { openConfig } from "../core/config.js";
 import { printHelp, formatErrorMessage, formatConfigErrorMessage } from "../core/messages.js";
 import { createSafeError } from "../core/util.js";
 function printAstroHelp() {
@@ -40,7 +40,7 @@ function printAstroHelp() {
   });
 }
 async function printVersion() {
-  const version = "1.0.0-beta.26";
+  const version = "1.0.0-beta.29";
   console.log();
   console.log(`  ${colors.bgGreen(colors.black(` astro `))} ${colors.green(`v${version}`)}`);
 }
@@ -83,7 +83,7 @@ async function cli(args) {
   } else if (flags.silent) {
     logging.level = "silent";
   }
-  const telemetry = new AstroTelemetry({ version: "1.0.0-beta.26" });
+  const telemetry = new AstroTelemetry({ version: "1.0.0-beta.29" });
   if (cmd === "telemetry") {
     try {
       const subcommand = (_a = flags._[3]) == null ? void 0 : _a.toString();
@@ -97,7 +97,7 @@ async function cli(args) {
       try {
         const packages = flags._.slice(3);
         telemetry.record(event.eventCliSession({
-          astroVersion: "1.0.0-beta.26",
+          astroVersion: "1.0.0-beta.29",
           cliCommand: "add"
         }));
         return await add(packages, { cwd: root, flags, logging, telemetry });
@@ -107,9 +107,9 @@ async function cli(args) {
     }
     case "dev": {
       try {
-        const config = await loadConfig({ cwd: root, flags, cmd });
-        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.26", cliCommand: "dev" }, config));
-        await devServer(config, { logging, telemetry });
+        const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.29", cliCommand: "dev" }, userConfig, flags));
+        await devServer(astroConfig, { logging, telemetry });
         return await new Promise(() => {
         });
       } catch (err) {
@@ -118,24 +118,24 @@ async function cli(args) {
     }
     case "build": {
       try {
-        const config = await loadConfig({ cwd: root, flags, cmd });
-        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.26", cliCommand: "build" }, config));
-        return await build(config, { logging, telemetry });
+        const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.29", cliCommand: "build" }, userConfig, flags));
+        return await build(astroConfig, { logging, telemetry });
       } catch (err) {
         return throwAndExit(err);
       }
     }
     case "check": {
-      const config = await loadConfig({ cwd: root, flags, cmd });
-      telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.26", cliCommand: "check" }, config));
-      const ret = await check(config);
+      const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
+      telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.29", cliCommand: "check" }, userConfig, flags));
+      const ret = await check(astroConfig);
       return process.exit(ret);
     }
     case "preview": {
       try {
-        const config = await loadConfig({ cwd: root, flags, cmd });
-        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.26", cliCommand: "preview" }, config));
-        const server = await preview(config, { logging, telemetry });
+        const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.29", cliCommand: "preview" }, userConfig, flags));
+        const server = await preview(astroConfig, { logging, telemetry });
         return await server.closed();
       } catch (err) {
         return throwAndExit(err);
@@ -144,7 +144,7 @@ async function cli(args) {
     case "docs": {
       try {
         await telemetry.record(event.eventCliSession({
-          astroVersion: "1.0.0-beta.26",
+          astroVersion: "1.0.0-beta.29",
           cliCommand: "docs"
         }));
         return await openInBrowser("https://docs.astro.build/");

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/app/index.js

@@ -92,7 +92,16 @@ 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({
     links,
     logging: __privateGet(this, _logging),

package/dist/core/build/index.js

@@ -140,7 +140,6 @@ class AstroBuilder {
     try {
       await this.build(setupData);
     } catch (_err) {
-      debugger;
       throw fixViteErrorMessage(createSafeError(_err), setupData.viteServer);
     }
   }

package/dist/core/build/internal.js

@@ -1,3 +1,4 @@
+import { prependForwardSlash } from "../path.js";
 import { viteID } from "../util.js";
 function createBuildInternals() {
   const pureCSSChunks = /* @__PURE__ */ new Set();
@@ -19,15 +20,14 @@ function trackPageData(internals, component, pageData, componentModuleId, compon
   internals.pagesByComponent.set(component, pageData);
   internals.pagesByViteID.set(viteID(componentURL), pageData);
 }
-function trackClientOnlyPageDatas(internals, pageData, clientOnlys, astroConfig) {
+function trackClientOnlyPageDatas(internals, pageData, clientOnlys) {
   for (const clientOnlyComponent of clientOnlys) {
-    const coPath = viteID(new URL("." + clientOnlyComponent, astroConfig.root));
     let pageDataSet;
-    if (internals.pagesByClientOnly.has(coPath)) {
-      pageDataSet = internals.pagesByClientOnly.get(coPath);
+    if (internals.pagesByClientOnly.has(clientOnlyComponent)) {
+      pageDataSet = internals.pagesByClientOnly.get(clientOnlyComponent);
     } else {
       pageDataSet = /* @__PURE__ */ new Set();
-      internals.pagesByClientOnly.set(coPath, pageDataSet);
+      internals.pagesByClientOnly.set(clientOnlyComponent, pageDataSet);
     }
     pageDataSet.add(pageData);
   }
@@ -44,8 +44,9 @@ function* getPageDatasByClientOnlyChunk(internals, chunk) {
   const pagesByClientOnly = internals.pagesByClientOnly;
   if (pagesByClientOnly.size) {
     for (const [modulePath] of Object.entries(chunk.modules)) {
-      if (pagesByClientOnly.has(modulePath)) {
-        for (const pageData of pagesByClientOnly.get(modulePath)) {
+      const pathname = `/@fs${prependForwardSlash(modulePath)}`;
+      if (pagesByClientOnly.has(pathname)) {
+        for (const pageData of pagesByClientOnly.get(pathname)) {
           yield pageData;
         }
       }

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

@@ -54,7 +54,7 @@ async function staticBuild(opts) {
       const [renderers, mod] = pageData.preload;
       const metadata = mod.$$metadata;
       const clientOnlys = Array.from(metadata.clientOnlyComponentPaths());
-      trackClientOnlyPageDatas(internals, pageData, clientOnlys, astroConfig);
+      trackClientOnlyPageDatas(internals, pageData, clientOnlys);
       const topLevelImports = /* @__PURE__ */ new Set([
         ...metadata.hydratedComponentPaths(),
         ...clientOnlys,
@@ -133,7 +133,7 @@ async function ssrBuild(opts, internals, input) {
     root: viteConfig.root,
     envPrefix: "PUBLIC_",
     server: viteConfig.server,
-    base: astroConfig.site ? new URL(astroConfig.site).pathname : "/",
+    base: astroConfig.base,
     ssr: viteConfig.ssr,
     resolve: viteConfig.resolve
   };

package/dist/core/build/vite-plugin-hoisted-scripts.js

@@ -15,7 +15,11 @@ function vitePluginHoistedScripts(astroConfig, internals) {
       if (virtualHoistedEntry(id)) {
         let code = "";
         for (let path of internals.hoistedScriptIdToHoistedMap.get(id)) {
-          code += `import "${path}";`;
+          let importPath = path;
+          if (importPath.startsWith("/@fs")) {
+            importPath = importPath.slice("/@fs".length);
+          }
+          code += `import "${importPath}";`;
         }
         return {
           code

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

@@ -81,8 +81,11 @@ function buildManifest(opts, internals, staticFiles) {
     routes.push({
       file: "",
       links: Array.from(pageData.css),
-      scripts,
-      routeData: serializeRouteData(pageData.route)
+      scripts: [
+        ...scripts,
+        ...astroConfig._ctx.scripts.filter((script) => script.stage === "head-inline").map(({ stage, content }) => ({ stage, children: content }))
+      ],
+      routeData: serializeRouteData(pageData.route, astroConfig.trailingSlash)
     });
   }
   const entryModules = Object.fromEntries(internals.entrySpecifierToBundleMap.entries());

package/dist/core/config.js

@@ -27,7 +27,7 @@ import load, { resolve, ProloadError } from "@proload/core";
 import loadTypeScript from "@proload/plugin-tsm";
 import postcssrc from "postcss-load-config";
 import { arraify, isObject } from "./util.js";
-import { appendForwardSlash, trimSlashes } from "./path.js";
+import { appendForwardSlash, prependForwardSlash, trimSlashes } from "./path.js";
 load.use([loadTypeScript]);
 async function resolvePostcssConfig(inlineOptions, root) {
   if (isObject(inlineOptions)) {
@@ -72,7 +72,7 @@ const AstroConfigSchema = z.object({
   site: z.string().url().optional().transform((val) => val ? appendForwardSlash(val) : val).refine((val) => !val || new URL(val).pathname.length <= 1, {
     message: '"site" must be a valid URL origin (ex: "https://example.com") but cannot contain a URL path (ex: "https://example.com/blog"). Use "base" to configure your deployed URL path'
   }),
-  base: z.string().optional().default("/").transform((val) => appendForwardSlash(trimSlashes(val))),
+  base: z.string().optional().default("/").transform((val) => prependForwardSlash(appendForwardSlash(trimSlashes(val)))),
   trailingSlash: z.union([z.literal("always"), z.literal("never"), z.literal("ignore")]).optional().default("ignore"),
   build: z.object({
     format: z.union([z.literal("file"), z.literal("directory")]).optional().default("directory")
@@ -110,7 +110,7 @@ const AstroConfigSchema = z.object({
       z.tuple([z.custom((data) => typeof data === "function"), z.any()])
     ]).array().default([])
   }).default({}),
-  vite: z.any().optional().default({}),
+  vite: z.custom((data) => data instanceof Object && !Array.isArray(data)).default({}),
   experimental: z.object({
     ssr: z.boolean().optional().default(false),
     integrations: z.boolean().optional().default(false)
@@ -237,6 +237,39 @@ async function resolveConfigURL(configOptions) {
     return pathToFileURL(configPath);
   }
 }
+async function openConfig(configOptions) {
+  const root = configOptions.cwd ? path.resolve(configOptions.cwd) : process.cwd();
+  const flags = resolveFlags(configOptions.flags || {});
+  let userConfig = {};
+  let userConfigPath;
+  if (flags == null ? void 0 : flags.config) {
+    userConfigPath = /^\.*\//.test(flags.config) ? flags.config : `./${flags.config}`;
+    userConfigPath = fileURLToPath(new URL(userConfigPath, appendForwardSlash(pathToFileURL(root).toString())));
+  }
+  let config;
+  try {
+    config = await load("astro", {
+      mustExist: !!userConfigPath,
+      cwd: root,
+      filePath: userConfigPath
+    });
+  } catch (err) {
+    if (err instanceof ProloadError && flags.config) {
+      throw new Error(`Unable to resolve --config "${flags.config}"! Does the file exist?`);
+    }
+    throw err;
+  }
+  if (config) {
+    userConfig = config.value;
+  }
+  const astroConfig = await resolveConfig(userConfig, root, flags, configOptions.cmd);
+  return {
+    astroConfig,
+    userConfig,
+    flags,
+    root
+  };
+}
 async function loadConfig(configOptions) {
   const root = configOptions.cwd ? path.resolve(configOptions.cwd) : process.cwd();
   const flags = resolveFlags(configOptions.flags || {});
@@ -305,6 +338,7 @@ export {
   LEGACY_ASTRO_CONFIG_KEYS,
   loadConfig,
   mergeConfig,
+  openConfig,
   resolveConfig,
   resolveConfigURL,
   validateConfig

package/dist/core/create-vite.js

@@ -32,7 +32,8 @@ async function createVite(commandConfig, { astroConfig, logging, mode }) {
     clearScreen: false,
     logLevel: "warn",
     optimizeDeps: {
-      entries: ["src/**/*"]
+      entries: ["src/**/*"],
+      exclude: ["node-fetch"]
     },
     plugins: [
       configAliasVitePlugin({ config: astroConfig }),

package/dist/core/dev/index.js

@@ -36,13 +36,16 @@ async function dev(config, options) {
     site,
     https: !!((_a = viteConfig.server) == null ? void 0 : _a.https)
   }));
-  const currentVersion = "1.0.0-beta.26";
+  const currentVersion = "1.0.0-beta.29";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }
   await runHookServerStart({ config, address: devServerAddressInfo });
   return {
     address: devServerAddressInfo,
+    get watcher() {
+      return viteServer.watcher;
+    },
     stop: async () => {
       await viteServer.close();
       await runHookServerDone({ config });

package/dist/core/errors.js

@@ -12,6 +12,12 @@ function fixViteErrorMessage(_err, server) {
   }
   return err;
 }
+function generateHint(err) {
+  if (/Unknown file extension \"\.(jsx|vue|svelte|astro)\" for /.test(err.message)) {
+    return "You likely need to add this package to `vite.ssr.noExternal` in your astro config file.";
+  }
+  return void 0;
+}
 function collectErrorMetadata(e) {
   if (e.stack) {
     e.stack = eol.lf(e.stack);
@@ -34,8 +40,10 @@ function collectErrorMetadata(e) {
     if (pluginName) {
       err.plugin = pluginName;
     }
+    err.hint = generateHint(err);
     return err;
   }
+  e.hint = generateHint(e);
   return e;
 }
 export {

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function devStart({
   https,
   site
 }) {
-  const version = "1.0.0-beta.26";
+  const version = "1.0.0-beta.29";
   const rootPath = site ? site.pathname : "/";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
@@ -157,6 +157,10 @@ ${errorList.join("\n")}`;
 function formatErrorMessage(_err, args = []) {
   const err = collectErrorMetadata(_err);
   args.push(`${bgRed(black(` error `))}${red(bold(padMultilineString(err.message)))}`);
+  if (err.hint) {
+    args.push(`  ${bold("Hint:")}`);
+    args.push(yellow(padMultilineString(err.hint, 4)));
+  }
   if (err.id) {
     args.push(`  ${bold("File:")}`);
     args.push(red(`    ${err.id}`));
@@ -199,7 +203,7 @@ function printHelp({
   };
   let message = [];
   if (headline) {
-    message.push(linebreak(), `  ${bgGreen(black(` ${commandName} `))} ${green(`v${"1.0.0-beta.26"}`)} ${headline}`);
+    message.push(linebreak(), `  ${bgGreen(black(` ${commandName} `))} ${green(`v${"1.0.0-beta.29"}`)} ${headline}`);
   }
   if (usage) {
     message.push(linebreak(), `  ${green(commandName)} ${bold(usage)}`);

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

@@ -105,14 +105,10 @@ async function render(renderers, mod, ssrOpts) {
     pathname,
     scripts,
     async resolve(s) {
-      const [resolvedUrl, resolvedPath] = await viteServer.moduleGraph.resolveUrl(s);
-      if (resolvedPath.includes("node_modules/.vite")) {
-        return resolvedPath.replace(/.*?node_modules\/\.vite/, "/node_modules/.vite");
+      if (s.startsWith("/@fs")) {
+        return s;
       }
-      if (!resolvedUrl.startsWith(".") && !resolvedUrl.startsWith("/")) {
-        return "/@id" + prependForwardSlash(resolvedUrl);
-      }
-      return "/@fs" + prependForwardSlash(resolvedPath);
+      return "/@id" + prependForwardSlash(s);
     },
     renderers,
     request,

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

@@ -1,10 +1,10 @@
 import fs from "fs";
 import path from "path";
-import { compile } from "path-to-regexp";
 import slash from "slash";
 import { fileURLToPath } from "url";
 import { warn } from "../../logger/core.js";
 import { resolvePages } from "../../util.js";
+import { getRouteGenerator } from "./generator.js";
 function countOccurrences(needle, haystack) {
   let count = 0;
   for (let i = 0; i < haystack.length; i += 1) {
@@ -50,17 +50,6 @@ function getTrailingSlashPattern(addTrailingSlash) {
   }
   return "\\/?$";
 }
-function getGenerator(segments, addTrailingSlash) {
-  const template = segments.map((segment) => {
-    return segment[0].spread ? `/:${segment[0].content.slice(3)}(.*)?` : "/" + segment.map((part) => {
-      if (part)
-        return part.dynamic ? `:${part.content}` : part.content.normalize().replace(/\?/g, "%3F").replace(/#/g, "%23").replace(/%5B/g, "[").replace(/%5D/g, "]").replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    }).join("");
-  }).join("");
-  const trailing = addTrailingSlash !== "never" && segments.length ? "/" : "";
-  const toPath = compile(template + trailing);
-  return toPath;
-}
 function isSpread(str) {
   const spreadPattern = /\[\.{3}/g;
   return spreadPattern.test(str);
@@ -184,7 +173,7 @@ function createRouteManifest({ config, cwd }, logging) {
         const component = item.file;
         const trailingSlash = item.isPage ? config.trailingSlash : "never";
         const pattern = getPattern(segments, trailingSlash);
-        const generate = getGenerator(segments, trailingSlash);
+        const generate = getRouteGenerator(segments, trailingSlash);
         const pathname = segments.every((segment) => segment.length === 1 && !segment[0].dynamic) ? `/${segments.map((segment) => segment[0].content).join("/")}` : null;
         routes.push({
           type: item.isPage ? "page" : "endpoint",

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

@@ -0,0 +1,15 @@
+import { compile } from "path-to-regexp";
+function getRouteGenerator(segments, addTrailingSlash) {
+  const template = segments.map((segment) => {
+    return segment[0].spread ? `/:${segment[0].content.slice(3)}(.*)?` : "/" + segment.map((part) => {
+      if (part)
+        return part.dynamic ? `:${part.content}` : part.content.normalize().replace(/\?/g, "%3F").replace(/#/g, "%23").replace(/%5B/g, "[").replace(/%5D/g, "]").replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    }).join("");
+  }).join("");
+  const trailing = addTrailingSlash !== "never" && segments.length ? "/" : "";
+  const toPath = compile(template + trailing);
+  return toPath;
+}
+export {
+  getRouteGenerator
+};

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

@@ -1,23 +1,40 @@
-function createRouteData(pattern, params, component, pathname, type, segments) {
-  return {
-    type,
-    pattern,
-    params,
-    component,
-    generate: () => "",
-    pathname: pathname || void 0,
-    segments
-  };
-}
-function serializeRouteData(routeData) {
-  const outRouteData = routeData;
-  outRouteData.pattern = routeData.pattern.source;
-  return outRouteData;
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+import { getRouteGenerator } from "./generator.js";
+function serializeRouteData(routeData, trailingSlash) {
+  return __spreadProps(__spreadValues({}, routeData), {
+    generate: void 0,
+    pattern: routeData.pattern.source,
+    _meta: { trailingSlash }
+  });
 }
 function deserializeRouteData(rawRouteData) {
-  const { component, params, pathname, type, segments } = rawRouteData;
-  const pattern = new RegExp(rawRouteData.pattern);
-  return createRouteData(pattern, params, component, pathname, type, segments);
+  return {
+    type: rawRouteData.type,
+    pattern: new RegExp(rawRouteData.pattern),
+    params: rawRouteData.params,
+    component: rawRouteData.component,
+    generate: getRouteGenerator(rawRouteData.segments, rawRouteData._meta.trailingSlash),
+    pathname: rawRouteData.pathname || void 0,
+    segments: rawRouteData.segments
+  };
 }
 export {
   deserializeRouteData,

package/dist/runtime/server/hydration.js

@@ -57,9 +57,8 @@ async function generateHydrateScript(scriptOptions, metadata) {
   if (!componentExport) {
     throw new Error(`Unable to resolve a componentExport for "${metadata.displayName}"! Please open an issue.`);
   }
-  let hydrationSource = ``;
-  hydrationSource += renderer.clientEntrypoint ? `const [{ ${componentExport.value}: Component }, { default: hydrate }] = await Promise.all([import("${await result.resolve(componentUrl)}"), import("${await result.resolve(renderer.clientEntrypoint)}")]);
-  return (el, children) => hydrate(el)(Component, ${serializeProps(props)}, children);
+  const hydrationSource = renderer.clientEntrypoint ? `const [{ ${componentExport.value}: Component }, { default: hydrate }] = await Promise.all([import("${await result.resolve(componentUrl)}"), import("${await result.resolve(renderer.clientEntrypoint)}")]);
+  return (el, children) => hydrate(el)(Component, ${serializeProps(props)}, children, ${JSON.stringify({ client: hydrate })});
 ` : `await import("${await result.resolve(componentUrl)}");
   return () => {};
 `;

package/dist/runtime/server/index.js

@@ -1,22 +1,6 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __objRest = (source, exclude) => {
   var target = {};
   for (var prop in source)
@@ -150,12 +134,20 @@ Did you mean to add ${formatList(probableRendererNames.map((r) => "`" + r + "`")
   const children = await renderSlot(result, slots == null ? void 0 : slots.default);
   let renderer;
   if (metadata.hydrate !== "only") {
+    let error;
     for (const r of renderers) {
-      if (await r.ssr.check(Component, props, children)) {
-        renderer = r;
-        break;
+      try {
+        if (await r.ssr.check(Component, props, children)) {
+          renderer = r;
+          break;
+        }
+      } catch (e) {
+        error ?? (error = e);
       }
     }
+    if (error) {
+      throw error;
+    }
     if (!renderer && typeof HTMLElement === "function" && componentIsHTMLElement(Component)) {
       const output = renderHTMLElement(result, Component, _props, slots);
       return output;
@@ -362,7 +354,7 @@ Update your code to remove this warning.`);
       }
     }
   });
-  return await handler.call(mod, proxy, request);
+  return handler.call(mod, proxy, request);
 }
 async function replaceHeadInjection(result, html) {
   let template = html;
@@ -419,9 +411,7 @@ async function renderHead(result) {
     if ("data-astro-component-hydration" in script.props) {
       needsHydrationStyles = true;
     }
-    return renderElement("script", __spreadProps(__spreadValues({}, script), {
-      props: __spreadProps(__spreadValues({}, script.props), { "astro-script": result._metadata.pathname + "/script-" + i })
-    }));
+    return renderElement("script", script);
   });
   if (needsHydrationStyles) {
     styles.push(renderElement("style", {

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

@@ -234,6 +234,9 @@ declare type ServerConfig = {
      */
     port?: number;
 };
+export interface ViteUserConfig extends vite.UserConfig {
+    ssr?: vite.SSROptions;
+}
 /**
  * Astro User Config
  * Docs: https://docs.astro.build/reference/configuration-reference/
@@ -348,7 +351,7 @@ export interface AstroUserConfig {
      * @docs
      * @name trailingSlash
      * @type {('always' | 'never' | 'ignore')}
-     * @default `'always'`
+     * @default `'ignore'`
      * @see buildOptions.pageUrlFormat
      * @description
      *
@@ -402,11 +405,11 @@ export interface AstroUserConfig {
      * @name Server Options
      * @description
      *
-     * Customize the Astro dev server, used by both `astro dev` and `astro serve`.
+     * Customize the Astro dev server, used by both `astro dev` and `astro preview`.
      *
      * ```js
      * {
-     *   server: {port: 1234, host: true}
+     *   server: { port: 1234, host: true}
      * }
      * ```
      *
@@ -415,7 +418,7 @@ export interface AstroUserConfig {
      * ```js
      * {
      *   // Example: Use the function syntax to customize based on command
-     *   server: (command) => ({port: command === 'dev' ? 3000 : 4000})
+     *   server: (command) => ({ port: command === 'dev' ? 3000 : 4000 })
      * }
      * ```
      */
@@ -426,10 +429,10 @@ export interface AstroUserConfig {
      * @default `false`
      * @version 0.24.0
      * @description
-     * Set which network IP addresses the dev server should listen on (i.e. 	non-localhost IPs).
+     * Set which network IP addresses the server should listen on (i.e. non-localhost IPs).
      * - `false` - do not expose on a network IP address
      * - `true` - listen on all addresses, including LAN and public addresses
-     * - `[custom-address]` - expose on a network IP address at `[custom-address]`
+     * - `[custom-address]` - expose on a network IP address at `[custom-address]` (ex: `192.168.0.1`)
      */
     /**
      * @docs
@@ -437,9 +440,15 @@ export interface AstroUserConfig {
      * @type {number}
      * @default `3000`
      * @description
-     * Set which port the dev server should listen on.
+     * Set which port the server should listen on.
      *
      * If the given port is already in use, Astro will automatically try the next available port.
+     *
+     * ```js
+     * {
+     *   server: { port: 8080 }
+     * }
+     * ```
      */
     server?: ServerConfig | ((options: {
         command: 'dev' | 'preview';
@@ -521,7 +530,7 @@ export interface AstroUserConfig {
          * {
          *   markdown: {
          *     // Example: The default set of remark plugins used by Astro
-         *     remarkPlugins: ['remark-code-titles', ['rehype-autolink-headings', { behavior: 'prepend' }]],
+         *     remarkPlugins: ['remark-gfm', 'remark-smartypants'],
          *   },
          * };
          * ```
@@ -540,7 +549,7 @@ export interface AstroUserConfig {
          * {
          *   markdown: {
          *     // Example: The default set of rehype plugins used by Astro
-         *     rehypePlugins: ['rehype-slug', ['rehype-toc', { headings: ['h2', 'h3'] }], [addClasses, { 'h1,h2,h3': 'title' }]],
+         *     rehypePlugins: [],
          *   },
          * };
          * ```
@@ -607,9 +616,7 @@ export interface AstroUserConfig {
      * }
      * ```
      */
-    vite?: vite.UserConfig & {
-        ssr?: vite.SSROptions;
-    };
+    vite?: ViteUserConfig;
     experimental?: {
         /**
          * Enable support for 3rd-party integrations.
@@ -695,8 +702,8 @@ export declare type GetHydrateCallback = () => Promise<(element: Element, innerH
  * getStaticPaths() options
  * Docs: https://docs.astro.build/reference/api-reference/#getstaticpaths
  */ export interface GetStaticPathsOptions {
-    paginate?: PaginateFunction;
-    rss?: (...args: any[]) => any;
+    paginate: PaginateFunction;
+    rss: (...args: any[]) => any;
 }
 export declare type GetStaticPathsItem = {
     params: Params;
@@ -794,16 +801,9 @@ export interface APIContext {
 export interface EndpointOutput<Output extends Body = Body> {
     body: Output;
 }
-interface APIRoute {
-    (context: APIContext): EndpointOutput | Response;
-    /**
-     * @deprecated
-     * Use { context: APIRouteContext } object instead.
-     */
-    (params: Params, request: Request): EndpointOutput | Response;
-}
+export declare type APIRoute = (context: APIContext) => EndpointOutput | Response;
 export interface EndpointHandler {
-    [method: string]: APIRoute;
+    [method: string]: APIRoute | ((params: Params, request: Request) => EndpointOutput | Response);
 }
 export interface AstroRenderer {
     /** Name of the renderer. */
@@ -886,6 +886,9 @@ export interface RouteData {
 export declare type SerializedRouteData = Omit<RouteData, 'generate' | 'pattern'> & {
     generate: undefined;
     pattern: string;
+    _meta: {
+        trailingSlash: AstroConfig['trailingSlash'];
+    };
 };
 export declare type RuntimeMode = 'development' | 'production';
 /**

package/dist/types/core/add/consts.d.ts

@@ -8,4 +8,4 @@ export declare const FIRST_PARTY_ADDONS: {
 }[];
 export declare const ALIASES: Map<string, string>;
 export declare const CONFIG_STUB = "import { defineConfig } from 'astro/config';\n\nexport default defineConfig({});";
-export declare const TAILWIND_CONFIG_STUB = "module.exports = {\n\tcontent: ['./src/**/*.{astro,html,js,jsx,svelte,ts,tsx,vue}'],\n\ttheme: {\n\t\textend: {},\n\t},\n\tplugins: [],\n}\n";
+export declare const TAILWIND_CONFIG_STUB = "module.exports = {\n\tcontent: ['./src/**/*.{astro,html,js,jsx,md,svelte,ts,tsx,vue}'],\n\ttheme: {\n\t\textend: {},\n\t},\n\tplugins: [],\n}\n";

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

@@ -5,7 +5,10 @@ export interface RouteInfo {
     routeData: RouteData;
     file: string;
     links: string[];
-    scripts: string[];
+    scripts: Array<string | {
+        children: string;
+        stage: string;
+    }>;
 }
 export declare type SerializedRouteInfo = Omit<RouteInfo, 'routeData'> & {
     routeData: SerializedRouteData;

package/dist/types/core/build/internal.d.ts

@@ -1,4 +1,3 @@
-import type { AstroConfig } from '../../@types/astro';
 import type { RenderedChunk } from 'rollup';
 import type { PageBuildData, ViteID } from './types';
 export interface BuildInternals {
@@ -27,7 +26,7 @@ export declare function trackPageData(internals: BuildInternals, component: stri
 /**
  * Tracks client-only components to the pages they are associated with.
  */
-export declare function trackClientOnlyPageDatas(internals: BuildInternals, pageData: PageBuildData, clientOnlys: string[], astroConfig: AstroConfig): void;
+export declare function trackClientOnlyPageDatas(internals: BuildInternals, pageData: PageBuildData, clientOnlys: string[]): void;
 export declare function getPageDatasByChunk(internals: BuildInternals, chunk: RenderedChunk): Generator<PageBuildData, void, unknown>;
 export declare function getPageDatasByClientOnlyChunk(internals: BuildInternals, chunk: RenderedChunk): Generator<PageBuildData, void, unknown>;
 export declare function getPageDataByComponent(internals: BuildInternals, component: string): PageBuildData | undefined;

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

@@ -0,0 +1,34 @@
+import type { ComponentPreload } from '../render/dev/index';
+import type { AstroConfig, BuildConfig, ManifestData, RouteData, ComponentInstance, SSRLoadedRenderer } from '../../@types/astro';
+import type { LogOptions } from '../logger/core';
+import type { RouteCache } from '../render/route-cache';
+import type { ViteConfigWithSSR } from '../create-vite';
+export declare type ComponentPath = string;
+export declare type ViteID = string;
+export interface PageBuildData {
+    component: ComponentPath;
+    paths: string[];
+    preload: ComponentPreload;
+    route: RouteData;
+    moduleSpecifier: string;
+    css: Set<string>;
+    hoistedScript: string | undefined;
+    scripts: Set<string>;
+}
+export declare type AllPagesData = Record<ComponentPath, PageBuildData>;
+/** Options for the static build */
+export interface StaticBuildOptions {
+    allPages: AllPagesData;
+    astroConfig: AstroConfig;
+    buildConfig: BuildConfig;
+    logging: LogOptions;
+    manifest: ManifestData;
+    origin: string;
+    pageNames: string[];
+    routeCache: RouteCache;
+    viteConfig: ViteConfigWithSSR;
+}
+export interface SingleFileBuiltModule {
+    pageMap: Map<ComponentPath, ComponentInstance>;
+    renderers: SSRLoadedRenderer[];
+}

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

@@ -1,4 +1,4 @@
-import type { AstroConfig, AstroUserConfig, CLIFlags } from '../@types/astro';
+import type { AstroConfig, AstroUserConfig, CLIFlags, ViteUserConfig } 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';
@@ -125,7 +125,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         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>>;
+    vite: z.ZodDefault<z.ZodType<ViteUserConfig, z.ZodTypeDef, ViteUserConfig>>;
     experimental: z.ZodDefault<z.ZodOptional<z.ZodObject<{
         ssr: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         integrations: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
@@ -142,13 +142,12 @@ export declare const AstroConfigSchema: z.ZodObject<{
         hooks: {};
     } | undefined;
     site?: string | undefined;
-    vite?: any;
     root: URL;
     srcDir: URL;
     publicDir: URL;
     outDir: URL;
     base: string;
-    trailingSlash: "always" | "never" | "ignore";
+    trailingSlash: "never" | "always" | "ignore";
     build: {
         format: "file" | "directory";
     };
@@ -178,6 +177,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         remarkPlugins: (string | [string, any] | RemarkPlugin<any[]> | [RemarkPlugin<any[]>, any])[];
         rehypePlugins: (string | [string, any] | RehypePlugin<any[]> | [RehypePlugin<any[]>, any])[];
     };
+    vite: ViteUserConfig;
     experimental: {
         integrations: boolean;
         ssr: boolean;
@@ -193,7 +193,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
     outDir?: string | undefined;
     site?: string | undefined;
     base?: string | undefined;
-    trailingSlash?: "always" | "never" | "ignore" | undefined;
+    trailingSlash?: "never" | "always" | "ignore" | undefined;
     build?: {
         format?: "file" | "directory" | undefined;
     } | undefined;
@@ -223,7 +223,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         remarkPlugins?: (string | [string, any] | RemarkPlugin<any[]> | [RemarkPlugin<any[]>, any])[] | undefined;
         rehypePlugins?: (string | [string, any] | RehypePlugin<any[]> | [RehypePlugin<any[]>, any])[] | undefined;
     } | undefined;
-    vite?: any;
+    vite?: ViteUserConfig | undefined;
     experimental?: {
         integrations?: boolean | undefined;
         ssr?: boolean | undefined;
@@ -243,7 +243,18 @@ interface LoadConfigOptions {
  * instead of the resolved config
  */
 export declare function resolveConfigURL(configOptions: Pick<LoadConfigOptions, 'cwd' | 'flags'>): Promise<URL | undefined>;
-/** Attempt to load an `astro.config.mjs` file */
+interface OpenConfigResult {
+    userConfig: AstroUserConfig;
+    astroConfig: AstroConfig;
+    flags: CLIFlags;
+    root: string;
+}
+/** Load a configuration file, returning both the userConfig and astroConfig */
+export declare function openConfig(configOptions: LoadConfigOptions): Promise<OpenConfigResult>;
+/**
+ * Attempt to load an `astro.config.mjs` file
+ * @deprecated
+ */
 export declare function loadConfig(configOptions: LoadConfigOptions): Promise<AstroConfig>;
 /** Attempt to resolve an Astro configuration object. Normalize, validate, and return. */
 export declare function resolveConfig(userConfig: AstroUserConfig, root: string, flags: CLIFlags | undefined, cmd: string): Promise<AstroConfig>;

package/dist/types/core/dev/index.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 import type { AddressInfo } from 'net';
 import type { AstroTelemetry } from '@astrojs/telemetry';
+import * as vite from 'vite';
 import type { AstroConfig } from '../../@types/astro';
 import { LogOptions } from '../logger/core.js';
 export interface DevOptions {
@@ -9,6 +10,7 @@ export interface DevOptions {
 }
 export interface DevServer {
     address: AddressInfo;
+    watcher: vite.FSWatcher;
     stop(): Promise<void>;
 }
 /** `astro dev` */

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

@@ -3,6 +3,7 @@ export interface ErrorWithMetadata {
     [name: string]: any;
     message: string;
     stack: string;
+    hint?: string;
     id?: string;
     frame?: string;
     plugin?: string;

package/dist/types/core/routing/manifest/generator.d.ts

@@ -0,0 +1,2 @@
+import type { AstroConfig, RoutePart } from '../../../@types/astro';
+export declare function getRouteGenerator(segments: RoutePart[][], addTrailingSlash: AstroConfig['trailingSlash']): import("path-to-regexp").PathFunction<object>;

package/dist/types/core/routing/manifest/serialization.d.ts

@@ -1,3 +1,3 @@
-import type { RouteData, SerializedRouteData } from '../../../@types/astro';
-export declare function serializeRouteData(routeData: RouteData): SerializedRouteData;
+import type { RouteData, SerializedRouteData, AstroConfig } from '../../../@types/astro';
+export declare function serializeRouteData(routeData: RouteData, trailingSlash: AstroConfig['trailingSlash']): SerializedRouteData;
 export declare function deserializeRouteData(rawRouteData: SerializedRouteData): RouteData;

package/dist/types/vite-plugin-astro/compile.d.ts

@@ -4,9 +4,15 @@ import type { TransformHook } from './styles';
 declare type CompileResult = TransformResult & {
     rawCSSDeps: Set<string>;
 };
+interface CompileProps {
+    config: AstroConfig;
+    filename: string;
+    moduleId: string;
+    source: string;
+    ssr: boolean;
+    viteTransform: TransformHook;
+}
 export declare function isCached(config: AstroConfig, filename: string): boolean;
 export declare function invalidateCompilation(config: AstroConfig, filename: string): void;
-export declare function cachedCompilation(config: AstroConfig, filename: string, source: string, viteTransform: TransformHook, opts: {
-    ssr: boolean;
-}): Promise<CompileResult>;
+export declare function cachedCompilation(props: CompileProps): Promise<CompileResult>;
 export {};

package/dist/vite-plugin-astro/compile.js

@@ -10,14 +10,20 @@ function safelyReplaceImportPlaceholder(code) {
   return code.replace(/\/\*IMPORT\:(.*?)\*\//g, `@import '$1';`);
 }
 const configCache = /* @__PURE__ */ new WeakMap();
-async function compile(config, filename, source, viteTransform, opts) {
+async function compile({
+  config,
+  filename,
+  moduleId,
+  source,
+  ssr,
+  viteTransform
+}) {
   const filenameURL = new URL(`file://${filename}`);
   const normalizedID = fileURLToPath(filenameURL);
-  const pathname = filenameURL.pathname.slice(config.root.pathname.length - 1);
   let rawCSSDeps = /* @__PURE__ */ new Set();
   let cssTransformError;
   const transformResult = await transform(source, {
-    pathname,
+    pathname: `/@fs${prependForwardSlash(moduleId)}`,
     projectRoot: config.root.toString(),
     site: config.site ? new URL(config.base, config.site).toString() : void 0,
     sourcefile: filename,
@@ -40,7 +46,7 @@ async function compile(config, filename, source, viteTransform, opts) {
           lang,
           id: normalizedID,
           transformHook: viteTransform,
-          ssr: opts.ssr
+          ssr
         });
         let map;
         if (!result)
@@ -78,7 +84,8 @@ function invalidateCompilation(config, filename) {
     cache.delete(filename);
   }
 }
-async function cachedCompilation(config, filename, source, viteTransform, opts) {
+async function cachedCompilation(props) {
+  const { config, filename } = props;
   let cache;
   if (!configCache.has(config)) {
     cache = /* @__PURE__ */ new Map();
@@ -89,7 +96,7 @@ async function cachedCompilation(config, filename, source, viteTransform, opts)
   if (cache.has(filename)) {
     return cache.get(filename);
   }
-  const compileResult = await compile(config, filename, source, viteTransform, opts);
+  const compileResult = await compile(props);
   cache.set(filename, compileResult);
   return compileResult;
 }

package/dist/vite-plugin-astro/hmr.js

@@ -22,7 +22,7 @@ async function trackCSSDependencies(opts) {
   }
 }
 async function handleHotUpdate(ctx, config, logging) {
-  var _a;
+  var _a, _b;
   invalidateCompilation(config, ctx.file);
   const filtered = new Set(ctx.modules);
   const files = /* @__PURE__ */ new Set();
@@ -46,6 +46,13 @@ async function handleHotUpdate(ctx, config, logging) {
     invalidateCompilation(config, file2);
   }
   const mods = ctx.modules.filter((m) => !m.url.endsWith("="));
+  for (const mod of mods) {
+    for (const imp of mod.importedModules) {
+      if ((_b = imp.id) == null ? void 0 : _b.includes("?astro&type=script")) {
+        mods.push(imp);
+      }
+    }
+  }
   const isSelfAccepting = mods.every((m) => m.isSelfAccepting || m.url.endsWith(".svelte"));
   const file = ctx.file.replace(config.root.pathname, "/");
   if (isSelfAccepting) {

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

@@ -75,14 +75,20 @@ function astro({ config, logging }) {
         source += `
 <script src="${PAGE_SCRIPT_ID}" />`;
       }
+      const compileProps = {
+        config,
+        filename,
+        moduleId: id,
+        source,
+        ssr: Boolean(opts == null ? void 0 : opts.ssr),
+        viteTransform
+      };
       if (query.astro) {
         if (query.type === "style") {
           if (typeof query.index === "undefined") {
             throw new Error(`Requests for Astro CSS must include an index.`);
           }
-          const transformResult = await cachedCompilation(config, filename, source, viteTransform, {
-            ssr: Boolean(opts == null ? void 0 : opts.ssr)
-          });
+          const transformResult = await cachedCompilation(compileProps);
           await trackCSSDependencies.call(this, {
             viteDevServer,
             id,
@@ -98,9 +104,12 @@ function astro({ config, logging }) {
           if (typeof query.index === "undefined") {
             throw new Error(`Requests for hoisted scripts must include an index`);
           }
-          const transformResult = await cachedCompilation(config, filename, source, viteTransform, {
-            ssr: Boolean(opts == null ? void 0 : opts.ssr)
-          });
+          if (opts == null ? void 0 : opts.ssr) {
+            return {
+              code: `/* client hoisted script, empty in SSR: ${id} */`
+            };
+          }
+          const transformResult = await cachedCompilation(compileProps);
           const scripts = transformResult.scripts;
           const hoistedScript = scripts[query.index];
           if (!hoistedScript) {
@@ -123,9 +132,7 @@ File: ${filename}`);
         }
       }
       try {
-        const transformResult = await cachedCompilation(config, filename, source, viteTransform, {
-          ssr: Boolean(opts == null ? void 0 : opts.ssr)
-        });
+        const transformResult = await cachedCompilation(compileProps);
         const { code, map } = await esbuild.transform(transformResult.code, {
           loader: "ts",
           sourcemap: "external",
@@ -141,6 +148,12 @@ File: ${filename}`);
           while (match = (_b = pattern.exec(metadata)) == null ? void 0 : _b[1]) {
             deps.add(match);
           }
+          let i = 0;
+          while (i < transformResult.scripts.length) {
+            deps.add(`${id}?astro&type=script&index=${i}`);
+            SUFFIX += `import "${id}?astro&type=script&index=${i}";`;
+            i++;
+          }
           SUFFIX += `
 if (import.meta.hot) {
 						import.meta.hot.accept(mod => mod);
@@ -200,7 +213,7 @@ import "${PAGE_SSR_SCRIPT_ID}";`;
     async handleHotUpdate(context) {
       if (context.server.config.isProduction)
         return;
-      return handleHotUpdate(context, config, logging);
+      return handleHotUpdate.call(this, context, config, logging);
     }
   };
 }

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

@@ -1,4 +1,5 @@
 import { info, warn, error } from "../core/logger/core.js";
+import { appendForwardSlash } from "../core/path.js";
 import { getParamsAndProps, GetParamsAndPropsError } from "../core/render/core.js";
 import { createRouteManifest, matchRoute } from "../core/routing/index.js";
 import stripAnsi from "strip-ansi";
@@ -116,7 +117,7 @@ async function handle500Response(viteServer, origin, req, res, err) {
 }
 function getCustom404Route(config, manifest) {
   const relPages = resolvePages(config).href.replace(config.root.href, "");
-  return manifest.routes.find((r) => r.component === relPages + "404.astro");
+  return manifest.routes.find((r) => r.component === appendForwardSlash(relPages) + "404.astro");
 }
 function log404(logging, pathname) {
   info(logging, "serve", msg.req({ url: pathname, statusCode: 404 }));
@@ -234,7 +235,6 @@ async function handleRequest(routeCache, viteServer, logging, manifest, config,
       return await writeSSRResult(result, res, statusCode);
     }
   } catch (_err) {
-    debugger;
     const err = fixViteErrorMessage(createSafeError(_err), viteServer);
     error(logging, null, msg.formatErrorMessage(err));
     handle500Response(viteServer, origin, req, res, err);

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

@@ -8,8 +8,6 @@ function getPrivateEnv(viteConfig, astroConfig) {
   }
   const fullEnv = loadEnv(viteConfig.mode, viteConfig.envDir ?? fileURLToPath(astroConfig.root), "");
   const privateKeys = Object.keys(fullEnv).filter((key) => {
-    if (typeof process.env[key] !== "undefined")
-      return false;
     for (const envPrefix of envPrefixes) {
       if (key.startsWith(envPrefix))
         return false;
@@ -19,7 +17,11 @@ function getPrivateEnv(viteConfig, astroConfig) {
   if (privateKeys.length === 0) {
     return null;
   }
-  return Object.fromEntries(privateKeys.map((key) => [key, JSON.stringify(fullEnv[key])]));
+  return Object.fromEntries(privateKeys.map((key) => {
+    if (typeof process.env[key] !== "undefined")
+      return [key, `process.env.${key}`];
+    return [key, JSON.stringify(fullEnv[key])];
+  }));
 }
 function getReferencedPrivateKeys(source, privateEnv) {
   const references = /* @__PURE__ */ new Set();

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

@@ -35,8 +35,8 @@ import matter from "gray-matter";
 import { fileURLToPath } from "url";
 import { PAGE_SSR_SCRIPT_ID } from "../vite-plugin-scripts/index.js";
 import { pagesVirtualModuleId } from "../core/app/index.js";
-import { appendForwardSlash } from "../core/path.js";
-import { resolvePages } from "../core/util.js";
+import { appendForwardSlash, prependForwardSlash } from "../core/path.js";
+import { resolvePages, viteID } from "../core/util.js";
 const MARKDOWN_IMPORT_FLAG = "?mdImport";
 const MARKDOWN_CONTENT_FLAG = "?content";
 function markdown({ config }) {
@@ -147,7 +147,7 @@ ${astroResult}`;
           site: config.site ? new URL(config.base, config.site).toString() : void 0,
           sourcefile: id,
           sourcemap: "inline",
-          internalURL: `/@fs${new URL("../runtime/server/index.js", import.meta.url).pathname}`
+          internalURL: `/@fs${prependForwardSlash(viteID(new URL("../runtime/server/index.js", import.meta.url)))}`
         });
         tsResult = `
 export const metadata = ${JSON.stringify(metadata)};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.0.0-beta.26",
+  "version": "1.0.0-beta.29",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -70,23 +70,23 @@
     "@astrojs/language-server": "^0.13.4",
     "@astrojs/markdown-remark": "^0.9.4",
     "@astrojs/prism": "0.4.1",
-    "@astrojs/telemetry": "^0.1.1",
+    "@astrojs/telemetry": "^0.1.2",
     "@astrojs/webapi": "^0.11.1",
-    "@babel/core": "^7.17.9",
-    "@babel/generator": "^7.17.9",
-    "@babel/parser": "^7.17.9",
-    "@babel/traverse": "^7.17.9",
+    "@babel/core": "^7.17.12",
+    "@babel/generator": "^7.17.12",
+    "@babel/parser": "^7.17.12",
+    "@babel/traverse": "^7.17.12",
     "@proload/core": "^0.3.2",
     "@proload/plugin-tsm": "^0.2.1",
     "ast-types": "^0.14.2",
     "boxen": "^6.2.1",
-    "ci-info": "^3.3.0",
+    "ci-info": "^3.3.1",
     "common-ancestor-path": "^1.0.1",
     "debug": "^4.3.4",
     "diff": "^5.0.0",
     "eol": "^0.9.1",
     "es-module-lexer": "^0.10.5",
-    "esbuild": "^0.14.38",
+    "esbuild": "^0.14.39",
     "estree-walker": "^3.0.1",
     "execa": "^6.1.0",
     "fast-glob": "^3.2.11",
@@ -101,15 +101,15 @@
     "mime": "^3.0.0",
     "ora": "^6.1.0",
     "path-browserify": "^1.0.1",
-    "path-to-regexp": "^6.2.0",
-    "postcss": "^8.4.12",
+    "path-to-regexp": "^6.2.1",
+    "postcss": "^8.4.13",
     "postcss-load-config": "^3.1.4",
     "preferred-pm": "^3.0.3",
     "prismjs": "^1.28.0",
     "prompts": "^2.4.2",
     "recast": "^0.20.5",
     "resolve": "^1.22.0",
-    "rollup": "^2.70.2",
+    "rollup": "^2.73.0",
     "semver": "^7.3.7",
     "serialize-javascript": "^6.0.0",
     "shiki": "^0.10.1",
@@ -120,15 +120,16 @@
     "strip-ansi": "^7.0.1",
     "supports-esm": "^1.0.0",
     "tsconfig-resolver": "^3.0.1",
-    "vite": "^2.9.5",
+    "vite": "^2.9.9",
     "yargs-parser": "^21.0.1",
-    "zod": "^3.14.4"
+    "zod": "^3.16.0"
   },
   "devDependencies": {
-    "@babel/types": "^7.17.0",
+    "@babel/types": "^7.17.12",
+    "@playwright/test": "^1.22.1",
     "@types/babel__core": "^7.1.19",
     "@types/babel__generator": "^7.6.4",
-    "@types/babel__traverse": "^7.17.0",
+    "@types/babel__traverse": "^7.17.1",
     "@types/chai": "^4.3.1",
     "@types/common-ancestor-path": "^1.0.0",
     "@types/connect": "^3.4.35",
@@ -140,7 +141,7 @@
     "@types/mocha": "^9.1.1",
     "@types/parse5": "^6.0.3",
     "@types/path-browserify": "^1.0.0",
-    "@types/prettier": "^2.6.0",
+    "@types/prettier": "^2.6.1",
     "@types/resolve": "^1.20.2",
     "@types/rimraf": "^3.0.2",
     "@types/send": "^0.17.1",
@@ -150,7 +151,7 @@
     "chai": "^4.3.6",
     "cheerio": "^1.0.0-rc.10",
     "mocha": "^9.2.2",
-    "sass": "^1.50.1",
+    "sass": "^1.51.0",
     "srcset-parse": "^1.1.0"
   },
   "engines": {
@@ -164,6 +165,7 @@
     "postbuild": "astro-scripts copy \"src/**/*.astro\"",
     "benchmark": "node test/benchmark/dev.bench.js && node test/benchmark/build.bench.js",
     "test": "mocha --exit --timeout 20000 --ignore **/lit-element.test.js && mocha --timeout 20000 **/lit-element.test.js",
-    "test:match": "mocha --timeout 20000 -g"
+    "test:match": "mocha --timeout 20000 -g",
+    "test:e2e": "playwright test e2e"
   }
 }