astro 1.2.4 → 1.2.6

package/dist/integrations/index.js

@@ -1,5 +1,5 @@
 import { bold } from "kleur/colors";
-import { mergeConfig } from "../core/config.js";
+import { mergeConfig } from "../core/config/config.js";
 import { info } from "../core/logger/core.js";
 async function withTakingALongTimeMsg({
   name,
@@ -15,20 +15,21 @@ async function withTakingALongTimeMsg({
   return result;
 }
 async function runHookConfigSetup({
-  config: _config,
+  settings,
   command,
   logging
 }) {
   var _a;
-  if (_config.adapter) {
-    _config.integrations.push(_config.adapter);
+  if (settings.config.adapter) {
+    settings.config.integrations.push(settings.config.adapter);
   }
-  let updatedConfig = { ..._config };
-  for (const integration of _config.integrations) {
+  let updatedConfig = { ...settings.config };
+  let updatedSettings = { ...settings, config: updatedConfig };
+  for (const integration of settings.config.integrations) {
     if ((_a = integration == null ? void 0 : integration.hooks) == null ? void 0 : _a["astro:config:setup"]) {
       let addPageExtension2 = function(...input) {
         const exts = input.flat(Infinity).map((ext) => `.${ext.replace(/^\./, "")}`);
-        updatedConfig._ctx.pageExtensions.push(...exts);
+        updatedSettings.pageExtensions.push(...exts);
       };
       var addPageExtension = addPageExtension2;
       const hooks = {
@@ -41,16 +42,16 @@ async function runHookConfigSetup({
           if (!renderer.serverEntrypoint) {
             throw new Error(`Renderer ${bold(renderer.name)} does not provide a serverEntrypoint.`);
           }
-          updatedConfig._ctx.renderers.push(renderer);
+          updatedSettings.renderers.push(renderer);
         },
         injectScript: (stage, content) => {
-          updatedConfig._ctx.scripts.push({ stage, content });
+          updatedSettings.scripts.push({ stage, content });
         },
         updateConfig: (newConfig) => {
           updatedConfig = mergeConfig(updatedConfig, newConfig);
         },
         injectRoute: (injectRoute) => {
-          updatedConfig._ctx.injectedRoutes.push(injectRoute);
+          updatedSettings.injectedRoutes.push(injectRoute);
         }
       };
       Object.defineProperty(hooks, "addPageExtension", {
@@ -65,26 +66,27 @@ async function runHookConfigSetup({
       });
     }
   }
-  return updatedConfig;
+  updatedSettings.config = updatedConfig;
+  return updatedSettings;
 }
 async function runHookConfigDone({
-  config,
+  settings,
   logging
 }) {
   var _a;
-  for (const integration of config.integrations) {
+  for (const integration of settings.config.integrations) {
     if ((_a = integration == null ? void 0 : integration.hooks) == null ? void 0 : _a["astro:config:done"]) {
       await withTakingALongTimeMsg({
         name: integration.name,
         hookResult: integration.hooks["astro:config:done"]({
-          config,
+          config: settings.config,
           setAdapter(adapter) {
-            if (config._ctx.adapter && config._ctx.adapter.name !== adapter.name) {
+            if (settings.adapter && settings.adapter.name !== adapter.name) {
               throw new Error(
-                `Integration "${integration.name}" conflicts with "${config._ctx.adapter.name}". You can only configure one deployment integration.`
+                `Integration "${integration.name}" conflicts with "${settings.adapter.name}". You can only configure one deployment integration.`
               );
             }
-            config._ctx.adapter = adapter;
+            settings.adapter = adapter;
           }
         }),
         logging

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

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "1.2.4";
+const ASTRO_VERSION = "1.2.6";
 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/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/vite-plugin-astro/index.d.ts

@@ -1,10 +1,10 @@
 import type * as vite from 'vite';
-import type { AstroConfig } from '../@types/astro';
+import type { AstroSettings } from '../@types/astro';
 import type { LogOptions } from '../core/logger/core.js';
 interface AstroPluginOptions {
-    config: AstroConfig;
+    settings: AstroSettings;
     logging: LogOptions;
 }
 /** Transform .astro files for Vite */
-export default function astro({ config, logging }: AstroPluginOptions): vite.Plugin;
+export default function astro({ settings, logging }: AstroPluginOptions): vite.Plugin;
 export {};

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

@@ -13,7 +13,8 @@ import {
 import { handleHotUpdate } from "./hmr.js";
 import { parseAstroRequest } from "./query.js";
 const FRONTMATTER_PARSE_REGEXP = /^\-\-\-(.*)^\-\-\-/ms;
-function astro({ config, logging }) {
+function astro({ settings, logging }) {
+  const { config } = settings;
   function normalizeFilename(filename) {
     if (filename.startsWith("/@fs")) {
       filename = filename.slice("/@fs".length);

package/dist/vite-plugin-astro-postprocess/index.d.ts

@@ -1,7 +1,7 @@
 import type { Plugin } from 'vite';
-import type { AstroConfig } from '../@types/astro';
+import type { AstroSettings } from '../@types/astro';
 interface AstroPluginOptions {
-    config: AstroConfig;
+    settings: AstroSettings;
 }
-export default function astro({ config }: AstroPluginOptions): Plugin;
+export default function astro(_opts: AstroPluginOptions): Plugin;
 export {};

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

@@ -2,7 +2,7 @@ import { parse as babelParser } from "@babel/parser";
 import { parse, print, types, visit } from "recast";
 const ASTRO_GLOB_REGEX = /Astro2?\s*\.\s*glob\s*\(/;
 const validAstroGlobalNames = /* @__PURE__ */ new Set(["Astro", "Astro2"]);
-function astro({ config }) {
+function astro(_opts) {
   return {
     name: "astro:postprocess",
     async transform(code, id) {

package/dist/vite-plugin-astro-server/index.d.ts

@@ -1,10 +1,10 @@
 import type * as vite from 'vite';
-import type { AstroConfig } from '../@types/astro';
+import type { AstroSettings } from '../@types/astro';
 import { LogOptions } from '../core/logger/core.js';
 interface AstroPluginOptions {
-    config: AstroConfig;
+    settings: AstroSettings;
     logging: LogOptions;
 }
-export declare function baseMiddleware(config: AstroConfig, logging: LogOptions): vite.Connect.NextHandleFunction;
-export default function createPlugin({ config, logging }: AstroPluginOptions): vite.Plugin;
+export declare function baseMiddleware(settings: AstroSettings, logging: LogOptions): vite.Connect.NextHandleFunction;
+export default function createPlugin({ settings, logging }: AstroPluginOptions): vite.Plugin;
 export {};

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

@@ -63,7 +63,7 @@ async function writeWebResponse(res, webResponse) {
 async function writeSSRResult(webResponse, res) {
   return writeWebResponse(res, webResponse);
 }
-async function handle404Response(origin, config, req, res) {
+async function handle404Response(origin, settings, req, res) {
   const pathname = decodeURI(new URL(origin + req.url).pathname);
   const html = notFoundTemplate({
     statusCode: 404,
@@ -86,7 +86,7 @@ async function handle500Response(viteServer, origin, req, res, err) {
     );
   }
 }
-function getCustom404Route(config, manifest) {
+function getCustom404Route({ config }, manifest) {
   const relPages = resolvePages(config).href.replace(config.root.href, "");
   const pattern = new RegExp(`${appendForwardSlash(relPages)}404.(astro|md)`);
   return manifest.routes.find((r) => r.component.match(pattern));
@@ -94,7 +94,8 @@ function getCustom404Route(config, manifest) {
 function log404(logging, pathname) {
   info(logging, "serve", msg.req({ url: pathname, statusCode: 404 }));
 }
-function baseMiddleware(config, logging) {
+function baseMiddleware(settings, logging) {
+  const { config } = settings;
   const site = config.site ? new URL(config.base, config.site) : void 0;
   const devRoot = site ? site.pathname : "/";
   return function devBaseMiddleware(req, res, next) {
@@ -123,11 +124,11 @@ function baseMiddleware(config, logging) {
     next();
   };
 }
-async function matchRoute(pathname, routeCache, viteServer, logging, manifest, config) {
+async function matchRoute(pathname, routeCache, viteServer, logging, manifest, settings) {
   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 filePath = new URL(`./${maybeRoute.component}`, settings.config.root);
+    const preloadedComponent = await preload({ settings, filePath, viteServer });
     const [, mod] = preloadedComponent;
     const paramsAndPropsRes = await getParamsAndProps({
       mod,
@@ -135,7 +136,7 @@ async function matchRoute(pathname, routeCache, viteServer, logging, manifest, c
       routeCache,
       pathname,
       logging,
-      ssr: config.output === "server"
+      ssr: settings.config.output === "server"
     });
     if (paramsAndPropsRes !== GetParamsAndPropsError.NoMatchingStaticPath) {
       return {
@@ -154,10 +155,10 @@ async function matchRoute(pathname, routeCache, viteServer, logging, manifest, c
     );
   }
   log404(logging, pathname);
-  const custom404 = getCustom404Route(config, manifest);
+  const custom404 = getCustom404Route(settings, manifest);
   if (custom404) {
-    const filePath = new URL(`./${custom404.component}`, config.root);
-    const preloadedComponent = await preload({ astroConfig: config, filePath, viteServer });
+    const filePath = new URL(`./${custom404.component}`, settings.config.root);
+    const preloadedComponent = await preload({ settings, filePath, viteServer });
     const [, mod] = preloadedComponent;
     return {
       route: custom404,
@@ -168,8 +169,9 @@ async function matchRoute(pathname, routeCache, viteServer, logging, manifest, c
   }
   return void 0;
 }
-async function handleRequest(routeCache, viteServer, logging, manifest, config, req, res) {
+async function handleRequest(routeCache, viteServer, logging, manifest, settings, req, res) {
   var _a;
+  const { config } = settings;
   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$/, "")));
@@ -200,7 +202,7 @@ async function handleRequest(routeCache, viteServer, logging, manifest, config,
       viteServer,
       logging,
       manifest,
-      config
+      settings
     );
     filePath = matchedRoute == null ? void 0 : matchedRoute.filePath;
     return await handleRoute(
@@ -213,7 +215,7 @@ async function handleRequest(routeCache, viteServer, logging, manifest, config,
       viteServer,
       manifest,
       logging,
-      config,
+      settings,
       req,
       res
     );
@@ -224,10 +226,11 @@ 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) {
+async function handleRoute(matchedRoute, url, pathname, body, origin, routeCache, viteServer, manifest, logging, settings, req, res) {
   if (!matchedRoute) {
-    return handle404Response(origin, config, req, res);
+    return handle404Response(origin, settings, req, res);
   }
+  const { config } = settings;
   const filePath = matchedRoute.filePath;
   const { route, preloadedComponent, mod } = matchedRoute;
   const buildingToSSR = config.output === "server";
@@ -249,7 +252,7 @@ async function handleRoute(matchedRoute, url, pathname, body, origin, routeCache
     ssr: config.output === "server"
   });
   const options = {
-    astroConfig: config,
+    settings,
     filePath,
     logging,
     mode: "development",
@@ -270,7 +273,7 @@ async function handleRoute(matchedRoute, url, pathname, body, origin, routeCache
           viteServer,
           logging,
           manifest,
-          config
+          settings
         );
         return handleRoute(
           fourOhFourRoute,
@@ -282,7 +285,7 @@ async function handleRoute(matchedRoute, url, pathname, body, origin, routeCache
           viteServer,
           manifest,
           logging,
-          config,
+          settings,
           req,
           res
         );
@@ -303,33 +306,33 @@ async function handleRoute(matchedRoute, url, pathname, body, origin, routeCache
     return await writeSSRResult(result, res);
   }
 }
-function createPlugin({ config, logging }) {
+function createPlugin({ settings, logging }) {
   return {
     name: "astro:server",
     configureServer(viteServer) {
       let routeCache = new RouteCache(logging);
-      let manifest = createRouteManifest({ config }, logging);
+      let manifest = createRouteManifest({ settings }, logging);
       function rebuildManifest(needsManifestRebuild, file) {
         routeCache.clearAll();
         if (needsManifestRebuild) {
-          manifest = createRouteManifest({ config }, logging);
+          manifest = createRouteManifest({ settings }, logging);
         }
       }
       viteServer.watcher.on("add", rebuildManifest.bind(null, true));
       viteServer.watcher.on("unlink", rebuildManifest.bind(null, true));
       viteServer.watcher.on("change", rebuildManifest.bind(null, false));
       return () => {
-        if (config.base !== "/") {
+        if (settings.config.base !== "/") {
           viteServer.middlewares.stack.unshift({
             route: "",
-            handle: baseMiddleware(config, logging)
+            handle: baseMiddleware(settings, logging)
           });
         }
         viteServer.middlewares.use(async (req, res) => {
           if (!req.url || !req.method) {
             throw new Error("Incomplete request");
           }
-          handleRequest(routeCache, viteServer, logging, manifest, config, req, res);
+          handleRequest(routeCache, viteServer, logging, manifest, settings, req, res);
         });
       };
     },

package/dist/vite-plugin-config-alias/index.d.ts

@@ -1,4 +1,4 @@
-import type { AstroConfig } from '../@types/astro';
+import type { AstroSettings } from '../@types/astro';
 import type * as vite from 'vite';
 /** Result of successfully parsed tsconfig.json or jsconfig.json. */
 export declare interface Alias {
@@ -6,6 +6,6 @@ export declare interface Alias {
     replacement: string;
 }
 /** Returns a Vite plugin used to alias pathes from tsconfig.json and jsconfig.json. */
-export default function configAliasVitePlugin({ config: astroConfig, }: {
-    config: AstroConfig;
+export default function configAliasVitePlugin({ settings, }: {
+    settings: AstroSettings;
 }): vite.PluginOption;

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 = (settings) => {
+  const config = settings.tsConfig;
+  const configPath = settings.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 = [];
@@ -40,9 +35,10 @@ const getConfigAlias = (cwd) => {
   return aliases;
 };
 function configAliasVitePlugin({
-  config: astroConfig
+  settings
 }) {
-  const configAlias = getConfigAlias(astroConfig.root && url.fileURLToPath(astroConfig.root));
+  const { config } = settings;
+  const configAlias = getConfigAlias(settings);
   if (!configAlias)
     return {};
   return {

package/dist/vite-plugin-env/index.d.ts

@@ -1,7 +1,7 @@
 import type * as vite from 'vite';
-import type { AstroConfig } from '../@types/astro';
+import type { AstroSettings } from '../@types/astro';
 interface EnvPluginOptions {
-    config: AstroConfig;
+    settings: AstroSettings;
 }
-export default function envVitePlugin({ config: astroConfig, }: EnvPluginOptions): vite.PluginOption;
+export default function envVitePlugin({ settings }: EnvPluginOptions): vite.PluginOption;
 export {};

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

@@ -38,13 +38,12 @@ function getReferencedPrivateKeys(source, privateEnv) {
   }
   return references;
 }
-function envVitePlugin({
-  config: astroConfig
-}) {
+function envVitePlugin({ settings }) {
   let privateEnv;
   let config;
   let replacements;
   let pattern;
+  const { config: astroConfig } = settings;
   return {
     name: "astro:vite-plugin-env",
     enforce: "pre",

package/dist/vite-plugin-integrations-container/index.d.ts

@@ -1,8 +1,8 @@
 import { Plugin as VitePlugin } from 'vite';
-import { AstroConfig } from '../@types/astro.js';
+import { AstroSettings } from '../@types/astro.js';
 import { LogOptions } from '../core/logger/core.js';
 /** Connect Astro integrations into Vite, as needed. */
-export default function astroIntegrationsContainerPlugin({ config, logging, }: {
-    config: AstroConfig;
+export default function astroIntegrationsContainerPlugin({ settings, logging, }: {
+    settings: AstroSettings;
     logging: LogOptions;
 }): VitePlugin;

package/dist/vite-plugin-integrations-container/index.js

@@ -1,12 +1,12 @@
 import { runHookServerSetup } from "../integrations/index.js";
 function astroIntegrationsContainerPlugin({
-  config,
+  settings,
   logging
 }) {
   return {
     name: "astro:integration-container",
     configureServer(server) {
-      runHookServerSetup({ config, server, logging });
+      runHookServerSetup({ config: settings.config, server, logging });
     }
   };
 }

package/dist/vite-plugin-jsx/index.d.ts

@@ -1,10 +1,10 @@
 import type { Plugin } from 'vite';
-import type { AstroConfig } from '../@types/astro';
+import type { AstroSettings } from '../@types/astro';
 import type { LogOptions } from '../core/logger/core.js';
 interface AstroPluginJSXOptions {
-    config: AstroConfig;
+    settings: AstroSettings;
     logging: LogOptions;
 }
 /** Use Astro config to allow for alternate or multiple JSX renderers (by default Vite will assume React) */
-export default function jsx({ config, logging }: AstroPluginJSXOptions): Plugin;
+export default function jsx({ settings, logging }: AstroPluginJSXOptions): Plugin;
 export {};

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

@@ -101,7 +101,7 @@ async function transformJSX({
     map: result.map
   };
 }
-function jsx({ config, logging }) {
+function jsx({ settings, logging }) {
   let viteConfig;
   const jsxRenderers = /* @__PURE__ */ new Map();
   const jsxRenderersIntegrationOnly = /* @__PURE__ */ new Map();
@@ -112,7 +112,7 @@ function jsx({ config, logging }) {
     enforce: "pre",
     async configResolved(resolvedConfig) {
       viteConfig = resolvedConfig;
-      const possibleRenderers = collectJSXRenderers(config._ctx.renderers);
+      const possibleRenderers = collectJSXRenderers(settings.renderers);
       for (const [importSource, renderer] of possibleRenderers) {
         jsxRenderers.set(importSource, renderer);
         if (importSource === "astro") {
@@ -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 = settings.tsConfig) == null ? void 0 : _a.compilerOptions;
+        importSource = compilerOptions == null ? void 0 : compilerOptions.jsxImportSource;
+      }
       if (!importSource && defaultJSXRendererEntry) {
         const [defaultRendererName] = defaultJSXRendererEntry;
         error(

package/dist/vite-plugin-markdown/index.d.ts

@@ -1,9 +1,9 @@
 import type { Plugin } from 'vite';
-import type { AstroConfig } from '../@types/astro';
+import type { AstroSettings } from '../@types/astro';
 import type { LogOptions } from '../core/logger/core.js';
 interface AstroPluginOptions {
-    config: AstroConfig;
+    settings: AstroSettings;
     logging: LogOptions;
 }
-export default function markdown({ config, logging }: AstroPluginOptions): Plugin;
+export default function markdown({ settings, logging }: AstroPluginOptions): Plugin;
 export {};

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

@@ -12,17 +12,17 @@ function safeMatter(source, id) {
     throw collectErrorMetadata(e);
   }
 }
-function markdown({ config, logging }) {
+function markdown({ settings, logging }) {
   return {
     enforce: "pre",
     name: "astro:markdown",
     async load(id) {
       if (id.endsWith(".md")) {
-        const { fileId, fileUrl } = getFileInfo(id, config);
+        const { fileId, fileUrl } = getFileInfo(id, settings.config);
         const rawFile = await fs.promises.readFile(fileId, "utf-8");
         const raw = safeMatter(rawFile, id);
         const renderResult = await renderMarkdown(raw.content, {
-          ...config.markdown,
+          ...settings.config.markdown,
           fileURL: new URL(`file://${fileId}`),
           isAstroFlavoredMd: false
         });

package/dist/vite-plugin-markdown-legacy/index.d.ts

@@ -1,9 +1,9 @@
 import type { Plugin } from 'vite';
-import type { AstroConfig } from '../@types/astro';
+import type { AstroSettings } from '../@types/astro';
 import type { LogOptions } from '../core/logger/core.js';
 interface AstroPluginOptions {
-    config: AstroConfig;
+    settings: AstroSettings;
     logging: LogOptions;
 }
-export default function markdown({ config, logging }: AstroPluginOptions): Plugin;
+export default function markdown({ settings }: AstroPluginOptions): Plugin;
 export {};

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

@@ -22,7 +22,8 @@ function safeMatter(source, id) {
     throw collectErrorMetadata(e);
   }
 }
-function markdown({ config, logging }) {
+function markdown({ settings }) {
+  const { config } = settings;
   function normalizeFilename(filename) {
     if (filename.startsWith("/@fs")) {
       filename = filename.slice("/@fs".length);

package/dist/vite-plugin-scripts/index.d.ts

@@ -1,8 +1,8 @@
 import { Plugin as VitePlugin } from 'vite';
-import { AstroConfig } from '../@types/astro.js';
+import { AstroSettings } from '../@types/astro.js';
 export declare const BEFORE_HYDRATION_SCRIPT_ID: string;
 export declare const PAGE_SCRIPT_ID: string;
 export declare const PAGE_SSR_SCRIPT_ID: string;
-export default function astroScriptsPlugin({ config }: {
-    config: AstroConfig;
+export default function astroScriptsPlugin({ settings }: {
+    settings: AstroSettings;
 }): VitePlugin;