astro 4.4.2 → 4.4.3

package/dist/content/vite-plugin-content-virtual-mod.d.ts

@@ -8,12 +8,13 @@ interface AstroContentVirtualModPluginParams {
     fs: typeof nodeFs;
 }
 export declare function astroContentVirtualModPlugin({ settings, fs, }: AstroContentVirtualModPluginParams): Plugin;
-export declare function generateContentEntryFile({ settings, lookupMap, IS_DEV, IS_SERVER, }: {
+export declare function generateContentEntryFile({ settings, lookupMap, IS_DEV, IS_SERVER, isClient, }: {
     settings: AstroSettings;
     fs: typeof nodeFs;
     lookupMap: ContentLookupMap;
     IS_DEV: boolean;
     IS_SERVER: boolean;
+    isClient: boolean;
 }): Promise<string>;
 /**
  * Generate a map from a collection + slug to the local file path.

package/dist/content/vite-plugin-content-virtual-mod.js

@@ -51,13 +51,21 @@ function astroContentVirtualModPlugin({
         }
       }
     },
-    async load(id) {
+    async load(id, args) {
       if (id === RESOLVED_VIRTUAL_MODULE_ID) {
         const lookupMap = await generateLookupMap({
           settings,
           fs
         });
-        const code = await generateContentEntryFile({ settings, fs, lookupMap, IS_DEV, IS_SERVER });
+        const isClient = !args?.ssr;
+        const code = await generateContentEntryFile({
+          settings,
+          fs,
+          lookupMap,
+          IS_DEV,
+          IS_SERVER,
+          isClient
+        });
         return {
           code,
           meta: {
@@ -89,7 +97,8 @@ async function generateContentEntryFile({
   settings,
   lookupMap,
   IS_DEV,
-  IS_SERVER
+  IS_SERVER,
+  isClient
 }) {
   const contentPaths = getContentPaths(settings.config);
   const relContentDir = rootRelativePath(settings.config.root, contentPaths.contentDir);
@@ -122,7 +131,8 @@ async function generateContentEntryFile({
     dataEntryGlobResult = getStringifiedCollectionFromLookup("data", relContentDir, lookupMap);
     renderEntryGlobResult = getStringifiedCollectionFromLookup("render", relContentDir, lookupMap);
   }
-  const virtualModContents = nodeFs.readFileSync(contentPaths.virtualModTemplate, "utf-8").replace("@@CONTENT_DIR@@", relContentDir).replace("'@@CONTENT_ENTRY_GLOB_PATH@@'", contentEntryGlobResult).replace("'@@DATA_ENTRY_GLOB_PATH@@'", dataEntryGlobResult).replace("'@@RENDER_ENTRY_GLOB_PATH@@'", renderEntryGlobResult).replace("/* @@LOOKUP_MAP_ASSIGNMENT@@ */", `lookupMap = ${JSON.stringify(lookupMap)};`);
+  let virtualModContents = nodeFs.readFileSync(contentPaths.virtualModTemplate, "utf-8").replace("@@CONTENT_DIR@@", relContentDir).replace("'@@CONTENT_ENTRY_GLOB_PATH@@'", contentEntryGlobResult).replace("'@@DATA_ENTRY_GLOB_PATH@@'", dataEntryGlobResult).replace("'@@RENDER_ENTRY_GLOB_PATH@@'", renderEntryGlobResult).replace("/* @@LOOKUP_MAP_ASSIGNMENT@@ */", `lookupMap = ${JSON.stringify(lookupMap)};`) + (isClient ? `
+console.warn('astro:content is only supported running server-side. Using it in the browser will lead to bloated bundles and slow down page load. In the future it will not be supported.');` : "");
   return virtualModContents;
 }
 function getStringifiedCollectionFromLookup(wantedType, relContentDir, lookupMap) {

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

@@ -120,7 +120,8 @@ export default {}`
         fs: fsMod,
         lookupMap,
         IS_DEV: false,
-        IS_SERVER: false
+        IS_SERVER: false,
+        isClient: false
       });
       this.emitFile({
         type: "prebuilt-chunk",

package/dist/core/compile/compile.d.ts

@@ -9,8 +9,14 @@ export interface CompileProps {
     filename: string;
     source: string;
 }
-export interface CompileResult extends TransformResult {
-    cssDeps: Set<string>;
-    source: string;
+export interface CompileCssResult {
+    code: string;
+    /**
+     * The dependencies of the transformed CSS (Normalized paths)
+     */
+    dependencies?: string[];
+}
+export interface CompileResult extends Omit<TransformResult, 'css'> {
+    css: CompileCssResult[];
 }
 export declare function compile({ astroConfig, viteConfig, preferences, filename, source, }: CompileProps): Promise<CompileResult>;

package/dist/core/compile/compile.js

@@ -12,7 +12,7 @@ async function compile({
   filename,
   source
 }) {
-  const cssDeps = /* @__PURE__ */ new Set();
+  const cssDeps = [];
   const cssTransformErrors = [];
   let transformResult;
   try {
@@ -50,8 +50,10 @@ async function compile({
   handleCompileResultErrors(transformResult, cssTransformErrors);
   return {
     ...transformResult,
-    cssDeps,
-    source
+    css: transformResult.css.map((code, i) => ({
+      code,
+      dependencies: cssDeps[i]
+    }))
   };
 }
 function handleCompileResultErrors(result, cssTransformErrors) {

package/dist/core/compile/style.d.ts

@@ -1,8 +1,9 @@
 import type { TransformOptions } from '@astrojs/compiler';
 import { type ResolvedConfig } from 'vite';
+import type { CompileCssResult } from './compile.js';
 export declare function createStylePreprocessor({ filename, viteConfig, cssDeps, cssTransformErrors, }: {
     filename: string;
     viteConfig: ResolvedConfig;
-    cssDeps: Set<string>;
+    cssDeps: CompileCssResult['dependencies'][];
     cssTransformErrors: Error[];
 }): TransformOptions['preprocessStyle'];

package/dist/core/compile/style.js

@@ -1,5 +1,5 @@
 import fs from "node:fs";
-import { preprocessCSS } from "vite";
+import { normalizePath, preprocessCSS } from "vite";
 import { AstroErrorData, CSSError, positionAt } from "../errors/index.js";
 function createStylePreprocessor({
   filename,
@@ -7,14 +7,16 @@ function createStylePreprocessor({
   cssDeps,
   cssTransformErrors
 }) {
+  let processedStylesCount = 0;
   return async (content, attrs) => {
+    const index = processedStylesCount++;
     const lang = `.${attrs?.lang || "css"}`.toLowerCase();
-    const id = `${filename}?astro&type=style&lang${lang}`;
+    const id = `${filename}?astro&type=style&index=${index}&lang${lang}`;
     try {
       const result = await preprocessCSS(content, id, viteConfig);
-      result.deps?.forEach((dep) => {
-        cssDeps.add(dep);
-      });
+      if (result.deps) {
+        cssDeps[index] = [...result.deps].map((dep) => normalizePath(dep));
+      }
       let map;
       if (result.map) {
         if (typeof result.map === "string") {

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.4.2";
+const ASTRO_VERSION = "4.4.3";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const ROUTE_TYPE_HEADER = "X-Astro-Route-Type";
 const REROUTABLE_STATUS_CODES = [404, 500];

package/dist/core/create-vite.js

@@ -1,5 +1,6 @@
 import nodeFs from "node:fs";
 import { fileURLToPath } from "node:url";
+import glob from "fast-glob";
 import * as vite from "vite";
 import { crawlFrameworkPkgs } from "vitefu";
 import astroAssetsPlugin from "../assets/vite-plugin-assets.js";
@@ -74,6 +75,7 @@ async function createVite(commandConfig, { settings, logger, mode, command, fs =
       }
     }
   });
+  const srcDirPattern = glob.convertPathToPattern(fileURLToPath(settings.config.srcDir));
   const commonConfig = {
     // Tell Vite not to combine config from vite.config.js with our provided inline config
     configFile: false,
@@ -84,7 +86,17 @@ async function createVite(commandConfig, { settings, logger, mode, command, fs =
     customLogger: createViteLogger(logger, settings.config.vite.logLevel),
     appType: "custom",
     optimizeDeps: {
-      entries: ["src/**/*"],
+      // Scan all files within `srcDir` except for known server-code (e.g endpoints)
+      entries: [
+        `${srcDirPattern}!(pages)/**/*`,
+        // All files except for pages
+        `${srcDirPattern}pages/**/!(*.js|*.mjs|*.ts|*.mts)`,
+        // All pages except for endpoints
+        `${srcDirPattern}pages/**/_*.{js,mjs,ts,mts}`,
+        // Remaining JS/TS files prefixed with `_` (not endpoints)
+        `${srcDirPattern}pages/**/_*/**/*.{js,mjs,ts,mts}`
+        // Remaining JS/TS files within directories prefixed with `_` (not endpoints)
+      ],
       exclude: ["astro", "node-fetch"]
     },
     plugins: [

package/dist/core/dev/dev.js

@@ -23,7 +23,7 @@ async function dev(inlineConfig) {
       base: restart.container.settings.config.base
     })
   );
-  const currentVersion = "4.4.2";
+  const currentVersion = "4.4.3";
   if (currentVersion.includes("-")) {
     logger.warn("SKIP_FORMAT", msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

@@ -36,7 +36,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.4.2";
+  const version = "4.4.3";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -261,7 +261,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"4.4.2"}`
+        `v${"4.4.3"}`
       )} ${headline}`
     );
   }

package/dist/transitions/vite-plugin-transitions.js

@@ -5,6 +5,13 @@ const resolvedVirtualClientModuleId = "\0" + virtualClientModuleId;
 function astroTransitions({ settings }) {
   return {
     name: "astro:transitions",
+    config() {
+      return {
+        optimizeDeps: {
+          include: ["astro > cssesc"]
+        }
+      };
+    },
     async resolveId(id) {
       if (id === virtualModuleId) {
         return resolvedVirtualModuleId;

package/dist/vite-plugin-astro/hmr.d.ts

@@ -1,12 +1,9 @@
 import type { HmrContext } from 'vite';
 import type { Logger } from '../core/logger/core.js';
-import type { CompileAstroResult } from './compile.js';
 import type { CompileMetadata } from './types.js';
 export interface HandleHotUpdateOptions {
     logger: Logger;
-    compile: (code: string, filename: string) => Promise<CompileAstroResult>;
-    astroFileToCssAstroDeps: Map<string, Set<string>>;
     astroFileToCompileMetadata: Map<string, CompileMetadata>;
 }
-export declare function handleHotUpdate(ctx: HmrContext, { logger, compile, astroFileToCssAstroDeps, astroFileToCompileMetadata }: HandleHotUpdateOptions): Promise<import("vite").ModuleNode[] | undefined>;
+export declare function handleHotUpdate(ctx: HmrContext, { logger, astroFileToCompileMetadata }: HandleHotUpdateOptions): Promise<import("vite").ModuleNode[] | undefined>;
 export declare function isStyleOnlyChanged(oldCode: string, newCode: string): boolean;

package/dist/vite-plugin-astro/hmr.js

@@ -1,26 +1,20 @@
-import path from "node:path";
-import { appendForwardSlash } from "@astrojs/internal-helpers/path";
 import { frontmatterRE } from "./utils.js";
-async function handleHotUpdate(ctx, { logger, compile, astroFileToCssAstroDeps, astroFileToCompileMetadata }) {
+async function handleHotUpdate(ctx, { logger, astroFileToCompileMetadata }) {
+  for (const [astroFile, compileData] of astroFileToCompileMetadata) {
+    const isUpdatedFileCssDep = compileData.css.some((css) => css.dependencies?.includes(ctx.file));
+    if (isUpdatedFileCssDep) {
+      astroFileToCompileMetadata.delete(astroFile);
+    }
+  }
   const oldCode = astroFileToCompileMetadata.get(ctx.file)?.originalCode;
+  if (oldCode == null)
+    return;
   const newCode = await ctx.read();
-  if (oldCode && isStyleOnlyChanged(oldCode, newCode)) {
+  if (isStyleOnlyChanged(oldCode, newCode)) {
     logger.debug("watch", "style-only change");
-    await compile(newCode, ctx.file);
+    astroFileToCompileMetadata.delete(ctx.file);
     return ctx.modules.filter((mod) => mod.id?.includes("astro&type=style"));
   }
-  for (const [astroFile, cssAstroDeps] of astroFileToCssAstroDeps) {
-    if (cssAstroDeps.has(ctx.file)) {
-      logger.info("watch", getShortName(ctx.file, ctx.server.config.root));
-      const parentModules = ctx.server.moduleGraph.getModulesByFile(astroFile);
-      if (parentModules) {
-        for (const mod of parentModules) {
-          ctx.server.moduleGraph.invalidateModule(mod);
-        }
-      }
-      ctx.server.hot.send({ type: "full-reload", path: "*" });
-    }
-  }
 }
 const scriptRE = /<script(?:\s.*?)?>.*?<\/script>/gs;
 const styleRE = /<style(?:\s.*?)?>.*?<\/style>/gs;
@@ -58,9 +52,6 @@ function isArrayEqual(a, b) {
   }
   return true;
 }
-function getShortName(file, root) {
-  return file.startsWith(appendForwardSlash(root)) ? path.posix.relative(root, file) : file;
-}
 export {
   handleHotUpdate,
   isStyleOnlyChanged

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

@@ -3,13 +3,13 @@ import { normalizeFilename } from "../vite-plugin-utils/index.js";
 import { compileAstro } from "./compile.js";
 import { handleHotUpdate } from "./hmr.js";
 import { parseAstroRequest } from "./query.js";
+import { loadId } from "./utils.js";
 import { getAstroMetadata } from "./metadata.js";
 const astroFileToCompileMetadataWeakMap = /* @__PURE__ */ new WeakMap();
 function astro({ settings, logger }) {
   const { config } = settings;
   let server;
   let compile;
-  let astroFileToCssAstroDeps = /* @__PURE__ */ new Map();
   let astroFileToCompileMetadata = /* @__PURE__ */ new Map();
   const srcRootWeb = config.srcDir.pathname.slice(config.root.pathname.length - 1);
   const isBrowserPath = (path) => path.startsWith(srcRootWeb) && srcRootWeb !== "/";
@@ -39,7 +39,6 @@ function astro({ settings, logger }) {
       });
     },
     buildStart() {
-      astroFileToCssAstroDeps = /* @__PURE__ */ new Map();
       astroFileToCompileMetadata = /* @__PURE__ */ new Map();
       if (astroFileToCompileMetadataWeakMap.has(config)) {
         astroFileToCompileMetadata = astroFileToCompileMetadataWeakMap.get(config);
@@ -54,7 +53,13 @@ function astro({ settings, logger }) {
         return null;
       }
       const filename = normalizePath(normalizeFilename(parsedId.filename, config.root));
-      const compileMetadata = astroFileToCompileMetadata.get(filename);
+      let compileMetadata = astroFileToCompileMetadata.get(filename);
+      if (!compileMetadata && server) {
+        const code = await loadId(server.pluginContainer, filename);
+        if (code != null)
+          await compile(code, filename);
+        compileMetadata = astroFileToCompileMetadata.get(filename);
+      }
       if (!compileMetadata) {
         throw new Error(
           `No cached compile metadata found for "${id}". The main Astro module "${filename}" should have compiled and filled the metadata first, before its virtual modules can be requested.`
@@ -65,11 +70,12 @@ function astro({ settings, logger }) {
           if (typeof query.index === "undefined") {
             throw new Error(`Requests for Astro CSS must include an index.`);
           }
-          const code = compileMetadata.css[query.index];
-          if (!code) {
+          const result = compileMetadata.css[query.index];
+          if (!result) {
             throw new Error(`No Astro CSS at index ${query.index}`);
           }
-          return { code };
+          result.dependencies?.forEach((dep) => this.addWatchFile(dep));
+          return { code: result.code };
         }
         case "script": {
           if (typeof query.index === "undefined") {
@@ -130,25 +136,6 @@ File: ${id}`
       }
       const filename = normalizePath(parsedId.filename);
       const transformResult = await compile(source, filename);
