fix(@angular-devkit/build-angular): fallback to use language ID to se…

…t the `dir` attribute In some cases we don't ship certain locales, or they map to files which are named only the language IDs. Example `en-US`, which it's locale data is available from `@angular/common/locales/en.mjs` Closes #22285
angular · Dec 6, 2021 · d55fc62 · d55fc62
1 parent b06dd03
commit d55fc62
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 5 deletions.
diff --git a/packages/angular_devkit/build_angular/src/utils/index-file/augment-index-html.ts b/packages/angular_devkit/build_angular/src/utils/index-file/augment-index-html.ts
@@ -222,20 +222,40 @@ function isString(value: unknown): value is string {
   return typeof value === 'string';
 }
 
-async function getLanguageDirection(lang: string, warnings: string[]): Promise<string | undefined> {
+async function getLanguageDirection(
+  locale: string,
+  warnings: string[],
+): Promise<string | undefined> {
+  const dir = await getLanguageDirectionFromLocales(locale);
+
+  if (!dir) {
+    warnings.push(
+      `Locale data for '${locale}' cannot be found. 'dir' attribute will not be set for this locale.`,
+    );
+  }
+
+  return dir;
+}
+
+async function getLanguageDirectionFromLocales(locale: string): Promise<string | undefined> {
   try {
     const localeData = (
       await loadEsmModule<typeof import('@angular/common/locales/en')>(
-        `@angular/common/locales/${lang}`,
+        `@angular/common/locales/${locale}`,
       )
     ).default;
 
     const dir = localeData[localeData.length - 2];
 
     return isString(dir) ? dir : undefined;
   } catch {
-    warnings.push(
-      `Locale data for '${lang}' cannot be found. 'dir' attribute will not be set for this locale.`,
-    );
+    // In some cases certain locales might map to files which are named only with language id.
+    // Example: `en-US` -> `en`.
+    const [languageId] = locale.split('-', 1);
+    if (languageId !== locale) {
+      return getLanguageDirectionFromLocales(languageId);
+    }
   }
+
+  return undefined;
 }
diff --git a/packages/angular_devkit/build_angular/src/utils/index-file/augment-index-html_spec.ts b/packages/angular_devkit/build_angular/src/utils/index-file/augment-index-html_spec.ts
@@ -104,6 +104,24 @@ describe('augment-index-html', () => {
       `);
   });
 
+  it(`should fallback to use language ID to set the dir attribute (en-US)`, async () => {
+    const { content, warnings } = await augmentIndexHtml({
+      ...indexGeneratorOptions,
+      lang: 'en-US',
+    });
+
+    expect(warnings).toHaveSize(0);
+    expect(content).toEqual(oneLineHtml`
+        <html lang="en-US" dir="ltr">
+          <head>
+            <base href="/">
+          </head>
+          <body>
+          </body>
+        </html>
+      `);
+  });
+
   it(`should work when lang (locale) is not provided by '@angular/common'`, async () => {
     const { content, warnings } = await augmentIndexHtml({
       ...indexGeneratorOptions,