@docusaurus/core 0.0.0-4606 → 0.0.0-4610

package/lib/client/serverEntry.js

@@ -20,10 +20,10 @@ import App from './App';
 import { createStatefulLinksCollector, ProvideLinksCollector, } from './LinksCollector';
 import logger from '@docusaurus/logger';
 // eslint-disable-next-line no-restricted-imports
-import { memoize } from 'lodash';
+import _ from 'lodash';
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const packageJson = require('../../package.json');
-const getCompiledSSRTemplate = memoize((template) => eta.compile(template.trim(), {
+const getCompiledSSRTemplate = _.memoize((template) => eta.compile(template.trim(), {
     rmWhitespace: true,
 }));
 function renderSSRTemplate(ssrTemplate, data) {

package/lib/commands/start.js

@@ -12,7 +12,7 @@ const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
 const chokidar_1 = (0, tslib_1.__importDefault)(require("chokidar"));
 const html_webpack_plugin_1 = (0, tslib_1.__importDefault)(require("html-webpack-plugin"));
 const path_1 = (0, tslib_1.__importDefault)(require("path"));
-const lodash_1 = require("lodash");
+const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
 const openBrowser_1 = (0, tslib_1.__importDefault)(require("react-dev-utils/openBrowser"));
 const WebpackDevServerUtils_1 = require("react-dev-utils/WebpackDevServerUtils");
 const evalSourceMapMiddleware_1 = (0, tslib_1.__importDefault)(require("react-dev-utils/evalSourceMapMiddleware"));
@@ -48,7 +48,7 @@ async function start(siteDir, cliOptions) {
     const openUrl = (0, utils_1.normalizeUrl)([urls.localUrlForBrowser, baseUrl]);
     logger_1.default.success `Docusaurus website is running at path=${openUrl}.`;
     // Reload files processing.
-    const reload = (0, lodash_1.debounce)(() => {
+    const reload = lodash_1.default.debounce(() => {
         loadSite()
             .then(({ baseUrl: newBaseUrl }) => {
             const newOpenUrl = (0, utils_1.normalizeUrl)([urls.localUrlForBrowser, newBaseUrl]);

package/lib/server/brokenLinks.js

@@ -10,7 +10,7 @@ exports.handleBrokenLinks = exports.filterExistingFileLinks = exports.getBrokenL
 const tslib_1 = require("tslib");
 const react_router_config_1 = require("react-router-config");
 const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
-const lodash_1 = require("lodash");
+const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
 const utils_1 = require("@docusaurus/utils");
 const utils_2 = require("./utils");
 const path_1 = (0, tslib_1.__importDefault)(require("path"));
@@ -51,9 +51,9 @@ function filterIntermediateRoutes(routesInput) {
 }
 function getAllBrokenLinks({ allCollectedLinks, routes, }) {
     const filteredRoutes = filterIntermediateRoutes(routes);
-    const allBrokenLinks = (0, lodash_1.mapValues)(allCollectedLinks, (pageLinks, pagePath) => getPageBrokenLinks({ pageLinks, pagePath, routes: filteredRoutes }));
+    const allBrokenLinks = lodash_1.default.mapValues(allCollectedLinks, (pageLinks, pagePath) => getPageBrokenLinks({ pageLinks, pagePath, routes: filteredRoutes }));
     // remove pages without any broken link
-    return (0, lodash_1.pickBy)(allBrokenLinks, (brokenLinks) => brokenLinks.length > 0);
+    return lodash_1.default.pickBy(allBrokenLinks, (brokenLinks) => brokenLinks.length > 0);
 }
 exports.getAllBrokenLinks = getAllBrokenLinks;
 function getBrokenLinksErrorMessage(allBrokenLinks) {
@@ -76,7 +76,7 @@ function getBrokenLinksErrorMessage(allBrokenLinks) {
      */
     function getLayoutBrokenLinksHelpMessage() {
         const flatList = Object.entries(allBrokenLinks).flatMap(([pagePage, brokenLinks]) => brokenLinks.map((brokenLink) => ({ pagePage, brokenLink })));
-        const countedBrokenLinks = (0, lodash_1.countBy)(flatList, (item) => item.brokenLink.link);
+        const countedBrokenLinks = lodash_1.default.countBy(flatList, (item) => item.brokenLink.link);
         const FrequencyThreshold = 5; // Is this a good value?
         const frequentLinks = Object.entries(countedBrokenLinks)
             .filter(([, count]) => count >= FrequencyThreshold)
@@ -118,7 +118,7 @@ async function filterExistingFileLinks({ baseUrl, outDir, allCollectedLinks, })
         }
         return filePathsToTry.some(isExistingFile);
     }
-    return (0, lodash_1.mapValues)(allCollectedLinks, (links) => links.filter((link) => !linkFileExists(link)));
+    return lodash_1.default.mapValues(allCollectedLinks, (links) => links.filter((link) => !linkFileExists(link)));
 }
 exports.filterExistingFileLinks = filterExistingFileLinks;
 async function handleBrokenLinks({ allCollectedLinks, onBrokenLinks, routes, baseUrl, outDir, }) {

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

@@ -7,12 +7,11 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const lodash_1 = require("lodash");
 const html_tags_1 = (0, tslib_1.__importDefault)(require("html-tags"));
 const void_1 = (0, tslib_1.__importDefault)(require("html-tags/void"));
 const escape_html_1 = (0, tslib_1.__importDefault)(require("escape-html"));
 function assertIsHtmlTagObject(val) {
-    if (!(0, lodash_1.isPlainObject)(val)) {
+    if (typeof val !== 'object' || !val) {
         throw new Error(`"${val}" is not a valid HTML tag object.`);
     }
     if (typeof val.tagName !== 'string') {

package/lib/server/index.js

@@ -22,7 +22,7 @@ const versions_1 = require("./versions");
 const duplicateRoutes_1 = require("./duplicateRoutes");
 const i18n_1 = require("./i18n");
 const translations_1 = require("./translations/translations");
-const lodash_1 = require("lodash");
+const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
 const remark_admonitions_1 = (0, tslib_1.__importDefault)(require("remark-admonitions"));
 const module_1 = require("module");
 const moduleShorthand_1 = require("./moduleShorthand");
@@ -68,7 +68,7 @@ async function loadContext(siteDir, options = {}) {
         locale: i18n.currentLocale,
     }))) !== null && _a !== void 0 ? _a : {};
     // We only need key->message for code translations
-    const codeTranslations = (0, lodash_1.mapValues)(codeTranslationFileContent, (value) => value.message);
+    const codeTranslations = lodash_1.default.mapValues(codeTranslationFileContent, (value) => value.message);
     return {
         siteDir,
         generatedFilesDir,

package/lib/server/plugins/index.js

@@ -13,7 +13,7 @@ const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
 const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const init_1 = (0, tslib_1.__importDefault)(require("./init"));
 const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
-const lodash_1 = require("lodash");
+const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
 const translations_1 = require("../translations/translations");
 const applyRouteTrailingSlash_1 = (0, tslib_1.__importDefault)(require("./applyRouteTrailingSlash"));
 function sortConfig(routeConfigs, baseUrl = '/') {
@@ -80,9 +80,9 @@ async function loadPlugins({ pluginConfigs, context, }) {
             translationFiles: localizedTranslationFiles,
         };
     }));
-    const allContent = (0, lodash_1.chain)(loadedPlugins)
+    const allContent = lodash_1.default.chain(loadedPlugins)
         .groupBy((item) => item.name)
-        .mapValues((nameItems) => (0, lodash_1.chain)(nameItems)
+        .mapValues((nameItems) => lodash_1.default.chain(nameItems)
         .groupBy((item) => { var _a; return (_a = item.options.id) !== null && _a !== void 0 ? _a : utils_1.DEFAULT_PLUGIN_ID; })
         .mapValues((idItems) => idItems[0].content)
         .value())

package/lib/server/plugins/pluginIds.js

@@ -7,14 +7,15 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureUniquePluginInstanceIds = void 0;
-const lodash_1 = require("lodash");
+const tslib_1 = require("tslib");
+const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
 const utils_1 = require("@docusaurus/utils");
 // It is forbidden to have 2 plugins of the same name sharing the same id
 // this is required to support multi-instance plugins without conflict
 function ensureUniquePluginInstanceIds(plugins) {
-    const pluginsByName = (0, lodash_1.groupBy)(plugins, (p) => p.name);
+    const pluginsByName = lodash_1.default.groupBy(plugins, (p) => p.name);
     Object.entries(pluginsByName).forEach(([pluginName, pluginInstances]) => {
-        const pluginInstancesById = (0, lodash_1.groupBy)(pluginInstances, (p) => { var _a; return (_a = p.options.id) !== null && _a !== void 0 ? _a : utils_1.DEFAULT_PLUGIN_ID; });
+        const pluginInstancesById = lodash_1.default.groupBy(pluginInstances, (p) => { var _a; return (_a = p.options.id) !== null && _a !== void 0 ? _a : utils_1.DEFAULT_PLUGIN_ID; });
         Object.entries(pluginInstancesById).forEach(([pluginId, pluginInstancesWithId]) => {
             if (pluginInstancesWithId.length !== 1) {
                 throw new Error(`Plugin "${pluginName}" is used ${pluginInstancesWithId.length} times with ID "${pluginId}".\nTo use the same plugin multiple times on a Docusaurus site, you need to assign a unique ID to each plugin instance.${pluginId === utils_1.DEFAULT_PLUGIN_ID

package/lib/server/routes.js

@@ -7,7 +7,6 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("@docusaurus/utils");
-const lodash_1 = require("lodash");
 const querystring_1 = require("querystring");
 function indent(str) {
     const spaces = '  ';
@@ -46,10 +45,15 @@ const RoutesImportsCode = [
     `import ComponentCreator from '@docusaurus/ComponentCreator';`,
 ].join('\n');
 function isModule(value) {
-    if ((0, lodash_1.isString)(value)) {
+    var _a, _b;
+    if (typeof value === 'string') {
         return true;
     }
-    if ((0, lodash_1.isPlainObject)(value) && (0, lodash_1.has)(value, '__import') && (0, lodash_1.has)(value, 'path')) {
+    if (typeof value === 'object' &&
+        (
+        // eslint-disable-next-line no-underscore-dangle
+        (_a = value) === null || _a === void 0 ? void 0 : _a.__import) &&
+        ((_b = value) === null || _b === void 0 ? void 0 : _b.path)) {
         return true;
     }
     return false;
@@ -68,8 +72,9 @@ async function loadRoutes(pluginsRouteConfigs, baseUrl) {
     // This is the higher level overview of route code generation.
     function generateRouteCode(routeConfig) {
         const { path: routePath, component, modules = {}, routes: subroutes, exact, priority, ...props } = routeConfig;
-        if (!(0, lodash_1.isString)(routePath) || !component) {
-            throw new Error(`Invalid route config: path must be a string and component is required.\n${JSON.stringify(routeConfig)}`);
+        if (typeof routePath !== 'string' || !component) {
+            throw new Error(`Invalid route config: path must be a string and component is required.
+${JSON.stringify(routeConfig)}`);
         }
         // Collect all page paths for injecting it later in the plugin lifecycle
         // This is useful for plugins like sitemaps, redirects etc...

package/lib/server/themes/alias.js

@@ -11,14 +11,14 @@ const tslib_1 = require("tslib");
 const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
 const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const utils_1 = require("@docusaurus/utils");
-const lodash_1 = require("lodash");
+const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
 // Order of Webpack aliases is important because one alias can shadow another
 // This ensure @theme/NavbarItem alias is after @theme/NavbarItem/LocaleDropdown
 // See https://github.com/facebook/docusaurus/pull/3922
 // See https://github.com/facebook/docusaurus/issues/5382
 function sortAliases(aliases) {
     // Alphabetical order by default
-    const entries = (0, lodash_1.sortBy)(Object.entries(aliases), ([alias]) => alias);
+    const entries = lodash_1.default.sortBy(Object.entries(aliases), ([alias]) => alias);
     // @theme/NavbarItem should be after @theme/NavbarItem/LocaleDropdown
     entries.sort(([alias1], [alias2]) => alias1.includes(`${alias2}/`) ? -1 : 0);
     return Object.fromEntries(entries);

package/lib/server/translations/translations.js

@@ -10,7 +10,7 @@ exports.applyDefaultCodeTranslations = exports.getPluginsDefaultCodeTranslationM
 const tslib_1 = require("tslib");
 const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
-const lodash_1 = require("lodash");
+const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
 const utils_1 = require("@docusaurus/utils");
 const utils_validation_1 = require("@docusaurus/utils-validation");
 const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
@@ -44,7 +44,7 @@ async function readTranslationFileContent(filePath) {
 exports.readTranslationFileContent = readTranslationFileContent;
 function mergeTranslationFileContent({ existingContent = {}, newContent, options, }) {
     // Apply messagePrefix to all messages
-    const newContentTransformed = (0, lodash_1.mapValues)(newContent, (value) => {
+    const newContentTransformed = lodash_1.default.mapValues(newContent, (value) => {
         var _a;
         return ({
             ...value,
@@ -68,7 +68,7 @@ function mergeTranslationFileContent({ existingContent = {}, newContent, options
 async function writeTranslationFileContent({ filePath, content: newContent, options = {}, }) {
     const existingContent = await readTranslationFileContent(filePath);
     // Warn about potential legacy keys
-    const unknownKeys = (0, lodash_1.difference)(Object.keys(existingContent !== null && existingContent !== void 0 ? existingContent : {}), Object.keys(newContent));
+    const unknownKeys = lodash_1.default.difference(Object.keys(existingContent !== null && existingContent !== void 0 ? existingContent : {}), Object.keys(newContent));
     if (unknownKeys.length > 0) {
         logger_1.default.warn `Some translation keys looks unknown to us in file path=${filePath}.
 Maybe you should remove them? ${unknownKeys}`;
@@ -171,12 +171,12 @@ async function getPluginsDefaultCodeTranslationMessages(plugins) {
 }
 exports.getPluginsDefaultCodeTranslationMessages = getPluginsDefaultCodeTranslationMessages;
 function applyDefaultCodeTranslations({ extractedCodeTranslations, defaultCodeMessages, }) {
-    const unusedDefaultCodeMessages = (0, lodash_1.difference)(Object.keys(defaultCodeMessages), Object.keys(extractedCodeTranslations));
+    const unusedDefaultCodeMessages = lodash_1.default.difference(Object.keys(defaultCodeMessages), Object.keys(extractedCodeTranslations));
     if (unusedDefaultCodeMessages.length > 0) {
         logger_1.default.warn `Unused default message codes found.
 Please report this Docusaurus issue. name=${unusedDefaultCodeMessages}`;
     }
-    return (0, lodash_1.mapValues)(extractedCodeTranslations, (messageTranslation, messageId) => {
+    return lodash_1.default.mapValues(extractedCodeTranslations, (messageTranslation, messageId) => {
         var _a;
         return ({
             ...messageTranslation,

package/lib/webpack/utils.js

@@ -18,7 +18,7 @@ const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const crypto_1 = (0, tslib_1.__importDefault)(require("crypto"));
 const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
 const utils_1 = require("@docusaurus/utils");
-const lodash_1 = require("lodash");
+const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
 // Utility method to get style loaders
 function getStyleLoaders(isServer, cssOptionsArg = {}) {
     const cssOptions = {
@@ -116,7 +116,7 @@ const getCustomizableJSLoader = (jsLoader = 'babel') => ({ isServer, babelOption
     : jsLoader(isServer);
 exports.getCustomizableJSLoader = getCustomizableJSLoader;
 // TODO remove this before end of 2021?
-const warnBabelLoaderOnce = (0, lodash_1.memoize)(() => {
+const warnBabelLoaderOnce = lodash_1.default.memoize(() => {
     logger_1.default.warn `Docusaurus plans to support multiple JS loader strategies (Babel, esbuild...): code=${'getBabelLoader(isServer)'} is now deprecated in favor of code=${'getJSLoader(isServer)'}.`;
 });
 const getBabelLoaderDeprecated = function getBabelLoaderDeprecated(isServer, babelOptions) {
@@ -124,7 +124,7 @@ const getBabelLoaderDeprecated = function getBabelLoaderDeprecated(isServer, bab
     return getDefaultBabelLoader({ isServer, babelOptions });
 };
 // TODO remove this before end of 2021 ?
-const warnCacheLoaderOnce = (0, lodash_1.memoize)(() => {
+const warnCacheLoaderOnce = lodash_1.default.memoize(() => {
     logger_1.default.warn `Docusaurus uses Webpack 5 and code=${'getCacheLoader()'} usage is now deprecated.`;
 });
 function getCacheLoaderDeprecated() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "0.0.0-4606",
+  "version": "0.0.0-4610",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -31,8 +31,8 @@
     "url": "https://github.com/facebook/docusaurus/issues"
   },
   "dependencies": {
-    "@babel/core": "^7.17.2",
-    "@babel/generator": "^7.17.0",
+    "@babel/core": "^7.17.5",
+    "@babel/generator": "^7.17.3",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/plugin-transform-runtime": "^7.17.0",
     "@babel/preset-env": "^7.16.11",
@@ -40,25 +40,25 @@
     "@babel/preset-typescript": "^7.16.7",
     "@babel/runtime": "^7.17.2",
     "@babel/runtime-corejs3": "^7.17.2",
-    "@babel/traverse": "^7.17.0",
-    "@docusaurus/cssnano-preset": "0.0.0-4606",
-    "@docusaurus/logger": "0.0.0-4606",
-    "@docusaurus/mdx-loader": "0.0.0-4606",
+    "@babel/traverse": "^7.17.3",
+    "@docusaurus/cssnano-preset": "0.0.0-4610",
+    "@docusaurus/logger": "0.0.0-4610",
+    "@docusaurus/mdx-loader": "0.0.0-4610",
     "@docusaurus/react-loadable": "5.5.2",
-    "@docusaurus/utils": "0.0.0-4606",
-    "@docusaurus/utils-common": "0.0.0-4606",
-    "@docusaurus/utils-validation": "0.0.0-4606",
+    "@docusaurus/utils": "0.0.0-4610",
+    "@docusaurus/utils-common": "0.0.0-4610",
+    "@docusaurus/utils-validation": "0.0.0-4610",
     "@slorber/static-site-generator-webpack-plugin": "^4.0.1",
     "@svgr/webpack": "^6.2.1",
     "autoprefixer": "^10.4.2",
     "babel-loader": "^8.2.3",
     "babel-plugin-dynamic-import-node": "2.3.0",
-    "boxen": "^5.0.1",
+    "boxen": "^5.1.2",
     "chokidar": "^3.5.3",
     "clean-css": "^5.2.4",
     "commander": "^5.1.0",
     "copy-webpack-plugin": "^10.2.4",
-    "core-js": "^3.21.0",
+    "core-js": "^3.21.1",
     "css-loader": "^6.6.0",
     "css-minimizer-webpack-plugin": "^3.4.1",
     "cssnano": "^5.0.17",
@@ -81,7 +81,7 @@
     "postcss-loader": "^6.2.1",
     "prompts": "^2.4.2",
     "react-dev-utils": "^12.0.0",
-    "react-helmet-async": "^1.2.2",
+    "react-helmet-async": "^1.2.3",
     "react-loadable": "npm:@docusaurus/react-loadable@5.5.2",
     "react-loadable-ssr-addon-v5-slorber": "^1.0.1",
     "react-router": "^5.2.0",
@@ -97,15 +97,15 @@
     "update-notifier": "^5.1.0",
     "url-loader": "^4.1.1",
     "wait-on": "^6.0.1",
-    "webpack": "^5.68.0",
+    "webpack": "^5.69.1",
     "webpack-bundle-analyzer": "^4.5.0",
     "webpack-dev-server": "^4.7.4",
     "webpack-merge": "^5.8.0",
     "webpackbar": "^5.0.2"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-4606",
-    "@docusaurus/types": "0.0.0-4606",
+    "@docusaurus/module-type-aliases": "0.0.0-4610",
+    "@docusaurus/types": "0.0.0-4610",
     "@types/detect-port": "^1.3.2",
     "@types/nprogress": "^0.2.0",
     "@types/react-dom": "^17.0.11",
@@ -125,5 +125,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "b3b0a96db25fe575c5030ff5398cb11c10c871e3"
+  "gitHead": "3208d225c0366f7a46f6f9ecf622cf2e1f9a3018"
 }