-      const astroDeps = /* @__PURE__ */ new Set();
-      for (const dep of transformResult.cssDeps) {
-        if (dep.endsWith(".astro")) {
-          astroDeps.add(dep);
-        }
-        this.addWatchFile(dep);
-      }
-      astroFileToCssAstroDeps.set(id, astroDeps);
-      if (server) {
-        const mods = server.moduleGraph.getModulesByFile(filename);
-        if (mods) {
-          const seen = new Set(mods);
-          for (const mod of mods) {
-            if (mod.url.includes("?astro")) {
-              server.moduleGraph.invalidateModule(mod, seen);
-            }
-          }
-        }
-      }
       const astroMetadata = {
         clientOnlyComponents: transformResult.clientOnlyComponents,
         hydratedComponents: transformResult.hydratedComponents,
@@ -171,14 +158,7 @@ File: ${id}`
       };
     },
     async handleHotUpdate(ctx) {
-      if (!ctx.file.endsWith(".astro"))
-        return;
-      return handleHotUpdate(ctx, {
-        logger,
-        compile,
-        astroFileToCssAstroDeps,
-        astroFileToCompileMetadata
-      });
+      return handleHotUpdate(ctx, { logger, astroFileToCompileMetadata });
     }
   };
   const normalPlugin = {

package/dist/vite-plugin-astro/types.d.ts

@@ -1,5 +1,6 @@
 import type { HoistedScript, TransformResult } from '@astrojs/compiler';
 import type { PropagationHint } from '../@types/astro.js';
+import type { CompileCssResult } from '../core/compile/compile.js';
 export interface PageOptions {
     prerender?: boolean;
 }
@@ -17,7 +18,7 @@ export interface CompileMetadata {
     /** Used for HMR to compare code changes */
     originalCode: string;
     /** For Astro CSS virtual module */
-    css: string[];
+    css: CompileCssResult[];
     /** For Astro hoisted scripts virtual module */
     scripts: HoistedScript[];
 }

package/dist/vite-plugin-astro/utils.d.ts

@@ -1 +1,3 @@
+import type { PluginContainer } from 'vite';
 export declare const frontmatterRE: RegExp;
+export declare function loadId(pluginContainer: PluginContainer, id: string): Promise<string | undefined>;

package/dist/vite-plugin-astro/utils.js

@@ -1,4 +1,20 @@
+import fs from "node:fs/promises";
 const frontmatterRE = /^---(.*?)^---/ms;
+async function loadId(pluginContainer, id) {
+  const result = await pluginContainer.load(id, { ssr: true });
+  if (result) {
+    if (typeof result === "string") {
+      return result;
+    } else {
+      return result.code;
+    }
+  }
+  try {
+    return await fs.readFile(id, "utf-8");
+  } catch {
+  }
+}
 export {
-  frontmatterRE
+  frontmatterRE,
+  loadId
 };

package/dist/vite-plugin-astro-server/response.js

@@ -61,8 +61,7 @@ async function writeWebResponse(res, webResponse) {
     } else {
       const reader = body.getReader();
       res.on("close", () => {
-        reader.cancel().catch((error) => {
-          console.error("An unexpected error occurred in the middle of the stream.", error);
+        reader.cancel().catch(() => {
         });
       });
       while (true) {

package/package.json

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