Merge branch 'facebook:main' into main

Author: treoden

packages/docusaurus-migrate/package.json

@@ -32,7 +32,6 @@
     "fs-extra": "^10.1.0",
     "hast-util-to-string": "^1.0.4",
     "html-tags": "^3.2.0",
-    "import-fresh": "^3.3.0",
     "jscodeshift": "^0.13.1",
     "rehype-parse": "^7.0.1",
     "remark-parse": "^8.0.2",

packages/docusaurus-migrate/src/index.ts

@@ -9,7 +9,6 @@ import path from 'path';
 import fs from 'fs-extra';
 import logger from '@docusaurus/logger';
 import {Globby, DOCUSAURUS_VERSION} from '@docusaurus/utils';
-import importFresh from 'import-fresh';
 import Color from 'color';
 
 import extractMetadata, {shouldQuotifyFrontMatter} from './frontMatter';
@@ -79,7 +78,7 @@ export async function migrateDocusaurusProject(
   shouldMigratePages: boolean = false,
 ): Promise<void> {
   async function createMigrationContext(): Promise<MigrationContext> {
-    const v1Config = (await import(`${siteDir}/siteConfig`))
+    const v1Config = (await import(`${siteDir}/siteConfig.js`))
       .default as VersionOneConfig;
     logger.info('Starting migration from v1 to v2...');
     const deps = {
@@ -709,12 +708,13 @@ async function migrateLatestDocs(context: MigrationContext) {
 
 async function migratePackageFile(context: MigrationContext): Promise<void> {
   const {deps, siteDir, newDir} = context;
-  const packageFile = importFresh<{
+  // eslint-disable-next-line global-require, import/no-dynamic-require
+  const packageFile = (await require(`${siteDir}/package.json`)) as {
     scripts?: {[key: string]: string};
     dependencies?: {[key: string]: string};
     devDependencies?: {[key: string]: string};
     [otherKey: string]: unknown;
-  }>(`${siteDir}/package.json`);
+  };
   packageFile.scripts = {
     ...packageFile.scripts,
     start: 'docusaurus start',

packages/docusaurus-theme-translations/locales/ko/theme-search-algolia.json

@@ -1,35 +1,35 @@
 {
   "theme.SearchBar.label": "검색",
   "theme.SearchBar.seeAll": "{count}개의 결과 확인하기",
-  "theme.SearchModal.errorScreen.helpText": "You might want to check your network connection.",
-  "theme.SearchModal.errorScreen.titleText": "Unable to fetch results",
-  "theme.SearchModal.footer.closeKeyAriaLabel": "Escape key",
-  "theme.SearchModal.footer.closeText": "to close",
-  "theme.SearchModal.footer.navigateDownKeyAriaLabel": "Arrow down",
-  "theme.SearchModal.footer.navigateText": "to navigate",
-  "theme.SearchModal.footer.navigateUpKeyAriaLabel": "Arrow up",
-  "theme.SearchModal.footer.searchByText": "Search by",
-  "theme.SearchModal.footer.selectKeyAriaLabel": "Enter key",
-  "theme.SearchModal.footer.selectText": "to select",
-  "theme.SearchModal.noResultsScreen.noResultsText": "No results for",
-  "theme.SearchModal.noResultsScreen.reportMissingResultsLinkText": "Let us know.",
-  "theme.SearchModal.noResultsScreen.reportMissingResultsText": "Believe this query should return results?",
-  "theme.SearchModal.noResultsScreen.suggestedQueryText": "Try searching for",
-  "theme.SearchModal.placeholder": "Search docs",
-  "theme.SearchModal.searchBox.cancelButtonText": "Cancel",
-  "theme.SearchModal.searchBox.resetButtonTitle": "Clear the query",
-  "theme.SearchModal.startScreen.favoriteSearchesTitle": "Favorite",
-  "theme.SearchModal.startScreen.noRecentSearchesText": "No recent searches",
-  "theme.SearchModal.startScreen.recentSearchesTitle": "Recent",
-  "theme.SearchModal.startScreen.removeFavoriteSearchButtonTitle": "Remove this search from favorites",
-  "theme.SearchModal.startScreen.removeRecentSearchButtonTitle": "Remove this search from history",
-  "theme.SearchModal.startScreen.saveRecentSearchButtonTitle": "Save this search",
+  "theme.SearchModal.errorScreen.helpText": "인터넷 연결을 다시 확인하시기 바랍니다.",
+  "theme.SearchModal.errorScreen.titleText": "결과를 불러올 수 없음",
+  "theme.SearchModal.footer.closeKeyAriaLabel": "Esc 키",
+  "theme.SearchModal.footer.closeText": "로 종료",
+  "theme.SearchModal.footer.navigateDownKeyAriaLabel": "화살표 아래 키",
+  "theme.SearchModal.footer.navigateText": "로 이동",
+  "theme.SearchModal.footer.navigateUpKeyAriaLabel": "화살표 위 키",
+  "theme.SearchModal.footer.searchByText": "검색 제공",
+  "theme.SearchModal.footer.selectKeyAriaLabel": "엔터 키",
+  "theme.SearchModal.footer.selectText": "로 선택",
+  "theme.SearchModal.noResultsScreen.noResultsText": "검색 결과 없음",
+  "theme.SearchModal.noResultsScreen.reportMissingResultsLinkText": "알려주시기 바랍니다.",
+  "theme.SearchModal.noResultsScreen.reportMissingResultsText": "검색 결과가 없는 것이 오류라고 생각되십니까?",
+  "theme.SearchModal.noResultsScreen.suggestedQueryText": "다른 추천 검색어",
+  "theme.SearchModal.placeholder": "문서 검색",
+  "theme.SearchModal.searchBox.cancelButtonText": "취소",
+  "theme.SearchModal.searchBox.resetButtonTitle": "검색어 초기화",
+  "theme.SearchModal.startScreen.favoriteSearchesTitle": "즐겨찾기",
+  "theme.SearchModal.startScreen.noRecentSearchesText": "최근 검색어 없음",
+  "theme.SearchModal.startScreen.recentSearchesTitle": "최근",
+  "theme.SearchModal.startScreen.removeFavoriteSearchButtonTitle": "이 검색어를 즐겨찾기에서 삭제",
+  "theme.SearchModal.startScreen.removeRecentSearchButtonTitle": "이 검색어를 최근 검색어에서 삭제",
+  "theme.SearchModal.startScreen.saveRecentSearchButtonTitle": "이 검색어를 저장",
   "theme.SearchPage.algoliaLabel": "Algolia로 검색",
-  "theme.SearchPage.documentsFound.plurals": "{count}개 문서를 찾았습니다.",
+  "theme.SearchPage.documentsFound.plurals": "{count}개의 문서를 찾았습니다.",
   "theme.SearchPage.emptyResultsTitle": "문서를 검색합니다.",
-  "theme.SearchPage.existingResultsTitle": "\"{query}\"개 검색 결과가 있습니다.",
-  "theme.SearchPage.fetchingNewResults": "새로운 검색 결과를 불러오는 중 입니다...",
+  "theme.SearchPage.existingResultsTitle": "\"{query}\" 검색 결과",
+  "theme.SearchPage.fetchingNewResults": "새로운 검색 결과를 불러오는 중입니다.",
   "theme.SearchPage.inputLabel": "검색",
-  "theme.SearchPage.inputPlaceholder": "여기에 검색할 키워드를 입력하세요.",
+  "theme.SearchPage.inputPlaceholder": "검색어를 입력하세요.",
   "theme.SearchPage.noResultsText": "검색 결과가 없습니다."
 }

packages/docusaurus/src/commands/deploy.ts

@@ -183,9 +183,6 @@ You can also set the deploymentBranch property in docusaurus.config.js .`);
   // Save the commit hash that triggers publish-gh-pages before checking
   // out to deployment branch.
   const currentCommit = shellExecLog('git rev-parse HEAD').stdout.trim();
-  const currentGitRootDir = shellExecLog(
-    'git rev-parse --show-toplevel',
-  ).stdout.trim();
 
   const runDeploy = async (outputDirectory: string) => {
     const fromPath = outputDirectory;
@@ -216,16 +213,6 @@ You can also set the deploymentBranch property in docusaurus.config.js .`);
       logger.error`Copying build assets from path=${fromPath} to path=${toPath} failed.`;
       throw err;
     }
-
-    const gitConfigFromPath = path.join(currentGitRootDir, `.git`, `config`);
-    const gitConfigToPath = path.join(toPath, `.git`, `config`);
-    try {
-      await fs.copy(gitConfigFromPath, gitConfigToPath);
-    } catch (err) {
-      logger.error`Copying git config from path=${gitConfigFromPath} to path=${gitConfigToPath} failed.`;
-      throw err;
-    }
-
     shellExecLog('git add --all');
 
     const commitMessage =