astro 1.0.7 → 1.1.0-next.0

package/astro-jsx.d.ts

@@ -23,12 +23,12 @@ declare namespace astroHTML.JSX {
 		children?: Children;
 	}
 
-	type AstroBuiltinProps = import('./dist/types/@types/astro').AstroBuiltinProps;
-	type AstroBuiltinAttributes = import('./dist/types/@types/astro').AstroBuiltinAttributes;
-	type AstroDefineVarsAttribute = import('./dist/types/@types/astro').AstroDefineVarsAttribute;
-	type AstroScriptAttributes = import('./dist/types/@types/astro').AstroScriptAttributes &
+	type AstroBuiltinProps = import('./dist/@types/astro').AstroBuiltinProps;
+	type AstroBuiltinAttributes = import('./dist/@types/astro').AstroBuiltinAttributes;
+	type AstroDefineVarsAttribute = import('./dist/@types/astro').AstroDefineVarsAttribute;
+	type AstroScriptAttributes = import('./dist/@types/astro').AstroScriptAttributes &
 		AstroDefineVarsAttribute;
-	type AstroStyleAttributes = import('./dist/types/@types/astro').AstroStyleAttributes &
+	type AstroStyleAttributes = import('./dist/@types/astro').AstroStyleAttributes &
 		AstroDefineVarsAttribute;
 
 	// This is an unfortunate use of `any`, but unfortunately we can't make a type that works for every framework
