Skip to content

Commit ff5039f

Browse files
authored
fix(core): configurePostCss() should run after configureWebpack() (#10132)
1 parent 29b7a4d commit ff5039f

File tree

7 files changed

+620
-405
lines changed

7 files changed

+620
-405
lines changed

packages/docusaurus-plugin-content-docs/src/__tests__/index.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {isMatch} from 'picomatch';
1313
import commander from 'commander';
1414
import webpack from 'webpack';
1515
import {loadContext} from '@docusaurus/core/src/server/site';
16-
import {applyConfigureWebpack} from '@docusaurus/core/src/webpack/utils';
16+
import {applyConfigureWebpack} from '@docusaurus/core/src/webpack/configure';
1717
import {sortRoutes} from '@docusaurus/core/src/server/plugins/routeConfig';
1818
import {posixPath} from '@docusaurus/utils';
1919
import {normalizePluginOptions} from '@docusaurus/utils-validation';

packages/docusaurus/src/commands/build.ts

+2-9
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,8 @@ import {handleBrokenLinks} from '../server/brokenLinks';
1515

1616
import {createBuildClientConfig} from '../webpack/client';
1717
import createServerConfig from '../webpack/server';
18-
import {
19-
executePluginsConfigurePostCss,
20-
executePluginsConfigureWebpack,
21-
compile,
22-
} from '../webpack/utils';
18+
import {executePluginsConfigureWebpack} from '../webpack/configure';
19+
import {compile} from '../webpack/utils';
2320
import {PerfLogger} from '../utils';
2421

2522
import {loadI18n} from '../server/i18n';
@@ -325,10 +322,6 @@ async function getBuildClientConfig({
325322
bundleAnalyzer: cliOptions.bundleAnalyzer ?? false,
326323
});
327324
let {config} = result;
328-
config = executePluginsConfigurePostCss({
329-
plugins,
330-
config,
331-
});
332325
config = executePluginsConfigureWebpack({
333326
plugins,
334327
config,

packages/docusaurus/src/commands/start/webpack.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@ import WebpackDevServer from 'webpack-dev-server';
1313
import evalSourceMapMiddleware from 'react-dev-utils/evalSourceMapMiddleware';
1414
import {createPollingOptions} from './watcher';
1515
import {
16-
executePluginsConfigurePostCss,
17-
executePluginsConfigureWebpack,
1816
formatStatsErrorMessage,
1917
getHttpsConfig,
2018
printStatsWarnings,
2119
} from '../../webpack/utils';
20+
import {executePluginsConfigureWebpack} from '../../webpack/configure';
2221
import {createStartClientConfig} from '../../webpack/client';
2322
import type {StartCLIOptions} from './start';
2423
import type {Props} from '@docusaurus/types';
@@ -135,7 +134,6 @@ async function getStartClientConfig({
135134
minify,
136135
poll,
137136
});
138-
config = executePluginsConfigurePostCss({plugins, config});
139137
config = executePluginsConfigureWebpack({
140138
plugins,
141139
config,

0 commit comments

Comments
 (0)