npm - @docusaurus/core - Versions diffs - 2.0.0-beta.15a2b59f9 → 2.0.0-beta.17 - Mend

@docusaurus/core 2.0.0-beta.15a2b59f9 → 2.0.0-beta.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (189) hide show

package/bin/beforeCli.mjs +136 -0
package/bin/{docusaurus.js → docusaurus.mjs} +63 -108
package/lib/babel/preset.d.ts +8 -3
package/lib/babel/preset.js +8 -7
package/lib/choosePort.js +29 -38
package/lib/client/.eslintrc.js +0 -1
package/lib/client/App.d.ts +1 -2
package/lib/client/App.js +19 -24
package/lib/client/LinksCollector.d.ts +3 -3
package/lib/client/LinksCollector.js +5 -9
package/lib/client/PendingNavigation.d.ts +24 -1
package/lib/client/PendingNavigation.js +5 -7
package/lib/client/baseUrlIssueBanner/BaseUrlIssueBanner.d.ts +13 -0
package/lib/client/baseUrlIssueBanner/BaseUrlIssueBanner.js +15 -10
package/lib/client/client-lifecycles-dispatcher.d.ts +2 -5
package/lib/client/client-lifecycles-dispatcher.js +6 -10
package/lib/client/clientEntry.js +11 -5
package/lib/client/docusaurus.d.ts +6 -0
package/lib/client/docusaurus.js +16 -25
package/lib/client/exports/BrowserOnly.d.ts +2 -3
package/lib/client/exports/BrowserOnly.js +13 -7
package/lib/client/exports/ComponentCreator.d.ts +1 -2
package/lib/client/exports/ComponentCreator.js +7 -6
package/lib/client/exports/ErrorBoundary.d.ts +18 -0
package/lib/client/exports/ErrorBoundary.js +35 -0
package/lib/client/exports/Head.d.ts +2 -3
package/lib/client/exports/Head.js +3 -4
package/lib/client/exports/Interpolate.d.ts +1 -1
package/lib/client/exports/Interpolate.js +16 -22
package/lib/client/exports/Link.d.ts +11 -5
package/lib/client/exports/Link.js +24 -19
package/lib/client/exports/Translate.d.ts +3 -3
package/lib/client/exports/Translate.js +14 -10
package/lib/client/exports/browserContext.d.ts +11 -0
package/lib/client/exports/browserContext.js +22 -0
package/lib/client/exports/constants.js +1 -11
package/lib/client/exports/docusaurusContext.d.ts +12 -0
package/lib/client/exports/docusaurusContext.js +25 -0
package/lib/client/exports/isInternalUrl.js +1 -1
package/lib/client/exports/renderRoutes.d.ts +1 -2
package/lib/client/exports/renderRoutes.js +1 -2
package/lib/client/exports/router.d.ts +1 -1
package/lib/client/exports/router.js +1 -1
package/lib/client/exports/useBaseUrl.js +3 -5
package/lib/client/exports/useDocusaurusContext.d.ts +2 -3
package/lib/client/exports/useDocusaurusContext.js +3 -9
package/lib/client/exports/useGlobalData.js +1 -5
package/lib/{server/versions/__tests/index.test.d.ts → client/exports/useIsBrowser.d.ts} +1 -1
package/lib/client/exports/useIsBrowser.js +11 -0
package/lib/client/flat.d.ts +2 -2
package/lib/client/flat.js +8 -11
package/lib/client/normalizeLocation.d.ts +2 -5
package/lib/client/normalizeLocation.js +1 -2
package/lib/client/nprogress.css +2 -2
package/lib/client/prefetch.d.ts +1 -2
package/lib/client/prefetch.js +1 -3
package/lib/client/preload.d.ts +3 -2
package/lib/client/preload.js +2 -1
package/lib/client/serverEntry.d.ts +10 -0
package/lib/client/serverEntry.js +90 -142
package/lib/client/theme-fallback/Error/index.d.ts +10 -0
package/lib/client/theme-fallback/Error/index.js +39 -0
package/lib/client/theme-fallback/Layout/index.d.ts +10 -0
package/lib/client/theme-fallback/Layout/index.js +10 -19
package/lib/client/theme-fallback/Loading/index.d.ts +9 -0
package/lib/client/theme-fallback/Loading/index.js +47 -115
package/lib/client/{exports/context.js → theme-fallback/NotFound/index.d.ts} +2 -2
package/lib/client/theme-fallback/NotFound/index.js +9 -16
package/lib/{webpack/sharedModuleAliases.d.ts → client/theme-fallback/Root/index.d.ts} +4 -4
package/lib/client/theme-fallback/Root/index.js +2 -7
package/lib/commands/build.d.ts +1 -1
package/lib/commands/build.js +50 -54
package/lib/commands/clear.d.ts +6 -0
package/lib/commands/clear.js +30 -19
package/lib/commands/commandUtils.d.ts +7 -1
package/lib/commands/commandUtils.js +6 -6
package/lib/commands/deploy.d.ts +4 -1
package/lib/commands/deploy.js +102 -66
package/lib/commands/external.d.ts +2 -2
package/lib/commands/external.js +3 -3
package/lib/commands/serve.d.ts +1 -1
package/lib/commands/serve.js +13 -19
package/lib/commands/start.d.ts +1 -1
package/lib/commands/start.js +93 -83
package/lib/commands/swizzle/actions.d.ts +23 -0
package/lib/commands/swizzle/actions.js +102 -0
package/lib/commands/swizzle/common.d.ts +33 -0
package/lib/commands/swizzle/common.js +56 -0
package/lib/commands/swizzle/components.d.ts +29 -0
package/lib/commands/swizzle/components.js +162 -0
package/lib/commands/swizzle/config.d.ts +10 -0
package/lib/commands/swizzle/config.js +80 -0
package/lib/{server/loadSetup.d.ts → commands/swizzle/context.d.ts} +2 -3
package/lib/commands/swizzle/context.js +30 -0
package/lib/commands/swizzle/index.d.ts +8 -0
package/lib/commands/swizzle/index.js +115 -0
package/lib/commands/swizzle/prompts.d.ts +12 -0
package/lib/commands/swizzle/prompts.js +110 -0
package/lib/{client/exports/context.d.ts → commands/swizzle/tables.d.ts} +3 -4
package/lib/commands/swizzle/tables.js +116 -0
package/lib/commands/swizzle/themes.d.ts +20 -0
package/lib/commands/swizzle/themes.js +103 -0
package/lib/commands/writeHeadingIds.d.ts +9 -6
package/lib/commands/writeHeadingIds.js +41 -43
package/lib/commands/writeTranslations.d.ts +2 -2
package/lib/commands/writeTranslations.js +35 -14
package/lib/index.d.ts +10 -9
package/lib/index.js +20 -19
package/lib/server/brokenLinks.d.ts +1 -1
package/lib/server/brokenLinks.js +57 -38
package/lib/server/client-modules/index.d.ts +1 -1
package/lib/server/client-modules/index.js +1 -3
package/lib/server/config.d.ts +2 -2
package/lib/server/config.js +7 -4
package/lib/server/configValidation.d.ts +2 -2
package/lib/server/configValidation.js +43 -28
package/lib/server/duplicateRoutes.d.ts +1 -1
package/lib/server/duplicateRoutes.js +10 -6
package/lib/server/html-tags/htmlTags.js +2 -4
package/lib/server/html-tags/index.d.ts +1 -1
package/lib/server/html-tags/index.js +1 -1
package/lib/server/i18n.d.ts +1 -2
package/lib/server/i18n.js +32 -46
package/lib/server/index.d.ts +2 -2
package/lib/server/index.js +147 -68
package/lib/server/moduleShorthand.d.ts +9 -0
package/lib/server/moduleShorthand.js +46 -0
package/lib/server/plugins/applyRouteTrailingSlash.d.ts +2 -2
package/lib/server/plugins/applyRouteTrailingSlash.js +1 -1
package/lib/server/plugins/index.d.ts +2 -2
package/lib/server/plugins/index.js +34 -35
package/lib/server/plugins/init.d.ts +12 -2
package/lib/server/plugins/init.js +48 -58
package/lib/server/plugins/pluginIds.d.ts +1 -1
package/lib/server/plugins/pluginIds.js +8 -5
package/lib/server/presets/index.d.ts +3 -3
package/lib/server/presets/index.js +12 -13
package/lib/server/routes.d.ts +1 -1
package/lib/server/routes.js +50 -29
package/lib/server/themes/alias.d.ts +3 -2
package/lib/server/themes/alias.js +22 -14
package/lib/server/themes/index.d.ts +3 -3
package/lib/server/themes/index.js +26 -26
package/lib/server/translations/translations.d.ts +7 -1
package/lib/server/translations/translations.js +30 -45
package/lib/server/translations/translationsExtractor.d.ts +9 -3
package/lib/server/translations/translationsExtractor.js +159 -120
package/lib/server/utils.d.ts +9 -3
package/lib/server/utils.js +7 -9
package/lib/server/versions/__fixtures__/dummy-plugin.d.ts +0 -0
package/lib/server/versions/index.d.ts +3 -4
package/lib/server/versions/index.js +22 -21
package/lib/webpack/base.d.ts +4 -4
package/lib/webpack/base.js +38 -33
package/lib/webpack/client.d.ts +3 -3
package/lib/webpack/client.js +12 -19
package/lib/webpack/plugins/ChunkAssetPlugin.d.ts +13 -3
package/lib/webpack/plugins/ChunkAssetPlugin.js +17 -10
package/lib/webpack/plugins/CleanWebpackPlugin.d.ts +6 -6
package/lib/webpack/plugins/CleanWebpackPlugin.js +8 -14
package/lib/webpack/plugins/LogPlugin.d.ts +1 -1
package/lib/webpack/plugins/LogPlugin.js +4 -5
package/lib/webpack/plugins/WaitPlugin.d.ts +1 -1
package/lib/webpack/plugins/WaitPlugin.js +1 -1
package/lib/webpack/server.d.ts +3 -3
package/lib/webpack/server.js +9 -8
package/lib/{client → webpack}/templates/index.html.template.ejs +0 -0
package/lib/webpack/templates/ssr.html.template.d.ts +8 -0
package/lib/{client → webpack}/templates/ssr.html.template.js +3 -2
package/lib/webpack/utils.d.ts +7 -29
package/lib/webpack/utils.js +54 -171
package/package.json +74 -69
package/lib/.tsbuildinfo +0 -1
package/lib/client/.tsbuildinfo +0 -1
package/lib/commands/buildRemoteBranchUrl.d.ts +0 -7
package/lib/commands/buildRemoteBranchUrl.js +0 -27
package/lib/commands/swizzle.d.ts +0 -9
package/lib/commands/swizzle.js +0 -245
package/lib/constants.d.ts +0 -18
package/lib/constants.js +0 -23
package/lib/server/loadSetup.js +0 -25
package/lib/server/versions/__tests/index.test.js +0 -25
package/lib/webpack/react-dev-utils-webpack5/README.md +0 -11
package/lib/webpack/react-dev-utils-webpack5/evalSourceMapMiddleware.js +0 -57
package/lib/webpack/react-dev-utils-webpack5/formatWebpackMessages.js +0 -138
package/lib/webpack/react-dev-utils-webpack5/webpackHotDevClient.js +0 -285
package/lib/webpack/sharedModuleAliases.js +0 -18
package/tsconfig.client.json +0 -13
package/tsconfig.json +0 -13

