dont allow null entries

Author: amannn

packages/next-intl/src/middleware/getAlternateLinksHeaderValue.test.tsx

@@ -159,7 +159,7 @@ describe.each([{basePath: undefined}, {basePath: '/base'}])(
       ]);
     });
 
-    it('works for partial pathnames with undefined and null entries', () => {
+    it('works for partial pathnames with undefined entries', () => {
       const routing = receiveRoutingConfig({
         defaultLocale: 'en',
         locales: ['en', 'de', 'ja'],
@@ -168,8 +168,7 @@ describe.each([{basePath: undefined}, {basePath: '/base'}])(
       const pathnames = {
         '/': '/',
         '/about': {
-          de: '/ueber',
-          ja: null
+          de: '/ueber'
         }
       };
 
@@ -184,6 +183,7 @@ describe.each([{basePath: undefined}, {basePath: '/base'}])(
       ).toEqual([
         `<https://example.com${basePath}/about>; rel="alternate"; hreflang="en"`,
         `<https://example.com${basePath}/de/ueber>; rel="alternate"; hreflang="de"`,
+        `<https://example.com${basePath}/ja/about>; rel="alternate"; hreflang="ja"`,
         `<https://example.com${basePath}/about>; rel="alternate"; hreflang="x-default"`
       ]);
     });

packages/next-intl/src/middleware/getAlternateLinksHeaderValue.tsx

@@ -74,13 +74,12 @@ export default function getAlternateLinksHeaderValue<
 
   function getLocalizedPathname(pathname: string, locale: AppLocales[number]) {
     if (localizedPathnames && typeof localizedPathnames === 'object') {
-      if (localizedPathnames[locale] === null) return;
       const sourceTemplate = localizedPathnames[resolvedLocale];
 
       return formatTemplatePathname(
         pathname,
-        sourceTemplate ?? internalTemplateName ?? pathname,
-        localizedPathnames[locale] ?? internalTemplateName ?? pathname
+        sourceTemplate ?? internalTemplateName!,
+        localizedPathnames[locale] ?? internalTemplateName!
       );
     } else {
       return pathname;
@@ -91,69 +90,59 @@ export default function getAlternateLinksHeaderValue<
     routing.locales as AppLocales,
     routing.localePrefix,
     false
-  )
-    .flatMap(([locale, prefix]) => {
-      function prefixPathname(pathname: string) {
-        if (pathname === '/') {
-          return prefix;
-        } else {
-          return prefix + pathname;
-        }
+  ).flatMap(([locale, prefix]) => {
+    function prefixPathname(pathname: string) {
+      if (pathname === '/') {
+        return prefix;
+      } else {
+        return prefix + pathname;
       }
+    }
 
-      let url: URL;
-
-      if (routing.domains) {
-        const domainConfigs = routing.domains.filter((cur) =>
-          isLocaleSupportedOnDomain(locale, cur)
-        );
-
-        return domainConfigs.map((domainConfig) => {
-          const pathname = getLocalizedPathname(normalizedUrl.pathname, locale);
-          if (!pathname) return undefined;
+    let url: URL;
 
-          url = new URL(normalizedUrl);
-          url.port = '';
-          url.host = domainConfig.domain;
+    if (routing.domains) {
+      const domainConfigs = routing.domains.filter((cur) =>
+        isLocaleSupportedOnDomain(locale, cur)
+      );
 
-          // Important: Use `normalizedUrl` here, as `url` potentially uses
-          // a `basePath` that automatically gets applied to the pathname
-          url.pathname = pathname;
+      return domainConfigs.map((domainConfig) => {
+        url = new URL(normalizedUrl);
+        url.port = '';
+        url.host = domainConfig.domain;
 
-          if (
-            locale !== domainConfig.defaultLocale ||
-            routing.localePrefix.mode === 'always'
-          ) {
-            url.pathname = prefixPathname(url.pathname);
-          }
-
-          return getAlternateEntry(url, locale);
-        });
-      } else {
-        let pathname: string;
-        if (localizedPathnames && typeof localizedPathnames === 'object') {
-          const candidate = getLocalizedPathname(
-            normalizedUrl.pathname,
-            locale
-          );
-          if (!candidate) return undefined;
-          pathname = candidate;
-        } else {
-          pathname = normalizedUrl.pathname;
-        }
+        // Important: Use `normalizedUrl` here, as `url` potentially uses
+        // a `basePath` that automatically gets applied to the pathname
+        url.pathname = getLocalizedPathname(normalizedUrl.pathname, locale);
 
         if (
-          locale !== routing.defaultLocale ||
+          locale !== domainConfig.defaultLocale ||
           routing.localePrefix.mode === 'always'
         ) {
-          pathname = prefixPathname(pathname);
+          url.pathname = prefixPathname(url.pathname);
         }
-        url = new URL(pathname, normalizedUrl);
+
+        return getAlternateEntry(url, locale);
+      });
+    } else {
+      let pathname: string;
+      if (localizedPathnames && typeof localizedPathnames === 'object') {
+        pathname = getLocalizedPathname(normalizedUrl.pathname, locale);
+      } else {
+        pathname = normalizedUrl.pathname;
       }
 
-      return getAlternateEntry(url, locale);
-    })
-    .filter((link) => link != null);
+      if (
+        locale !== routing.defaultLocale ||
+        routing.localePrefix.mode === 'always'
+      ) {
+        pathname = prefixPathname(pathname);
+      }
+      url = new URL(pathname, normalizedUrl);
+    }
+
+    return getAlternateEntry(url, locale);
+  });
 
   // Add x-default entry
   const shouldAddXDefault =

packages/next-intl/src/middleware/middleware.test.tsx

@@ -482,7 +482,7 @@ describe('prefix-based routing', () => {
           },
           '/partially-available': {
             de: '/teilweise-verfuegbar',
-            'de-AT': null
+            'de-AT': '/teilweise-verfuegbar'
             // (ja inherits en)
           }
         } satisfies Pathnames<ReadonlyArray<'en' | 'de' | 'de-AT' | 'ja'>>

packages/next-intl/src/routing/defineRouting.test.tsx

@@ -35,7 +35,6 @@ describe('pathnames', () => {
     routing.pathnames['/about'].en;
   });
 
-
   it('accepts a partial config for only some locales', () => {
     defineRouting({
       locales: ['en', 'de'],
@@ -47,18 +46,6 @@ describe('pathnames', () => {
       }
     });
   });
-
-  it('allows to mark locales as not supported', () => {
-    defineRouting({
-      locales: ['en', 'de'],
-      defaultLocale: 'en',
-      pathnames: {
-        '/about': {
-          de: null
-        }
-      }
-    });
-  });
 });
 
 describe('domains', () => {

packages/next-intl/src/routing/types.tsx

@@ -36,7 +36,7 @@ export type LocalePrefix<
 
 export type Pathnames<AppLocales extends Locales> = Record<
   Pathname,
-  Partial<Record<AppLocales[number], Pathname | null>> | Pathname
+  Partial<Record<AppLocales[number], Pathname>> | Pathname
 >;
 
 export type DomainConfig<AppLocales extends Locales> = {