@docusaurus/core 0.0.0-4688 → 0.0.0-4693

package/lib/server/brokenLinks.d.ts

@@ -5,20 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 import type { RouteConfig, ReportingSeverity } from '@docusaurus/types';
-declare type BrokenLink = {
-    link: string;
-    resolvedLink: string;
-};
-export declare function getAllBrokenLinks({ allCollectedLinks, routes, }: {
-    allCollectedLinks: Record<string, string[]>;
-    routes: RouteConfig[];
-}): Record<string, BrokenLink[]>;
-export declare function getBrokenLinksErrorMessage(allBrokenLinks: Record<string, BrokenLink[]>): string | undefined;
-export declare function filterExistingFileLinks({ baseUrl, outDir, allCollectedLinks, }: {
-    baseUrl: string;
-    outDir: string;
-    allCollectedLinks: Record<string, string[]>;
-}): Promise<Record<string, string[]>>;
 export declare function handleBrokenLinks({ allCollectedLinks, onBrokenLinks, routes, baseUrl, outDir, }: {
     allCollectedLinks: Record<string, string[]>;
     onBrokenLinks: ReportingSeverity;
@@ -26,4 +12,3 @@ export declare function handleBrokenLinks({ allCollectedLinks, onBrokenLinks, ro
     baseUrl: string;
     outDir: string;
 }): Promise<void>;
-export {};

package/lib/server/brokenLinks.js

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleBrokenLinks = exports.filterExistingFileLinks = exports.getBrokenLinksErrorMessage = exports.getAllBrokenLinks = void 0;
+exports.handleBrokenLinks = void 0;
 const tslib_1 = require("tslib");
 const react_router_config_1 = require("react-router-config");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
@@ -57,7 +57,6 @@ function getAllBrokenLinks({ allCollectedLinks, routes, }) {
     // remove pages without any broken link
     return lodash_1.default.pickBy(allBrokenLinks, (brokenLinks) => brokenLinks.length > 0);
 }
-exports.getAllBrokenLinks = getAllBrokenLinks;
 function getBrokenLinksErrorMessage(allBrokenLinks) {
     if (Object.keys(allBrokenLinks).length === 0) {
         return undefined;
@@ -93,8 +92,7 @@ function getBrokenLinksErrorMessage(allBrokenLinks) {
 It looks like some of the broken links we found appear in many pages of your site.
 Maybe those broken links appear on all pages through your site layout?
 We recommend that you check your theme configuration for such links (particularly, theme navbar and footer).
-Frequent broken links are linking to:${frequentLinks}
-`;
+Frequent broken links are linking to:${frequentLinks}`;
     }
     return `Docusaurus found broken links!
 
@@ -107,7 +105,6 @@ ${Object.entries(allBrokenLinks)
         .join('\n')}
 `;
 }
-exports.getBrokenLinksErrorMessage = getBrokenLinksErrorMessage;
 async function isExistingFile(filePath) {
     try {
         return (await fs_extra_1.default.stat(filePath)).isFile();
@@ -139,7 +136,6 @@ async function filterExistingFileLinks({ baseUrl, outDir, allCollectedLinks, })
     }
     return (0, combine_promises_1.default)(lodash_1.default.mapValues(allCollectedLinks, async (links) => (await Promise.all(links.map(async (link) => ((await linkFileExists(link)) ? '' : link)))).filter(Boolean)));
 }
-exports.filterExistingFileLinks = filterExistingFileLinks;
 async function handleBrokenLinks({ allCollectedLinks, onBrokenLinks, routes, baseUrl, outDir, }) {
     if (onBrokenLinks === 'ignore') {
         return;

package/lib/server/duplicateRoutes.d.ts

@@ -5,6 +5,4 @@
  * LICENSE file in the root directory of this source tree.
  */
 import type { ReportingSeverity, RouteConfig } from '@docusaurus/types';
-export declare function getAllDuplicateRoutes(pluginsRouteConfigs: RouteConfig[]): string[];
-export declare function getDuplicateRoutesMessage(allDuplicateRoutes: string[]): string;
 export declare function handleDuplicateRoutes(pluginsRouteConfigs: RouteConfig[], onDuplicateRoutes: ReportingSeverity): void;

package/lib/server/duplicateRoutes.js

@@ -6,28 +6,26 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleDuplicateRoutes = exports.getDuplicateRoutesMessage = exports.getAllDuplicateRoutes = void 0;
+exports.handleDuplicateRoutes = void 0;
 const utils_1 = require("@docusaurus/utils");
 const utils_2 = require("./utils");
 function getAllDuplicateRoutes(pluginsRouteConfigs) {
     const allRoutes = (0, utils_2.getAllFinalRoutes)(pluginsRouteConfigs).map((routeConfig) => routeConfig.path);
-    const seenRoutes = {};
+    const seenRoutes = new Set();
     return allRoutes.filter((route) => {
-        if (Object.prototype.hasOwnProperty.call(seenRoutes, route)) {
+        if (seenRoutes.has(route)) {
             return true;
         }
-        seenRoutes[route] = true;
+        seenRoutes.add(route);
         return false;
     });
 }
-exports.getAllDuplicateRoutes = getAllDuplicateRoutes;
 function getDuplicateRoutesMessage(allDuplicateRoutes) {
     const message = allDuplicateRoutes
-        .map((duplicateRoute) => `Attempting to create page at ${duplicateRoute}, but a page already exists at this route`)
+        .map((duplicateRoute) => `- Attempting to create page at ${duplicateRoute}, but a page already exists at this route.`)
         .join('\n');
     return message;
 }
-exports.getDuplicateRoutesMessage = getDuplicateRoutesMessage;
 function handleDuplicateRoutes(pluginsRouteConfigs, onDuplicateRoutes) {
     if (onDuplicateRoutes === 'ignore') {
         return;
@@ -35,7 +33,9 @@ function handleDuplicateRoutes(pluginsRouteConfigs, onDuplicateRoutes) {
     const duplicatePaths = getAllDuplicateRoutes(pluginsRouteConfigs);
     const message = getDuplicateRoutesMessage(duplicatePaths);
     if (message) {
-        const finalMessage = `Duplicate routes found!\n${message}\nThis could lead to non-deterministic routing behavior`;
+        const finalMessage = `Duplicate routes found!
+${message}
+This could lead to non-deterministic routing behavior.`;
         (0, utils_1.reportMessage)(finalMessage, onDuplicateRoutes);
     }
 }

package/lib/server/html-tags/index.d.ts

@@ -4,6 +4,5 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import type { InjectedHtmlTags, HtmlTags, LoadedPlugin } from '@docusaurus/types';
-export declare function createHtmlTagsString(tags: HtmlTags): string;
+import type { InjectedHtmlTags, LoadedPlugin } from '@docusaurus/types';
 export declare function loadHtmlTags(plugins: LoadedPlugin[]): InjectedHtmlTags;

package/lib/server/html-tags/index.js

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadHtmlTags = exports.createHtmlTagsString = void 0;
+exports.loadHtmlTags = void 0;
 const tslib_1 = require("tslib");
 const htmlTags_1 = tslib_1.__importDefault(require("./htmlTags"));
 function toString(val) {
@@ -15,7 +15,6 @@ function toString(val) {
 function createHtmlTagsString(tags) {
     return Array.isArray(tags) ? tags.map(toString).join('\n') : toString(tags);
 }
-exports.createHtmlTagsString = createHtmlTagsString;
 function loadHtmlTags(plugins) {
     const htmlTags = plugins.reduce((acc, plugin) => {
         if (!plugin.injectHtmlTags) {

package/lib/server/i18n.js

@@ -14,9 +14,6 @@ const rtl_detect_1 = require("rtl-detect");
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 function getDefaultLocaleLabel(locale) {
     const languageName = new Intl.DisplayNames(locale, { type: 'language' }).of(locale);
-    if (!languageName) {
-        return locale;
-    }
     return (languageName.charAt(0).toLocaleUpperCase(locale) + languageName.substring(1));
 }
 function getDefaultLocaleConfig(locale) {

package/lib/server/presets/index.js

@@ -15,8 +15,8 @@ async function loadPresets(context) {
     // siteDir's package.json declares the dependency on these presets.
     const presetRequire = (0, module_1.createRequire)(context.siteConfigPath);
     const { presets } = context.siteConfig;
-    const unflatPlugins = [];
-    const unflatThemes = [];
+    const plugins = [];
+    const themes = [];
     presets.forEach((presetItem) => {
         let presetModuleImport;
         let presetOptions = {};
@@ -30,15 +30,12 @@ async function loadPresets(context) {
         const presetModule = (0, import_fresh_1.default)(presetRequire.resolve(presetName));
         const preset = (presetModule.default ?? presetModule)(context, presetOptions);
         if (preset.plugins) {
-            unflatPlugins.push(preset.plugins);
+            plugins.push(...preset.plugins.filter(Boolean));
         }
         if (preset.themes) {
-            unflatThemes.push(preset.themes);
+            themes.push(...preset.themes.filter(Boolean));
         }
     });
-    return {
-        plugins: unflatPlugins.flat().filter(Boolean),
-        themes: unflatThemes.flat().filter(Boolean),
-    };
+    return { plugins, themes };
 }
 exports.default = loadPresets;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "0.0.0-4688",
+  "version": "0.0.0-4693",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -41,13 +41,13 @@
     "@babel/runtime": "^7.17.2",
     "@babel/runtime-corejs3": "^7.17.2",
     "@babel/traverse": "^7.17.3",
-    "@docusaurus/cssnano-preset": "0.0.0-4688",
-    "@docusaurus/logger": "0.0.0-4688",
-    "@docusaurus/mdx-loader": "0.0.0-4688",
+    "@docusaurus/cssnano-preset": "0.0.0-4693",
+    "@docusaurus/logger": "0.0.0-4693",
+    "@docusaurus/mdx-loader": "0.0.0-4693",
     "@docusaurus/react-loadable": "5.5.2",
-    "@docusaurus/utils": "0.0.0-4688",
-    "@docusaurus/utils-common": "0.0.0-4688",
-    "@docusaurus/utils-validation": "0.0.0-4688",
+    "@docusaurus/utils": "0.0.0-4693",
+    "@docusaurus/utils-common": "0.0.0-4693",
+    "@docusaurus/utils-validation": "0.0.0-4693",
     "@slorber/static-site-generator-webpack-plugin": "^4.0.1",
     "@svgr/webpack": "^6.2.1",
     "autoprefixer": "^10.4.2",
@@ -106,8 +106,8 @@
     "webpackbar": "^5.0.2"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-4688",
-    "@docusaurus/types": "0.0.0-4688",
+    "@docusaurus/module-type-aliases": "0.0.0-4693",
+    "@docusaurus/types": "0.0.0-4693",
     "@types/detect-port": "^1.3.2",
     "@types/nprogress": "^0.2.0",
     "@types/react-dom": "^17.0.11",
@@ -128,5 +128,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "1b4b624e2d929f444465aec5a01ccb8518c60df6"
+  "gitHead": "f5ed3eaf62d30a211da3b0aaf76dfc6deafba859"
 }