astro 3.5.6 → 3.5.7

package/dist/core/build/generate.js

@@ -194,40 +194,15 @@ ${bgGreen(black(` generating optimized images `))}`);
   });
 }
 async function generatePage(pageData, ssrEntry, builtPaths, pipeline) {
+  let timeStart = performance.now();
   const logger = pipeline.getLogger();
   const config = pipeline.getConfig();
-  const manifest = pipeline.getManifest();
+  const pageInfo = getPageDataByComponent(pipeline.getInternals(), pageData.route.component);
+  const linkIds = [];
+  const scripts = pageInfo?.hoistedScript ?? null;
+  const styles = pageData.styles.sort(cssOrder).map(({ sheet }) => sheet).reduce(mergeInlineCss, []);
   const pageModulePromise = ssrEntry.page;
   const onRequest = ssrEntry.onRequest;
-  const pageInfo = getPageDataByComponent(pipeline.getInternals(), pageData.route.component);
-  const hoistedScripts = pageInfo?.hoistedScript ?? null;
-  const moduleStyles = pageData.styles.sort(cssOrder).map(({ sheet }) => sheet).reduce(mergeInlineCss, []);
-  const links = /* @__PURE__ */ new Set();
-  const styles = createStylesheetElementSet(moduleStyles, manifest.base, manifest.assetsPrefix);
-  const scripts = createModuleScriptsSet(
-    hoistedScripts ? [hoistedScripts] : [],
-    manifest.base,
-    manifest.assetsPrefix
-  );
-  if (pipeline.getSettings().scripts.some((script) => script.stage === "page")) {
-    const hashedFilePath = pipeline.getInternals().entrySpecifierToBundleMap.get(PAGE_SCRIPT_ID);
-    if (typeof hashedFilePath !== "string") {
-      throw new Error(`Cannot find the built path for ${PAGE_SCRIPT_ID}`);
-    }
-    const src = createAssetLink(hashedFilePath, manifest.base, manifest.assetsPrefix);
-    scripts.add({
-      props: { type: "module", src },
-      children: ""
-    });
-  }
-  for (const script of pipeline.getSettings().scripts) {
-    if (script.stage === "head-inline") {
-      scripts.add({
-        props: {},
-        children: script.content
-      });
-    }
-  }
   const i18nMiddleware = createI18nMiddleware(
     pipeline.getManifest().i18n,
     pipeline.getManifest().base,
@@ -259,22 +234,34 @@ async function generatePage(pageData, ssrEntry, builtPaths, pipeline) {
     );
     return;
   }
-  for (const route of eachRouteInRouteData(pageData)) {
-    const paths = await getPathsForRoute(route, pageModule, pipeline, builtPaths);
-    let timeStart = performance.now();
-    let prevTimeEnd = timeStart;
-    for (let i = 0; i < paths.length; i++) {
-      const path = paths[i];
-      pipeline.getEnvironment().logger.debug("build", `Generating: ${path}`);
-      await generatePath(path, pipeline, route, links, scripts, styles, pageModule);
-      const timeEnd = performance.now();
-      const timeChange = getTimeStat(prevTimeEnd, timeEnd);
-      const timeIncrease = `(+${timeChange})`;
-      const filePath = getOutputFilename(pipeline.getConfig(), path, pageData.route.type);
-      const lineIcon = i === paths.length - 1 ? "\u2514\u2500" : "\u251C\u2500";
-      logger.info(null, `  ${cyan(lineIcon)} ${dim(filePath)} ${dim(timeIncrease)}`);
-      prevTimeEnd = timeEnd;
+  const generationOptions = {
+    pageData,
+    linkIds,
+    scripts,
+    styles,
+    mod: pageModule
+  };
+  const icon = pageData.route.type === "page" || pageData.route.type === "redirect" || pageData.route.type === "fallback" ? green("\u25B6") : magenta("\u03BB");
+  if (isRelativePath(pageData.route.component)) {
+    logger.info(null, `${icon} ${pageData.route.route}`);
+    for (const fallbackRoute of pageData.route.fallbackRoutes) {
+      logger.info(null, `${icon} ${fallbackRoute.route}`);
     }
+  } else {
+    logger.info(null, `${icon} ${pageData.route.component}`);
+  }
+  const paths = await getPathsForRoute(pageData, pageModule, pipeline, builtPaths);
+  let prevTimeEnd = timeStart;
+  for (let i = 0; i < paths.length; i++) {
+    const path = paths[i];
+    await generatePath(path, generationOptions, pipeline);
+    const timeEnd = performance.now();
+    const timeChange = getTimeStat(prevTimeEnd, timeEnd);
+    const timeIncrease = `(+${timeChange})`;
+    const filePath = getOutputFilename(pipeline.getConfig(), path, pageData.route.type);
+    const lineIcon = i === paths.length - 1 ? "\u2514\u2500" : "\u251C\u2500";
+    logger.info(null, `  ${cyan(lineIcon)} ${dim(filePath)} ${dim(timeIncrease)}`);
+    prevTimeEnd = timeEnd;
   }
 }
 function* eachRouteInRouteData(data) {
@@ -283,55 +270,59 @@ function* eachRouteInRouteData(data) {
     yield fallbackRoute;
   }
 }
-async function getPathsForRoute(route, mod, pipeline, builtPaths) {
+async function getPathsForRoute(pageData, mod, pipeline, builtPaths) {
   const opts = pipeline.getStaticBuildOptions();
   const logger = pipeline.getLogger();
   let paths = [];
-  if (route.pathname) {
-    paths.push(route.pathname);
-    builtPaths.add(route.pathname);
-    for (const virtualRoute of route.fallbackRoutes) {
+  if (pageData.route.pathname) {
+    paths.push(pageData.route.pathname);
+    builtPaths.add(pageData.route.pathname);
+    for (const virtualRoute of pageData.route.fallbackRoutes) {
       if (virtualRoute.pathname) {
         paths.push(virtualRoute.pathname);
         builtPaths.add(virtualRoute.pathname);
       }
     }
   } else {
-    const staticPaths = await callGetStaticPaths({
-      mod,
-      route,
-      routeCache: opts.routeCache,
-      logger,
-      ssr: isServerLikeOutput(opts.settings.config)
-    }).catch((err) => {
-      logger.debug("build", `\u251C\u2500\u2500 ${colors.bold(colors.red("\u2717"))} ${route.component}`);
-      throw err;
-    });
-    const label = staticPaths.length === 1 ? "page" : "pages";
-    logger.debug(
-      "build",
-      `\u251C\u2500\u2500 ${colors.bold(colors.green("\u2714"))} ${route.component} \u2192 ${colors.magenta(
-        `[${staticPaths.length} ${label}]`
-      )}`
-    );
-    paths = staticPaths.map((staticPath) => {
-      try {
-        return route.generate(staticPath.params);
-      } catch (e) {
-        if (e instanceof TypeError) {
-          throw getInvalidRouteSegmentError(e, route, staticPath);
-        }
-        throw e;
-      }
-    }).filter((staticPath) => {
-      if (!builtPaths.has(removeTrailingForwardSlash(staticPath))) {
-        return true;
+    for (const route of eachRouteInRouteData(pageData)) {
+      const staticPaths = await callGetStaticPaths({
+        mod,
+        route,
+        routeCache: opts.routeCache,
+        logger,
+        ssr: isServerLikeOutput(opts.settings.config)
+      }).catch((err) => {
+        logger.debug("build", `\u251C\u2500\u2500 ${colors.bold(colors.red("\u2717"))} ${route.component}`);
+        throw err;
+      });
+      const label = staticPaths.length === 1 ? "page" : "pages";
+      logger.debug(
+        "build",
+        `\u251C\u2500\u2500 ${colors.bold(colors.green("\u2714"))} ${route.component} \u2192 ${colors.magenta(
+          `[${staticPaths.length} ${label}]`
+        )}`
+      );
+      paths.push(
+        ...staticPaths.map((staticPath) => {
+          try {
+            return route.generate(staticPath.params);
+          } catch (e) {
+            if (e instanceof TypeError) {
+              throw getInvalidRouteSegmentError(e, route, staticPath);
+            }
+            throw e;
+          }
+        }).filter((staticPath) => {
+          if (!builtPaths.has(removeTrailingForwardSlash(staticPath))) {
+            return true;
+          }
+          const matchedRoute = matchRoute(staticPath, opts.manifest);
+          return matchedRoute === route;
+        })
+      );
+      for (const staticPath of paths) {
+        builtPaths.add(removeTrailingForwardSlash(staticPath));
       }
-      const matchedRoute = matchRoute(staticPath, opts.manifest);
-      return matchedRoute === route;
-    });
-    for (const staticPath of paths) {
-      builtPaths.add(removeTrailingForwardSlash(staticPath));
     }
   }
   return paths;
@@ -380,69 +371,90 @@ function getUrlForPath(pathname, base, origin, format, routeType) {
   const url = new URL(buildPathname, origin);
   return url;
 }
-async function generatePath(pathname, pipeline, route, links, scripts, styles, mod) {
+async function generatePath(pathname, gopts, pipeline) {
   const manifest = pipeline.getManifest();
-  const logger = pipeline.getLogger();
-  pipeline.getEnvironment().logger.debug("build", `Generating: ${pathname}`);
-  const icon = route.type === "page" || route.type === "redirect" || route.type === "fallback" ? green("\u25B6") : magenta("\u03BB");
-  if (isRelativePath(route.component)) {
-    logger.info(null, `${icon} ${route.route}`);
-  } else {
-    logger.info(null, `${icon} ${route.component}`);
-  }
-  if (route.type === "page") {
-    addPageName(pathname, pipeline.getStaticBuildOptions());
-  }
-  const ssr = isServerLikeOutput(pipeline.getConfig());
-  const url = getUrlForPath(
-    pathname,
-    pipeline.getConfig().base,
-    pipeline.getStaticBuildOptions().origin,
-    pipeline.getConfig().build.format,
-    route.type
-  );
-  const request = createRequest({
-    url,
-    headers: new Headers(),
-    logger: pipeline.getLogger(),
-    ssr
-  });
-  const i18n = pipeline.getConfig().experimental.i18n;
-  const renderContext = await createRenderContext({
-    pathname,
-    request,
-    componentMetadata: manifest.componentMetadata,
-    scripts,
-    styles,
-    links,
-    route,
-    env: pipeline.getEnvironment(),
-    mod,
-    locales: i18n?.locales,
-    routingStrategy: i18n?.routingStrategy,
-    defaultLocale: i18n?.defaultLocale
-  });
-  let body;
-  let encoding;
-  let response;
-  try {
-    response = await pipeline.renderRoute(renderContext, mod);
-  } catch (err) {
-    if (!AstroError.is(err) && !err.id && typeof err === "object") {
-      err.id = route.component;
+  const { mod, scripts: hoistedScripts, styles: _styles, pageData } = gopts;
+  for (const route of eachRouteInRouteData(pageData)) {
+    if (route.type === "page") {
+      addPageName(pathname, pipeline.getStaticBuildOptions());
     }
-    throw err;
-  }
-  if (response.status >= 300 && response.status < 400) {
-    if (!pipeline.getConfig().build.redirects) {
-      return;
+    pipeline.getEnvironment().logger.debug("build", `Generating: ${pathname}`);
+    const links = /* @__PURE__ */ new Set();
+    const scripts = createModuleScriptsSet(
+      hoistedScripts ? [hoistedScripts] : [],
+      manifest.base,
+      manifest.assetsPrefix
+    );
+    const styles = createStylesheetElementSet(_styles, manifest.base, manifest.assetsPrefix);
+    if (pipeline.getSettings().scripts.some((script) => script.stage === "page")) {
+      const hashedFilePath = pipeline.getInternals().entrySpecifierToBundleMap.get(PAGE_SCRIPT_ID);
+      if (typeof hashedFilePath !== "string") {
+        throw new Error(`Cannot find the built path for ${PAGE_SCRIPT_ID}`);
+      }
+      const src = createAssetLink(hashedFilePath, manifest.base, manifest.assetsPrefix);
+      scripts.add({
+        props: { type: "module", src },
+        children: ""
+      });
+    }
+    for (const script of pipeline.getSettings().scripts) {
+      if (script.stage === "head-inline") {
+        scripts.add({
+          props: {},
+          children: script.content
+        });
+      }
     }
-    const locationSite = getRedirectLocationOrThrow(response.headers);
-    const siteURL = pipeline.getConfig().site;
-    const location = siteURL ? new URL(locationSite, siteURL) : locationSite;
-    const fromPath = new URL(renderContext.request.url).pathname;
-    const delay = response.status === 302 ? 2 : 0;
-    body = `<!doctype html>
+    const ssr = isServerLikeOutput(pipeline.getConfig());
+    const url = getUrlForPath(
+      pathname,
+      pipeline.getConfig().base,
+      pipeline.getStaticBuildOptions().origin,
+      pipeline.getConfig().build.format,
+      route.type
+    );
+    const request = createRequest({
+      url,
+      headers: new Headers(),
+      logger: pipeline.getLogger(),
+      ssr
+    });
+    const i18n = pipeline.getConfig().experimental.i18n;
+    const renderContext = await createRenderContext({
+      pathname,
+      request,
+      componentMetadata: manifest.componentMetadata,
+      scripts,
+      styles,
+      links,
+      route,
+      env: pipeline.getEnvironment(),
+      mod,
+      locales: i18n?.locales,
+      routingStrategy: i18n?.routingStrategy,
+      defaultLocale: i18n?.defaultLocale
+    });
+    let body;
+    let encoding;
+    let response;
+    try {
+      response = await pipeline.renderRoute(renderContext, mod);
+    } catch (err) {
+      if (!AstroError.is(err) && !err.id && typeof err === "object") {
+        err.id = pageData.component;
+      }
+      throw err;
+    }
+    if (response.status >= 300 && response.status < 400) {
+      if (!pipeline.getConfig().build.redirects) {
+        return;
+      }
+      const locationSite = getRedirectLocationOrThrow(response.headers);
+      const siteURL = pipeline.getConfig().site;
+      const location = siteURL ? new URL(locationSite, siteURL) : locationSite;
+      const fromPath = new URL(renderContext.request.url).pathname;
+      const delay = response.status === 302 ? 2 : 0;
+      body = `<!doctype html>
 <title>Redirecting to: ${location}</title>
 <meta http-equiv="refresh" content="${delay};url=${location}">
 <meta name="robots" content="noindex">
@@ -450,23 +462,24 @@ async function generatePath(pathname, pipeline, route, links, scripts, styles, m
 <body>
 	<a href="${location}">Redirecting from <code>${fromPath}</code> to <code>${location}</code></a>
 </body>`;
-    if (pipeline.getConfig().compressHTML === true) {
-      body = body.replaceAll("\n", "");
-    }
-    if (route.type !== "redirect") {
-      route.redirect = location.toString();
+      if (pipeline.getConfig().compressHTML === true) {
+        body = body.replaceAll("\n", "");
+      }
+      if (route.type !== "redirect") {
+        route.redirect = location.toString();
+      }
+    } else {
+      if (!response.body)
+        return;
+      body = Buffer.from(await response.arrayBuffer());
+      encoding = response.headers.get("X-Astro-Encoding") ?? "utf-8";
     }
-  } else {
-    if (!response.body)
-      return;
-    body = Buffer.from(await response.arrayBuffer());
-    encoding = response.headers.get("X-Astro-Encoding") ?? "utf-8";
+    const outFolder = getOutFolder(pipeline.getConfig(), pathname, route.type);
+    const outFile = getOutFile(pipeline.getConfig(), outFolder, pathname, route.type);
+    route.distURL = outFile;
+    await fs.promises.mkdir(outFolder, { recursive: true });
+    await fs.promises.writeFile(outFile, body, encoding);
   }
