astro 4.2.0 → 4.2.1

package/dist/cli/preferences/index.js

@@ -5,10 +5,7 @@ import { resolveConfig } from "../../core/config/config.js";
 import { createSettings } from "../../core/config/settings.js";
 import * as msg from "../../core/messages.js";
 import { DEFAULT_PREFERENCES } from "../../preferences/defaults.js";
-import {
-  coerce,
-  isValidKey
-} from "../../preferences/index.js";
+import { coerce, isValidKey } from "../../preferences/index.js";
 import { createLoggerFromFlags, flagsToAstroInlineConfig } from "../flags.js";
 import { flattie } from "flattie";
 import { formatWithOptions } from "node:util";

package/dist/core/build/generate.js

@@ -344,9 +344,8 @@ function getUrlForPath(pathname, base, origin, format, routeType) {
   return url;
 }
 async function generatePath(pathname, pipeline, gopts, route) {
-  const { mod, scripts: hoistedScripts, styles: _styles, pageData } = gopts;
+  const { mod, scripts: hoistedScripts, styles: _styles } = gopts;
   const manifest = pipeline.getManifest();
-  const logger = pipeline.getLogger();
   pipeline.getEnvironment().logger.debug("build", `Generating: ${pathname}`);
   const links = /* @__PURE__ */ new Set();
   const scripts = createModuleScriptsSet(

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.2.0";
+const ASTRO_VERSION = "4.2.1";
 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.0";
+  const currentVersion = "4.2.1";
   if (currentVersion.includes("-")) {
     logger.warn("SKIP_FORMAT", msg.prerelease({ currentVersion }));
   }

package/dist/core/logger/node.js

@@ -1,7 +1,7 @@
 import debugPackage from "debug";
 import { getEventPrefix, levels } from "./core.js";
 const nodeLogDestination = {
-  write(event, newLine = true) {
+  write(event) {
     let dest = process.stderr;
     if (levels[event.level] < levels["error"]) {
       dest = process.stdout;

package/dist/core/messages.js

@@ -36,7 +36,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.2.0";
+  const version = "4.2.1";
   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.0"}`
+        `v${"4.2.1"}`
       )} ${headline}`
     );
   }

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

@@ -83,9 +83,26 @@ function validateSegment(segment, file = "") {
     throw new Error(`Invalid route ${file} \u2014 rest parameter must be a standalone segment`);
   }
 }
+function isSemanticallyEqualSegment(segmentA, segmentB) {
+  if (segmentA.length !== segmentB.length) {
+    return false;
+  }
+  for (const [index, partA] of segmentA.entries()) {
+    const partB = segmentB[index];
+    if (partA.dynamic !== partB.dynamic || partA.spread !== partB.spread) {
+      return false;
+    }
+    if (!partA.dynamic && partA.content !== partB.content) {
+      return false;
+    }
+  }
+  return true;
+}
 function routeComparator(a, b) {
-  if (a.segments.length !== b.segments.length) {
-    return a.segments.length > b.segments.length ? -1 : 1;
+  const aLength = a.isIndex ? a.segments.length + 1 : a.segments.length;
+  const bLength = b.isIndex ? b.segments.length + 1 : b.segments.length;
+  if (aLength !== bLength) {
+    return aLength > bLength ? -1 : 1;
   }
   const aIsStatic = a.segments.every(
     (segment) => segment.every((part) => !part.dynamic && !part.spread)
@@ -203,6 +220,7 @@ function createFileBasedRoutes({ settings, cwd, fsMod }, logger) {
         const route = `/${segments.map(([{ dynamic, content }]) => dynamic ? `[${content}]` : content).join("/")}`.toLowerCase();
         routes.push({
           route,
+          isIndex: item.isIndex,
           type: item.isPage ? "page" : "endpoint",
           pattern,
           segments,
@@ -257,6 +275,8 @@ function createInjectedRoutes({ settings, cwd }) {
     const route = `/${segments.map(([{ dynamic, content }]) => dynamic ? `[${content}]` : content).join("/")}`.toLowerCase();
     routes[priority].push({
       type,
+      // For backwards compatibility, an injected route is never considered an index route.
+      isIndex: false,
       route,
       pattern,
       segments,
@@ -302,6 +322,8 @@ function createRedirectRoutes({ settings }, routeMap, logger) {
     }
     routes[priority].push({
       type: "redirect",
+      // For backwards compatibility, a redirect is never considered an index route.
+      isIndex: false,
       route,
       pattern,
       segments,
@@ -320,21 +342,6 @@ function createRedirectRoutes({ settings }, routeMap, logger) {
 function isStaticSegment(segment) {
   return segment.every((part) => !part.dynamic && !part.spread);
 }
-function isSemanticallyEqualSegment(segmentA, segmentB) {
-  if (segmentA.length !== segmentB.length) {
-    return false;
-  }
-  for (const [index, partA] of segmentA.entries()) {
-    const partB = segmentB[index];
-    if (partA.dynamic !== partB.dynamic || partA.spread !== partB.spread) {
-      return false;
-    }
-    if (!partA.dynamic && partA.content !== partB.content) {
-      return false;
-    }
-  }
-  return true;
-}
 function detectRouteCollision(a, b, config, logger) {
   if (a.type === "fallback" || b.type === "fallback") {
     return;

package/dist/i18n/middleware.js

@@ -1,6 +1,5 @@
 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");
 function pathnameHasLocale(pathname, locales) {
   const segments = pathname.split("/");

package/dist/runtime/server/render/util.js

@@ -12,7 +12,7 @@ const toIdent = (k) => k.trim().replace(/(?:(?!^)\b\w|\s+|[^\w]+)/g, (match, ind
 });
 const toAttributeString = (value, shouldEscape = true) => shouldEscape ? String(value).replace(/&/g, "&").replace(/"/g, """) : value;
 const kebab = (k) => k.toLowerCase() === k ? k : k.replace(/[A-Z]/g, (match) => `-${match.toLowerCase()}`);
-const toStyleString = (obj) => Object.entries(obj).filter(([k, v]) => typeof v === "string" && v.trim() || typeof v === "number").map(([k, v]) => {
+const toStyleString = (obj) => Object.entries(obj).filter(([_, v]) => typeof v === "string" && v.trim() || typeof v === "number").map(([k, v]) => {
   if (k[0] !== "-" && k[1] !== "-")
     return `${kebab(k)}:${v}`;
   return `${k}:${v}`;

package/package.json

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