@docusaurus/core 0.0.0-6096 → 0.0.0-6098

package/lib/commands/build.js

@@ -157,13 +157,17 @@ async function executeSSG({ props, serverBundlePath, clientManifestPath, router,
         logger_1.PerfLogger.end('Generate Hash Router entry point');
         return { collectedData: {} };
     }
-    const renderer = await logger_1.PerfLogger.async('Load App renderer', () => (0, ssg_1.loadAppRenderer)({
-        serverBundlePath,
-    }));
+    const [renderer, htmlMinifier] = await Promise.all([
+        logger_1.PerfLogger.async('Load App renderer', () => (0, ssg_1.loadAppRenderer)({
+            serverBundlePath,
+        })),
+        logger_1.PerfLogger.async('Load HTML minifier', () => (0, bundler_1.getHtmlMinifier)({ siteConfig: props.siteConfig })),
+    ]);
     const ssgResult = await logger_1.PerfLogger.async('Generate static files', () => (0, ssg_1.generateStaticFiles)({
         pathnames: props.routesPaths,
         renderer,
         params,
+        htmlMinifier,
     }));
     return ssgResult;
 }

package/lib/server/configValidation.js

@@ -25,6 +25,7 @@ exports.DEFAULT_STORAGE_CONFIG = {
 exports.DEFAULT_FASTER_CONFIG = {
     swcJsLoader: false,
     swcJsMinimizer: false,
+    swcHtmlMinimizer: false,
     lightningCssMinimizer: false,
     mdxCrossCompilerCache: false,
     rspackBundler: false,
@@ -33,6 +34,7 @@ exports.DEFAULT_FASTER_CONFIG = {
 exports.DEFAULT_FASTER_CONFIG_TRUE = {
     swcJsLoader: true,
     swcJsMinimizer: true,
+    swcHtmlMinimizer: true,
     lightningCssMinimizer: true,
     mdxCrossCompilerCache: true,
     rspackBundler: true,
@@ -150,6 +152,7 @@ const FASTER_CONFIG_SCHEMA = utils_validation_1.Joi.alternatives()
     .try(utils_validation_1.Joi.object({
     swcJsLoader: utils_validation_1.Joi.boolean().default(exports.DEFAULT_FASTER_CONFIG.swcJsLoader),
     swcJsMinimizer: utils_validation_1.Joi.boolean().default(exports.DEFAULT_FASTER_CONFIG.swcJsMinimizer),
+    swcHtmlMinimizer: utils_validation_1.Joi.boolean().default(exports.DEFAULT_FASTER_CONFIG.swcHtmlMinimizer),
     lightningCssMinimizer: utils_validation_1.Joi.boolean().default(exports.DEFAULT_FASTER_CONFIG.lightningCssMinimizer),
     mdxCrossCompilerCache: utils_validation_1.Joi.boolean().default(exports.DEFAULT_FASTER_CONFIG.mdxCrossCompilerCache),
     rspackBundler: utils_validation_1.Joi.boolean().default(exports.DEFAULT_FASTER_CONFIG.rspackBundler),

package/lib/ssg.d.ts

@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 import type { AppRenderer, SiteCollectedData } from './common';
+import type { HtmlMinifier } from '@docusaurus/bundler';
 import type { Manifest } from 'react-loadable-ssr-addon-v5-slorber';
 import type { SSRTemplateCompiled } from './templates/templates';
 export type SSGParams = {
@@ -22,10 +23,11 @@ export type SSGParams = {
 export declare function loadAppRenderer({ serverBundlePath, }: {
     serverBundlePath: string;
 }): Promise<AppRenderer>;
-export declare function generateStaticFiles({ pathnames, renderer, params, }: {
+export declare function generateStaticFiles({ pathnames, renderer, params, htmlMinifier, }: {
     pathnames: string[];
     renderer: AppRenderer;
     params: SSGParams;
+    htmlMinifier: HtmlMinifier;
 }): Promise<{
     collectedData: SiteCollectedData;
 }>;

package/lib/ssg.js

@@ -16,7 +16,6 @@ const path_1 = tslib_1.__importDefault(require("path"));
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const eval_1 = tslib_1.__importDefault(require("eval"));
 const p_map_1 = tslib_1.__importDefault(require("p-map"));
-const html_minifier_terser_1 = require("html-minifier-terser");
 const logger_1 = tslib_1.__importStar(require("@docusaurus/logger"));
 const templates_1 = require("./templates/templates");
 // Secret way to set SSR plugin concurrency option
@@ -67,13 +66,14 @@ function pathnameToFilename({ pathname, trailingSlash, }) {
     }
     return `${outputFileName}.html`;
 }
-async function generateStaticFiles({ pathnames, renderer, params, }) {
+async function generateStaticFiles({ pathnames, renderer, params, htmlMinifier, }) {
     // Note that we catch all async errors on purpose
     // Docusaurus presents all the SSG errors to the user, not just the first one
     const results = await (0, p_map_1.default)(pathnames, async (pathname) => generateStaticFile({
         pathname,
         renderer,
         params,
+        htmlMinifier,
     }).then((result) => ({ pathname, result, error: null }), (error) => ({ pathname, result: null, error: error })), { concurrency: Concurrency });
     const [allSSGErrors, allSSGSuccesses] = lodash_1.default.partition(results, (r) => !!r.error);
     if (allSSGErrors.length > 0) {
@@ -92,7 +92,7 @@ async function generateStaticFiles({ pathnames, renderer, params, }) {
         .value();
     return { collectedData };
 }
-async function generateStaticFile({ pathname, renderer, params, }) {
+async function generateStaticFile({ pathname, renderer, params, htmlMinifier, }) {
     try {
         // This only renders the app HTML
         const result = await renderer({
@@ -103,7 +103,7 @@ async function generateStaticFile({ pathname, renderer, params, }) {
             params,
             result,
         });
-        const content = await minifyHtml(fullPageHtml);
+        const content = await htmlMinifier.minify(fullPageHtml);
         await writeStaticFile({
             pathname,
             content,
@@ -151,23 +151,3 @@ async function writeStaticFile({ content, pathname, params, }) {
     await fs_extra_1.default.ensureDir(path_1.default.dirname(filePath));
     await fs_extra_1.default.writeFile(filePath, content);
 }
-async function minifyHtml(html) {
-    try {
-        if (process.env.SKIP_HTML_MINIFICATION === 'true') {
-            return html;
-        }
-        // Minify html with https://github.com/DanielRuf/html-minifier-terser
-        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', { cause: err });
-    }
-}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "0.0.0-6096",
+  "version": "0.0.0-6098",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -33,13 +33,13 @@
     "url": "https://github.com/facebook/docusaurus/issues"
   },
   "dependencies": {
-    "@docusaurus/babel": "0.0.0-6096",
-    "@docusaurus/bundler": "0.0.0-6096",
-    "@docusaurus/logger": "0.0.0-6096",
-    "@docusaurus/mdx-loader": "0.0.0-6096",
-    "@docusaurus/utils": "0.0.0-6096",
-    "@docusaurus/utils-common": "0.0.0-6096",
-    "@docusaurus/utils-validation": "0.0.0-6096",
+    "@docusaurus/babel": "0.0.0-6098",
+    "@docusaurus/bundler": "0.0.0-6098",
+    "@docusaurus/logger": "0.0.0-6098",
+    "@docusaurus/mdx-loader": "0.0.0-6098",
+    "@docusaurus/utils": "0.0.0-6098",
+    "@docusaurus/utils-common": "0.0.0-6098",
+    "@docusaurus/utils-validation": "0.0.0-6098",
     "boxen": "^6.2.1",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
@@ -53,9 +53,8 @@
     "eta": "^2.2.0",
     "eval": "^0.1.8",
     "fs-extra": "^11.1.1",
-    "html-minifier-terser": "^7.2.0",
     "html-tags": "^3.3.1",
-    "html-webpack-plugin": "^5.5.3",
+    "html-webpack-plugin": "^5.6.0",
     "leven": "^3.1.0",
     "lodash": "^4.17.21",
     "p-map": "^4.0.0",
@@ -79,8 +78,8 @@
     "webpack-merge": "^6.0.1"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-6096",
-    "@docusaurus/types": "0.0.0-6096",
+    "@docusaurus/module-type-aliases": "0.0.0-6098",
+    "@docusaurus/types": "0.0.0-6098",
     "@total-typescript/shoehorn": "^0.1.2",
     "@types/detect-port": "^1.3.3",
     "@types/react-dom": "^18.2.7",
@@ -107,5 +106,5 @@
   "engines": {
     "node": ">=18.0"
   },
-  "gitHead": "4005addf94d2f52e3908088601f036b5aff7acd7"
+  "gitHead": "d0a89b89c2ace47f7e76829fbf41681cde932bb9"
 }