fix(core): configurePostCss() should run after configureWebpack() (…

…#10132)
facebook · May 13, 2024 · ff5039f · ff5039f
1 parent 29b7a4d
commit ff5039f
Show file tree

Hide file tree

Showing 7 changed files with 620 additions and 405 deletions.
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/index.test.ts b/packages/docusaurus-plugin-content-docs/src/__tests__/index.test.ts
@@ -13,7 +13,7 @@ import {isMatch} from 'picomatch';
 import commander from 'commander';
 import webpack from 'webpack';
 import {loadContext} from '@docusaurus/core/src/server/site';
-import {applyConfigureWebpack} from '@docusaurus/core/src/webpack/utils';
+import {applyConfigureWebpack} from '@docusaurus/core/src/webpack/configure';
 import {sortRoutes} from '@docusaurus/core/src/server/plugins/routeConfig';
 import {posixPath} from '@docusaurus/utils';
 import {normalizePluginOptions} from '@docusaurus/utils-validation';

diff --git a/packages/docusaurus/src/commands/build.ts b/packages/docusaurus/src/commands/build.ts
@@ -15,11 +15,8 @@ import {handleBrokenLinks} from '../server/brokenLinks';
 
 import {createBuildClientConfig} from '../webpack/client';
 import createServerConfig from '../webpack/server';
-import {
-  executePluginsConfigurePostCss,
-  executePluginsConfigureWebpack,
-  compile,
-} from '../webpack/utils';
+import {executePluginsConfigureWebpack} from '../webpack/configure';
+import {compile} from '../webpack/utils';
 import {PerfLogger} from '../utils';
 
 import {loadI18n} from '../server/i18n';
@@ -325,10 +322,6 @@ async function getBuildClientConfig({
     bundleAnalyzer: cliOptions.bundleAnalyzer ?? false,
   });
   let {config} = result;
-  config = executePluginsConfigurePostCss({
-    plugins,
-    config,
-  });
   config = executePluginsConfigureWebpack({
     plugins,
     config,

diff --git a/packages/docusaurus/src/commands/start/webpack.ts b/packages/docusaurus/src/commands/start/webpack.ts
@@ -13,12 +13,11 @@ import WebpackDevServer from 'webpack-dev-server';
 import evalSourceMapMiddleware from 'react-dev-utils/evalSourceMapMiddleware';
 import {createPollingOptions} from './watcher';
 import {
-  executePluginsConfigurePostCss,
-  executePluginsConfigureWebpack,
   formatStatsErrorMessage,
   getHttpsConfig,
   printStatsWarnings,
 } from '../../webpack/utils';
+import {executePluginsConfigureWebpack} from '../../webpack/configure';
 import {createStartClientConfig} from '../../webpack/client';
 import type {StartCLIOptions} from './start';
 import type {Props} from '@docusaurus/types';
@@ -135,7 +134,6 @@ async function getStartClientConfig({
     minify,
     poll,
   });
-  config = executePluginsConfigurePostCss({plugins, config});
   config = executePluginsConfigureWebpack({
     plugins,
     config,