astro 1.2.3 → 1.2.5

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

@@ -3,6 +3,7 @@
 import type { MarkdownHeading, MarkdownMetadata, MarkdownRenderingResult, RehypePlugins, RemarkPlugins, RemarkRehype, ShikiConfig } from '@astrojs/markdown-remark';
 import type * as babel from '@babel/core';
 import type { AddressInfo } from 'net';
+import type { TsConfigJson } from 'tsconfig-resolver';
 import type * as vite from 'vite';
 import { z } from 'zod';
 import type { SerializedSSRManifest } from '../core/app/types';
@@ -803,6 +804,8 @@ export interface InjectedRoute {
 export interface AstroConfig extends z.output<typeof AstroConfigSchema> {
     integrations: AstroIntegration[];
     _ctx: {
+        tsConfig: TsConfigJson | undefined;
+        tsConfigPath: string | undefined;
         pageExtensions: string[];
         injectedRoutes: InjectedRoute[];
         adapter: AstroAdapter | undefined;

package/dist/core/app/index.js

@@ -156,7 +156,15 @@ renderPage_fn = async function(request, routeData, mod, status = 200) {
           throw new Error(`Unable to resolve [${specifier}]`);
         }
         const bundlePath = manifest.entryModules[specifier];
-        return bundlePath.startsWith("data:") ? bundlePath : prependForwardSlash(joinPaths(manifest.base, bundlePath));
+        switch (true) {
+          case bundlePath.startsWith("data:"):
+          case bundlePath.length === 0: {
+            return bundlePath;
+          }
+          default: {
+            return prependForwardSlash(joinPaths(manifest.base, bundlePath));
+          }
+        }
       },
       route: routeData,
       routeCache: __privateGet(this, _routeCache),
@@ -190,6 +198,13 @@ callEndpoint_fn = async function(request, routeData, mod, status = 200) {
     status
   });
   if (result.type === "response") {
+    if (result.response.headers.get("X-Astro-Response") === "Not-Found") {
+      const fourOhFourRequest = new Request(new URL("/404", request.url));
+      const fourOhFourRouteData = this.match(fourOhFourRequest);
+      if (fourOhFourRouteData) {
+        return this.render(fourOhFourRequest, fourOhFourRouteData);
+      }
+    }
     return result.response;
   } else {
     const body = result.body;

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

@@ -1,3 +1,9 @@
 import type { AstroConfig, RouteType } from '../../@types/astro';
 export declare function getOutFolder(astroConfig: AstroConfig, pathname: string, routeType: RouteType): URL;
 export declare function getOutFile(astroConfig: AstroConfig, outFolder: URL, pathname: string, routeType: RouteType): URL;
+/**
+ * Ensures the `outDir` is within `process.cwd()`. If not it will fallback to `<cwd>/.astro`.
+ * This is used for static `ssrBuild` so the output can access node_modules when we import
+ * the output files. A hardcoded fallback dir is fine as it would be cleaned up after build.
+ */
+export declare function getOutDirWithinCwd(outDir: URL): URL;

package/dist/core/build/common.js

@@ -1,6 +1,8 @@
 import npath from "path";
+import { fileURLToPath, pathToFileURL } from "url";
 import { appendForwardSlash } from "../../core/path.js";
 const STATUS_CODE_PAGES = /* @__PURE__ */ new Set(["/404", "/500"]);
+const FALLBACK_OUT_DIR_NAME = "./.astro/";
 function getOutRoot(astroConfig) {
   return new URL("./", astroConfig.outDir);
 }
@@ -43,7 +45,15 @@ function getOutFile(astroConfig, outFolder, pathname, routeType) {
       }
   }
 }
+function getOutDirWithinCwd(outDir) {
+  if (fileURLToPath(outDir).startsWith(process.cwd())) {
+    return outDir;
+  } else {
+    return new URL(FALLBACK_OUT_DIR_NAME, pathToFileURL(process.cwd() + npath.sep));
+  }
+}
 export {
+  getOutDirWithinCwd,
   getOutFile,
   getOutFolder
 };

package/dist/core/build/generate.js

@@ -18,7 +18,7 @@ import { createLinkStylesheetElementSet, createModuleScriptsSet } from "../rende
 import { createRequest } from "../request.js";
 import { matchRoute } from "../routing/match.js";
 import { getOutputFilename } from "../util.js";
-import { getOutFile, getOutFolder } from "./common.js";
+import { getOutDirWithinCwd, getOutFile, getOutFolder } from "./common.js";
 import { eachPageData, getPageDataByComponent, sortedCSS } from "./internal.js";
 import { getTimeStat } from "./util.js";
 const MAX_CONCURRENT_RENDERS = 1;
