astro 2.0.6 → 2.0.8

package/dist/core/build/{vite-plugin-hoisted-scripts.js → plugins/plugin-hoisted-scripts.js}

@@ -1,5 +1,5 @@
-import { viteID } from "../util.js";
-import { getPageDataByViteID } from "./internal.js";
+import { viteID } from "../../util.js";
+import { getPageDataByViteID } from "../internal.js";
 function virtualHoistedEntry(id) {
   return id.startsWith("/astro/hoisted.js?q=");
 }
@@ -65,6 +65,19 @@ function vitePluginHoistedScripts(settings, internals) {
     }
   };
 }
+function pluginHoistedScripts(options, internals) {
+  return {
+    build: "client",
+    hooks: {
+      "build:before": () => {
+        return {
+          vitePlugin: vitePluginHoistedScripts(options.settings, internals)
+        };
+      }
+    }
+  };
+}
 export {
+  pluginHoistedScripts,
   vitePluginHoistedScripts
 };

package/dist/core/build/plugins/plugin-internals.d.ts

@@ -0,0 +1,5 @@
+import type { Plugin as VitePlugin } from 'vite';
+import type { BuildInternals } from '../internal.js';
+import type { AstroBuildPlugin } from '../plugin';
+export declare function vitePluginInternals(input: Set<string>, internals: BuildInternals): VitePlugin;
+export declare function pluginInternals(internals: BuildInternals): AstroBuildPlugin;

package/dist/core/build/{vite-plugin-internals.js → plugins/plugin-internals.js}

