@docusaurus/core 0.0.0-6052 → 0.0.0-6055

package/lib/commands/build.js

@@ -195,6 +195,7 @@ async function getBuildClientConfig({ props, cliOptions, }) {
     const result = await (0, client_1.createBuildClientConfig)({
         props,
         minify: cliOptions.minify ?? true,
+        faster: props.siteConfig.future.experimental_faster,
         bundleAnalyzer: cliOptions.bundleAnalyzer ?? false,
     });
     let { config } = result;

package/lib/commands/start/webpack.js

@@ -102,6 +102,7 @@ async function getStartClientConfig({ props, minify, poll, }) {
     let { clientConfig: config } = await (0, client_1.createStartClientConfig)({
         props,
         minify,
+        faster: props.siteConfig.future.experimental_faster,
         poll,
     });
     config = (0, configure_1.executePluginsConfigureWebpack)({

package/lib/faster.d.ts

@@ -5,4 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 import type { ConfigureWebpackUtils } from '@docusaurus/types';
-export declare function getSwcJsLoaderFactory(): Promise<ConfigureWebpackUtils['getJSLoader']>;
+import type { MinimizerOptions, CustomOptions } from 'terser-webpack-plugin';
+export declare function importSwcJsLoaderFactory(): Promise<ConfigureWebpackUtils['getJSLoader']>;
+export declare function importSwcJsMinifierOptions(): Promise<MinimizerOptions<CustomOptions>>;

package/lib/faster.js

@@ -6,7 +6,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSwcJsLoaderFactory = getSwcJsLoaderFactory;
+exports.importSwcJsLoaderFactory = importSwcJsLoaderFactory;
+exports.importSwcJsMinifierOptions = importSwcJsMinifierOptions;
 async function importFaster() {
     return import('@docusaurus/faster');
 }
@@ -18,7 +19,11 @@ async function ensureFaster() {
         throw new Error('Your Docusaurus site need to add the @docusaurus/faster package as a dependency.', { cause: error });
     }
 }
-async function getSwcJsLoaderFactory() {
+async function importSwcJsLoaderFactory() {
     const faster = await ensureFaster();
     return faster.getSwcJsLoaderFactory;
 }
+async function importSwcJsMinifierOptions() {
+    const faster = await ensureFaster();
+    return faster.getSwcJsMinifierOptions();
+}

package/lib/server/configValidation.js

@@ -24,10 +24,12 @@ exports.DEFAULT_STORAGE_CONFIG = {
 };
 exports.DEFAULT_FASTER_CONFIG = {
     swcJsLoader: false,
+    swcJsMinimizer: false,
 };
 // When using the "faster: true" shortcut
 exports.DEFAULT_FASTER_CONFIG_TRUE = {
     swcJsLoader: true,
+    swcJsMinimizer: true,
 };
 exports.DEFAULT_FUTURE_CONFIG = {
     experimental_faster: exports.DEFAULT_FASTER_CONFIG,
@@ -141,6 +143,7 @@ const I18N_CONFIG_SCHEMA = utils_validation_1.Joi.object({
 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),
 }), utils_validation_1.Joi.boolean()
     .required()
     .custom((bool) => bool ? exports.DEFAULT_FASTER_CONFIG_TRUE : exports.DEFAULT_FASTER_CONFIG))

package/lib/webpack/base.d.ts

@@ -5,11 +5,12 @@
  * LICENSE file in the root directory of this source tree.
  */
 import type { Configuration } from 'webpack';
-import type { Props } from '@docusaurus/types';
+import type { FasterConfig, Props } from '@docusaurus/types';
 export declare const clientDir: string;
 export declare function excludeJS(modulePath: string): boolean;
-export declare function createBaseConfig({ props, isServer, minify, }: {
+export declare function createBaseConfig({ props, isServer, minify, faster, }: {
     props: Props;
     isServer: boolean;
     minify: boolean;
+    faster: FasterConfig;
 }): Promise<Configuration>;

package/lib/webpack/base.js

@@ -42,7 +42,7 @@ function excludeJS(modulePath) {
         !/docusaurus(?:(?!node_modules).)*\.jsx?$/.test(modulePath) &&
         !LibrariesToTranspileRegex.test(modulePath));
 }
-async function createBaseConfig({ props, isServer, minify, }) {
+async function createBaseConfig({ props, isServer, minify, faster, }) {
     const { outDir, siteDir, siteConfig, siteConfigPath, baseUrl, generatedFilesDir, routesPaths, siteMetadata, plugins, } = props;
     const totalPages = routesPaths.length;
     const isProd = process.env.NODE_ENV === 'production';
@@ -135,7 +135,7 @@ async function createBaseConfig({ props, isServer, minify, }) {
             // Only minimize client bundle in production because server bundle is only
             // used for static site generation
             minimize: minimizeEnabled,
-            minimizer: minimizeEnabled ? (0, minification_1.getMinimizer)() : undefined,
+            minimizer: minimizeEnabled ? await (0, minification_1.getMinimizers)({ faster }) : undefined,
             splitChunks: isServer
                 ? false
                 : {

package/lib/webpack/client.d.ts

@@ -4,18 +4,20 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import type { Props } from '@docusaurus/types';
+import type { FasterConfig, Props } from '@docusaurus/types';
 import type { Configuration } from 'webpack';
-export declare function createStartClientConfig({ props, minify, poll, }: {
+export declare function createStartClientConfig({ props, minify, poll, faster, }: {
     props: Props;
     minify: boolean;
     poll: number | boolean | undefined;
+    faster: FasterConfig;
 }): Promise<{
     clientConfig: Configuration;
 }>;
-export declare function createBuildClientConfig({ props, minify, bundleAnalyzer, }: {
+export declare function createBuildClientConfig({ props, minify, faster, bundleAnalyzer, }: {
     props: Props;
     minify: boolean;
+    faster: FasterConfig;
     bundleAnalyzer: boolean;
 }): Promise<{
     config: Configuration;

package/lib/webpack/client.js

@@ -21,8 +21,13 @@ const ChunkAssetPlugin_1 = tslib_1.__importDefault(require("./plugins/ChunkAsset
 const CleanWebpackPlugin_1 = tslib_1.__importDefault(require("./plugins/CleanWebpackPlugin"));
 const ForceTerminatePlugin_1 = tslib_1.__importDefault(require("./plugins/ForceTerminatePlugin"));
 const StaticDirectoriesCopyPlugin_1 = require("./plugins/StaticDirectoriesCopyPlugin");
-async function createBaseClientConfig({ props, hydrate, minify, }) {
-    const baseConfig = await (0, base_1.createBaseConfig)({ props, isServer: false, minify });
+async function createBaseClientConfig({ props, hydrate, minify, faster, }) {
+    const baseConfig = await (0, base_1.createBaseConfig)({
+        props,
+        isServer: false,
+        minify,
+        faster,
+    });
     return (0, webpack_merge_1.default)(baseConfig, {
         // Useless, disabled on purpose (errors on existing sites with no
         // browserslist config)
@@ -47,12 +52,13 @@ async function createBaseClientConfig({ props, hydrate, minify, }) {
     });
 }
 // client config when running "docusaurus start"
-async function createStartClientConfig({ props, minify, poll, }) {
+async function createStartClientConfig({ props, minify, poll, faster, }) {
     const { siteConfig, headTags, preBodyTags, postBodyTags } = props;
     const clientConfig = (0, webpack_merge_1.default)(await createBaseClientConfig({
         props,
         minify,
         hydrate: false,
+        faster,
     }), {
         watchOptions: {
             ignored: /node_modules\/(?!@docusaurus)/,
@@ -79,7 +85,7 @@ async function createStartClientConfig({ props, minify, poll, }) {
     return { clientConfig };
 }
 // client config when running "docusaurus build"
-async function createBuildClientConfig({ props, minify, bundleAnalyzer, }) {
+async function createBuildClientConfig({ props, minify, faster, bundleAnalyzer, }) {
     // Apply user webpack config.
     const { generatedFilesDir, siteConfig } = props;
     const router = siteConfig.future.experimental_router;
@@ -87,7 +93,7 @@ async function createBuildClientConfig({ props, minify, bundleAnalyzer, }) {
     // This is because it will always be a client-rendered React app
     const hydrate = router !== 'hash';
     const clientManifestPath = path_1.default.join(generatedFilesDir, 'client-manifest.json');
-    const config = (0, webpack_merge_1.default)(await createBaseClientConfig({ props, minify, hydrate }), {
+    const config = (0, webpack_merge_1.default)(await createBaseClientConfig({ props, minify, faster, hydrate }), {
         plugins: [
             new ForceTerminatePlugin_1.default(),
             // Remove/clean build folders before building bundles.

package/lib/webpack/minification.d.ts

@@ -5,4 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 import type { WebpackPluginInstance } from 'webpack';
-export declare function getMinimizer(): WebpackPluginInstance[];
+import type { FasterConfig } from '@docusaurus/types';
+export type MinimizersConfig = {
+    faster: Pick<FasterConfig, 'swcJsMinimizer'>;
+};
+export declare function getMinimizers(params: MinimizersConfig): Promise<WebpackPluginInstance[]>;

package/lib/webpack/minification.js

@@ -6,10 +6,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMinimizer = getMinimizer;
+exports.getMinimizers = getMinimizers;
 const tslib_1 = require("tslib");
 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 faster_1 = require("../faster");
 // See https://github.com/webpack-contrib/terser-webpack-plugin#parallel
 function getTerserParallel() {
     let terserParallel = true;
@@ -22,7 +23,15 @@ function getTerserParallel() {
     }
     return terserParallel;
 }
-function getJsMinifierPlugin() {
+async function getJsMinimizer({ faster }) {
+    if (faster.swcJsMinimizer) {
+        const terserOptions = await (0, faster_1.importSwcJsMinifierOptions)();
+        return new terser_webpack_plugin_1.default({
+            parallel: getTerserParallel(),
+            minify: terser_webpack_plugin_1.default.swcMinify,
+            terserOptions,
+        });
+    }
     return new terser_webpack_plugin_1.default({
         parallel: getTerserParallel(),
         terserOptions: {
@@ -81,16 +90,17 @@ function getAdvancedCssMinifier() {
         ],
     });
 }
-function getMinimizer() {
+function getCssMinimizer() {
     // This is an historical env variable to opt-out of the advanced minifier
     // Sometimes there's a bug in it and people are happy to disable it
     const useSimpleCssMinifier = process.env.USE_SIMPLE_CSS_MINIFIER === 'true';
-    const minimizer = [getJsMinifierPlugin()];
     if (useSimpleCssMinifier) {
-        minimizer.push(new css_minimizer_webpack_plugin_1.default());
+        return new css_minimizer_webpack_plugin_1.default();
     }
     else {
-        minimizer.push(getAdvancedCssMinifier());
+        return getAdvancedCssMinifier();
     }
-    return minimizer;
+}
+async function getMinimizers(params) {
+    return Promise.all([getJsMinimizer(params), getCssMinimizer()]);
 }

package/lib/webpack/server.js

@@ -18,8 +18,8 @@ async function createServerConfig(params) {
     const baseConfig = await (0, base_1.createBaseConfig)({
         props,
         isServer: true,
-        // Minification of server bundle reduces size but doubles bundle time :/
         minify: false,
+        faster: props.siteConfig.future.experimental_faster,
     });
     const outputFilename = 'server.bundle.js';
     const outputDir = path_1.default.join(props.outDir, '__server');

package/lib/webpack/utils.js

@@ -143,7 +143,7 @@ async function createJsLoaderFactory({ siteConfig, }) {
         return ({ isServer }) => jsLoader(isServer);
     }
     if (siteConfig.future?.experimental_faster.swcJsLoader) {
-        return (0, faster_1.getSwcJsLoaderFactory)();
+        return (0, faster_1.importSwcJsLoaderFactory)();
     }
     if (jsLoader === 'babel') {
         return BabelJsLoaderFactory;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "0.0.0-6052",
+  "version": "0.0.0-6055",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -43,12 +43,12 @@
     "@babel/runtime": "^7.22.6",
     "@babel/runtime-corejs3": "^7.22.6",
     "@babel/traverse": "^7.22.8",
-    "@docusaurus/cssnano-preset": "0.0.0-6052",
-    "@docusaurus/logger": "0.0.0-6052",
-    "@docusaurus/mdx-loader": "0.0.0-6052",
-    "@docusaurus/utils": "0.0.0-6052",
-    "@docusaurus/utils-common": "0.0.0-6052",
-    "@docusaurus/utils-validation": "0.0.0-6052",
+    "@docusaurus/cssnano-preset": "0.0.0-6055",
+    "@docusaurus/logger": "0.0.0-6055",
+    "@docusaurus/mdx-loader": "0.0.0-6055",
+    "@docusaurus/utils": "0.0.0-6055",
+    "@docusaurus/utils-common": "0.0.0-6055",
+    "@docusaurus/utils-validation": "0.0.0-6055",
     "autoprefixer": "^10.4.14",
     "babel-loader": "^9.1.3",
     "babel-plugin-dynamic-import-node": "^2.3.3",
@@ -92,7 +92,7 @@
     "semver": "^7.5.4",
     "serve-handler": "^6.1.5",
     "shelljs": "^0.8.5",
-    "terser-webpack-plugin": "^5.3.9",
+    "terser-webpack-plugin": "^5.3.10",
     "tslib": "^2.6.0",
     "update-notifier": "^6.0.2",
     "url-loader": "^4.1.1",
@@ -103,8 +103,8 @@
     "webpackbar": "^5.0.2"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-6052",
-    "@docusaurus/types": "0.0.0-6052",
+    "@docusaurus/module-type-aliases": "0.0.0-6055",
+    "@docusaurus/types": "0.0.0-6055",
     "@total-typescript/shoehorn": "^0.1.2",
     "@types/detect-port": "^1.3.3",
     "@types/react-dom": "^18.2.7",
@@ -131,5 +131,5 @@
   "engines": {
     "node": ">=18.0"
   },
-  "gitHead": "ff41451cf14cc627f2c0e002edc580ae91732eaf"
+  "gitHead": "b57b82e42ebabf1864ac745b95199ff62fb289af"
 }