package/lib/{client → webpack}/templates/index.html.template.ejs RENAMED Viewed

File without changes

package/lib/webpack/templates/ssr.html.template.d.ts ADDED Viewed

@@ -0,0 +1,8 @@
+/**
+ * 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.
+ */
+declare const _default: "\n<!DOCTYPE html>\n<html <%~ it.htmlAttributes %>>\n  <head>\n    <meta charset=\"UTF-8\">\n    <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">\n    <meta name=\"generator\" content=\"Docusaurus v<%= it.version %>\">\n    <% if (it.noIndex) { %>\n      <meta name=\"robots\" content=\"noindex, nofollow\" />\n    <% } %>\n    <%~ it.headTags %>\n    <% it.metaAttributes.forEach((metaAttribute) => { %>\n      <%~ metaAttribute %>\n    <% }); %>\n    <% it.stylesheets.forEach((stylesheet) => { %>\n      <link rel=\"stylesheet\" href=\"<%= it.baseUrl %><%= stylesheet %>\" />\n    <% }); %>\n    <% it.scripts.forEach((script) => { %>\n      <link rel=\"preload\" href=\"<%= it.baseUrl %><%= script %>\" as=\"script\">\n    <% }); %>\n  </head>\n  <body <%~ it.bodyAttributes %>>\n    <%~ it.preBodyTags %>\n    <div id=\"__docusaurus\">\n      <%~ it.appHtml %>\n    </div>\n    <% it.scripts.forEach((script) => { %>\n      <script src=\"<%= it.baseUrl %><%= script %>\"></script>\n    <% }); %>\n    <%~ it.postBodyTags %>\n  </body>\n</html>\n";
+export default _default;

