astro 2.5.1 → 2.5.2

package/dist/core/build/plugins/plugin-hoisted-scripts.js

@@ -33,33 +33,39 @@ function vitePluginHoistedScripts(settings, internals) {
       if (((_a = settings.config.vite) == null ? void 0 : _a.build) && settings.config.vite.build.assetsInlineLimit !== void 0) {
         assetInlineLimit = (_b = settings.config.vite) == null ? void 0 : _b.build.assetsInlineLimit;
       }
-      for (const [id, output] of Object.entries(bundle)) {
+      const considerInlining = /* @__PURE__ */ new Map();
+      const importedByOtherScripts = /* @__PURE__ */ new Set();
+      Object.entries(bundle).forEach(([id, output]) => {
         if (output.type === "chunk" && output.facadeModuleId && virtualHoistedEntry(output.facadeModuleId)) {
-          const canBeInlined = output.imports.length === 0 && output.dynamicImports.length === 0 && Buffer.byteLength(output.code) <= assetInlineLimit;
-          let removeFromBundle = false;
-          const facadeId = output.facadeModuleId;
-          const pages = internals.hoistedScriptIdToPagesMap.get(facadeId);
-          for (const pathname of pages) {
-            const vid = viteID(new URL("." + pathname, settings.config.root));
-            const pageInfo = getPageDataByViteID(internals, vid);
-            if (pageInfo) {
-              if (canBeInlined) {
-                pageInfo.hoistedScript = {
-                  type: "inline",
-                  value: output.code
-                };
-                removeFromBundle = true;
-              } else {
-                pageInfo.hoistedScript = {
-                  type: "external",
-                  value: id
-                };
-              }
+          considerInlining.set(id, output);
+          output.imports.forEach((imported) => importedByOtherScripts.add(imported));
+        }
+      });
+      for (const [id, output] of considerInlining.entries()) {
+        const canBeInlined = importedByOtherScripts.has(output.fileName) === false && output.imports.length === 0 && output.dynamicImports.length === 0 && Buffer.byteLength(output.code) <= assetInlineLimit;
+        let removeFromBundle = false;
+        const facadeId = output.facadeModuleId;
+        const pages = internals.hoistedScriptIdToPagesMap.get(facadeId);
+        for (const pathname of pages) {
+          const vid = viteID(new URL("." + pathname, settings.config.root));
+          const pageInfo = getPageDataByViteID(internals, vid);
+          if (pageInfo) {
+            if (canBeInlined) {
+              pageInfo.hoistedScript = {
+                type: "inline",
+                value: output.code
+              };
+              removeFromBundle = true;
+            } else {
+              pageInfo.hoistedScript = {
+                type: "external",
+                value: id
+              };
             }
           }
-          if (removeFromBundle) {
-            delete bundle[id];
-          }
+        }
+        if (removeFromBundle) {
+          delete bundle[id];
         }
       }
     }

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

@@ -1,4 +1,5 @@
 import path from "node:path";
+import { getPrerenderMetadata } from "../../../prerender/metadata.js";
 import { extendManualChunks } from "./util.js";
 function vitePluginPrerender(opts, internals) {
   return {
@@ -6,13 +7,12 @@ function vitePluginPrerender(opts, internals) {
     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) {
+            if (getPrerenderMetadata(meta.getModuleInfo(id))) {
               pageInfo.route.prerender = true;
               return "prerender";
             }

package/dist/core/constants.js

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

package/dist/core/dev/dev.js

@@ -53,7 +53,7 @@ async function dev(settings, options) {
       isRestart: options.isRestart
     })
   );
-  const currentVersion = "2.5.1";
+  const currentVersion = "2.5.2";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/endpoint/index.js

@@ -60,6 +60,7 @@ function createAPIContext({
   return context;
 }
 async function callEndpoint(mod, env, ctx, logging, middleware) {
+  var _a;
   const context = createAPIContext({
     request: ctx.request,
     params: ctx.params,
@@ -94,7 +95,7 @@ async function callEndpoint(mod, env, ctx, logging, middleware) {
       response
     };
   }
-  if (env.ssr && !mod.prerender) {
+  if (env.ssr && !((_a = ctx.route) == null ? void 0 : _a.prerender)) {
     if (response.hasOwnProperty("headers")) {
       warn(
         logging,

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "2.5.1";
+  const version = "2.5.2";
   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.5.1"}`
+        `v${"2.5.2"}`
       )} ${headline}`
     );
   }

package/dist/core/render/core.js

@@ -52,7 +52,7 @@ async function getParamsAndProps(opts) {
       routeCache.set(route, routeCacheEntry);
     }
     const matchedStaticPath = findPathItemByKey(routeCacheEntry.staticPaths, params, route);
-    if (!matchedStaticPath && (ssr ? mod.prerender : true)) {
+    if (!matchedStaticPath && (ssr ? route.prerender : true)) {
       return 0 /* NoMatchingStaticPath */;
     }
     pageProps = (matchedStaticPath == null ? void 0 : matchedStaticPath.props) ? { ...matchedStaticPath.props } : {};

package/dist/core/render/route-cache.js

@@ -11,7 +11,7 @@ async function callGetStaticPaths({
   ssr
 }) {
   validateDynamicRouteModule(mod, { ssr, logging, route });
-  if (ssr && !mod.prerender) {
+  if (ssr && !route.prerender) {
     return { staticPaths: Object.assign([], { keyed: /* @__PURE__ */ new Map() }) };
   }
   if (!mod.getStaticPaths) {

package/dist/core/routing/manifest/create.js

@@ -143,7 +143,7 @@ function createRouteManifest({ settings, cwd, fsMod }, logging) {
   ]);
   const validEndpointExtensions = /* @__PURE__ */ new Set([".js", ".ts"]);
   const localFs = fsMod ?? nodeFs;
-  const isPrenderDefault = isHybridOutput(settings.config);
+  const isPrerenderDefault = isHybridOutput(settings.config);
   const foundInvalidFileExtensions = /* @__PURE__ */ new Set();
   function walk(fs, dir, parentSegments, parentParams) {
     let items = [];
@@ -233,7 +233,7 @@ function createRouteManifest({ settings, cwd, fsMod }, logging) {
           component,
           generate,
           pathname: pathname || void 0,
-          prerender: isPrenderDefault
+          prerender: isPrerenderDefault
         });
       }
     });
@@ -287,7 +287,7 @@ This route collides with: "${collision.component}".`
       component,
       generate,
       pathname: pathname || void 0,
-      prerender: isPrenderDefault
+      prerender: isPrerenderDefault
     });
   });
   return {

package/dist/core/routing/validation.js

@@ -18,14 +18,14 @@ function validateDynamicRouteModule(mod, {
   logging,
   route
 }) {
-  if (ssr && mod.getStaticPaths && !mod.prerender) {
+  if (ssr && mod.getStaticPaths && !route.prerender) {
     warn(
       logging,
       "getStaticPaths",
       `getStaticPaths() in ${bold(route.component)} is ignored when "output: server" is set.`
     );
   }
-  if ((!ssr || mod.prerender) && !mod.getStaticPaths) {
+  if ((!ssr || route.prerender) && !mod.getStaticPaths) {
     throw new AstroError({
       ...AstroErrorData.GetStaticPathsRequired,
       location: { file: route.component }

package/dist/prerender/metadata.d.ts

@@ -0,0 +1,8 @@
+import type { ModuleInfo, ModuleLoader } from '../core/module-loader';
+type GetPrerenderStatusParams = {
+    filePath: URL;
+    loader: ModuleLoader;
+};
+export declare function getPrerenderStatus({ filePath, loader, }: GetPrerenderStatusParams): boolean | undefined;
+export declare function getPrerenderMetadata(moduleInfo: ModuleInfo): any;
+export {};

package/dist/prerender/metadata.js

@@ -0,0 +1,20 @@
+import { viteID } from "../core/util.js";
+function getPrerenderStatus({
+  filePath,
+  loader
+}) {
+  const fileID = viteID(filePath);
+  const moduleInfo = loader.getModuleInfo(fileID);
+  if (!moduleInfo)
+    return;
+  const prerenderStatus = getPrerenderMetadata(moduleInfo);
+  return prerenderStatus;
+}
+function getPrerenderMetadata(moduleInfo) {
+  var _a, _b, _c;
+  return (_c = (_b = (_a = moduleInfo == null ? void 0 : moduleInfo.meta) == null ? void 0 : _a.astro) == null ? void 0 : _b.pageOptions) == null ? void 0 : _c.prerender;
+}
+export {
+  getPrerenderMetadata,
+  getPrerenderStatus
+};

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

@@ -9,6 +9,7 @@ import { preload, renderPage } from "../core/render/dev/index.js";
 import { getParamsAndProps, GetParamsAndPropsError } from "../core/render/index.js";
 import { createRequest } from "../core/request.js";
 import { matchAllRoutes } from "../core/routing/index.js";
+import { getPrerenderStatus } from "../prerender/metadata.js";
 import { isHybridOutput } from "../prerender/utils.js";
 import { log404 } from "./common.js";
 import { handle404Response, writeSSRResult, writeWebResponse } from "./response.js";
@@ -22,6 +23,13 @@ async function matchRoute(pathname, env, manifest) {
   for await (const maybeRoute of matches) {
     const filePath = new URL(`./${maybeRoute.component}`, settings.config.root);
     const preloadedComponent = await preload({ env, filePath });
+    const prerenderStatus = getPrerenderStatus({
+      filePath,
+      loader: env.loader
+    });
+    if (prerenderStatus !== void 0) {
+      maybeRoute.prerender = prerenderStatus;
+    }
     const [, mod] = preloadedComponent;
     const paramsAndPropsRes = await getParamsAndProps({
       mod,

package/package.json

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