@docusaurus/core 0.0.0-4255 → 0.0.0-4261

package/lib/commands/swizzle.js

@@ -8,13 +8,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPluginNames = void 0;
 const tslib_1 = require("tslib");
-const chalk = require("chalk");
+const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
 const import_fresh_1 = (0, tslib_1.__importDefault)(require("import-fresh"));
 const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const leven_1 = (0, tslib_1.__importDefault)(require("leven"));
 const lodash_1 = require("lodash");
-const constants_1 = require("../constants");
+const utils_1 = require("@docusaurus/utils");
 const server_1 = require("../server");
 const init_1 = (0, tslib_1.__importDefault)(require("../server/plugins/init"));
 const utils_validation_1 = require("@docusaurus/utils-validation");
@@ -82,13 +82,13 @@ function getComponentName(themePath, plugin, danger) {
 function themeComponents(themePath, plugin) {
     const components = colorCode(themePath, plugin);
     if (components.length === 0) {
-        return `${chalk.red('No component to swizzle.')}`;
+        return `${chalk_1.default.red('No component to swizzle.')}`;
     }
     return `
-${chalk.cyan('Theme components available for swizzle.')}
+${chalk_1.default.cyan('Theme components available for swizzle.')}
 
-${chalk.green('green  =>')} safe: lower breaking change risk
-${chalk.red('red    =>')} unsafe: higher breaking change risk
+${chalk_1.default.green('green  =>')} safe: lower breaking change risk
+${chalk_1.default.red('red    =>')} unsafe: higher breaking change risk
 
 ${components.join('\n')}
 `;
@@ -106,8 +106,8 @@ function colorCode(themePath, plugin) {
         : [];
     const [greenComponents, redComponents] = (0, lodash_1.partition)(components, (comp) => allowedComponent.includes(comp));
     return [
-        ...greenComponents.map((component) => chalk.green(`safe: ${component}`)),
-        ...redComponents.map((component) => chalk.red(`unsafe: ${component}`)),
+        ...greenComponents.map((component) => chalk_1.default.green(`safe: ${component}`)),
+        ...redComponents.map((component) => chalk_1.default.red(`unsafe: ${component}`)),
     ];
 }
 async function swizzle(siteDir, themeName, componentName, typescript, danger) {
@@ -137,7 +137,7 @@ async function swizzle(siteDir, themeName, componentName, typescript, danger) {
                 suggestion = name;
             }
         });
-        chalk.red(`Theme ${themeName} not found. ${suggestion
+        chalk_1.default.red(`Theme ${themeName} not found. ${suggestion
             ? `Did you mean "${suggestion}" ?`
             : formattedThemeNames(themeNames)}`);
         process.exit(1);
@@ -171,7 +171,7 @@ async function swizzle(siteDir, themeName, componentName, typescript, danger) {
         ? (_d = pluginInstance.getTypeScriptThemePath) === null || _d === void 0 ? void 0 : _d.call(pluginInstance)
         : (_e = pluginInstance.getThemePath) === null || _e === void 0 ? void 0 : _e.call(pluginInstance);
     if (!themePath) {
-        console.warn(chalk.yellow(typescript
+        console.warn(chalk_1.default.yellow(typescript
             ? `${themeName} does not provide TypeScript theme code via "getTypeScriptThemePath()".`
             : `${themeName} does not provide any theme code.`));
         process.exit(1);
@@ -199,11 +199,11 @@ async function swizzle(siteDir, themeName, componentName, typescript, danger) {
         });
         if (mostSuitableMatch !== componentName) {
             mostSuitableComponent = mostSuitableMatch;
-            console.log(chalk.red(`Component "${componentName}" doesn't exist.`), chalk.yellow(`"${mostSuitableComponent}" is swizzled instead of "${componentName}".`));
+            console.log(chalk_1.default.red(`Component "${componentName}" doesn't exist.`), chalk_1.default.yellow(`"${mostSuitableComponent}" is swizzled instead of "${componentName}".`));
         }
     }
     let fromPath = path_1.default.join(themePath, mostSuitableComponent);
-    let toPath = path_1.default.resolve(siteDir, constants_1.THEME_PATH, mostSuitableComponent);
+    let toPath = path_1.default.resolve(siteDir, utils_1.THEME_PATH, mostSuitableComponent);
     // Handle single TypeScript/JavaScript file only.
     // E.g: if <fromPath> does not exist, we try to swizzle <fromPath>.(ts|tsx|js) instead
     if (!fs_extra_1.default.existsSync(fromPath)) {
@@ -223,7 +223,7 @@ async function swizzle(siteDir, themeName, componentName, typescript, danger) {
                     suggestion = name;
                 }
             });
