astro 1.4.6 → 1.5.0

package/dist/core/add/index.js

@@ -2,13 +2,18 @@ import boxen from "boxen";
 import { diffWords } from "diff";
 import { execa } from "execa";
 import { existsSync, promises as fs } from "fs";
-import { bold, cyan, dim, green, magenta, yellow } from "kleur/colors";
+import { bold, cyan, dim, green, magenta, red, yellow } from "kleur/colors";
 import ora from "ora";
 import path from "path";
 import preferredPM from "preferred-pm";
 import prompts from "prompts";
 import { fileURLToPath, pathToFileURL } from "url";
-import { resolveConfigPath } from "../config/index.js";
+import { loadTSConfig, resolveConfigPath } from "../config/index.js";
+import {
+  defaultTSConfig,
+  presets,
+  updateTSConfigForFramework
+} from "../config/tsconfig.js";
 import { debug, info } from "../logger/core.js";
 import * as msg from "../messages.js";
 import { printHelp } from "../messages.js";
@@ -212,7 +217,7 @@ async function add(names, { cwd, flags, logging, telemetry }) {
   switch (configResult) {
     case UpdateResult.cancelled: {
       info(logging, null, msg.cancelled(`Your configuration has ${bold("NOT")} been updated.`));
-      return;
+      break;
     }
     case UpdateResult.none: {
       const pkgURL = new URL("./package.json", configURL);
@@ -224,11 +229,11 @@ async function add(names, { cwd, flags, logging, telemetry }) {
         );
         if (missingDeps.length === 0) {
           info(logging, null, msg.success(`Configuration up-to-date.`));
-          return;
+          break;
         }
       }
       info(logging, null, msg.success(`Configuration up-to-date.`));
-      return;
+      break;
     }
     default: {
       const list = integrations.map((integration) => `  - ${integration.packageName}`).join("\n");
@@ -242,6 +247,27 @@ ${list}`
       );
     }
   }
+  const updateTSConfigResult = await updateTSConfig(cwd, logging, integrations, flags);
+  switch (updateTSConfigResult) {
+    case UpdateResult.none: {
+      break;
+    }
+    case UpdateResult.cancelled: {
+      info(
+        logging,
+        null,
+        msg.cancelled(`Your TypeScript configuration has ${bold("NOT")} been updated.`)
+      );
+      break;
+    }
+    case UpdateResult.failure: {
+      throw new Error(
+        `Unknown error parsing tsconfig.json or jsconfig.json. Could not update TypeScript settings.`
+      );
+    }
+    default:
+      info(logging, null, msg.success(`Successfully updated TypeScript settings`));
+  }
 }
 function isAdapter(integration) {
   return integration.type === "adapter";
@@ -392,27 +418,12 @@ ${defaultExport}`);
   if (input === output) {
     return 0 /* none */;
   }
-  let changes = [];
-  for (const change of diffWords(input, output)) {
-    let lines = change.value.trim().split("\n").slice(0, change.count);
-    if (lines.length === 0)
-      continue;
-    if (change.added) {
-      if (!change.value.trim())
-        continue;
-      changes.push(change.value);
-    }
-  }
-  if (changes.length === 0) {
+  const diff = getDiffContent(input, output);
+  if (!diff) {
     return 0 /* none */;
   }
-  let diffed = output;
-  for (let newContent of changes) {
-    const coloredOutput = newContent.split("\n").map((ln) => ln ? green(ln) : "").join("\n");
-    diffed = diffed.replace(newContent, coloredOutput);
-  }
   const message = `
-${boxen(diffed, {
+${boxen(diff, {
     margin: 0.5,
     padding: 0.5,
     borderStyle: "round",
@@ -616,6 +627,90 @@ async function validateIntegrations(integrations) {
     }
   }
 }
+async function updateTSConfig(cwd = process.cwd(), logging, integrationsInfo, flags) {
+  var _a, _b;
+  const integrations = integrationsInfo.map(
+    (integration) => integration.id
+  );
+  const firstIntegrationWithTSSettings = integrations.find(
+    (integration) => presets.has(integration)
+  );
+  if (!firstIntegrationWithTSSettings) {
+    return 0 /* none */;
+  }
+  const inputConfig = loadTSConfig(cwd, false);
+  const configFileName = inputConfig.exists ? inputConfig.path.split("/").pop() : "tsconfig.json";
+  if (inputConfig.reason === "invalid-config") {
+    return 3 /* failure */;
+  }
+  if (inputConfig.reason === "not-found") {
+    debug("add", "Couldn't find tsconfig.json or jsconfig.json, generating one");
+  }
+  const outputConfig = updateTSConfigForFramework(
+    inputConfig.exists ? inputConfig.config : defaultTSConfig,
+    firstIntegrationWithTSSettings
+  );
+  const input = inputConfig.exists ? JSON.stringify(inputConfig.config, null, 2) : "";
+  const output = JSON.stringify(outputConfig, null, 2);
+  const diff = getDiffContent(input, output);
+  if (!diff) {
+    return 0 /* none */;
+  }
+  const message = `
+${boxen(diff, {
+    margin: 0.5,
+    padding: 0.5,
+    borderStyle: "round",
+    title: configFileName
+  })}
+`;
+  info(
+    logging,
+    null,
+    `
+  ${magenta(`Astro will make the following changes to your ${configFileName}:`)}
+${message}`
+  );
+  const conflictingIntegrations = [...Object.keys(presets).filter((config) => config !== "vue")];
+  const hasConflictingIntegrations = integrations.filter((integration) => presets.has(integration)).length > 1 && integrations.filter((integration) => conflictingIntegrations.includes(integration)).length > 0;
+  if (hasConflictingIntegrations) {
+    info(
+      logging,
+      null,
+      red(
+        `  ${bold(
+          "Caution:"
+        )} Selected UI frameworks require conflicting tsconfig.json settings, as such only settings for ${bold(
+          firstIntegrationWithTSSettings
+        )} were used.
+  More information: https://docs.astro.build/en/guides/typescript/#errors-typing-multiple-jsx-frameworks-at-the-same-time
+`
+      )
+    );
+  }
+  if (integrations.includes("vue") && hasConflictingIntegrations && (((_a = outputConfig.compilerOptions) == null ? void 0 : _a.jsx) !== "preserve" && ((_b = outputConfig.compilerOptions) == null ? void 0 : _b.jsxImportSource) !== void 0 || integrations.includes("react"))) {
+    info(
+      logging,
+      null,
+      red(
+        `  ${bold(
+          "Caution:"
+        )} Using Vue together with a JSX framework can lead to type checking issues inside Vue files.
+  More information: https://docs.astro.build/en/guides/typescript/#vue-components-are-mistakenly-typed-by-the-typesreact-package-when-installed
+`
+      )
+    );
+  }
+  if (await askToContinue({ flags })) {
+    await fs.writeFile((inputConfig == null ? void 0 : inputConfig.path) ?? path.join(cwd, "tsconfig.json"), output, {
+      encoding: "utf-8"
+    });
+    debug("add", `Updated ${configFileName} file`);
+    return 1 /* updated */;
+  } else {
+    return 2 /* cancelled */;
+  }
+}
 function parseIntegrationName(spec) {
   const result = parseNpmName(spec);
   if (!result)
@@ -643,6 +738,28 @@ async function askToContinue({ flags }) {
   });
   return Boolean(response.askToContinue);
 }
+function getDiffContent(input, output) {
+  let changes = [];
+  for (const change of diffWords(input, output)) {
+    let lines = change.value.trim().split("\n").slice(0, change.count);
+    if (lines.length === 0)
+      continue;
+    if (change.added) {
+      if (!change.value.trim())
+        continue;
+      changes.push(change.value);
+    }
+  }
+  if (changes.length === 0) {
+    return null;
+  }
+  let diffed = output;
+  for (let newContent of changes) {
+    const coloredOutput = newContent.split("\n").map((ln) => ln ? green(ln) : "").join("\n");
+    diffed = diffed.replace(newContent, coloredOutput);
+  }
+  return diffed;
+}
 export {
   add as default,
   validateIntegrations

package/dist/core/build/index.js

@@ -59,9 +59,9 @@ class AstroBuilder {
   }
   async build({ viteConfig }) {
     const buildConfig = {
-      client: new URL("./client/", this.settings.config.outDir),
-      server: new URL("./server/", this.settings.config.outDir),
-      serverEntry: "entry.mjs"
+      client: this.settings.config.build.client,
+      server: this.settings.config.build.server,
+      serverEntry: this.settings.config.build.serverEntry
     };
     await runHookBuildStart({ config: this.settings.config, buildConfig, logging: this.logging });
     this.validateConfig();

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

@@ -2,7 +2,6 @@ import crypto from "crypto";
 import esbuild from "esbuild";
 import npath from "path";
 import { isCSSRequest } from "../render/util.js";
-import { relativeToSrcDir } from "../util.js";
 import { getTopLevelPages, moduleIsTopLevelPage, walkParentInfos } from "./graph.js";
 import {
   eachPageData,
@@ -11,32 +10,22 @@ import {
   getPageDatasByHoistedScriptId,
   isHoistedScript
 } from "./internal.js";
-const MAX_NAME_LENGTH = 70;
 function rollupPluginAstroBuildCSS(options) {
   const { internals, buildOptions } = options;
   const { settings } = buildOptions;
   let resolvedConfig;
-  function nameifyPage(id) {
-    let rel = relativeToSrcDir(settings.config, id);
-    if (rel.startsWith("pages/")) {
-      rel = rel.slice(6);
-    }
-    const ext = npath.extname(rel);
-    const noext = rel.slice(0, rel.length - ext.length);
-    const named = noext.replace(/\//g, "-");
-    return named;
-  }
   function createNameForParentPages(id, ctx) {
+    var _a;
     const parents = Array.from(getTopLevelPages(id, ctx));
-    const proposedName = parents.map(([page]) => nameifyPage(page.id)).sort().join("-");
-    if (proposedName.length <= MAX_NAME_LENGTH) {
-      return proposedName;
-    }
+    const firstParentId = (_a = parents[0]) == null ? void 0 : _a[0].id;
+    const firstParentName = firstParentId ? npath.parse(firstParentId).name : "index";
     const hash = crypto.createHash("sha256");
     for (const [page] of parents) {
       hash.update(page.id, "utf-8");
     }
-    return hash.digest("hex").slice(0, 8);
+    const h = hash.digest("hex").slice(0, 8);
+    const proposedName = firstParentName + "." + h;
+    return proposedName;
   }
   function* getParentClientOnlys(id, ctx) {
     for (const [info] of walkParentInfos(id, ctx)) {

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

@@ -14,7 +14,7 @@ interface LoadConfigOptions {
     validate?: boolean;
     logging: LogOptions;
     /** Invalidate when reloading a previously loaded config */
-    isConfigReload?: boolean;
+    isRestart?: boolean;
 }
 /**
  * Resolve the file URL of the user's `astro.config.js|cjs|mjs|ts` file

package/dist/core/config/config.js

@@ -6,7 +6,7 @@ import path from "path";
 import { fileURLToPath, pathToFileURL } from "url";
 import * as vite from "vite";
 import { mergeConfig as mergeViteConfig } from "vite";
-import { arraify, isObject } from "../util.js";
+import { arraify, isObject, isURL } from "../util.js";
 import { createRelativeSchema } from "./schema.js";
 load.use([loadTypeScript]);
 const LEGACY_ASTRO_CONFIG_KEYS = /* @__PURE__ */ new Set([
@@ -150,7 +150,7 @@ async function tryLoadConfig(configOptions, flags, root) {
     });
     if (!configPath)
       return void 0;
-    if (configOptions.isConfigReload) {
+    if (configOptions.isRestart) {
       const tempConfigPath = path.join(
         root,
         `.temp.${Date.now()}.config${path.extname(configPath)}`
@@ -237,6 +237,10 @@ function mergeConfigRecursively(defaults, overrides, rootPath) {
       merged[key] = [...arraify(existing ?? []), ...arraify(value ?? [])];
       continue;
     }
+    if (isURL(existing) && isURL(value)) {
+      merged[key] = value;
+      continue;
+    }
     if (isObject(existing) && isObject(value)) {
       merged[key] = mergeConfigRecursively(existing, value, rootPath ? `${rootPath}.${key}` : key);
       continue;

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

@@ -1,4 +1,4 @@
 export { openConfig, resolveConfigPath, resolveFlags, resolveRoot, validateConfig, } from './config.js';
 export type { AstroConfigSchema } from './schema';
 export { createSettings } from './settings.js';
-export { loadTSConfig } from './tsconfig.js';
+export { loadTSConfig, updateTSConfigForFramework } from './tsconfig.js';

package/dist/core/config/index.js

@@ -6,7 +6,7 @@ import {
   validateConfig
 } from "./config.js";
 import { createSettings } from "./settings.js";
-import { loadTSConfig } from "./tsconfig.js";
+import { loadTSConfig, updateTSConfigForFramework } from "./tsconfig.js";
 export {
   createSettings,
   loadTSConfig,
@@ -14,5 +14,6 @@ export {
   resolveConfigPath,
   resolveFlags,
   resolveRoot,
+  updateTSConfigForFramework,
   validateConfig
 };

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

@@ -36,10 +36,19 @@ export declare const AstroConfigSchema: z.ZodObject<{
     }[], unknown>;
     build: z.ZodDefault<z.ZodOptional<z.ZodObject<{
         format: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"file">, z.ZodLiteral<"directory">]>>>;
+        client: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
+        server: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
+        serverEntry: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     }, "strip", z.ZodTypeAny, {
+        server: URL;
         format: "file" | "directory";
+        client: URL;
+        serverEntry: string;
     }, {
+        server?: string | undefined;
         format?: "file" | "directory" | undefined;
+        client?: string | undefined;
+        serverEntry?: string | undefined;
     }>>>;
     server: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodObject<{
         host: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodBoolean]>>>;
@@ -164,7 +173,10 @@ export declare const AstroConfigSchema: z.ZodObject<{
         hooks: {};
     }[];
     build: {
+        server: URL;
         format: "file" | "directory";
+        client: URL;
+        serverEntry: string;
     };
     style: {
         postcss: {
@@ -205,7 +217,10 @@ export declare const AstroConfigSchema: z.ZodObject<{
     } | undefined;
     integrations?: unknown;
     build?: {
+        server?: string | undefined;
         format?: "file" | "directory" | undefined;
+        client?: string | undefined;
+        serverEntry?: string | undefined;
     } | undefined;
     style?: {
         postcss?: {
@@ -218,7 +233,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         astroFlavoredMarkdown?: boolean | undefined;
     } | undefined;
 }>;
-export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL): z.ZodObject<z.extendShape<{
+export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL): z.ZodEffects<z.ZodObject<z.extendShape<{
     root: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
     srcDir: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
     publicDir: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
@@ -252,10 +267,19 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
     }[], unknown>;
     build: z.ZodDefault<z.ZodOptional<z.ZodObject<{
         format: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"file">, z.ZodLiteral<"directory">]>>>;
+        client: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
+        server: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
+        serverEntry: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     }, "strip", z.ZodTypeAny, {
+        server: URL;
         format: "file" | "directory";
+        client: URL;
+        serverEntry: string;
     }, {
+        server?: string | undefined;
         format?: "file" | "directory" | undefined;
+        client?: string | undefined;
+        serverEntry?: string | undefined;
     }>>>;
     server: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodObject<{
         host: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodBoolean]>>>;
@@ -350,6 +374,22 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
     srcDir: z.ZodEffects<z.ZodDefault<z.ZodString>, URL, string | undefined>;
     publicDir: z.ZodEffects<z.ZodDefault<z.ZodString>, URL, string | undefined>;
     outDir: z.ZodEffects<z.ZodDefault<z.ZodString>, URL, string | undefined>;
+    build: z.ZodDefault<z.ZodOptional<z.ZodObject<{
+        format: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"file">, z.ZodLiteral<"directory">]>>>;
+        client: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
+        server: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
+        serverEntry: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    }, "strip", z.ZodTypeAny, {
+        server: URL;
+        format: "file" | "directory";
+        client: URL;
+        serverEntry: string;
+    }, {
+        server?: string | undefined;
+        format?: "file" | "directory" | undefined;
+        client?: string | undefined;
+        serverEntry?: string | undefined;
+    }>>>;
     server: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodObject<{
         host: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodBoolean]>>>;
         port: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
@@ -425,7 +465,102 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         hooks: {};
     }[];
     build: {
+        server: URL;
+        format: "file" | "directory";
+        client: URL;
+        serverEntry: string;
+    };
+    style: {
+        postcss: {
+            options?: any;
+            plugins: any[];
+        };
+    };
+    vite: ViteUserConfig;
+    legacy: {
+        astroFlavoredMarkdown: boolean;
+    };
+}, {
+    site?: string | undefined;
+    base?: string | undefined;
+    markdown?: {
+        drafts?: boolean | undefined;
+        syntaxHighlight?: false | "shiki" | "prism" | undefined;
+        shikiConfig?: {
+            langs?: ILanguageRegistration[] | undefined;
+            theme?: string | import("shiki").IShikiTheme | undefined;
+            wrap?: boolean | null | undefined;
+        } | undefined;
+        remarkPlugins?: (string | [string, any] | RemarkPlugin<any[]> | [RemarkPlugin<any[]>, any])[] | undefined;
+        rehypePlugins?: (string | [string, any] | RehypePlugin<any[]> | [RehypePlugin<any[]>, any])[] | undefined;
+        remarkRehype?: RemarkRehype | undefined;
+        extendDefaultPlugins?: boolean | undefined;
+    } | undefined;
+    root?: string | undefined;
+    srcDir?: string | undefined;
+    publicDir?: string | undefined;
+    outDir?: string | undefined;
+    trailingSlash?: "never" | "always" | "ignore" | undefined;
+    server?: unknown;
+    output?: "static" | "server" | undefined;
+    adapter?: {
+        hooks?: {} | undefined;
+        name: string;
+    } | undefined;
+    integrations?: unknown;
+    build?: {
+        server?: string | undefined;
+        format?: "file" | "directory" | undefined;
+        client?: string | undefined;
+        serverEntry?: string | undefined;
+    } | undefined;
+    style?: {
+        postcss?: unknown;
+    } | undefined;
+    vite?: ViteUserConfig | undefined;
+    legacy?: {
+        astroFlavoredMarkdown?: boolean | undefined;
+    } | undefined;
+}>, {
+    site?: string | undefined;
+    adapter?: {
+        name: string;
+        hooks: {};
+    } | undefined;
+    base: string;
+    markdown: {
+        drafts: boolean;
+        syntaxHighlight: false | "shiki" | "prism";
+        shikiConfig: {
+            langs: ILanguageRegistration[];
+            theme: string | import("shiki").IShikiTheme;
+            wrap: boolean | null;
+        };
+        remarkPlugins: (string | [string, any] | RemarkPlugin<any[]> | [RemarkPlugin<any[]>, any])[];
+        rehypePlugins: (string | [string, any] | RehypePlugin<any[]> | [RehypePlugin<any[]>, any])[];
+        remarkRehype: RemarkRehype;
+        extendDefaultPlugins: boolean;
+    };
+    root: URL;
+    srcDir: URL;
+    publicDir: URL;
+    outDir: URL;
+    trailingSlash: "never" | "always" | "ignore";
+    server: {
+        host: string | boolean;
+        port: number;
+        streaming: boolean;
+    };
+    output: "static" | "server";
+    integrations: {
+        name: string;
+        hooks: {};
+    }[];
+    build: {
+        server: URL;
         format: "file" | "directory";
+        client: URL;
+        serverEntry: string;
     };
     style: {
         postcss: {
@@ -466,7 +601,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
     } | undefined;
     integrations?: unknown;
     build?: {
+        server?: string | undefined;
         format?: "file" | "directory" | undefined;
+        client?: string | undefined;
+        serverEntry?: string | undefined;
     } | undefined;
     style?: {
         postcss?: unknown;

package/dist/core/config/schema.js

@@ -11,7 +11,12 @@ const ASTRO_CONFIG_DEFAULTS = {
   outDir: "./dist",
   base: "/",
   trailingSlash: "ignore",
-  build: { format: "directory" },
+  build: {
+    format: "directory",
+    client: "./dist/client/",
+    server: "./dist/server/",
+    serverEntry: "entry.mjs"
+  },
   server: {
     host: false,
     port: 3e3,
@@ -51,7 +56,10 @@ const AstroConfigSchema = z.object({
     z.array(z.object({ name: z.string(), hooks: z.object({}).passthrough().default({}) })).default(ASTRO_CONFIG_DEFAULTS.integrations)
   ),
   build: z.object({
-    format: z.union([z.literal("file"), z.literal("directory")]).optional().default(ASTRO_CONFIG_DEFAULTS.build.format)
+    format: z.union([z.literal("file"), z.literal("directory")]).optional().default(ASTRO_CONFIG_DEFAULTS.build.format),
+    client: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.client).transform((val) => new URL(val)),
+    server: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.server).transform((val) => new URL(val)),
+    serverEntry: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.serverEntry)
   }).optional().default({}),
   server: z.preprocess(
     (val) => typeof val === "function" ? val({ command: "error" }) : val,
@@ -122,6 +130,12 @@ function createRelativeSchema(cmd, fileProtocolRoot) {
     srcDir: z.string().default(ASTRO_CONFIG_DEFAULTS.srcDir).transform((val) => new URL(appendForwardSlash(val), fileProtocolRoot)),
     publicDir: z.string().default(ASTRO_CONFIG_DEFAULTS.publicDir).transform((val) => new URL(appendForwardSlash(val), fileProtocolRoot)),
     outDir: z.string().default(ASTRO_CONFIG_DEFAULTS.outDir).transform((val) => new URL(appendForwardSlash(val), fileProtocolRoot)),
+    build: z.object({
+      format: z.union([z.literal("file"), z.literal("directory")]).optional().default(ASTRO_CONFIG_DEFAULTS.build.format),
+      client: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.client).transform((val) => new URL(val, fileProtocolRoot)),
+      server: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.server).transform((val) => new URL(val, fileProtocolRoot)),
+      serverEntry: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.serverEntry)
+    }).optional().default({}),
     server: z.preprocess(
       (val) => typeof val === "function" ? val({ command: cmd === "dev" ? "dev" : "preview" }) : val,
       z.object({
@@ -139,6 +153,14 @@ function createRelativeSchema(cmd, fileProtocolRoot) {
         }).optional().default(ASTRO_CONFIG_DEFAULTS.style.postcss)
       )
     }).optional().default({})
+  }).transform((config) => {
+    if (!config.build.server.toString().startsWith(config.outDir.toString()) && config.build.server.toString().endsWith("dist/server/")) {
+      config.build.server = new URL("./dist/server/", config.outDir);
+    }
+    if (!config.build.client.toString().startsWith(config.outDir.toString()) && config.build.client.toString().endsWith("dist/client/")) {
+      config.build.client = new URL("./dist/client/", config.outDir);
+    }
+    return config;
   });
   return AstroConfigRelativeSchema;
 }

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

@@ -1,8 +1,2 @@
-import type { TsConfigJson } from 'tsconfig-resolver';
 import type { AstroConfig, AstroSettings } from '../../@types/astro';
-export interface CreateSettings {
-    config: AstroConfig;
-    tsConfig?: TsConfigJson;
-    tsConfigPath?: string;
-}
-export declare function createSettings({ config, tsConfig, tsConfigPath }: CreateSettings): AstroSettings;
+export declare function createSettings(config: AstroConfig, cwd?: string): AstroSettings;

package/dist/core/config/settings.js

@@ -1,14 +1,17 @@
 import jsxRenderer from "../../jsx/renderer.js";
-function createSettings({ config, tsConfig, tsConfigPath }) {
+import { loadTSConfig } from "./tsconfig.js";
+function createSettings(config, cwd) {
+  const tsconfig = loadTSConfig(cwd);
   return {
     config,
-    tsConfig,
-    tsConfigPath,
+    tsConfig: tsconfig == null ? void 0 : tsconfig.config,
+    tsConfigPath: tsconfig == null ? void 0 : tsconfig.path,
     adapter: void 0,
     injectedRoutes: [],
     pageExtensions: [".astro", ".md", ".html"],
     renderers: [jsxRenderer],
-    scripts: []
+    scripts: [],
+    watchFiles: (tsconfig == null ? void 0 : tsconfig.exists) ? [tsconfig.path, ...tsconfig.extendedPaths] : []
   };
 }
 export {

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

@@ -1,2 +1,11 @@
 import * as tsr from 'tsconfig-resolver';
-export declare function loadTSConfig(cwd: string | undefined): tsr.TsConfigResult | undefined;
+export declare const defaultTSConfig: tsr.TsConfigJson;
+export declare type frameworkWithTSSettings = 'vue' | 'react' | 'preact' | 'solid-js';
+export declare const presets: Map<frameworkWithTSSettings, tsr.TsConfigJson>;
+/**
+ * Load a tsconfig.json or jsconfig.json is the former is not found
+ * @param cwd Directory to start from
+ * @param resolve Determine if the function should go up directories like TypeScript would
+ */
+export declare function loadTSConfig(cwd: string | undefined, resolve?: boolean): tsr.TsConfigResult;
+export declare function updateTSConfigForFramework(target: tsr.TsConfigJson, framework: frameworkWithTSSettings): tsr.TsConfigJson;