@docusaurus/bundler 4.0.0-canary-6973 → 4.0.0-canary-6975

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.
@@ -5,7 +5,8 @@
5
5
  * LICENSE file in the root directory of this source tree.
6
6
  */
7
7
  import type { ConfigureWebpackUtils, DocusaurusConfig } from '@docusaurus/types';
8
- export declare function createJsLoaderFactory({ siteConfig, }: {
8
+ export declare function createJsLoaderFactory({ siteDir, siteConfig, }: {
9
+ siteDir: string;
9
10
  siteConfig: Pick<DocusaurusConfig, 'webpack'>;
10
11
  }): Promise<ConfigureWebpackUtils['getJSLoader']>;
11
12
  //# 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,IAAI,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;CAC/C,GAAG,OAAO,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAC,CAchD"}
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;AAkC/E,wBAAsB,qBAAqB,CAAC,EAC1C,OAAO,EACP,UAAU,GACX,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,IAAI,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;CAC/C,GAAG,OAAO,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAC,CAchD"}
@@ -11,12 +11,15 @@ const babel_1 = require("@docusaurus/babel");
11
11
  const swc_1 = require("../swc");
12
12
  const currentBundler_1 = require("../currentBundler");
13
13
  const browserslist_1 = require("../browserslist");
14
- const BabelJsLoaderFactory = ({ isServer, babelOptions, }) => {
15
- return {
16
- loader: require.resolve('babel-loader'),
17
- options: (0, babel_1.getBabelOptions)({ isServer, babelOptions }),
14
+ async function createBabelJsLoaderFactory({ siteDir, }) {
15
+ const configFile = await (0, babel_1.getCustomBabelConfigFilePath)(siteDir);
16
+ return ({ isServer }) => {
17
+ return {
18
+ loader: require.resolve('babel-loader'),
19
+ options: (0, babel_1.getBabelOptions)({ isServer, configFile }),
20
+ };
18
21
  };
19
- };
22
+ }
20
23
  function createRspackSwcJsLoaderFactory() {
21
24
  const loader = 'builtin:swc-loader';
22
25
  const clientBrowserslistQueries = (0, browserslist_1.getBrowserslistQueries)();
@@ -34,17 +37,17 @@ function createRspackSwcJsLoaderFactory() {
34
37
  // Confusing: function that creates a function that creates actual js loaders
35
38
  // This is done on purpose because the js loader factory is a public API
36
39
  // It is injected in configureWebpack plugin lifecycle for plugin authors
37
- async function createJsLoaderFactory({ siteConfig, }) {
40
+ async function createJsLoaderFactory({ siteDir, siteConfig, }) {
38
41
  const currentBundler = await (0, currentBundler_1.getCurrentBundler)({ siteConfig });
39
42
  if (currentBundler.name === 'rspack') {
40
43
  return createRspackSwcJsLoaderFactory();
41
44
  }
42
45
  const jsLoader = siteConfig.webpack?.jsLoader ?? 'babel';
43
46
  if (jsLoader instanceof Function) {
44
- return ({ isServer }) => jsLoader(isServer);
47
+ return jsLoader;
45
48
  }
46
49
  if (jsLoader === 'babel') {
47
- return BabelJsLoaderFactory;
50
+ return createBabelJsLoaderFactory({ siteDir });
48
51
  }
49
52
  throw new Error(`Docusaurus bug: unexpected jsLoader value${jsLoader}`);
50
53
  }
@@ -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,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
+ {"version":3,"file":"jsLoader.js","sourceRoot":"","sources":["../../src/loaders/jsLoader.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,6CAAgF;AAChF,gCAA2C;AAC3C,sDAAoD;AACpD,kDAAuD;AAGvD,KAAK,UAAU,0BAA0B,CAAC,EACxC,OAAO,GAGR;IACC,MAAM,UAAU,GAAG,MAAM,IAAA,oCAA4B,EAAC,OAAO,CAAC,CAAC;IAC/D,OAAO,CAAC,EAAC,QAAQ,EAAC,EAAE,EAAE;QACpB,OAAO;YACL,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC;YACvC,OAAO,EAAE,IAAA,uBAAe,EAAC,EAAC,QAAQ,EAAE,UAAU,EAAC,CAAC;SACjD,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAED,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,OAAO,EACP,UAAU,GAIX;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,QAAQ,CAAC;IAClB,CAAC;IACD,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;QACzB,OAAO,0BAA0B,CAAC,EAAC,OAAO,EAAC,CAAC,CAAC;IAC/C,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-6973",
3
+ "version": "4.0.0-canary-6975",
4
4
  "description": "Docusaurus util package to abstract the current bundler.",
5
5
  "main": "./lib/index.js",
6
6
  "types": "./lib/index.d.ts",
@@ -15,9 +15,9 @@
15
15
  "license": "MIT",
16
16
  "dependencies": {
17
17
  "@babel/core": "^7.29.7",
18
- "@docusaurus/babel": "4.0.0-canary-6973",
19
- "@docusaurus/logger": "4.0.0-canary-6973",
20
- "@docusaurus/types": "4.0.0-canary-6973",
18
+ "@docusaurus/babel": "4.0.0-canary-6975",
19
+ "@docusaurus/logger": "4.0.0-canary-6975",
20
+ "@docusaurus/types": "4.0.0-canary-6975",
21
21
  "@rspack/core": "^2.2.3",
22
22
  "@rspack/dev-server": "^2.2.1",
23
23
  "@swc/html": "^1.16.2",
@@ -5,21 +5,25 @@
5
5
  * LICENSE file in the root directory of this source tree.
6
6
  */
7
7
 
8
- import {getBabelOptions} from '@docusaurus/babel';
8
+ import {getBabelOptions, getCustomBabelConfigFilePath} from '@docusaurus/babel';
9
9
  import {getSwcLoaderOptions} from '../swc';
10
10
  import {getCurrentBundler} from '../currentBundler';
11
11
  import {getBrowserslistQueries} from '../browserslist';
12
12
  import type {ConfigureWebpackUtils, DocusaurusConfig} from '@docusaurus/types';
13
13
 
14
- const BabelJsLoaderFactory: ConfigureWebpackUtils['getJSLoader'] = ({
15
- isServer,
16
- babelOptions,
17
- }) => {
18
- return {
19
- loader: require.resolve('babel-loader'),
20
- options: getBabelOptions({isServer, babelOptions}),
14
+ async function createBabelJsLoaderFactory({
15
+ siteDir,
16
+ }: {
17
+ siteDir: string;
18
+ }): Promise<ConfigureWebpackUtils['getJSLoader']> {
19
+ const configFile = await getCustomBabelConfigFilePath(siteDir);
20
+ return ({isServer}) => {
21
+ return {
22
+ loader: require.resolve('babel-loader'),
23
+ options: getBabelOptions({isServer, configFile}),
24
+ };
21
25
  };
22
- };
26
+ }
23
27
 
24
28
  function createRspackSwcJsLoaderFactory(): ConfigureWebpackUtils['getJSLoader'] {
25
29
  const loader = 'builtin:swc-loader';
@@ -40,8 +44,10 @@ function createRspackSwcJsLoaderFactory(): ConfigureWebpackUtils['getJSLoader']
40
44
  // This is done on purpose because the js loader factory is a public API
41
45
  // It is injected in configureWebpack plugin lifecycle for plugin authors
42
46
  export async function createJsLoaderFactory({
47
+ siteDir,
43
48
  siteConfig,
44
49
  }: {
50
+ siteDir: string;
45
51
  siteConfig: Pick<DocusaurusConfig, 'webpack'>;
46
52
  }): Promise<ConfigureWebpackUtils['getJSLoader']> {
47
53
  const currentBundler = await getCurrentBundler({siteConfig});
@@ -51,10 +57,10 @@ export async function createJsLoaderFactory({
51
57
 
52
58
  const jsLoader = siteConfig.webpack?.jsLoader ?? 'babel';
53
59
  if (jsLoader instanceof Function) {
54
- return ({isServer}) => jsLoader(isServer);
60
+ return jsLoader;
55
61
  }
56
62
  if (jsLoader === 'babel') {
57
- return BabelJsLoaderFactory;
63
+ return createBabelJsLoaderFactory({siteDir});
58
64
  }
59
65
  throw new Error(`Docusaurus bug: unexpected jsLoader value${jsLoader}`);
60
66
  }