@docusaurus/bundler 4.0.0-canary-6892 → 4.0.0-canary-6894
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/importFaster.d.ts +0 -1
- package/lib/importFaster.d.ts.map +1 -1
- package/lib/importFaster.js +0 -5
- package/lib/importFaster.js.map +1 -1
- package/lib/loaders/jsLoader.d.ts.map +1 -1
- package/lib/loaders/jsLoader.js +4 -20
- package/lib/loaders/jsLoader.js.map +1 -1
- package/package.json +7 -7
- package/src/importFaster.ts +0 -5
- package/src/loaders/jsLoader.ts +5 -24
package/lib/importFaster.d.ts
CHANGED
|
@@ -9,7 +9,6 @@ import type { MinimizerOptions as CssMinimizerOptions } from 'css-minimizer-webp
|
|
|
9
9
|
export type FasterModule = Awaited<typeof import('@docusaurus/faster')>;
|
|
10
10
|
export declare function importRspack(): Promise<FasterModule['rspack']>;
|
|
11
11
|
export declare function importRspackDevServer(): Promise<FasterModule['rspackDevServer']>;
|
|
12
|
-
export declare function importSwcLoader(): Promise<string>;
|
|
13
12
|
export declare function importGetSwcLoaderOptions(): Promise<FasterModule['getSwcLoaderOptions']>;
|
|
14
13
|
export declare function importSwcJsMinimizerOptions(): Promise<JsMinimizerOptions<CustomOptions>>;
|
|
15
14
|
export declare function importSwcHtmlMinifier(): Promise<ReturnType<FasterModule['getSwcHtmlMinifier']>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"importFaster.d.ts","sourceRoot":"","sources":["../src/importFaster.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EACV,gBAAgB,IAAI,kBAAkB,EACtC,aAAa,EACd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAC,gBAAgB,IAAI,mBAAmB,EAAC,MAAM,8BAA8B,CAAC;AAE1F,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC,cAAc,oBAAoB,CAAC,CAAC,CAAC;AAmBxE,wBAAsB,YAAY,IAAI,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAGpE;AAED,wBAAsB,qBAAqB,IAAI,OAAO,CACpD,YAAY,CAAC,iBAAiB,CAAC,CAChC,CAGA;AAED,wBAAsB,
|
|
1
|
+
{"version":3,"file":"importFaster.d.ts","sourceRoot":"","sources":["../src/importFaster.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EACV,gBAAgB,IAAI,kBAAkB,EACtC,aAAa,EACd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAC,gBAAgB,IAAI,mBAAmB,EAAC,MAAM,8BAA8B,CAAC;AAE1F,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC,cAAc,oBAAoB,CAAC,CAAC,CAAC;AAmBxE,wBAAsB,YAAY,IAAI,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAGpE;AAED,wBAAsB,qBAAqB,IAAI,OAAO,CACpD,YAAY,CAAC,iBAAiB,CAAC,CAChC,CAGA;AAED,wBAAsB,yBAAyB,IAAI,OAAO,CACxD,YAAY,CAAC,qBAAqB,CAAC,CACpC,CAGA;AAED,wBAAsB,2BAA2B,IAAI,OAAO,CAC1D,kBAAkB,CAAC,aAAa,CAAC,CAClC,CAGA;AAED,wBAAsB,qBAAqB,IAAI,OAAO,CACpD,UAAU,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAAC,CAC/C,CAGA;AAED,wBAAsB,4BAA4B,IAAI,OAAO,CAC3D,YAAY,CAAC,wBAAwB,CAAC,CACvC,CAGA;AAED,wBAAsB,kCAAkC,IAAI,OAAO,CACjE,mBAAmB,CAAC,aAAa,CAAC,CACnC,CAGA"}
|
package/lib/importFaster.js
CHANGED
|
@@ -8,7 +8,6 @@
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.importRspack = importRspack;
|
|
10
10
|
exports.importRspackDevServer = importRspackDevServer;
|
|
11
|
-
exports.importSwcLoader = importSwcLoader;
|
|
12
11
|
exports.importGetSwcLoaderOptions = importGetSwcLoaderOptions;
|
|
13
12
|
exports.importSwcJsMinimizerOptions = importSwcJsMinimizerOptions;
|
|
14
13
|
exports.importSwcHtmlMinifier = importSwcHtmlMinifier;
|
|
@@ -35,10 +34,6 @@ async function importRspackDevServer() {
|
|
|
35
34
|
const faster = await ensureFaster();
|
|
36
35
|
return faster.rspackDevServer;
|
|
37
36
|
}
|
|
38
|
-
async function importSwcLoader() {
|
|
39
|
-
const faster = await ensureFaster();
|
|
40
|
-
return faster.swcLoader;
|
|
41
|
-
}
|
|
42
37
|
async function importGetSwcLoaderOptions() {
|
|
43
38
|
const faster = await ensureFaster();
|
|
44
39
|
return faster.getSwcLoaderOptions;
|
package/lib/importFaster.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"importFaster.js","sourceRoot":"","sources":["../src/importFaster.ts"],"names":[],"mappings":";AAAA;;;;;GAKG
|
|
1
|
+
{"version":3,"file":"importFaster.js","sourceRoot":"","sources":["../src/importFaster.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;AAEH,wEAAwC;AASxC,KAAK,UAAU,YAAY;IACzB,OAAO,MAAM,CAAC,oBAAoB,CAAC,CAAC;AACtC,CAAC;AAED,KAAK,UAAU,YAAY;IACzB,IAAI,CAAC;QACH,OAAO,MAAM,YAAY,EAAE,CAAC;IAC9B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CACb,+DAA+D,gBAAM,CAAC,IAAI,CACxE,oBAAoB,CACrB,2BAA2B,EAC5B,EAAC,KAAK,EAAE,KAAK,EAAC,CACf,CAAC;IACJ,CAAC;AACH,CAAC;AAEM,KAAK;IACV,MAAM,MAAM,GAAG,MAAM,YAAY,EAAE,CAAC;IACpC,OAAO,MAAM,CAAC,MAAM,CAAC;AACvB,CAAC;AAEM,KAAK;IAGV,MAAM,MAAM,GAAG,MAAM,YAAY,EAAE,CAAC;IACpC,OAAO,MAAM,CAAC,eAAe,CAAC;AAChC,CAAC;AAEM,KAAK;IAGV,MAAM,MAAM,GAAG,MAAM,YAAY,EAAE,CAAC;IACpC,OAAO,MAAM,CAAC,mBAAmB,CAAC;AACpC,CAAC;AAEM,KAAK;IAGV,MAAM,MAAM,GAAG,MAAM,YAAY,EAAE,CAAC;IACpC,OAAO,MAAM,CAAC,wBAAwB,EAAuC,CAAC;AAChF,CAAC;AAEM,KAAK;IAGV,MAAM,MAAM,GAAG,MAAM,YAAY,EAAE,CAAC;IACpC,OAAO,MAAM,CAAC,kBAAkB,EAAE,CAAC;AACrC,CAAC;AAEM,KAAK;IAGV,MAAM,MAAM,GAAG,MAAM,YAAY,EAAE,CAAC;IACpC,OAAO,MAAM,CAAC,sBAAsB,CAAC;AACvC,CAAC;AAEM,KAAK;IAGV,MAAM,MAAM,GAAG,MAAM,YAAY,EAAE,CAAC;IACpC,OAAO,MAAM,CAAC,+BAA+B,EAAwC,CAAC;AACxF,CAAC"}
|
|
@@ -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;
|
|
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;AA4B/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"}
|
package/lib/loaders/jsLoader.js
CHANGED
|
@@ -16,17 +16,6 @@ const BabelJsLoaderFactory = ({ isServer, babelOptions, }) => {
|
|
|
16
16
|
options: (0, babel_1.getBabelOptions)({ isServer, babelOptions }),
|
|
17
17
|
};
|
|
18
18
|
};
|
|
19
|
-
async function createSwcJsLoaderFactory() {
|
|
20
|
-
const loader = await (0, importFaster_1.importSwcLoader)();
|
|
21
|
-
const getOptions = await (0, importFaster_1.importGetSwcLoaderOptions)();
|
|
22
|
-
return ({ isServer }) => {
|
|
23
|
-
return {
|
|
24
|
-
loader,
|
|
25
|
-
options: getOptions({ isServer, bundlerName: 'webpack' }),
|
|
26
|
-
};
|
|
27
|
-
};
|
|
28
|
-
}
|
|
29
|
-
// Same as swcLoader, except we use the built-in SWC loader
|
|
30
19
|
async function createRspackSwcJsLoaderFactory() {
|
|
31
20
|
const loader = 'builtin:swc-loader';
|
|
32
21
|
const getOptions = await (0, importFaster_1.importGetSwcLoaderOptions)();
|
|
@@ -42,17 +31,12 @@ async function createRspackSwcJsLoaderFactory() {
|
|
|
42
31
|
// It is injected in configureWebpack plugin lifecycle for plugin authors
|
|
43
32
|
async function createJsLoaderFactory({ siteConfig, }) {
|
|
44
33
|
const currentBundler = await (0, currentBundler_1.getCurrentBundler)({ siteConfig });
|
|
45
|
-
|
|
46
|
-
if (isSWCLoader) {
|
|
34
|
+
if (currentBundler.name === 'rspack') {
|
|
47
35
|
if (siteConfig.webpack?.jsLoader) {
|
|
48
|
-
throw new Error(`You can't use siteConfig.webpack.jsLoader
|
|
49
|
-
|
|
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.faster.swcJsLoader: false`);
|
|
36
|
+
throw new Error(`You can't use siteConfig.webpack.jsLoader with siteConfig.future.faster.rspackBundler.
|
|
37
|
+
Rspack always uses its built-in SWC loader, please remove siteConfig.webpack.jsLoader.`);
|
|
52
38
|
}
|
|
53
|
-
return
|
|
54
|
-
? createRspackSwcJsLoaderFactory()
|
|
55
|
-
: createSwcJsLoaderFactory();
|
|
39
|
+
return createRspackSwcJsLoaderFactory();
|
|
56
40
|
}
|
|
57
41
|
const jsLoader = siteConfig.webpack?.jsLoader ?? 'babel';
|
|
58
42
|
if (jsLoader instanceof Function) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jsLoader.js","sourceRoot":"","sources":["../../src/loaders/jsLoader.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,6CAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"jsLoader.js","sourceRoot":"","sources":["../../src/loaders/jsLoader.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,6CAAkD;AAClD,kDAA0D;AAC1D,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,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,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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@docusaurus/bundler",
|
|
3
|
-
"version": "4.0.0-canary-
|
|
3
|
+
"version": "4.0.0-canary-6894",
|
|
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,10 +19,10 @@
|
|
|
19
19
|
"license": "MIT",
|
|
20
20
|
"dependencies": {
|
|
21
21
|
"@babel/core": "^7.29.7",
|
|
22
|
-
"@docusaurus/babel": "4.0.0-canary-
|
|
23
|
-
"@docusaurus/cssnano-preset": "4.0.0-canary-
|
|
24
|
-
"@docusaurus/logger": "4.0.0-canary-
|
|
25
|
-
"@docusaurus/types": "4.0.0-canary-
|
|
22
|
+
"@docusaurus/babel": "4.0.0-canary-6894",
|
|
23
|
+
"@docusaurus/cssnano-preset": "4.0.0-canary-6894",
|
|
24
|
+
"@docusaurus/logger": "4.0.0-canary-6894",
|
|
25
|
+
"@docusaurus/types": "4.0.0-canary-6894",
|
|
26
26
|
"babel-loader": "^10.1.1",
|
|
27
27
|
"css-loader": "^7.1.5",
|
|
28
28
|
"css-minimizer-webpack-plugin": "^8.0.0",
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
"webpackbar": "^7.0.0"
|
|
39
39
|
},
|
|
40
40
|
"peerDependencies": {
|
|
41
|
-
"@docusaurus/faster": "4.0.0-canary-
|
|
41
|
+
"@docusaurus/faster": "4.0.0-canary-6894",
|
|
42
42
|
"@types/html-minifier-terser": "^7.0.2"
|
|
43
43
|
},
|
|
44
44
|
"peerDependenciesMeta": {
|
|
@@ -52,5 +52,5 @@
|
|
|
52
52
|
"engines": {
|
|
53
53
|
"node": ">=24.21"
|
|
54
54
|
},
|
|
55
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "fd790ec4701679f498019f9ba8ae1b32fe1b86d2"
|
|
56
56
|
}
|
package/src/importFaster.ts
CHANGED
|
@@ -43,11 +43,6 @@ export async function importRspackDevServer(): Promise<
|
|
|
43
43
|
return faster.rspackDevServer;
|
|
44
44
|
}
|
|
45
45
|
|
|
46
|
-
export async function importSwcLoader(): Promise<string> {
|
|
47
|
-
const faster = await ensureFaster();
|
|
48
|
-
return faster.swcLoader;
|
|
49
|
-
}
|
|
50
|
-
|
|
51
46
|
export async function importGetSwcLoaderOptions(): Promise<
|
|
52
47
|
FasterModule['getSwcLoaderOptions']
|
|
53
48
|
> {
|
package/src/loaders/jsLoader.ts
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
*/
|
|
7
7
|
|
|
8
8
|
import {getBabelOptions} from '@docusaurus/babel';
|
|
9
|
-
import {
|
|
9
|
+
import {importGetSwcLoaderOptions} from '../importFaster';
|
|
10
10
|
import {getCurrentBundler} from '../currentBundler';
|
|
11
11
|
import type {ConfigureWebpackUtils, DocusaurusConfig} from '@docusaurus/types';
|
|
12
12
|
|
|
@@ -20,20 +20,6 @@ const BabelJsLoaderFactory: ConfigureWebpackUtils['getJSLoader'] = ({
|
|
|
20
20
|
};
|
|
21
21
|
};
|
|
22
22
|
|
|
23
|
-
async function createSwcJsLoaderFactory(): Promise<
|
|
24
|
-
ConfigureWebpackUtils['getJSLoader']
|
|
25
|
-
> {
|
|
26
|
-
const loader = await importSwcLoader();
|
|
27
|
-
const getOptions = await importGetSwcLoaderOptions();
|
|
28
|
-
return ({isServer}) => {
|
|
29
|
-
return {
|
|
30
|
-
loader,
|
|
31
|
-
options: getOptions({isServer, bundlerName: 'webpack'}),
|
|
32
|
-
};
|
|
33
|
-
};
|
|
34
|
-
}
|
|
35
|
-
|
|
36
|
-
// Same as swcLoader, except we use the built-in SWC loader
|
|
37
23
|
async function createRspackSwcJsLoaderFactory(): Promise<
|
|
38
24
|
ConfigureWebpackUtils['getJSLoader']
|
|
39
25
|
> {
|
|
@@ -61,19 +47,14 @@ export async function createJsLoaderFactory({
|
|
|
61
47
|
};
|
|
62
48
|
}): Promise<ConfigureWebpackUtils['getJSLoader']> {
|
|
63
49
|
const currentBundler = await getCurrentBundler({siteConfig});
|
|
64
|
-
|
|
65
|
-
if (isSWCLoader) {
|
|
50
|
+
if (currentBundler.name === 'rspack') {
|
|
66
51
|
if (siteConfig.webpack?.jsLoader) {
|
|
67
52
|
throw new Error(
|
|
68
|
-
`You can't use siteConfig.webpack.jsLoader
|
|
69
|
-
|
|
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.faster.swcJsLoader: false`,
|
|
53
|
+
`You can't use siteConfig.webpack.jsLoader with siteConfig.future.faster.rspackBundler.
|
|
54
|
+
Rspack always uses its built-in SWC loader, please remove siteConfig.webpack.jsLoader.`,
|
|
72
55
|
);
|
|
73
56
|
}
|
|
74
|
-
return
|
|
75
|
-
? createRspackSwcJsLoaderFactory()
|
|
76
|
-
: createSwcJsLoaderFactory();
|
|
57
|
+
return createRspackSwcJsLoaderFactory();
|
|
77
58
|
}
|
|
78
59
|
|
|
79
60
|
const jsLoader = siteConfig.webpack?.jsLoader ?? 'babel';
|