@@ -65,7 +65,7 @@ async function generatePages(opts, internals) {
 ${bgGreen(black(" generating static routes "))}`);
   const ssr = opts.astroConfig.output === "server";
   const serverEntry = opts.buildConfig.serverEntry;
-  const outFolder = ssr ? opts.buildConfig.server : opts.astroConfig.outDir;
+  const outFolder = ssr ? opts.buildConfig.server : getOutDirWithinCwd(opts.astroConfig.outDir);
   const ssrEntryURL = new URL("./" + serverEntry + `?time=${Date.now()}`, outFolder);
   const ssrEntry = await import(ssrEntryURL.toString());
   const builtPaths = /* @__PURE__ */ new Set();
@@ -246,7 +246,7 @@ async function generatePath(pathname, opts, gopts) {
       const hashedFilePath = internals.entrySpecifierToBundleMap.get(specifier);
       if (typeof hashedFilePath !== "string") {
         if (specifier === BEFORE_HYDRATION_SCRIPT_ID) {
-          return "data:text/javascript;charset=utf-8,//[no before-hydration script]";
+          return "";
         }
         throw new Error(`Cannot find the built path for ${specifier}`);
       }

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

@@ -9,6 +9,7 @@ import { emptyDir, isModeServerWithNoAdapter, removeDir } from "../../core/util.
 import { runHookBuildSetup } from "../../integrations/index.js";
 import { PAGE_SCRIPT_ID } from "../../vite-plugin-scripts/index.js";
 import { info } from "../logger/core.js";
+import { getOutDirWithinCwd } from "./common.js";
 import { generatePages } from "./generate.js";
 import { trackPageData } from "./internal.js";
 import { getTimeStat } from "./util.js";
@@ -78,7 +79,7 @@ async function ssrBuild(opts, internals, input) {
   var _a, _b, _c;
   const { astroConfig, viteConfig } = opts;
   const ssr = astroConfig.output === "server";
-  const out = ssr ? opts.buildConfig.server : astroConfig.outDir;
+  const out = ssr ? opts.buildConfig.server : getOutDirWithinCwd(astroConfig.outDir);
   const viteBuildConfig = {
     ...viteConfig,
     logLevel: opts.viteConfig.logLevel ?? "error",
@@ -195,12 +196,17 @@ ${bgGreen(black(" building client "))}`);
   return buildResult;
 }
 async function cleanSsrOutput(opts) {
+  const out = getOutDirWithinCwd(opts.astroConfig.outDir);
+  if (out.toString() !== opts.astroConfig.outDir.toString()) {
+    await fs.promises.rm(out, { recursive: true });
+    return;
+  }
   const files = await glob("**/*.mjs", {
-    cwd: fileURLToPath(opts.astroConfig.outDir)
+    cwd: fileURLToPath(out)
   });
   await Promise.all(
     files.map(async (filename) => {
-      const url = new URL(filename, opts.astroConfig.outDir);
+      const url = new URL(filename, out);
       await fs.promises.rm(url);
     })
   );

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

@@ -119,7 +119,7 @@ function buildManifest(opts, internals, staticFiles) {
     });
   }
   if (!(BEFORE_HYDRATION_SCRIPT_ID in entryModules)) {
-    entryModules[BEFORE_HYDRATION_SCRIPT_ID] = "data:text/javascript;charset=utf-8,//[no before-hydration script]";
+    entryModules[BEFORE_HYDRATION_SCRIPT_ID] = "";
   }
   const ssrManifest = {
     adapterName: opts.astroConfig._ctx.adapter.name,

package/dist/core/config.js

@@ -5,6 +5,7 @@ import * as colors from "kleur/colors";
 import path from "path";
 import postcssrc from "postcss-load-config";
 import { BUNDLED_THEMES } from "shiki";
+import * as tsr from "tsconfig-resolver";
 import { fileURLToPath, pathToFileURL } from "url";
 import * as vite from "vite";
 import { mergeConfig as mergeViteConfig } from "vite";
@@ -203,10 +204,13 @@ See https://astro.build/config for more information.`
       )
     }).optional().default({})
   });
+  const tsconfig = loadTSConfig(root);
   const result = {
     ...await AstroConfigRelativeSchema.parseAsync(userConfig),
     _ctx: {
       pageExtensions: [".astro", ".md", ".html"],
+      tsConfig: tsconfig == null ? void 0 : tsconfig.config,
+      tsConfigPath: tsconfig == null ? void 0 : tsconfig.path,
       scripts: [],
       renderers: [jsxRenderer],
       injectedRoutes: [],
@@ -346,6 +350,15 @@ async function tryLoadConfig(configOptions, flags, root) {
     await finallyCleanup();
   }
 }
+function loadTSConfig(cwd) {
+  for (const searchName of ["tsconfig.json", "jsconfig.json"]) {
+    const config = tsr.tsconfigResolverSync({ cwd, searchName });
+    if (config.exists) {
+      return config;
+    }
+  }
+  return void 0;
+}
 async function loadConfig(configOptions) {
   const root = resolveRoot(configOptions.cwd);
   const flags = resolveFlags(configOptions.flags || {});

package/dist/core/dev/index.js

@@ -48,7 +48,7 @@ async function dev(config, options) {
       isRestart
     })
   );
-  const currentVersion = "1.2.3";
+  const currentVersion = "1.2.5";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

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

