@docusaurus/core 2.0.0-beta.8bda3b2db → 2.0.0-beta.9

package/lib/webpack/server.js

@@ -7,17 +7,17 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const path_1 = tslib_1.__importDefault(require("path"));
-const webpack_merge_1 = tslib_1.__importDefault(require("webpack-merge"));
+const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const webpack_merge_1 = (0, tslib_1.__importDefault)(require("webpack-merge"));
 const base_1 = require("./base");
-const WaitPlugin_1 = tslib_1.__importDefault(require("./plugins/WaitPlugin"));
-const LogPlugin_1 = tslib_1.__importDefault(require("./plugins/LogPlugin"));
+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");
 // Forked for Docusaurus: https://github.com/slorber/static-site-generator-webpack-plugin
-const static_site_generator_webpack_plugin_1 = tslib_1.__importDefault(require("@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 = () => { }, }) {
     const { baseUrl, routesPaths, generatedFilesDir, headTags, preBodyTags, postBodyTags, ssrTemplate, siteConfig: { noIndex, trailingSlash }, } = props;
-    const config = base_1.createBaseConfig(props, true);
+    const config = (0, base_1.createBaseConfig)(props, true);
     const routesLocation = {};
     // Array of paths to be rendered. Relative to output directory
     const ssgPaths = routesPaths.map((str) => {
@@ -25,7 +25,7 @@ function createServerConfig({ props, onLinksCollected = () => { }, }) {
         routesLocation[ssgPath] = str;
         return ssgPath;
     });
-    const serverConfig = webpack_merge_1.default(config, {
+    const serverConfig = (0, webpack_merge_1.default)(config, {
         target: `node${constants_1.NODE_MAJOR_VERSION}.${constants_1.NODE_MINOR_VERSION}`,
         entry: {
             main: path_1.default.resolve(__dirname, '../client/serverEntry.js'),
@@ -57,6 +57,10 @@ function createServerConfig({ props, onLinksCollected = () => { }, }) {
                 },
                 paths: ssgPaths,
                 preferFoldersOutput: trailingSlash,
+                // When using "new URL('file.js', import.meta.url)", Webpack will emit __filename, and this plugin will throw
+                // not sure the __filename value has any importance for this plugin, just using an empty string to avoid the error
+                // See https://github.com/facebook/docusaurus/issues/4922
+                globals: { __filename: '' },
             }),
             // Show compilation progress bar.
             new LogPlugin_1.default({

package/lib/webpack/sharedModuleAliases.js

@@ -7,7 +7,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const module_alias_1 = tslib_1.__importDefault(require("module-alias"));
+const module_alias_1 = (0, tslib_1.__importDefault)(require("module-alias"));
 // The shared module aliases are module aliases that need to work in both SSR/NodeJS + Webpack
 const SharedModuleAliases = {
     // Useful to fix the react-loadable warning

package/lib/webpack/utils.d.ts

@@ -26,9 +26,10 @@ export declare const getCustomizableJSLoader: (jsLoader?: "babel" | ((isServer:
  * @param config initial webpack config
  * @param isServer indicates if this is a server webpack configuration
  * @param jsLoader custom js loader config
+ * @param content content loaded by the plugin
  * @returns final/ modified webpack config
  */
-export declare function applyConfigureWebpack(configureWebpack: ConfigureWebpackFn, config: Configuration, isServer: boolean, jsLoader?: 'babel' | ((isServer: boolean) => RuleSetRule)): Configuration;
+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';

package/lib/webpack/utils.js

@@ -8,15 +8,15 @@
 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;
 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 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 chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 const constants_1 = require("../constants");
 const lodash_1 = require("lodash");
 // Utility method to get style loaders
@@ -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'),
                     ],
                 },
@@ -112,7 +112,7 @@ const getCustomizableJSLoader = (jsLoader = 'babel') => ({ isServer, babelOption
     : jsLoader(isServer);
 exports.getCustomizableJSLoader = getCustomizableJSLoader;
 // TODO remove this before end of 2021?
-const warnBabelLoaderOnce = lodash_1.memoize(function () {
+const warnBabelLoaderOnce = (0, 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) {
@@ -120,7 +120,7 @@ const getBabelLoaderDeprecated = function getBabelLoaderDeprecated(isServer, bab
     return getDefaultBabelLoader({ isServer, babelOptions });
 };
 // TODO remove this before end of 2021 ?
-const warnCacheLoaderOnce = lodash_1.memoize(function () {
+const warnCacheLoaderOnce = (0, lodash_1.memoize)(function () {
     console.warn(chalk_1.default.yellow('Docusaurus uses Webpack 5 and getCacheLoader() usage is now deprecated.'));
 });
 function getCacheLoaderDeprecated() {
@@ -133,24 +133,24 @@ function getCacheLoaderDeprecated() {
  * @param config initial webpack config
  * @param isServer indicates if this is a server webpack configuration
  * @param jsLoader custom js loader config
+ * @param content content loaded by the plugin
  * @returns final/ modified webpack config
  */
-function applyConfigureWebpack(configureWebpack, config, isServer, jsLoader) {
+function applyConfigureWebpack(configureWebpack, config, isServer, jsLoader, content) {
     // 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);
+        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);
         }
     }
@@ -175,16 +175,16 @@ 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) {
@@ -223,8 +223,8 @@ 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;
+    // 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 = {
@@ -324,7 +324,7 @@ function getFileLoaderUtils() {
 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
@@ -390,10 +390,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: {
@@ -424,10 +425,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.8bda3b2db",
+  "version": "2.0.0-beta.9",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -31,89 +31,95 @@
     "url": "https://github.com/facebook/docusaurus/issues"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "2.0.0-beta.8bda3b2db",
+    "@docusaurus/module-type-aliases": "2.0.0-beta.9",
+    "@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"
   },
   "dependencies": {
     "@babel/core": "^7.12.16",
     "@babel/generator": "^7.12.15",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.12.15",
-    "@babel/preset-env": "^7.12.16",
+    "@babel/plugin-transform-runtime": "^7.15.0",
+    "@babel/preset-env": "^7.15.6",
     "@babel/preset-react": "^7.12.13",
     "@babel/preset-typescript": "^7.12.16",
-    "@babel/runtime": "^7.12.5",
-    "@babel/runtime-corejs3": "^7.12.13",
+    "@babel/runtime": "^7.15.4",
+    "@babel/runtime-corejs3": "^7.15.4",
     "@babel/traverse": "^7.12.13",
-    "@docusaurus/cssnano-preset": "2.0.0-beta.8bda3b2db",
-    "@docusaurus/react-loadable": "5.5.0",
-    "@docusaurus/types": "2.0.0-beta.8bda3b2db",
-    "@docusaurus/utils": "2.0.0-beta.8bda3b2db",
-    "@docusaurus/utils-common": "2.0.0-beta.8bda3b2db",
-    "@docusaurus/utils-validation": "2.0.0-beta.8bda3b2db",
+    "@docusaurus/cssnano-preset": "2.0.0-beta.9",
+    "@docusaurus/react-loadable": "5.5.2",
+    "@docusaurus/types": "2.0.0-beta.9",
+    "@docusaurus/utils": "2.0.0-beta.9",
+    "@docusaurus/utils-common": "2.0.0-beta.9",
+    "@docusaurus/utils-validation": "2.0.0-beta.9",
     "@slorber/static-site-generator-webpack-plugin": "^4.0.0",
     "@svgr/webpack": "^5.5.0",
-    "autoprefixer": "^10.2.5",
+    "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",
+    "chalk": "^4.1.2",
+    "chokidar": "^3.5.2",
+    "clean-css": "^5.1.5",
     "commander": "^5.1.0",
-    "copy-webpack-plugin": "^8.1.1",
-    "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": "^2.0.0",
-    "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",
+    "github-slugger": "^1.4.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.1",
+    "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.2",
-    "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.37.0",
+    "wait-on": "^6.0.0",
+    "webpack": "^5.61.0",
     "webpack-bundle-analyzer": "^4.4.2",
-    "webpack-dev-server": "^3.11.2",
-    "webpack-merge": "^5.7.3",
+    "webpack-dev-server": "^4.4.0",
+    "webpack-merge": "^5.8.0",
     "webpackbar": "^5.0.0-3"
   },
   "peerDependencies": {
@@ -121,7 +127,7 @@
     "react-dom": "^16.8.4 || ^17.0.0"
   },
   "engines": {
-    "node": ">=12.13.0"
+    "node": ">=14"
   },
-  "gitHead": "11a61b194f840ae0d554849a71c0d9447ef770af"
+  "gitHead": "8a491fc29ad002f90e97f5b5fe4178ac8fa0c4d7"
 }

package/tsconfig.client.json

@@ -2,11 +2,10 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "incremental": true,
-    "lib": ["DOM"],
+    "lib": ["DOM", "ES2019"],
     "module": "esnext",
     "tsBuildInfoFile": "./lib/client/.tsbuildinfo",
     "outDir": "lib/client",
-    "noImplicitAny": false,
     "jsx": "react"
   },
   "include": ["src/client"]

package/tsconfig.json

@@ -2,12 +2,13 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "incremental": true,
-    "lib": ["DOM"],
+    "lib": ["DOM", "ES2019"],
     "tsBuildInfoFile": "./lib/.tsbuildinfo",
     "rootDir": "src",
     "outDir": "lib",
-    "noImplicitAny": false,
-    "jsx": "react"
+    "jsx": "react",
+    "allowJs": true
   },
-  "exclude": ["node_modules", "**/__tests__/**/*", "**/lib/**/*", "src/client"]
+  "include": ["src"],
+  "exclude": ["**/__tests__/**/*", "src/client"]
 }