-            console.warn(chalk.red(`Component ${mostSuitableComponent} not found.`));
+            console.warn(chalk_1.default.red(`Component ${mostSuitableComponent} not found.`));
             console.warn(suggestion
                 ? `Did you mean "${suggestion}"?`
                 : `${themeComponents(themePath, pluginModule)}`);
@@ -231,15 +231,15 @@ async function swizzle(siteDir, themeName, componentName, typescript, danger) {
         }
     }
     if (!components.includes(mostSuitableComponent) && !danger) {
-        console.warn(chalk.red(`${mostSuitableComponent} is an internal component and has a higher breaking change probability. If you want to swizzle it, use the "--danger" flag.`));
+        console.warn(chalk_1.default.red(`${mostSuitableComponent} is an internal component and has a higher breaking change probability. If you want to swizzle it, use the "--danger" flag.`));
         process.exit(1);
     }
     await fs_extra_1.default.copy(fromPath, toPath);
     const relativeDir = path_1.default.relative(process.cwd(), toPath);
-    const fromMsg = chalk.blue(mostSuitableComponent
-        ? `${themeName} ${chalk.yellow(mostSuitableComponent)}`
+    const fromMsg = chalk_1.default.blue(mostSuitableComponent
+        ? `${themeName} ${chalk_1.default.yellow(mostSuitableComponent)}`
         : themeName);
-    const toMsg = chalk.cyan(relativeDir);
-    console.log(`\n${chalk.green('Success!')} Copied ${fromMsg} to ${toMsg}.\n`);
+    const toMsg = chalk_1.default.cyan(relativeDir);
+    console.log(`\n${chalk_1.default.green('Success!')} Copied ${fromMsg} to ${toMsg}.\n`);
 }
 exports.default = swizzle;

package/lib/server/configValidation.js

