From 7269578d57c5a29892a5c26e6956598d21e3b94f Mon Sep 17 00:00:00 2001
From: Uyarn <uyarnchen@gmail.com>
Date: Wed, 2 Aug 2023 15:52:00 +0800
Subject: [PATCH] chore: release 1.5.2

---
 CHANGELOG.md            | 2 +-
 package.json            | 6 +++++-
 script/rollup.config.js | 6 +++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3bf2a839ff..b40fd752cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ toc: false
 docClass: timeline
 ---
 
-## 🌈 1.5.1 `2023-08-01` 
+## 🌈 1.5.2 `2023-08-01` 
 ### 🚀 Features
 - `Table`:
   - 可筛选表格，支持透传 attrs/style/classNames 属性、样式、类名等信息到自定义组件，[issue#2627](https://github.com/Tencent/tdesign-vue/issues/2627) @chaishi ([#2629](https://github.com/Tencent/tdesign-vue/pull/2629))
diff --git a/package.json b/package.json
index 4d88b0934f..b39b6fd246 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,11 @@
 {
   "name": "tdesign-vue",
   "purename": "tdesign",
+<<<<<<< HEAD
   "version": "1.5.1",
+=======
+  "version": "1.5.2",
+>>>>>>> fc839d8b (chore: release 1.5.2)
   "description": "tdesign-vue",
   "title": "tdesign-vue",
   "keywords": [
@@ -63,7 +67,7 @@
     "lint": "npm run lint:tsc && eslint --ext .vue,.js,.ts,.tsx ./ --max-warnings 0",
     "lint:tsc": "tsc --emitDeclarationOnly",
     "generate:usage": "node script/generate-usage/index.js",
-    "test": "npm run test:unit && npm run test:snap", 
+    "test": "npm run test:unit && npm run test:snap",
     "test:unit": "vitest run --config vitest.config.js",
     "test:update": "vitest run -u && npm run test:snap-update",
     "test:unit-dev": "vitest",
diff --git a/script/rollup.config.js b/script/rollup.config.js
index c8a6b901c2..20046f3e1d 100644
--- a/script/rollup.config.js
+++ b/script/rollup.config.js
@@ -78,8 +78,8 @@ const getPlugins = ({
         include: ['src/**/style/css.js'],
       }),
       ignoreImport({
-        include: ['src/*/style/*'],
-        body: 'import "./css.js";',
+        include: ['src/*/style/*', 'src/*/*/style/*'],
+        body: 'import "./style/css.js";',
       }),
     );
   } else if (ignoreLess) {
@@ -91,7 +91,7 @@ const getPlugins = ({
       }),
       ignoreImport({
         include: ['src/*/style/*'],
-        body: 'import "./index.js";',
+        body: 'import "./style/index.js";',
       }),
     );
   }