astro 1.2.4 → 1.2.6

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

@@ -2,7 +2,7 @@ const SCRIPT_ID_PREFIX = `astro:scripts/`;
 const BEFORE_HYDRATION_SCRIPT_ID = `${SCRIPT_ID_PREFIX}${"before-hydration"}.js`;
 const PAGE_SCRIPT_ID = `${SCRIPT_ID_PREFIX}${"page"}.js`;
 const PAGE_SSR_SCRIPT_ID = `${SCRIPT_ID_PREFIX}${"page-ssr"}.js`;
-function astroScriptsPlugin({ config }) {
+function astroScriptsPlugin({ settings }) {
   let env = void 0;
   return {
     name: "astro:scripts",
@@ -17,18 +17,18 @@ function astroScriptsPlugin({ config }) {
     },
     async load(id) {
       if (id === BEFORE_HYDRATION_SCRIPT_ID) {
-        return config._ctx.scripts.filter((s) => s.stage === "before-hydration").map((s) => s.content).join("\n");
+        return settings.scripts.filter((s) => s.stage === "before-hydration").map((s) => s.content).join("\n");
       }
       if (id === PAGE_SCRIPT_ID) {
-        return config._ctx.scripts.filter((s) => s.stage === "page").map((s) => s.content).join("\n");
+        return settings.scripts.filter((s) => s.stage === "page").map((s) => s.content).join("\n");
       }
       if (id === PAGE_SSR_SCRIPT_ID) {
-        return config._ctx.scripts.filter((s) => s.stage === "page-ssr").map((s) => s.content).join("\n");
+        return settings.scripts.filter((s) => s.stage === "page-ssr").map((s) => s.content).join("\n");
       }
       return null;
     },
     buildStart(options) {
-      const hasHydrationScripts = config._ctx.scripts.some((s) => s.stage === "before-hydration");
+      const hasHydrationScripts = settings.scripts.some((s) => s.stage === "before-hydration");
       if (hasHydrationScripts && (env == null ? void 0 : env.command) === "build" && !(env == null ? void 0 : env.ssrBuild)) {
         this.emitFile({
           type: "chunk",

package/dist/vite-plugin-scripts/page-ssr.d.ts

@@ -1,5 +1,5 @@
 import { Plugin as VitePlugin } from 'vite';
-import { AstroConfig } from '../@types/astro.js';
-export default function astroScriptsPostPlugin({ config }: {
-    config: AstroConfig;
+import { AstroSettings } from '../@types/astro.js';
+export default function astroScriptsPostPlugin({ settings, }: {
+    settings: AstroSettings;
 }): VitePlugin;

package/dist/vite-plugin-scripts/page-ssr.js

@@ -2,12 +2,14 @@ import { PAGE_SSR_SCRIPT_ID } from "./index.js";
 import ancestor from "common-ancestor-path";
 import MagicString from "magic-string";
 import { isPage } from "../core/util.js";
-function astroScriptsPostPlugin({ config }) {
+function astroScriptsPostPlugin({
+  settings
+}) {
   function normalizeFilename(filename) {
     if (filename.startsWith("/@fs")) {
       filename = filename.slice("/@fs".length);
-    } else if (filename.startsWith("/") && !ancestor(filename, config.root.pathname)) {
-      filename = new URL("." + filename, config.root).pathname;
+    } else if (filename.startsWith("/") && !ancestor(filename, settings.config.root.pathname)) {
+      filename = new URL("." + filename, settings.config.root).pathname;
     }
     return filename;
   }
@@ -17,7 +19,7 @@ function astroScriptsPostPlugin({ config }) {
     transform(code, id, options) {
       if (!(options == null ? void 0 : options.ssr))
         return;
-      const hasInjectedScript = config._ctx.scripts.some((s2) => s2.stage === "page-ssr");
+      const hasInjectedScript = settings.scripts.some((s2) => s2.stage === "page-ssr");
       if (!hasInjectedScript)
         return;
       const filename = normalizeFilename(id);
@@ -27,7 +29,7 @@ function astroScriptsPostPlugin({ config }) {
       } catch (e) {
         return;
       }
-      const fileIsPage = isPage(fileURL, config);
+      const fileIsPage = isPage(fileURL, settings);
       if (!fileIsPage)
         return;
       const s = new MagicString(code, { filename });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",

package/dist/core/config.d.ts

@@ -1,260 +0,0 @@
-import type { RehypePlugin, RemarkPlugin, RemarkRehype } from '@astrojs/markdown-remark';
-import type { ILanguageRegistration, IThemeRegistration, Theme } from 'shiki';
-import type { Arguments as Flags } from 'yargs-parser';
-import type { AstroConfig, AstroUserConfig, CLIFlags, ViteUserConfig } from '../@types/astro';
-import { z } from 'zod';
-import { LogOptions } from './logger/core.js';
-export declare const LEGACY_ASTRO_CONFIG_KEYS: Set<string>;
-export declare const AstroConfigSchema: z.ZodObject<{
-    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>;
-    outDir: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
-    site: z.ZodEffects<z.ZodOptional<z.ZodString>, string | undefined, string | undefined>;
-    base: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, string, string | undefined>;
-    trailingSlash: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"always">, z.ZodLiteral<"never">, z.ZodLiteral<"ignore">]>>>;
-    output: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"static">, z.ZodLiteral<"server">]>>>;
-    adapter: z.ZodOptional<z.ZodObject<{
-        name: z.ZodString;
-        hooks: z.ZodDefault<z.ZodObject<{}, "passthrough", z.ZodTypeAny, {}, {}>>;
-    }, "strip", z.ZodTypeAny, {
-        name: string;
-        hooks: {};
-    }, {
-        hooks?: {} | undefined;
-        name: string;
-    }>>;
-    integrations: z.ZodEffects<z.ZodDefault<z.ZodArray<z.ZodObject<{
-        name: z.ZodString;
-        hooks: z.ZodDefault<z.ZodObject<{}, "passthrough", z.ZodTypeAny, {}, {}>>;
-    }, "strip", z.ZodTypeAny, {
-        name: string;
-        hooks: {};
-    }, {
-        hooks?: {} | undefined;
-        name: string;
-    }>, "many">>, {
-        name: string;
-        hooks: {};
-    }[], unknown>;
-    build: z.ZodDefault<z.ZodOptional<z.ZodObject<{
-        format: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"file">, z.ZodLiteral<"directory">]>>>;
-    }, "strip", z.ZodTypeAny, {
-        format: "file" | "directory";
-    }, {
-        format?: "file" | "directory" | 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>>;
-    }, "strip", z.ZodTypeAny, {
-        host: string | boolean;
-        port: number;
-    }, {
-        host?: string | boolean | undefined;
-        port?: number | undefined;
-    }>>>, {
-        host: string | boolean;
-        port: number;
-    }, unknown>;
-    style: z.ZodDefault<z.ZodOptional<z.ZodObject<{
-        postcss: z.ZodDefault<z.ZodOptional<z.ZodObject<{
-            options: z.ZodAny;
-            plugins: z.ZodArray<z.ZodAny, "many">;
-        }, "strip", z.ZodTypeAny, {
-            options?: any;
-            plugins: any[];
-        }, {
-            options?: any;
-            plugins: any[];
-        }>>>;
-    }, "strip", z.ZodTypeAny, {
-        postcss: {
-            options?: any;
-            plugins: any[];
-        };
-    }, {
-        postcss?: {
-            options?: any;
-            plugins: any[];
-        } | undefined;
-    }>>>;
-    markdown: z.ZodDefault<z.ZodObject<{
-        drafts: z.ZodDefault<z.ZodBoolean>;
-        syntaxHighlight: z.ZodDefault<z.ZodUnion<[z.ZodLiteral<"shiki">, z.ZodLiteral<"prism">, z.ZodLiteral<false>]>>;
-        shikiConfig: z.ZodDefault<z.ZodObject<{
-            langs: z.ZodDefault<z.ZodArray<z.ZodType<ILanguageRegistration, z.ZodTypeDef, ILanguageRegistration>, "many">>;
-            theme: z.ZodDefault<z.ZodUnion<[z.ZodEnum<[Theme, ...Theme[]]>, z.ZodType<IThemeRegistration, z.ZodTypeDef, IThemeRegistration>]>>;
-            wrap: z.ZodDefault<z.ZodUnion<[z.ZodBoolean, z.ZodNull]>>;
-        }, "strip", z.ZodTypeAny, {
-            langs: ILanguageRegistration[];
-            theme: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "hc_light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {});
-            wrap: boolean | null;
-        }, {
-            langs?: ILanguageRegistration[] | undefined;
-            theme?: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "hc_light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {}) | undefined;
-            wrap?: boolean | null | undefined;
-        }>>;
-        remarkPlugins: z.ZodDefault<z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodTuple<[z.ZodString, z.ZodAny], null>, z.ZodType<RemarkPlugin<any[]>, z.ZodTypeDef, RemarkPlugin<any[]>>, z.ZodTuple<[z.ZodType<RemarkPlugin<any[]>, z.ZodTypeDef, RemarkPlugin<any[]>>, z.ZodAny], null>]>, "many">>;
-        rehypePlugins: z.ZodDefault<z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodTuple<[z.ZodString, z.ZodAny], null>, z.ZodType<RehypePlugin<any[]>, z.ZodTypeDef, RehypePlugin<any[]>>, z.ZodTuple<[z.ZodType<RehypePlugin<any[]>, z.ZodTypeDef, RehypePlugin<any[]>>, z.ZodAny], null>]>, "many">>;
-        remarkRehype: z.ZodDefault<z.ZodOptional<z.ZodType<RemarkRehype, z.ZodTypeDef, RemarkRehype>>>;
-        extendDefaultPlugins: z.ZodDefault<z.ZodBoolean>;
-    }, "strip", z.ZodTypeAny, {
-        drafts: boolean;
-        syntaxHighlight: false | "shiki" | "prism";
-        shikiConfig: {
-            langs: ILanguageRegistration[];
-            theme: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "hc_light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {});
-            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;
-    }, {
-        drafts?: boolean | undefined;
-        syntaxHighlight?: false | "shiki" | "prism" | undefined;
-        shikiConfig?: {
-            langs?: ILanguageRegistration[] | undefined;
-            theme?: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "hc_light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {}) | 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;
-    }>>;
-    vite: z.ZodDefault<z.ZodType<ViteUserConfig, z.ZodTypeDef, ViteUserConfig>>;
-    legacy: z.ZodDefault<z.ZodOptional<z.ZodObject<{
-        astroFlavoredMarkdown: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-    }, "strip", z.ZodTypeAny, {
-        astroFlavoredMarkdown: boolean;
-    }, {
-        astroFlavoredMarkdown?: boolean | undefined;
-    }>>>;
-}, "strip", z.ZodTypeAny, {
-    site?: string | undefined;
-    adapter?: {
-        name: string;
-        hooks: {};
-    } | undefined;
-    base: string;
-    markdown: {
-        drafts: boolean;
-        syntaxHighlight: false | "shiki" | "prism";
-        shikiConfig: {
-            langs: ILanguageRegistration[];
-            theme: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "hc_light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {});
-            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;
-    };
-    output: "static" | "server";
-    integrations: {
-        name: string;
-        hooks: {};
-    }[];
-    build: {
-        format: "file" | "directory";
-    };
-    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?: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "hc_light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {}) | 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?: {
-        format?: "file" | "directory" | undefined;
-    } | undefined;
-    style?: {
-        postcss?: {
-            options?: any;
-            plugins: any[];
-        } | undefined;
-    } | undefined;
-    vite?: ViteUserConfig | undefined;
-    legacy?: {
-        astroFlavoredMarkdown?: boolean | undefined;
-    } | undefined;
-}>;
-/** Turn raw config values into normalized values */
-export declare function validateConfig(userConfig: any, root: string, cmd: string, logging: LogOptions): Promise<AstroConfig>;
-/** Convert the generic "yargs" flag object into our own, custom TypeScript object. */
-export declare function resolveFlags(flags: Partial<Flags>): CLIFlags;
-export declare function resolveRoot(cwd?: string): string;
-interface LoadConfigOptions {
-    cwd?: string;
-    flags?: Flags;
-    cmd: string;
-    validate?: boolean;
-    logging: LogOptions;
-    /** Invalidate when reloading a previously loaded config */
-    isConfigReload?: boolean;
-}
-/**
- * Resolve the file URL of the user's `astro.config.js|cjs|mjs|ts` file
- * Note: currently the same as loadConfig but only returns the `filePath`
- * instead of the resolved config
- */
-export declare function resolveConfigPath(configOptions: Pick<LoadConfigOptions, 'cwd' | 'flags'>): Promise<string | undefined>;
-interface OpenConfigResult {
-    userConfig: AstroUserConfig;
-    astroConfig: AstroConfig;
-    flags: CLIFlags;
-    root: string;
-}
-/** Load a configuration file, returning both the userConfig and astroConfig */
-export declare function openConfig(configOptions: LoadConfigOptions): Promise<OpenConfigResult>;
-/**
- * Attempt to load an `astro.config.mjs` file
- * @deprecated
- */
-export declare function loadConfig(configOptions: LoadConfigOptions): Promise<AstroConfig>;
-/** Attempt to resolve an Astro configuration object. Normalize, validate, and return. */
-export declare function resolveConfig(userConfig: AstroUserConfig, root: string, flags: CLIFlags | undefined, cmd: string, logging: LogOptions): Promise<AstroConfig>;
-export declare function mergeConfig(defaults: Record<string, any>, overrides: Record<string, any>, isRoot?: boolean): Record<string, any>;
-export {};