[pull] main from facebook:main

packages/docusaurus-plugin-client-redirects/package.json

@@ -23,7 +23,7 @@
     "@docusaurus/utils": "3.10.1",
     "@docusaurus/utils-common": "3.10.1",
     "@docusaurus/utils-validation": "3.10.1",
-    "eta": "^2.2.0",
+    "eta": "^4.0.1",
     "fs-extra": "^11.2.0",
     "lodash": "^4.17.21",
     "tslib": "^2.6.0"

packages/docusaurus-plugin-client-redirects/src/createRedirectPageContent.ts

@@ -6,9 +6,11 @@
  */
 
 import _ from 'lodash';
-import * as eta from 'eta';
+import {Eta} from 'eta';
 import redirectPageTemplate from './templates/redirectPage.template.html';
 
+const eta = new Eta();
+
 const getCompiledRedirectPageTemplate = _.memoize(() =>
   eta.compile(redirectPageTemplate.trim()),
 );
@@ -18,7 +20,7 @@ function renderRedirectPageTemplate(data: {
   searchAnchorForwarding: boolean;
 }) {
   const compiled = getCompiledRedirectPageTemplate();
-  return compiled(data, eta.defaultConfig);
+  return eta.render(compiled, data);
 }
 
 // if the target url does not include ?search#anchor,

packages/docusaurus-plugin-client-redirects/src/deps.d.ts

@@ -4,13 +4,3 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-
-// TODO incompatible declaration file
-declare module 'eta' {
-  export const defaultConfig: object;
-
-  export function compile(
-    template: string,
-    options?: object,
-  ): (data: object, config: object) => string;
-}

packages/docusaurus-theme-search-algolia/package.json

@@ -46,7 +46,7 @@
     "algoliasearch": "^5.51.0",
     "algoliasearch-helper": "^3.28.2",
     "clsx": "^2.0.0",
-    "eta": "^2.2.0",
+    "eta": "^4.0.1",
     "fs-extra": "^11.2.0",
     "lodash": "^4.17.21",
     "tslib": "^2.6.0",

packages/docusaurus-theme-search-algolia/src/deps.d.ts

@@ -8,13 +8,3 @@
 declare module '@docsearch/react/modal';
 
 declare module '@docsearch/react/style';
-
-// TODO incompatible declaration file
-declare module 'eta' {
-  export const defaultConfig: object;
-
-  export function compile(
-    template: string,
-    options?: object,
-  ): (data: object, config: object) => string;
-}

packages/docusaurus-theme-search-algolia/src/opensearch.ts

@@ -8,15 +8,17 @@
 import path from 'path';
 import fs from 'fs-extra';
 import _ from 'lodash';
-import {defaultConfig, compile} from 'eta';
+import {Eta} from 'eta';
 import {normalizeUrl} from '@docusaurus/utils';
 import openSearchTemplate from './templates/opensearch';
 
 import type {HtmlTags, LoadContext} from '@docusaurus/types';
 import type {ThemeConfig} from '@docusaurus/theme-search-algolia';
 
+const eta = new Eta();
+
 const getCompiledOpenSearchTemplate = _.memoize(() =>
-  compile(openSearchTemplate.trim()),
+  eta.compile(openSearchTemplate.trim()),
 );
 
 function renderOpenSearchTemplate(data: {
@@ -26,7 +28,7 @@ function renderOpenSearchTemplate(data: {
   faviconUrl: string | null;
 }) {
   const compiled = getCompiledOpenSearchTemplate();
-  return compiled(data, defaultConfig);
+  return eta.render(compiled, data);
 }
 
 const OPEN_SEARCH_FILENAME = 'opensearch.xml';

packages/docusaurus/package.json

@@ -49,7 +49,7 @@
     "core-js": "^3.31.1",
     "detect-port": "^2.1.0",
     "escape-html": "^1.0.3",
-    "eta": "^2.2.0",
+    "eta": "^4.0.1",
     "eval": "^0.1.8",
     "execa": "^10.0.0",
     "fs-extra": "^11.2.0",

packages/docusaurus/src/deps.d.ts

@@ -37,13 +37,3 @@ declare module 'webpack/lib/HotModuleReplacementPlugin' {
 
   export default HotModuleReplacementPlugin;
 }
-
-// TODO incompatible declaration file
-declare module 'eta' {
-  export const defaultConfig: object;
-
-  export function compile(
-    template: string,
-    options?: object,
-  ): (data: object, config: object) => string;
-}

packages/docusaurus/src/ssg/ssgTemplate.ts

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import * as eta from 'eta';
+import {Eta} from 'eta';
 import {getBundles} from 'react-loadable-ssr-addon-v5-slorber';
 import {PerfLogger} from '@docusaurus/logger';
 import type {SSGParams} from './ssgParams';
@@ -35,11 +35,10 @@ export type SSGTemplateCompiled = (data: SSGTemplateData) => string;
 export async function compileSSGTemplate(
   template: string,
 ): Promise<SSGTemplateCompiled> {
-  const compiledTemplate = eta.compile(template.trim(), {
-    rmWhitespace: true,
-  });
+  const eta = new Eta({rmWhitespace: true});
+  const compiledTemplate = eta.compile(template.trim());
 
-  return (data: SSGTemplateData) => compiledTemplate(data, eta.defaultConfig);
+  return (data: SSGTemplateData) => eta.render(compiledTemplate, data);
 }
 
 /**