astro 4.2.5 → 4.2.7

package/content-types.template.d.ts

@@ -183,5 +183,5 @@ declare module 'astro:content' {
 
 	type AnyEntryMap = ContentEntryMap & DataEntryMap;
 
-	type ContentConfig = '@@CONTENT_CONFIG_TYPE@@';
+	export type ContentConfig = '@@CONTENT_CONFIG_TYPE@@';
 }

package/dist/assets/services/squoosh.js

@@ -32,6 +32,8 @@ async function getRotationForEXIF(inputBuffer, src) {
     case 7:
     case 8:
       return { type: "rotate", numRotations: 3 };
+    default:
+      return void 0;
   }
 }
 const service = {

package/dist/cli/add/index.js

@@ -180,6 +180,8 @@ async function add(names, { flags }) {
     case 3 /* failure */: {
       throw createPrettyError(new Error(`Unable to install dependencies`));
     }
+    case 0 /* none */:
+      break;
   }
   const rawConfigPath = await resolveConfigPath({
     root: rootPath,

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

@@ -50,7 +50,7 @@ export type SSRManifest = {
 };
 export type SSRManifestI18n = {
     fallback?: Record<string, string>;
-    routing?: RoutingStrategies;
+    routing: RoutingStrategies;
     locales: Locales;
     defaultLocale: string;
 };

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.d.ts

@@ -1,3 +1,4 @@
 export declare const ASTRO_VERSION: string;
 export declare const SUPPORTED_MARKDOWN_FILE_EXTENSIONS: readonly [".markdown", ".mdown", ".mkdn", ".mkd", ".mdwn", ".md"];
 export declare const MIDDLEWARE_PATH_SEGMENT_NAME = "middleware";
+export declare const ROUTE_DATA_SYMBOL = "astro.routeData";

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.2.5";
+const ASTRO_VERSION = "4.2.7";
 const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
   ".markdown",
   ".mdown",
@@ -8,8 +8,10 @@ const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
   ".md"
 ];
 const MIDDLEWARE_PATH_SEGMENT_NAME = "middleware";
+const ROUTE_DATA_SYMBOL = "astro.routeData";
 export {
   ASTRO_VERSION,
   MIDDLEWARE_PATH_SEGMENT_NAME,
+  ROUTE_DATA_SYMBOL,
   SUPPORTED_MARKDOWN_FILE_EXTENSIONS
 };

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.7";
   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.7";
   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.7"}`
       )} ${headline}`
     );
   }

package/dist/core/render/context.js

@@ -1,7 +1,9 @@
 import { normalizeTheLocale, toCodes } from "../../i18n/index.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
 import { getParamsAndProps } from "./params-and-props.js";
+import { ROUTE_DATA_SYMBOL } from "../constants.js";
 const clientLocalsSymbol = Symbol.for("astro.locals");
+const routeDataSymbol = Symbol.for(ROUTE_DATA_SYMBOL);
 async function createRenderContext(options) {
   const request = options.request;
   const pathname = options.pathname ?? new URL(request.url).pathname;
@@ -148,8 +150,11 @@ function computePreferredLocaleList(request, locales) {
   return result;
 }
 function computeCurrentLocale(request, locales, routingStrategy, defaultLocale) {
-  const requestUrl = new URL(request.url);
-  for (const segment of requestUrl.pathname.split("/")) {
+  const routeData = Reflect.get(request, routeDataSymbol);
+  if (!routeData) {
+    return defaultLocale;
+  }
+  for (const segment of routeData.route.split("/")) {
     for (const locale of locales) {
       if (typeof locale === "string") {
         if (normalizeTheLocale(locale) === normalizeTheLocale(segment)) {

package/dist/i18n/middleware.js

@@ -1,7 +1,8 @@
 import { appendForwardSlash, joinPaths } from "@astrojs/internal-helpers/path";
 import { getPathByLocale, normalizeTheLocale } from "./index.js";
 import { shouldAppendForwardSlash } from "../core/build/util.js";
-const routeDataSymbol = Symbol.for("astro.routeData");
+import { ROUTE_DATA_SYMBOL } from "../core/constants.js";
+const routeDataSymbol = Symbol.for(ROUTE_DATA_SYMBOL);
 function pathnameHasLocale(pathname, locales) {
   const segments = pathname.split("/");
   for (const segment of segments) {

package/dist/i18n/vite-plugin-i18n.d.ts

@@ -3,7 +3,8 @@ import type { AstroConfig, AstroSettings } from '../@types/astro.js';
 type AstroInternationalization = {
     settings: AstroSettings;
 };
-export interface I18nInternalConfig extends Pick<AstroConfig, 'base' | 'site' | 'trailingSlash'>, NonNullable<AstroConfig['i18n']>, Pick<AstroConfig['build'], 'format'> {
+export interface I18nInternalConfig extends Pick<AstroConfig, 'base' | 'site' | 'trailingSlash'>, Pick<AstroConfig['build'], 'format'> {
+    i18n: AstroConfig['i18n'];
 }
 export default function astroInternationalization({ settings, }: AstroInternationalization): vite.Plugin;
 export {};

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

@@ -1,8 +1,6 @@
 import { AstroError } from "../core/errors/errors.js";
 import { AstroErrorData } from "../core/errors/index.js";
 const virtualModuleId = "astro:i18n";
-const configId = "astro-internal:i18n-config";
-const resolvedConfigId = `\0${configId}`;
 function astroInternationalization({
   settings
 }) {
@@ -16,30 +14,20 @@ function astroInternationalization({
   return {
     name: "astro:i18n",
     enforce: "pre",
-    async resolveId(id) {
+    config(config) {
+      const i18nConfig = { base, format, site, trailingSlash, i18n };
+      return {
+        define: {
+          __ASTRO_INTERNAL_I18N_CONFIG__: JSON.stringify(i18nConfig)
+        }
+      };
+    },
+    resolveId(id) {
       if (id === virtualModuleId) {
         if (i18n === void 0)
           throw new AstroError(AstroErrorData.i18nNotEnabled);
         return this.resolve("astro/virtual-modules/i18n.js");
       }
-      if (id === configId)
-        return resolvedConfigId;
-    },
-    load(id) {
-      if (id === resolvedConfigId) {
-        const { defaultLocale, locales, routing, fallback } = i18n;
-        const config = {
-          base,
-          format,
-          site,
-          trailingSlash,
-          defaultLocale,
-          locales,
-          routing,
-          fallback
-        };
-        return `export default ${JSON.stringify(config)};`;
-      }
     }
   };
 }

package/dist/preferences/index.js

@@ -20,7 +20,10 @@ function coerce(key, value) {
         return true;
       if (value === "false" || value === 0)
         return false;
+      break;
     }
+    default:
+      throw new Error(`Incorrect value for ${key}`);
   }
   return value;
 }

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/runtime/client/dev-toolbar/apps/settings.js

@@ -144,7 +144,10 @@ var settings_default = {
             astroToggle.input.addEventListener("change", setting.changeEvent);
             astroToggle.input.checked = settings.config[setting.settingKey];
             label.append(astroToggle);
+            break;
           }
+          default:
+            break;
         }
         return label;
       }

package/dist/runtime/server/scripts.js

@@ -30,6 +30,8 @@ function getPrescripts(result, type, directive) {
       )};${islandScript}</script>`;
     case "directive":
       return `<script>${getDirectiveScriptText(result, directive)}</script>`;
+    case null:
+      break;
   }
   return "";
 }

package/dist/virtual-modules/i18n.js

@@ -1,7 +1,7 @@
 import * as I18nInternals from "../i18n/index.js";
 import { normalizeTheLocale, toCodes, toPaths } from "../i18n/index.js";
-import config from "astro-internal:i18n-config";
-const { trailingSlash, format, site, defaultLocale, locales, routing } = config;
+const { trailingSlash, format, site, i18n } = __ASTRO_INTERNAL_I18N_CONFIG__;
+const { defaultLocale, locales, routing } = i18n;
 const base = import.meta.env.BASE_URL;
 const getRelativeLocaleUrl = (locale, path, options) => I18nInternals.getLocaleRelativeUrl({
   locale,

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.7",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -163,7 +163,7 @@
     "yargs-parser": "^21.1.1",
     "zod": "^3.22.4",
     "@astrojs/internal-helpers": "0.2.1",
-    "@astrojs/markdown-remark": "4.2.0",
+    "@astrojs/markdown-remark": "4.2.1",
     "@astrojs/telemetry": "3.0.4"
   },
   "optionalDependencies": {