package/dist/core/util.js

@@ -5,7 +5,7 @@ import resolve from "resolve";
 import slash from "slash";
 import { fileURLToPath, pathToFileURL } from "url";
 import { prependForwardSlash, removeTrailingForwardSlash } from "./path.js";
-const ASTRO_VERSION = "1.2.3";
+const ASTRO_VERSION = "1.2.5";
 function isObject(value) {
   return typeof value === "object" && value != null;
 }

package/dist/runtime/server/astro-global.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "1.2.3";
+const ASTRO_VERSION = "1.2.5";
 function createDeprecatedFetchContentFn() {
   return () => {
     throw new Error("Deprecated: Astro.fetchContent() has been replaced with Astro.glob().");

package/dist/runtime/server/astro-island.js

@@ -63,7 +63,10 @@ var _a;
         }
         async childrenConnectedCallback() {
           window.addEventListener("astro:hydrate", this.hydrate);
-          await import(this.getAttribute("before-hydration-url"));
+          let beforeHydrationUrl = this.getAttribute("before-hydration-url");
+          if (beforeHydrationUrl) {
+            await import(beforeHydrationUrl);
+          }
           this.start();
         }
         start() {

package/dist/runtime/server/astro-island.prebuilt.d.ts

@@ -3,5 +3,5 @@
  * Do not edit this directly, but instead edit that file and rerun the prebuild
  * to generate this file.
  */
-declare const _default: "var l;{const c={0:t=>t,1:t=>JSON.parse(t,o),2:t=>new RegExp(t),3:t=>new Date(t),4:t=>new Map(JSON.parse(t,o)),5:t=>new Set(JSON.parse(t,o)),6:t=>BigInt(t),7:t=>new URL(t)},o=(t,i)=>{if(t===\"\"||!Array.isArray(i))return i;const[e,n]=i;return e in c?c[e](n):void 0};customElements.get(\"astro-island\")||customElements.define(\"astro-island\",(l=class extends HTMLElement{constructor(){super(...arguments);this.hydrate=()=>{if(!this.hydrator||this.parentElement&&this.parentElement.closest(\"astro-island[ssr]\"))return;const i=this.querySelectorAll(\"astro-slot\"),e={},n=this.querySelectorAll(\"template[data-astro-template]\");for(const s of n){const r=s.closest(this.tagName);!r||!r.isSameNode(this)||(e[s.getAttribute(\"data-astro-template\")||\"default\"]=s.innerHTML,s.remove())}for(const s of i){const r=s.closest(this.tagName);!r||!r.isSameNode(this)||(e[s.getAttribute(\"name\")||\"default\"]=s.innerHTML)}const a=this.hasAttribute(\"props\")?JSON.parse(this.getAttribute(\"props\"),o):{};this.hydrator(this)(this.Component,a,e,{client:this.getAttribute(\"client\")}),this.removeAttribute(\"ssr\"),window.removeEventListener(\"astro:hydrate\",this.hydrate),window.dispatchEvent(new CustomEvent(\"astro:hydrate\"))}}connectedCallback(){!this.hasAttribute(\"await-children\")||this.firstChild?this.childrenConnectedCallback():new MutationObserver((i,e)=>{e.disconnect(),this.childrenConnectedCallback()}).observe(this,{childList:!0})}async childrenConnectedCallback(){window.addEventListener(\"astro:hydrate\",this.hydrate),await import(this.getAttribute(\"before-hydration-url\")),this.start()}start(){const i=JSON.parse(this.getAttribute(\"opts\")),e=this.getAttribute(\"client\");if(Astro[e]===void 0){window.addEventListener(`astro:${e}`,()=>this.start(),{once:!0});return}Astro[e](async()=>{const n=this.getAttribute(\"renderer-url\"),[a,{default:s}]=await Promise.all([import(this.getAttribute(\"component-url\")),n?import(n):()=>()=>{}]),r=this.getAttribute(\"component-export\")||\"default\";if(!r.includes(\".\"))this.Component=a[r];else{this.Component=a;for(const d of r.split(\".\"))this.Component=this.Component[d]}return this.hydrator=s,this.hydrate},i,this)}attributeChangedCallback(){this.hydrator&&this.hydrate()}},l.observedAttributes=[\"props\"],l))}";
+declare const _default: "var l;{const c={0:t=>t,1:t=>JSON.parse(t,o),2:t=>new RegExp(t),3:t=>new Date(t),4:t=>new Map(JSON.parse(t,o)),5:t=>new Set(JSON.parse(t,o)),6:t=>BigInt(t),7:t=>new URL(t)},o=(t,s)=>{if(t===\"\"||!Array.isArray(s))return s;const[e,n]=s;return e in c?c[e](n):void 0};customElements.get(\"astro-island\")||customElements.define(\"astro-island\",(l=class extends HTMLElement{constructor(){super(...arguments);this.hydrate=()=>{if(!this.hydrator||this.parentElement&&this.parentElement.closest(\"astro-island[ssr]\"))return;const s=this.querySelectorAll(\"astro-slot\"),e={},n=this.querySelectorAll(\"template[data-astro-template]\");for(const r of n){const i=r.closest(this.tagName);!i||!i.isSameNode(this)||(e[r.getAttribute(\"data-astro-template\")||\"default\"]=r.innerHTML,r.remove())}for(const r of s){const i=r.closest(this.tagName);!i||!i.isSameNode(this)||(e[r.getAttribute(\"name\")||\"default\"]=r.innerHTML)}const a=this.hasAttribute(\"props\")?JSON.parse(this.getAttribute(\"props\"),o):{};this.hydrator(this)(this.Component,a,e,{client:this.getAttribute(\"client\")}),this.removeAttribute(\"ssr\"),window.removeEventListener(\"astro:hydrate\",this.hydrate),window.dispatchEvent(new CustomEvent(\"astro:hydrate\"))}}connectedCallback(){!this.hasAttribute(\"await-children\")||this.firstChild?this.childrenConnectedCallback():new MutationObserver((s,e)=>{e.disconnect(),this.childrenConnectedCallback()}).observe(this,{childList:!0})}async childrenConnectedCallback(){window.addEventListener(\"astro:hydrate\",this.hydrate);let s=this.getAttribute(\"before-hydration-url\");s&&await import(s),this.start()}start(){const s=JSON.parse(this.getAttribute(\"opts\")),e=this.getAttribute(\"client\");if(Astro[e]===void 0){window.addEventListener(`astro:${e}`,()=>this.start(),{once:!0});return}Astro[e](async()=>{const n=this.getAttribute(\"renderer-url\"),[a,{default:r}]=await Promise.all([import(this.getAttribute(\"component-url\")),n?import(n):()=>()=>{}]),i=this.getAttribute(\"component-export\")||\"default\";if(!i.includes(\".\"))this.Component=a[i];else{this.Component=a;for(const d of i.split(\".\"))this.Component=this.Component[d]}return this.hydrator=r,this.hydrate},s,this)}attributeChangedCallback(){this.hydrator&&this.hydrate()}},l.observedAttributes=[\"props\"],l))}";
 export default _default;

package/dist/runtime/server/astro-island.prebuilt.js

@@ -1,4 +1,4 @@
-var astro_island_prebuilt_default = `var l;{const c={0:t=>t,1:t=>JSON.parse(t,o),2:t=>new RegExp(t),3:t=>new Date(t),4:t=>new Map(JSON.parse(t,o)),5:t=>new Set(JSON.parse(t,o)),6:t=>BigInt(t),7:t=>new URL(t)},o=(t,i)=>{if(t===""||!Array.isArray(i))return i;const[e,n]=i;return e in c?c[e](n):void 0};customElements.get("astro-island")||customElements.define("astro-island",(l=class extends HTMLElement{constructor(){super(...arguments);this.hydrate=()=>{if(!this.hydrator||this.parentElement&&this.parentElement.closest("astro-island[ssr]"))return;const i=this.querySelectorAll("astro-slot"),e={},n=this.querySelectorAll("template[data-astro-template]");for(const s of n){const r=s.closest(this.tagName);!r||!r.isSameNode(this)||(e[s.getAttribute("data-astro-template")||"default"]=s.innerHTML,s.remove())}for(const s of i){const r=s.closest(this.tagName);!r||!r.isSameNode(this)||(e[s.getAttribute("name")||"default"]=s.innerHTML)}const a=this.hasAttribute("props")?JSON.parse(this.getAttribute("props"),o):{};this.hydrator(this)(this.Component,a,e,{client:this.getAttribute("client")}),this.removeAttribute("ssr"),window.removeEventListener("astro:hydrate",this.hydrate),window.dispatchEvent(new CustomEvent("astro:hydrate"))}}connectedCallback(){!this.hasAttribute("await-children")||this.firstChild?this.childrenConnectedCallback():new MutationObserver((i,e)=>{e.disconnect(),this.childrenConnectedCallback()}).observe(this,{childList:!0})}async childrenConnectedCallback(){window.addEventListener("astro:hydrate",this.hydrate),await import(this.getAttribute("before-hydration-url")),this.start()}start(){const i=JSON.parse(this.getAttribute("opts")),e=this.getAttribute("client");if(Astro[e]===void 0){window.addEventListener(\`astro:\${e}\`,()=>this.start(),{once:!0});return}Astro[e](async()=>{const n=this.getAttribute("renderer-url"),[a,{default:s}]=await Promise.all([import(this.getAttribute("component-url")),n?import(n):()=>()=>{}]),r=this.getAttribute("component-export")||"default";if(!r.includes("."))this.Component=a[r];else{this.Component=a;for(const d of r.split("."))this.Component=this.Component[d]}return this.hydrator=s,this.hydrate},i,this)}attributeChangedCallback(){this.hydrator&&this.hydrate()}},l.observedAttributes=["props"],l))}`;
+var astro_island_prebuilt_default = `var l;{const c={0:t=>t,1:t=>JSON.parse(t,o),2:t=>new RegExp(t),3:t=>new Date(t),4:t=>new Map(JSON.parse(t,o)),5:t=>new Set(JSON.parse(t,o)),6:t=>BigInt(t),7:t=>new URL(t)},o=(t,s)=>{if(t===""||!Array.isArray(s))return s;const[e,n]=s;return e in c?c[e](n):void 0};customElements.get("astro-island")||customElements.define("astro-island",(l=class extends HTMLElement{constructor(){super(...arguments);this.hydrate=()=>{if(!this.hydrator||this.parentElement&&this.parentElement.closest("astro-island[ssr]"))return;const s=this.querySelectorAll("astro-slot"),e={},n=this.querySelectorAll("template[data-astro-template]");for(const r of n){const i=r.closest(this.tagName);!i||!i.isSameNode(this)||(e[r.getAttribute("data-astro-template")||"default"]=r.innerHTML,r.remove())}for(const r of s){const i=r.closest(this.tagName);!i||!i.isSameNode(this)||(e[r.getAttribute("name")||"default"]=r.innerHTML)}const a=this.hasAttribute("props")?JSON.parse(this.getAttribute("props"),o):{};this.hydrator(this)(this.Component,a,e,{client:this.getAttribute("client")}),this.removeAttribute("ssr"),window.removeEventListener("astro:hydrate",this.hydrate),window.dispatchEvent(new CustomEvent("astro:hydrate"))}}connectedCallback(){!this.hasAttribute("await-children")||this.firstChild?this.childrenConnectedCallback():new MutationObserver((s,e)=>{e.disconnect(),this.childrenConnectedCallback()}).observe(this,{childList:!0})}async childrenConnectedCallback(){window.addEventListener("astro:hydrate",this.hydrate);let s=this.getAttribute("before-hydration-url");s&&await import(s),this.start()}start(){const s=JSON.parse(this.getAttribute("opts")),e=this.getAttribute("client");if(Astro[e]===void 0){window.addEventListener(\`astro:\${e}\`,()=>this.start(),{once:!0});return}Astro[e](async()=>{const n=this.getAttribute("renderer-url"),[a,{default:r}]=await Promise.all([import(this.getAttribute("component-url")),n?import(n):()=>()=>{}]),i=this.getAttribute("component-export")||"default";if(!i.includes("."))this.Component=a[i];else{this.Component=a;for(const d of i.split("."))this.Component=this.Component[d]}return this.hydrator=r,this.hydrate},s,this)}attributeChangedCallback(){this.hydrator&&this.hydrate()}},l.observedAttributes=["props"],l))}`;
 export {
   astro_island_prebuilt_default as default
 };

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

@@ -1,3 +1,3 @@
 import type { EndpointHandler, Params } from '../../@types/astro';
 /** Renders an endpoint request to completion, returning the body. */
-export declare function renderEndpoint(mod: EndpointHandler, request: Request, params: Params): Promise<import("../../@types/astro").EndpointOutput | Response>;
+export declare function renderEndpoint(mod: EndpointHandler, request: Request, params: Params): Promise<Response | import("../../@types/astro").EndpointOutput>;

package/dist/runtime/server/endpoint.js

@@ -15,9 +15,13 @@ async function renderEndpoint(mod, request, params) {
   const chosenMethod = (_a = request.method) == null ? void 0 : _a.toLowerCase();
   const handler = getHandlerFromModule(mod, chosenMethod);
   if (!handler || typeof handler !== "function") {
-    throw new Error(
-      `Endpoint handler not found! Expected an exported function for "${chosenMethod}"`
-    );
+    let response = new Response(null, {
+      status: 404,
+      headers: {
+        "X-Astro-Response": "Not-Found"
+      }
+    });
+    return response;
   }
   if (handler.length > 1) {
     console.warn(`

package/dist/runtime/server/hydration.js

@@ -93,7 +93,10 @@ async function generateHydrateScript(scriptOptions, metadata) {
   }
   island.props["ssr"] = "";
   island.props["client"] = hydrate;
-  island.props["before-hydration-url"] = await result.resolve("astro:scripts/before-hydration.js");
+  let beforeHydrationUrl = await result.resolve("astro:scripts/before-hydration.js");
+  if (beforeHydrationUrl.length) {
+    island.props["before-hydration-url"] = beforeHydrationUrl;
+  }
   island.props["opts"] = escapeHTML(
     JSON.stringify({
       name: metadata.displayName,

package/dist/runtime/server/jsx.js

@@ -170,6 +170,7 @@ function filteredConsoleError(msg, ...rest) {
     if (isKnownReactHookError)
       return;
   }
+  originalConsoleError(msg, ...rest);
 }
 export {
   renderJSX

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

@@ -283,10 +283,10 @@ ${source}
         filename: context.file,
         moduleId: context.file,
         source: await context.read(),
-        transformStyle: createTransformStyles(styleTransformer, context.file, true, this)
+        transformStyle: createTransformStyles(styleTransformer, context.file, true)
       };
       const compile = () => cachedCompilation(compileProps);
-      return handleHotUpdate.call(this, context, {
+      return handleHotUpdate(context, {
         config,
         logging,
         compile

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

@@ -16,13 +16,6 @@ import { createRequest } from "../core/request.js";
 import { createRouteManifest, matchAllRoutes } from "../core/routing/index.js";
 import { resolvePages } from "../core/util.js";
 import notFoundTemplate, { subpathNotUsedTemplate } from "../template/4xx.js";
-function truncateString(str, n) {
-  if (str.length > n) {
-    return str.substring(0, n) + "…";
-  } else {
-    return str;
-  }
-}
 function writeHtmlResponse(res, statusCode, html) {
   res.writeHead(statusCode, {
     "Content-Type": "text/html; charset=utf-8",
@@ -130,9 +123,53 @@ function baseMiddleware(config, logging) {
     next();
   };
 }
+async function matchRoute(pathname, routeCache, viteServer, logging, manifest, config) {
+  const matches = matchAllRoutes(pathname, manifest);
+  for await (const maybeRoute of matches) {
+    const filePath = new URL(`./${maybeRoute.component}`, config.root);
+    const preloadedComponent = await preload({ astroConfig: config, filePath, viteServer });
+    const [, mod] = preloadedComponent;
+    const paramsAndPropsRes = await getParamsAndProps({
+      mod,
+      route: maybeRoute,
+      routeCache,
+      pathname,
+      logging,
+      ssr: config.output === "server"
+    });
+    if (paramsAndPropsRes !== GetParamsAndPropsError.NoMatchingStaticPath) {
+      return {
+        route: maybeRoute,
+        filePath,
+        preloadedComponent,
+        mod
+      };
+    }
+  }
+  if (matches.length) {
+    warn(
+      logging,
+      "getStaticPaths",
+      `Route pattern matched, but no matching static path found. (${pathname})`
+    );
+  }
+  log404(logging, pathname);
+  const custom404 = getCustom404Route(config, manifest);
+  if (custom404) {
+    const filePath = new URL(`./${custom404.component}`, config.root);
+    const preloadedComponent = await preload({ astroConfig: config, filePath, viteServer });
+    const [, mod] = preloadedComponent;
+    return {
+      route: custom404,
+      filePath,
+      preloadedComponent,
+      mod
+    };
+  }
+  return void 0;
+}
 async function handleRequest(routeCache, viteServer, logging, manifest, config, req, res) {
   var _a;
-  const reqStart = performance.now();
   const origin = `${viteServer.config.server.https ? "https" : "http"}://${req.headers.host}`;
   const buildingToSSR = config.output === "server";
   const url = new URL(origin + ((_a = req.url) == null ? void 0 : _a.replace(/(index)?\.html$/, "")));
@@ -148,112 +185,38 @@ async function handleRequest(routeCache, viteServer, logging, manifest, config,
   if (!(req.method === "GET" || req.method === "HEAD")) {
     let bytes = [];
     await new Promise((resolve) => {
-      req.setEncoding("utf-8");
-      req.on("data", (bts) => bytes.push(bts));
+      req.on("data", (part) => {
+        bytes.push(part);
+      });
       req.on("end", resolve);
     });
-    body = new TextEncoder().encode(bytes.join("")).buffer;
-  }
-  const request = createRequest({
-    url,
-    headers: buildingToSSR ? req.headers : new Headers(),
-    method: req.method,
-    body,
-    logging,
-    ssr: buildingToSSR,
-    clientAddress: buildingToSSR ? req.socket.remoteAddress : void 0
-  });
-  async function matchRoute() {
-    const matches = matchAllRoutes(pathname, manifest);
-    for await (const maybeRoute of matches) {
-      const filePath2 = new URL(`./${maybeRoute.component}`, config.root);
-      const preloadedComponent = await preload({ astroConfig: config, filePath: filePath2, viteServer });
-      const [, mod] = preloadedComponent;
-      const paramsAndPropsRes = await getParamsAndProps({
-        mod,
-        route: maybeRoute,
-        routeCache,
-        pathname,
-        logging,
-        ssr: config.output === "server"
-      });
-      if (paramsAndPropsRes !== GetParamsAndPropsError.NoMatchingStaticPath) {
-        return {
-          route: maybeRoute,
-          filePath: filePath2,
-          preloadedComponent,
-          mod
-        };
-      }
-    }
-    if (matches.length) {
-      warn(
-        logging,
-        "getStaticPaths",
-        `Route pattern matched, but no matching static path found. (${pathname})`
-      );
-    }
-    log404(logging, pathname);
-    const custom404 = getCustom404Route(config, manifest);
-    if (custom404) {
-      const filePath2 = new URL(`./${custom404.component}`, config.root);
-      const preloadedComponent = await preload({ astroConfig: config, filePath: filePath2, viteServer });
-      const [, mod] = preloadedComponent;
-      return {
-        route: custom404,
-        filePath: filePath2,
-        preloadedComponent,
-        mod
-      };
-    }
-    return void 0;
+    body = Buffer.concat(bytes);
   }
   let filePath;
   try {
-    const matchedRoute = await matchRoute();
-    if (!matchedRoute) {
-      return handle404Response(origin, config, req, res);
-    }
-    const { route, preloadedComponent, mod } = matchedRoute;
-    filePath = matchedRoute.filePath;
-    const paramsAndPropsRes = await getParamsAndProps({
-      mod,
-      route,
-      routeCache,
+    const matchedRoute = await matchRoute(
       pathname,
+      routeCache,
+      viteServer,
       logging,
-      ssr: config.output === "server"
-    });
-    const options = {
-      astroConfig: config,
-      filePath,
-      logging,
-      mode: "development",
-      origin,
+      manifest,
+      config
+    );
+    filePath = matchedRoute == null ? void 0 : matchedRoute.filePath;
+    return await handleRoute(
+      matchedRoute,
+      url,
       pathname,
-      route,
+      body,
+      origin,
       routeCache,
       viteServer,
-      request
-    };
-    if (route.type === "endpoint") {
-      const result = await callEndpoint(options);
-      if (result.type === "response") {
-        await writeWebResponse(res, result.response);
-      } else {
-        let contentType = "text/plain";
-        const filepath = route.pathname || route.segments.map((segment) => segment.map((p) => p.content).join("")).join("/");
-        const computedMimeType = mime.getType(filepath);
-        if (computedMimeType) {
-          contentType = computedMimeType;
-        }
-        res.writeHead(200, { "Content-Type": `${contentType};charset=utf-8` });
-        res.end(result.body);
-      }
-    } else {
-      const result = await ssr(preloadedComponent, options);
-      return await writeSSRResult(result, res);
-    }
+      manifest,
+      logging,
+      config,
+      req,
+      res
+    );
   } catch (_err) {
     const err = fixViteErrorMessage(_err, viteServer, filePath);
     const errorWithMetadata = collectErrorMetadata(err);
@@ -261,6 +224,85 @@ async function handleRequest(routeCache, viteServer, logging, manifest, config,
     handle500Response(viteServer, origin, req, res, errorWithMetadata);
   }
 }
+async function handleRoute(matchedRoute, url, pathname, body, origin, routeCache, viteServer, manifest, logging, config, req, res) {
+  if (!matchedRoute) {
+    return handle404Response(origin, config, req, res);
+  }
+  const filePath = matchedRoute.filePath;
+  const { route, preloadedComponent, mod } = matchedRoute;
+  const buildingToSSR = config.output === "server";
+  const request = createRequest({
+    url,
+    headers: buildingToSSR ? req.headers : new Headers(),
+    method: req.method,
+    body,
+    logging,
+    ssr: buildingToSSR,
+    clientAddress: buildingToSSR ? req.socket.remoteAddress : void 0
+  });
+  const paramsAndPropsRes = await getParamsAndProps({
+    mod,
+    route,
+    routeCache,
+    pathname,
+    logging,
+    ssr: config.output === "server"
+  });
+  const options = {
+    astroConfig: config,
+    filePath,
+    logging,
+    mode: "development",
+    origin,
+    pathname,
+    route,
+    routeCache,
+    viteServer,
+    request
+  };
+  if (route.type === "endpoint") {
+    const result = await callEndpoint(options);
+    if (result.type === "response") {
+      if (result.response.headers.get("X-Astro-Response") === "Not-Found") {
+        const fourOhFourRoute = await matchRoute(
+          "/404",
+          routeCache,
+          viteServer,
+          logging,
+          manifest,
+          config
+        );
+        return handleRoute(
+          fourOhFourRoute,
+          new URL("/404", url),
+          "/404",
+          body,
+          origin,
+          routeCache,
+          viteServer,
+          manifest,
+          logging,
+          config,
+          req,
+          res
+        );
+      }
+      await writeWebResponse(res, result.response);
+    } else {
+      let contentType = "text/plain";
+      const filepath = route.pathname || route.segments.map((segment) => segment.map((p) => p.content).join("")).join("/");
+      const computedMimeType = mime.getType(filepath);
+      if (computedMimeType) {
+        contentType = computedMimeType;
+      }
+      res.writeHead(200, { "Content-Type": `${contentType};charset=utf-8` });
+      res.end(result.body);
+    }
+  } else {
+    const result = await ssr(preloadedComponent, options);
+    return await writeSSRResult(result, res);
+  }
+}
 function createPlugin({ config, logging }) {
   return {
     name: "astro:server",

package/dist/vite-plugin-config-alias/index.js

@@ -1,20 +1,15 @@
 import * as path from "path";
-import * as tsr from "tsconfig-resolver";
-import * as url from "url";
 const normalize = (pathname) => String(pathname).split(path.sep).join(path.posix.sep);
-const getExistingConfig = (searchName, cwd) => {
-  const config = tsr.tsconfigResolverSync({ cwd, searchName });
-  return config.exists ? config : null;
-};
-const getConfigAlias = (cwd) => {
-  const config = getExistingConfig("tsconfig.json", cwd) || getExistingConfig("jsconfig.json", cwd);
-  if (!config)
+const getConfigAlias = (astroConfig) => {
+  const config = astroConfig._ctx.tsConfig;
+  const configPath = astroConfig._ctx.tsConfigPath;
+  if (!config || !configPath)
     return null;
-  const compilerOptions = Object(config.config.compilerOptions);
+  const compilerOptions = Object(config.compilerOptions);
   if (!compilerOptions.baseUrl)
     return null;
   const baseUrl = path.posix.resolve(
-    path.posix.dirname(normalize(config.path).replace(/^\/?/, "/")),
+    path.posix.dirname(normalize(configPath).replace(/^\/?/, "/")),
     normalize(compilerOptions.baseUrl)
   );
   const aliases = [];
@@ -42,7 +37,7 @@ const getConfigAlias = (cwd) => {
 function configAliasVitePlugin({
   config: astroConfig
 }) {
-  const configAlias = getConfigAlias(astroConfig.root && url.fileURLToPath(astroConfig.root));
+  const configAlias = getConfigAlias(astroConfig);
   if (!configAlias)
     return {};
   return {

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

@@ -124,6 +124,7 @@ function jsx({ config, logging }) {
       defaultJSXRendererEntry = [...jsxRenderersIntegrationOnly.entries()][0];
     },
     async transform(code, id, opts) {
+      var _a;
       const ssr = Boolean(opts == null ? void 0 : opts.ssr);
       if (!JSX_EXTENSIONS.has(path.extname(id))) {
         return null;
@@ -163,6 +164,10 @@ function jsx({ config, logging }) {
       if (!importSource && IMPORT_KEYWORD_REGEX.test(code)) {
         importSource = await detectImportSourceFromImports(code, id, jsxRenderers);
       }
+      if (!importSource) {
+        const compilerOptions = (_a = config._ctx.tsConfig) == null ? void 0 : _a.compilerOptions;
+        importSource = compilerOptions == null ? void 0 : compilerOptions.jsxImportSource;
+      }
       if (!importSource && defaultJSXRendererEntry) {
         const [defaultRendererName] = defaultJSXRendererEntry;
         error(

package/dist/vite-style-transform/style-transform.d.ts

@@ -7,4 +7,4 @@ export declare type ViteStyleTransformer = {
     transformStyleWithVite: TransformStyleWithVite;
 };
 export declare function createViteStyleTransformer(viteConfig: vite.ResolvedConfig): ViteStyleTransformer;
-export declare function createTransformStyles(viteStyleTransformer: ViteStyleTransformer, filename: string, ssr: boolean, pluginContext: PluginContext): TransformStyle;
+export declare function createTransformStyles(viteStyleTransformer: ViteStyleTransformer, filename: string, ssr: boolean, pluginContext?: PluginContext): TransformStyle;

package/dist/vite-style-transform/style-transform.js

@@ -14,10 +14,6 @@ function getNormalizedIDForPostCSS(filename) {
   }
 }
 function createTransformStyles(viteStyleTransformer, filename, ssr, pluginContext) {
-  if (!pluginContext.addWatchFile) {
-    pluginContext.addWatchFile = () => {
-    };
-  }
   const normalizedID = getNormalizedIDForPostCSS(filename);
   return async function(styleSource, lang) {
     const result = await viteStyleTransformer.transformStyleWithVite.call(pluginContext, {

package/dist/vite-style-transform/transform-with-vite.js

@@ -12,7 +12,9 @@ function createTransformStyleWithViteFn(viteConfig) {
     }
     const styleId = `${id}?astro&type=style&lang${lang}`;
     viteDevServer == null ? void 0 : viteDevServer.moduleGraph.ensureEntryFromUrl(styleId, ssr, false);
-    const transformResult = await transformCss.call(this, source, styleId, ssr);
+    const ctx = this ?? { addWatchFile: () => {
+    } };
+    const transformResult = await transformCss.call(ctx, source, styleId, ssr);
     const { code, map } = transformResult;
     const deps = /* @__PURE__ */ new Set();
     const mod = viteDevServer == null ? void 0 : viteDevServer.moduleGraph.getModuleById(styleId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -125,7 +125,7 @@
     "recast": "^0.20.5",
     "rehype": "^12.0.1",
     "resolve": "^1.22.0",
-    "rollup": "~2.77.0",
+    "rollup": "~2.78.0",
     "semver": "^7.3.7",
     "shiki": "^0.11.1",
     "sirv": "^2.0.2",
@@ -136,7 +136,7 @@
     "tsconfig-resolver": "^3.0.1",
     "unist-util-visit": "^4.1.0",
     "vfile": "^5.3.2",
-    "vite": "3.0.9",
+    "vite": "3.1.0",
     "yargs-parser": "^21.0.1",
     "zod": "^3.17.3"
   },