astro 4.2.5 → 4.2.6

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

@@ -28,7 +28,8 @@ async function collectPagesData(opts) {
         styles: [],
         propagatedStyles: /* @__PURE__ */ new Map(),
         propagatedScripts: /* @__PURE__ */ new Map(),
-        hoistedScript: void 0
+        hoistedScript: void 0,
+        hasSharedModules: false
       };
       clearInterval(routeCollectionLogTimeout);
       if (settings.config.output === "static") {
@@ -49,7 +50,8 @@ async function collectPagesData(opts) {
       styles: [],
       propagatedStyles: /* @__PURE__ */ new Map(),
       propagatedScripts: /* @__PURE__ */ new Map(),
-      hoistedScript: void 0
+      hoistedScript: void 0,
+      hasSharedModules: false
     };
   }
   clearInterval(dataCollectionLogTimeout);

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

@@ -11,8 +11,37 @@ function vitePluginPrerender(opts, internals) {
             return "astro";
           }
           const pageInfo = internals.pagesByViteID.get(id);
+          let hasSharedModules = false;
           if (pageInfo) {
             if (getPrerenderMetadata(meta.getModuleInfo(id))) {
+              const infoMeta = meta.getModuleInfo(id);
+              for (const moduleId of infoMeta.importedIds) {
+                const moduleMeta = meta.getModuleInfo(moduleId);
+                if (
+                  // a shared modules should be inside the `src/` folder, at least
+                  moduleMeta.id.startsWith(opts.settings.config.srcDir.pathname) && // and has at least two importers: the current page and something else
+                  moduleMeta.importers.length > 1
+                ) {
+                  for (const importer of moduleMeta.importedIds) {
+                    if (importer !== id) {
+                      const importerModuleMeta = meta.getModuleInfo(importer);
+                      if (importerModuleMeta) {
+                        if (importerModuleMeta.id.includes("/pages")) {
+                          if (getPrerenderMetadata(importerModuleMeta) === false) {
+                            hasSharedModules = true;
+                            break;
+                          }
+                        } else if (importerModuleMeta.id.includes("/middleware")) {
+                          hasSharedModules = true;
+                          break;
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+              opts.allPages;
+              pageInfo.hasSharedModules = hasSharedModules;
               pageInfo.route.prerender = true;
               return "prerender";
             }

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

@@ -279,7 +279,7 @@ async function runPostBuildHooks(container, ssrOutputs, clientOutputs) {
 async function cleanStaticOutput(opts, internals, ssrOutputChunkNames) {
   const allStaticFiles = /* @__PURE__ */ new Set();
   for (const pageData of eachPageData(internals)) {
-    if (pageData.route.prerender) {
+    if (pageData.route.prerender && !pageData.hasSharedModules) {
       const { moduleSpecifier } = pageData;
       const pageBundleId = internals.pageToBundleMap.get(moduleSpecifier);
       const entryBundleId = internals.entrySpecifierToBundleMap.get(moduleSpecifier);

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

@@ -28,6 +28,7 @@ export interface PageBuildData {
         order: number;
         sheet: StylesheetAsset;
     }>;
+    hasSharedModules: boolean;
 }
 export type AllPagesData = Record<ComponentPath, PageBuildData>;
 /** Options for the static build */

package/dist/core/constants.js

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

package/dist/core/dev/dev.js

@@ -23,7 +23,7 @@ async function dev(inlineConfig) {
       base: restart.container.settings.config.base
     })
   );
-  const currentVersion = "4.2.5";
+  const currentVersion = "4.2.6";
   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.2.5";
+  const version = "4.2.6";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -258,7 +258,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"4.2.5"}`
+        `v${"4.2.6"}`
       )} ${headline}`
     );
   }

package/dist/runtime/client/dev-toolbar/apps/audit/a11y.js

@@ -42,11 +42,8 @@ const aria_non_interactive_roles = [
   "application",
   "article",
   "banner",
-  "button",
   "cell",
-  "checkbox",
   "columnheader",
-  "combobox",
   "complementary",
   "contentinfo",
   "definition",
@@ -56,55 +53,30 @@ const aria_non_interactive_roles = [
   "feed",
   "figure",
   "form",
-  "grid",
-  "gridcell",
   "group",
   "heading",
   "img",
-  "link",
   "list",
-  "listbox",
   "listitem",
   "log",
   "main",
   "marquee",
   "math",
-  "menu",
-  "menubar",
-  "menuitem",
-  "menuitemcheckbox",
   "menuitemradio",
   "navigation",
   "none",
   "note",
-  "option",
   "presentation",
-  "progressbar",
-  "radio",
-  "radiogroup",
   "region",
   "row",
   "rowgroup",
   "rowheader",
-  "scrollbar",
   "search",
-  "searchbox",
-  "separator",
-  "slider",
-  "spinbutton",
   "status",
-  "switch",
-  "tab",
-  "tablist",
-  "tabpanel",
   "term",
-  "textbox",
   "timer",
   "toolbar",
-  "tooltip",
-  "tree",
-  "treegrid",
-  "treeitem"
+  "tooltip"
 ];
 const a11y_required_content = [
   // anchor-has-content

package/dist/vite-plugin-dev-toolbar/vite-plugin-dev-toolbar.js

@@ -52,12 +52,16 @@ ${args.error}`
       if (id === resolvedVirtualModuleId) {
         return `
 					export const loadDevToolbarApps = async () => {
-						return (await Promise.all([${settings.devToolbarApps.map((plugin) => `safeLoadPlugin(${JSON.stringify(plugin)})`).join(",")}])).filter(app => app);
+						return (await Promise.all([${settings.devToolbarApps.map(
+          (plugin) => `safeLoadPlugin(async () => (await import(${JSON.stringify(
+            plugin
+          )})).default, ${JSON.stringify(plugin)})`
+        ).join(",")}])).filter(app => app);
 					};
 
-					async function safeLoadPlugin(entrypoint) {
+					async function safeLoadPlugin(importEntrypoint, entrypoint) {
 						try {
-							const app = (await import(/* @vite-ignore */ entrypoint)).default;
+							const app = await importEntrypoint();
 
 							if (typeof app !== 'object' || !app.id || !app.name) {
 								throw new Error("Apps must default export an object with an id, and a name.");

package/package.json

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