-  const outFolder = getOutFolder(pipeline.getConfig(), pathname, route.type);
-  const outFile = getOutFile(pipeline.getConfig(), outFolder, pathname, route.type);
-  route.distURL = outFile;
-  await fs.promises.mkdir(outFolder, { recursive: true });
-  await fs.promises.writeFile(outFile, body, encoding);
 }
 function createBuildManifest(settings, internals, renderers) {
   let i18nManifest = void 0;

package/dist/core/constants.js

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

package/dist/core/dev/dev.js

@@ -20,7 +20,7 @@ async function dev(inlineConfig) {
       base: restart.container.settings.config.base
     })
   );
-  const currentVersion = "3.5.6";
+  const currentVersion = "3.5.7";
   if (currentVersion.includes("-")) {
     logger.warn(null, msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

@@ -50,7 +50,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "3.5.6";
+  const version = "3.5.7";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -235,7 +235,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"3.5.6"}`
+        `v${"3.5.7"}`
       )} ${headline}`
     );
   }

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

@@ -417,20 +417,25 @@ This route collides with: "${collision.component}".`
             if (!hasRoute) {
               let pathname;
               let route;
-              if (fallbackToLocale === i18n.defaultLocale && i18n.routingStrategy === "prefix-other-locales") {
+              if (fallbackToLocale === i18n.defaultLocale) {
                 if (fallbackToRoute.pathname) {
                   pathname = `/${fallbackFromLocale}${fallbackToRoute.pathname}`;
                 }
                 route = `/${fallbackFromLocale}${fallbackToRoute.route}`;
               } else {
-                pathname = fallbackToRoute.pathname?.replace(`/${fallbackToLocale}/`, `/${fallbackFromLocale}/`).replace(`/${fallbackToLocale}`, `/${fallbackFromLocale}`);
-                route = fallbackToRoute.route.replace(`/${fallbackToLocale}`, `/${fallbackFromLocale}`).replace(`/${fallbackToLocale}/`, `/${fallbackFromLocale}/`);
+                pathname = fallbackToRoute.pathname?.replace(
+                  `/${fallbackToLocale}`,
+                  `/${fallbackFromLocale}`
+                );
+                route = fallbackToRoute.route.replace(
+                  `/${fallbackToLocale}`,
+                  `/${fallbackFromLocale}`
+                );
               }
               const segments = removeLeadingForwardSlash(route).split(path.posix.sep).filter(Boolean).map((s) => {
                 validateSegment(s);
                 return getParts(s, route);
               });
-              const generate = getRouteGenerator(segments, config.trailingSlash);
               const index = routes.findIndex((r) => r === fallbackToRoute);
               if (index) {
                 const fallbackRoute = {
@@ -438,7 +443,6 @@ This route collides with: "${collision.component}".`
                   pathname,
                   route,
                   segments,
