Skip to content

Commit e2bb592

Browse files
authored
fix!: remove the builtin Sass and Less plugins (#1937)
1 parent 8a2207b commit e2bb592

File tree

21 files changed

+151
-160
lines changed

21 files changed

+151
-160
lines changed

e2e/fixtures/modern-js/modern.config.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { defineConfig, moduleTools } from '@modern-js/module-tools';
2+
import { pluginSass } from '@rsbuild/plugin-sass';
23
import { modulePluginDoc } from '@rspress/modern-js-plugin';
34

45
export default defineConfig({
@@ -15,6 +16,7 @@ export default defineConfig({
1516
apiParseTool: 'react-docgen-typescript',
1617
doc: {
1718
lang: 'en',
19+
builderPlugins: [pluginSass()],
1820
locales: [
1921
{
2022
lang: 'en',

e2e/fixtures/modern-js/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"devDependencies": {
2828
"@modern-js/module-tools": "2.64.0",
2929
"@modern-js/tsconfig": "2.64.0",
30+
"@rsbuild/plugin-sass": "~1.2.2",
3031
"@rspress/modern-js-plugin": "workspace:*",
3132
"@types/node": "^18.11.17",
3233
"@types/react": "^18.3.18",

e2e/fixtures/modern-js/src/alert.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Alert } from '@arco-design/web-react';
2-
import '@arco-design/web-react/es/Alert/style';
2+
import '@arco-design/web-react/es/Alert/style/css';
33

44
export type AlertProps = {
55
/**

e2e/fixtures/modern-js/src/button.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Button } from '@arco-design/web-react';
2-
import '@arco-design/web-react/es/Button/style';
2+
import '@arco-design/web-react/es/Button/style/css';
33

44
export type ButtonProps = {
55
/**

packages/core/package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,7 @@
5151
"@mdx-js/mdx": "2.3.0",
5252
"@mdx-js/react": "2.3.0",
5353
"@rsbuild/core": "1.2.16",
54-
"@rsbuild/plugin-less": "~1.1.1",
5554
"@rsbuild/plugin-react": "~1.1.1",
56-
"@rsbuild/plugin-sass": "~1.2.2",
5755
"@rspress/mdx-rs": "0.6.6",
5856
"@rspress/plugin-auto-nav-sidebar": "workspace:*",
5957
"@rspress/plugin-container-syntax": "workspace:*",

packages/core/src/node/initRsbuild.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ import type {
55
RsbuildInstance,
66
RsbuildPlugin,
77
} from '@rsbuild/core';
8-
import { PLUGIN_LESS_NAME, pluginLess } from '@rsbuild/plugin-less';
98
import { PLUGIN_REACT_NAME, pluginReact } from '@rsbuild/plugin-react';
10-
import { PLUGIN_SASS_NAME, pluginSass } from '@rsbuild/plugin-sass';
119
import {
1210
MDX_OR_MD_REGEXP,
1311
RSPRESS_TEMP_DIR,
@@ -100,8 +98,6 @@ async function createInternalBuildConfig(
10098
return {
10199
plugins: [
102100
...(isPluginIncluded(config, PLUGIN_REACT_NAME) ? [] : [pluginReact()]),
103-
...(isPluginIncluded(config, PLUGIN_SASS_NAME) ? [] : [pluginSass()]),
104-
...(isPluginIncluded(config, PLUGIN_LESS_NAME) ? [] : [pluginLess()]),
105101
rsbuildPluginDocVM({
106102
userDocRoot,
107103
config,

packages/document/docs/en/api/config/config-build.mdx

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,22 +94,18 @@ export default defineConfig({
9494
});
9595
```
9696

97-
You can also override the built-in plugins [@rsbuild/plugin-react](https://rsbuild.dev/plugins/list/plugin-react), [@rsbuild/plugin-sass](https://rsbuild.dev/plugins/list/plugin-sass) and [@rsbuild/plugin-less](https://rsbuild.dev/plugins/list/plugin-less), and customize relevant plugin options.
97+
You can also override the built-in plugin [@rsbuild/plugin-react](https://rsbuild.dev/plugins/list/plugin-react) and customize the plugin options.
9898

99-
- Example: Modify related options of built-in [@rsbuild/plugin-less](https://rsbuild.dev/plugins/list/plugin-less) plugin.
99+
For example:
100100

101101
```ts title="rspress.config.ts"
102102
import { defineConfig } from 'rspress/config';
103-
import { pluginLess } from '@rsbuild/plugin-less';
103+
import { pluginReact } from '@rsbuild/plugin-react';
104104

105105
export default defineConfig({
106106
builderPlugins: [
107-
pluginLess({
108-
lessLoaderOptions: {
109-
lessOptions: {
110-
math: 'always',
111-
},
112-
},
107+
pluginReact({
108+
// ...options
113109
}),
114110
],
115111
});

packages/document/docs/zh/api/config/config-build.mdx

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,22 +94,18 @@ export default defineConfig({
9494
});
9595
```
9696

97-
你也可以覆盖内置的 [@rsbuild/plugin-react](https://rsbuild.dev/zh/plugins/list/plugin-react)[@rsbuild/plugin-sass](https://rsbuild.dev/zh/plugins/list/plugin-sass)[@rsbuild/plugin-less](https://rsbuild.dev/zh/plugins/list/plugin-less) 插件,并传入相关插件选项
97+
你也可以覆盖内置的 [@rsbuild/plugin-react](https://rsbuild.dev/zh/plugins/list/plugin-react) 并自定义插件的选项
9898

99-
- 示例:修改内置的 [@rsbuild/plugin-less](https://rsbuild.dev/zh/plugins/list/plugin-less) 插件的相关选项
99+
比如:
100100

101101
```ts title="rspress.config.ts"
102102
import { defineConfig } from 'rspress/config';
103-
import { pluginLess } from '@rsbuild/plugin-less';
103+
import { pluginReact } from '@rsbuild/plugin-react';
104104

105105
export default defineConfig({
106106
builderPlugins: [
107-
pluginLess({
108-
lessLoaderOptions: {
109-
lessOptions: {
110-
math: 'always',
111-
},
112-
},
107+
pluginReact({
108+
// ...options
113109
}),
114110
],
115111
});

packages/document/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"preview": "rspress preview"
1717
},
1818
"devDependencies": {
19+
"@rsbuild/plugin-sass": "~1.2.2",
1920
"@rspress/plugin-algolia": "workspace:*",
2021
"@rstack-dev/doc-ui": "1.6.0",
2122
"@types/react": "^18.3.18",

packages/document/rspress.config.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { pluginSass } from '@rsbuild/plugin-sass';
12
import { pluginAlgolia } from '@rspress/plugin-algolia';
23
import { pluginGoogleAnalytics } from 'rsbuild-plugin-google-analytics';
34
import { pluginOpenGraph } from 'rsbuild-plugin-open-graph';
@@ -33,6 +34,7 @@ export default defineConfig({
3334
lazyCompilation: true,
3435
},
3536
plugins: [
37+
pluginSass(),
3638
pluginGoogleAnalytics({ id: 'G-66B2Z6KG0J' }),
3739
pluginOpenGraph({
3840
title: 'Rspress',

0 commit comments

Comments
 (0)