@docusaurus/faster 4.0.0-canary-6855 → 4.0.0-canary-6859

package/lib/index.d.ts

@@ -21,10 +21,7 @@ export declare const rspackDevServer: typeof RspackDevServer;
 type SwcHtmlMinifier = (typeof import('@swc/html'))['minify'];
 export declare function getSwcHtmlMinifier(): Promise<SwcHtmlMinifier>;
 export declare function getSwcJsMinimizerOptions(): JsMinifyOptions;
-export declare function getBrowserslistQueries({ isServer, bundlerName, }: {
-    isServer: boolean;
-    bundlerName: CurrentBundler['name'];
-}): string[];
+export declare function getBrowserslistQueries(): string[];
 type LightningCssMinimizerOptions = Omit<lightningcss.TransformOptions<never>, 'filename' | 'code'>;
 export declare function getLightningCssMinimizerOptions(): LightningCssMinimizerOptions;
 export {};

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAC,eAAe,EAAC,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,YAAY,MAAM,cAAc,CAAC;AAG7C,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,+BAG7B;IACD,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;CACrC,KAAG,UAsBH,CAAC;AAEF,eAAO,MAAM,MAAM;;;CAAS,CAAC;AAE7B,eAAO,MAAM,eAAe,wBAAkB,CAAC;AAE/C,KAAK,eAAe,GAAG,CAAC,cAAc,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;AAM9D,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,eAAe,CAAC,CAGnE;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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAC,eAAe,EAAC,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,YAAY,MAAM,cAAc,CAAC;AAG7C,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,+BAG7B;IACD,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;CACrC,KAAG,UAwBH,CAAC;AAEF,eAAO,MAAM,MAAM;;;CAAS,CAAC;AAE7B,eAAO,MAAM,eAAe,wBAAkB,CAAC;AAE/C,KAAK,eAAe,GAAG,CAAC,cAAc,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;AAM9D,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,eAAe,CAAC,CAGnE;AAMD,wBAAgB,wBAAwB,IAAI,eAAe,CAe1D;AA2CD,wBAAgB,sBAAsB,IAAI,MAAM,EAAE,CAIjD;AAKD,KAAK,4BAA4B,GAAG,IAAI,CACtC,YAAY,CAAC,gBAAgB,CAAC,KAAK,CAAC,EACpC,UAAU,GAAG,MAAM,CACpB,CAAC;AAEF,wBAAgB,+BAA+B,IAAI,4BAA4B,CAI9E"}

package/lib/index.js

