Merge branch 'master' into release-next

alibaba · Jul 6, 2022 · c0bfade · c0bfade
2 parents 82543dd + a27620d
commit c0bfade
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/packages/plugin-ignore-style/CHANGELOG.md b/packages/plugin-ignore-style/CHANGELOG.md
@@ -1,9 +1,13 @@
 # Changelog
 
+## 0.2.0
+
+- [feat] support custom style regexp
+
 ## 0.1.1
 
 - [fix] default style regexp
 
 ## 0.1.0
 
-- [feat] init plugin
+- [feat] init plugin
diff --git a/packages/plugin-ignore-style/README.md b/packages/plugin-ignore-style/README.md
@@ -37,4 +37,16 @@ config multi library
     }
   ]]
 }
-```
+```
+
+config custom style regexp
+
+```json
+{
+  "plugins": ["build-plugin-ignore-style", [
+    {
+      "rule": "@alifd/next/.*\\.scss"
+    },
+  ]]
+}
+```
diff --git a/packages/plugin-ignore-style/package.json b/packages/plugin-ignore-style/package.json
@@ -1,6 +1,6 @@
 {
   "name": "build-plugin-ignore-style",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "plugin for ignore style",
   "main": "lib/index.js",
   "scripts": {
@@ -25,4 +25,4 @@
     "lib",
     "!lib/**/*.map"
   ]
-}
+}
diff --git a/packages/plugin-ignore-style/src/index.ts b/packages/plugin-ignore-style/src/index.ts
@@ -4,6 +4,7 @@ import type { Plugin } from 'vite';
 interface Options {
   libraryName: string;
   style?: string;
+  rule?:string;
 }
 
 const getStyleRule = (libraryName: string, style = 'style'): string => `${libraryName}/(es|lib)/[-\\w+]+/(${style}|${style}.js|${style}/index.js)$`;
@@ -17,8 +18,8 @@ const plugin: IPlugin = ({ onGetWebpackConfig, modifyUserConfig, log, context },
     const libraryConfigs = Array.isArray(options) ? options : [options];
     // default rule for external style
     const externalRule = libraryConfigs.map((value) => {
-      const {libraryName, style = 'style'} = value as unknown as Options;
-      return getStyleRule(libraryName, style);
+      const {libraryName, style = 'style', rule} = value as unknown as Options;
+      return rule??getStyleRule(libraryName, style);
     }).join('|');
     onGetWebpackConfig((config) => {
       config.module