astro 1.6.2 → 1.6.3

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

@@ -159,25 +159,28 @@ export declare const AstroConfigSchema: z.ZodObject<{
         extendDefaultPlugins: boolean;
     };
     root: URL;
-    srcDir: URL;
     publicDir: URL;
-    outDir: URL;
-    trailingSlash: "never" | "always" | "ignore";
     server: {
         host: string | boolean;
         port: number;
     };
-    output: "static" | "server";
-    integrations: {
-        name: string;
-        hooks: {};
-    }[];
     build: {
         server: URL;
         format: "file" | "directory";
         client: URL;
         serverEntry: string;
     };
+    legacy: {
+        astroFlavoredMarkdown: boolean;
+    };
+    srcDir: URL;
+    outDir: URL;
+    trailingSlash: "never" | "always" | "ignore";
+    output: "server" | "static";
+    integrations: {
+        name: string;
+        hooks: {};
+    }[];
     style: {
         postcss: {
             options?: any;
@@ -185,9 +188,6 @@ export declare const AstroConfigSchema: z.ZodObject<{
         };
     };
     vite: ViteUserConfig;
-    legacy: {
-        astroFlavoredMarkdown: boolean;
-    };
 }, {
     site?: string | undefined;
     base?: string | undefined;
@@ -205,23 +205,26 @@ export declare const AstroConfigSchema: z.ZodObject<{
         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;
+    legacy?: {
+        astroFlavoredMarkdown?: boolean | undefined;
+    } | undefined;
+    srcDir?: string | undefined;
+    outDir?: string | undefined;
+    trailingSlash?: "never" | "always" | "ignore" | undefined;
+    output?: "server" | "static" | undefined;
+    adapter?: {
+        hooks?: {} | undefined;
+        name: string;
+    } | undefined;
+    integrations?: unknown;
     style?: {
         postcss?: {
             options?: any;
@@ -229,9 +232,6 @@ export declare const AstroConfigSchema: z.ZodObject<{
         } | undefined;
     } | undefined;
     vite?: ViteUserConfig | undefined;
-    legacy?: {
-        astroFlavoredMarkdown?: boolean | undefined;
-    } | undefined;
 }>;
 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>;
@@ -450,26 +450,29 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         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;
     };
+    legacy: {
+        astroFlavoredMarkdown: boolean;
+    };
+    srcDir: URL;
+    outDir: URL;
+    trailingSlash: "never" | "always" | "ignore";
+    output: "server" | "static";
+    integrations: {
+        name: string;
+        hooks: {};
+    }[];
     style: {
         postcss: {
             options?: any;
@@ -477,9 +480,6 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         };
     };
     vite: ViteUserConfig;
-    legacy: {
-        astroFlavoredMarkdown: boolean;
-    };
 }, {
     site?: string | undefined;
     base?: string | undefined;
@@ -497,30 +497,30 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         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;
+    legacy?: {
+        astroFlavoredMarkdown?: boolean | undefined;
+    } | undefined;
+    srcDir?: string | undefined;
+    outDir?: string | undefined;
+    trailingSlash?: "never" | "always" | "ignore" | undefined;
+    output?: "server" | "static" | undefined;
+    adapter?: {
+        hooks?: {} | undefined;
+        name: string;
+    } | undefined;
+    integrations?: unknown;
     style?: {
         postcss?: unknown;
     } | undefined;
     vite?: ViteUserConfig | undefined;
-    legacy?: {
-        astroFlavoredMarkdown?: boolean | undefined;
-    } | undefined;
 }>, {
     site?: string | undefined;
     adapter?: {
@@ -542,26 +542,29 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         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;
     };
+    legacy: {
+        astroFlavoredMarkdown: boolean;
+    };
+    srcDir: URL;
+    outDir: URL;
+    trailingSlash: "never" | "always" | "ignore";
+    output: "server" | "static";
+    integrations: {
+        name: string;
+        hooks: {};
+    }[];
     style: {
         postcss: {
             options?: any;
@@ -569,9 +572,6 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         };
     };
     vite: ViteUserConfig;
-    legacy: {
-        astroFlavoredMarkdown: boolean;
-    };
 }, {
     site?: string | undefined;
     base?: string | undefined;
@@ -589,28 +589,28 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         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;
+    legacy?: {
+        astroFlavoredMarkdown?: boolean | undefined;
+    } | undefined;
+    srcDir?: string | undefined;
+    outDir?: string | undefined;
+    trailingSlash?: "never" | "always" | "ignore" | undefined;
+    output?: "server" | "static" | undefined;
+    adapter?: {
+        hooks?: {} | undefined;
+        name: string;
+    } | undefined;
+    integrations?: unknown;
     style?: {
         postcss?: unknown;
     } | undefined;
     vite?: ViteUserConfig | undefined;
-    legacy?: {
-        astroFlavoredMarkdown?: boolean | undefined;
-    } | undefined;
 }>;

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

