astro 1.2.2 → 1.2.4

package/dist/core/app/index.js

@@ -190,6 +190,13 @@ callEndpoint_fn = async function(request, routeData, mod, status = 200) {
     status
   });
   if (result.type === "response") {
+    if (result.response.headers.get("X-Astro-Response") === "Not-Found") {
+      const fourOhFourRequest = new Request(new URL("/404", request.url));
+      const fourOhFourRouteData = this.match(fourOhFourRequest);
+      if (fourOhFourRouteData) {
+        return this.render(fourOhFourRequest, fourOhFourRouteData);
+      }
+    }
     return result.response;
   } else {
     const body = result.body;

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

@@ -1,3 +1,9 @@
 import type { AstroConfig, RouteType } from '../../@types/astro';
 export declare function getOutFolder(astroConfig: AstroConfig, pathname: string, routeType: RouteType): URL;
 export declare function getOutFile(astroConfig: AstroConfig, outFolder: URL, pathname: string, routeType: RouteType): URL;
+/**
+ * Ensures the `outDir` is within `process.cwd()`. If not it will fallback to `<cwd>/.astro`.
+ * This is used for static `ssrBuild` so the output can access node_modules when we import
+ * the output files. A hardcoded fallback dir is fine as it would be cleaned up after build.
+ */
+export declare function getOutDirWithinCwd(outDir: URL): URL;

package/dist/core/build/common.js

@@ -1,6 +1,8 @@
 import npath from "path";
+import { fileURLToPath, pathToFileURL } from "url";
 import { appendForwardSlash } from "../../core/path.js";
 const STATUS_CODE_PAGES = /* @__PURE__ */ new Set(["/404", "/500"]);
+const FALLBACK_OUT_DIR_NAME = "./.astro/";
 function getOutRoot(astroConfig) {
   return new URL("./", astroConfig.outDir);
 }
@@ -43,7 +45,15 @@ function getOutFile(astroConfig, outFolder, pathname, routeType) {
       }
   }
 }
+function getOutDirWithinCwd(outDir) {
+  if (fileURLToPath(outDir).startsWith(process.cwd())) {
+    return outDir;
+  } else {
+    return new URL(FALLBACK_OUT_DIR_NAME, pathToFileURL(process.cwd() + npath.sep));
+  }
+}
 export {
+  getOutDirWithinCwd,
   getOutFile,
   getOutFolder
 };

package/dist/core/build/generate.js

@@ -18,7 +18,7 @@ import { createLinkStylesheetElementSet, createModuleScriptsSet } from "../rende
 import { createRequest } from "../request.js";
 import { matchRoute } from "../routing/match.js";
 import { getOutputFilename } from "../util.js";
-import { getOutFile, getOutFolder } from "./common.js";
+import { getOutDirWithinCwd, getOutFile, getOutFolder } from "./common.js";
 import { eachPageData, getPageDataByComponent, sortedCSS } from "./internal.js";
 import { getTimeStat } from "./util.js";
 const MAX_CONCURRENT_RENDERS = 1;
