@docusaurus/bundler 4.0.0-canary-6905 → 4.0.0-canary-6909

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -7,19 +7,11 @@
7
7
  import webpack from 'webpack';
8
8
  import WebpackBar from 'webpackbar';
9
9
  import MiniCssExtractPlugin from 'mini-css-extract-plugin';
10
- import type { Rspack } from './rspack';
11
10
  import type { CurrentBundler, DocusaurusConfig } from '@docusaurus/types';
12
- type SiteConfigSlice = {
13
- future: {
14
- faster: Pick<DocusaurusConfig['future']['faster'], 'rspackBundler'>;
15
- };
16
- };
11
+ type SiteConfigSlice = Pick<DocusaurusConfig, 'webpack'>;
17
12
  export declare function getCurrentBundler({ siteConfig, }: {
18
13
  siteConfig: SiteConfigSlice;
19
14
  }): Promise<CurrentBundler>;
20
- export declare function getCurrentBundlerAsRspack({ currentBundler, }: {
21
- currentBundler: CurrentBundler;
22
- }): Rspack;
23
15
  export declare function getCSSExtractPlugin({ currentBundler, }: {
24
16
  currentBundler: CurrentBundler;
25
17
  }): Promise<typeof MiniCssExtractPlugin>;
@@ -1 +1 @@
1
- {"version":3,"file":"currentBundler.d.ts","sourceRoot":"","sources":["../src/currentBundler.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,oBAAoB,MAAM,yBAAyB,CAAC;AAE3D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AACrC,OAAO,KAAK,EAAC,cAAc,EAAE,gBAAgB,EAAC,MAAM,mBAAmB,CAAC;AAGxE,KAAK,eAAe,GAAG;IACrB,MAAM,EAAE;QACN,MAAM,EAAE,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,EAAE,eAAe,CAAC,CAAC;KACrE,CAAC;CACH,CAAC;AAMF,wBAAsB,iBAAiB,CAAC,EACtC,UAAU,GACX,EAAE;IACD,UAAU,EAAE,eAAe,CAAC;CAC7B,GAAG,OAAO,CAAC,cAAc,CAAC,CAW1B;AAED,wBAAgB,yBAAyB,CAAC,EACxC,cAAc,GACf,EAAE;IACD,cAAc,EAAE,cAAc,CAAC;CAChC,GAAG,MAAM,CAOT;AAED,wBAAsB,mBAAmB,CAAC,EACxC,cAAc,GACf,EAAE;IACD,cAAc,EAAE,cAAc,CAAC;CAChC,GAAG,OAAO,CAAC,OAAO,oBAAoB,CAAC,CAMvC;AAED,wBAAsB,aAAa,CAAC,EAClC,cAAc,GACf,EAAE;IACD,cAAc,EAAE,cAAc,CAAC;CAChC,GAAG,OAAO,CAAC,OAAO,OAAO,CAAC,UAAU,CAAC,CAMrC;AAED,wBAAsB,oBAAoB,CAAC,EACzC,cAAc,GACf,EAAE;IACD,cAAc,EAAE,cAAc,CAAC;CAChC,GAAG,OAAO,CAAC,OAAO,UAAU,CAAC,CAkB7B;AAED,wBAAsB,sBAAsB,CAAC,EAC3C,cAAc,GACf,EAAE;IACD,cAAc,EAAE,cAAc,CAAC;CAChC,GAAG,OAAO,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAqC/B"}
1
+ {"version":3,"file":"currentBundler.d.ts","sourceRoot":"","sources":["../src/currentBundler.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,oBAAoB,MAAM,yBAAyB,CAAC;AAE3D,OAAO,KAAK,EAAC,cAAc,EAAE,gBAAgB,EAAC,MAAM,mBAAmB,CAAC;AAExE,KAAK,eAAe,GAAG,IAAI,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;AAOzD,wBAAsB,iBAAiB,CAAC,EACtC,UAAU,GACX,EAAE;IACD,UAAU,EAAE,eAAe,CAAC;CAC7B,GAAG,OAAO,CAAC,cAAc,CAAC,CAY1B;AAED,wBAAsB,mBAAmB,CAAC,EACxC,cAAc,GACf,EAAE;IACD,cAAc,EAAE,cAAc,CAAC;CAChC,GAAG,OAAO,CAAC,OAAO,oBAAoB,CAAC,CAKvC;AAED,wBAAsB,aAAa,CAAC,EAClC,cAAc,GACf,EAAE;IACD,cAAc,EAAE,cAAc,CAAC;CAChC,GAAG,OAAO,CAAC,OAAO,OAAO,CAAC,UAAU,CAAC,CAKrC;AAED,wBAAsB,oBAAoB,CAAC,EACzC,cAAc,GACf,EAAE;IACD,cAAc,EAAE,cAAc,CAAC;CAChC,GAAG,OAAO,CAAC,OAAO,UAAU,CAAC,CAiB7B;AAED,wBAAsB,sBAAsB,CAAC,EAC3C,cAAc,GACf,EAAE;IACD,cAAc,EAAE,cAAc,CAAC;CAChC,GAAG,OAAO,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAmC/B"}
@@ -7,7 +7,6 @@
7
7
  */
8
8
  Object.defineProperty(exports, "__esModule", { value: true });
9
9
  exports.getCurrentBundler = getCurrentBundler;
10
- exports.getCurrentBundlerAsRspack = getCurrentBundlerAsRspack;
11
10
  exports.getCSSExtractPlugin = getCSSExtractPlugin;
12
11
  exports.getCopyPlugin = getCopyPlugin;
13
12
  exports.getProgressBarPlugin = getProgressBarPlugin;
@@ -17,14 +16,16 @@ const webpack_1 = tslib_1.__importDefault(require("webpack"));
17
16
  const webpackbar_1 = tslib_1.__importDefault(require("webpackbar"));
18
17
  const mini_css_extract_plugin_1 = tslib_1.__importDefault(require("mini-css-extract-plugin"));
19
18
  const rspack_1 = require("./rspack");
19
+ // Rspack is the default, Webpack is opt-in (deprecated)
20
20
  function isRspack(siteConfig) {
21
- return siteConfig.future.faster.rspackBundler;
21
+ return !siteConfig.webpack;
22
22
  }
23
23
  async function getCurrentBundler({ siteConfig, }) {
24
24
  if (isRspack(siteConfig)) {
25
25
  return {
26
26
  name: 'rspack',
27
- instance: (await (0, rspack_1.importRspack)()),
27
+ // CurrentBundler exposes Webpack types, see its type definition
28
+ instance: rspack_1.rspack,
28
29
  };
29
30
  }
30
31
  return {
@@ -32,30 +33,21 @@ async function getCurrentBundler({ siteConfig, }) {
32
33
  instance: webpack_1.default,
33
34
  };
34
35
  }
35
- function getCurrentBundlerAsRspack({ currentBundler, }) {
36
- if (currentBundler.name !== 'rspack') {
37
- throw new Error(`Can't getCurrentBundlerAsRspack() because current bundler is ${currentBundler.name}`);
38
- }
39
- return currentBundler.instance;
40
- }
41
36
  async function getCSSExtractPlugin({ currentBundler, }) {
42
37
  if (currentBundler.name === 'rspack') {
43
- // @ts-expect-error: this exists only in Rspack
44
- return currentBundler.instance.CssExtractRspackPlugin;
38
+ return rspack_1.rspack.CssExtractRspackPlugin;
45
39
  }
46
40
  return mini_css_extract_plugin_1.default;
47
41
  }
48
42
  async function getCopyPlugin({ currentBundler, }) {
49
43
  if (currentBundler.name === 'rspack') {
50
- // @ts-expect-error: this exists only in Rspack
51
- return currentBundler.instance.CopyRspackPlugin;
44
+ return rspack_1.rspack.CopyRspackPlugin;
52
45
  }
53
46
  return currentBundler.instance.CopyPlugin;
54
47
  }
55
48
  async function getProgressBarPlugin({ currentBundler, }) {
56
49
  if (currentBundler.name === 'rspack') {
57
- const rspack = getCurrentBundlerAsRspack({ currentBundler });
58
- class CustomRspackProgressPlugin extends rspack.ProgressPlugin {
50
+ class CustomRspackProgressPlugin extends rspack_1.rspack.ProgressPlugin {
59
51
  constructor({ name, color = 'green' }) {
60
52
  // Unfortunately rspack.ProgressPlugin does not have name/color options
61
53
  // See https://rspack.dev/plugins/webpack/progress-plugin
@@ -72,7 +64,6 @@ async function getProgressBarPlugin({ currentBundler, }) {
72
64
  }
73
65
  async function registerBundlerTracing({ currentBundler, }) {
74
66
  if (currentBundler.name === 'rspack') {
75
- const Rspack = await (0, rspack_1.importRspack)();
76
67
  // See https://rspack.dev/contribute/development/profiling
77
68
  // File can be opened with https://ui.perfetto.dev/
78
69
  if (process.env.DOCUSAURUS_RSPACK_TRACE) {
@@ -85,10 +76,10 @@ async function registerBundlerTracing({ currentBundler, }) {
85
76
  // https://github.com/web-infra-dev/rspack/blob/v1.3.10/packages/rspack-cli/src/utils/profile.ts
86
77
  filter = 'info';
87
78
  }
88
- await Rspack.experiments.globalTrace.register(filter, 'perfetto', './rspack-tracing.pftrace');
79
+ await rspack_1.rspack.experiments.globalTrace.register(filter, 'perfetto', './rspack-tracing.pftrace');
89
80
  console.info(`Rspack tracing registered, filter=${filter}`);
90
81
  return async () => {
91
- await Rspack.experiments.globalTrace.cleanup();
82
+ await rspack_1.rspack.experiments.globalTrace.cleanup();
92
83
  console.log(`Rspack tracing cleaned up, filter=${filter}`);
93
84
  };
94
85
  }
@@ -1 +1 @@
1
- {"version":3,"file":"currentBundler.js","sourceRoot":"","sources":["../src/currentBundler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"currentBundler.js","sourceRoot":"","sources":["../src/currentBundler.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;AAEH,8DAA8B;AAC9B,oEAAoC;AACpC,8FAA2D;AAC3D,qCAAgC;AAKhC,wDAAwD;AACxD,SAAS,QAAQ,CAAC,UAA2B;IAC3C,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC;AAC7B,CAAC;AAEM,KAAK,4BAA4B,EACtC,UAAU,GAGX;IACC,IAAI,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QACzB,OAAO;YACL,IAAI,EAAE,QAAQ;YACd,gEAAgE;YAChE,QAAQ,EAAE,eAAmC;SAC9C,CAAC;IACJ,CAAC;IACD,OAAO;QACL,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,iBAAO;KAClB,CAAC;AACJ,CAAC;AAEM,KAAK,8BAA8B,EACxC,cAAc,GAGf;IACC,IAAI,cAAc,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACrC,OAAO,eAAM,CAAC,sBAAgE,CAAC;IACjF,CAAC;IACD,OAAO,iCAAoB,CAAC;AAC9B,CAAC;AAEM,KAAK,wBAAwB,EAClC,cAAc,GAGf;IACC,IAAI,cAAc,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACrC,OAAO,eAAM,CAAC,gBAAwD,CAAC;IACzE,CAAC;IACD,OAAO,cAAc,CAAC,QAAQ,CAAC,UAAU,CAAC;AAC5C,CAAC;AAEM,KAAK,+BAA+B,EACzC,cAAc,GAGf;IACC,IAAI,cAAc,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACrC,MAAM,0BAA2B,SAAQ,eAAM,CAAC,cAAc;YAC5D,YAAY,EAAC,IAAI,EAAE,KAAK,GAAG,OAAO,EAAkC;gBAClE,uEAAuE;gBACvE,yDAAyD;gBACzD,KAAK,CAAC;oBACJ,MAAM,EAAE,IAAI;oBACZ,QAAQ,EAAE,4BAA4B,KAAK,0CAA0C;oBACrF,aAAa,EAAE,IAAI;iBACpB,CAAC,CAAC;YACL,CAAC;SACF;QACD,OAAO,0BAA0D,CAAC;IACpE,CAAC;IAED,OAAO,oBAAU,CAAC;AACpB,CAAC;AAEM,KAAK,iCAAiC,EAC3C,cAAc,GAGf;IACC,IAAI,cAAc,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACrC,0DAA0D;QAC1D,mDAAmD;QACnD,IAAI,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,CAAC;YACxC,oDAAoD;YACpD,oFAAoF;YACpF,IAAI,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC;YAEjD,IAAI,MAAM,KAAK,MAAM,IAAI,MAAM,KAAK,GAAG,EAAE,CAAC;gBACxC,+CAA+C;gBAC/C,yDAAyD;gBACzD,gGAAgG;gBAChG,MAAM,GAAG,MAAM,CAAC;YAClB,CAAC;YAED,MAAM,eAAM,CAAC,WAAW,CAAC,WAAW,CAAC,QAAQ,CAC3C,MAAM,EACN,UAAU,EACV,0BAA0B,CAC3B,CAAC;YAEF,OAAO,CAAC,IAAI,CAAC,qCAAqC,MAAM,EAAE,CAAC,CAAC;YAE5D,OAAO,KAAK,IAAI,EAAE;gBAChB,MAAM,eAAM,CAAC,WAAW,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;gBAC/C,OAAO,CAAC,GAAG,CAAC,qCAAqC,MAAM,EAAE,CAAC,CAAC;YAC7D,CAAC,CAAC;QACJ,CAAC;IACH,CAAC;IAED,iDAAiD;IACjD,OAAO,KAAK,IAAI,EAAE;QAChB,OAAO;IACT,CAAC,CAAC;AACJ,CAAC"}
package/lib/index.d.ts CHANGED
@@ -10,5 +10,5 @@ export { getMinimizers } from './minification';
10
10
  export { getHtmlMinifier, type HtmlMinifier } from './minifyHtml';
11
11
  export { createJsLoaderFactory } from './loaders/jsLoader';
12
12
  export { createStyleLoadersFactory } from './loaders/styleLoader';
13
- export { importRspackDevServer } from './rspack';
13
+ export { RspackDevServer } from './rspack';
14
14
  //# sourceMappingURL=index.d.ts.map
@@ -1 +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,EACpB,sBAAsB,GACvB,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;AAChE,OAAO,EAAC,qBAAqB,EAAC,MAAM,UAAU,CAAC"}
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,EACpB,sBAAsB,GACvB,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;AAChE,OAAO,EAAC,eAAe,EAAC,MAAM,UAAU,CAAC"}
package/lib/index.js CHANGED
@@ -6,7 +6,7 @@
6
6
  * LICENSE file in the root directory of this source tree.
7
7
  */
8
8
  Object.defineProperty(exports, "__esModule", { value: true });
9
- exports.importRspackDevServer = exports.createStyleLoadersFactory = exports.createJsLoaderFactory = exports.getHtmlMinifier = exports.getMinimizers = exports.registerBundlerTracing = exports.getProgressBarPlugin = exports.getCopyPlugin = exports.getCSSExtractPlugin = exports.getCurrentBundler = exports.compile = exports.formatStatsErrorMessage = exports.printStatsWarnings = void 0;
9
+ exports.RspackDevServer = exports.createStyleLoadersFactory = exports.createJsLoaderFactory = exports.getHtmlMinifier = exports.getMinimizers = exports.registerBundlerTracing = exports.getProgressBarPlugin = exports.getCopyPlugin = exports.getCSSExtractPlugin = exports.getCurrentBundler = exports.compile = exports.formatStatsErrorMessage = exports.printStatsWarnings = void 0;
10
10
  var compiler_1 = require("./compiler");
11
11
  Object.defineProperty(exports, "printStatsWarnings", { enumerable: true, get: function () { return compiler_1.printStatsWarnings; } });
12
12
  Object.defineProperty(exports, "formatStatsErrorMessage", { enumerable: true, get: function () { return compiler_1.formatStatsErrorMessage; } });
@@ -26,5 +26,5 @@ Object.defineProperty(exports, "createJsLoaderFactory", { enumerable: true, get:
26
26
  var styleLoader_1 = require("./loaders/styleLoader");
27
27
  Object.defineProperty(exports, "createStyleLoadersFactory", { enumerable: true, get: function () { return styleLoader_1.createStyleLoadersFactory; } });
28
28
  var rspack_1 = require("./rspack");
29
- Object.defineProperty(exports, "importRspackDevServer", { enumerable: true, get: function () { return rspack_1.importRspackDevServer; } });
29
+ Object.defineProperty(exports, "RspackDevServer", { enumerable: true, get: function () { return rspack_1.RspackDevServer; } });
30
30
  //# sourceMappingURL=index.js.map
package/lib/index.js.map CHANGED
@@ -1 +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,mDAM0B;AALxB,mHAAA,iBAAiB,OAAA;AACjB,qHAAA,mBAAmB,OAAA;AACnB,+GAAA,aAAa,OAAA;AACb,sHAAA,oBAAoB,OAAA;AACpB,wHAAA,sBAAsB,OAAA;AAGxB,+CAA6C;AAArC,6GAAA,aAAa,OAAA;AACrB,2CAAgE;AAAxD,6GAAA,eAAe,OAAA;AACvB,+CAAyD;AAAjD,iHAAA,qBAAqB,OAAA;AAC7B,qDAAgE;AAAxD,wHAAA,yBAAyB,OAAA;AACjC,mCAA+C;AAAvC,+GAAA,qBAAqB,OAAA"}
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,mDAM0B;AALxB,mHAAA,iBAAiB,OAAA;AACjB,qHAAA,mBAAmB,OAAA;AACnB,+GAAA,aAAa,OAAA;AACb,sHAAA,oBAAoB,OAAA;AACpB,wHAAA,sBAAsB,OAAA;AAGxB,+CAA6C;AAArC,6GAAA,aAAa,OAAA;AACrB,2CAAgE;AAAxD,6GAAA,eAAe,OAAA;AACvB,+CAAyD;AAAjD,iHAAA,qBAAqB,OAAA;AAC7B,qDAAgE;AAAxD,wHAAA,yBAAyB,OAAA;AACjC,mCAAyC;AAAjC,yGAAA,eAAe,OAAA"}
@@ -6,11 +6,6 @@
6
6
  */
7
7
  import type { ConfigureWebpackUtils, DocusaurusConfig } from '@docusaurus/types';
8
8
  export declare function createJsLoaderFactory({ siteConfig, }: {
9
- siteConfig: {
10
- webpack?: DocusaurusConfig['webpack'];
11
- future: {
12
- faster: DocusaurusConfig['future']['faster'];
13
- };
14
- };
9
+ siteConfig: Pick<DocusaurusConfig, 'webpack'>;
15
10
  }): Promise<ConfigureWebpackUtils['getJSLoader']>;
16
11
  //# sourceMappingURL=jsLoader.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"jsLoader.d.ts","sourceRoot":"","sources":["../../src/loaders/jsLoader.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,OAAO,KAAK,EAAC,qBAAqB,EAAE,gBAAgB,EAAC,MAAM,mBAAmB,CAAC;AA8B/E,wBAAsB,qBAAqB,CAAC,EAC1C,UAAU,GACX,EAAE;IACD,UAAU,EAAE;QACV,OAAO,CAAC,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;QACtC,MAAM,EAAE;YACN,MAAM,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC;SAC9C,CAAC;KACH,CAAC;CACH,GAAG,OAAO,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAC,CAoBhD"}
1
+ {"version":3,"file":"jsLoader.d.ts","sourceRoot":"","sources":["../../src/loaders/jsLoader.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,OAAO,KAAK,EAAC,qBAAqB,EAAE,gBAAgB,EAAC,MAAM,mBAAmB,CAAC;AA8B/E,wBAAsB,qBAAqB,CAAC,EAC1C,UAAU,GACX,EAAE;IACD,UAAU,EAAE,IAAI,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;CAC/C,GAAG,OAAO,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAC,CAchD"}
@@ -37,10 +37,6 @@ function createRspackSwcJsLoaderFactory() {
37
37
  async function createJsLoaderFactory({ siteConfig, }) {
38
38
  const currentBundler = await (0, currentBundler_1.getCurrentBundler)({ siteConfig });
39
39
  if (currentBundler.name === 'rspack') {
40
- if (siteConfig.webpack?.jsLoader) {
41
- throw new Error(`You can't use siteConfig.webpack.jsLoader with siteConfig.future.faster.rspackBundler.
42
- Rspack always uses its built-in SWC loader, please remove siteConfig.webpack.jsLoader.`);
43
- }
44
40
  return createRspackSwcJsLoaderFactory();
45
41
  }
46
42
  const jsLoader = siteConfig.webpack?.jsLoader ?? 'babel';
@@ -1 +1 @@
1
- {"version":3,"file":"jsLoader.js","sourceRoot":"","sources":["../../src/loaders/jsLoader.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,6CAAkD;AAClD,gCAA2C;AAC3C,sDAAoD;AACpD,kDAAuD;AAGvD,MAAM,oBAAoB,GAAyC,CAAC,EAClE,QAAQ,EACR,YAAY,GACb,EAAE,EAAE;IACH,OAAO;QACL,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC;QACvC,OAAO,EAAE,IAAA,uBAAe,EAAC,EAAC,QAAQ,EAAE,YAAY,EAAC,CAAC;KACnD,CAAC;AACJ,CAAC,CAAC;AAEF,SAAS,8BAA8B;IACrC,MAAM,MAAM,GAAG,oBAAoB,CAAC;IACpC,MAAM,yBAAyB,GAAG,IAAA,qCAAsB,GAAE,CAAC;IAC3D,OAAO,CAAC,EAAC,QAAQ,EAAC,EAAE,EAAE;QACpB,OAAO;YACL,MAAM;YACN,OAAO,EAAE,IAAA,yBAAmB,EAAC;gBAC3B,QAAQ;gBACR,WAAW,EAAE,QAAQ;gBACrB,yBAAyB;aAC1B,CAAC;SACH,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAED,6EAA6E;AAC7E,wEAAwE;AACxE,yEAAyE;AAClE,KAAK,gCAAgC,EAC1C,UAAU,GAQX;IACC,MAAM,cAAc,GAAG,MAAM,IAAA,kCAAiB,EAAC,EAAC,UAAU,EAAC,CAAC,CAAC;IAC7D,IAAI,cAAc,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACrC,IAAI,UAAU,CAAC,OAAO,EAAE,QAAQ,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CACb;uFAC+E,CAChF,CAAC;QACJ,CAAC;QACD,OAAO,8BAA8B,EAAE,CAAC;IAC1C,CAAC;IAED,MAAM,QAAQ,GAAG,UAAU,CAAC,OAAO,EAAE,QAAQ,IAAI,OAAO,CAAC;IACzD,IAAI,QAAQ,YAAY,QAAQ,EAAE,CAAC;QACjC,OAAO,CAAC,EAAC,QAAQ,EAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC;IACD,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;QACzB,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,4CAA4C,QAAQ,EAAE,CAAC,CAAC;AAC1E,CAAC"}
1
+ {"version":3,"file":"jsLoader.js","sourceRoot":"","sources":["../../src/loaders/jsLoader.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,6CAAkD;AAClD,gCAA2C;AAC3C,sDAAoD;AACpD,kDAAuD;AAGvD,MAAM,oBAAoB,GAAyC,CAAC,EAClE,QAAQ,EACR,YAAY,GACb,EAAE,EAAE;IACH,OAAO;QACL,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC;QACvC,OAAO,EAAE,IAAA,uBAAe,EAAC,EAAC,QAAQ,EAAE,YAAY,EAAC,CAAC;KACnD,CAAC;AACJ,CAAC,CAAC;AAEF,SAAS,8BAA8B;IACrC,MAAM,MAAM,GAAG,oBAAoB,CAAC;IACpC,MAAM,yBAAyB,GAAG,IAAA,qCAAsB,GAAE,CAAC;IAC3D,OAAO,CAAC,EAAC,QAAQ,EAAC,EAAE,EAAE;QACpB,OAAO;YACL,MAAM;YACN,OAAO,EAAE,IAAA,yBAAmB,EAAC;gBAC3B,QAAQ;gBACR,WAAW,EAAE,QAAQ;gBACrB,yBAAyB;aAC1B,CAAC;SACH,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAED,6EAA6E;AAC7E,wEAAwE;AACxE,yEAAyE;AAClE,KAAK,gCAAgC,EAC1C,UAAU,GAGX;IACC,MAAM,cAAc,GAAG,MAAM,IAAA,kCAAiB,EAAC,EAAC,UAAU,EAAC,CAAC,CAAC;IAC7D,IAAI,cAAc,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACrC,OAAO,8BAA8B,EAAE,CAAC;IAC1C,CAAC;IAED,MAAM,QAAQ,GAAG,UAAU,CAAC,OAAO,EAAE,QAAQ,IAAI,OAAO,CAAC;IACzD,IAAI,QAAQ,YAAY,QAAQ,EAAE,CAAC;QACjC,OAAO,CAAC,EAAC,QAAQ,EAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC;IACD,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;QACzB,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,4CAA4C,QAAQ,EAAE,CAAC,CAAC;AAC1E,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"minification.d.ts","sourceRoot":"","sources":["../src/minification.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAWH,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,SAAS,CAAC;AACnD,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,mBAAmB,CAAC;AAEtD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,cAAc,EAAE,cAAc,CAAC;CAChC,CAAC;AAkFF,wBAAsB,aAAa,CACjC,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAIlC"}
1
+ {"version":3,"file":"minification.d.ts","sourceRoot":"","sources":["../src/minification.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAcH,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,SAAS,CAAC;AACnD,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,mBAAmB,CAAC;AAEtD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,cAAc,EAAE,cAAc,CAAC;CAChC,CAAC;AAgFF,wBAAsB,aAAa,CACjC,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAKlC"}
@@ -10,25 +10,25 @@ exports.getMinimizers = getMinimizers;
10
10
  const tslib_1 = require("tslib");
11
11
  const terser_webpack_plugin_1 = tslib_1.__importDefault(require("terser-webpack-plugin"));
12
12
  const css_minimizer_webpack_plugin_1 = tslib_1.__importDefault(require("css-minimizer-webpack-plugin"));
13
- const currentBundler_1 = require("./currentBundler");
13
+ const rspack_1 = require("./rspack");
14
14
  const browserslist_1 = require("./browserslist");
15
+ // Shared by Webpack and Rspack, compatible with both SWC and Rspack types
16
+ // Rspack only accepts a subset of the SWC JS minifier options
15
17
  // See https://swc.rs/docs/configuration/minification
16
- function getSwcJsMinimizerOptions() {
17
- return {
18
- ecma: 2020,
19
- compress: {
20
- ecma: 5,
21
- },
22
- module: true,
23
- mangle: true,
24
- safari10: true,
25
- format: {
26
- ecma: 5,
27
- comments: false,
28
- ascii_only: true,
29
- },
30
- };
31
- }
18
+ // See https://rspack.rs/plugins/rspack/swc-js-minimizer-rspack-plugin#minimizeroptions
19
+ const SwcJsMinimizerOptions = {
20
+ ecma: 2020,
21
+ compress: {
22
+ ecma: 5,
23
+ },
24
+ module: true,
25
+ mangle: true,
26
+ format: {
27
+ ecma: 5,
28
+ comments: false,
29
+ ascii_only: true,
30
+ },
31
+ };
32
32
  // See https://github.com/webpack-contrib/terser-webpack-plugin#parallel
33
33
  function getTerserParallel() {
34
34
  let terserParallel = true;
@@ -46,7 +46,7 @@ function getJsMinimizer() {
46
46
  return new terser_webpack_plugin_1.default({
47
47
  parallel: getTerserParallel(),
48
48
  minify: terser_webpack_plugin_1.default.swcMinify,
49
- terserOptions: getSwcJsMinimizerOptions(),
49
+ terserOptions: { ...SwcJsMinimizerOptions, safari10: true },
50
50
  });
51
51
  }
52
52
  function getCssMinimizer() {
@@ -58,20 +58,17 @@ function getCssMinimizer() {
58
58
  function getWebpackMinimizers() {
59
59
  return [getJsMinimizer(), getCssMinimizer()];
60
60
  }
61
- async function getRspackMinimizers({ currentBundler, }) {
62
- const rspack = (0, currentBundler_1.getCurrentBundlerAsRspack)({ currentBundler });
63
- const swcJsMinimizerOptions = getSwcJsMinimizerOptions();
61
+ function getRspackMinimizers() {
64
62
  return [
65
63
  // See https://rspack.dev/plugins/rspack/swc-js-minimizer-rspack-plugin
66
64
  // See https://swc.rs/docs/configuration/minification
67
- new rspack.SwcJsMinimizerRspackPlugin({
65
+ new rspack_1.rspack.SwcJsMinimizerRspackPlugin({
68
66
  minimizerOptions: {
69
67
  minify: true,
70
- ecma: swcJsMinimizerOptions.ecma,
71
- ...swcJsMinimizerOptions,
68
+ ...SwcJsMinimizerOptions,
72
69
  },
73
70
  }),
74
- new rspack.LightningCssMinimizerRspackPlugin({
71
+ new rspack_1.rspack.LightningCssMinimizerRspackPlugin({
75
72
  minimizerOptions: {
76
73
  // Rspack takes Browserslist queries directly
77
74
  // While LightningCSS targets are normally not Browserslist queries
@@ -84,7 +81,8 @@ async function getRspackMinimizers({ currentBundler, }) {
84
81
  }
85
82
  async function getMinimizers(params) {
86
83
  return params.currentBundler.name === 'rspack'
87
- ? getRspackMinimizers(params)
84
+ ? // Docusaurus bundler configs are typed with Webpack types
85
+ getRspackMinimizers()
88
86
  : getWebpackMinimizers();
89
87
  }
90
88
  //# sourceMappingURL=minification.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"minification.js","sourceRoot":"","sources":["../src/minification.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;AAEH,0FAAiD;AACjD,wGAA8D;AAC9D,qDAA2D;AAC3D,iDAGwB;AAUxB,qDAAqD;AACrD,SAAS,wBAAwB;IAC/B,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,wEAAwE;AACxE,SAAS,iBAAiB;IACxB,IAAI,cAAc,GAAqB,IAAI,CAAC;IAC5C,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,KAAK,OAAO,EAAE,CAAC;QAC5C,cAAc,GAAG,KAAK,CAAC;IACzB,CAAC;SAAM,IACL,OAAO,CAAC,GAAG,CAAC,eAAe;QAC3B,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,EAAE,CAAC,GAAG,CAAC,EAC7C,CAAC;QACD,cAAc,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;IAC7D,CAAC;IACD,OAAO,cAAc,CAAC;AACxB,CAAC;AAED,uEAAuE;AACvE,SAAS,cAAc;IACrB,OAAO,IAAI,+BAAY,CAAkB;QACvC,QAAQ,EAAE,iBAAiB,EAAE;QAC7B,MAAM,EAAE,+BAAY,CAAC,SAAS;QAC9B,aAAa,EAAE,wBAAwB,EAAE;KAC1C,CAAC,CAAC;AACL,CAAC;AAED,SAAS,eAAe;IACtB,OAAO,IAAI,sCAAkB,CAAC;QAC5B,MAAM,EAAE,sCAAkB,CAAC,kBAAkB;QAC7C,gBAAgB,EAAE,IAAA,8CAA+B,GAAE;KACpD,CAAC,CAAC;AACL,CAAC;AAED,SAAS,oBAAoB;IAC3B,OAAO,CAAC,cAAc,EAAE,EAAE,eAAe,EAAE,CAAC,CAAC;AAC/C,CAAC;AAED,KAAK,UAAU,mBAAmB,CAAC,EACjC,cAAc,GACG;IACjB,MAAM,MAAM,GAAG,IAAA,0CAAyB,EAAC,EAAC,cAAc,EAAC,CAAC,CAAC;IAC3D,MAAM,qBAAqB,GAAkB,wBAAwB,EAAE,CAAC;IAExE,OAAO;QACL,uEAAuE;QACvE,qDAAqD;QACrD,IAAI,MAAM,CAAC,0BAA0B,CAAC;YACpC,gBAAgB,EAAE;gBAChB,MAAM,EAAE,IAAI;gBACZ,IAAI,EAAE,qBAAqB,CAAC,IAAI;gBAChC,GAAG,qBAAqB;aACzB;SACF,CAAC;QACF,IAAI,MAAM,CAAC,iCAAiC,CAAC;YAC3C,gBAAgB,EAAE;gBAChB,6CAA6C;gBAC7C,mEAAmE;gBACnE,+FAA+F;gBAC/F,kDAAkD;gBAClD,OAAO,EAAE,IAAA,qCAAsB,GAAE;aAClC;SACF,CAAC;KACmC,CAAC;AAC1C,CAAC;AAEM,KAAK,wBACV,MAAwB;IAExB,OAAO,MAAM,CAAC,cAAc,CAAC,IAAI,KAAK,QAAQ;QAC5C,CAAC,CAAC,mBAAmB,CAAC,MAAM,CAAC;QAC7B,CAAC,CAAC,oBAAoB,EAAE,CAAC;AAC7B,CAAC"}
1
+ {"version":3,"file":"minification.js","sourceRoot":"","sources":["../src/minification.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;AAEH,0FAAiD;AACjD,wGAA8D;AAC9D,qCAAgC;AAChC,iDAGwB;AAiBxB,0EAA0E;AAC1E,8DAA8D;AAC9D,qDAAqD;AACrD,uFAAuF;AACvF,MAAM,qBAAqB,GAAG;IAC5B,IAAI,EAAE,IAAI;IACV,QAAQ,EAAE;QACR,IAAI,EAAE,CAAC;KACR;IACD,MAAM,EAAE,IAAI;IACZ,MAAM,EAAE,IAAI;IACZ,MAAM,EAAE;QACN,IAAI,EAAE,CAAC;QACP,QAAQ,EAAE,KAAK;QACf,UAAU,EAAE,IAAI;KACjB;CAC6C,CAAC;AAEjD,wEAAwE;AACxE,SAAS,iBAAiB;IACxB,IAAI,cAAc,GAAqB,IAAI,CAAC;IAC5C,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,KAAK,OAAO,EAAE,CAAC;QAC5C,cAAc,GAAG,KAAK,CAAC;IACzB,CAAC;SAAM,IACL,OAAO,CAAC,GAAG,CAAC,eAAe;QAC3B,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,EAAE,CAAC,GAAG,CAAC,EAC7C,CAAC;QACD,cAAc,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;IAC7D,CAAC;IACD,OAAO,cAAc,CAAC;AACxB,CAAC;AAED,uEAAuE;AACvE,SAAS,cAAc;IACrB,OAAO,IAAI,+BAAY,CAAkB;QACvC,QAAQ,EAAE,iBAAiB,EAAE;QAC7B,MAAM,EAAE,+BAAY,CAAC,SAAS;QAC9B,aAAa,EAAE,EAAC,GAAG,qBAAqB,EAAE,QAAQ,EAAE,IAAI,EAAC;KAC1D,CAAC,CAAC;AACL,CAAC;AAED,SAAS,eAAe;IACtB,OAAO,IAAI,sCAAkB,CAAC;QAC5B,MAAM,EAAE,sCAAkB,CAAC,kBAAkB;QAC7C,gBAAgB,EAAE,IAAA,8CAA+B,GAAE;KACpD,CAAC,CAAC;AACL,CAAC;AAED,SAAS,oBAAoB;IAC3B,OAAO,CAAC,cAAc,EAAE,EAAE,eAAe,EAAE,CAAC,CAAC;AAC/C,CAAC;AAED,SAAS,mBAAmB;IAC1B,OAAO;QACL,uEAAuE;QACvE,qDAAqD;QACrD,IAAI,eAAM,CAAC,0BAA0B,CAAC;YACpC,gBAAgB,EAAE;gBAChB,MAAM,EAAE,IAAI;gBACZ,GAAG,qBAAqB;aACzB;SACF,CAAC;QACF,IAAI,eAAM,CAAC,iCAAiC,CAAC;YAC3C,gBAAgB,EAAE;gBAChB,6CAA6C;gBAC7C,mEAAmE;gBACnE,+FAA+F;gBAC/F,kDAAkD;gBAClD,OAAO,EAAE,IAAA,qCAAsB,GAAE;aAClC;SACF,CAAC;KACH,CAAC;AACJ,CAAC;AAEM,KAAK,wBACV,MAAwB;IAExB,OAAO,MAAM,CAAC,cAAc,CAAC,IAAI,KAAK,QAAQ;QAC5C,CAAC,CAAC,0DAA0D;YACzD,mBAAmB,EAAyC;QAC/D,CAAC,CAAC,oBAAoB,EAAE,CAAC;AAC7B,CAAC"}
package/lib/rspack.d.ts CHANGED
@@ -4,8 +4,6 @@
4
4
  * This source code is licensed under the MIT license found in the
5
5
  * LICENSE file in the root directory of this source tree.
6
6
  */
7
- export type Rspack = (typeof import('@rspack/core'))['rspack'];
8
- export type RspackDevServer = (typeof import('@rspack/dev-server'))['RspackDevServer'];
9
- export declare function importRspack(): Promise<Rspack>;
10
- export declare function importRspackDevServer(): Promise<RspackDevServer>;
7
+ export { rspack } from '@rspack/core';
8
+ export { RspackDevServer } from '@rspack/dev-server';
11
9
  //# sourceMappingURL=rspack.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"rspack.d.ts","sourceRoot":"","sources":["../src/rspack.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,MAAM,MAAM,MAAM,GAAG,CAAC,cAAc,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;AAE/D,MAAM,MAAM,eAAe,GACzB,CAAC,cAAc,oBAAoB,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC;AAE3D,wBAAsB,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,CAGpD;AAED,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,eAAe,CAAC,CAGtE"}
1
+ {"version":3,"file":"rspack.d.ts","sourceRoot":"","sources":["../src/rspack.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAC,MAAM,EAAC,MAAM,cAAc,CAAC;AACpC,OAAO,EAAC,eAAe,EAAC,MAAM,oBAAoB,CAAC"}
package/lib/rspack.js CHANGED
@@ -6,14 +6,9 @@
6
6
  * LICENSE file in the root directory of this source tree.
7
7
  */
8
8
  Object.defineProperty(exports, "__esModule", { value: true });
9
- exports.importRspack = importRspack;
10
- exports.importRspackDevServer = importRspackDevServer;
11
- async function importRspack() {
12
- const { rspack } = await import('@rspack/core');
13
- return rspack;
14
- }
15
- async function importRspackDevServer() {
16
- const { RspackDevServer } = await import('@rspack/dev-server');
17
- return RspackDevServer;
18
- }
9
+ exports.RspackDevServer = exports.rspack = void 0;
10
+ var core_1 = require("@rspack/core");
11
+ Object.defineProperty(exports, "rspack", { enumerable: true, get: function () { return core_1.rspack; } });
12
+ var dev_server_1 = require("@rspack/dev-server");
13
+ Object.defineProperty(exports, "RspackDevServer", { enumerable: true, get: function () { return dev_server_1.RspackDevServer; } });
19
14
  //# sourceMappingURL=rspack.js.map
package/lib/rspack.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"rspack.js","sourceRoot":"","sources":["../src/rspack.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;AAQI,KAAK;IACV,MAAM,EAAC,MAAM,EAAC,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,CAAC;IAC9C,OAAO,MAAM,CAAC;AAChB,CAAC;AAEM,KAAK;IACV,MAAM,EAAC,eAAe,EAAC,GAAG,MAAM,MAAM,CAAC,oBAAoB,CAAC,CAAC;IAC7D,OAAO,eAAe,CAAC;AACzB,CAAC"}
1
+ {"version":3,"file":"rspack.js","sourceRoot":"","sources":["../src/rspack.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAAoC;AAA5B,8FAAA,MAAM,OAAA;AACd,iDAAmD;AAA3C,6GAAA,eAAe,OAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@docusaurus/bundler",
3
- "version": "4.0.0-canary-6905",
3
+ "version": "4.0.0-canary-6909",
4
4
  "description": "Docusaurus util package to abstract the current bundler.",
5
5
  "main": "./lib/index.js",
6
6
  "types": "./lib/index.d.ts",
@@ -19,9 +19,9 @@
19
19
  "license": "MIT",
20
20
  "dependencies": {
21
21
  "@babel/core": "^7.29.7",
22
- "@docusaurus/babel": "4.0.0-canary-6905",
23
- "@docusaurus/logger": "4.0.0-canary-6905",
24
- "@docusaurus/types": "4.0.0-canary-6905",
22
+ "@docusaurus/babel": "4.0.0-canary-6909",
23
+ "@docusaurus/logger": "4.0.0-canary-6909",
24
+ "@docusaurus/types": "4.0.0-canary-6909",
25
25
  "@rspack/core": "^2.2.3",
26
26
  "@rspack/dev-server": "^2.2.1",
27
27
  "@swc/core": "^1.16.2",
@@ -41,11 +41,8 @@
41
41
  "webpack": "^5.111.0",
42
42
  "webpackbar": "^7.0.0"
43
43
  },
44
- "devDependencies": {
45
- "@total-typescript/shoehorn": "^0.1.2"
46
- },
47
44
  "engines": {
48
45
  "node": ">=24.21"
49
46
  },
50
- "gitHead": "470671a4afe0ffd3cc7baf99475ba2370145f3b1"
47
+ "gitHead": "5e2a504d84cc304af27b526febd9f9bdb997b290"
51
48
  }
@@ -8,19 +8,14 @@
8
8
  import webpack from 'webpack';
9
9
  import WebpackBar from 'webpackbar';
10
10
  import MiniCssExtractPlugin from 'mini-css-extract-plugin';
11
- import {importRspack} from './rspack';
12
- import type {Rspack} from './rspack';
11
+ import {rspack} from './rspack';
13
12
  import type {CurrentBundler, DocusaurusConfig} from '@docusaurus/types';
14
13
 
15
- // We inject a site config slice because the Rspack flag might change place
16
- type SiteConfigSlice = {
17
- future: {
18
- faster: Pick<DocusaurusConfig['future']['faster'], 'rspackBundler'>;
19
- };
20
- };
14
+ type SiteConfigSlice = Pick<DocusaurusConfig, 'webpack'>;
21
15
 
16
+ // Rspack is the default, Webpack is opt-in (deprecated)
22
17
  function isRspack(siteConfig: SiteConfigSlice): boolean {
23
- return siteConfig.future.faster.rspackBundler;
18
+ return !siteConfig.webpack;
24
19
  }
25
20
 
26
21
  export async function getCurrentBundler({
@@ -31,7 +26,8 @@ export async function getCurrentBundler({
31
26
  if (isRspack(siteConfig)) {
32
27
  return {
33
28
  name: 'rspack',
34
- instance: (await importRspack()) as unknown as typeof webpack,
29
+ // CurrentBundler exposes Webpack types, see its type definition
30
+ instance: rspack as unknown as typeof webpack,
35
31
  };
36
32
  }
37
33
  return {
@@ -40,27 +36,13 @@ export async function getCurrentBundler({
40
36
  };
41
37
  }
42
38
 
43
- export function getCurrentBundlerAsRspack({
44
- currentBundler,
45
- }: {
46
- currentBundler: CurrentBundler;
47
- }): Rspack {
48
- if (currentBundler.name !== 'rspack') {
49
- throw new Error(
50
- `Can't getCurrentBundlerAsRspack() because current bundler is ${currentBundler.name}`,
51
- );
52
- }
53
- return currentBundler.instance as unknown as Rspack;
54
- }
55
-
56
39
  export async function getCSSExtractPlugin({
57
40
  currentBundler,
58
41
  }: {
59
42
  currentBundler: CurrentBundler;
60
43
  }): Promise<typeof MiniCssExtractPlugin> {
61
44
  if (currentBundler.name === 'rspack') {
62
- // @ts-expect-error: this exists only in Rspack
63
- return currentBundler.instance.CssExtractRspackPlugin;
45
+ return rspack.CssExtractRspackPlugin as unknown as typeof MiniCssExtractPlugin;
64
46
  }
65
47
  return MiniCssExtractPlugin;
66
48
  }
@@ -71,8 +53,7 @@ export async function getCopyPlugin({
71
53
  currentBundler: CurrentBundler;
72
54
  }): Promise<typeof webpack.CopyPlugin> {
73
55
  if (currentBundler.name === 'rspack') {
74
- // @ts-expect-error: this exists only in Rspack
75
- return currentBundler.instance.CopyRspackPlugin;
56
+ return rspack.CopyRspackPlugin as unknown as typeof webpack.CopyPlugin;
76
57
  }
77
58
  return currentBundler.instance.CopyPlugin;
78
59
  }
@@ -83,7 +64,6 @@ export async function getProgressBarPlugin({
83
64
  currentBundler: CurrentBundler;
84
65
  }): Promise<typeof WebpackBar> {
85
66
  if (currentBundler.name === 'rspack') {
86
- const rspack = getCurrentBundlerAsRspack({currentBundler});
87
67
  class CustomRspackProgressPlugin extends rspack.ProgressPlugin {
88
68
  constructor({name, color = 'green'}: {name?: string; color?: string}) {
89
69
  // Unfortunately rspack.ProgressPlugin does not have name/color options
@@ -107,8 +87,6 @@ export async function registerBundlerTracing({
107
87
  currentBundler: CurrentBundler;
108
88
  }): Promise<() => Promise<void>> {
109
89
  if (currentBundler.name === 'rspack') {
110
- const Rspack = await importRspack();
111
-
112
90
  // See https://rspack.dev/contribute/development/profiling
113
91
  // File can be opened with https://ui.perfetto.dev/
114
92
  if (process.env.DOCUSAURUS_RSPACK_TRACE) {
@@ -123,7 +101,7 @@ export async function registerBundlerTracing({
123
101
  filter = 'info';
124
102
  }
125
103
 
126
- await Rspack.experiments.globalTrace.register(
104
+ await rspack.experiments.globalTrace.register(
127
105
  filter,
128
106
  'perfetto',
129
107
  './rspack-tracing.pftrace',
@@ -132,7 +110,7 @@ export async function registerBundlerTracing({
132
110
  console.info(`Rspack tracing registered, filter=${filter}`);
133
111
 
134
112
  return async () => {
135
- await Rspack.experiments.globalTrace.cleanup();
113
+ await rspack.experiments.globalTrace.cleanup();
136
114
  console.log(`Rspack tracing cleaned up, filter=${filter}`);
137
115
  };
138
116
  }
package/src/index.ts CHANGED
@@ -19,4 +19,4 @@ export {getMinimizers} from './minification';
19
19
  export {getHtmlMinifier, type HtmlMinifier} from './minifyHtml';
20
20
  export {createJsLoaderFactory} from './loaders/jsLoader';
21
21
  export {createStyleLoadersFactory} from './loaders/styleLoader';
22
- export {importRspackDevServer} from './rspack';
22
+ export {RspackDevServer} from './rspack';
@@ -42,21 +42,10 @@ function createRspackSwcJsLoaderFactory(): ConfigureWebpackUtils['getJSLoader']
42
42
  export async function createJsLoaderFactory({
43
43
  siteConfig,
44
44
  }: {
45
- siteConfig: {
46
- webpack?: DocusaurusConfig['webpack'];
47
- future: {
48
- faster: DocusaurusConfig['future']['faster'];
49
- };
50
- };
45
+ siteConfig: Pick<DocusaurusConfig, 'webpack'>;
51
46
  }): Promise<ConfigureWebpackUtils['getJSLoader']> {
52
47
  const currentBundler = await getCurrentBundler({siteConfig});
53
48
  if (currentBundler.name === 'rspack') {
54
- if (siteConfig.webpack?.jsLoader) {
55
- throw new Error(
56
- `You can't use siteConfig.webpack.jsLoader with siteConfig.future.faster.rspackBundler.
57
- Rspack always uses its built-in SWC loader, please remove siteConfig.webpack.jsLoader.`,
58
- );
59
- }
60
49
  return createRspackSwcJsLoaderFactory();
61
50
  }
62
51
 
@@ -7,13 +7,16 @@
7
7
 
8
8
  import TerserPlugin from 'terser-webpack-plugin';
9
9
  import CssMinimizerPlugin from 'css-minimizer-webpack-plugin';
10
- import {getCurrentBundlerAsRspack} from './currentBundler';
10
+ import {rspack} from './rspack';
11
11
  import {
12
12
  getBrowserslistQueries,
13
13
  getLightningCssMinimizerOptions,
14
14
  } from './browserslist';
15
15
  import type {JsMinifyOptions} from '@swc/core';
16
- import type {CustomOptions} from 'terser-webpack-plugin';
16
+ import type {
17
+ RspackPluginInstance,
18
+ SwcJsMinimizerRspackPluginOptions,
19
+ } from '@rspack/core';
17
20
  import type {WebpackPluginInstance} from 'webpack';
18
21
  import type {CurrentBundler} from '@docusaurus/types';
19
22
 
@@ -21,23 +24,27 @@ export type MinimizersConfig = {
21
24
  currentBundler: CurrentBundler;
22
25
  };
23
26
 
27
+ type RspackSwcJsMinimizerOptions = NonNullable<
28
+ SwcJsMinimizerRspackPluginOptions['minimizerOptions']
29
+ >;
30
+
31
+ // Shared by Webpack and Rspack, compatible with both SWC and Rspack types
32
+ // Rspack only accepts a subset of the SWC JS minifier options
24
33
  // See https://swc.rs/docs/configuration/minification
25
- function getSwcJsMinimizerOptions(): JsMinifyOptions {
26
- return {
27
- ecma: 2020,
28
- compress: {
29
- ecma: 5,
30
- },
31
- module: true,
32
- mangle: true,
33
- safari10: true,
34
- format: {
35
- ecma: 5,
36
- comments: false,
37
- ascii_only: true,
38
- },
39
- };
40
- }
34
+ // See https://rspack.rs/plugins/rspack/swc-js-minimizer-rspack-plugin#minimizeroptions
35
+ const SwcJsMinimizerOptions = {
36
+ ecma: 2020,
37
+ compress: {
38
+ ecma: 5,
39
+ },
40
+ module: true,
41
+ mangle: true,
42
+ format: {
43
+ ecma: 5,
44
+ comments: false,
45
+ ascii_only: true,
46
+ },
47
+ } as const satisfies RspackSwcJsMinimizerOptions;
41
48
 
42
49
  // See https://github.com/webpack-contrib/terser-webpack-plugin#parallel
43
50
  function getTerserParallel() {
@@ -58,7 +65,7 @@ function getJsMinimizer(): WebpackPluginInstance {
58
65
  return new TerserPlugin<JsMinifyOptions>({
59
66
  parallel: getTerserParallel(),
60
67
  minify: TerserPlugin.swcMinify,
61
- terserOptions: getSwcJsMinimizerOptions(),
68
+ terserOptions: {...SwcJsMinimizerOptions, safari10: true},
62
69
  });
63
70
  }
64
71
 
@@ -73,20 +80,14 @@ function getWebpackMinimizers(): WebpackPluginInstance[] {
73
80
  return [getJsMinimizer(), getCssMinimizer()];
74
81
  }
75
82
 
76
- async function getRspackMinimizers({
77
- currentBundler,
78
- }: MinimizersConfig): Promise<WebpackPluginInstance[]> {
79
- const rspack = getCurrentBundlerAsRspack({currentBundler});
80
- const swcJsMinimizerOptions: CustomOptions = getSwcJsMinimizerOptions();
81
-
83
+ function getRspackMinimizers(): RspackPluginInstance[] {
82
84
  return [
83
85
  // See https://rspack.dev/plugins/rspack/swc-js-minimizer-rspack-plugin
84
86
  // See https://swc.rs/docs/configuration/minification
85
87
  new rspack.SwcJsMinimizerRspackPlugin({
86
88
  minimizerOptions: {
87
89
  minify: true,
88
- ecma: swcJsMinimizerOptions.ecma,
89
- ...swcJsMinimizerOptions,
90
+ ...SwcJsMinimizerOptions,
90
91
  },
91
92
  }),
92
93
  new rspack.LightningCssMinimizerRspackPlugin({
@@ -98,13 +99,14 @@ async function getRspackMinimizers({
98
99
  targets: getBrowserslistQueries(),
99
100
  },
100
101
  }),
101
- ] as unknown as WebpackPluginInstance[];
102
+ ];
102
103
  }
103
104
 
104
105
  export async function getMinimizers(
105
106
  params: MinimizersConfig,
106
107
  ): Promise<WebpackPluginInstance[]> {
107
108
  return params.currentBundler.name === 'rspack'
108
- ? getRspackMinimizers(params)
109
+ ? // Docusaurus bundler configs are typed with Webpack types
110
+ (getRspackMinimizers() as unknown as WebpackPluginInstance[])
109
111
  : getWebpackMinimizers();
110
112
  }
package/src/rspack.ts CHANGED
@@ -5,18 +5,5 @@
5
5
  * LICENSE file in the root directory of this source tree.
6
6
  */
7
7
 
8
- // Rspack is imported lazily: sites using webpack shouldn't pay its load cost
9
- export type Rspack = (typeof import('@rspack/core'))['rspack'];
10
-
11
- export type RspackDevServer =
12
- (typeof import('@rspack/dev-server'))['RspackDevServer'];
13
-
14
- export async function importRspack(): Promise<Rspack> {
15
- const {rspack} = await import('@rspack/core');
16
- return rspack;
17
- }
18
-
19
- export async function importRspackDevServer(): Promise<RspackDevServer> {
20
- const {RspackDevServer} = await import('@rspack/dev-server');
21
- return RspackDevServer;
22
- }
8
+ export {rspack} from '@rspack/core';
9
+ export {RspackDevServer} from '@rspack/dev-server';