@@ -1,2 +1,4 @@
-import type { AstroConfig, AstroSettings } from '../../@types/astro';
+import type { AstroConfig, AstroSettings, AstroUserConfig } from '../../@types/astro';
+export declare function createBaseSettings(config: AstroConfig): AstroSettings;
 export declare function createSettings(config: AstroConfig, cwd?: string): AstroSettings;
+export declare function createDefaultDevSettings(userConfig?: AstroUserConfig, root?: string | URL): Promise<AstroSettings>;

package/dist/core/config/settings.js

@@ -1,20 +1,38 @@
 import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from "./../constants.js";
+import { fileURLToPath } from "url";
 import jsxRenderer from "../../jsx/renderer.js";
+import { createDefaultDevConfig } from "./config.js";
 import { loadTSConfig } from "./tsconfig.js";
-function createSettings(config, cwd) {
-  const tsconfig = loadTSConfig(cwd);
+function createBaseSettings(config) {
   return {
     config,
-    tsConfig: tsconfig == null ? void 0 : tsconfig.config,
-    tsConfigPath: tsconfig == null ? void 0 : tsconfig.path,
+    tsConfig: void 0,
+    tsConfigPath: void 0,
     adapter: void 0,
     injectedRoutes: [],
     pageExtensions: [".astro", ".html", ...SUPPORTED_MARKDOWN_FILE_EXTENSIONS],
     renderers: [jsxRenderer],
     scripts: [],
-    watchFiles: (tsconfig == null ? void 0 : tsconfig.exists) ? [tsconfig.path, ...tsconfig.extendedPaths] : []
+    watchFiles: []
   };
 }
+function createSettings(config, cwd) {
+  const tsconfig = loadTSConfig(cwd);
+  const settings = createBaseSettings(config);
+  settings.tsConfig = tsconfig == null ? void 0 : tsconfig.config;
+  settings.tsConfigPath = tsconfig == null ? void 0 : tsconfig.path;
+  settings.watchFiles = (tsconfig == null ? void 0 : tsconfig.exists) ? [tsconfig.path, ...tsconfig.extendedPaths] : [];
+  return settings;
+}
+async function createDefaultDevSettings(userConfig = {}, root) {
+  if (root && typeof root !== "string") {
+    root = fileURLToPath(root);
+  }
+  const config = await createDefaultDevConfig(userConfig, root);
+  return createBaseSettings(config);
+}
 export {
+  createBaseSettings,
+  createDefaultDevSettings,
   createSettings
 };

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "1.6.2";
+const ASTRO_VERSION = "1.6.3";
 const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
   ".markdown",
   ".mdown",

package/dist/core/create-vite.d.ts

@@ -1,11 +1,14 @@
+/// <reference types="node" />
 import type { AstroSettings } from '../@types/astro';
 import type { LogOptions } from './logger/core';
+import nodeFs from 'fs';
 import * as vite from 'vite';
 interface CreateViteOptions {
     settings: AstroSettings;
     logging: LogOptions;
     mode: 'dev' | 'build' | string;
+    fs?: typeof nodeFs;
 }
 /** Return a common starting point for all Vite actions */
-export declare function createVite(commandConfig: vite.InlineConfig, { settings, logging, mode }: CreateViteOptions): Promise<vite.InlineConfig>;
+export declare function createVite(commandConfig: vite.InlineConfig, { settings, logging, mode, fs }: CreateViteOptions): Promise<vite.InlineConfig>;
 export {};

package/dist/core/create-vite.js

@@ -1,14 +1,16 @@
+import nodeFs from "fs";
 import { fileURLToPath } from "url";
 import * as vite from "vite";
 import { crawlFrameworkPkgs } from "vitefu";
 import astroPostprocessVitePlugin from "../vite-plugin-astro-postprocess/index.js";
-import astroViteServerPlugin from "../vite-plugin-astro-server/index.js";
+import { vitePluginAstroServer } from "../vite-plugin-astro-server/index.js";
 import astroVitePlugin from "../vite-plugin-astro/index.js";
 import configAliasVitePlugin from "../vite-plugin-config-alias/index.js";
 import envVitePlugin from "../vite-plugin-env/index.js";
 import htmlVitePlugin from "../vite-plugin-html/index.js";
 import astroIntegrationsContainerPlugin from "../vite-plugin-integrations-container/index.js";
 import jsxVitePlugin from "../vite-plugin-jsx/index.js";
+import astroLoadFallbackPlugin from "../vite-plugin-load-fallback/index.js";
 import legacyMarkdownVitePlugin from "../vite-plugin-markdown-legacy/index.js";
 import markdownVitePlugin from "../vite-plugin-markdown/index.js";
 import astroScriptsPlugin from "../vite-plugin-scripts/index.js";
@@ -32,7 +34,7 @@ function getSsrNoExternalDeps(projectRoot) {
   }
   return noExternalDeps;
 }
