@docusaurus/faster 3.9.2 → 3.10.1

package/lib/index.d.ts

@@ -8,15 +8,18 @@ import Rspack from '@rspack/core';
 import * as lightningcss from 'lightningcss';
 import { minify as swcHtmlMinifier } from '@swc/html';
 import type { JsMinifyOptions, Options as SwcOptions } from '@swc/core';
+import type { CurrentBundler } from '@docusaurus/types';
 export declare const swcLoader: string;
-export declare const getSwcLoaderOptions: ({ isServer, }: {
+export declare const getSwcLoaderOptions: ({ isServer, bundlerName, }: {
     isServer: boolean;
+    bundlerName: CurrentBundler["name"];
 }) => SwcOptions;
 export declare const rspack: typeof Rspack;
 export declare function getSwcHtmlMinifier(): typeof swcHtmlMinifier;
 export declare function getSwcJsMinimizerOptions(): JsMinifyOptions;
-export declare function getBrowserslistQueries({ isServer, }: {
+export declare function getBrowserslistQueries({ isServer, bundlerName, }: {
     isServer: boolean;
+    bundlerName: CurrentBundler['name'];
 }): string[];
 type LightningCssMinimizerOptions = Omit<lightningcss.TransformOptions<never>, 'filename' | 'code'>;
 export declare function getLightningCssMinimizerOptions(): LightningCssMinimizerOptions;

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,MAAM,MAAM,cAAc,CAAC;AAClC,OAAO,KAAK,YAAY,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAC,MAAM,IAAI,eAAe,EAAC,MAAM,WAAW,CAAC;AACpD,OAAO,KAAK,EAAC,eAAe,EAAE,OAAO,IAAI,UAAU,EAAC,MAAM,WAAW,CAAC;AAEtE,eAAO,MAAM,SAAS,QAAgC,CAAC;AAEvD,eAAO,MAAM,mBAAmB,GAAI,eAEjC;IACD,QAAQ,EAAE,OAAO,CAAC;CACnB,KAAG,UAiBH,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,OAAO,MAAe,CAAC;AAE5C,wBAAgB,kBAAkB,IAAI,OAAO,eAAe,CAE3D;AAMD,wBAAgB,wBAAwB,IAAI,eAAe,CAe1D;AAID,wBAAgB,sBAAsB,CAAC,EACrC,QAAQ,GACT,EAAE;IACD,QAAQ,EAAE,OAAO,CAAC;CACnB,GAAG,MAAM,EAAE,CASX;AAKD,KAAK,4BAA4B,GAAG,IAAI,CACtC,YAAY,CAAC,gBAAgB,CAAC,KAAK,CAAC,EACpC,UAAU,GAAG,MAAM,CACpB,CAAC;AAEF,wBAAgB,+BAA+B,IAAI,4BAA4B,CAG9E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,MAAM,MAAM,cAAc,CAAC;AAClC,OAAO,KAAK,YAAY,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAC,MAAM,IAAI,eAAe,EAAC,MAAM,WAAW,CAAC;AAEpD,OAAO,KAAK,EAAC,eAAe,EAAE,OAAO,IAAI,UAAU,EAAC,MAAM,WAAW,CAAC;AACtE,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,mBAAmB,CAAC;AAEtD,eAAO,MAAM,SAAS,QAAgC,CAAC;AAEvD,eAAO,MAAM,mBAAmB,GAAI,4BAGjC;IACD,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;CACrC,KAAG,UAiBH,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,OAAO,MAAe,CAAC;AAE5C,wBAAgB,kBAAkB,IAAI,OAAO,eAAe,CAE3D;AAMD,wBAAgB,wBAAwB,IAAI,eAAe,CAe1D;AAuBD,wBAAgB,sBAAsB,CAAC,EACrC,QAAQ,EACR,WAAW,GACZ,EAAE;IACD,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;CACrC,GAAG,MAAM,EAAE,CAqBX;AAKD,KAAK,4BAA4B,GAAG,IAAI,CACtC,YAAY,CAAC,gBAAgB,CAAC,KAAK,CAAC,EACpC,UAAU,GAAG,MAAM,CACpB,CAAC;AAEF,wBAAgB,+BAA+B,IAAI,4BAA4B,CAG9E"}

package/lib/index.js

@@ -16,11 +16,12 @@ const core_1 = tslib_1.__importDefault(require("@rspack/core"));
 const lightningcss = tslib_1.__importStar(require("lightningcss"));
 const browserslist_1 = tslib_1.__importDefault(require("browserslist"));
 const html_1 = require("@swc/html");
+const semver_1 = tslib_1.__importDefault(require("semver"));
 exports.swcLoader = require.resolve('swc-loader');
-const getSwcLoaderOptions = ({ isServer, }) => {
+const getSwcLoaderOptions = ({ isServer, bundlerName, }) => {
     return {
         env: {
-            targets: getBrowserslistQueries({ isServer }),
+            targets: getBrowserslistQueries({ isServer, bundlerName }),
         },
         jsc: {
             parser: {
@@ -60,11 +61,33 @@ function getSwcJsMinimizerOptions() {
         },
     };
 }
+// TODO this is not accurate
+//  for Rspack we should read from the built-in browserslist data
+//  see https://github.com/facebook/docusaurus/pull/11496
+function getLastBrowserslistKnownNodeVersion(bundlerName) {
+    if (bundlerName === 'rspack') {
+        // TODO hardcoded value until Rspack exposes its Browserslist data
+        //  see https://github.com/facebook/docusaurus/pull/11496
+        return '22.0.0';
+    }
+    // browserslist('last 1 node versions')[0]!.replace('node ', '')
+    return browserslist_1.default.nodeVersions.at(-1);
+}
+function getMinVersion(v1, v2) {
+    return semver_1.default.lt(v1, v2) ? v1 : v2;
+}
 // We need this because of Rspack built-in LightningCSS integration
 // See https://github.com/orgs/browserslist/discussions/846
-function getBrowserslistQueries({ isServer, }) {
+function getBrowserslistQueries({ isServer, bundlerName, }) {
     if (isServer) {
-        return [`node ${process.versions.node}`];
+        // Escape hatch env variable
+        if (process.env.DOCUSAURUS_SERVER_NODE_TARGET) {
+            return [`node ${process.env.DOCUSAURUS_SERVER_NODE_TARGET}`];
+        }
+        // For server builds, we want to use the current Node version as target
+        // But we can't pass a target that Browserslist doesn't know about yet
+        const nodeTarget = getMinVersion(process.versions.node, getLastBrowserslistKnownNodeVersion(bundlerName));
+        return [`node ${nodeTarget}`];
     }
     const queries = browserslist_1.default.loadConfig({ path: process.cwd() }) ?? [
         ...browserslist_1.default.defaults,

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAmCH,gDAEC;AAMD,4DAeC;AAID,wDAaC;AAUD,0EAGC;;AAtFD,gEAAkC;AAClC,mEAA6C;AAC7C,wEAAwC;AACxC,oCAAoD;AAGvC,QAAA,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;AAEhD,MAAM,mBAAmB,GAAG,CAAC,EAClC,QAAQ,GAGT,EAAc,EAAE;IACf,OAAO;QACL,GAAG,EAAE;YACH,OAAO,EAAE,sBAAsB,CAAC,EAAC,QAAQ,EAAC,CAAC;SAC5C;QACD,GAAG,EAAE;YACH,MAAM,EAAE;gBACN,MAAM,EAAE,YAAY;gBACpB,GAAG,EAAE,IAAI;aACV;YACD,SAAS,EAAE;gBACT,KAAK,EAAE;oBACL,OAAO,EAAE,WAAW;iBACrB;aACF;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AArBW,QAAA,mBAAmB,uBAqB9B;AAEW,QAAA,MAAM,GAAkB,cAAM,CAAC;AAE5C,SAAgB,kBAAkB;IAChC,OAAO,aAAe,CAAC;AACzB,CAAC;AAED,yDAAyD;AACzD,8EAA8E;AAC9E,gFAAgF;AAChF,2BAA2B;AAC3B,SAAgB,wBAAwB;IACtC,OAAO;QACL,IAAI,EAAE,IAAI;QACV,QAAQ,EAAE;YACR,IAAI,EAAE,CAAC;SACR;QACD,MAAM,EAAE,IAAI;QACZ,MAAM,EAAE,IAAI;QACZ,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE;YACN,IAAI,EAAE,CAAC;YACP,QAAQ,EAAE,KAAK;YACf,UAAU,EAAE,IAAI;SACjB;KACF,CAAC;AACJ,CAAC;AAED,mEAAmE;AACnE,2DAA2D;AAC3D,SAAgB,sBAAsB,CAAC,EACrC,QAAQ,GAGT;IACC,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO,CAAC,QAAQ,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3C,CAAC;IAED,MAAM,OAAO,GAAG,sBAAY,CAAC,UAAU,CAAC,EAAC,IAAI,EAAE,OAAO,CAAC,GAAG,EAAE,EAAC,CAAC,IAAI;QAChE,GAAG,sBAAY,CAAC,QAAQ;KACzB,CAAC;IACF,OAAO,OAAO,CAAC;AACjB,CAAC;AAUD,SAAgB,+BAA+B;IAC7C,MAAM,OAAO,GAAG,IAAA,sBAAY,GAAE,CAAC;IAC/B,OAAO,EAAC,OAAO,EAAE,YAAY,CAAC,qBAAqB,CAAC,OAAO,CAAC,EAAC,CAAC;AAChE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/faster",
-  "version": "3.9.2",
+  "version": "3.10.1",
   "description": "Docusaurus experimental package exposing new modern dependencies to make the build faster.",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -18,12 +18,13 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/types": "3.9.2",
-    "@rspack/core": "^1.5.0",
+    "@docusaurus/types": "3.10.1",
+    "@rspack/core": "^1.7.10",
     "@swc/core": "^1.7.39",
     "@swc/html": "^1.13.5",
     "browserslist": "^4.24.2",
     "lightningcss": "^1.27.0",
+    "semver": "^7.5.4",
     "swc-loader": "^0.2.6",
     "tslib": "^2.6.0",
     "webpack": "^5.95.0"
@@ -34,5 +35,5 @@
   "peerDependencies": {
     "@docusaurus/types": "*"
   },
-  "gitHead": "abfbe5621b08407bc3dcbe6111ff118d4c22f7a1"
+  "gitHead": "41c1a458ecb07d61b6df2761ea4bc1b13db49d12"
 }

package/src/index.ts

@@ -9,18 +9,22 @@ import Rspack from '@rspack/core';
 import * as lightningcss from 'lightningcss';
 import browserslist from 'browserslist';
 import {minify as swcHtmlMinifier} from '@swc/html';
+import semver from 'semver';
 import type {JsMinifyOptions, Options as SwcOptions} from '@swc/core';
+import type {CurrentBundler} from '@docusaurus/types';
 
 export const swcLoader = require.resolve('swc-loader');
 
 export const getSwcLoaderOptions = ({
   isServer,
+  bundlerName,
 }: {
   isServer: boolean;
+  bundlerName: CurrentBundler['name'];
 }): SwcOptions => {
   return {
     env: {
-      targets: getBrowserslistQueries({isServer}),
+      targets: getBrowserslistQueries({isServer, bundlerName}),
     },
     jsc: {
       parser: {
@@ -63,20 +67,53 @@ export function getSwcJsMinimizerOptions(): JsMinifyOptions {
   };
 }
 
+// TODO this is not accurate
+//  for Rspack we should read from the built-in browserslist data
+//  see https://github.com/facebook/docusaurus/pull/11496
+function getLastBrowserslistKnownNodeVersion(
+  bundlerName: CurrentBundler['name'],
+): string {
+  if (bundlerName === 'rspack') {
+    // TODO hardcoded value until Rspack exposes its Browserslist data
+    //  see https://github.com/facebook/docusaurus/pull/11496
+    return '22.0.0';
+  }
+  // browserslist('last 1 node versions')[0]!.replace('node ', '')
+  return browserslist.nodeVersions.at(-1)!;
+}
+
+function getMinVersion(v1: string, v2: string): string {
+  return semver.lt(v1, v2) ? v1 : v2;
+}
+
 // We need this because of Rspack built-in LightningCSS integration
 // See https://github.com/orgs/browserslist/discussions/846
 export function getBrowserslistQueries({
   isServer,
+  bundlerName,
 }: {
   isServer: boolean;
+  bundlerName: CurrentBundler['name'];
 }): string[] {
   if (isServer) {
-    return [`node ${process.versions.node}`];
+    // Escape hatch env variable
+    if (process.env.DOCUSAURUS_SERVER_NODE_TARGET) {
+      return [`node ${process.env.DOCUSAURUS_SERVER_NODE_TARGET}`];
+    }
+    // For server builds, we want to use the current Node version as target
+    // But we can't pass a target that Browserslist doesn't know about yet
+    const nodeTarget = getMinVersion(
+      process.versions.node,
+      getLastBrowserslistKnownNodeVersion(bundlerName),
+    );
+
+    return [`node ${nodeTarget}`];
   }
 
   const queries = browserslist.loadConfig({path: process.cwd()}) ?? [
     ...browserslist.defaults,
   ];
+
   return queries;
 }