-                  generate,
                   pattern: getPattern(segments, config, config.trailingSlash),
                   type: "fallback",
                   fallbackRoutes: []

package/dist/core/routing/params.js

@@ -16,7 +16,7 @@ function getParams(array) {
 }
 function stringifyParams(params, route) {
   const validatedParams = Object.entries(params).reduce((acc, next) => {
-    validateGetStaticPathsParameter(next, route.route);
+    validateGetStaticPathsParameter(next, route.component);
     const [key, value] = next;
     if (value !== void 0) {
       acc[key] = typeof value === "string" ? trimSlashes(value) : value.toString();

package/dist/i18n/middleware.js

@@ -23,7 +23,7 @@ function createI18nMiddleware(i18n, base, trailingSlash) {
       }
     }
     const url = context.url;
-    const { locales, defaultLocale, fallback, routingStrategy } = i18n;
+    const { locales, defaultLocale, fallback } = i18n;
     const response = await next();
     if (response instanceof Response) {
       const separators = url.pathname.split("/");
@@ -56,7 +56,7 @@ function createI18nMiddleware(i18n, base, trailingSlash) {
         if (urlLocale && fallbackKeys.includes(urlLocale)) {
           const fallbackLocale = fallback[urlLocale];
           let newPathname;
-          if (fallbackLocale === defaultLocale && routingStrategy === "prefix-other-locales") {
+          if (fallbackLocale === defaultLocale) {
             newPathname = url.pathname.replace(`/${urlLocale}`, ``);
           } else {
             newPathname = url.pathname.replace(`/${urlLocale}`, `/${fallbackLocale}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "3.5.6",
+  "version": "3.5.7",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -164,8 +164,8 @@
     "which-pm": "^2.1.1",
     "yargs-parser": "^21.1.1",
     "zod": "^3.22.4",
-    "@astrojs/markdown-remark": "3.5.0",
     "@astrojs/internal-helpers": "0.2.1",
+    "@astrojs/markdown-remark": "3.5.0",
     "@astrojs/telemetry": "3.0.4"
   },
   "optionalDependencies": {