@docusaurus/core 2.0.0-beta.12faed89d → 2.0.0-beta.14

package/lib/webpack/utils.js

@@ -6,18 +6,18 @@
  * 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 mini_css_extract_plugin_1 = (0, tslib_1.__importDefault)(require("mini-css-extract-plugin"));
 const webpack_merge_1 = require("webpack-merge");
-const webpack_1 = tslib_1.__importDefault(require("webpack"));
-const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
-const terser_webpack_plugin_1 = tslib_1.__importDefault(require("terser-webpack-plugin"));
-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 webpack_1 = (0, tslib_1.__importDefault)(require("webpack"));
+const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
+const terser_webpack_plugin_1 = (0, tslib_1.__importDefault)(require("terser-webpack-plugin"));
+const css_minimizer_webpack_plugin_1 = (0, tslib_1.__importDefault)(require("css-minimizer-webpack-plugin"));
+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");
 // Utility method to get style loaders
 function getStyleLoaders(isServer, cssOptions = {}) {
@@ -66,7 +66,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'),
                     ],
                 },
@@ -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;
@@ -112,16 +112,16 @@ const getCustomizableJSLoader = (jsLoader = 'babel') => ({ isServer, babelOption
     : 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 warnBabelLoaderOnce = (0, lodash_1.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) {
     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.'));
+const warnCacheLoaderOnce = (0, lodash_1.memoize)(() => {
+    logger_1.default.warn `Docusaurus uses Webpack 5 and code=${'getCacheLoader()'} usage is now deprecated.`;
 });
 function getCacheLoaderDeprecated() {
     warnCacheLoaderOnce();
@@ -140,18 +140,17 @@ function applyConfigureWebpack(configureWebpack, config, isServer, jsLoader, con
     // Export some utility functions
     const utils = {
         getStyleLoaders,
-        getJSLoader: exports.getCustomizableJSLoader(jsLoader),
+        getJSLoader: (0, exports.getCustomizableJSLoader)(jsLoader),
         getBabelLoader: getBabelLoaderDeprecated,
         getCacheLoader: getCacheLoaderDeprecated,
     };
     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),
+            return (0, webpack_merge_1.mergeWithCustomize)({
+                customizeArray: (0, webpack_merge_1.customizeArray)(customizeRules),
+                customizeObject: (0, webpack_merge_1.customizeObject)(customizeRules),
             })(config, res);
         }
     }
@@ -176,24 +175,24 @@ 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);
+    (_b = (_a = config.module) === null || _a === void 0 ? void 0 : _a.rules) === null || _b === void 0 ? void 0 : _b.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);
             }
@@ -204,14 +203,14 @@ function compile(config) {
             }
             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);
+                    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,130 +221,31 @@ 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.`);
+        throw new Error(`You specified ${type} in your env, but the file "${file}" can't be found.`);
     }
     return fs_extra_1.default.readFileSync(file);
 }