@@ -65,7 +65,7 @@ async function generatePages(opts, internals) {
 ${bgGreen(black(" generating static routes "))}`);
   const ssr = opts.astroConfig.output === "server";
   const serverEntry = opts.buildConfig.serverEntry;
-  const outFolder = ssr ? opts.buildConfig.server : opts.astroConfig.outDir;
+  const outFolder = ssr ? opts.buildConfig.server : getOutDirWithinCwd(opts.astroConfig.outDir);
   const ssrEntryURL = new URL("./" + serverEntry + `?time=${Date.now()}`, outFolder);
   const ssrEntry = await import(ssrEntryURL.toString());
   const builtPaths = /* @__PURE__ */ new Set();

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

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

package/dist/core/build/graph.js

@@ -1,16 +1,17 @@
 import { resolvedPagesVirtualModuleId } from "../app/index.js";
-function* walkParentInfos(id, ctx, depth = 0, seen = /* @__PURE__ */ new Set()) {
+function* walkParentInfos(id, ctx, depth = 0, seen = /* @__PURE__ */ new Set(), childId = "") {
   seen.add(id);
   const info = ctx.getModuleInfo(id);
   if (info) {
-    yield [info, depth];
+    let order = childId ? info.importedIds.indexOf(childId) : 0;
+    yield [info, depth, order];
   }
   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, ++depth, seen);
+    yield* walkParentInfos(imp, ctx, ++depth, seen, id);
   }
 }
 function moduleIsTopLevelPage(info) {

package/dist/core/build/internal.js

@@ -78,13 +78,23 @@ function* eachPageData(internals) {
 }
 function sortedCSS(pageData) {
   return Array.from(pageData.css).sort((a, b) => {
-    let depthA = a[1].depth, depthB = b[1].depth;
-    if (depthA === -1) {
+    let depthA = a[1].depth, depthB = b[1].depth, orderA = a[1].order, orderB = b[1].order;
+    if (orderA === -1 && orderB >= 0) {
+      return 1;
+    } else if (orderB === -1 && orderA >= 0) {
       return -1;
-    } else if (depthB === -1) {
+    } else if (orderA > orderB) {
       return 1;
+    } else if (orderA < orderB) {
+      return -1;
     } else {
-      return depthA > depthB ? -1 : 1;
+      if (depthA === -1) {
+        return -1;
+      } else if (depthB === -1) {
+        return 1;
+      } else {
+        return depthA > depthB ? -1 : 1;
+      }
     }
   }).map(([id]) => id);
 }

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

@@ -9,6 +9,7 @@ import { emptyDir, isModeServerWithNoAdapter, removeDir } from "../../core/util.
 import { runHookBuildSetup } from "../../integrations/index.js";
 import { PAGE_SCRIPT_ID } from "../../vite-plugin-scripts/index.js";
 import { info } from "../logger/core.js";
+import { getOutDirWithinCwd } from "./common.js";
 import { generatePages } from "./generate.js";
 import { trackPageData } from "./internal.js";
 import { getTimeStat } from "./util.js";
@@ -78,7 +79,7 @@ async function ssrBuild(opts, internals, input) {
   var _a, _b, _c;
   const { astroConfig, viteConfig } = opts;
   const ssr = astroConfig.output === "server";
-  const out = ssr ? opts.buildConfig.server : astroConfig.outDir;
+  const out = ssr ? opts.buildConfig.server : getOutDirWithinCwd(astroConfig.outDir);
   const viteBuildConfig = {
     ...viteConfig,
     logLevel: opts.viteConfig.logLevel ?? "error",
@@ -195,12 +196,17 @@ ${bgGreen(black(" building client "))}`);
   return buildResult;
 }
 async function cleanSsrOutput(opts) {
+  const out = getOutDirWithinCwd(opts.astroConfig.outDir);
+  if (out.toString() !== opts.astroConfig.outDir.toString()) {
+    await fs.promises.rm(out, { recursive: true });
+    return;
+  }
   const files = await glob("**/*.mjs", {
-    cwd: fileURLToPath(opts.astroConfig.outDir)
+    cwd: fileURLToPath(out)
   });
   await Promise.all(
     files.map(async (filename) => {
-      const url = new URL(filename, opts.astroConfig.outDir);
+      const url = new URL(filename, out);
       await fs.promises.rm(url);
     })
   );

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

@@ -10,6 +10,7 @@ export interface PageBuildData {
     moduleSpecifier: string;
     css: Map<string, {
         depth: number;
+        order: number;
     }>;
     hoistedScript: {
         type: 'inline' | 'external';

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

@@ -65,15 +65,20 @@ function rollupPluginAstroBuildCSS(options) {
         };
       },
       async generateBundle(_outputOptions, bundle) {
-        const appendCSSToPage = (pageData, meta, depth) => {
+        const appendCSSToPage = (pageData, meta, depth, order) => {
           for (const importedCssImport of meta.importedCss) {
             if (pageData == null ? void 0 : pageData.css.has(importedCssImport)) {
               const cssInfo = pageData == null ? void 0 : pageData.css.get(importedCssImport);
               if (depth < cssInfo.depth) {
                 cssInfo.depth = depth;
               }
+              if (cssInfo.order === -1) {
+                cssInfo.order = order;
+              } else if (order < cssInfo.order && order > -1) {
+                cssInfo.order = order;
+              }
             } else {
-              pageData == null ? void 0 : pageData.css.set(importedCssImport, { depth });
+              pageData == null ? void 0 : pageData.css.set(importedCssImport, { depth, order });
             }
           }
         };
@@ -101,25 +106,25 @@ function rollupPluginAstroBuildCSS(options) {
                   for (const id of Object.keys(c.modules)) {
                     for (const pageData of getParentClientOnlys(id, this)) {
                       for (const importedCssImport of meta.importedCss) {
-                        pageData.css.set(importedCssImport, { depth: -1 });
+                        pageData.css.set(importedCssImport, { depth: -1, order: -1 });
                       }
                     }
                   }
                 }
                 for (const id of Object.keys(c.modules)) {
-                  for (const [pageInfo, depth] of walkParentInfos(id, this)) {
+                  for (const [pageInfo, depth, order] of walkParentInfos(id, this)) {
                     if (moduleIsTopLevelPage(pageInfo)) {
                       const pageViteID = pageInfo.id;
                       const pageData = getPageDataByViteID(internals, pageViteID);
                       if (pageData) {
-                        appendCSSToPage(pageData, meta, depth);
+                        appendCSSToPage(pageData, meta, depth, order);
                       }
                     } else if (options.target === "client" && isHoistedScript(internals, pageInfo.id)) {
                       for (const pageData of getPageDatasByHoistedScriptId(
                         internals,
                         pageInfo.id
                       )) {
-                        appendCSSToPage(pageData, meta, -1);
+                        appendCSSToPage(pageData, meta, -1, order);
                       }
                     }
                   }
@@ -143,7 +148,7 @@ function rollupPluginAstroBuildCSS(options) {
           );
           if (cssChunk) {
             for (const pageData of eachPageData(internals)) {
-              pageData.css.set(cssChunk.fileName, { depth: -1 });
+              pageData.css.set(cssChunk.fileName, { depth: -1, order: -1 });
             }
           }
         }

package/dist/core/dev/index.js

@@ -48,7 +48,7 @@ async function dev(config, options) {
       isRestart
     })
   );
-  const currentVersion = "1.2.2";
+  const currentVersion = "1.2.4";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function devStart({
   site,
   isRestart = false
 }) {
-  const version = "1.2.2";
+  const version = "1.2.4";
   const rootPath = site ? site.pathname : "/";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
@@ -226,7 +226,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"1.2.2"}`
+        `v${"1.2.4"}`
       )} ${headline}`
     );
   }

package/dist/core/util.js

@@ -5,7 +5,7 @@ import resolve from "resolve";
 import slash from "slash";
 import { fileURLToPath, pathToFileURL } from "url";
 import { prependForwardSlash, removeTrailingForwardSlash } from "./path.js";
-const ASTRO_VERSION = "1.2.2";
+const ASTRO_VERSION = "1.2.4";
 function isObject(value) {
   return typeof value === "object" && value != null;
 }

package/dist/runtime/server/astro-global.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "1.2.2";
+const ASTRO_VERSION = "1.2.4";
 function createDeprecatedFetchContentFn() {
   return () => {
     throw new Error("Deprecated: Astro.fetchContent() has been replaced with Astro.glob().");

package/dist/runtime/server/endpoint.d.ts

@@ -1,3 +1,3 @@
 import type { EndpointHandler, Params } from '../../@types/astro';
 /** Renders an endpoint request to completion, returning the body. */
-export declare function renderEndpoint(mod: EndpointHandler, request: Request, params: Params): Promise<import("../../@types/astro").EndpointOutput | Response>;
+export declare function renderEndpoint(mod: EndpointHandler, request: Request, params: Params): Promise<Response | import("../../@types/astro").EndpointOutput>;

package/dist/runtime/server/endpoint.js

@@ -15,9 +15,13 @@ async function renderEndpoint(mod, request, params) {
   const chosenMethod = (_a = request.method) == null ? void 0 : _a.toLowerCase();
   const handler = getHandlerFromModule(mod, chosenMethod);
   if (!handler || typeof handler !== "function") {
-    throw new Error(
-      `Endpoint handler not found! Expected an exported function for "${chosenMethod}"`
-    );
+    let response = new Response(null, {
+      status: 404,
+      headers: {
+        "X-Astro-Response": "Not-Found"
+      }
+    });
+    return response;
   }
   if (handler.length > 1) {
     console.warn(`

package/dist/runtime/server/jsx.js

@@ -170,6 +170,7 @@ function filteredConsoleError(msg, ...rest) {
     if (isKnownReactHookError)
       return;
   }
+  originalConsoleError(msg, ...rest);
 }
 export {
   renderJSX

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

@@ -283,10 +283,10 @@ ${source}
         filename: context.file,
         moduleId: context.file,
         source: await context.read(),
-        transformStyle: createTransformStyles(styleTransformer, context.file, true, this)
+        transformStyle: createTransformStyles(styleTransformer, context.file, true)
       };
       const compile = () => cachedCompilation(compileProps);
-      return handleHotUpdate.call(this, context, {
+      return handleHotUpdate(context, {
         config,
         logging,
         compile

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

@@ -16,13 +16,6 @@ import { createRequest } from "../core/request.js";
 import { createRouteManifest, matchAllRoutes } from "../core/routing/index.js";
 import { resolvePages } from "../core/util.js";
 import notFoundTemplate, { subpathNotUsedTemplate } from "../template/4xx.js";
-function truncateString(str, n) {
-  if (str.length > n) {
-    return str.substring(0, n) + "…";
-  } else {
-    return str;
-  }
-}
 function writeHtmlResponse(res, statusCode, html) {
   res.writeHead(statusCode, {
     "Content-Type": "text/html; charset=utf-8",
@@ -130,9 +123,53 @@ function baseMiddleware(config, logging) {
     next();
   };
 }
+async function matchRoute(pathname, routeCache, viteServer, logging, manifest, config) {
+  const matches = matchAllRoutes(pathname, manifest);
+  for await (const maybeRoute of matches) {
+    const filePath = new URL(`./${maybeRoute.component}`, config.root);
+    const preloadedComponent = await preload({ astroConfig: config, filePath, viteServer });
+    const [, mod] = preloadedComponent;
+    const paramsAndPropsRes = await getParamsAndProps({
+      mod,
+      route: maybeRoute,
+      routeCache,
+      pathname,
+      logging,
+      ssr: config.output === "server"
+    });
+    if (paramsAndPropsRes !== GetParamsAndPropsError.NoMatchingStaticPath) {
+      return {
+        route: maybeRoute,
+        filePath,
+        preloadedComponent,
+        mod
+      };
+    }
+  }
+  if (matches.length) {
+    warn(
+      logging,
+      "getStaticPaths",
+      `Route pattern matched, but no matching static path found. (${pathname})`
+    );
+  }
+  log404(logging, pathname);
+  const custom404 = getCustom404Route(config, manifest);
+  if (custom404) {
+    const filePath = new URL(`./${custom404.component}`, config.root);
+    const preloadedComponent = await preload({ astroConfig: config, filePath, viteServer });
+    const [, mod] = preloadedComponent;
+    return {
+      route: custom404,
+      filePath,
+      preloadedComponent,
+      mod
+    };
+  }
+  return void 0;
+}
 async function handleRequest(routeCache, viteServer, logging, manifest, config, req, res) {
   var _a;
-  const reqStart = performance.now();
   const origin = `${viteServer.config.server.https ? "https" : "http"}://${req.headers.host}`;
   const buildingToSSR = config.output === "server";
   const url = new URL(origin + ((_a = req.url) == null ? void 0 : _a.replace(/(index)?\.html$/, "")));
@@ -148,112 +185,38 @@ async function handleRequest(routeCache, viteServer, logging, manifest, config,
   if (!(req.method === "GET" || req.method === "HEAD")) {
     let bytes = [];
     await new Promise((resolve) => {
-      req.setEncoding("utf-8");
-      req.on("data", (bts) => bytes.push(bts));
+      req.on("data", (part) => {
+        bytes.push(part);
+      });
       req.on("end", resolve);
     });
-    body = new TextEncoder().encode(bytes.join("")).buffer;
-  }
-  const request = createRequest({
-    url,
-    headers: buildingToSSR ? req.headers : new Headers(),
-    method: req.method,
-    body,
-    logging,
-    ssr: buildingToSSR,
-    clientAddress: buildingToSSR ? req.socket.remoteAddress : void 0
-  });
-  async function matchRoute() {
-    const matches = matchAllRoutes(pathname, manifest);
-    for await (const maybeRoute of matches) {
-      const filePath2 = new URL(`./${maybeRoute.component}`, config.root);
-      const preloadedComponent = await preload({ astroConfig: config, filePath: filePath2, viteServer });
-      const [, mod] = preloadedComponent;
-      const paramsAndPropsRes = await getParamsAndProps({
-        mod,
-        route: maybeRoute,
-        routeCache,
-        pathname,
-        logging,
-        ssr: config.output === "server"
-      });
-      if (paramsAndPropsRes !== GetParamsAndPropsError.NoMatchingStaticPath) {
-        return {
-          route: maybeRoute,
-          filePath: filePath2,
-          preloadedComponent,
-          mod
-        };
-      }
-    }
-    if (matches.length) {
-      warn(
-        logging,
-        "getStaticPaths",
-        `Route pattern matched, but no matching static path found. (${pathname})`
-      );
-    }
-    log404(logging, pathname);
-    const custom404 = getCustom404Route(config, manifest);
-    if (custom404) {
-      const filePath2 = new URL(`./${custom404.component}`, config.root);
-      const preloadedComponent = await preload({ astroConfig: config, filePath: filePath2, viteServer });
-      const [, mod] = preloadedComponent;
-      return {
-        route: custom404,
-        filePath: filePath2,
-        preloadedComponent,
-        mod
-      };
-    }
-    return void 0;
+    body = Buffer.concat(bytes);
   }
   let filePath;
   try {
-    const matchedRoute = await matchRoute();
-    if (!matchedRoute) {
-      return handle404Response(origin, config, req, res);
-    }
-    const { route, preloadedComponent, mod } = matchedRoute;
-    filePath = matchedRoute.filePath;
-    const paramsAndPropsRes = await getParamsAndProps({
-      mod,
-      route,
-      routeCache,
+    const matchedRoute = await matchRoute(
       pathname,
+      routeCache,
+      viteServer,
       logging,
-      ssr: config.output === "server"
-    });
-    const options = {
-      astroConfig: config,
-      filePath,
-      logging,
-      mode: "development",
-      origin,
+      manifest,
+      config
+    );
+    filePath = matchedRoute == null ? void 0 : matchedRoute.filePath;
+    return await handleRoute(
+      matchedRoute,
+      url,
       pathname,
-      route,
+      body,
+      origin,
       routeCache,
       viteServer,
-      request
-    };
-    if (route.type === "endpoint") {
-      const result = await callEndpoint(options);
-      if (result.type === "response") {
-        await writeWebResponse(res, result.response);
-      } else {
-        let contentType = "text/plain";
-        const filepath = route.pathname || route.segments.map((segment) => segment.map((p) => p.content).join("")).join("/");
-        const computedMimeType = mime.getType(filepath);
-        if (computedMimeType) {
-          contentType = computedMimeType;
-        }
-        res.writeHead(200, { "Content-Type": `${contentType};charset=utf-8` });
-        res.end(result.body);
-      }
-    } else {
-      const result = await ssr(preloadedComponent, options);
-      return await writeSSRResult(result, res);
-    }
+      manifest,
+      logging,
+      config,
+      req,
+      res
+    );
   } catch (_err) {
     const err = fixViteErrorMessage(_err, viteServer, filePath);
     const errorWithMetadata = collectErrorMetadata(err);
@@ -261,6 +224,85 @@ async function handleRequest(routeCache, viteServer, logging, manifest, config,
     handle500Response(viteServer, origin, req, res, errorWithMetadata);
   }
 }
+async function handleRoute(matchedRoute, url, pathname, body, origin, routeCache, viteServer, manifest, logging, config, req, res) {
+  if (!matchedRoute) {
+    return handle404Response(origin, config, req, res);
+  }
+  const filePath = matchedRoute.filePath;
+  const { route, preloadedComponent, mod } = matchedRoute;
+  const buildingToSSR = config.output === "server";
+  const request = createRequest({
+    url,
+    headers: buildingToSSR ? req.headers : new Headers(),
+    method: req.method,
+    body,
+    logging,
+    ssr: buildingToSSR,
+    clientAddress: buildingToSSR ? req.socket.remoteAddress : void 0
+  });
+  const paramsAndPropsRes = await getParamsAndProps({
+    mod,
+    route,
+    routeCache,
+    pathname,
+    logging,
+    ssr: config.output === "server"
+  });
+  const options = {
+    astroConfig: config,
+    filePath,
+    logging,
+    mode: "development",
+    origin,
+    pathname,
+    route,
+    routeCache,
+    viteServer,
+    request
+  };
+  if (route.type === "endpoint") {
+    const result = await callEndpoint(options);
+    if (result.type === "response") {
+      if (result.response.headers.get("X-Astro-Response") === "Not-Found") {
+        const fourOhFourRoute = await matchRoute(
+          "/404",
+          routeCache,
+          viteServer,
+          logging,
+          manifest,
+          config
+        );
+        return handleRoute(
+          fourOhFourRoute,
+          new URL("/404", url),
+          "/404",
+          body,
+          origin,
+          routeCache,
+          viteServer,
+          manifest,
+          logging,
+          config,
+          req,
+          res
+        );
+      }
+      await writeWebResponse(res, result.response);
+    } else {
+      let contentType = "text/plain";
+      const filepath = route.pathname || route.segments.map((segment) => segment.map((p) => p.content).join("")).join("/");
+      const computedMimeType = mime.getType(filepath);
+      if (computedMimeType) {
+        contentType = computedMimeType;
+      }
+      res.writeHead(200, { "Content-Type": `${contentType};charset=utf-8` });
+      res.end(result.body);
+    }
+  } else {
+    const result = await ssr(preloadedComponent, options);
+    return await writeSSRResult(result, res);
+  }
+}
 function createPlugin({ config, logging }) {
   return {
     name: "astro:server",

package/dist/vite-style-transform/style-transform.d.ts

@@ -7,4 +7,4 @@ export declare type ViteStyleTransformer = {
     transformStyleWithVite: TransformStyleWithVite;
 };
 export declare function createViteStyleTransformer(viteConfig: vite.ResolvedConfig): ViteStyleTransformer;
-export declare function createTransformStyles(viteStyleTransformer: ViteStyleTransformer, filename: string, ssr: boolean, pluginContext: PluginContext): TransformStyle;
+export declare function createTransformStyles(viteStyleTransformer: ViteStyleTransformer, filename: string, ssr: boolean, pluginContext?: PluginContext): TransformStyle;

package/dist/vite-style-transform/style-transform.js

@@ -14,10 +14,6 @@ function getNormalizedIDForPostCSS(filename) {
   }
 }
 function createTransformStyles(viteStyleTransformer, filename, ssr, pluginContext) {
-  if (!pluginContext.addWatchFile) {
-    pluginContext.addWatchFile = () => {
-    };
-  }
   const normalizedID = getNormalizedIDForPostCSS(filename);
   return async function(styleSource, lang) {
     const result = await viteStyleTransformer.transformStyleWithVite.call(pluginContext, {

package/dist/vite-style-transform/transform-with-vite.js

@@ -12,7 +12,9 @@ function createTransformStyleWithViteFn(viteConfig) {
     }
     const styleId = `${id}?astro&type=style&lang${lang}`;
     viteDevServer == null ? void 0 : viteDevServer.moduleGraph.ensureEntryFromUrl(styleId, ssr, false);
-    const transformResult = await transformCss.call(this, source, styleId, ssr);
+    const ctx = this ?? { addWatchFile: () => {
+    } };
+    const transformResult = await transformCss.call(ctx, source, styleId, ssr);
     const { code, map } = transformResult;
     const deps = /* @__PURE__ */ new Set();
     const mod = viteDevServer == null ? void 0 : viteDevServer.moduleGraph.getModuleById(styleId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -125,7 +125,7 @@
     "recast": "^0.20.5",
     "rehype": "^12.0.1",
     "resolve": "^1.22.0",
-    "rollup": "~2.77.0",
+    "rollup": "~2.78.0",
     "semver": "^7.3.7",
     "shiki": "^0.11.1",
     "sirv": "^2.0.2",
@@ -136,7 +136,7 @@
     "tsconfig-resolver": "^3.0.1",
     "unist-util-visit": "^4.1.0",
     "vfile": "^5.3.2",
-    "vite": "3.0.9",
+    "vite": "3.1.0",
     "yargs-parser": "^21.0.1",
     "zod": "^3.17.3"
   },