Skip to content

Commit 15297d8

Browse files
committed
docs(en): merging all conflicts
2 parents 1d5fd67 + 500feca commit 15297d8

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

config/shared-options.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,11 @@ declare const __APP_VERSION__: string
227227
指定传递给 CSS 预处理器的选项。文件扩展名用作选项的键。每个预处理器支持的选项可以在它们各自的文档中找到:
228228

229229
- `sass`/`scss`:
230+
<<<<<<< HEAD
230231
- 选择要使用的 sass 应用程序接口 `api: "modern-compiler" | "modern"` (如果安装了`sass-embedded`,默认为`"modern-compiler"`,否则为 `"modern"`). 为获得最佳性能,建议使用 `api: "modern-compiler"``sass-embedded` 软件包。
232+
=======
233+
- Uses `sass-embedded` if installed, otherwise uses `sass`. For the best performance, it's recommended to install the `sass-embedded` package.
234+
>>>>>>> 500feca4bcc262767800a5f63ec9eef88fd38fed
231235
- [Options](https://sass-lang.com/documentation/js-api/interfaces/stringoptions/)
232236
- `less`: [选项](https://lesscss.org/usage/#less-options).
233237
- `styl`/`stylus`: 仅支持 [`define`](https://stylus-lang.com/docs/js.html#define-name-node),可以作为对象传递。
@@ -247,7 +251,10 @@ export default defineConfig({
247251
},
248252
},
249253
scss: {
254+
<<<<<<< HEAD
250255
api: 'modern-compiler', // 或 "modern"
256+
=======
257+
>>>>>>> 500feca4bcc262767800a5f63ec9eef88fd38fed
251258
importers: [
252259
// ...
253260
],

0 commit comments

Comments
 (0)