@@ -21,7 +21,9 @@ exports.swcLoader = require.resolve('swc-loader');
 const getSwcLoaderOptions = ({ isServer, bundlerName, }) => {
     return {
         env: {
-            targets: getBrowserslistQueries({ isServer, bundlerName }),
+            targets: isServer
+                ? getServerBrowserslistQueries({ bundlerName })
+                : getBrowserslistQueries(),
         },
         jsc: {
             parser: {
@@ -79,7 +81,7 @@ 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';
+        return '26.0.0';
     }
     // browserslist('last 1 node versions')[0]!.replace('node ', '')
     return browserslist_1.default.nodeVersions.at(-1);
@@ -87,26 +89,25 @@ function getLastBrowserslistKnownNodeVersion(bundlerName) {
 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, bundlerName, }) {
-    if (isServer) {
-        // 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}`];
+// Used when the site doesn't provide its own Browserslist config
+// See https://web.dev/baseline
+const DefaultBrowserslistQueries = ['baseline widely available'];
+function getServerBrowserslistQueries({ bundlerName, }) {
+    // Escape hatch env variable
+    if (process.env.DOCUSAURUS_SERVER_NODE_TARGET) {
+        return [`node ${process.env.DOCUSAURUS_SERVER_NODE_TARGET}`];
     }
-    const queries = browserslist_1.default.loadConfig({ path: process.cwd() }) ?? [
-        ...browserslist_1.default.defaults,
-    ];
-    return queries;
+    // 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}`];
+}
+function getBrowserslistQueries() {
+    return (browserslist_1.default.loadConfig({ path: process.cwd() }) ?? DefaultBrowserslistQueries);
 }
 function getLightningCssMinimizerOptions() {
-    const queries = (0, browserslist_1.default)();
-    return { targets: lightningcss.browserslistToTargets(queries) };
+    const queries = getBrowserslistQueries();
+    const browsers = (0, browserslist_1.default)(queries);
+    return { targets: lightningcss.browserslistToTargets(browsers) };
 }
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;AAEH,uCAA8C;AAC9C,mDAAmD;AACnD,MAAY,YAAY,iDAAqB;AAC7C,wEAAwC;AACxC,4DAA4B;AAIf,QAAA,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;AAEhD,MAAM,mBAAmB,GAAG,CAAC,EAClC,QAAQ,EACR,WAAW,GAIZ,EAAc,EAAE;IACf,OAAO;QACL,GAAG,EAAE;YACH,OAAO,EAAE,sBAAsB,CAAC,EAAC,QAAQ,EAAE,WAAW,EAAC,CAAC;SACzD;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;YACD,YAAY,EAAE;gBACZ,oDAAoD;gBACpD,kDAAkD;gBAClD,oBAAoB,EAAE,IAAI;aAC3B;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AA5BW,QAAA,mBAAmB,GAAnB,mBAAmB,CA4B9B;AAEW,QAAA,MAAM,GAAG,aAAM,CAAC;AAEhB,QAAA,eAAe,GAAG,4BAAe,CAAC;AAI/C,iEAAiE;AACjE,sDAAsD;AACtD,0DAA0D;AAC1D,sDAAsD;AAC/C,KAAK;IACV,MAAM,EAAC,MAAM,EAAC,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC;IAC3C,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,yDAAyD;AACzD,8EAA8E;AAC9E,gFAAgF;AAChF,2BAA2B;AAC3B;IACE,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,4BAA4B;AAC5B,iEAAiE;AACjE,yDAAyD;AACzD,SAAS,mCAAmC,CAC1C,WAAmC;IAEnC,IAAI,WAAW,KAAK,QAAQ,EAAE,CAAC;QAC7B,kEAAkE;QAClE,yDAAyD;QACzD,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,gEAAgE;IAChE,OAAO,sBAAY,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC;AAC3C,CAAC;AAED,SAAS,aAAa,CAAC,EAAU,EAAE,EAAU;IAC3C,OAAO,gBAAM,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AACrC,CAAC;AAED,mEAAmE;AACnE,2DAA2D;AAC3D,gCAAuC,EACrC,QAAQ,EACR,WAAW,GAIZ;IACC,IAAI,QAAQ,EAAE,CAAC;QACb,4BAA4B;QAC5B,IAAI,OAAO,CAAC,GAAG,CAAC,6BAA6B,EAAE,CAAC;YAC9C,OAAO,CAAC,QAAQ,OAAO,CAAC,GAAG,CAAC,6BAA6B,EAAE,CAAC,CAAC;QAC/D,CAAC;QACD,uEAAuE;QACvE,sEAAsE;QACtE,MAAM,UAAU,GAAG,aAAa,CAC9B,OAAO,CAAC,QAAQ,CAAC,IAAI,EACrB,mCAAmC,CAAC,WAAW,CAAC,CACjD,CAAC;QAEF,OAAO,CAAC,QAAQ,UAAU,EAAE,CAAC,CAAC;IAChC,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;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC;AAUD;IACE,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": "4.0.0-canary-6855",
+  "version": "4.0.0-canary-6859",
   "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,12 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/types": "4.0.0-canary-6855",
+    "@docusaurus/types": "4.0.0-canary-6859",
     "@rspack/core": "^2.2.3",
     "@rspack/dev-server": "^2.2.1",
     "@swc/core": "^1.16.2",
     "@swc/html": "^1.16.2",
-    "browserslist": "^4.28.9",
+    "browserslist": "^4.29.0",
     "lightningcss": "^1.33.0",
     "semver": "^7.8.5",
     "swc-loader": "^0.2.7",
@@ -36,5 +36,5 @@
   "peerDependencies": {
     "@docusaurus/types": "*"
   },
-  "gitHead": "0ad9e0df523979f23bf9bea8db780f7b101a20ad"
+  "gitHead": "e3da0b4153190a1001ad0c242a684a3201aff6d1"
 }

package/src/index.ts

@@ -24,7 +24,9 @@ export const getSwcLoaderOptions = ({
 }): SwcOptions => {
   return {
     env: {
-      targets: getBrowserslistQueries({isServer, bundlerName}),
+      targets: isServer
+        ? getServerBrowserslistQueries({bundlerName})
+        : getBrowserslistQueries(),
     },
     jsc: {
       parser: {
@@ -90,7 +92,7 @@ function getLastBrowserslistKnownNodeVersion(
   if (bundlerName === 'rspack') {
     // TODO hardcoded value until Rspack exposes its Browserslist data
     //  see https://github.com/facebook/docusaurus/pull/11496
-    return '22.0.0';
+    return '26.0.0';
   }
   // browserslist('last 1 node versions')[0]!.replace('node ', '')
   return browserslist.nodeVersions.at(-1)!;
@@ -100,35 +102,32 @@ 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,
+// Used when the site doesn't provide its own Browserslist config
+// See https://web.dev/baseline
+const DefaultBrowserslistQueries = ['baseline widely available'];
+
+function getServerBrowserslistQueries({
   bundlerName,
 }: {
-  isServer: boolean;
   bundlerName: CurrentBundler['name'];
 }): string[] {
-  if (isServer) {
-    // 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}`];
+  // 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;
+export function getBrowserslistQueries(): string[] {
+  return (
+    browserslist.loadConfig({path: process.cwd()}) ?? DefaultBrowserslistQueries
+  );
 }
 
 // LightningCSS doesn't expose any type for css-minimizer-webpack-plugin setup
@@ -140,6 +139,7 @@ type LightningCssMinimizerOptions = Omit<
 >;
 
 export function getLightningCssMinimizerOptions(): LightningCssMinimizerOptions {
-  const queries = browserslist();
-  return {targets: lightningcss.browserslistToTargets(queries)};
+  const queries = getBrowserslistQueries();
+  const browsers = browserslist(queries);
+  return {targets: lightningcss.browserslistToTargets(browsers)};
 }