@@ -548,7 +548,7 @@ declare namespace astroHTML.JSX {
 		| 'strict-origin-when-cross-origin'
 		| 'unsafe-url';
 
-	type HTMLAttributeAnchorTarget = '_self' | '_blank' | '_parent' | '_top';
+	type HTMLAttributeAnchorTarget = '_self' | '_blank' | '_parent' | '_top' | (string & {});
 
 	interface AnchorHTMLAttributes extends HTMLAttributes {
 		download?: string | boolean | undefined | null;
@@ -756,7 +756,7 @@ declare namespace astroHTML.JSX {
 		size?: number | string | undefined | null;
 		src?: string | undefined | null;
 		step?: number | string | undefined | null;
-		type?: HTMLInputTypeAttribute | string | undefined | null;
+		type?: HTMLInputTypeAttribute | undefined | null;
 		value?: string | string[] | number | undefined | null;
 		width?: number | string | undefined | null;
 	}

package/dist/{types/@types → @types}/astro.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import type { MarkdownHeading, MarkdownMetadata, MarkdownRenderingResult, RehypePlugins, RemarkPlugins, ShikiConfig } from '@astrojs/markdown-remark';
+import type { MarkdownHeading, MarkdownMetadata, MarkdownRenderingResult, RehypePlugins, RemarkPlugins, RemarkRehype, ShikiConfig } from '@astrojs/markdown-remark';
 import type * as babel from '@babel/core';
 import type { AddressInfo } from 'net';
 import type * as vite from 'vite';
@@ -179,7 +179,7 @@ export interface AstroGlobal extends AstroGlobalPartial {
          */
         has(slotName: string): boolean;
         /**
-         * Asychronously renders this slot and returns HTML
+         * Asynchronously renders this slot and returns a string
          *
          * Example usage:
          * ```astro
@@ -192,6 +192,21 @@ export interface AstroGlobal extends AstroGlobalPartial {
          * <Fragment set:html={html} />
          * ```
          *
+         * A second parameters can be used to pass arguments to a slotted callback
+         *
+         * Example usage:
+         * ```astro
+         * ---
+         * html = await Astro.slots.render('default', ["Hello", "World"])
+         * ---
+         * ```
+         * Each item in the array will be passed as an argument that you can use like so:
+         * ```astro
+         * <Component>
+         *		{(hello, world) => <div>{hello}, {world}!</div>}
+         * </Component>
+         * ```
+         *
          * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astroslots)
          */
         render(slotName: string, args?: any[]): Promise<string>;
@@ -377,7 +392,7 @@ export interface AstroUserConfig {
      * @name trailingSlash
      * @type {('always' | 'never' | 'ignore')}
      * @default `'ignore'`
-     * @see buildOptions.pageUrlFormat
+     * @see build.format
      * @description
      *
      * Set the route matching behavior of the dev server. Choose from the following options:
@@ -463,6 +478,13 @@ export interface AstroUserConfig {
          *   }
          * }
          * ```
+         *
+         * #### Effect on Astro.url
+         * Setting `build.format` controls what `Astro.url` is set to during the build. When it is:
+         * - `directory` - The `Astro.url.pathname` will include a trailing slash to mimic folder behavior; ie `/foo/`.
+         * - `file` - The `Astro.url.pathname` will include `.html`; ie `/foo.html`.
+         *
+         * This means that when you create relative URLs using `new URL('./relative', Astro.url)`, you will get consistent behavior between dev and build.
          */
         format?: 'file' | 'directory';
     };
@@ -580,17 +602,19 @@ export interface AstroUserConfig {
          * @name markdown.remarkPlugins
          * @type {RemarkPlugins}
          * @description
-         * Pass a custom [Remark](https://github.com/remarkjs/remark) plugin to customize how your Markdown is built.
+         * Pass [remark plugins](https://github.com/remarkjs/remark) to customize how your Markdown is built. You can import and apply the plugin function (recommended), or pass the plugin name as a string.
          *
-         * **Note:** Enabling custom `remarkPlugins` or `rehypePlugins` removes Astro's built-in support for [GitHub-flavored Markdown](https://github.github.com/gfm/) support and [Smartypants](https://github.com/silvenon/remark-smartypants). You must explicitly add these plugins to your `astro.config.mjs` file, if desired.
+         * :::caution
+         * Providing a list of plugins will **remove** our default plugins. To preserve these defaults, see the `extendDefaultPlugins` flag.
+         * :::
          *
          * ```js
+         * import remarkToc from 'remark-toc';
          * {
          *   markdown: {
-         *     // Example: The default set of remark plugins used by Astro
-         *     remarkPlugins: ['remark-gfm', 'remark-smartypants'],
-         *   },
-         * };
+         *     remarkPlugins: [remarkToc]
+         *   }
+         * }
          * ```
          */
         remarkPlugins?: RemarkPlugins;
@@ -599,20 +623,58 @@ export interface AstroUserConfig {
          * @name markdown.rehypePlugins
          * @type {RehypePlugins}
          * @description
-         * Pass a custom [Rehype](https://github.com/remarkjs/remark-rehype) plugin to customize how your Markdown is built.
+         * Pass [rehype plugins](https://github.com/remarkjs/remark-rehype) to customize how your Markdown's output HTML is processed. You can import and apply the plugin function (recommended), or pass the plugin name as a string.
+         *
+         * :::caution
+         * Providing a list of plugins will **remove** our default plugins. To preserve these defaults, see the `extendDefaultPlugins` flag.
+         * :::
+         *
+         * ```js
+         * import rehypeMinifyHtml from 'rehype-minify';
+         * {
+         *   markdown: {
+         *     rehypePlugins: [rehypeMinifyHtml]
+         *   }
+         * }
+         * ```
+         */
+        rehypePlugins?: RehypePlugins;
+        /**
+         * @docs
+         * @name markdown.extendDefaultPlugins
+         * @type {boolean}
+         * @default `false`
+         * @description
+         * Astro applies the [GitHub-flavored Markdown](https://github.com/remarkjs/remark-gfm) and [Smartypants](https://github.com/silvenon/remark-smartypants) plugins by default. When adding your own remark or rehype plugins, you can preserve these defaults by setting the `extendDefaultPlugins` flag to `true`:
          *
-         * **Note:** Enabling custom `remarkPlugins` or `rehypePlugins` removes Astro's built-in support for [GitHub-flavored Markdown](https://github.github.com/gfm/) support and [Smartypants](https://github.com/silvenon/remark-smartypants). You must explicitly add these plugins to your `astro.config.mjs` file, if desired.
+         * ```js
+         * {
+         *   markdown: {
+         *     extendDefaultPlugins: true,
+         * 		 remarkPlugins: [exampleRemarkPlugin],
+         *     rehypePlugins: [exampleRehypePlugin],
+         *   }
+         * }
+         * ```
+         */
+        extendDefaultPlugins?: boolean;
+        /**
+         * @docs
+         * @name markdown.remarkRehype
+         * @type {RemarkRehype}
+         * @description
+         * Pass options to [remark-rehype](https://github.com/remarkjs/remark-rehype#api).
          *
          * ```js
          * {
          *   markdown: {
-         *     // Example: The default set of rehype plugins used by Astro
-         *     rehypePlugins: [],
+         *     // Example: Translate the footnotes text to another language, here are the default English values
+         *     remarkRehype: { footnoteLabel: "Footnotes", footnoteBackLabel: "Back to content"},
          *   },
          * };
          * ```
          */
-        rehypePlugins?: RehypePlugins;
+        remarkRehype?: RemarkRehype;
     };
     /**
      * @docs
@@ -633,7 +695,7 @@ export interface AstroUserConfig {
      * }
      * ```
      */
-    integrations?: Array<AstroIntegration | AstroIntegration[]>;
+    integrations?: Array<AstroIntegration | (AstroIntegration | false | undefined | null)[] | false | undefined | null>;
     /**
      * @docs
      * @kind heading
@@ -765,36 +827,35 @@ export interface AstroInstance {
 }
 export interface MarkdownInstance<T extends Record<string, any>> {
     frontmatter: T;
+    /** Absolute file path (e.g. `/home/user/projects/.../file.md`) */
     file: string;
+    /** Browser URL for files under `/src/pages` (e.g. `/en/guides/markdown-content`) */
     url: string | undefined;
+    /** Component to render content in `.astro` files. Usage: `<Content />` */
     Content: AstroComponentFactory;
-    /** raw Markdown file content, excluding frontmatter */
+    /** raw Markdown file content, excluding layout HTML and YAML frontmatter */
     rawContent(): string;
-    /** Markdown file compiled to valid Astro syntax. Queryable with most HTML parsing libraries */
-    compiledContent(): Promise<string>;
-    getHeadings(): Promise<MarkdownHeading[]>;
+    /** Markdown file compiled to HTML, excluding layout HTML */
+    compiledContent(): string;
+    /** List of headings (h1 -> h6) with associated metadata */
+    getHeadings(): MarkdownHeading[];
     /** @deprecated Renamed to `getHeadings()` */
     getHeaders(): void;
-    default: () => Promise<{
-        metadata: MarkdownMetadata;
-        frontmatter: MarkdownContent<T>;
-        $$metadata: Metadata;
-        default: AstroComponentFactory;
-    }>;
+    default: AstroComponentFactory;
 }