@@ -391,10 +291,11 @@ 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,
+                    // @ts-expect-error: API change in new version?
                     warnings: false,
                 },
                 mangle: {
@@ -425,10 +326,12 @@ function getMinimizer(useSimpleCssMinifier = false) {
                 },
                 // CleanCss options
                 {
+                    // @ts-expect-error: API change in new version?
                     inline: false,
                     level: {
                         1: {
                             all: false,
+                            removeWhitespace: true,
                         },
                         2: {
                             all: true,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "2.0.0-beta.12faed89d",
+  "version": "2.0.0-beta.14",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -30,98 +30,103 @@
   "bugs": {
     "url": "https://github.com/facebook/docusaurus/issues"
   },
-  "devDependencies": {
-    "@docusaurus/module-type-aliases": "2.0.0-beta.12faed89d",
-    "@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.16.0",
+    "@babel/generator": "^7.16.0",
     "@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.12faed89d",
-    "@docusaurus/react-loadable": "5.5.0",
-    "@docusaurus/types": "2.0.0-beta.12faed89d",
-    "@docusaurus/utils": "2.0.0-beta.12faed89d",
-    "@docusaurus/utils-common": "2.0.0-beta.12faed89d",
-    "@docusaurus/utils-validation": "2.0.0-beta.12faed89d",
+    "@babel/plugin-transform-runtime": "^7.16.0",
+    "@babel/preset-env": "^7.16.4",
+    "@babel/preset-react": "^7.16.0",
+    "@babel/preset-typescript": "^7.16.0",
+    "@babel/runtime": "^7.16.3",
+    "@babel/runtime-corejs3": "^7.16.3",
+    "@babel/traverse": "^7.16.3",
+    "@docusaurus/cssnano-preset": "2.0.0-beta.14",
+    "@docusaurus/logger": "2.0.0-beta.14",
+    "@docusaurus/mdx-loader": "2.0.0-beta.14",
+    "@docusaurus/react-loadable": "5.5.2",
+    "@docusaurus/utils": "2.0.0-beta.14",
+    "@docusaurus/utils-common": "2.0.0-beta.14",
+    "@docusaurus/utils-validation": "2.0.0-beta.14",
     "@slorber/static-site-generator-webpack-plugin": "^4.0.0",
-    "@svgr/webpack": "^5.5.0",
-    "autoprefixer": "^10.2.5",
+    "@svgr/webpack": "^6.0.0",
+    "autoprefixer": "^10.3.5",
     "babel-loader": "^8.2.2",
     "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",
+    "chokidar": "^3.5.2",
+    "clean-css": "^5.1.5",
     "commander": "^5.1.0",
-    "copy-webpack-plugin": "^9.0.0",
-    "core-js": "^3.9.1",
+    "copy-webpack-plugin": "^9.0.1",
+    "core-js": "^3.18.0",
     "css-loader": "^5.1.1",
-    "css-minimizer-webpack-plugin": "^3.0.1",
-    "cssnano": "^5.0.4",
+    "css-minimizer-webpack-plugin": "^3.0.2",
+    "cssnano": "^5.0.8",
     "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",
+    "html-minifier-terser": "^6.0.2",
     "html-tags": "^3.1.0",
-    "html-webpack-plugin": "^5.3.2",
+    "html-webpack-plugin": "^5.4.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",
     "nprogress": "^0.2.0",
-    "postcss": "^8.2.15",
-    "postcss-loader": "^5.3.0",
+    "postcss": "^8.3.7",
+    "postcss-loader": "^6.1.1",
     "prompts": "^2.4.1",
-    "react-dev-utils": "^11.0.1",
+    "react-dev-utils": "12.0.0-next.47",
     "react-error-overlay": "^6.0.9",
     "react-helmet": "^6.1.0",
-    "react-loadable": "^5.5.0",
+    "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",
+    "remark-admonitions": "^1.2.1",
     "resolve-pathname": "^3.0.0",
-    "rtl-detect": "^1.0.3",
+    "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",
+    "terser-webpack-plugin": "^5.2.4",
+    "tslib": "^2.3.1",
     "update-notifier": "^5.1.0",
     "url-loader": "^4.1.1",
-    "wait-on": "^5.3.0",
-    "webpack": "^5.40.0",
+    "wait-on": "^6.0.0",
+    "webpack": "^5.61.0",
     "webpack-bundle-analyzer": "^4.4.2",
-    "webpack-dev-server": "^3.11.2",
+    "webpack-dev-server": "^4.5.0",
     "webpack-merge": "^5.8.0",
     "webpackbar": "^5.0.0-3"
   },
+  "devDependencies": {
+    "@docusaurus/module-type-aliases": "2.0.0-beta.14",
+    "@docusaurus/types": "2.0.0-beta.14",
+    "@types/copy-webpack-plugin": "^8.0.1",
+    "@types/css-minimizer-webpack-plugin": "^3.0.2",
+    "@types/detect-port": "^1.3.0",
+    "@types/mini-css-extract-plugin": "^1.4.3",
+    "@types/nprogress": "^0.2.0",
+    "@types/react-dom": "^17.0.9",
+    "@types/rtl-detect": "^1.0.0",
+    "@types/serve-handler": "^6.1.1",
+    "@types/webpack-bundle-analyzer": "^4.4.1",
+    "tmp-promise": "^3.0.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": "1430dbacfbe9da59a17ce395ed29bdbddaf90049"
+  "gitHead": "c4824a8937d8f1aa0806667749cbc74058e2b294"
 }