cleanup signature of extractSiteSourceCodeTranslations

facebook · Sep 20, 2024 · 785f676 · 785f676
1 parent 1589f9d
commit 785f676
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 18 deletions.
diff --git a/packages/docusaurus-babel/src/utils.ts b/packages/docusaurus-babel/src/utils.ts
@@ -27,6 +27,8 @@ export function getBabelOptions({
   babelOptions,
 }: {
   isServer?: boolean;
+  // TODO Docusaurus v4 fix this
+  //  weird to have getBabelOptions take a babelOptions param
   babelOptions?: TransformOptions | string;
 } = {}): TransformOptions {
   const caller = {name: isServer ? 'server' : 'client'};

diff --git a/packages/docusaurus/src/commands/writeTranslations.ts b/packages/docusaurus/src/commands/writeTranslations.ts
@@ -7,7 +7,6 @@
 
 import fs from 'fs-extra';
 import path from 'path';
-import {getCustomBabelConfigFilePath, getBabelOptions} from '@docusaurus/babel';
 import {loadContext, type LoadContextParams} from '../server/site';
 import {initPlugins} from '../server/plugins/init';
 import {
@@ -103,16 +102,11 @@ Available locales are: ${context.i18n.locales.join(',')}.`,
     );
   }
 
-  const babelOptions = getBabelOptions({
-    isServer: true,
-    babelOptions: await getCustomBabelConfigFilePath(siteDir),
-  });
-  const extractedCodeTranslations = await extractSiteSourceCodeTranslations(
+  const extractedCodeTranslations = await extractSiteSourceCodeTranslations({
     siteDir,
     plugins,
-    babelOptions,
-    await getExtraSourceCodeFilePaths(),
-  );
+    extraSourceCodeFilePaths: await getExtraSourceCodeFilePaths(),
+  });
 
   const defaultCodeMessages = await loadPluginsDefaultCodeTranslationMessages(
     plugins,

diff --git a/packages/docusaurus/src/server/translations/__tests__/translationsExtractor.test.ts b/packages/docusaurus/src/server/translations/__tests__/translationsExtractor.test.ts
@@ -694,11 +694,10 @@ export default function MyComponent(props: Props) {
       plugin2,
       {name: 'dummy', options: {}, version: {type: 'synthetic'}} as const,
     ] as LoadedPlugin[];
-    const translations = await extractSiteSourceCodeTranslations(
+    const translations = await extractSiteSourceCodeTranslations({
       siteDir,
       plugins,
-      TestBabelOptions,
-    );
+    });
     expect(translations).toEqual({
       siteComponentFileId1: {
         description: 'site component 1 desc',

diff --git a/packages/docusaurus/src/server/translations/translationsExtractor.ts b/packages/docusaurus/src/server/translations/translationsExtractor.ts
@@ -17,6 +17,7 @@ import {
   type TransformOptions,
 } from '@babel/core';
 import {SRC_DIR_NAME} from '@docusaurus/utils';
+import {getBabelOptions, getCustomBabelConfigFilePath} from '@docusaurus/babel';
 import {safeGlobby} from '../utils';
 import type {
   InitializedPlugin,
@@ -82,12 +83,20 @@ async function getSourceCodeFilePaths(
   return globSourceCodeFilePaths(allPaths);
 }
 
-export async function extractSiteSourceCodeTranslations(
-  siteDir: string,
-  plugins: InitializedPlugin[],
-  babelOptions: TransformOptions,
-  extraSourceCodeFilePaths: string[] = [],
-): Promise<TranslationFileContent> {
+export async function extractSiteSourceCodeTranslations({
+  siteDir,
+  plugins,
+  extraSourceCodeFilePaths = [],
+}: {
+  siteDir: string;
+  plugins: InitializedPlugin[];
+  extraSourceCodeFilePaths?: string[];
+}): Promise<TranslationFileContent> {
+  const babelOptions = getBabelOptions({
+    isServer: true,
+    babelOptions: await getCustomBabelConfigFilePath(siteDir),
+  });
+
   // Should we warn here if the same translation "key" is found in multiple
   // source code files?
   function toTranslationFileContent(