-export interface MDXInstance<T> extends Omit<MarkdownInstance<T>, 'rawContent' | 'compiledContent' | 'Content' | 'default'> {
+export interface MDXInstance<T> extends Omit<MarkdownInstance<T>, 'rawContent' | 'compiledContent'> {
     /** MDX does not support rawContent! If you need to read the Markdown contents to calculate values (ex. reading time), we suggest injecting frontmatter via remark plugins. Learn more on our docs: https://docs.astro.build/en/guides/integrations-guide/mdx/#inject-frontmatter-via-remark-or-rehype-plugins */
     rawContent: never;
     /** MDX does not support compiledContent! If you need to read the HTML contents to calculate values (ex. reading time), we suggest injecting frontmatter via rehype plugins. Learn more on our docs: https://docs.astro.build/en/guides/integrations-guide/mdx/#inject-frontmatter-via-remark-or-rehype-plugins */
     compiledContent: never;
-    default: AstroComponentFactory;
-    Content: AstroComponentFactory;
 }
 export interface MarkdownLayoutProps<T extends Record<string, any>> {
     frontmatter: {
         file: MarkdownInstance<T>['file'];
         url: MarkdownInstance<T>['url'];
     } & T;
+    file: MarkdownInstance<T>['file'];
+    url: MarkdownInstance<T>['url'];
     headings: MarkdownHeading[];
     rawContent: MarkdownInstance<T>['rawContent'];
     compiledContent: MarkdownInstance<T>['compiledContent'];

package/dist/core/add/index.js

@@ -517,7 +517,7 @@ ${message}`
   }
 }
 async function fetchPackageJson(scope, name, tag) {
-  const packageName = `${scope ? `@${scope}/` : ""}${name}`;
+  const packageName = `${scope ? `${scope}/` : ""}${name}`;
   const res = await fetch(`https://registry.npmjs.org/${packageName}/${tag}`);
   if (res.status === 404) {
     return new Error();
@@ -535,10 +535,12 @@ async function validateIntegrations(integrations) {
           throw new Error(`${bold(integration)} does not appear to be a valid package name!`);
         }
         let { scope, name, tag } = parsed;
-        let pkgJson = null;
-        let pkgType = "first-party";
-        if (!scope) {
-          const firstPartyPkgCheck = await fetchPackageJson("astrojs", name, tag);
+        let pkgJson;
+        let pkgType;
+        if (scope && scope !== "@astrojs") {
+          pkgType = "third-party";
+        } else {
+          const firstPartyPkgCheck = await fetchPackageJson("@astrojs", name, tag);
           if (firstPartyPkgCheck instanceof Error) {
             spinner.warn(
               yellow(`${bold(integration)} is not an official Astro package. Use at your own risk!`)
@@ -559,6 +561,7 @@ async function validateIntegrations(integrations) {
             spinner.start("Resolving with third party packages...");
             pkgType = "third-party";
           } else {
+            pkgType = "first-party";
             pkgJson = firstPartyPkgCheck;
           }
         }
@@ -570,8 +573,8 @@ async function validateIntegrations(integrations) {
             pkgJson = thirdPartyPkgCheck;
           }
         }
-        const resolvedScope = pkgType === "first-party" ? "astrojs" : scope;
-        const packageName = `${resolvedScope ? `@${resolvedScope}/` : ""}${name}`;
+        const resolvedScope = pkgType === "first-party" ? "@astrojs" : scope;
+        const packageName = `${resolvedScope ? `${resolvedScope}/` : ""}${name}`;
         let dependencies = [
           [pkgJson["name"], `^${pkgJson["version"]}`]
         ];

package/dist/core/build/generate.js

@@ -19,7 +19,7 @@ import { createRequest } from "../request.js";
 import { matchRoute } from "../routing/match.js";
 import { getOutputFilename } from "../util.js";
 import { getOutFile, getOutFolder } from "./common.js";
-import { eachPageData, getPageDataByComponent } from "./internal.js";
+import { eachPageData, getPageDataByComponent, sortedCSS } from "./internal.js";
 import { getTimeStat } from "./util.js";
 const MAX_CONCURRENT_RENDERS = 1;
 function* throttle(max, inPaths) {
@@ -79,7 +79,7 @@ async function generatePage(opts, internals, pageData, ssrEntry, builtPaths) {
   let timeStart = performance.now();
   const renderers = ssrEntry.renderers;
   const pageInfo = getPageDataByComponent(internals, pageData.route.component);
-  const linkIds = Array.from((pageInfo == null ? void 0 : pageInfo.css) ?? []);
+  const linkIds = sortedCSS(pageData);
   const scripts = (pageInfo == null ? void 0 : pageInfo.hoistedScript) ?? null;
   const pageModule = ssrEntry.pageMap.get(pageData.component);
   if (!pageModule) {
@@ -141,9 +141,6 @@ async function getPathsForRoute(pageData, mod, opts, builtPaths) {
     });
     opts.routeCache.set(route, result);
     paths = result.staticPaths.map((staticPath) => staticPath.params && route.generate(staticPath.params)).filter((staticPath) => {
-      if (!staticPath) {
-        return false;
-      }
       if (!builtPaths.has(removeTrailingForwardSlash(staticPath))) {
         return true;
       }
@@ -159,6 +156,21 @@ async function getPathsForRoute(pageData, mod, opts, builtPaths) {
 function addPageName(pathname, opts) {
   opts.pageNames.push(pathname.replace(/^\//, ""));
 }
+function getUrlForPath(pathname, base, origin, format, routeType) {
+  const ending = format === "directory" ? "/" : ".html";
+  let buildPathname;
+  if (pathname === "/" || pathname === "") {
+    buildPathname = base;
+  } else if (routeType === "endpoint") {
+    const buildPathRelative = removeLeadingForwardSlash(pathname);
+    buildPathname = base + buildPathRelative;
+  } else {
+    const buildPathRelative = removeTrailingForwardSlash(removeLeadingForwardSlash(pathname)) + ending;
+    buildPathname = base + buildPathRelative;
+  }
+  const url = new URL(buildPathname, origin);
+  return url;
+}
 async function generatePath(pathname, opts, gopts) {
   var _a;
   const { astroConfig, logging, origin, routeCache } = opts;
@@ -168,7 +180,7 @@ async function generatePath(pathname, opts, gopts) {
   }
   debug("build", `Generating: ${pathname}`);
   const site = astroConfig.base !== "/" ? joinPaths(((_a = astroConfig.site) == null ? void 0 : _a.toString()) || "http://localhost/", astroConfig.base) : astroConfig.site;
-  const links = createLinkStylesheetElementSet(linkIds.reverse(), site);
+  const links = createLinkStylesheetElementSet(linkIds, site);
   const scripts = createModuleScriptsSet(hoistedScripts ? [hoistedScripts] : [], site);
   if (astroConfig._ctx.scripts.some((script) => script.stage === "page")) {
     const hashedFilePath = internals.entrySpecifierToBundleMap.get(PAGE_SCRIPT_ID);
@@ -190,7 +202,13 @@ async function generatePath(pathname, opts, gopts) {
     }
   }
   const ssr = opts.astroConfig.output === "server";
-  const url = new URL(opts.astroConfig.base + removeLeadingForwardSlash(pathname), origin);
+  const url = getUrlForPath(
+    pathname,
+    opts.astroConfig.base,
+    origin,
+    opts.astroConfig.build.format,
+    pageData.route.type
+  );
   const options = {
     adapterName: void 0,
     links,

package/dist/{types/core → core}/build/graph.d.ts

@@ -1,7 +1,8 @@
 import type { GetModuleInfo, ModuleInfo } from 'rollup';
 export declare function walkParentInfos(id: string, ctx: {
     getModuleInfo: GetModuleInfo;
-}, seen?: Set<string>): Generator<ModuleInfo, void, unknown>;
+}, depth?: number, seen?: Set<string>): Generator<[ModuleInfo, number], void, unknown>;
+export declare function moduleIsTopLevelPage(info: ModuleInfo): boolean;
 export declare function getTopLevelPages(id: string, ctx: {
     getModuleInfo: GetModuleInfo;
-}): Generator<ModuleInfo, void, unknown>;
+}): Generator<[ModuleInfo, number], void, unknown>;

package/dist/core/build/graph.js

@@ -1,26 +1,30 @@
 import { resolvedPagesVirtualModuleId } from "../app/index.js";
-function* walkParentInfos(id, ctx, seen = /* @__PURE__ */ new Set()) {
+function* walkParentInfos(id, ctx, depth = 0, seen = /* @__PURE__ */ new Set()) {
   seen.add(id);
   const info = ctx.getModuleInfo(id);
   if (info) {
-    yield info;
+    yield [info, depth];
   }
   const importers = ((info == null ? void 0 : info.importers) || []).concat((info == null ? void 0 : info.dynamicImporters) || []);
   for (const imp of importers) {
     if (seen.has(imp)) {
       continue;
     }
-    yield* walkParentInfos(imp, ctx, seen);
+    yield* walkParentInfos(imp, ctx, ++depth, seen);
   }
 }
+function moduleIsTopLevelPage(info) {
+  return info.importers[0] === resolvedPagesVirtualModuleId;
+}
 function* getTopLevelPages(id, ctx) {
-  for (const info of walkParentInfos(id, ctx)) {
-    if ((info == null ? void 0 : info.importers[0]) === resolvedPagesVirtualModuleId) {
-      yield info;
+  for (const res of walkParentInfos(id, ctx)) {
+    if (moduleIsTopLevelPage(res[0])) {
+      yield res;
     }
   }
 }
 export {
   getTopLevelPages,
+  moduleIsTopLevelPage,
   walkParentInfos
 };

package/dist/core/build/index.js

@@ -38,7 +38,7 @@ class AstroBuilder {
     debug("build", "Initial setup...");
     const { logging } = this;
     this.timer.init = performance.now();
-    this.config = await runHookConfigSetup({ config: this.config, command: "build" });
+    this.config = await runHookConfigSetup({ config: this.config, command: "build", logging });
     this.manifest = createRouteManifest({ config: this.config }, this.logging);
     const viteConfig = await createVite(
       {
@@ -51,7 +51,7 @@ class AstroBuilder {
       },
       { astroConfig: this.config, logging, mode: "build" }
     );
-    await runHookConfigDone({ config: this.config });
+    await runHookConfigDone({ config: this.config, logging });
     return { viteConfig };
   }
   async build({ viteConfig }) {
@@ -60,7 +60,7 @@ class AstroBuilder {
       server: new URL("./server/", this.config.outDir),
       serverEntry: "entry.mjs"
     };
-    await runHookBuildStart({ config: this.config, buildConfig });
+    await runHookBuildStart({ config: this.config, buildConfig, logging: this.logging });
     info(this.logging, "build", `output target: ${colors.green(this.config.output)}`);
     if (this.config._ctx.adapter) {
       info(this.logging, "build", `deploy adapter: ${colors.green(this.config._ctx.adapter.name)}`);
@@ -106,7 +106,8 @@ class AstroBuilder {
       config: this.config,
       buildConfig,
       pages: pageNames,
-      routes: Object.values(allPages).map((pd) => pd.route)
+      routes: Object.values(allPages).map((pd) => pd.route),
+      logging: this.logging
     });
     if (this.logging.level && levels[this.logging.level] <= levels["info"]) {
       await this.printStats({

package/dist/{types/core → core}/build/internal.d.ts

@@ -51,3 +51,12 @@ export declare function getPageDataByComponent(internals: BuildInternals, compon
 export declare function getPageDataByViteID(internals: BuildInternals, viteid: ViteID): PageBuildData | undefined;
 export declare function hasPageDataByViteID(internals: BuildInternals, viteid: ViteID): boolean;
 export declare function eachPageData(internals: BuildInternals): Generator<PageBuildData, void, undefined>;
+/**
+ * Sort a page's CSS by depth. A higher depth means that the CSS comes from shared subcomponents.
+ * A lower depth means it comes directly from the top-level page.
+ * The return of this function is an array of CSS paths, with shared CSS on top
+ * and page-level CSS on bottom.
+ */
+export declare function sortedCSS(pageData: PageBuildData): string[];
+export declare function isHoistedScript(internals: BuildInternals, id: string): boolean;
+export declare function getPageDatasByHoistedScriptId(internals: BuildInternals, id: string): Generator<PageBuildData, void, unknown>;

package/dist/core/build/internal.js

@@ -2,9 +2,6 @@ import { prependForwardSlash } from "../path.js";
 import { viteID } from "../util.js";
 function createBuildInternals() {
   const pureCSSChunks = /* @__PURE__ */ new Set();
-  const chunkToReferenceIdMap = /* @__PURE__ */ new Map();
-  const astroStyleMap = /* @__PURE__ */ new Map();
-  const astroPageStyleMap = /* @__PURE__ */ new Map();
   const hoistedScriptIdToHoistedMap = /* @__PURE__ */ new Map();
   const hoistedScriptIdToPagesMap = /* @__PURE__ */ new Map();
   return {
@@ -76,6 +73,32 @@ function hasPageDataByViteID(internals, viteid) {
 function* eachPageData(internals) {
   yield* internals.pagesByComponent.values();
 }
+function sortedCSS(pageData) {
+  return Array.from(pageData.css).sort((a, b) => {
+    let depthA = a[1].depth, depthB = b[1].depth;
+    if (depthA === -1) {
+      return -1;
+    } else if (depthB === -1) {
+      return 1;
+    } else {
+      return depthA > depthB ? -1 : 1;
+    }
+  }).map(([id]) => id);
+}
+function isHoistedScript(internals, id) {
+  return internals.hoistedScriptIdToPagesMap.has(id);
+}
+function* getPageDatasByHoistedScriptId(internals, id) {
+  const set = internals.hoistedScriptIdToPagesMap.get(id);
+  if (set) {
+    for (const pageId of set) {
+      const pageData = getPageDataByComponent(internals, pageId.slice(1));
+      if (pageData) {
+        yield pageData;
+      }
+    }
+  }
+}
 export {
   createBuildInternals,
   eachPageData,
@@ -83,7 +106,10 @@ export {
   getPageDataByViteID,
   getPageDatasByChunk,
   getPageDatasByClientOnlyID,
+  getPageDatasByHoistedScriptId,
   hasPageDataByViteID,
+  isHoistedScript,
+  sortedCSS,
   trackClientOnlyPageDatas,
   trackPageData
 };

package/dist/core/build/page-data.js

@@ -27,7 +27,7 @@ async function collectPagesData(opts) {
         component: route.component,
         route,
         moduleSpecifier: "",
-        css: /* @__PURE__ */ new Set(),
+        css: /* @__PURE__ */ new Map(),
         hoistedScript: void 0
       };
       clearInterval(routeCollectionLogTimeout);
@@ -46,7 +46,7 @@ async function collectPagesData(opts) {
       component: route.component,
       route,
       moduleSpecifier: "",
-      css: /* @__PURE__ */ new Set(),
+      css: /* @__PURE__ */ new Map(),
       hoistedScript: void 0
     };
   }

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

@@ -122,13 +122,15 @@ async function ssrBuild(opts, internals, input) {
       vitePluginAnalyzer(internals)
     ],
     publicDir: ssr ? false : viteConfig.publicDir,
-    envPrefix: "PUBLIC_"
+    envPrefix: "PUBLIC_",
+    base: astroConfig.base
   };
   await runHookBuildSetup({
     config: astroConfig,
     pages: internals.pagesByComponent,
     vite: viteBuildConfig,
-    target: "server"
+    target: "server",
+    logging: opts.logging
   });
   return await vite.build(viteBuildConfig);
 }
@@ -180,13 +182,15 @@ ${bgGreen(black(" building client "))}`);
       }),
       ...viteConfig.plugins || []
     ],
-    envPrefix: "PUBLIC_"
+    envPrefix: "PUBLIC_",
+    base: astroConfig.base
   };
   await runHookBuildSetup({
     config: astroConfig,
     pages: internals.pagesByComponent,
     vite: viteBuildConfig,
-    target: "client"
+    target: "client",
+    logging: opts.logging
   });
   const buildResult = await vite.build(viteBuildConfig);
   info(opts.logging, null, dim(`Completed in ${getTimeStat(timer, performance.now())}.

package/dist/{types/core → core}/build/types.d.ts

@@ -8,7 +8,9 @@ export interface PageBuildData {
     component: ComponentPath;
     route: RouteData;
     moduleSpecifier: string;
-    css: Set<string>;
+    css: Map<string, {
+        depth: number;
+    }>;
     hoistedScript: {
         type: 'inline' | 'external';
         value: string;

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

@@ -15,7 +15,7 @@ function vitePluginAnalyzer(internals) {
           hoistedScripts.add(hid);
         }
         if (hoistedScripts.size) {
-          for (const pageInfo of getTopLevelPages(from, this)) {
+          for (const [pageInfo] of getTopLevelPages(from, this)) {
             const pageId = pageInfo.id;
             for (const hid of hoistedScripts) {
               if (pageScripts.has(pageId)) {
@@ -77,7 +77,7 @@ function vitePluginAnalyzer(internals) {
             internals.discoveredClientOnlyComponents.add(cid);
             clientOnlys.push(cid);
           }
-          for (const pageInfo of getTopLevelPages(id, this)) {
+          for (const [pageInfo] of getTopLevelPages(id, this)) {
             const pageData = getPageDataByViteID(internals, pageInfo.id);
             if (!pageData)
               continue;