astro 2.9.7 → 3.0.0-beta.0

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

@@ -1,7 +1,7 @@
 import glob from "fast-glob";
 import { join } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
-import { runHookBuildSsr } from "../../../integrations/index.js";
+import { isFunctionPerRouteEnabled, runHookBuildSsr } from "../../../integrations/index.js";
 import { isServerLikeOutput } from "../../../prerender/utils.js";
 import { BEFORE_HYDRATION_SCRIPT_ID, PAGE_SCRIPT_ID } from "../../../vite-plugin-scripts/index.js";
 import { joinPaths, prependForwardSlash } from "../../path.js";
@@ -82,11 +82,13 @@ function vitePluginSSR(internals, adapter, options) {
 }
 function pluginSSR(options, internals) {
   const ssr = isServerLikeOutput(options.settings.config);
+  const functionPerRouteEnabled = isFunctionPerRouteEnabled(options.settings.adapter);
   return {
     build: "ssr",
     hooks: {
       "build:before": () => {
-        let vitePlugin = ssr && !options.settings.config.build.split ? vitePluginSSR(internals, options.settings.adapter, options) : void 0;
+        let vitePlugin = ssr && // TODO: Remove in Astro 4.0
+        options.settings.config.build.split === false && functionPerRouteEnabled === false ? vitePluginSSR(internals, options.settings.adapter, options) : void 0;
         return {
           enforce: "after-user-plugins",
           vitePlugin
@@ -96,7 +98,7 @@ function pluginSSR(options, internals) {
         if (!ssr) {
           return;
         }
-        if (options.settings.config.build.split) {
+        if (options.settings.config.build.split || functionPerRouteEnabled) {
           return;
         }
         if (!internals.ssrEntryChunk) {
@@ -120,11 +122,12 @@ function pluginSSR(options, internals) {
 const SPLIT_MODULE_ID = "@astro-page-split:";
 const RESOLVED_SPLIT_MODULE_ID = "\0@astro-page-split:";
 function vitePluginSSRSplit(internals, adapter, options) {
+  const functionPerRouteEnabled = isFunctionPerRouteEnabled(options.settings.adapter);
   return {
     name: "@astrojs/vite-plugin-astro-ssr-split",
     enforce: "post",
     options(opts) {
-      if (options.settings.config.build.split) {
+      if (options.settings.config.build.split || functionPerRouteEnabled) {
         const inputs = /* @__PURE__ */ new Set();
         for (const path of Object.keys(options.allPages)) {
           inputs.add(getVirtualModulePageNameFromPath(SPLIT_MODULE_ID, path));
@@ -182,11 +185,12 @@ function vitePluginSSRSplit(internals, adapter, options) {
 }
 function pluginSSRSplit(options, internals) {
   const ssr = isServerLikeOutput(options.settings.config);
+  const functionPerRouteEnabled = isFunctionPerRouteEnabled(options.settings.adapter);
   return {
     build: "ssr",
     hooks: {
       "build:before": () => {
-        let vitePlugin = ssr && options.settings.config.build.split ? vitePluginSSRSplit(internals, options.settings.adapter, options) : void 0;
+        let vitePlugin = ssr && (options.settings.config.build.split || functionPerRouteEnabled) ? vitePluginSSRSplit(internals, options.settings.adapter, options) : void 0;
         return {
           enforce: "after-user-plugins",
           vitePlugin
@@ -196,7 +200,7 @@ function pluginSSRSplit(options, internals) {
         if (!ssr) {
           return;
         }
-        if (!options.settings.config.build.split) {
+        if (!options.settings.config.build.split && !functionPerRouteEnabled) {
           return;
         }
         if (internals.ssrSplitEntryChunks.size === 0) {
@@ -222,7 +226,7 @@ function generateSSRCode(config, adapter) {
   const imports = [];
   const contents = [];
   let pageMap;
-  if (config.build.split) {
+  if (config.build.split || isFunctionPerRouteEnabled(adapter)) {
     pageMap = "pageModule";
   } else {
     pageMap = "pageMap";
@@ -264,7 +268,7 @@ function injectManifest(manifest, chunk) {
   });
 }
 async function createManifest(buildOpts, internals) {
-  if (buildOpts.settings.config.build.split) {
+  if (buildOpts.settings.config.build.split || isFunctionPerRouteEnabled(buildOpts.settings.adapter)) {
     if (internals.ssrSplitEntryChunks.size === 0) {
       throw new Error(`Did not generate an entry chunk for SSR in serverless mode`);
     }

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

@@ -30,7 +30,6 @@ import { RESOLVED_SPLIT_MODULE_ID, SSR_VIRTUAL_MODULE_ID } from "./plugins/plugi
 import { ASTRO_PAGE_EXTENSION_POST_PATTERN } from "./plugins/util.js";
 import { getTimeStat } from "./util.js";
 async function viteBuild(opts) {
-  var _a, _b, _c;
   const { allPages, settings } = opts;
   if (isModeServerWithNoAdapter(opts.settings)) {
     throw new AstroError(AstroErrorData.NoAdapterInstalled);
@@ -48,7 +47,7 @@ async function viteBuild(opts) {
       facadeIdToPageDataMap.set(fileURLToPath(astroModuleURL), pageData);
     }
   }
-  if (((_c = (_b = (_a = settings.config) == null ? void 0 : _a.vite) == null ? void 0 : _b.build) == null ? void 0 : _c.emptyOutDir) !== false) {
+  if (settings.config?.vite?.build?.emptyOutDir !== false) {
     emptyDir(settings.config.outDir, new Set(".git"));
   }
   const container = createPluginContainer(opts, internals);
@@ -102,7 +101,6 @@ ${bgMagenta(black(" finalizing server assets "))}
   }
 }
 async function ssrBuild(opts, internals, input, container) {
-  var _a, _b, _c, _d, _e;
   const { allPages, settings, viteConfig } = opts;
   const ssr = isServerLikeOutput(settings.config);
   const out = ssr ? settings.config.build.server : getOutDirWithinCwd(settings.config.outDir);
@@ -116,14 +114,14 @@ async function ssrBuild(opts, internals, input, container) {
       target: "esnext",
       // Vite defaults cssMinify to false in SSR by default, but we want to minify it
       // as the CSS generated are used and served to the client.
-      cssMinify: ((_a = viteConfig.build) == null ? void 0 : _a.minify) == null ? true : !!((_b = viteConfig.build) == null ? void 0 : _b.minify),
+      cssMinify: viteConfig.build?.minify == null ? true : !!viteConfig.build?.minify,
       ...viteConfig.build,
       emptyOutDir: false,
       manifest: false,
       outDir: fileURLToPath(out),
       copyPublicDir: !ssr,
       rollupOptions: {
-        ...(_c = viteConfig.build) == null ? void 0 : _c.rollupOptions,
+        ...viteConfig.build?.rollupOptions,
         input: [],
         output: {
           format: "esm",
@@ -131,16 +129,15 @@ async function ssrBuild(opts, internals, input, container) {
           // We need to keep these separate
           chunkFileNames: `chunks/[name].[hash].mjs`,
           assetFileNames: `${settings.config.build.assets}/[name].[hash][extname]`,
-          ...(_e = (_d = viteConfig.build) == null ? void 0 : _d.rollupOptions) == null ? void 0 : _e.output,
+          ...viteConfig.build?.rollupOptions?.output,
           entryFileNames(chunkInfo) {
-            var _a2, _b2;
-            if ((_a2 = chunkInfo.facadeModuleId) == null ? void 0 : _a2.startsWith(ASTRO_PAGE_RESOLVED_MODULE_ID)) {
+            if (chunkInfo.facadeModuleId?.startsWith(ASTRO_PAGE_RESOLVED_MODULE_ID)) {
               return makeAstroPageEntryPointFileName(
                 ASTRO_PAGE_RESOLVED_MODULE_ID,
                 chunkInfo.facadeModuleId,
                 routes
               );
-            } else if ((_b2 = chunkInfo.facadeModuleId) == null ? void 0 : _b2.startsWith(RESOLVED_SPLIT_MODULE_ID)) {
+            } else if (chunkInfo.facadeModuleId?.startsWith(RESOLVED_SPLIT_MODULE_ID)) {
               return makeSplitEntryPointFileName(chunkInfo.facadeModuleId, routes);
             } else if (chunkInfo.facadeModuleId === SSR_VIRTUAL_MODULE_ID) {
               return opts.settings.config.build.serverEntry;
@@ -173,7 +170,6 @@ async function ssrBuild(opts, internals, input, container) {
   return await vite.build(updatedViteBuildConfig);
 }
 async function clientBuild(opts, internals, input, container) {
-  var _a, _b, _c;
   const { settings, viteConfig } = opts;
   const timer = performance.now();
   const ssr = isServerLikeOutput(settings.config);
@@ -197,14 +193,14 @@ ${bgGreen(black(" building client "))}`);
       emptyOutDir: false,
       outDir: fileURLToPath(out),
       rollupOptions: {
-        ...(_a = viteConfig.build) == null ? void 0 : _a.rollupOptions,
+        ...viteConfig.build?.rollupOptions,
         input: Array.from(input),
         output: {
           format: "esm",
           entryFileNames: `${settings.config.build.assets}/[name].[hash].js`,
           chunkFileNames: `${settings.config.build.assets}/[name].[hash].js`,
           assetFileNames: `${settings.config.build.assets}/[name].[hash][extname]`,
-          ...(_c = (_b = viteConfig.build) == null ? void 0 : _b.rollupOptions) == null ? void 0 : _c.output
+          ...viteConfig.build?.rollupOptions?.output
         },
         preserveEntrySignatures: "exports-only"
       }

package/dist/core/client-directive/build.js

@@ -1,6 +1,5 @@
 import { build } from "esbuild";
 async function buildClientDirectiveEntrypoint(name, entrypoint) {
-  var _a;
   const stringifiedName = JSON.stringify(name);
   const stringifiedEntrypoint = JSON.stringify(entrypoint);
   const output = await build({
@@ -18,7 +17,7 @@ window.dispatchEvent(new Event('astro:' + ${stringifiedName}));`,
     bundle: true,
     write: false
   });
-  const outputFile = (_a = output.outputFiles) == null ? void 0 : _a[0];
+  const outputFile = output.outputFiles?.[0];
   if (!outputFile)
     return "";
   return outputFile.text;

package/dist/core/compile/compile.js

@@ -1,7 +1,7 @@
 import { transform } from "@astrojs/compiler";
 import { fileURLToPath } from "node:url";
 import { normalizePath } from "vite";
-import { AggregateError, CompilerError } from "../errors/errors.js";
+import { AggregateError, AstroError, CompilerError } from "../errors/errors.js";
 import { AstroErrorData } from "../errors/index.js";
 import { resolvePath } from "../util.js";
 import { createStylePreprocessor } from "./style.js";
@@ -25,6 +25,7 @@ async function compile({
       scopedStyleStrategy: astroConfig.scopedStyleStrategy,
       resultScopedSlot: true,
       experimentalTransitions: astroConfig.experimental.viewTransitions,
+      experimentalPersistence: astroConfig.experimental.viewTransitions,
       transitionsAnimationURL: "astro/components/viewtransitions.css",
       preprocessStyle: createStylePreprocessor({
         filename,

package/dist/core/compile/style.js

@@ -8,12 +8,11 @@ function createStylePreprocessor({
   cssTransformErrors
 }) {
   return async (content, attrs) => {
-    var _a;
-    const lang = `.${(attrs == null ? void 0 : attrs.lang) || "css"}`.toLowerCase();
+    const lang = `.${attrs?.lang || "css"}`.toLowerCase();
     const id = `${filename}?astro&type=style&lang${lang}`;
     try {
       const result = await preprocessCSS(content, id, viteConfig);
-      (_a = result.deps) == null ? void 0 : _a.forEach((dep) => {
+      result.deps?.forEach((dep) => {
         cssDeps.add(dep);
       });
       let map;

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

@@ -49,7 +49,15 @@ export declare const AstroConfigSchema: z.ZodObject<{
         serverEntry: z.ZodDefault<z.ZodOptional<z.ZodString>>;
         redirects: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         inlineStylesheets: z.ZodDefault<z.ZodOptional<z.ZodEnum<["always", "auto", "never"]>>>;
+        /**
+         * @deprecated
+         * Use the adapter feature instead
+         */
         split: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+        /**
+         * @deprecated
+         * Use the adapter feature instead
+         */
         excludeMiddleware: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     }, "strip", z.ZodTypeAny, {
         assetsPrefix?: string | undefined;

package/dist/core/config/schema.js

@@ -23,10 +23,10 @@ const ASTRO_CONFIG_DEFAULTS = {
     split: false,
     excludeMiddleware: false
   },
-  compressHTML: false,
+  compressHTML: true,
   server: {
     host: false,
-    port: 3e3,
+    port: 4321,
     open: false
   },
   integrations: [],
@@ -70,7 +70,15 @@ const AstroConfigSchema = z.object({
     serverEntry: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.serverEntry),
     redirects: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.build.redirects),
     inlineStylesheets: z.enum(["always", "auto", "never"]).optional().default(ASTRO_CONFIG_DEFAULTS.build.inlineStylesheets),
+    /**
+     * @deprecated
+     * Use the adapter feature instead
+     */
     split: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.build.split),
+    /**
+     * @deprecated
+     * Use the adapter feature instead
+     */
     excludeMiddleware: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.build.excludeMiddleware)
   }).optional().default({}),
   server: z.preprocess(
@@ -114,7 +122,7 @@ const AstroConfigSchema = z.object({
       config: z.record(z.any()).default({})
     })
   }).default({
-    service: { entrypoint: "astro/assets/services/squoosh", config: {} }
+    service: { entrypoint: "astro/assets/services/sharp", config: {} }
   }),
   markdown: z.object({
     drafts: z.boolean().default(false),

package/dist/core/config/settings.js

@@ -93,12 +93,12 @@ function createBaseSettings(config) {
 function createSettings(config, cwd) {
   const tsconfig = loadTSConfig(cwd);
   const settings = createBaseSettings(config);
-  const watchFiles = (tsconfig == null ? void 0 : tsconfig.exists) ? [tsconfig.path, ...tsconfig.extendedPaths] : [];
+  const watchFiles = tsconfig?.exists ? [tsconfig.path, ...tsconfig.extendedPaths] : [];
   if (cwd) {
     watchFiles.push(fileURLToPath(new URL("./package.json", pathToFileURL(cwd))));
   }
-  settings.tsConfig = tsconfig == null ? void 0 : tsconfig.config;
-  settings.tsConfigPath = tsconfig == null ? void 0 : tsconfig.path;
+  settings.tsConfig = tsconfig?.config;
+  settings.tsConfigPath = tsconfig?.path;
   settings.watchFiles = watchFiles;
   return settings;
 }

package/dist/core/config/timer.js

@@ -1,18 +1,18 @@
 import fs from "node:fs";
 class AstroTimer {
+  enabled;
+  ongoingTimers = /* @__PURE__ */ new Map();
+  stats = {};
   constructor() {
-    this.ongoingTimers = /* @__PURE__ */ new Map();
-    this.stats = {};
     this.enabled = !!process.env.ASTRO_TIMER_PATH;
   }
   /**
    * Start a timer for a scope with a given name.
    */
   start(name) {
-    var _a;
     if (!this.enabled)
       return;
-    (_a = globalThis.gc) == null ? void 0 : _a.call(globalThis);
+    globalThis.gc?.();
     this.ongoingTimers.set(name, {
       startTime: performance.now(),
       startHeap: process.memoryUsage().heapUsed
@@ -22,13 +22,12 @@ class AstroTimer {
    * End a timer for a scope with a given name.
    */
   end(name) {
-    var _a;
     if (!this.enabled)
       return;
     const stat = this.ongoingTimers.get(name);
     if (!stat)
       return;
-    (_a = globalThis.gc) == null ? void 0 : _a.call(globalThis);
+    globalThis.gc?.();
     const endHeap = process.memoryUsage().heapUsed;
     this.stats[name] = {
       elapsedTime: performance.now() - stat.startTime,

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "2.9.7";
+const ASTRO_VERSION = "3.0.0-beta.0";
 const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
   ".markdown",
   ".mdown",

package/dist/core/cookies/cookies.d.ts

@@ -9,20 +9,20 @@ interface AstroCookieSetOptions {
 }
 type AstroCookieDeleteOptions = Pick<AstroCookieSetOptions, 'domain' | 'path'>;
 interface AstroCookieInterface {
-    value: string | undefined;
+    value: string;
     json(): Record<string, any>;
     number(): number;
     boolean(): boolean;
 }
 interface AstroCookiesInterface {
-    get(key: string): AstroCookieInterface;
+    get(key: string): AstroCookieInterface | undefined;
     has(key: string): boolean;
     set(key: string, value: string | number | boolean | Record<string, any>, options?: AstroCookieSetOptions): void;
     delete(key: string, options?: AstroCookieDeleteOptions): void;
 }
 declare class AstroCookie implements AstroCookieInterface {
-    value: string | undefined;
-    constructor(value: string | undefined);
+    value: string;
+    constructor(value: string);
     json(): any;
     number(): number;
     boolean(): boolean;
@@ -44,7 +44,7 @@ declare class AstroCookies implements AstroCookiesInterface {
      * @param key The cookie to get.
      * @returns An object containing the cookie value as well as convenience methods for converting its value.
      */
-    get(key: string): AstroCookie;
+    get(key: string): AstroCookie | undefined;
     /**
      * Astro.cookies.has(key) returns a boolean indicating whether this cookie is either
      * part of the initial request or set via Astro.cookies.set(key)

package/dist/core/cookies/cookies.js

@@ -43,10 +43,10 @@ class AstroCookies {
     const serializeOptions = {
       expires: DELETED_EXPIRATION
     };
-    if (options == null ? void 0 : options.domain) {
+    if (options?.domain) {
       serializeOptions.domain = options.domain;
     }
-    if (options == null ? void 0 : options.path) {
+    if (options?.path) {
       serializeOptions.path = options.path;
     }
     this.#ensureOutgoingMap().set(key, [
@@ -63,18 +63,19 @@ class AstroCookies {
    * @returns An object containing the cookie value as well as convenience methods for converting its value.
    */
   get(key) {
-    var _a;
-    if ((_a = this.#outgoing) == null ? void 0 : _a.has(key)) {
+    if (this.#outgoing?.has(key)) {
       let [serializedValue, , isSetValue] = this.#outgoing.get(key);
       if (isSetValue) {
         return new AstroCookie(serializedValue);
       } else {
-        return new AstroCookie(void 0);
+        return void 0;
       }
     }
     const values = this.#ensureParsed();
-    const value = values[key];
-    return new AstroCookie(value);
+    if (key in values) {
+      const value = values[key];
+      return new AstroCookie(value);
+    }
   }
   /**
    * Astro.cookies.has(key) returns a boolean indicating whether this cookie is either
@@ -83,8 +84,7 @@ class AstroCookies {
    * @returns
    */
   has(key) {
-    var _a;
-    if ((_a = this.#outgoing) == null ? void 0 : _a.has(key)) {
+    if (this.#outgoing?.has(key)) {
       let [, , isSetValue] = this.#outgoing.get(key);
       return isSetValue;
     }

package/dist/core/create-vite.js

@@ -46,20 +46,18 @@ const ONLY_DEV_EXTERNAL = [
   "string-width"
 ];
 async function createVite(commandConfig, { settings, logging, mode, command, fs = nodeFs }) {
-  var _a, _b;
   const astroPkgsConfig = await crawlFrameworkPkgs({
     root: fileURLToPath(settings.config.root),
     isBuild: mode === "build",
     viteUserConfig: settings.config.vite,
     isFrameworkPkgByJson(pkgJson) {
-      var _a2, _b2, _c, _d, _e;
-      if (((_a2 = pkgJson == null ? void 0 : pkgJson.astro) == null ? void 0 : _a2.external) === true) {
+      if (pkgJson?.astro?.external === true) {
         return false;
       }
       return (
         // Attempt: package relies on `astro`. ✅ Definitely an Astro package
-        ((_b2 = pkgJson.peerDependencies) == null ? void 0 : _b2.astro) || ((_c = pkgJson.dependencies) == null ? void 0 : _c.astro) || // Attempt: package is tagged with `astro` or `astro-component`. ✅ Likely a community package
-        ((_d = pkgJson.keywords) == null ? void 0 : _d.includes("astro")) || ((_e = pkgJson.keywords) == null ? void 0 : _e.includes("astro-component")) || // Attempt: package is named `astro-something` or `@scope/astro-something`. ✅ Likely a community package
+        pkgJson.peerDependencies?.astro || pkgJson.dependencies?.astro || // Attempt: package is tagged with `astro` or `astro-component`. ✅ Likely a community package
+        pkgJson.keywords?.includes("astro") || pkgJson.keywords?.includes("astro-component") || // Attempt: package is named `astro-something` or `@scope/astro-something`. ✅ Likely a community package
         /^(@[^\/]+\/)?astro\-/.test(pkgJson.name)
       );
     },
@@ -111,7 +109,7 @@ async function createVite(commandConfig, { settings, logging, mode, command, fs
     ],
     publicDir: fileURLToPath(settings.config.publicDir),
     root: fileURLToPath(settings.config.root),
-    envPrefix: ((_a = settings.config.vite) == null ? void 0 : _a.envPrefix) ?? "PUBLIC_",
+    envPrefix: settings.config.vite?.envPrefix ?? "PUBLIC_",
     define: {
       "import.meta.env.SITE": settings.config.site ? JSON.stringify(settings.config.site) : "undefined"
     },
@@ -161,7 +159,7 @@ async function createVite(commandConfig, { settings, logging, mode, command, fs
     };
   }
   let result = commonConfig;
-  if (command && ((_b = settings.config.vite) == null ? void 0 : _b.plugins)) {
+  if (command && settings.config.vite?.plugins) {
     let { plugins, ...rest } = settings.config.vite;
     const applyToFilter = command === "build" ? "serve" : "build";
     const applyArgs = [
@@ -169,7 +167,7 @@ async function createVite(commandConfig, { settings, logging, mode, command, fs
       { command: command === "dev" ? "serve" : command, mode }
     ];
     plugins = plugins.flat(Infinity).filter((p) => {
-      if (!p || (p == null ? void 0 : p.apply) === applyToFilter) {
+      if (!p || p?.apply === applyToFilter) {
         return false;
       }
       if (typeof p.apply === "function") {
@@ -182,29 +180,9 @@ async function createVite(commandConfig, { settings, logging, mode, command, fs
     result = vite.mergeConfig(result, settings.config.vite || {});
   }
   result = vite.mergeConfig(result, commandConfig);
-  if (result.plugins) {
-    sortPlugins(result.plugins);
-  }
   result.customLogger = vite.createLogger(result.logLevel ?? "warn");
   return result;
 }
-function isVitePlugin(plugin) {
-  return Boolean(plugin == null ? void 0 : plugin.hasOwnProperty("name"));
-}
-function findPluginIndexByName(pluginOptions, name) {
-  return pluginOptions.findIndex(function(pluginOption) {
-    return isVitePlugin(pluginOption) && pluginOption.name === name;
-  });
-}
-function sortPlugins(pluginOptions) {
-  const mdxPluginIndex = findPluginIndexByName(pluginOptions, "@mdx-js/rollup");
-  if (mdxPluginIndex === -1)
-    return;
-  const jsxPluginIndex = findPluginIndexByName(pluginOptions, "astro:jsx");
-  const mdxPlugin = pluginOptions[mdxPluginIndex];
-  pluginOptions.splice(mdxPluginIndex, 1);
-  pluginOptions.splice(jsxPluginIndex, 0, mdxPlugin);
-}
 const COMMON_DEPENDENCIES_NOT_ASTRO = [
   "autoprefixer",
   "react",

package/dist/core/dev/container.d.ts

@@ -26,4 +26,3 @@ export interface CreateContainerParams {
 }
 export declare function createContainer({ isRestart, logging, inlineConfig, settings, fs, }: CreateContainerParams): Promise<Container>;
 export declare function startContainer({ settings, viteServer, logging, }: Container): Promise<AddressInfo>;
-export declare function isStarted(container: Container): boolean;

package/dist/core/dev/container.js

@@ -79,12 +79,7 @@ async function startContainer({
   });
   return devServerAddressInfo;
 }
-function isStarted(container) {
-  var _a;
-  return !!((_a = container.viteServer.httpServer) == null ? void 0 : _a.listening);
-}
 export {
   createContainer,
-  isStarted,
   startContainer
 };

package/dist/core/dev/dev.js

@@ -7,7 +7,6 @@ import * as msg from "../messages.js";
 import { startContainer } from "./container.js";
 import { createContainerWithAutomaticRestart } from "./restart.js";
 async function dev(inlineConfig) {
-  var _a, _b;
   const devStart = performance.now();
   await telemetry.record([]);
   const restart = await createContainerWithAutomaticRestart({ inlineConfig, fs });
@@ -23,11 +22,11 @@ async function dev(inlineConfig) {
       base: restart.container.settings.config.base
     })
   );
-  const currentVersion = "2.9.7";
+  const currentVersion = "3.0.0-beta.0";
   if (currentVersion.includes("-")) {
     warn(logging, null, msg.prerelease({ currentVersion }));
   }
-  if (((_b = (_a = restart.container.viteServer.config.server) == null ? void 0 : _a.fs) == null ? void 0 : _b.strict) === false) {
+  if (restart.container.viteServer.config.server?.fs?.strict === false) {
     warn(logging, null, msg.fsStrictWarning());
   }
   await attachContentServerListeners(restart.container);

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

@@ -1,3 +1,3 @@
-export { createContainer, isStarted, startContainer } from './container.js';
+export { createContainer, startContainer } from './container.js';
 export { default } from './dev.js';
 export { createContainerWithAutomaticRestart } from './restart.js';

package/dist/core/dev/index.js

@@ -1,10 +1,9 @@
-import { createContainer, isStarted, startContainer } from "./container.js";
+import { createContainer, startContainer } from "./container.js";
 import { default as default2 } from "./dev.js";
 import { createContainerWithAutomaticRestart } from "./restart.js";
 export {
   createContainer,
   createContainerWithAutomaticRestart,
   default2 as default,
-  isStarted,
   startContainer
 };

package/dist/core/dev/restart.d.ts

@@ -3,10 +3,7 @@ import nodeFs from 'node:fs';
 import type { AstroInlineConfig } from '../../@types/astro';
 import type { Container } from './container';
 export declare function shouldRestartContainer({ settings, inlineConfig, restartInFlight }: Container, changedFile: string): boolean;
-export declare function restartContainer(container: Container): Promise<{
-    container: Container;
-    error: Error | null;
-}>;
+export declare function restartContainer(container: Container): Promise<Container | Error>;
 export interface CreateContainerWithAutomaticRestart {
     inlineConfig?: AstroInlineConfig;
     fs: typeof nodeFs;

package/dist/core/dev/restart.js

@@ -1,3 +1,4 @@
+import nodeFs from "node:fs";
 import { fileURLToPath } from "node:url";
 import * as vite from "vite";
 import { eventCliSession, telemetry } from "../../events/index.js";
@@ -7,8 +8,8 @@ import { isAstroConfigZodError } from "../errors/errors.js";
 import { createSafeError } from "../errors/index.js";
 import { info, error as logError } from "../logger/core.js";
 import { formatErrorMessage } from "../messages.js";
-import { createContainer, isStarted, startContainer } from "./container.js";
-async function createRestartedContainer(container, settings, needsStart) {
+import { createContainer, startContainer } from "./container.js";
+async function createRestartedContainer(container, settings) {
   const { logging, fs, inlineConfig } = container;
   const newContainer = await createContainer({
     isRestart: true,
@@ -17,9 +18,7 @@ async function createRestartedContainer(container, settings, needsStart) {
     inlineConfig,
     fs
   });
-  if (needsStart) {
-    await startContainer(newContainer);
-  }
+  await startContainer(newContainer);
   return newContainer;
 }
 function shouldRestartContainer({ settings, inlineConfig, restartInFlight }, changedFile) {
@@ -43,15 +42,11 @@ function shouldRestartContainer({ settings, inlineConfig, restartInFlight }, cha
 async function restartContainer(container) {
   const { logging, close, settings: existingSettings } = container;
   container.restartInFlight = true;
-  const needsStart = isStarted(container);
   try {
     const { astroConfig } = await resolveConfig(container.inlineConfig, "dev", container.fs);
     const settings = createSettings(astroConfig, fileURLToPath(existingSettings.config.root));
     await close();
-    return {
-      container: await createRestartedContainer(container, settings, needsStart),
-      error: null
-    };
+    return await createRestartedContainer(container, settings);
   } catch (_err) {
     const error = createSafeError(_err);
     if (!isAstroConfigZodError(_err)) {
@@ -64,12 +59,9 @@ async function restartContainer(container) {
         stack: error.stack || ""
       }
     });
-    await close();
+    container.restartInFlight = false;
     info(logging, "astro", "Continuing with previous valid configuration\n");
-    return {
-      container: await createRestartedContainer(container, existingSettings, needsStart),
-      error
-    };
+    return error;
   }
 }
 async function createContainerWithAutomaticRestart({
@@ -94,10 +86,14 @@ async function createContainerWithAutomaticRestart({
   async function handleServerRestart(logMsg) {
     info(logging, "astro", logMsg + "\n");
     const container = restart.container;
-    const { container: newContainer, error } = await restartContainer(container);
-    restart.container = newContainer;
-    addWatches();
-    resolveRestart(error);
+    const result = await restartContainer(container);
+    if (result instanceof Error) {
+      resolveRestart(result);
+    } else {
+      restart.container = result;
+      addWatches();
+      resolveRestart(null);
+    }
     restartComplete = new Promise((resolve) => {
       resolveRestart = resolve;
     });