Merge branch 'haoziqaq:dev' into dev

varletjs · Nov 24, 2021 · 895d546 · 895d546
2 parents 7bed015 + 0b3b540
commit 895d546
Show file tree

Hide file tree

Showing 24 changed files with 232 additions and 157 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,35 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.23.7](https://github.com/haoziqaq/varlet/compare/v1.23.6...v1.23.7) (2021-11-23)
+
+
+### Bug Fixes
+
+* **loading:** add color for circle type & update doc ([3457394](https://github.com/haoziqaq/varlet/commit/345739466b8109e63205eee720d391a328d30ca7))
+* **loading:** remove radius prop & add color for circle type & update doc ([3a9dfe0](https://github.com/haoziqaq/varlet/commit/3a9dfe07886b245d686b454bfa1aa975b7e223f5))
+* **ui/themes, cli:** fix themes types ([f29511a](https://github.com/haoziqaq/varlet/commit/f29511a016edb462bdf578a6b5a19fbe10a22158))
+
+
+### Reverts
+
+* revert fix loading ([b97b8b9](https://github.com/haoziqaq/varlet/commit/b97b8b96e6f5f3c5f22f0f93eedc3e39b44e5344))
+
+
+
+
+
+## [1.23.6](https://github.com/haoziqaq/varlet/compare/v1.23.5...v1.23.6) (2021-11-22)
+
+
+### Bug Fixes
+
+* **date-picker:** css specificity ([565002b](https://github.com/haoziqaq/varlet/commit/565002bf78b0374b6b9f411df95d5e342f4ce626))
+
+
+
+
+
 ## [1.23.5](https://github.com/haoziqaq/varlet/compare/v1.23.4...v1.23.5) (2021-11-21)
 
 

diff --git a/lerna.json b/lerna.json
@@ -21,5 +21,5 @@
   "ignoreChanges": [
     "**/*.md"
   ],
-  "version": "1.23.5"
+  "version": "1.23.7"
 }
diff --git a/packages/varlet-cli/CHANGELOG.md b/packages/varlet-cli/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.23.7](https://github.com/haoziqaq/varlet/compare/v1.23.6...v1.23.7) (2021-11-23)
+
+
+### Bug Fixes
+
+* **ui/themes, cli:** fix themes types ([f29511a](https://github.com/haoziqaq/varlet/commit/f29511a016edb462bdf578a6b5a19fbe10a22158))
+
+
+
+
+
 ## [1.23.5](https://github.com/haoziqaq/varlet/compare/v1.23.4...v1.23.5) (2021-11-21)
 
 

diff --git a/packages/varlet-cli/package.json b/packages/varlet-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@varlet/cli",
-  "version": "1.23.5",
+  "version": "1.23.7",
   "description": "cli of varlet",
   "bin": {
     "varlet-cli": "./lib/index.js"

diff --git a/packages/varlet-cli/src/compiler/compileModule.ts b/packages/varlet-cli/src/compiler/compileModule.ts
@@ -10,7 +10,7 @@ import {
   STYLE_DIR_NAME,
   LIB_DIR,
 } from '../shared/constant'
-import { getPublicDirs, isDir, isLess, isScript, isSFC } from '../shared/fsUtils'
+import { getPublicDirs, isDir, isDTS, isLess, isScript, isSFC } from '../shared/fsUtils'
 import { compileSFC } from './compileSFC'
 import { compileESEntry, compileCommonJSEntry, compileScriptFile } from './compileScript'
 import { compileLess } from './compileStyle'
@@ -37,7 +37,7 @@ export async function compileDir(dir: string) {
 
       ;[TESTS_DIR_NAME, EXAMPLE_DIR_NAME, DOCS_DIR_NAME].includes(filename) && removeSync(file)
 
-      if (filename === STYLE_DIR_NAME) {
+      if (isDTS(file) || filename === STYLE_DIR_NAME) {
         return Promise.resolve()
       }
 

diff --git a/packages/varlet-cli/src/shared/fsUtils.ts b/packages/varlet-cli/src/shared/fsUtils.ts
@@ -25,6 +25,8 @@ export const isJSX = (file: string): boolean => pathExistsSync(file) && extname(
 
 export const isTSX = (file: string): boolean => pathExistsSync(file) && extname(file) === '.tsx'
 
+export const isDTS = (file: string): boolean => pathExistsSync(file) && file.endsWith('.d.ts')
+
 export const isScript = (file: string): boolean => pathExistsSync(file) && SCRIPTS_EXTENSIONS.includes(extname(file))
 
 export const isLess = (file: string): boolean => pathExistsSync(file) && extname(file) === '.less'

diff --git a/packages/varlet-ui/CHANGELOG.md b/packages/varlet-ui/CHANGELOG.md
@@ -3,6 +3,35 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.23.7](https://github.com/haoziqaq/varlet/compare/v1.23.6...v1.23.7) (2021-11-23)
+
+
+### Bug Fixes
+
+* **loading:** add color for circle type & update doc ([3457394](https://github.com/haoziqaq/varlet/commit/345739466b8109e63205eee720d391a328d30ca7))
+* **loading:** remove radius prop & add color for circle type & update doc ([3a9dfe0](https://github.com/haoziqaq/varlet/commit/3a9dfe07886b245d686b454bfa1aa975b7e223f5))
+* **ui/themes, cli:** fix themes types ([f29511a](https://github.com/haoziqaq/varlet/commit/f29511a016edb462bdf578a6b5a19fbe10a22158))
+
+
+### Reverts
+
+* revert fix loading ([b97b8b9](https://github.com/haoziqaq/varlet/commit/b97b8b96e6f5f3c5f22f0f93eedc3e39b44e5344))
+
+
+
+
+
+## [1.23.6](https://github.com/haoziqaq/varlet/compare/v1.23.5...v1.23.6) (2021-11-22)
+
+
+### Bug Fixes
+
+* **date-picker:** css specificity ([565002b](https://github.com/haoziqaq/varlet/commit/565002bf78b0374b6b9f411df95d5e342f4ce626))
+
+
+
+
+
 ## [1.23.5](https://github.com/haoziqaq/varlet/compare/v1.23.4...v1.23.5) (2021-11-21)
 
 

diff --git a/packages/varlet-ui/package.json b/packages/varlet-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@varlet/ui",
-  "version": "1.23.5",
+  "version": "1.23.7",
   "description": "A material like components library",
   "module": "es/index.js",
   "main": "lib/index.js",
@@ -51,7 +51,7 @@
   },
   "gitHead": "ee9c3866bedad96c86365b0f9888a3a6bb781b1f",
   "devDependencies": {
-    "@varlet/cli": "^1.23.5"
+    "@varlet/cli": "^1.23.7"
   },
   "dependencies": {
     "dayjs": "^1.10.4",

diff --git a/packages/varlet-ui/src/button/__tests__/__snapshots__/index.spec.js.snap b/packages/varlet-ui/src/button/__tests__/__snapshots__/index.spec.js.snap
@@ -53,7 +53,7 @@ exports[`test button example 1`] = `
 </button>
 <div class=\\"app-type\\">加载状态</div><button class=\\"var-button var--box var-button--normal var--inline-flex var-button--primary var-elevation--2\\">
   <div class=\\"var--box var-loading var-button__loading\\">
-    <div class=\\"var-loading__circle\\"><span class=\\"var-loading__circle-block\\" style=\\"width: 24px; height: 24px;\\"><svg viewBox=\\"25 25 50 50\\"><circle cx=\\"50\\" cy=\\"50\\" r=\\"20\\" fill=\\"none\\"></circle></svg></span></div>
+    <div class=\\"var-loading__circle\\"><span class=\\"var-loading__circle-block\\" style=\\"width: 24px; height: 24px; color: currentColor;\\"><svg viewBox=\\"25 25 50 50\\"><circle cx=\\"50\\" cy=\\"50\\" r=\\"20\\" fill=\\"none\\"></circle></svg></span></div>
     <!--v-if-->
     <!--v-if-->
     <!--v-if-->
@@ -173,7 +173,7 @@ exports[`test button example 1`] = `
 exports[`test button loading 1`] = `
 "<button class=\\"var-button var--box var-button--normal var--inline-flex var-button--default var-elevation--2\\">
   <div class=\\"var--box var-loading var-button__loading\\">
-    <div class=\\"var-loading__circle\\"><span class=\\"var-loading__circle-block\\" style=\\"width: 24px; height: 24px;\\"><svg viewBox=\\"25 25 50 50\\"><circle cx=\\"50\\" cy=\\"50\\" r=\\"20\\" fill=\\"none\\"></circle></svg></span></div>
+    <div class=\\"var-loading__circle\\"><span class=\\"var-loading__circle-block\\" style=\\"width: 24px; height: 24px; color: currentColor;\\"><svg viewBox=\\"25 25 50 50\\"><circle cx=\\"50\\" cy=\\"50\\" r=\\"20\\" fill=\\"none\\"></circle></svg></span></div>
     <!--v-if-->
     <!--v-if-->
     <!--v-if-->