@docusaurus/bundler 3.9.2 → 3.10.1
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.
- package/lib/currentBundler.d.ts +1 -1
- package/lib/currentBundler.d.ts.map +1 -1
- package/lib/currentBundler.js +1 -1
- package/lib/currentBundler.js.map +1 -1
- package/lib/loaders/jsLoader.d.ts +1 -1
- package/lib/loaders/jsLoader.d.ts.map +1 -1
- package/lib/loaders/jsLoader.js +5 -5
- package/lib/loaders/jsLoader.js.map +1 -1
- package/lib/minification.d.ts.map +1 -1
- package/lib/minification.js +6 -1
- package/lib/minification.js.map +1 -1
- package/package.json +8 -8
- package/src/currentBundler.ts +2 -5
- package/src/loaders/jsLoader.ts +6 -6
- package/src/minification.ts +7 -1
package/lib/currentBundler.d.ts
CHANGED
|
@@ -11,7 +11,7 @@ import type { FasterModule } from './importFaster';
|
|
|
11
11
|
import type { CurrentBundler, DocusaurusConfig } from '@docusaurus/types';
|
|
12
12
|
type SiteConfigSlice = {
|
|
13
13
|
future: {
|
|
14
|
-
|
|
14
|
+
faster: Pick<DocusaurusConfig['future']['faster'], 'rspackBundler'>;
|
|
15
15
|
};
|
|
16
16
|
};
|
|
17
17
|
export declare function getCurrentBundler({ siteConfig, }: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"currentBundler.d.ts","sourceRoot":"","sources":["../src/currentBundler.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,oBAAoB,MAAM,yBAAyB,CAAC;AAC3D,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AAEpD,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AACjD,OAAO,KAAK,EAAC,cAAc,EAAE,gBAAgB,EAAC,MAAM,mBAAmB,CAAC;AAGxE,KAAK,eAAe,GAAG;IACrB,MAAM,EAAE;QACN,
|
|
1
|
+
{"version":3,"file":"currentBundler.d.ts","sourceRoot":"","sources":["../src/currentBundler.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,oBAAoB,MAAM,yBAAyB,CAAC;AAC3D,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AAEpD,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AACjD,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,YAAY,CAAC,QAAQ,CAAC,CAOzB;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,iBAAiB,CAAC,CAMpC;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"}
|
package/lib/currentBundler.js
CHANGED
|
@@ -19,7 +19,7 @@ const mini_css_extract_plugin_1 = tslib_1.__importDefault(require("mini-css-extr
|
|
|
19
19
|
const copy_webpack_plugin_1 = tslib_1.__importDefault(require("copy-webpack-plugin"));
|
|
20
20
|
const importFaster_1 = require("./importFaster");
|
|
21
21
|
function isRspack(siteConfig) {
|
|
22
|
-
return siteConfig.future.
|
|
22
|
+
return siteConfig.future.faster.rspackBundler;
|
|
23
23
|
}
|
|
24
24
|
async function getCurrentBundler({ siteConfig, }) {
|
|
25
25
|
if (isRspack(siteConfig)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"currentBundler.js","sourceRoot":"","sources":["../src/currentBundler.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;
|
|
1
|
+
{"version":3,"file":"currentBundler.js","sourceRoot":"","sources":["../src/currentBundler.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ export declare function createJsLoaderFactory({ siteConfig, }: {
|
|
|
9
9
|
siteConfig: {
|
|
10
10
|
webpack?: DocusaurusConfig['webpack'];
|
|
11
11
|
future: {
|
|
12
|
-
|
|
12
|
+
faster: DocusaurusConfig['future']['faster'];
|
|
13
13
|
};
|
|
14
14
|
};
|
|
15
15
|
}): Promise<ConfigureWebpackUtils['getJSLoader']>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jsLoader.d.ts","sourceRoot":"","sources":["../../src/loaders/jsLoader.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,KAAK,EAAC,qBAAqB,EAAE,gBAAgB,EAAC,MAAM,mBAAmB,CAAC;AA0C/E,wBAAsB,qBAAqB,CAAC,EAC1C,UAAU,GACX,EAAE;IACD,UAAU,EAAE;QACV,OAAO,CAAC,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;QACtC,MAAM,EAAE;YACN,
|
|
1
|
+
{"version":3,"file":"jsLoader.d.ts","sourceRoot":"","sources":["../../src/loaders/jsLoader.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,KAAK,EAAC,qBAAqB,EAAE,gBAAgB,EAAC,MAAM,mBAAmB,CAAC;AA0C/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,CAyBhD"}
|
package/lib/loaders/jsLoader.js
CHANGED
|
@@ -22,7 +22,7 @@ async function createSwcJsLoaderFactory() {
|
|
|
22
22
|
return ({ isServer }) => {
|
|
23
23
|
return {
|
|
24
24
|
loader,
|
|
25
|
-
options: getOptions({ isServer }),
|
|
25
|
+
options: getOptions({ isServer, bundlerName: 'webpack' }),
|
|
26
26
|
};
|
|
27
27
|
};
|
|
28
28
|
}
|
|
@@ -33,7 +33,7 @@ async function createRspackSwcJsLoaderFactory() {
|
|
|
33
33
|
return ({ isServer }) => {
|
|
34
34
|
return {
|
|
35
35
|
loader,
|
|
36
|
-
options: getOptions({ isServer }),
|
|
36
|
+
options: getOptions({ isServer, bundlerName: 'rspack' }),
|
|
37
37
|
};
|
|
38
38
|
};
|
|
39
39
|
}
|
|
@@ -42,13 +42,13 @@ async function createRspackSwcJsLoaderFactory() {
|
|
|
42
42
|
// It is injected in configureWebpack plugin lifecycle for plugin authors
|
|
43
43
|
async function createJsLoaderFactory({ siteConfig, }) {
|
|
44
44
|
const currentBundler = await (0, currentBundler_1.getCurrentBundler)({ siteConfig });
|
|
45
|
-
const isSWCLoader = siteConfig.future.
|
|
45
|
+
const isSWCLoader = siteConfig.future.faster.swcJsLoader;
|
|
46
46
|
if (isSWCLoader) {
|
|
47
47
|
if (siteConfig.webpack?.jsLoader) {
|
|
48
|
-
throw new Error(`You can't use siteConfig.webpack.jsLoader and siteConfig.future.
|
|
48
|
+
throw new Error(`You can't use siteConfig.webpack.jsLoader and siteConfig.future.faster.swcJsLoader at the same time.
|
|
49
49
|
To avoid any configuration ambiguity, you must make an explicit choice:
|
|
50
50
|
- If you want to use Docusaurus Faster and SWC (recommended), remove siteConfig.webpack.jsLoader
|
|
51
|
-
- If you want to use a custom JS loader, use siteConfig.future.
|
|
51
|
+
- If you want to use a custom JS loader, use siteConfig.future.faster.swcJsLoader: false`);
|
|
52
52
|
}
|
|
53
53
|
return currentBundler.name === 'rspack'
|
|
54
54
|
? createRspackSwcJsLoaderFactory()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jsLoader.js","sourceRoot":"","sources":["../../src/loaders/jsLoader.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AA+CH,sDAkCC;AA/ED,6CAAkD;AAClD,kDAA2E;AAC3E,sDAAoD;AAGpD,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,KAAK,UAAU,wBAAwB;IAGrC,MAAM,MAAM,GAAG,MAAM,IAAA,8BAAe,GAAE,CAAC;IACvC,MAAM,UAAU,GAAG,MAAM,IAAA,wCAAyB,GAAE,CAAC;IACrD,OAAO,CAAC,EAAC,QAAQ,EAAC,EAAE,EAAE;QACpB,OAAO;YACL,MAAM;YACN,OAAO,EAAE,UAAU,CAAC,EAAC,QAAQ,EAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"jsLoader.js","sourceRoot":"","sources":["../../src/loaders/jsLoader.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AA+CH,sDAkCC;AA/ED,6CAAkD;AAClD,kDAA2E;AAC3E,sDAAoD;AAGpD,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,KAAK,UAAU,wBAAwB;IAGrC,MAAM,MAAM,GAAG,MAAM,IAAA,8BAAe,GAAE,CAAC;IACvC,MAAM,UAAU,GAAG,MAAM,IAAA,wCAAyB,GAAE,CAAC;IACrD,OAAO,CAAC,EAAC,QAAQ,EAAC,EAAE,EAAE;QACpB,OAAO;YACL,MAAM;YACN,OAAO,EAAE,UAAU,CAAC,EAAC,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAC,CAAC;SACxD,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAED,2DAA2D;AAC3D,KAAK,UAAU,8BAA8B;IAG3C,MAAM,MAAM,GAAG,oBAAoB,CAAC;IACpC,MAAM,UAAU,GAAG,MAAM,IAAA,wCAAyB,GAAE,CAAC;IACrD,OAAO,CAAC,EAAC,QAAQ,EAAC,EAAE,EAAE;QACpB,OAAO;YACL,MAAM;YACN,OAAO,EAAE,UAAU,CAAC,EAAC,QAAQ,EAAE,WAAW,EAAE,QAAQ,EAAC,CAAC;SACvD,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAED,6EAA6E;AAC7E,wEAAwE;AACxE,yEAAyE;AAClE,KAAK,UAAU,qBAAqB,CAAC,EAC1C,UAAU,GAQX;IACC,MAAM,cAAc,GAAG,MAAM,IAAA,kCAAiB,EAAC,EAAC,UAAU,EAAC,CAAC,CAAC;IAC7D,MAAM,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC;IACzD,IAAI,WAAW,EAAE,CAAC;QAChB,IAAI,UAAU,CAAC,OAAO,EAAE,QAAQ,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CACb;;;yFAGiF,CAClF,CAAC;QACJ,CAAC;QACD,OAAO,cAAc,CAAC,IAAI,KAAK,QAAQ;YACrC,CAAC,CAAC,8BAA8B,EAAE;YAClC,CAAC,CAAC,wBAAwB,EAAE,CAAC;IACjC,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,EAAE,YAAY,EAAC,MAAM,mBAAmB,CAAC;AAEpE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,gBAAgB,GAAG,uBAAuB,CAAC,CAAC;IACvE,cAAc,EAAE,cAAc,CAAC;CAChC,CAAC;
|
|
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,EAAE,YAAY,EAAC,MAAM,mBAAmB,CAAC;AAEpE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,gBAAgB,GAAG,uBAAuB,CAAC,CAAC;IACvE,cAAc,EAAE,cAAc,CAAC;CAChC,CAAC;AAyJF,wBAAsB,aAAa,CACjC,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAIlC"}
|
package/lib/minification.js
CHANGED
|
@@ -115,7 +115,10 @@ async function getWebpackMinimizers(params) {
|
|
|
115
115
|
async function getRspackMinimizers({ currentBundler, }) {
|
|
116
116
|
const rspack = (0, currentBundler_1.getCurrentBundlerAsRspack)({ currentBundler });
|
|
117
117
|
const getBrowserslistQueries = await (0, importFaster_1.importGetBrowserslistQueries)();
|
|
118
|
-
const browserslistQueries = getBrowserslistQueries({
|
|
118
|
+
const browserslistQueries = getBrowserslistQueries({
|
|
119
|
+
isServer: false,
|
|
120
|
+
bundlerName: 'rspack',
|
|
121
|
+
});
|
|
119
122
|
const swcJsMinimizerOptions = await (0, importFaster_1.importSwcJsMinimizerOptions)();
|
|
120
123
|
return [
|
|
121
124
|
// See https://rspack.dev/plugins/rspack/swc-js-minimizer-rspack-plugin
|
|
@@ -123,6 +126,8 @@ async function getRspackMinimizers({ currentBundler, }) {
|
|
|
123
126
|
new rspack.SwcJsMinimizerRspackPlugin({
|
|
124
127
|
minimizerOptions: {
|
|
125
128
|
minify: true,
|
|
129
|
+
// @ts-expect-error: annoying type incompatibility
|
|
130
|
+
ecma: swcJsMinimizerOptions.ecma,
|
|
126
131
|
...swcJsMinimizerOptions,
|
|
127
132
|
},
|
|
128
133
|
}),
|
package/lib/minification.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"minification.js","sourceRoot":"","sources":["../src/minification.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;
|
|
1
|
+
{"version":3,"file":"minification.js","sourceRoot":"","sources":["../src/minification.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@docusaurus/bundler",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.10.1",
|
|
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,11 +19,11 @@
|
|
|
19
19
|
"license": "MIT",
|
|
20
20
|
"dependencies": {
|
|
21
21
|
"@babel/core": "^7.25.9",
|
|
22
|
-
"@docusaurus/babel": "3.
|
|
23
|
-
"@docusaurus/cssnano-preset": "3.
|
|
24
|
-
"@docusaurus/logger": "3.
|
|
25
|
-
"@docusaurus/types": "3.
|
|
26
|
-
"@docusaurus/utils": "3.
|
|
22
|
+
"@docusaurus/babel": "3.10.1",
|
|
23
|
+
"@docusaurus/cssnano-preset": "3.10.1",
|
|
24
|
+
"@docusaurus/logger": "3.10.1",
|
|
25
|
+
"@docusaurus/types": "3.10.1",
|
|
26
|
+
"@docusaurus/utils": "3.10.1",
|
|
27
27
|
"babel-loader": "^9.2.1",
|
|
28
28
|
"clean-css": "^5.3.3",
|
|
29
29
|
"copy-webpack-plugin": "^11.0.0",
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"tslib": "^2.6.0",
|
|
42
42
|
"url-loader": "^4.1.1",
|
|
43
43
|
"webpack": "^5.95.0",
|
|
44
|
-
"webpackbar": "^
|
|
44
|
+
"webpackbar": "^7.0.0"
|
|
45
45
|
},
|
|
46
46
|
"peerDependencies": {
|
|
47
47
|
"@docusaurus/faster": "*"
|
|
@@ -57,5 +57,5 @@
|
|
|
57
57
|
"engines": {
|
|
58
58
|
"node": ">=20.0"
|
|
59
59
|
},
|
|
60
|
-
"gitHead": "
|
|
60
|
+
"gitHead": "41c1a458ecb07d61b6df2761ea4bc1b13db49d12"
|
|
61
61
|
}
|
package/src/currentBundler.ts
CHANGED
|
@@ -16,15 +16,12 @@ import type {CurrentBundler, DocusaurusConfig} from '@docusaurus/types';
|
|
|
16
16
|
// We inject a site config slice because the Rspack flag might change place
|
|
17
17
|
type SiteConfigSlice = {
|
|
18
18
|
future: {
|
|
19
|
-
|
|
20
|
-
DocusaurusConfig['future']['experimental_faster'],
|
|
21
|
-
'rspackBundler'
|
|
22
|
-
>;
|
|
19
|
+
faster: Pick<DocusaurusConfig['future']['faster'], 'rspackBundler'>;
|
|
23
20
|
};
|
|
24
21
|
};
|
|
25
22
|
|
|
26
23
|
function isRspack(siteConfig: SiteConfigSlice): boolean {
|
|
27
|
-
return siteConfig.future.
|
|
24
|
+
return siteConfig.future.faster.rspackBundler;
|
|
28
25
|
}
|
|
29
26
|
|
|
30
27
|
export async function getCurrentBundler({
|
package/src/loaders/jsLoader.ts
CHANGED
|
@@ -28,7 +28,7 @@ async function createSwcJsLoaderFactory(): Promise<
|
|
|
28
28
|
return ({isServer}) => {
|
|
29
29
|
return {
|
|
30
30
|
loader,
|
|
31
|
-
options: getOptions({isServer}),
|
|
31
|
+
options: getOptions({isServer, bundlerName: 'webpack'}),
|
|
32
32
|
};
|
|
33
33
|
};
|
|
34
34
|
}
|
|
@@ -42,7 +42,7 @@ async function createRspackSwcJsLoaderFactory(): Promise<
|
|
|
42
42
|
return ({isServer}) => {
|
|
43
43
|
return {
|
|
44
44
|
loader,
|
|
45
|
-
options: getOptions({isServer}),
|
|
45
|
+
options: getOptions({isServer, bundlerName: 'rspack'}),
|
|
46
46
|
};
|
|
47
47
|
};
|
|
48
48
|
}
|
|
@@ -56,19 +56,19 @@ export async function createJsLoaderFactory({
|
|
|
56
56
|
siteConfig: {
|
|
57
57
|
webpack?: DocusaurusConfig['webpack'];
|
|
58
58
|
future: {
|
|
59
|
-
|
|
59
|
+
faster: DocusaurusConfig['future']['faster'];
|
|
60
60
|
};
|
|
61
61
|
};
|
|
62
62
|
}): Promise<ConfigureWebpackUtils['getJSLoader']> {
|
|
63
63
|
const currentBundler = await getCurrentBundler({siteConfig});
|
|
64
|
-
const isSWCLoader = siteConfig.future.
|
|
64
|
+
const isSWCLoader = siteConfig.future.faster.swcJsLoader;
|
|
65
65
|
if (isSWCLoader) {
|
|
66
66
|
if (siteConfig.webpack?.jsLoader) {
|
|
67
67
|
throw new Error(
|
|
68
|
-
`You can't use siteConfig.webpack.jsLoader and siteConfig.future.
|
|
68
|
+
`You can't use siteConfig.webpack.jsLoader and siteConfig.future.faster.swcJsLoader at the same time.
|
|
69
69
|
To avoid any configuration ambiguity, you must make an explicit choice:
|
|
70
70
|
- If you want to use Docusaurus Faster and SWC (recommended), remove siteConfig.webpack.jsLoader
|
|
71
|
-
- If you want to use a custom JS loader, use siteConfig.future.
|
|
71
|
+
- If you want to use a custom JS loader, use siteConfig.future.faster.swcJsLoader: false`,
|
|
72
72
|
);
|
|
73
73
|
}
|
|
74
74
|
return currentBundler.name === 'rspack'
|
package/src/minification.ts
CHANGED
|
@@ -142,14 +142,20 @@ async function getRspackMinimizers({
|
|
|
142
142
|
}: MinimizersConfig): Promise<WebpackPluginInstance[]> {
|
|
143
143
|
const rspack = getCurrentBundlerAsRspack({currentBundler});
|
|
144
144
|
const getBrowserslistQueries = await importGetBrowserslistQueries();
|
|
145
|
-
const browserslistQueries = getBrowserslistQueries({
|
|
145
|
+
const browserslistQueries = getBrowserslistQueries({
|
|
146
|
+
isServer: false,
|
|
147
|
+
bundlerName: 'rspack',
|
|
148
|
+
});
|
|
146
149
|
const swcJsMinimizerOptions = await importSwcJsMinimizerOptions();
|
|
150
|
+
|
|
147
151
|
return [
|
|
148
152
|
// See https://rspack.dev/plugins/rspack/swc-js-minimizer-rspack-plugin
|
|
149
153
|
// See https://swc.rs/docs/configuration/minification
|
|
150
154
|
new rspack.SwcJsMinimizerRspackPlugin({
|
|
151
155
|
minimizerOptions: {
|
|
152
156
|
minify: true,
|
|
157
|
+
// @ts-expect-error: annoying type incompatibility
|
|
158
|
+
ecma: swcJsMinimizerOptions.ecma,
|
|
153
159
|
...swcJsMinimizerOptions,
|
|
154
160
|
},
|
|
155
161
|
}),
|