package/lib/{client → webpack}/templates/ssr.html.template.js RENAMED Viewed

@@ -1,11 +1,12 @@
+"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.
  */
-module.exports = `
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = `
 <!DOCTYPE html>
 <html <%~ it.htmlAttributes %>>
   <head>

package/lib/webpack/utils.d.ts CHANGED Viewed

@@ -5,13 +5,13 @@
  * LICENSE file in the root directory of this source tree.
  */
 /// <reference types="node" />
-import { Configuration, RuleSetRule, WebpackPluginInstance } from 'webpack';
-import { TransformOptions } from '@babel/core';
-import { ConfigureWebpackFn, ConfigurePostCssFn } from '@docusaurus/types';
-export declare function getStyleLoaders(isServer: boolean, cssOptions?: {
+import { type Configuration, type RuleSetRule, type WebpackPluginInstance } from 'webpack';
+import type { TransformOptions } from '@babel/core';
+import type { ConfigureWebpackFn, ConfigurePostCssFn } from '@docusaurus/types';
+export declare function getStyleLoaders(isServer: boolean, cssOptionsArg?: {
     [key: string]: unknown;
 }): RuleSetRule[];
-export declare function getCustomBabelConfigFilePath(siteDir: string): string | undefined;
+export declare function getCustomBabelConfigFilePath(siteDir: string): Promise<string | undefined>;
 export declare function getBabelOptions({ isServer, babelOptions, }?: {
     isServer?: boolean;
     babelOptions?: TransformOptions | string;
@@ -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 | {
+export declare function getHttpsConfig(): Promise<boolean | {
     cert: Buffer;
     key: Buffer;
-};
+}>;
 export declare function getMinimizer(useSimpleCssMinifier?: boolean): WebpackPluginInstance[];
-export {};

package/lib/webpack/utils.js CHANGED Viewed

@@ -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 = tslib_1.__importDefault(require("mini-css-extract-plugin"));
 const webpack_merge_1 = require("webpack-merge");
@@ -16,11 +16,15 @@ const terser_webpack_plugin_1 = tslib_1.__importDefault(require("terser-webpack-
 const css_minimizer_webpack_plugin_1 = tslib_1.__importDefault(require("css-minimizer-webpack-plugin"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const crypto_1 = tslib_1.__importDefault(require("crypto"));
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const constants_1 = require("../constants");
-const lodash_1 = require("lodash");
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
+const utils_1 = require("@docusaurus/utils");
 // Utility method to get style loaders
-function getStyleLoaders(isServer, cssOptions = {}) {
+function getStyleLoaders(isServer, cssOptionsArg = {}) {
+    const cssOptions = {
+        // TODO turn esModule on later, see https://github.com/facebook/docusaurus/pull/6424
+        esModule: false,
+        ...cssOptionsArg,
+    };
     if (isServer) {
         return cssOptions.modules
             ? [
@@ -66,7 +70,7 @@ function getStyleLoaders(isServer, cssOptions = {}) {
                     // https://github.com/facebook/create-react-app/issues/2677
                     ident: 'postcss',
                     plugins: [
-                        // eslint-disable-next-line @typescript-eslint/no-var-requires, global-require
+                        // eslint-disable-next-line global-require
                         require('autoprefixer'),
                     ],
                 },
@@ -75,9 +79,9 @@ function getStyleLoaders(isServer, cssOptions = {}) {
     ];
 }
 exports.getStyleLoaders = getStyleLoaders;
-function getCustomBabelConfigFilePath(siteDir) {
-    const customBabelConfigurationPath = path_1.default.join(siteDir, constants_1.BABEL_CONFIG_FILE_NAME);
-    return fs_extra_1.default.existsSync(customBabelConfigurationPath)
+async function getCustomBabelConfigFilePath(siteDir) {
+    const customBabelConfigurationPath = path_1.default.join(siteDir, utils_1.BABEL_CONFIG_FILE_NAME);
+    return (await fs_extra_1.default.pathExists(customBabelConfigurationPath))
         ? customBabelConfigurationPath
         : undefined;
 }
@@ -90,13 +94,12 @@ function getBabelOptions({ isServer, babelOptions, } = {}) {
             caller: { name: isServer ? 'server' : 'client' },
         };
     }
-    else {
-        return Object.assign(babelOptions !== null && babelOptions !== void 0 ? babelOptions : { presets: [require.resolve('../babel/preset')] }, {
-            babelrc: false,
-            configFile: false,
-            caller: { name: isServer ? 'server' : 'client' },
-        });
-    }
+    return {
+        ...(babelOptions ?? { presets: [require.resolve('../babel/preset')] }),
+        babelrc: false,
+        configFile: false,
+        caller: { name: isServer ? 'server' : 'client' },
+    };
 }
 exports.getBabelOptions = getBabelOptions;
 // Name is generic on purpose
@@ -111,22 +114,6 @@ const getCustomizableJSLoader = (jsLoader = 'babel') => ({ isServer, babelOption
     ? getDefaultBabelLoader({ isServer, babelOptions })
     : jsLoader(isServer);
 exports.getCustomizableJSLoader = getCustomizableJSLoader;
-// TODO remove this before end of 2021?
-const warnBabelLoaderOnce = lodash_1.memoize(function () {
-    console.warn(chalk_1.default.yellow('Docusaurus plans to support multiple JS loader strategies (Babel, esbuild...): "getBabelLoader(isServer)" is now deprecated in favor of "getJSLoader({isServer})".'));
-});
-const getBabelLoaderDeprecated = function getBabelLoaderDeprecated(isServer, babelOptions) {
-    warnBabelLoaderOnce();
-    return getDefaultBabelLoader({ isServer, babelOptions });
-};
-// TODO remove this before end of 2021 ?
-const warnCacheLoaderOnce = lodash_1.memoize(function () {
-    console.warn(chalk_1.default.yellow('Docusaurus uses Webpack 5 and getCacheLoader() usage is now deprecated.'));
-});
-function getCacheLoaderDeprecated() {
-    warnCacheLoaderOnce();
-    return null;
-}
 /**
  * Helper function to modify webpack config
  * @param configureWebpack a webpack config or a function to modify config
@@ -140,18 +127,15 @@ function applyConfigureWebpack(configureWebpack, config, isServer, jsLoader, con
     // Export some utility functions
     const utils = {
         getStyleLoaders,
-        getJSLoader: exports.getCustomizableJSLoader(jsLoader),
-        getBabelLoader: getBabelLoaderDeprecated,
-        getCacheLoader: getCacheLoaderDeprecated,
+        getJSLoader: (0, exports.getCustomizableJSLoader)(jsLoader),
     };
     if (typeof configureWebpack === 'function') {
         const { mergeStrategy, ...res } = configureWebpack(config, isServer, utils, content);
         if (res && typeof res === 'object') {
-            // @ts-expect-error: annoying error due to enums: https://github.com/survivejs/webpack-merge/issues/179
-            const customizeRules = mergeStrategy !== null && mergeStrategy !== void 0 ? mergeStrategy : {};
-            return webpack_merge_1.mergeWithCustomize({
-                customizeArray: webpack_merge_1.customizeArray(customizeRules),
-                customizeObject: webpack_merge_1.customizeObject(customizeRules),
+            const customizeRules = mergeStrategy ?? {};
+            return (0, webpack_merge_1.mergeWithCustomize)({
+                customizeArray: (0, webpack_merge_1.customizeArray)(customizeRules),
+                customizeObject: (0, webpack_merge_1.customizeObject)(customizeRules),
             })(config, res);
         }
     }
@@ -159,11 +143,9 @@ function applyConfigureWebpack(configureWebpack, config, isServer, jsLoader, con
 }
 exports.applyConfigureWebpack = applyConfigureWebpack;
 function applyConfigurePostCss(configurePostCss, config) {
-    var _a, _b;
-    // TODO not ideal heuristic but good enough for our usecase?
+    // not ideal heuristic but good enough for our use-case?
     function isPostCssLoader(loader) {
-        var _a, _b;
-        return !!((_b = (_a = loader) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.postcssOptions);
+        return !!loader?.options?.postcssOptions;
     }
     // Does not handle all edge cases, but good enough for now
     function overridePostCssOptions(entry) {
@@ -176,42 +158,41 @@ function applyConfigurePostCss(configurePostCss, config) {
         else if (Array.isArray(entry.use)) {
             entry.use
                 .filter((u) => typeof u === 'object')
-                .forEach(overridePostCssOptions);
+                .forEach((rule) => overridePostCssOptions(rule));
         }
     }
-    (_b = (_a = config.module) === null || _a === void 0 ? void 0 : _a.rules) === null || _b === void 0 ? void 0 : _b.forEach(overridePostCssOptions);
+    config.module?.rules?.forEach((rule) => overridePostCssOptions(rule));
     return config;
 }
 exports.applyConfigurePostCss = applyConfigurePostCss;
 function compile(config) {
     return new Promise((resolve, reject) => {
-        const compiler = webpack_1.default(config);
+        const compiler = (0, webpack_1.default)(config);
         compiler.run((err, stats) => {
-            var _a;
             if (err) {
-                console.error(err.stack || err);
+                logger_1.default.error(err.stack || err);
                 // @ts-expect-error: see https://webpack.js.org/api/node/#error-handling
                 if (err.details) {
                     // @ts-expect-error: see https://webpack.js.org/api/node/#error-handling
-                    console.error(err.details);
+                    logger_1.default.error(err.details);
                 }
                 reject(err);
             }
             // let plugins consume all the stats
-            const errorsWarnings = stats === null || stats === void 0 ? void 0 : stats.toJson('errors-warnings');
-            if (stats === null || stats === void 0 ? void 0 : stats.hasErrors()) {
+            const errorsWarnings = stats?.toJson('errors-warnings');
+            if (stats?.hasErrors()) {
                 reject(new Error('Failed to compile with errors.'));
             }
-            if (errorsWarnings && (stats === null || stats === void 0 ? void 0 : stats.hasWarnings())) {
-                (_a = errorsWarnings.warnings) === null || _a === void 0 ? void 0 : _a.forEach((warning) => {
-                    console.warn(warning);
+            if (errorsWarnings && stats?.hasWarnings()) {
+                errorsWarnings.warnings?.forEach((warning) => {
+                    logger_1.default.warn(warning);
                 });
             }
             // Webpack 5 requires calling close() so that persistent caching works
             // See https://github.com/webpack/webpack.js.org/pull/4775
             compiler.close((errClose) => {
                 if (errClose) {
-                    console.error(chalk_1.default.red('Error while closing Webpack compiler:', errClose));
+                    logger_1.default.error(`Error while closing Webpack compiler: ${errClose}`);
                     reject(errClose);
                 }
                 else {
@@ -222,145 +203,46 @@ 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 < 10kb will be inlined as base64 strings directly in the html
-    const urlLoaderLimit = 10000;
-    // 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) => {
-            return {
-                loader: require.resolve(`file-loader`),
-                options: {
-                    name: fileLoaderFileName(options.folder),
-                },
-            };
-        },
-        url: (options) => {
-            return {
-                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: () => {
-            return {
-                use: [loaders.url({ folder: 'images' })],
-                test: /\.(ico|jpg|jpeg|png|gif|webp)(\?.*)?$/,
-            };
-        },
-        fonts: () => {
-            return {
-                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: () => {
-            return {
-                use: [loaders.url({ folder: 'medias' })],
-                test: /\.(mp4|webm|ogv|wav|mp3|m4a|aac|oga|flac)$/,
-            };
-        },
-        svg: () => {
-            return {
-                test: /\.svg?$/,
-                oneOf: [
-                    {
-                        use: [
-                            {
-                                loader: '@svgr/webpack',
-                                options: {
-                                    prettier: false,
-                                    svgo: true,
-                                    svgoConfig: {
-                                        plugins: [{ 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: () => {
-            return {
-                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 }) {
+function validateKeyAndCerts({ cert, key, keyFile, crtFile, }) {
     let encrypted;
     try {
         // publicEncrypt will throw an error with an invalid cert
         encrypted = crypto_1.default.publicEncrypt(cert, Buffer.from('test'));
     }
     catch (err) {
-        throw new Error(`The certificate "${chalk_1.default.yellow(crtFile)}" is invalid.\n${err.message}`);
+        throw new Error(`The certificate ${crtFile} is invalid.
+${err}`);
     }
     try {
         // privateDecrypt will throw an error with an invalid key
         crypto_1.default.privateDecrypt(key, encrypted);
     }
     catch (err) {
-        throw new Error(`The certificate key "${chalk_1.default.yellow(keyFile)}" is invalid.\n${err.message}`);
+        throw new Error(`The certificate key ${keyFile} is invalid.
+${err}`);
     }
 }
 // Read file and throw an error if it doesn't exist
-function readEnvFile(file, type) {
-    if (!fs_extra_1.default.existsSync(file)) {
-        throw new Error(`You specified ${chalk_1.default.cyan(type)} in your env, but the file "${chalk_1.default.yellow(file)}" can't be found.`);
+async function readEnvFile(file, type) {
+    if (!(await fs_extra_1.default.pathExists(file))) {
+        throw new Error(`You specified ${type} in your env, but the file "${file}" can't be found.`);
     }
-    return fs_extra_1.default.readFileSync(file);
+    return fs_extra_1.default.readFile(file);
 }
-const appDirectory = fs_extra_1.default.realpathSync(process.cwd());
 // Get the https config
 // Return cert files if provided in env, otherwise just true or false
-function getHttpsConfig() {
+async function getHttpsConfig() {
+    const appDirectory = await fs_extra_1.default.realpath(process.cwd());
     const { SSL_CRT_FILE, SSL_KEY_FILE, HTTPS } = process.env;
     const isHttps = HTTPS === 'true';
     if (isHttps && SSL_CRT_FILE && SSL_KEY_FILE) {
         const crtFile = path_1.default.resolve(appDirectory, SSL_CRT_FILE);
         const keyFile = path_1.default.resolve(appDirectory, SSL_KEY_FILE);
         const config = {
-            cert: readEnvFile(crtFile, 'SSL_CRT_FILE'),
-            key: readEnvFile(keyFile, 'SSL_KEY_FILE'),
+            cert: await readEnvFile(crtFile, 'SSL_CRT_FILE'),
+            key: await readEnvFile(keyFile, 'SSL_KEY_FILE'),
         };
         validateKeyAndCerts({ ...config, keyFile, crtFile });
         return config;
@@ -391,7 +273,7 @@ function getMinimizer(useSimpleCssMinifier = false) {
                     // into invalid ecma 5 code. This is why the 'compress' and 'output'
                     // sections only apply transformations that are ecma 5 safe
                     // https://github.com/facebook/create-react-app/pull/4234
-                    ecma: 8,
+                    ecma: 2020,
                 },
                 compress: {
                     ecma: 5,
@@ -403,8 +285,8 @@ function getMinimizer(useSimpleCssMinifier = false) {
                 output: {
                     ecma: 5,
                     comments: false,
-                    // Turned on because emoji and regex is not minified properly using default
-                    // https://github.com/facebook/create-react-app/issues/2488
+                    // Turned on because emoji and regex is not minified properly using
+                    // default. See https://github.com/facebook/create-react-app/issues/2488
                     ascii_only: true,
                 },
             },
@@ -429,6 +311,7 @@ function getMinimizer(useSimpleCssMinifier = false) {
                     level: {
                         1: {
                             all: false,
+                            removeWhitespace: true,
                         },
                         2: {
                             all: true,

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "2.0.0-beta.15a2b59f9",
+  "version": "2.0.0-beta.17",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -21,107 +21,112 @@
     "directory": "packages/docusaurus"
   },
   "bin": {
-    "docusaurus": "bin/docusaurus.js"
+    "docusaurus": "bin/docusaurus.mjs"
   },
   "scripts": {
-    "build": "tsc && tsc -p tsconfig.client.json && node copyUntypedFiles.js",
-    "watch": "node copyUntypedFiles.js && concurrently -n \"server,client\" --kill-others \"tsc --watch\" \"tsc -p tsconfig.client.json --watch\""
+    "build": "tsc && tsc -p tsconfig.client.json && node copyUntypedFiles.mjs",
+    "watch": "node copyUntypedFiles.mjs && concurrently -n \"server,client\" --kill-others \"tsc --watch\" \"tsc -p tsconfig.client.json --watch\""
   },
   "bugs": {
     "url": "https://github.com/facebook/docusaurus/issues"
   },
-  "devDependencies": {
-    "@docusaurus/module-type-aliases": "2.0.0-beta.15a2b59f9",
-    "@types/detect-port": "^1.3.0",
-    "@types/nprogress": "^0.2.0",
-    "tmp-promise": "^3.0.2"
-  },
   "dependencies": {
-    "@babel/core": "^7.12.16",
-    "@babel/generator": "^7.12.15",
+    "@babel/core": "^7.17.5",
+    "@babel/generator": "^7.17.3",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.12.15",
-    "@babel/preset-env": "^7.12.16",
-    "@babel/preset-react": "^7.12.13",
-    "@babel/preset-typescript": "^7.12.16",
-    "@babel/runtime": "^7.12.5",
-    "@babel/runtime-corejs3": "^7.12.13",
-    "@babel/traverse": "^7.12.13",
-    "@docusaurus/cssnano-preset": "2.0.0-beta.15a2b59f9",
-    "@docusaurus/react-loadable": "5.5.0",
-    "@docusaurus/types": "2.0.0-beta.15a2b59f9",
-    "@docusaurus/utils": "2.0.0-beta.15a2b59f9",
-    "@docusaurus/utils-common": "2.0.0-beta.15a2b59f9",
-    "@docusaurus/utils-validation": "2.0.0-beta.15a2b59f9",
-    "@slorber/static-site-generator-webpack-plugin": "^4.0.0",
-    "@svgr/webpack": "^5.5.0",
-    "autoprefixer": "^10.2.5",
-    "babel-loader": "^8.2.2",
+    "@babel/plugin-transform-runtime": "^7.17.0",
+    "@babel/preset-env": "^7.16.11",
+    "@babel/preset-react": "^7.16.7",
+    "@babel/preset-typescript": "^7.16.7",
+    "@babel/runtime": "^7.17.2",
+    "@babel/runtime-corejs3": "^7.17.2",
+    "@babel/traverse": "^7.17.3",
+    "@docusaurus/cssnano-preset": "2.0.0-beta.17",
+    "@docusaurus/logger": "2.0.0-beta.17",
+    "@docusaurus/mdx-loader": "2.0.0-beta.17",
+    "@docusaurus/react-loadable": "5.5.2",
+    "@docusaurus/utils": "2.0.0-beta.17",
+    "@docusaurus/utils-common": "2.0.0-beta.17",
+    "@docusaurus/utils-validation": "2.0.0-beta.17",
+    "@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",
-    "chalk": "^4.1.1",
-    "chokidar": "^3.5.1",
-    "clean-css": "^5.1.2",
+    "boxen": "^6.2.1",
+    "chokidar": "^3.5.3",
+    "clean-css": "^5.2.4",
+    "cli-table3": "^0.6.1",
+    "combine-promises": "^1.1.0",
     "commander": "^5.1.0",
-    "copy-webpack-plugin": "^9.0.0",
-    "core-js": "^3.9.1",
-    "css-loader": "^5.1.1",
-    "css-minimizer-webpack-plugin": "^3.0.1",
-    "cssnano": "^5.0.4",
+    "copy-webpack-plugin": "^10.2.4",
+    "core-js": "^3.21.1",
+    "css-loader": "^6.6.0",
+    "css-minimizer-webpack-plugin": "^3.4.1",
+    "cssnano": "^5.0.17",
     "del": "^6.0.0",
     "detect-port": "^1.3.0",
     "escape-html": "^1.0.3",
-    "eta": "^1.12.1",
-    "express": "^4.17.1",
+    "eta": "^1.12.3",
     "file-loader": "^6.2.0",
-    "fs-extra": "^10.0.0",
-    "github-slugger": "^1.3.0",
-    "globby": "^11.0.2",
-    "html-minifier-terser": "^5.1.1",
+    "fs-extra": "^10.0.1",
+    "html-minifier-terser": "^6.1.0",
     "html-tags": "^3.1.0",
-    "html-webpack-plugin": "^5.3.2",
+    "html-webpack-plugin": "^5.5.0",
     "import-fresh": "^3.3.0",
     "is-root": "^2.1.0",
     "leven": "^3.1.0",
-    "lodash": "^4.17.20",
-    "mini-css-extract-plugin": "^1.6.0",
-    "module-alias": "^2.2.2",
+    "lodash": "^4.17.21",
+    "mini-css-extract-plugin": "^2.5.3",
     "nprogress": "^0.2.0",
-    "postcss": "^8.2.15",
-    "postcss-loader": "^5.3.0",
-    "prompts": "^2.4.1",
-    "react-dev-utils": "^11.0.1",
-    "react-error-overlay": "^6.0.9",
-    "react-helmet": "^6.1.0",
-    "react-loadable": "^5.5.0",
+    "postcss": "^8.4.7",
+    "postcss-loader": "^6.2.1",
+    "prompts": "^2.4.2",
+    "react-dev-utils": "^12.0.0",
+    "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",
     "react-router-config": "^5.1.1",
     "react-router-dom": "^5.2.0",
-    "resolve-pathname": "^3.0.0",
-    "rtl-detect": "^1.0.3",
+    "remark-admonitions": "^1.2.1",
+    "rtl-detect": "^1.0.4",
     "semver": "^7.3.4",
     "serve-handler": "^6.1.3",
-    "shelljs": "^0.8.4",
-    "std-env": "^2.2.1",
-    "strip-ansi": "^6.0.0",
-    "terser-webpack-plugin": "^5.1.3",
-    "tslib": "^2.2.0",
+    "shelljs": "^0.8.5",
+    "terser-webpack-plugin": "^5.3.1",
+    "tslib": "^2.3.1",
     "update-notifier": "^5.1.0",
     "url-loader": "^4.1.1",
-    "wait-on": "^5.3.0",
-    "webpack": "^5.40.0",
-    "webpack-bundle-analyzer": "^4.4.2",
-    "webpack-dev-server": "^3.11.2",
+    "wait-on": "^6.0.1",
+    "webpack": "^5.69.1",
+    "webpack-bundle-analyzer": "^4.5.0",
+    "webpack-dev-server": "^4.7.4",
     "webpack-merge": "^5.8.0",
-    "webpackbar": "^5.0.0-3"
+    "webpackbar": "^5.0.2"
+  },
+  "devDependencies": {
+    "@docusaurus/module-type-aliases": "2.0.0-beta.17",
+    "@docusaurus/types": "2.0.0-beta.17",
+    "@types/detect-port": "^1.3.2",
+    "@types/nprogress": "^0.2.0",
+    "@types/react-dom": "^17.0.11",
+    "@types/react-router-config": "^5.0.6",
+    "@types/rtl-detect": "^1.0.0",
+    "@types/serve-handler": "^6.1.1",
+    "@types/update-notifier": "^5.1.0",
+    "@types/wait-on": "^5.3.1",
+    "@types/webpack-bundle-analyzer": "^4.4.1",
+    "react-test-renderer": "^17.0.2",
+    "tmp-promise": "^3.0.3",
+    "tree-node-cli": "^1.5.2"
   },
   "peerDependencies": {
     "react": "^16.8.4 || ^17.0.0",
     "react-dom": "^16.8.4 || ^17.0.0"
   },
   "engines": {
-    "node": ">=12.13.0"
+    "node": ">=14"
   },
-  "gitHead": "34881586224092fb9b5b2f455a46e19b3eee7f08"
+  "gitHead": "0032c0b0480083227af2e1b4da2d3ee6ce992403"
 }