@@ -29,7 +29,11 @@ function vitePluginInternals(input, internals) {
         promises.push(
           this.resolve(specifier).then((result) => {
             if (result) {
-              mapping.set(result.id, specifier);
+              if (mapping.has(result.id)) {
+                mapping.get(result.id).add(specifier);
+              } else {
+                mapping.set(result.id, /* @__PURE__ */ new Set([specifier]));
+              }
             }
           })
         );
@@ -37,8 +41,10 @@ function vitePluginInternals(input, internals) {
       await Promise.all(promises);
       for (const [, chunk] of Object.entries(bundle)) {
         if (chunk.type === "chunk" && chunk.facadeModuleId) {
-          const specifier = mapping.get(chunk.facadeModuleId) || chunk.facadeModuleId;
-          internals.entrySpecifierToBundleMap.set(specifier, chunk.fileName);
+          const specifiers = mapping.get(chunk.facadeModuleId) || /* @__PURE__ */ new Set([chunk.facadeModuleId]);
+          for (const specifier of specifiers) {
+            internals.entrySpecifierToBundleMap.set(specifier, chunk.fileName);
+          }
         } else if (chunk.type === "chunk") {
           for (const id of Object.keys(chunk.modules)) {
             const pageData = internals.pagesByViteID.get(id);
@@ -51,6 +57,19 @@ function vitePluginInternals(input, internals) {
     }
   };
 }
+function pluginInternals(internals) {
+  return {
+    build: "both",
+    hooks: {
+      "build:before": ({ input }) => {
+        return {
+          vitePlugin: vitePluginInternals(input, internals)
+        };
+      }
+    }
+  };
+}
 export {
+  pluginInternals,
   vitePluginInternals
 };

package/dist/core/build/plugins/plugin-pages.d.ts

@@ -0,0 +1,6 @@
+import type { Plugin as VitePlugin } from 'vite';
+import type { AstroBuildPlugin } from '../plugin';
+import type { StaticBuildOptions } from '../types';
+import { BuildInternals } from '../internal.js';
+export declare function vitePluginPages(opts: StaticBuildOptions, internals: BuildInternals): VitePlugin;
+export declare function pluginPages(opts: StaticBuildOptions, internals: BuildInternals): AstroBuildPlugin;

package/dist/core/build/{vite-plugin-pages.js → plugins/plugin-pages.js}

@@ -1,6 +1,6 @@
-import { pagesVirtualModuleId, resolvedPagesVirtualModuleId } from "../app/index.js";
-import { addRollupInput } from "./add-rollup-input.js";
-import { eachPageData, hasPrerenderedPages } from "./internal.js";
+import { pagesVirtualModuleId, resolvedPagesVirtualModuleId } from "../../app/index.js";
+import { addRollupInput } from "../add-rollup-input.js";
+import { eachPageData, hasPrerenderedPages } from "../internal.js";
 function vitePluginPages(opts, internals) {
   return {
     name: "@astro/plugin-build-pages",
@@ -42,6 +42,19 @@ export const renderers = [${rendererItems}];`;
     }
   };
 }
+function pluginPages(opts, internals) {
+  return {
+    build: "ssr",
+    hooks: {
+      "build:before": () => {
+        return {
+          vitePlugin: vitePluginPages(opts, internals)
+        };
+      }
+    }
+  };
+}
 export {
+  pluginPages,
   vitePluginPages
 };

package/dist/core/build/plugins/plugin-prerender.d.ts

@@ -0,0 +1,6 @@
+import type { Plugin as VitePlugin } from 'vite';
+import type { BuildInternals } from '../internal.js';
+import type { AstroBuildPlugin } from '../plugin.js';
+import type { StaticBuildOptions } from '../types';
+export declare function vitePluginPrerender(opts: StaticBuildOptions, internals: BuildInternals): VitePlugin;
+export declare function pluginPrerender(opts: StaticBuildOptions, internals: BuildInternals): AstroBuildPlugin;

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

@@ -0,0 +1,39 @@
+import { extendManualChunks } from "./util.js";
+function vitePluginPrerender(opts, internals) {
+  return {
+    name: "astro:rollup-plugin-prerender",
+    outputOptions(outputOptions) {
+      extendManualChunks(outputOptions, {
+        after(id, meta) {
+          var _a, _b, _c;
+          if (id.includes("astro/dist")) {
+            return "astro";
+          }
+          const pageInfo = internals.pagesByViteID.get(id);
+          if (pageInfo) {
+            if ((_c = (_b = (_a = meta.getModuleInfo(id)) == null ? void 0 : _a.meta.astro) == null ? void 0 : _b.pageOptions) == null ? void 0 : _c.prerender) {
+              return "prerender";
+            }
+            return `pages/all`;
+          }
+        }
+      });
+    }
+  };
+}
+function pluginPrerender(opts, internals) {
+  return {
+    build: "ssr",
+    hooks: {
+      "build:before": () => {
+        return {
+          vitePlugin: vitePluginPrerender(opts, internals)
+        };
+      }
+    }
+  };
+}
+export {
+  pluginPrerender,
+  vitePluginPrerender
+};

package/dist/core/build/plugins/plugin-ssr.d.ts

@@ -0,0 +1,9 @@
+import type { Plugin as VitePlugin } from 'vite';
+import type { AstroAdapter } from '../../../@types/astro';
+import type { BuildInternals } from '../internal.js';
+import type { StaticBuildOptions } from '../types';
+import { AstroBuildPlugin } from '../plugin';
+export declare const virtualModuleId = "@astrojs-ssr-virtual-entry";
+export declare function vitePluginSSR(internals: BuildInternals, adapter: AstroAdapter): VitePlugin;
+export declare function injectManifest(buildOpts: StaticBuildOptions, internals: BuildInternals): Promise<string>;
+export declare function pluginSSR(options: StaticBuildOptions, internals: BuildInternals): AstroBuildPlugin;

package/dist/core/build/{vite-plugin-ssr.js → plugins/plugin-ssr.js}

@@ -1,15 +1,14 @@
 import glob from "fast-glob";
-import * as fs from "fs";
 import { fileURLToPath } from "url";
-import { getContentPaths } from "../../content/index.js";
-import { runHookBuildSsr } from "../../integrations/index.js";
-import { BEFORE_HYDRATION_SCRIPT_ID, PAGE_SCRIPT_ID } from "../../vite-plugin-scripts/index.js";
-import { pagesVirtualModuleId } from "../app/index.js";
-import { removeLeadingForwardSlash, removeTrailingForwardSlash } from "../path.js";
-import { serializeRouteData } from "../routing/index.js";
-import { addRollupInput } from "./add-rollup-input.js";
-import { getOutFile, getOutFolder } from "./common.js";
-import { eachPrerenderedPageData, eachServerPageData, sortedCSS } from "./internal.js";
+import { getContentPaths } from "../../../content/index.js";
+import { runHookBuildSsr } from "../../../integrations/index.js";
+import { BEFORE_HYDRATION_SCRIPT_ID, PAGE_SCRIPT_ID } from "../../../vite-plugin-scripts/index.js";
+import { pagesVirtualModuleId } from "../../app/index.js";
+import { removeLeadingForwardSlash, removeTrailingForwardSlash } from "../../path.js";
+import { serializeRouteData } from "../../routing/index.js";
+import { addRollupInput } from "../add-rollup-input.js";
+import { getOutFile, getOutFolder } from "../common.js";
+import { eachPrerenderedPageData, eachServerPageData, sortedCSS } from "../internal.js";
 const virtualModuleId = "@astrojs-ssr-virtual-entry";
 const resolvedVirtualModuleId = "\0" + virtualModuleId;
 const manifestReplace = "@@ASTRO_MANIFEST_REPLACE@@";
@@ -21,7 +20,7 @@ function vitePluginSSR(internals, adapter) {
     options(opts) {
       return addRollupInput(opts, [virtualModuleId]);
     },
-    resolveId(id) {
+    resolveId(id, parent) {
       if (id === virtualModuleId) {
         return resolvedVirtualModuleId;
       }
@@ -93,12 +92,9 @@ async function injectManifest(buildOpts, internals) {
   });
   const chunk = internals.ssrEntryChunk;
   const code = chunk.code;
-  chunk.code = code.replace(replaceExp, () => {
+  return code.replace(replaceExp, () => {
     return JSON.stringify(manifest);
   });
-  const serverEntryURL = new URL(buildOpts.buildConfig.serverEntry, buildOpts.buildConfig.server);
-  await fs.promises.mkdir(new URL("./", serverEntryURL), { recursive: true });
-  await fs.promises.writeFile(serverEntryURL, chunk.code, "utf-8");
 }
 function buildManifest(opts, internals, staticFiles) {
   const { settings } = opts;
@@ -174,14 +170,42 @@ function buildManifest(opts, internals, staticFiles) {
       contentDir: getContentPaths(settings.config).contentDir
     },
     pageMap: null,
+    propagation: Array.from(internals.propagation),
     renderers: [],
     entryModules,
     assets: staticFiles.map((s) => settings.config.base + s)
   };
   return ssrManifest;
 }
+function pluginSSR(options, internals) {
+  const ssr = options.settings.config.output === "server";
+  return {
+    build: "ssr",
+    hooks: {
+      "build:before": () => {
+        let vitePlugin = ssr ? vitePluginSSR(internals, options.settings.adapter) : void 0;
+        return {
+          enforce: "after-user-plugins",
+          vitePlugin
+        };
+      },
+      "build:post": async ({ mutate }) => {
+        if (!ssr) {
+          return;
+        }
+        if (!internals.ssrEntryChunk) {
+          throw new Error(`Did not generate an entry chunk for SSR`);
+        }
+        internals.ssrEntryChunk.fileName = options.settings.config.build.serverEntry;
+        const code = await injectManifest(options, internals);
+        mutate(internals.ssrEntryChunk, "server", code);
+      }
+    }
+  };
+}
 export {
   injectManifest,
+  pluginSSR,
   virtualModuleId,
   vitePluginSSR
 };

package/dist/core/build/plugins/util.d.ts

@@ -0,0 +1,9 @@
+import type { Plugin as VitePlugin } from 'vite';
+type OutputOptionsHook = Extract<VitePlugin['outputOptions'], Function>;
+type OutputOptions = Parameters<OutputOptionsHook>[0];
+type ExtendManualChunksHooks = {
+    before?: (id: string, meta: any) => string | undefined;
+    after?: (id: string, meta: any) => string | undefined;
+};
+export declare function extendManualChunks(outputOptions: OutputOptions, hooks: ExtendManualChunksHooks): void;
+export {};

package/dist/core/build/plugins/util.js

@@ -0,0 +1,29 @@
+function extendManualChunks(outputOptions, hooks) {
+  const manualChunks = outputOptions.manualChunks;
+  outputOptions.manualChunks = function(id, meta) {
+    if (hooks.before) {
+      let value = hooks.before(id, meta);
+      if (value) {
+        return value;
+      }
+    }
+    if (typeof manualChunks == "object") {
+      if (id in manualChunks) {
+        let value = manualChunks[id];
+        return value[0];
+      }
+    } else if (typeof manualChunks === "function") {
+      const outid = manualChunks.call(this, id, meta);
+      if (outid) {
+        return outid;
+      }
+    }
+    if (hooks.after) {
+      return hooks.after(id, meta) || null;
+    }
+    return null;
+  };
+}
+export {
+  extendManualChunks
+};

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

@@ -4,7 +4,6 @@ import fs from "fs";
 import { bgGreen, bgMagenta, black, dim } from "kleur/colors";
 import { fileURLToPath } from "url";
 import * as vite from "vite";
-import { astroContentProdBundlePlugin } from "../../content/index.js";
 import {
   createBuildInternals,
   eachPrerenderedPageData
@@ -20,16 +19,11 @@ import { info } from "../logger/core.js";
 import { getOutDirWithinCwd } from "./common.js";
 import { generatePages } from "./generate.js";
 import { trackPageData } from "./internal.js";
+import { createPluginContainer } from "./plugin.js";
+import { registerAllPlugins } from "./plugins/index.js";
 import { getTimeStat } from "./util.js";
-import { vitePluginAliasResolve } from "./vite-plugin-alias-resolve.js";
-import { vitePluginAnalyzer } from "./vite-plugin-analyzer.js";
-import { rollupPluginAstroBuildCSS } from "./vite-plugin-css.js";
-import { vitePluginHoistedScripts } from "./vite-plugin-hoisted-scripts.js";
-import { vitePluginInternals } from "./vite-plugin-internals.js";
-import { vitePluginPages } from "./vite-plugin-pages.js";
-import { vitePluginPrerender } from "./vite-plugin-prerender.js";
-import { injectManifest, vitePluginSSR } from "./vite-plugin-ssr.js";
 async function staticBuild(opts) {
+  var _a, _b, _c;
   const { allPages, settings } = opts;
   if (isModeServerWithNoAdapter(opts.settings)) {
     throw new AstroError(AstroErrorData.NoAdapterInstalled);
@@ -46,10 +40,14 @@ async function staticBuild(opts) {
     pageInput.add(astroModuleId);
     facadeIdToPageDataMap.set(fileURLToPath(astroModuleURL), pageData);
   }
-  emptyDir(settings.config.outDir, new Set(".git"));
+  if (((_c = (_b = (_a = settings.config) == null ? void 0 : _a.vite) == null ? void 0 : _b.build) == null ? void 0 : _c.emptyOutDir) !== false) {
+    emptyDir(settings.config.outDir, new Set(".git"));
+  }
+  const container = createPluginContainer(opts, internals);
+  registerAllPlugins(container);
   timer.ssr = performance.now();
   info(opts.logging, "build", `Building ${settings.config.output} entrypoints...`);
-  await ssrBuild(opts, internals, pageInput);
+  const ssrOutput = await ssrBuild(opts, internals, pageInput, container);
   info(opts.logging, "build", dim(`Completed in ${getTimeStat(timer.ssr, performance.now())}.`));
   const rendererClientEntrypoints = settings.renderers.map((r) => r.clientEntrypoint).filter((a) => typeof a === "string");
   const clientInput = /* @__PURE__ */ new Set([
@@ -62,8 +60,9 @@ async function staticBuild(opts) {
     clientInput.add(PAGE_SCRIPT_ID);
   }
   timer.clientBuild = performance.now();
-  await clientBuild(opts, internals, clientInput);
+  const clientOutput = await clientBuild(opts, internals, clientInput, container);
   timer.generate = performance.now();
+  await runPostBuildHooks(container, ssrOutput, clientOutput);
   switch (settings.config.output) {
     case "static": {
       await generatePages(opts, internals);
@@ -71,7 +70,6 @@ async function staticBuild(opts) {
       return;
     }
     case "server": {
-      await injectManifest(opts, internals);
       await generatePages(opts, internals);
       await cleanStaticOutput(opts, internals);
       info(opts.logging, null, `
@@ -82,11 +80,12 @@ ${bgMagenta(black(" finalizing server assets "))}
     }
   }
 }
-async function ssrBuild(opts, internals, input) {
+async function ssrBuild(opts, internals, input, container) {
   var _a, _b, _c;
   const { settings, viteConfig } = opts;
   const ssr = settings.config.output === "server";
   const out = ssr ? opts.buildConfig.server : getOutDirWithinCwd(settings.config.outDir);
+  const { lastVitePlugins, vitePlugins } = container.runBeforeHook("ssr", input);
   const viteBuildConfig = {
     ...viteConfig,
     mode: viteConfig.mode || "production",
@@ -120,20 +119,7 @@ async function ssrBuild(opts, internals, input) {
       modulePreload: { polyfill: false },
       reportCompressedSize: false
     },
-    plugins: [
-      vitePluginAnalyzer(internals),
-      vitePluginInternals(input, internals),
-      vitePluginPages(opts, internals),
-      rollupPluginAstroBuildCSS({
-        buildOptions: opts,
-        internals,
-        target: "server"
-      }),
-      vitePluginPrerender(opts, internals),
-      ...viteConfig.plugins || [],
-      astroContentProdBundlePlugin({ internals }),
-      ssr && vitePluginSSR(internals, settings.adapter)
-    ],
+    plugins: [...vitePlugins, ...viteConfig.plugins || [], ...lastVitePlugins],
     envPrefix: viteConfig.envPrefix ?? "PUBLIC_",
     base: settings.config.base
   };
@@ -146,7 +132,7 @@ async function ssrBuild(opts, internals, input) {
   });
   return await vite.build(viteBuildConfig);
 }
-async function clientBuild(opts, internals, input) {
+async function clientBuild(opts, internals, input, container) {
   var _a, _b, _c;
   const { settings, viteConfig } = opts;
   const timer = performance.now();
@@ -158,6 +144,7 @@ async function clientBuild(opts, internals, input) {
     }
     return null;
   }
+  const { lastVitePlugins, vitePlugins } = container.runBeforeHook("client", input);
   info(opts.logging, null, `
 ${bgGreen(black(" building client "))}`);
   const viteBuildConfig = {
@@ -182,17 +169,7 @@ ${bgGreen(black(" building client "))}`);
         preserveEntrySignatures: "exports-only"
       }
     },
-    plugins: [
-      vitePluginAliasResolve(internals),
-      vitePluginInternals(input, internals),
-      vitePluginHoistedScripts(settings, internals),
-      rollupPluginAstroBuildCSS({
-        buildOptions: opts,
-        internals,
-        target: "client"
-      }),
-      ...viteConfig.plugins || []
-    ],
+    plugins: [...vitePlugins, ...viteConfig.plugins || [], ...lastVitePlugins],
     envPrefix: viteConfig.envPrefix ?? "PUBLIC_",
     base: settings.config.base
   };
@@ -208,6 +185,17 @@ ${bgGreen(black(" building client "))}`);
 `));
   return buildResult;
 }
+async function runPostBuildHooks(container, ssrReturn, clientReturn) {
+  const mutations = await container.runPostHook(ssrReturn, clientReturn);
+  const config = container.options.settings.config;
+  const buildConfig = container.options.settings.config.build;
+  for (const [fileName, mutation] of mutations) {
+    const root = config.output === "server" ? mutation.build === "server" ? buildConfig.server : buildConfig.client : config.outDir;
+    const fileURL = new URL(fileName, root);
+    await fs.promises.mkdir(new URL("./", fileURL), { recursive: true });
+    await fs.promises.writeFile(fileURL, mutation.code, "utf-8");
+  }
+}
 async function cleanStaticOutput(opts, internals) {
   const allStaticFiles = /* @__PURE__ */ new Set();
   for (const pageData of eachPrerenderedPageData(internals)) {

package/dist/core/build/types.d.ts

@@ -1,4 +1,4 @@
-import type { InlineConfig } from 'vite';
+import type { default as vite, InlineConfig } from 'vite';
 import type { AstroConfig, AstroSettings, BuildConfig, ComponentInstance, ManifestData, RouteData, RuntimeMode, SSRLoadedRenderer } from '../../@types/astro';
 import type { LogOptions } from '../logger/core';
 import type { RouteCache } from '../render/route-cache';
@@ -13,7 +13,8 @@ export interface PageBuildData {
         depth: number;
         order: number;
     }>;
-    contentCollectionCss: Map<string, Set<string>>;
+    propagatedStyles: Map<string, Set<string>>;
+    propagatedScripts: Map<string, Set<string>>;
     hoistedScript: {
         type: 'inline' | 'external';
         value: string;
@@ -37,3 +38,10 @@ export interface SingleFileBuiltModule {
     pageMap: Map<ComponentPath, ComponentInstance>;
     renderers: SSRLoadedRenderer[];
 }
+export type ViteBuildReturn = Awaited<ReturnType<typeof vite.build>>;
+export type RollupOutput = Extract<Extract<ViteBuildReturn, Exclude<ViteBuildReturn, Array<any>>>, {
+    output: any;
+}>;
+export type OutputChunk = Extract<RollupOutput['output'][number], {
+    type: 'chunk';
+}>;

package/dist/core/compile/compile.js

@@ -21,6 +21,7 @@ async function compile({
       sourcemap: "both",
       internalURL: "astro/server/index.js",
       astroGlobalArgs: JSON.stringify(astroConfig.site),
+      resultScopedSlot: true,
       preprocessStyle: createStylePreprocessor({
         filename,
         viteConfig,

package/dist/core/constants.js

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

package/dist/core/create-vite.js

@@ -4,7 +4,7 @@ import * as vite from "vite";
 import { crawlFrameworkPkgs } from "vitefu";
 import {
   astroContentAssetPropagationPlugin,
-  astroContentServerPlugin,
+  astroContentImportPlugin,
   astroContentVirtualModPlugin
 } from "../content/index.js";
 import astroPostprocessVitePlugin from "../vite-plugin-astro-postprocess/index.js";
@@ -35,8 +35,11 @@ async function createVite(commandConfig, { settings, logging, mode, fs = nodeFs
     isBuild: mode === "build",
     viteUserConfig: settings.config.vite,
     isFrameworkPkgByJson(pkgJson) {
-      var _a2, _b, _c, _d;
-      return ((_a2 = pkgJson.peerDependencies) == null ? void 0 : _a2.astro) || ((_b = pkgJson.dependencies) == null ? void 0 : _b.astro) || ((_c = pkgJson.keywords) == null ? void 0 : _c.includes("astro")) || ((_d = pkgJson.keywords) == null ? void 0 : _d.includes("astro-component")) || /^(@[^\/]+\/)?astro\-/.test(pkgJson.name);
+      var _a2, _b, _c, _d, _e;
+      if (((_a2 = pkgJson == null ? void 0 : pkgJson.astro) == null ? void 0 : _a2.external) === true) {
+        return false;
+      }
+      return ((_b = pkgJson.peerDependencies) == null ? void 0 : _b.astro) || ((_c = pkgJson.dependencies) == null ? void 0 : _c.astro) || ((_d = pkgJson.keywords) == null ? void 0 : _d.includes("astro")) || ((_e = pkgJson.keywords) == null ? void 0 : _e.includes("astro-component")) || /^(@[^\/]+\/)?astro\-/.test(pkgJson.name);
     },
     isFrameworkPkgByName(pkgName) {
       const isNotAstroPkg = isCommonNotAstro(pkgName);
@@ -73,7 +76,7 @@ async function createVite(commandConfig, { settings, logging, mode, fs = nodeFs
       astroScannerPlugin({ settings }),
       astroInjectEnvTsPlugin({ settings, logging, fs }),
       astroContentVirtualModPlugin({ settings }),
-      astroContentServerPlugin({ fs, settings, logging, mode }),
+      astroContentImportPlugin({ fs, settings }),
       astroContentAssetPropagationPlugin({ mode })
     ],
     publicDir: fileURLToPath(settings.config.publicDir),

package/dist/core/dev/dev.js

@@ -1,4 +1,5 @@
 import { performance } from "perf_hooks";
+import { attachContentServerListeners } from "../../content/index.js";
 import { info, warn } from "../logger/core.js";
 import * as msg from "../messages.js";
 import { startContainer } from "./container.js";
@@ -29,13 +30,14 @@ async function dev(settings, options) {
       isRestart: options.isRestart
     })
   );
-  const currentVersion = "2.0.6";
+  const currentVersion = "2.0.8";
   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());
   }
+  await attachContentServerListeners(restart.container);
   return {
     address: devServerAddressInfo,
     get watcher() {

package/dist/core/errors/errors-data.d.ts

@@ -373,6 +373,19 @@ export declare const AstroErrorData: {
         readonly message: (name: string) => string;
         readonly hint: "Astro components cannot be rendered directly via function call, such as `Component()` or `{items.map(Component)}`.";
     };
+    /**
+     * @docs
+     * @see
+     * - [Pagination](https://docs.astro.build/en/core-concepts/routing/#pagination)
+     * @description
+     * The page number parameter was not found in your filepath.
+     */
+    readonly PageNumberParamNotFound: {
+        readonly title: "Page number param not found.";
+        readonly code: 3021;
+        readonly message: (paramName: string) => string;
+        readonly hint: "Rename your file to `[page].astro` or `[...page].astro`.";
+    };
     readonly UnknownViteError: {
         readonly title: "Unknown Vite Error.";
         readonly code: 4000;

package/dist/core/errors/errors-data.js

@@ -139,6 +139,12 @@ Expected \`true\` value but got \`${suffix}\`.`;
     message: (name) => `Invalid arguments passed to${name ? ` <${name}>` : ""} component.`,
     hint: "Astro components cannot be rendered directly via function call, such as `Component()` or `{items.map(Component)}`."
   },
+  PageNumberParamNotFound: {
+    title: "Page number param not found.",
+    code: 3021,
+    message: (paramName) => `[paginate()] page number param \`${paramName}\` not found in your filepath.`,
+    hint: "Rename your file to `[page].astro` or `[...page].astro`."
+  },
   UnknownViteError: {
     title: "Unknown Vite Error.",
     code: 4e3

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "2.0.6";
+  const version = "2.0.8";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -233,7 +233,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"2.0.6"}`
+        `v${"2.0.8"}`
       )} ${headline}`
     );
   }