-async function createVite(commandConfig, { settings, logging, mode }) {
+async function createVite(commandConfig, { settings, logging, mode, fs = nodeFs }) {
   const astroPkgsConfig = await crawlFrameworkPkgs({
     root: fileURLToPath(settings.config.root),
     isBuild: mode === "build",
@@ -62,14 +64,15 @@ async function createVite(commandConfig, { settings, logging, mode }) {
       configAliasVitePlugin({ settings }),
       astroVitePlugin({ settings, logging }),
       astroScriptsPlugin({ settings }),
-      mode !== "build" && astroViteServerPlugin({ settings, logging }),
+      mode !== "build" && vitePluginAstroServer({ settings, logging, fs }),
       envVitePlugin({ settings }),
       settings.config.legacy.astroFlavoredMarkdown ? legacyMarkdownVitePlugin({ settings, logging }) : markdownVitePlugin({ settings, logging }),
       htmlVitePlugin(),
       jsxVitePlugin({ settings, logging }),
       astroPostprocessVitePlugin({ settings }),
       astroIntegrationsContainerPlugin({ settings, logging }),
-      astroScriptsPageSSRPlugin({ settings })
+      astroScriptsPageSSRPlugin({ settings }),
+      astroLoadFallbackPlugin({ fs })
     ],
     publicDir: fileURLToPath(settings.config.publicDir),
     root: fileURLToPath(settings.config.root),

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

@@ -0,0 +1,36 @@
+/// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
+import * as http from 'http';
+import type { AddressInfo } from 'net';
+import type { AstroSettings, AstroUserConfig } from '../../@types/astro';
+import nodeFs from 'fs';
+import * as vite from 'vite';
+import { LogOptions } from '../logger/core.js';
+export interface Container {
+    fs: typeof nodeFs;
+    logging: LogOptions;
+    settings: AstroSettings;
+    viteConfig: vite.InlineConfig;
+    viteServer: vite.ViteDevServer;
+    resolvedRoot: string;
+    configFlag: string | undefined;
+    configFlagPath: string | undefined;
+    restartInFlight: boolean;
+    handle: (req: http.IncomingMessage, res: http.ServerResponse) => void;
+    close: () => Promise<void>;
+}
+export interface CreateContainerParams {
+    isRestart?: boolean;
+    logging?: LogOptions;
+    userConfig?: AstroUserConfig;
+    settings?: AstroSettings;
+    fs?: typeof nodeFs;
+    root?: string | URL;
+    configFlag?: string;
+    configFlagPath?: string;
+}
+export declare function createContainer(params?: CreateContainerParams): Promise<Container>;
+export declare function startContainer({ settings, viteServer, logging, }: Container): Promise<AddressInfo>;
+export declare function isStarted(container: Container): boolean;
+export declare function runInContainer(params: CreateContainerParams, callback: (container: Container) => Promise<void> | void): Promise<void>;

package/dist/core/dev/container.js

@@ -0,0 +1,109 @@
+import nodeFs from "fs";
+import * as vite from "vite";
+import {
+  runHookConfigDone,
+  runHookConfigSetup,
+  runHookServerDone,
+  runHookServerSetup,
+  runHookServerStart
+} from "../../integrations/index.js";
+import { createDefaultDevSettings, resolveRoot } from "../config/index.js";
+import { createVite } from "../create-vite.js";
+import { nodeLogDestination } from "../logger/node.js";
+import { appendForwardSlash } from "../path.js";
+import { apply as applyPolyfill } from "../polyfill.js";
+const defaultLogging = {
+  dest: nodeLogDestination,
+  level: "error"
+};
+async function createContainer(params = {}) {
+  let {
+    isRestart = false,
+    logging = defaultLogging,
+    settings = await createDefaultDevSettings(params.userConfig, params.root),
+    fs = nodeFs
+  } = params;
+  applyPolyfill();
+  settings = await runHookConfigSetup({
+    settings,
+    command: "dev",
+    logging,
+    isRestart
+  });
+  const { host } = settings.config.server;
+  const rendererClientEntries = settings.renderers.map((r) => r.clientEntrypoint).filter(Boolean);
+  const viteConfig = await createVite(
+    {
+      mode: "development",
+      server: { host },
+      optimizeDeps: {
+        include: rendererClientEntries
+      },
+      define: {
+        "import.meta.env.BASE_URL": settings.config.base ? `'${settings.config.base}'` : "undefined"
+      }
+    },
+    { settings, logging, mode: "dev", fs }
+  );
+  await runHookConfigDone({ settings, logging });
+  const viteServer = await vite.createServer(viteConfig);
+  runHookServerSetup({ config: settings.config, server: viteServer, logging });
+  const container = {
+    configFlag: params.configFlag,
+    configFlagPath: params.configFlagPath,
+    fs,
+    logging,
+    resolvedRoot: appendForwardSlash(resolveRoot(params.root)),
+    restartInFlight: false,
+    settings,
+    viteConfig,
+    viteServer,
+    handle(req, res) {
+      viteServer.middlewares.handle(req, res, Function.prototype);
+    },
+    close() {
+      return closeContainer(container);
+    }
+  };
+  return container;
+}
+async function closeContainer({ viteServer, settings, logging }) {
+  await viteServer.close();
+  await runHookServerDone({
+    config: settings.config,
+    logging
+  });
+}
+async function startContainer({
+  settings,
+  viteServer,
+  logging
+}) {
+  const { port } = settings.config.server;
+  await viteServer.listen(port);
+  const devServerAddressInfo = viteServer.httpServer.address();
+  await runHookServerStart({
+    config: settings.config,
+    address: devServerAddressInfo,
+    logging
+  });
+  return devServerAddressInfo;
+}
+function isStarted(container) {
+  var _a;
+  return !!((_a = container.viteServer.httpServer) == null ? void 0 : _a.listening);
+}
+async function runInContainer(params, callback) {
+  const container = await createContainer(params);
+  try {
+    await callback(container);
+  } finally {
+    await container.close();
+  }
+}
+export {
+  createContainer,
+  isStarted,
+  runInContainer,
+  startContainer
+};

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

@@ -0,0 +1,24 @@
+/// <reference types="node" />
+/// <reference types="node" />
+import type { AstroTelemetry } from '@astrojs/telemetry';
+import type http from 'http';
+import type { AddressInfo } from 'net';
+import * as vite from 'vite';
+import type { AstroSettings } from '../../@types/astro';
+import { LogOptions } from '../logger/core.js';
+export interface DevOptions {
+    configFlag: string | undefined;
+    configFlagPath: string | undefined;
+    logging: LogOptions;
+    telemetry: AstroTelemetry;
+    handleConfigError: (error: Error) => void;
+    isRestart?: boolean;
+}
+export interface DevServer {
+    address: AddressInfo;
+    handle: (req: http.IncomingMessage, res: http.ServerResponse<http.IncomingMessage>) => void;
+    watcher: vite.FSWatcher;
+    stop(): Promise<void>;
+}
+/** `astro dev` */
+export default function dev(settings: AstroSettings, options: DevOptions): Promise<DevServer>;

package/dist/core/dev/dev.js

@@ -0,0 +1,55 @@
+import { performance } from "perf_hooks";
+import { info, warn } from "../logger/core.js";
+import * as msg from "../messages.js";
+import { startContainer } from "./container.js";
+import { createContainerWithAutomaticRestart } from "./restart.js";
+async function dev(settings, options) {
+  var _a, _b;
+  const devStart = performance.now();
+  await options.telemetry.record([]);
+  const restart = await createContainerWithAutomaticRestart({
+    flags: {},
+    handleConfigError: options.handleConfigError,
+    beforeRestart: () => console.clear(),
+    params: {
+      settings,
+      logging: options.logging,
+      isRestart: options.isRestart
+    }
+  });
+  const devServerAddressInfo = await startContainer(restart.container);
+  const site = settings.config.site ? new URL(settings.config.base, settings.config.site) : void 0;
+  info(
+    options.logging,
+    null,
+    msg.serverStart({
+      startupTime: performance.now() - devStart,
+      resolvedUrls: restart.container.viteServer.resolvedUrls || { local: [], network: [] },
+      host: settings.config.server.host,
+      site,
+      isRestart: options.isRestart
+    })
+  );
+  const currentVersion = "1.6.3";
+  if (currentVersion.includes("-")) {
+    warn(options.logging, null, msg.prerelease({ currentVersion }));
+  }
+  if (((_b = (_a = restart.container.viteConfig.server) == null ? void 0 : _a.fs) == null ? void 0 : _b.strict) === false) {
+    warn(options.logging, null, msg.fsStrictWarning());
+  }
+  return {
+    address: devServerAddressInfo,
+    get watcher() {
+      return restart.container.viteServer.watcher;
+    },
+    handle(req, res) {
+      return restart.container.handle(req, res);
+    },
+    async stop() {
+      await restart.container.close();
+    }
+  };
+}
+export {
+  dev as default
+};

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

@@ -1,18 +1,3 @@
-/// <reference types="node" />
-import type { AstroTelemetry } from '@astrojs/telemetry';
-import type { AddressInfo } from 'net';
-import * as vite from 'vite';
-import type { AstroSettings } from '../../@types/astro';
-import { LogOptions } from '../logger/core.js';
-export interface DevOptions {
-    logging: LogOptions;
-    telemetry: AstroTelemetry;
-    isRestart?: boolean;
-}
-export interface DevServer {
-    address: AddressInfo;
-    watcher: vite.FSWatcher;
-    stop(): Promise<void>;
-}
-/** `astro dev` */
-export default function dev(settings: AstroSettings, options: DevOptions): Promise<DevServer>;
+export { createContainer, runInContainer, startContainer } from './container.js';
+export { default } from './dev.js';
+export { createContainerWithAutomaticRestart } from './restart.js';