@@ -7,7 +7,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateConfig = exports.ConfigSchema = exports.DEFAULT_CONFIG = exports.DEFAULT_I18N_CONFIG = void 0;
-const constants_1 = require("../constants");
+const utils_1 = require("@docusaurus/utils");
 const utils_validation_1 = require("@docusaurus/utils-validation");
 const DEFAULT_I18N_LOCALE = 'en';
 exports.DEFAULT_I18N_CONFIG = {
@@ -28,7 +28,7 @@ exports.DEFAULT_CONFIG = {
     titleDelimiter: '|',
     noIndex: false,
     baseUrlIssueBanner: true,
-    staticDirectories: [constants_1.STATIC_DIR_NAME],
+    staticDirectories: [utils_1.STATIC_DIR_NAME],
 };
 const PluginSchema = utils_validation_1.Joi.alternatives()
     .try(utils_validation_1.Joi.function(), utils_validation_1.Joi.array().ordered(utils_validation_1.Joi.function().required(), utils_validation_1.Joi.object().required()), utils_validation_1.Joi.string(), utils_validation_1.Joi.array()
@@ -160,7 +160,7 @@ function validateConfig(config) {
             ? `${accumulatedErr}${err.message}\n`
             : accumulatedErr, '');
         formattedError = unknownFields
-            ? `${formattedError}These field(s) (${unknownFields}) are not recognized in ${constants_1.DEFAULT_CONFIG_FILE_NAME}.\nIf you still want these fields to be in your configuration, put them in the "customFields" field.\nSee https://docusaurus.io/docs/docusaurus.config.js/#customfields`
+            ? `${formattedError}These field(s) (${unknownFields}) are not recognized in ${utils_1.DEFAULT_CONFIG_FILE_NAME}.\nIf you still want these fields to be in your configuration, put them in the "customFields" field.\nSee https://docusaurus.io/docs/docusaurus.config.js/#customfields`
             : formattedError;
         throw new Error(formattedError);
     }

package/lib/server/i18n.js

@@ -5,13 +5,14 @@ const tslib_1 = require("tslib");
 const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const utils_1 = require("@docusaurus/utils");
 const rtl_detect_1 = require("rtl-detect");
-const constants_1 = require("../constants");
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 function getDefaultLocaleLabel(locale) {
     // Intl.DisplayNames is ES2021 - Node14+
     // https://v8.dev/features/intl-displaynames
     if (typeof Intl.DisplayNames !== 'undefined') {
-        return new Intl.DisplayNames([locale], { type: 'language' }).of(locale);
+        const languageName = new Intl.DisplayNames(locale, { type: 'language' }).of(locale);
+        return (languageName.charAt(0).toLocaleUpperCase(locale) +
+            languageName.substring(1));
     }
     return locale;
 }
@@ -39,8 +40,8 @@ Note: Docusaurus only support running one locale at a time.`));
     const locales = i18nConfig.locales.includes(currentLocale)
         ? i18nConfig.locales
         : i18nConfig.locales.concat(currentLocale);
-    if (shouldWarnAboutNodeVersion(constants_1.NODE_MAJOR_VERSION, locales)) {
-        console.warn(chalk_1.default.yellow(`To use Docusaurus i18n, it is strongly advised to use Node.js 14 or later (instead of ${constants_1.NODE_MAJOR_VERSION}).`));
+    if (shouldWarnAboutNodeVersion(utils_1.NODE_MAJOR_VERSION, locales)) {
+        console.warn(chalk_1.default.yellow(`To use Docusaurus i18n, it is strongly advised to use Node.js 14 or later (instead of ${utils_1.NODE_MAJOR_VERSION}).`));
     }
     function getLocaleConfig(locale) {
         return {

package/lib/server/index.js

@@ -12,7 +12,6 @@ const utils_1 = require("@docusaurus/utils");
 const path_1 = (0, tslib_1.__importStar)(require("path"));
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 const ssr_html_template_1 = (0, tslib_1.__importDefault)(require("../client/templates/ssr.html.template"));
-const constants_1 = require("../constants");
 const client_modules_1 = (0, tslib_1.__importDefault)(require("./client-modules"));
 const config_1 = (0, tslib_1.__importDefault)(require("./config"));
 const plugins_1 = require("./plugins");
@@ -28,7 +27,7 @@ const remark_admonitions_1 = (0, tslib_1.__importDefault)(require("remark-admoni
 const module_1 = require("module");
 const moduleShorthand_1 = require("./moduleShorthand");
 async function loadSiteConfig({ siteDir, customConfigFilePath, }) {
-    const siteConfigPathUnresolved = customConfigFilePath !== null && customConfigFilePath !== void 0 ? customConfigFilePath : constants_1.DEFAULT_CONFIG_FILE_NAME;
+    const siteConfigPathUnresolved = customConfigFilePath !== null && customConfigFilePath !== void 0 ? customConfigFilePath : utils_1.DEFAULT_CONFIG_FILE_NAME;
     const siteConfigPath = path_1.default.isAbsolute(siteConfigPathUnresolved)
         ? siteConfigPathUnresolved
         : path_1.default.resolve(siteDir, siteConfigPathUnresolved);
@@ -39,9 +38,9 @@ exports.loadSiteConfig = loadSiteConfig;
 async function loadContext(siteDir, options = {}) {
     var _a;
     const { customOutDir, locale, customConfigFilePath } = options;
-    const generatedFilesDir = path_1.default.isAbsolute(constants_1.GENERATED_FILES_DIR_NAME)
-        ? constants_1.GENERATED_FILES_DIR_NAME
-        : path_1.default.resolve(siteDir, constants_1.GENERATED_FILES_DIR_NAME);
+    const generatedFilesDir = path_1.default.isAbsolute(utils_1.GENERATED_FILES_DIR_NAME)
+        ? utils_1.GENERATED_FILES_DIR_NAME
+        : path_1.default.resolve(siteDir, utils_1.GENERATED_FILES_DIR_NAME);
     const { siteConfig: initialSiteConfig, siteConfigPath } = await loadSiteConfig({
         siteDir,
         customConfigFilePath,
@@ -49,7 +48,7 @@ async function loadContext(siteDir, options = {}) {
     const { ssrTemplate } = initialSiteConfig;
     const baseOutDir = customOutDir
         ? path_1.default.resolve(customOutDir)
-        : path_1.default.resolve(siteDir, constants_1.DEFAULT_BUILD_DIR_NAME);
+        : path_1.default.resolve(siteDir, utils_1.DEFAULT_BUILD_DIR_NAME);
     const i18n = await (0, i18n_1.loadI18n)(initialSiteConfig, { locale });
     const baseUrl = (0, i18n_1.localizePath)({
         path: initialSiteConfig.baseUrl,
@@ -211,7 +210,7 @@ async function load(siteDir, options = {}) {
     (0, duplicateRoutes_1.handleDuplicateRoutes)(pluginsRouteConfigs, siteConfig.onDuplicateRoutes);
     // Site config must be generated after plugins
     // We want the generated config to have been normalized by the plugins!
-    const genSiteConfig = (0, utils_1.generate)(generatedFilesDir, constants_1.DEFAULT_CONFIG_FILE_NAME, `export default ${JSON.stringify(siteConfig, null, 2)};`);
+    const genSiteConfig = (0, utils_1.generate)(generatedFilesDir, utils_1.DEFAULT_CONFIG_FILE_NAME, `export default ${JSON.stringify(siteConfig, null, 2)};`);
     plugins.push(createBootstrapPlugin({ siteConfig }));
     plugins.push(createMDXFallbackPlugin({ siteDir, siteConfig }));
     // Load client modules.

package/lib/server/plugins/index.js

@@ -13,7 +13,6 @@ 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 chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
-const constants_1 = require("../../constants");
 const lodash_1 = require("lodash");
 const translations_1 = require("../translations/translations");
 const applyRouteTrailingSlash_1 = (0, tslib_1.__importDefault)(require("./applyRouteTrailingSlash"));
@@ -84,7 +83,7 @@ async function loadPlugins({ pluginConfigs, context, }) {
     const allContent = (0, lodash_1.chain)(loadedPlugins)
         .groupBy((item) => item.name)
         .mapValues((nameItems) => (0, lodash_1.chain)(nameItems)
-        .groupBy((item) => { var _a; return (_a = item.options.id) !== null && _a !== void 0 ? _a : constants_1.DEFAULT_PLUGIN_ID; })
+        .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())
         .value();
@@ -96,7 +95,7 @@ async function loadPlugins({ pluginConfigs, context, }) {
         if (!plugin.contentLoaded) {
             return;
         }
-        const pluginId = (_a = plugin.options.id) !== null && _a !== void 0 ? _a : constants_1.DEFAULT_PLUGIN_ID;
+        const pluginId = (_a = plugin.options.id) !== null && _a !== void 0 ? _a : utils_1.DEFAULT_PLUGIN_ID;
         // plugins data files are namespaced by pluginName/pluginId
         const dataDirRoot = path_1.default.join(context.generatedFilesDir, plugin.name);
         const dataDir = path_1.default.join(dataDirRoot, pluginId);

package/lib/server/plugins/init.js

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const module_1 = require("module");
 const import_fresh_1 = (0, tslib_1.__importDefault)(require("import-fresh"));
-const constants_1 = require("../../constants");
+const utils_1 = require("@docusaurus/utils");
 const versions_1 = require("../versions");
 const pluginIds_1 = require("./pluginIds");
 const utils_validation_1 = require("@docusaurus/utils-validation");
@@ -126,7 +126,7 @@ function initPlugins({ pluginConfigs, context, }) {
             // as we don't go through the Joi schema that adds it
             return {
                 ...normalizedPluginConfig.options,
-                id: (_a = normalizedPluginConfig.options.id) !== null && _a !== void 0 ? _a : constants_1.DEFAULT_PLUGIN_ID,
+                id: (_a = normalizedPluginConfig.options.id) !== null && _a !== void 0 ? _a : utils_1.DEFAULT_PLUGIN_ID,
             };
         }
     }

package/lib/server/plugins/pluginIds.js

@@ -8,17 +8,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureUniquePluginInstanceIds = void 0;
 const lodash_1 = require("lodash");
-const constants_1 = require("../../constants");
+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);
     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 : constants_1.DEFAULT_PLUGIN_ID; });
+        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; });
         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 === constants_1.DEFAULT_PLUGIN_ID
-                    ? `\n\nThe plugin ID is "${constants_1.DEFAULT_PLUGIN_ID}" by default. It's possible that the preset you are using already includes a plugin instance, in which case you either want to disable the plugin in the preset (to use a single instance), or assign another ID to your extra plugin instance (to use multiple instances).`
+                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
+                    ? `\n\nThe plugin ID is "${utils_1.DEFAULT_PLUGIN_ID}" by default. It's possible that the preset you are using already includes a plugin instance, in which case you either want to disable the plugin in the preset (to use a single instance), or assign another ID to your extra plugin instance (to use multiple instances).`
                     : ''}`);
             }
         });

package/lib/server/themes/index.js

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadPluginsThemeAliases = exports.loadThemeAliases = void 0;
 const tslib_1 = require("tslib");
 const path_1 = (0, tslib_1.__importDefault)(require("path"));
-const constants_1 = require("../../constants");
+const utils_1 = require("@docusaurus/utils");
 const alias_1 = (0, tslib_1.__importStar)(require("./alias"));
 const ThemeFallbackDir = path_1.default.resolve(__dirname, '../../client/theme-fallback');
 function loadThemeAliases(themePaths, userThemePaths) {
@@ -40,7 +40,7 @@ function loadPluginsThemeAliases({ siteDir, plugins, }) {
     const pluginThemes = plugins
         .map((plugin) => (plugin.getThemePath ? plugin.getThemePath() : undefined))
         .filter((x) => Boolean(x));
-    const userTheme = path_1.default.resolve(siteDir, constants_1.THEME_PATH);
+    const userTheme = path_1.default.resolve(siteDir, utils_1.THEME_PATH);
     return loadThemeAliases([ThemeFallbackDir, ...pluginThemes], [userTheme]);
 }
 exports.loadPluginsThemeAliases = loadPluginsThemeAliases;

package/lib/server/translations/translationsExtractor.js

@@ -14,8 +14,8 @@ const generator_1 = (0, tslib_1.__importDefault)(require("@babel/generator"));
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 const core_1 = require("@babel/core");
 const path_1 = (0, tslib_1.__importDefault)(require("path"));
-const constants_1 = require("../../constants");
-const utils_1 = require("../utils");
+const utils_1 = require("@docusaurus/utils");
+const utils_2 = require("../utils");
 // We only support extracting source code translations from these kind of files
 const TranslatableSourceCodeExtension = new Set([
     '.js',
@@ -31,7 +31,7 @@ function isTranslatableSourceCodePath(filePath) {
     return TranslatableSourceCodeExtension.has(path_1.default.extname(filePath));
 }
 function getSiteSourceCodeFilePaths(siteDir) {
-    return [path_1.default.join(siteDir, constants_1.SRC_DIR_NAME)];
+    return [path_1.default.join(siteDir, utils_1.SRC_DIR_NAME)];
 }
 function getPluginSourceCodeFilePaths(plugin) {
     var _a, _b, _c;
@@ -47,7 +47,7 @@ function getPluginSourceCodeFilePaths(plugin) {
     return codePaths;
 }
 async function globSourceCodeFilePaths(dirPaths) {
-    const filePaths = await (0, utils_1.safeGlobby)(dirPaths);
+    const filePaths = await (0, utils_2.safeGlobby)(dirPaths);
     return filePaths.filter(isTranslatableSourceCodePath);
 }
 exports.globSourceCodeFilePaths = globSourceCodeFilePaths;

package/lib/webpack/base.js

@@ -53,7 +53,7 @@ function createBaseConfig(props, isServer, minify = true) {
     const isProd = process.env.NODE_ENV === 'production';
     const minimizeEnabled = minify && isProd && !isServer;
     const useSimpleCssMinifier = process.env.USE_SIMPLE_CSS_MINIFIER === 'true';
-    const fileLoaderUtils = (0, utils_1.getFileLoaderUtils)();
+    const fileLoaderUtils = (0, utils_2.getFileLoaderUtils)();
     const name = isServer ? 'server' : 'client';
     const mode = isProd ? 'production' : 'development';
     const themeAliases = (0, themes_1.loadPluginsThemeAliases)({ siteDir, plugins });

package/lib/webpack/server.js

@@ -12,7 +12,7 @@ const webpack_merge_1 = (0, tslib_1.__importDefault)(require("webpack-merge"));
 const base_1 = require("./base");
 const WaitPlugin_1 = (0, tslib_1.__importDefault)(require("./plugins/WaitPlugin"));
 const LogPlugin_1 = (0, tslib_1.__importDefault)(require("./plugins/LogPlugin"));
-const constants_1 = require("../constants");
+const utils_1 = require("@docusaurus/utils");
 // Forked for Docusaurus: https://github.com/slorber/static-site-generator-webpack-plugin
 const static_site_generator_webpack_plugin_1 = (0, tslib_1.__importDefault)(require("@slorber/static-site-generator-webpack-plugin"));
 function createServerConfig({ props, onLinksCollected = () => { }, }) {
@@ -26,7 +26,7 @@ function createServerConfig({ props, onLinksCollected = () => { }, }) {
         return ssgPath;
     });
     const serverConfig = (0, webpack_merge_1.default)(config, {
-        target: `node${constants_1.NODE_MAJOR_VERSION}.${constants_1.NODE_MINOR_VERSION}`,
+        target: `node${utils_1.NODE_MAJOR_VERSION}.${utils_1.NODE_MINOR_VERSION}`,
         entry: {
             main: path_1.default.resolve(__dirname, '../client/serverEntry.js'),
         },

package/lib/webpack/utils.d.ts

@@ -32,30 +32,8 @@ export declare const getCustomizableJSLoader: (jsLoader?: "babel" | ((isServer:
 export declare function applyConfigureWebpack(configureWebpack: ConfigureWebpackFn, config: Configuration, isServer: boolean, jsLoader: 'babel' | ((isServer: boolean) => RuleSetRule) | undefined, content: unknown): Configuration;
 export declare function applyConfigurePostCss(configurePostCss: NonNullable<ConfigurePostCssFn>, config: Configuration): Configuration;
 export declare function compile(config: Configuration[]): Promise<void>;
-declare type AssetFolder = 'images' | 'files' | 'fonts' | 'medias';
-declare type FileLoaderUtils = {
-    loaders: {
-        file: (options: {
-            folder: AssetFolder;
-        }) => RuleSetRule;
-        url: (options: {
-            folder: AssetFolder;
-        }) => RuleSetRule;
-        inlineMarkdownImageFileLoader: string;
-        inlineMarkdownLinkFileLoader: string;
-    };
-    rules: {
-        images: () => RuleSetRule;
-        fonts: () => RuleSetRule;
-        media: () => RuleSetRule;
-        svg: () => RuleSetRule;
-        otherAssets: () => RuleSetRule;
-    };
-};
-export declare function getFileLoaderUtils(): FileLoaderUtils;
 export declare function getHttpsConfig(): boolean | {
     cert: Buffer;
     key: Buffer;
 };
 export declare function getMinimizer(useSimpleCssMinifier?: boolean): WebpackPluginInstance[];
-export {};

package/lib/webpack/utils.js

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMinimizer = exports.getHttpsConfig = exports.getFileLoaderUtils = exports.compile = exports.applyConfigurePostCss = exports.applyConfigureWebpack = exports.getCustomizableJSLoader = exports.getBabelOptions = exports.getCustomBabelConfigFilePath = exports.getStyleLoaders = void 0;
+exports.getMinimizer = exports.getHttpsConfig = exports.compile = exports.applyConfigurePostCss = exports.applyConfigureWebpack = exports.getCustomizableJSLoader = exports.getBabelOptions = exports.getCustomBabelConfigFilePath = exports.getStyleLoaders = void 0;
 const tslib_1 = require("tslib");
 const mini_css_extract_plugin_1 = (0, tslib_1.__importDefault)(require("mini-css-extract-plugin"));
 const webpack_merge_1 = require("webpack-merge");
@@ -17,7 +17,7 @@ const css_minimizer_webpack_plugin_1 = (0, tslib_1.__importDefault)(require("css
 const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const crypto_1 = (0, tslib_1.__importDefault)(require("crypto"));
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
-const constants_1 = require("../constants");
+const utils_1 = require("@docusaurus/utils");
 const lodash_1 = require("lodash");
 // Utility method to get style loaders
 function getStyleLoaders(isServer, cssOptions = {}) {
@@ -76,7 +76,7 @@ function getStyleLoaders(isServer, cssOptions = {}) {
 }
 exports.getStyleLoaders = getStyleLoaders;
 function getCustomBabelConfigFilePath(siteDir) {
-    const customBabelConfigurationPath = path_1.default.join(siteDir, constants_1.BABEL_CONFIG_FILE_NAME);
+    const customBabelConfigurationPath = path_1.default.join(siteDir, utils_1.BABEL_CONFIG_FILE_NAME);
     return fs_extra_1.default.existsSync(customBabelConfigurationPath)
         ? customBabelConfigurationPath
         : undefined;
@@ -221,102 +221,6 @@ function compile(config) {
     });
 }
 exports.compile = compile;
-// Inspired by https://github.com/gatsbyjs/gatsby/blob/8e6e021014da310b9cc7d02e58c9b3efe938c665/packages/gatsby/src/utils/webpack-utils.ts#L447
-function getFileLoaderUtils() {
-    // files/images < urlLoaderLimit will be inlined as base64 strings directly in the html
-    const urlLoaderLimit = constants_1.WEBPACK_URL_LOADER_LIMIT;
-    // defines the path/pattern of the assets handled by webpack
-    const fileLoaderFileName = (folder) => `${constants_1.OUTPUT_STATIC_ASSETS_DIR_NAME}/${folder}/[name]-[hash].[ext]`;
-    const loaders = {
-        file: (options) => ({
-            loader: require.resolve(`file-loader`),
-            options: {
-                name: fileLoaderFileName(options.folder),
-            },
-        }),
-        url: (options) => ({
-            loader: require.resolve(`url-loader`),
-            options: {
-                limit: urlLoaderLimit,
-                name: fileLoaderFileName(options.folder),
-                fallback: require.resolve(`file-loader`),
-            },
-        }),
-        // TODO find a better solution to avoid conflicts with the ideal-image plugin
-        // TODO this may require a little breaking change for ideal-image users?
-        // Maybe with the ideal image plugin, all md images should be "ideal"?
-        // This is used to force url-loader+file-loader on markdown images
-        // https://webpack.js.org/concepts/loaders/#inline
-        inlineMarkdownImageFileLoader: `!url-loader?limit=${urlLoaderLimit}&name=${fileLoaderFileName('images')}&fallback=file-loader!`,
-        inlineMarkdownLinkFileLoader: `!file-loader?name=${fileLoaderFileName('files')}!`,
-    };
-    const rules = {
-        /**
-         * Loads image assets, inlines images via a data URI if they are below
-         * the size threshold
-         */
-        images: () => ({
-            use: [loaders.url({ folder: 'images' })],
-            test: /\.(ico|jpg|jpeg|png|gif|webp)(\?.*)?$/,
-        }),
-        fonts: () => ({
-            use: [loaders.url({ folder: 'fonts' })],
-            test: /\.(woff|woff2|eot|ttf|otf)$/,
-        }),
-        /**
-         * Loads audio and video and inlines them via a data URI if they are below
-         * the size threshold
-         */
-        media: () => ({
-            use: [loaders.url({ folder: 'medias' })],
-            test: /\.(mp4|webm|ogv|wav|mp3|m4a|aac|oga|flac)$/,
-        }),
-        svg: () => ({
-            test: /\.svg?$/,
-            oneOf: [
-                {
-                    use: [
-                        {
-                            loader: '@svgr/webpack',
-                            options: {
-                                prettier: false,
-                                svgo: true,
-                                svgoConfig: {
-                                    plugins: [
-                                        {
-                                            name: 'preset-default',
-                                            params: {
-                                                overrides: {
-                                                    removeViewBox: false,
-                                                },
-                                            },
-                                        },
-                                    ],
-                                },
-                                titleProp: true,
-                                ref: ![path_1.default],
-                            },
-                        },
-                    ],
-                    // We don't want to use SVGR loader for non-React source code
-                    // ie we don't want to use SVGR for CSS files...
-                    issuer: {
-                        and: [/\.(ts|tsx|js|jsx|md|mdx)$/],
-                    },
-                },
-                {
-                    use: [loaders.url({ folder: 'images' })],
-                },
-            ],
-        }),
-        otherAssets: () => ({
-            use: [loaders.file({ folder: 'files' })],
-            test: /\.(pdf|doc|docx|xls|xlsx|zip|rar)$/,
-        }),
-    };
-    return { loaders, rules };
-}
-exports.getFileLoaderUtils = getFileLoaderUtils;
 // Ensure the certificate and key provided are valid and if not
 // throw an easy to debug error
 function validateKeyAndCerts({ cert, key, keyFile, crtFile, }) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "0.0.0-4255",
+  "version": "0.0.0-4261",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -41,11 +41,12 @@
     "@babel/runtime": "^7.16.3",
     "@babel/runtime-corejs3": "^7.16.3",
     "@babel/traverse": "^7.16.3",
-    "@docusaurus/cssnano-preset": "0.0.0-4255",
+    "@docusaurus/cssnano-preset": "0.0.0-4261",
+    "@docusaurus/mdx-loader": "0.0.0-4261",
     "@docusaurus/react-loadable": "5.5.2",
-    "@docusaurus/utils": "0.0.0-4255",
-    "@docusaurus/utils-common": "0.0.0-4255",
-    "@docusaurus/utils-validation": "0.0.0-4255",
+    "@docusaurus/utils": "0.0.0-4261",
+    "@docusaurus/utils-common": "0.0.0-4261",
+    "@docusaurus/utils-validation": "0.0.0-4261",
     "@slorber/static-site-generator-webpack-plugin": "^4.0.0",
     "@svgr/webpack": "^6.0.0",
     "autoprefixer": "^10.3.5",
@@ -107,8 +108,8 @@
     "webpackbar": "^5.0.0-3"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-4255",
-    "@docusaurus/types": "0.0.0-4255",
+    "@docusaurus/module-type-aliases": "0.0.0-4261",
+    "@docusaurus/types": "0.0.0-4261",
     "@types/copy-webpack-plugin": "^8.0.1",
     "@types/css-minimizer-webpack-plugin": "^3.0.2",
     "@types/detect-port": "^1.3.0",
@@ -127,5 +128,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "8908b0cf1a155265ee3f2e46478c2697cd057280"
+  "gitHead": "ed9b25260e929a057df10621409f2e599f0c9a6a"
 }

package/lib/constants.d.ts

@@ -1,19 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-export declare const NODE_MAJOR_VERSION: number;
-export declare const NODE_MINOR_VERSION: number;
-export declare const DEFAULT_BUILD_DIR_NAME = "build";
-export declare const DEFAULT_CONFIG_FILE_NAME = "docusaurus.config.js";
-export declare const BABEL_CONFIG_FILE_NAME: string;
-export declare const GENERATED_FILES_DIR_NAME: string;
-export declare const SRC_DIR_NAME = "src";
-export declare const STATIC_DIR_NAME = "static";
-export declare const OUTPUT_STATIC_ASSETS_DIR_NAME = "assets";
-export declare const THEME_PATH: string;
-export declare const DEFAULT_PORT = 3000;
-export declare const DEFAULT_PLUGIN_ID = "default";
-export declare const WEBPACK_URL_LOADER_LIMIT: string | number;

package/lib/constants.js

@@ -1,26 +0,0 @@
-"use strict";
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WEBPACK_URL_LOADER_LIMIT = exports.DEFAULT_PLUGIN_ID = exports.DEFAULT_PORT = exports.THEME_PATH = exports.OUTPUT_STATIC_ASSETS_DIR_NAME = exports.STATIC_DIR_NAME = exports.SRC_DIR_NAME = exports.GENERATED_FILES_DIR_NAME = exports.BABEL_CONFIG_FILE_NAME = exports.DEFAULT_CONFIG_FILE_NAME = exports.DEFAULT_BUILD_DIR_NAME = exports.NODE_MINOR_VERSION = exports.NODE_MAJOR_VERSION = void 0;
-exports.NODE_MAJOR_VERSION = parseInt(process.versions.node.split('.')[0], 10);
-exports.NODE_MINOR_VERSION = parseInt(process.versions.node.split('.')[1], 10);
-// Can be overridden with cli option --out-dir
-exports.DEFAULT_BUILD_DIR_NAME = 'build';
-// Can be overridden with cli option --config
-exports.DEFAULT_CONFIG_FILE_NAME = 'docusaurus.config.js';
-exports.BABEL_CONFIG_FILE_NAME = process.env.DOCUSAURUS_BABEL_CONFIG_FILE_NAME || 'babel.config.js';
-exports.GENERATED_FILES_DIR_NAME = process.env.DOCUSAURUS_GENERATED_FILES_DIR_NAME || '.docusaurus';
-exports.SRC_DIR_NAME = 'src';
-exports.STATIC_DIR_NAME = 'static';
-exports.OUTPUT_STATIC_ASSETS_DIR_NAME = 'assets'; // files handled by webpack, hashed (can be cached aggressively)
-exports.THEME_PATH = `${exports.SRC_DIR_NAME}/theme`;
-exports.DEFAULT_PORT = 3000;
-exports.DEFAULT_PLUGIN_ID = 'default';
-// Temporary fix for https://github.com/facebook/docusaurus/issues/5493
-exports.WEBPACK_URL_LOADER_LIMIT = (_a = process.env.WEBPACK_URL_LOADER_LIMIT) !== null && _a !== void 0 ? _a : 10000;