package/dist/core/render/dev/css.js

@@ -1,13 +1,11 @@
-import path from "path";
 import { viteID } from "../../util.js";
-import { STYLE_EXTENSIONS } from "../util.js";
+import { isCSSRequest } from "./util.js";
 import { crawlGraph } from "./vite.js";
 async function getStylesForURL(filePath, loader, mode) {
   const importedCssUrls = /* @__PURE__ */ new Set();
   const importedStylesMap = /* @__PURE__ */ new Map();
   for await (const importedModule of crawlGraph(loader, viteID(filePath), true)) {
-    const ext = path.extname(importedModule.url).toLowerCase();
-    if (STYLE_EXTENSIONS.has(ext)) {
+    if (isCSSRequest(importedModule.url)) {
       let ssrModule;
       try {
         ssrModule = importedModule.ssrModule ?? await loader.import(importedModule.url);

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

@@ -0,0 +1,3 @@
+import { isCSSRequest } from 'vite';
+export { isCSSRequest };
+export declare const isBuildableCSSRequest: (request: string) => boolean;

package/dist/core/render/dev/util.js

@@ -0,0 +1,8 @@
+import { isCSSRequest } from "vite";
+const rawRE = /(?:\?|&)raw(?:&|$)/;
+const inlineRE = /(?:\?|&)inline\b/;
+const isBuildableCSSRequest = (request) => isCSSRequest(request) && !rawRE.test(request) && !inlineRE.test(request);
+export {
+  isBuildableCSSRequest,
+  isCSSRequest
+};