astro 3.5.0 → 3.5.1

package/dist/@types/astro.d.ts

@@ -1345,6 +1345,8 @@ export interface AstroUserConfig {
          * @description
          *
          * Configures experimental i18n routing and allows you to specify some customization options.
+         *
+         * See our guide for more information on [internationalization in Astro](/en/guides/internationalization/)
          */
         i18n?: {
             /**
@@ -1355,6 +1357,8 @@ export interface AstroUserConfig {
              * @description
              *
              * The default locale of your website/application. This is a required field.
+             *
+             * No particular language format or syntax is enforced, but we suggest using lower-case and hyphens as needed (e.g. "es", "pt-br") for greatest compatibility.
              */
             defaultLocale: string;
             /**
@@ -1364,7 +1368,7 @@ export interface AstroUserConfig {
              * @version 3.5.0
              * @description
              *
-             * A list of all locales supported by the website (e.g. `['en', 'es', 'pt_BR']`). This list should also include the `defaultLocale`. This is a required field.
+             * A list of all locales supported by the website (e.g. `['en', 'es', 'pt-br']`). This list should also include the `defaultLocale`. This is a required field.
              *
              * No particular language format or syntax is enforced, but your folder structure must match exactly the locales in the list.
              */
@@ -1382,14 +1386,14 @@ export interface AstroUserConfig {
              *
              * #### Example
              *
-             * The following example configures your content fallback strategy to redirect unavailable pages in `/pt/` to their `es` version, and unavailable pages in `/fr/` to their `en` version. Unavailable `/es/` pages will return a 404.
+             * The following example configures your content fallback strategy to redirect unavailable pages in `/pt-br/` to their `es` version, and unavailable pages in `/fr/` to their `en` version. Unavailable `/es/` pages will return a 404.
              *
              * ```js
              * export defualt defineConfig({
              * 	experimental: {
              * 		i18n: {
              * 			defaultLocale: "en",
-             * 			locales: ["en", "fr", "pt", "es"],
+             * 			locales: ["en", "fr", "pt-br", "es"],
              * 			fallback: {
              * 				pt: "es",
              * 			  fr: "en"
@@ -1408,14 +1412,15 @@ export interface AstroUserConfig {
              * @version 3.5.0
              * @description
              *
-             * Controls the routing strategy to determine your site URLs.
+             * Controls the routing strategy to determine your site URLs. Set this based on your folder/URL path configuration for your default language:
              *
-             *  - `prefix-other-locales`(default): Only non-default languages will display a language prefix. The `defaultLocale` will not show a language prefix.
-             *    URLs will be of the form `example.com/[lang]/content/` for all non-default languages, but `example.com/content/` for the default locale.
+             *  - `prefix-other-locales`(default): Only non-default languages will display a language prefix.
+             *    The `defaultLocale` will not show a language prefix and content files do not exist in a localized folder.
+             *    URLs will be of the form `example.com/[locale]/content/` for all non-default languages, but `example.com/content/` for the default locale.
              *  - `prefix-always`: All URLs will display a language prefix.
-             *    URLs will be of the form `example.com/[lang]/content/` for every route, including the default language.
+             *    URLs will be of the form `example.com/[locale]/content/` for every route, including the default language.
+             *    Localized folders are used for every language, including the default.
              *
-             * Note: Astro requires all content to exist within a `/[lang]/` folder, even for the default language.
              */
             routingStrategy?: 'prefix-always' | 'prefix-other-locales';
         };

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

@@ -136,7 +136,7 @@ function assets({
       configResolved(viteConfig) {
         resolvedConfig = viteConfig;
       },
-      async load(id) {
+      async load(id, options) {
         if (id !== removeQueryString(id)) {
           return;
         }
@@ -148,8 +148,14 @@ function assets({
               message: AstroErrorData.ImageNotFound.message(id)
             });
           }
-          return `
-					export default ${getProxyCode(meta, isServerLikeOutput(settings.config))}`;
+          if (options?.ssr) {
+            return `export default ${getProxyCode(meta, isServerLikeOutput(settings.config))}`;
+          } else {
+            if (!globalThis.astroAsset.referencedImages)
+              globalThis.astroAsset.referencedImages = /* @__PURE__ */ new Set();
+            globalThis.astroAsset.referencedImages.add(meta.fsPath);
+            return `export default ${JSON.stringify(meta)}`;
+          }
         }
       }
     }

package/dist/cli/info/index.js

@@ -35,11 +35,15 @@ async function copyToClipboard(text) {
   } else if (system === "win32") {
     command = "clip";
   } else {
-    const output = execSync("which xclip", { encoding: "utf8" });
-    if (output[0] !== "/") {
+    try {
+      const output = execSync("which xclip", { encoding: "utf8" });
+      if (output[0] !== "/") {
+        return;
+      }
+      command = "xclip -sel clipboard -l 1";
+    } catch (e) {
       return;
     }
-    command = "xclip -sel clipboard -l 1";
   }
   console.log();
   const { shouldCopy } = await prompts({

package/dist/core/constants.js

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

package/dist/core/logger/node.js

@@ -80,6 +80,7 @@ const logger = {
   error: error.bind(null, nodeLogOptions)
 };
 function enableVerboseLogging() {
+  debugPackage.enable("*,-babel");
   debug("cli", '--verbose flag enabled! Enabling: DEBUG="*,-babel"');
   debug(
     "cli",

package/dist/core/messages.js

@@ -50,7 +50,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "3.5.0";
+  const version = "3.5.1";
   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.0"}`
+        `v${"3.5.1"}`
       )} ${headline}`
     );
   }

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

@@ -10,32 +10,30 @@ async function callGetStaticPaths({
   ssr
 }) {
   const cached = routeCache.get(route);
-  if (cached?.staticPaths)
+  if (!mod) {
+    throw new Error("This is an error caused by Astro and not your code. Please file an issue.");
+  }
+  if (cached?.staticPaths) {
     return cached.staticPaths;
-  if (mod) {
-    validateDynamicRouteModule(mod, { ssr, route });
   }
+  validateDynamicRouteModule(mod, { ssr, route });
   if (ssr && !route.prerender) {
     const entry = Object.assign([], { keyed: /* @__PURE__ */ new Map() });
     routeCache.set(route, { ...cached, staticPaths: entry });
     return entry;
   }
   let staticPaths = [];
-  if (mod) {
-    if (!mod.getStaticPaths) {
-      throw new Error("Unexpected Error.");
-    }
-    if (mod) {
-      staticPaths = await mod.getStaticPaths({
-        // Q: Why the cast?
-        // A: So users downstream can have nicer typings, we have to make some sacrifice in our internal typings, which necessitate a cast here
-        paginate: generatePaginateFunction(route),
-        rss() {
-          throw new AstroError(AstroErrorData.GetStaticPathsRemovedRSSHelper);
-        }
-      });
-    }
+  if (!mod.getStaticPaths) {
+    throw new Error("Unexpected Error.");
   }
+  staticPaths = await mod.getStaticPaths({
+    // Q: Why the cast?
+    // A: So users downstream can have nicer typings, we have to make some sacrifice in our internal typings, which necessitate a cast here
+    paginate: generatePaginateFunction(route),
+    rss() {
+      throw new AstroError(AstroErrorData.GetStaticPathsRemovedRSSHelper);
+    }
+  });
   validateGetStaticPathsResult(staticPaths, logger, route);
   const keyedStaticPaths = staticPaths;
   keyedStaticPaths.keyed = /* @__PURE__ */ new Map();

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

@@ -34,9 +34,8 @@ function getParts(part, file) {
   });
   return result;
 }
-function getPattern(segments, config) {
+function getPattern(segments, config, addTrailingSlash) {
   const base = config.base;
-  const addTrailingSlash = config.trailingSlash;
   const pathname = segments.map((segment) => {
     if (segment.length === 1 && segment[0].spread) {
       return "(?:\\/(.*?))?";
@@ -224,7 +223,7 @@ function createRouteManifest({ settings, cwd, fsMod }, logger) {
         components.push(item.file);
         const component = item.file;
         const trailingSlash = item.isPage ? settings.config.trailingSlash : "never";
-        const pattern = getPattern(segments, settings.config);
+        const pattern = getPattern(segments, settings.config, trailingSlash);
         const generate = getRouteGenerator(segments, trailingSlash);
         const pathname = segments.every((segment) => segment.length === 1 && !segment[0].dynamic) ? `/${segments.map((segment) => segment[0].content).join("/")}` : null;
         const route = `/${segments.map(([{ dynamic, content }]) => dynamic ? `[${content}]` : content).join("/")}`.toLowerCase();
@@ -270,7 +269,7 @@ function createRouteManifest({ settings, cwd, fsMod }, logger) {
     const type = resolved.endsWith(".astro") ? "page" : "endpoint";
     const isPage = type === "page";
     const trailingSlash = isPage ? config.trailingSlash : "never";
-    const pattern = getPattern(segments, settings.config);
+    const pattern = getPattern(segments, settings.config, trailingSlash);
     const generate = getRouteGenerator(segments, trailingSlash);
     const pathname = segments.every((segment) => segment.length === 1 && !segment[0].dynamic) ? `/${segments.map((segment) => segment[0].content).join("/")}` : null;
     const params = segments.flat().filter((p) => p.dynamic).map((p) => p.content);
@@ -300,7 +299,7 @@ This route collides with: "${collision.component}".`
       validateSegment(s);
       return getParts(s, from);
     });
-    const pattern = getPattern(segments, settings.config);
+    const pattern = getPattern(segments, settings.config, trailingSlash);
     const generate = getRouteGenerator(segments, trailingSlash);
     const pathname = segments.every((segment) => segment.length === 1 && !segment[0].dynamic) ? `/${segments.map((segment) => segment[0].content).join("/")}` : null;
     const params = segments.flat().filter((p) => p.dynamic).map((p) => p.content);
@@ -383,7 +382,7 @@ This route collides with: "${collision.component}".`
             pathname,
             route,
             segments,
-            pattern: getPattern(segments, config),
+            pattern: getPattern(segments, config, config.trailingSlash),
             type: "fallback"
           });
         }
@@ -439,7 +438,7 @@ This route collides with: "${collision.component}".`
                 pathname,
                 route,
                 segments,
-                pattern: getPattern(segments, config),
+                pattern: getPattern(segments, config, config.trailingSlash),
                 type: "fallback"
               });
             }

package/package.json

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