@docusaurus/bundler 0.0.0-6097 → 0.0.0-6098

package/lib/importFaster.d.ts

@@ -7,7 +7,10 @@
 import type { ConfigureWebpackUtils } from '@docusaurus/types';
 import type { MinimizerOptions as JsMinimizerOptions, CustomOptions } from 'terser-webpack-plugin';
 import type { MinimizerOptions as CssMinimizerOptions } from 'css-minimizer-webpack-plugin';
+type FasterModule = Awaited<typeof import('@docusaurus/faster')>;
 export declare function importSwcJsLoaderFactory(): Promise<ConfigureWebpackUtils['getJSLoader']>;
 export declare function importSwcJsMinimizerOptions(): Promise<JsMinimizerOptions<CustomOptions>>;
+export declare function importSwcHtmlMinifier(): Promise<ReturnType<FasterModule['getSwcHtmlMinifier']>>;
 export declare function importLightningCssMinimizerOptions(): Promise<CssMinimizerOptions<CustomOptions>>;
+export {};
 //# sourceMappingURL=importFaster.d.ts.map

package/lib/importFaster.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"importFaster.d.ts","sourceRoot":"","sources":["../src/importFaster.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,mBAAmB,CAAC;AAC7D,OAAO,KAAK,EACV,gBAAgB,IAAI,kBAAkB,EACtC,aAAa,EACd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAC,gBAAgB,IAAI,mBAAmB,EAAC,MAAM,8BAA8B,CAAC;AAiB1F,wBAAsB,wBAAwB,IAAI,OAAO,CACvD,qBAAqB,CAAC,aAAa,CAAC,CACrC,CAGA;AAED,wBAAsB,2BAA2B,IAAI,OAAO,CAC1D,kBAAkB,CAAC,aAAa,CAAC,CAClC,CAGA;AAED,wBAAsB,kCAAkC,IAAI,OAAO,CACjE,mBAAmB,CAAC,aAAa,CAAC,CACnC,CAGA"}
+{"version":3,"file":"importFaster.d.ts","sourceRoot":"","sources":["../src/importFaster.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,mBAAmB,CAAC;AAC7D,OAAO,KAAK,EACV,gBAAgB,IAAI,kBAAkB,EACtC,aAAa,EACd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAC,gBAAgB,IAAI,mBAAmB,EAAC,MAAM,8BAA8B,CAAC;AAE1F,KAAK,YAAY,GAAG,OAAO,CAAC,cAAc,oBAAoB,CAAC,CAAC,CAAC;AAiBjE,wBAAsB,wBAAwB,IAAI,OAAO,CACvD,qBAAqB,CAAC,aAAa,CAAC,CACrC,CAGA;AAED,wBAAsB,2BAA2B,IAAI,OAAO,CAC1D,kBAAkB,CAAC,aAAa,CAAC,CAClC,CAGA;AAED,wBAAsB,qBAAqB,IAAI,OAAO,CACpD,UAAU,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAAC,CAC/C,CAGA;AAED,wBAAsB,kCAAkC,IAAI,OAAO,CACjE,mBAAmB,CAAC,aAAa,CAAC,CACnC,CAGA"}

package/lib/importFaster.js

@@ -8,6 +8,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.importSwcJsLoaderFactory = importSwcJsLoaderFactory;
 exports.importSwcJsMinimizerOptions = importSwcJsMinimizerOptions;
+exports.importSwcHtmlMinifier = importSwcHtmlMinifier;
 exports.importLightningCssMinimizerOptions = importLightningCssMinimizerOptions;
 async function importFaster() {
     return import('@docusaurus/faster');
@@ -28,6 +29,10 @@ async function importSwcJsMinimizerOptions() {
     const faster = await ensureFaster();
     return faster.getSwcJsMinimizerOptions();
 }
+async function importSwcHtmlMinifier() {
+    const faster = await ensureFaster();
+    return faster.getSwcHtmlMinifier();
+}
 async function importLightningCssMinimizerOptions() {
     const faster = await ensureFaster();
     return faster.getLightningCssMinimizerOptions();

package/lib/importFaster.js.map

@@ -1 +1 @@
-{"version":3,"file":"importFaster.js","sourceRoot":"","sources":["../src/importFaster.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAwBH,4DAKC;AAED,kEAKC;AAED,gFAKC;AAlCD,KAAK,UAAU,YAAY;IACzB,OAAO,MAAM,CAAC,oBAAoB,CAAC,CAAC;AACtC,CAAC;AAED,KAAK,UAAU,YAAY;IACzB,IAAI,CAAC;QACH,OAAO,MAAM,YAAY,EAAE,CAAC;IAC9B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CACb,kFAAkF,EAClF,EAAC,KAAK,EAAE,KAAK,EAAC,CACf,CAAC;IACJ,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,wBAAwB;IAG5C,MAAM,MAAM,GAAG,MAAM,YAAY,EAAE,CAAC;IACpC,OAAO,MAAM,CAAC,qBAAqB,CAAC;AACtC,CAAC;AAEM,KAAK,UAAU,2BAA2B;IAG/C,MAAM,MAAM,GAAG,MAAM,YAAY,EAAE,CAAC;IACpC,OAAO,MAAM,CAAC,wBAAwB,EAAuC,CAAC;AAChF,CAAC;AAEM,KAAK,UAAU,kCAAkC;IAGtD,MAAM,MAAM,GAAG,MAAM,YAAY,EAAE,CAAC;IACpC,OAAO,MAAM,CAAC,+BAA+B,EAAwC,CAAC;AACxF,CAAC"}
+{"version":3,"file":"importFaster.js","sourceRoot":"","sources":["../src/importFaster.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AA0BH,4DAKC;AAED,kEAKC;AAED,sDAKC;AAED,gFAKC;AAzCD,KAAK,UAAU,YAAY;IACzB,OAAO,MAAM,CAAC,oBAAoB,CAAC,CAAC;AACtC,CAAC;AAED,KAAK,UAAU,YAAY;IACzB,IAAI,CAAC;QACH,OAAO,MAAM,YAAY,EAAE,CAAC;IAC9B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CACb,kFAAkF,EAClF,EAAC,KAAK,EAAE,KAAK,EAAC,CACf,CAAC;IACJ,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,wBAAwB;IAG5C,MAAM,MAAM,GAAG,MAAM,YAAY,EAAE,CAAC;IACpC,OAAO,MAAM,CAAC,qBAAqB,CAAC;AACtC,CAAC;AAEM,KAAK,UAAU,2BAA2B;IAG/C,MAAM,MAAM,GAAG,MAAM,YAAY,EAAE,CAAC;IACpC,OAAO,MAAM,CAAC,wBAAwB,EAAuC,CAAC;AAChF,CAAC;AAEM,KAAK,UAAU,qBAAqB;IAGzC,MAAM,MAAM,GAAG,MAAM,YAAY,EAAE,CAAC;IACpC,OAAO,MAAM,CAAC,kBAAkB,EAAE,CAAC;AACrC,CAAC;AAEM,KAAK,UAAU,kCAAkC;IAGtD,MAAM,MAAM,GAAG,MAAM,YAAY,EAAE,CAAC;IACpC,OAAO,MAAM,CAAC,+BAA+B,EAAwC,CAAC;AACxF,CAAC"}

package/lib/index.d.ts

@@ -7,6 +7,7 @@
 export { printStatsWarnings, formatStatsErrorMessage, compile } from './compiler';
 export { getCurrentBundler, getCSSExtractPlugin, getCopyPlugin, getProgressBarPlugin, } from './currentBundler';
 export { getMinimizers } from './minification';
+export { getHtmlMinifier, type HtmlMinifier } from './minifyHtml';
 export { createJsLoaderFactory } from './loaders/jsLoader';
 export { createStyleLoadersFactory } from './loaders/styleLoader';
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAC,kBAAkB,EAAE,uBAAuB,EAAE,OAAO,EAAC,MAAM,YAAY,CAAC;AAEhF,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACnB,aAAa,EACb,oBAAoB,GACrB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAC,qBAAqB,EAAC,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAC,yBAAyB,EAAC,MAAM,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAC,kBAAkB,EAAE,uBAAuB,EAAE,OAAO,EAAC,MAAM,YAAY,CAAC;AAEhF,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACnB,aAAa,EACb,oBAAoB,GACrB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAC,eAAe,EAAE,KAAK,YAAY,EAAC,MAAM,cAAc,CAAC;AAChE,OAAO,EAAC,qBAAqB,EAAC,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAC,yBAAyB,EAAC,MAAM,uBAAuB,CAAC"}

package/lib/index.js

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createStyleLoadersFactory = exports.createJsLoaderFactory = exports.getMinimizers = exports.getProgressBarPlugin = exports.getCopyPlugin = exports.getCSSExtractPlugin = exports.getCurrentBundler = exports.compile = exports.formatStatsErrorMessage = exports.printStatsWarnings = void 0;
+exports.createStyleLoadersFactory = exports.createJsLoaderFactory = exports.getHtmlMinifier = exports.getMinimizers = exports.getProgressBarPlugin = exports.getCopyPlugin = exports.getCSSExtractPlugin = exports.getCurrentBundler = exports.compile = exports.formatStatsErrorMessage = exports.printStatsWarnings = void 0;
 var compiler_1 = require("./compiler");
 Object.defineProperty(exports, "printStatsWarnings", { enumerable: true, get: function () { return compiler_1.printStatsWarnings; } });
 Object.defineProperty(exports, "formatStatsErrorMessage", { enumerable: true, get: function () { return compiler_1.formatStatsErrorMessage; } });
@@ -18,6 +18,8 @@ Object.defineProperty(exports, "getCopyPlugin", { enumerable: true, get: functio
 Object.defineProperty(exports, "getProgressBarPlugin", { enumerable: true, get: function () { return currentBundler_1.getProgressBarPlugin; } });
 var minification_1 = require("./minification");
 Object.defineProperty(exports, "getMinimizers", { enumerable: true, get: function () { return minification_1.getMinimizers; } });
+var minifyHtml_1 = require("./minifyHtml");
+Object.defineProperty(exports, "getHtmlMinifier", { enumerable: true, get: function () { return minifyHtml_1.getHtmlMinifier; } });
 var jsLoader_1 = require("./loaders/jsLoader");
 Object.defineProperty(exports, "createJsLoaderFactory", { enumerable: true, get: function () { return jsLoader_1.createJsLoaderFactory; } });
 var styleLoader_1 = require("./loaders/styleLoader");

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,uCAAgF;AAAxE,8GAAA,kBAAkB,OAAA;AAAE,mHAAA,uBAAuB,OAAA;AAAE,mGAAA,OAAO,OAAA;AAE5D,mDAK0B;AAJxB,mHAAA,iBAAiB,OAAA;AACjB,qHAAA,mBAAmB,OAAA;AACnB,+GAAA,aAAa,OAAA;AACb,sHAAA,oBAAoB,OAAA;AAGtB,+CAA6C;AAArC,6GAAA,aAAa,OAAA;AACrB,+CAAyD;AAAjD,iHAAA,qBAAqB,OAAA;AAC7B,qDAAgE;AAAxD,wHAAA,yBAAyB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,uCAAgF;AAAxE,8GAAA,kBAAkB,OAAA;AAAE,mHAAA,uBAAuB,OAAA;AAAE,mGAAA,OAAO,OAAA;AAE5D,mDAK0B;AAJxB,mHAAA,iBAAiB,OAAA;AACjB,qHAAA,mBAAmB,OAAA;AACnB,+GAAA,aAAa,OAAA;AACb,sHAAA,oBAAoB,OAAA;AAGtB,+CAA6C;AAArC,6GAAA,aAAa,OAAA;AACrB,2CAAgE;AAAxD,6GAAA,eAAe,OAAA;AACvB,+CAAyD;AAAjD,iHAAA,qBAAqB,OAAA;AAC7B,qDAAgE;AAAxD,wHAAA,yBAAyB,OAAA"}

package/lib/minifyHtml.d.ts

@@ -0,0 +1,20 @@
+/**
+ * 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.
+ */
+import type { DocusaurusConfig } from '@docusaurus/types';
+export type HtmlMinifier = {
+    minify: (html: string) => Promise<string>;
+};
+type SiteConfigSlice = {
+    future: {
+        experimental_faster: Pick<DocusaurusConfig['future']['experimental_faster'], 'swcHtmlMinimizer'>;
+    };
+};
+export declare function getHtmlMinifier({ siteConfig, }: {
+    siteConfig: SiteConfigSlice;
+}): Promise<HtmlMinifier>;
+export {};
+//# sourceMappingURL=minifyHtml.d.ts.map

package/lib/minifyHtml.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"minifyHtml.d.ts","sourceRoot":"","sources":["../src/minifyHtml.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,mBAAmB,CAAC;AAKxD,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CAC3C,CAAC;AAMF,KAAK,eAAe,GAAG;IACrB,MAAM,EAAE;QACN,mBAAmB,EAAE,IAAI,CACvB,gBAAgB,CAAC,QAAQ,CAAC,CAAC,qBAAqB,CAAC,EACjD,kBAAkB,CACnB,CAAC;KACH,CAAC;CACH,CAAC;AAEF,wBAAsB,eAAe,CAAC,EACpC,UAAU,GACX,EAAE;IACD,UAAU,EAAE,eAAe,CAAC;CAC7B,GAAG,OAAO,CAAC,YAAY,CAAC,CASxB"}

package/lib/minifyHtml.js

@@ -0,0 +1,117 @@
+"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.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getHtmlMinifier = getHtmlMinifier;
+const tslib_1 = require("tslib");
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
+const html_minifier_terser_1 = require("html-minifier-terser");
+const importFaster_1 = require("./importFaster");
+// Historical env variable
+const SkipHtmlMinification = process.env.SKIP_HTML_MINIFICATION === 'true';
+const NoopMinifier = {
+    minify: async (html) => html,
+};
+async function getHtmlMinifier({ siteConfig, }) {
+    if (SkipHtmlMinification) {
+        return NoopMinifier;
+    }
+    if (siteConfig.future.experimental_faster.swcHtmlMinimizer) {
+        return getSwcMinifier();
+    }
+    else {
+        return getTerserMinifier();
+    }
+}
+// Minify html with https://github.com/DanielRuf/html-minifier-terser
+async function getTerserMinifier() {
+    return {
+        minify: async function minifyHtmlWithTerser(html) {
+            try {
+                return await (0, html_minifier_terser_1.minify)(html, {
+                    removeComments: false,
+                    removeRedundantAttributes: true,
+                    removeEmptyAttributes: true,
+                    removeScriptTypeAttributes: true,
+                    removeStyleLinkTypeAttributes: true,
+                    useShortDoctype: true,
+                    minifyJS: true,
+                });
+            }
+            catch (err) {
+                throw new Error(`HTML minification failed (Terser)`, {
+                    cause: err,
+                });
+            }
+        },
+    };
+}
+// Minify html with @swc/html
+// Not well-documented but fast!
+// See https://github.com/swc-project/swc/discussions/9616
+async function getSwcMinifier() {
+    const swcHtmlMinifier = await (0, importFaster_1.importSwcHtmlMinifier)();
+    return {
+        minify: async function minifyHtmlWithSwc(html) {
+            try {
+                const result = await swcHtmlMinifier(Buffer.from(html), {
+                    // Removing comments can lead to React hydration errors
+                    // See https://x.com/sebastienlorber/status/1841966927440478577
+                    removeComments: false,
+                    // TODO maybe it's fine to only keep <!-- --> React comments?
+                    preserveComments: [],
+                    // Sorting these attributes (class) can lead to React hydration errors
+                    sortSpaceSeparatedAttributeValues: false,
+                    sortAttributes: false,
+                    // @ts-expect-error: bad type https://github.com/swc-project/swc/pull/9615
+                    removeRedundantAttributes: 'all',
+                    removeEmptyAttributes: true,
+                    minifyJs: true,
+                    minifyJson: true,
+                    minifyCss: true,
+                });
+                // Escape hatch because SWC is quite aggressive to report errors
+                // TODO figure out what to do with these errors: throw or swallow?
+                //  See https://github.com/facebook/docusaurus/pull/10554
+                //  See https://github.com/swc-project/swc/discussions/9616#discussioncomment-10846201
+                const ignoreSwcMinifierErrors = process.env.DOCUSAURUS_IGNORE_SWC_HTML_MINIFIER_ERRORS === 'true';
+                if (!ignoreSwcMinifierErrors && result.errors) {
+                    const ignoredErrors = [
+                        // TODO Docusaurus seems to emit NULL chars, and minifier detects it
+                        //  see https://github.com/facebook/docusaurus/issues/9985
+                        'Unexpected null character',
+                    ];
+                    result.errors = result.errors.filter((diagnostic) => !ignoredErrors.includes(diagnostic.message));
+                    if (result.errors.length) {
+                        throw new Error(`HTML minification diagnostic errors:
+- ${result.errors
+                            .map((diagnostic) => `[${diagnostic.level}] ${diagnostic.message} - ${JSON.stringify(diagnostic.span)}`)
+                            .join('\n- ')}
+Note: please report the problem to the Docusaurus team
+In the meantime, you can skip this error with ${logger_1.default.code('DOCUSAURUS_IGNORE_SWC_HTML_MINIFIER_ERRORS=true')}`);
+                    }
+                    /*
+                    if (result.errors.length) {
+                      throw new AggregateError(
+                        result.errors.map(
+                          (diagnostic) => new Error(JSON.stringify(diagnostic, null, 2)),
+                        ),
+                      );
+                    }
+                     */
+                }
+                return result.code;
+            }
+            catch (err) {
+                throw new Error(`HTML minification failed (SWC)`, {
+                    cause: err,
+                });
+            }
+        },
+    };
+}
+//# sourceMappingURL=minifyHtml.js.map

package/lib/minifyHtml.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"minifyHtml.js","sourceRoot":"","sources":["../src/minifyHtml.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/bundler",
-  "version": "0.0.0-6097",
+  "version": "0.0.0-6098",
   "description": "Docusaurus util package to abstract the current bundler.",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -19,12 +19,12 @@
   "license": "MIT",
   "dependencies": {
     "@babel/core": "^7.23.3",
-    "@docusaurus/babel": "0.0.0-6097",
-    "@docusaurus/cssnano-preset": "0.0.0-6097",
-    "@docusaurus/faster": "0.0.0-6097",
-    "@docusaurus/logger": "0.0.0-6097",
-    "@docusaurus/types": "0.0.0-6097",
-    "@docusaurus/utils": "0.0.0-6097",
+    "@docusaurus/babel": "0.0.0-6098",
+    "@docusaurus/cssnano-preset": "0.0.0-6098",
+    "@docusaurus/faster": "0.0.0-6098",
+    "@docusaurus/logger": "0.0.0-6098",
+    "@docusaurus/types": "0.0.0-6098",
+    "@docusaurus/utils": "0.0.0-6098",
     "autoprefixer": "^10.4.14",
     "babel-loader": "^9.1.3",
     "clean-css": "^5.3.2",
@@ -33,6 +33,7 @@
     "css-minimizer-webpack-plugin": "^5.0.1",
     "cssnano": "^6.1.2",
     "file-loader": "^6.2.0",
+    "html-minifier-terser": "^7.2.0",
     "mini-css-extract-plugin": "^2.9.1",
     "null-loader": "^4.0.1",
     "postcss": "^8.4.26",
@@ -50,5 +51,5 @@
   "engines": {
     "node": ">=18.0"
   },
-  "gitHead": "100530cd36591548d4c29cbac58ddd10a91a6686"
+  "gitHead": "d0a89b89c2ace47f7e76829fbf41681cde932bb9"
 }

package/src/importFaster.ts

@@ -12,11 +12,13 @@ import type {
 } from 'terser-webpack-plugin';
 import type {MinimizerOptions as CssMinimizerOptions} from 'css-minimizer-webpack-plugin';
 
-async function importFaster() {
+type FasterModule = Awaited<typeof import('@docusaurus/faster')>;
+
+async function importFaster(): Promise<FasterModule> {
   return import('@docusaurus/faster');
 }
 
-async function ensureFaster() {
+async function ensureFaster(): Promise<FasterModule> {
   try {
     return await importFaster();
   } catch (error) {
@@ -41,6 +43,13 @@ export async function importSwcJsMinimizerOptions(): Promise<
   return faster.getSwcJsMinimizerOptions() as JsMinimizerOptions<CustomOptions>;
 }
 
+export async function importSwcHtmlMinifier(): Promise<
+  ReturnType<FasterModule['getSwcHtmlMinifier']>
+> {
+  const faster = await ensureFaster();
+  return faster.getSwcHtmlMinifier();
+}
+
 export async function importLightningCssMinimizerOptions(): Promise<
   CssMinimizerOptions<CustomOptions>
 > {

package/src/index.ts

@@ -15,5 +15,6 @@ export {
 } from './currentBundler';
 
 export {getMinimizers} from './minification';
+export {getHtmlMinifier, type HtmlMinifier} from './minifyHtml';
 export {createJsLoaderFactory} from './loaders/jsLoader';
 export {createStyleLoadersFactory} from './loaders/styleLoader';

package/src/minifyHtml.ts

@@ -0,0 +1,148 @@
+/**
+ * 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.
+ */
+
+import logger from '@docusaurus/logger';
+import {minify as terserHtmlMinifier} from 'html-minifier-terser';
+import {importSwcHtmlMinifier} from './importFaster';
+import type {DocusaurusConfig} from '@docusaurus/types';
+
+// Historical env variable
+const SkipHtmlMinification = process.env.SKIP_HTML_MINIFICATION === 'true';
+
+export type HtmlMinifier = {
+  minify: (html: string) => Promise<string>;
+};
+
+const NoopMinifier: HtmlMinifier = {
+  minify: async (html: string) => html,
+};
+
+type SiteConfigSlice = {
+  future: {
+    experimental_faster: Pick<
+      DocusaurusConfig['future']['experimental_faster'],
+      'swcHtmlMinimizer'
+    >;
+  };
+};
+
+export async function getHtmlMinifier({
+  siteConfig,
+}: {
+  siteConfig: SiteConfigSlice;
+}): Promise<HtmlMinifier> {
+  if (SkipHtmlMinification) {
+    return NoopMinifier;
+  }
+  if (siteConfig.future.experimental_faster.swcHtmlMinimizer) {
+    return getSwcMinifier();
+  } else {
+    return getTerserMinifier();
+  }
+}
+
+// Minify html with https://github.com/DanielRuf/html-minifier-terser
+async function getTerserMinifier(): Promise<HtmlMinifier> {
+  return {
+    minify: async function minifyHtmlWithTerser(html) {
+      try {
+        return await terserHtmlMinifier(html, {
+          removeComments: false,
+          removeRedundantAttributes: true,
+          removeEmptyAttributes: true,
+          removeScriptTypeAttributes: true,
+          removeStyleLinkTypeAttributes: true,
+          useShortDoctype: true,
+          minifyJS: true,
+        });
+      } catch (err) {
+        throw new Error(`HTML minification failed (Terser)`, {
+          cause: err as Error,
+        });
+      }
+    },
+  };
+}
+
+// Minify html with @swc/html
+// Not well-documented but fast!
+// See https://github.com/swc-project/swc/discussions/9616
+async function getSwcMinifier(): Promise<HtmlMinifier> {
+  const swcHtmlMinifier = await importSwcHtmlMinifier();
+  return {
+    minify: async function minifyHtmlWithSwc(html) {
+      try {
+        const result = await swcHtmlMinifier(Buffer.from(html), {
+          // Removing comments can lead to React hydration errors
+          // See https://x.com/sebastienlorber/status/1841966927440478577
+          removeComments: false,
+          // TODO maybe it's fine to only keep <!-- --> React comments?
+          preserveComments: [],
+
+          // Sorting these attributes (class) can lead to React hydration errors
+          sortSpaceSeparatedAttributeValues: false,
+          sortAttributes: false,
+
+          // @ts-expect-error: bad type https://github.com/swc-project/swc/pull/9615
+          removeRedundantAttributes: 'all',
+          removeEmptyAttributes: true,
+          minifyJs: true,
+          minifyJson: true,
+          minifyCss: true,
+        });
+
+        // Escape hatch because SWC is quite aggressive to report errors
+        // TODO figure out what to do with these errors: throw or swallow?
+        //  See https://github.com/facebook/docusaurus/pull/10554
+        //  See https://github.com/swc-project/swc/discussions/9616#discussioncomment-10846201
+        const ignoreSwcMinifierErrors =
+          process.env.DOCUSAURUS_IGNORE_SWC_HTML_MINIFIER_ERRORS === 'true';
+        if (!ignoreSwcMinifierErrors && result.errors) {
+          const ignoredErrors: string[] = [
+            // TODO Docusaurus seems to emit NULL chars, and minifier detects it
+            //  see https://github.com/facebook/docusaurus/issues/9985
+            'Unexpected null character',
+          ];
+          result.errors = result.errors.filter(
+            (diagnostic) => !ignoredErrors.includes(diagnostic.message),
+          );
+          if (result.errors.length) {
+            throw new Error(
+              `HTML minification diagnostic errors:
+- ${result.errors
+                .map(
+                  (diagnostic) =>
+                    `[${diagnostic.level}] ${
+                      diagnostic.message
+                    } - ${JSON.stringify(diagnostic.span)}`,
+                )
+                .join('\n- ')}
+Note: please report the problem to the Docusaurus team
+In the meantime, you can skip this error with ${logger.code(
+                'DOCUSAURUS_IGNORE_SWC_HTML_MINIFIER_ERRORS=true',
+              )}`,
+            );
+          }
+          /*
+          if (result.errors.length) {
+            throw new AggregateError(
+              result.errors.map(
+                (diagnostic) => new Error(JSON.stringify(diagnostic, null, 2)),
+              ),
+            );
+          }
+           */
+        }
+        return result.code;
+      } catch (err) {
+        throw new Error(`HTML minification failed (SWC)`, {
+          cause: err as Error,
+        });
+      }
+    },
+  };
+}