From 3f8b5a5669bff54aac1bde67dac6d0ff32af7f4e Mon Sep 17 00:00:00 2001 From: danranVm Date: Thu, 11 Aug 2022 09:55:10 +0800 Subject: [PATCH] build: upgrade dependencies (#1068) --- .markdownlintrc | 3 +- .stylelintrc | 4 +- package.json | 105 +++++++++--------- .../__tests__/blockScrollStrategy.spec.ts | 10 +- packages/cdk/utils/src/props.ts | 1 + packages/cdk/utils/src/typeof.ts | 1 + .../__snapshots__/badge.spec.ts.snap | 24 +++- .../cascader/src/contents/OverlayContent.tsx | 3 +- .../src/contents/OverlayOptionGroup.tsx | 3 +- .../__snapshots__/datePicker.spec.ts.snap | 3 +- .../dateRangePicker.spec.ts.snap | 3 +- .../date-picker/__tests__/datePicker.spec.ts | 10 +- .../__tests__/dateRangePicker.spec.ts | 10 +- packages/components/form/docs/Api.zh.md | 13 +-- .../__snapshots__/imageViewer.spec.ts.snap | 2 +- .../__snapshots__/loadingBar.spec.ts.snap | 3 +- .../messageProvider.spec.ts.snap | 5 +- .../__snapshots__/select.spec.ts.snap | 15 +-- .../__snapshots__/treeSelect.spec.ts.snap | 9 +- .../components/tree/__tests__/tree.spec.ts | 4 +- .../__tests__/__snapshots__/list.spec.ts.snap | 2 +- .../pro/table/src/contents/LayoutToolTree.tsx | 3 +- scripts/gen/generate.ts | 12 +- scripts/gen/template.ts | 20 +++- vitest.config.ts | 7 +- 25 files changed, 141 insertions(+), 134 deletions(-) diff --git a/.markdownlintrc b/.markdownlintrc index f9f2e7e25..b1df7c9ce 100644 --- a/.markdownlintrc +++ b/.markdownlintrc @@ -8,5 +8,6 @@ "MD029": false, "MD033": false, "MD036": false, - "MD041": false + "MD041": false, + "MD051": false } diff --git a/.stylelintrc b/.stylelintrc index d2c7b15f1..6b7e328af 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -4,13 +4,15 @@ "rules": { "keyframes-name-pattern": null, "at-rule-no-unknown": null, + "function-no-unknown": null, "function-name-case": ["lower", { "ignoreFunctions": ["/colorPalette/"] }], "rule-empty-line-before": null, "no-duplicate-selectors": null, "no-empty-source": null, "no-invalid-double-slash-comments": null, "no-invalid-position-at-import-rule": null, - "font-family-no-missing-generic-family-keyword": null + "font-family-no-missing-generic-family-keyword": null, + "selector-not-notation": null }, "ignoreFiles": [ "dist/**/*.less", diff --git a/package.json b/package.json index b2bdaf154..1ff49a43e 100644 --- a/package.json +++ b/package.json @@ -49,16 +49,16 @@ } }, "devDependencies": { - "@babel/core": "^7.17.9", - "@babel/preset-env": "^7.16.11", - "@babel/preset-typescript": "^7.16.7", - "@commitlint/cli": "^16.2.3", - "@commitlint/config-angular": "^16.2.3", - "@juggle/resize-observer": "^3.3.0", - "@ls-lint/ls-lint": "^1.11.0", + "@babel/core": "^7.18.10", + "@babel/preset-env": "^7.18.10", + "@babel/preset-typescript": "^7.18.6", + "@commitlint/cli": "^17.0.3", + "@commitlint/config-angular": "^17.0.3", + "@juggle/resize-observer": "^3.3.1", + "@ls-lint/ls-lint": "^1.11.2", "@rollup/plugin-alias": "^3.1.9", - "@rollup/plugin-node-resolve": "^13.2.1", - "@rollup/plugin-replace": "^3.1.0", + "@rollup/plugin-node-resolve": "^13.3.0", + "@rollup/plugin-replace": "^4.0.0", "@rollup/pluginutils": "^4.2.1", "@types/bluebird": "^3.5.36", "@types/figlet": "^1.5.4", @@ -68,74 +68,75 @@ "@types/less": "^3.0.3", "@types/lodash-es": "^4.17.6", "@types/marked": "^4.0.3", - "@types/node": "^17.0.27", - "@types/parse5": "^6.0.3", + "@types/node": "^17.0.45", + "@types/parse5": "^7.0.0", "@types/prismjs": "^1.26.0", "@types/svgo": "^2.6.3", "@types/yaml-front-matter": "^4.1.0", - "@typescript-eslint/eslint-plugin": "^5.20.0", - "@typescript-eslint/parser": "^5.20.0", - "@vitejs/plugin-vue": "^1.10.2", - "@vitejs/plugin-vue-jsx": "^1.3.10", + "@typescript-eslint/eslint-plugin": "^5.33.0", + "@typescript-eslint/parser": "^5.33.0", + "@vitejs/plugin-vue": "^3.0.1", + "@vitejs/plugin-vue-jsx": "^2.0.0", "@vue/babel-plugin-jsx": "^1.1.1", - "@vue/compiler-dom": "^3.2.33", - "@vue/compiler-sfc": "^3.2.33", + "@vue/compiler-dom": "^3.2.37", + "@vue/compiler-sfc": "^3.2.37", "@vue/eslint-config-prettier": "^7.0.0", - "@vue/eslint-config-typescript": "^10.0.0", - "@vue/reactivity": "^3.2.33", - "@vue/runtime-core": "^3.2.33", - "@vue/runtime-dom": "^3.2.33", - "@vue/shared": "^3.2.33", - "@vue/test-utils": "2.0.0-rc.17", - "c8": "^7.11.2", + "@vue/eslint-config-typescript": "^11.0.0", + "@vue/reactivity": "^3.2.37", + "@vue/runtime-core": "^3.2.37", + "@vue/runtime-dom": "^3.2.37", + "@vue/shared": "^3.2.37", + "@vue/test-utils": "2.0.2", + "c8": "^7.12.0", "chalk": "^4.1.2", "codecov": "^3.8.3", - "cz-git": "^1.3.3", - "esbuild": "^0.14.38", - "eslint": "^8.14.0", + "cz-git": "^1.3.10", + "esbuild": "^0.15.0", + "eslint": "^8.21.0", "eslint-import-resolver-custom-alias": "^1.3.0", "eslint-plugin-header": "^3.1.1", "eslint-plugin-import": "^2.26.0", - "eslint-plugin-jsdoc": "^37.9.7", - "eslint-plugin-prettier": "^4.0.0", - "eslint-plugin-vue": "^8.7.1", + "eslint-plugin-jsdoc": "^39.3.6", + "eslint-plugin-prettier": "^4.2.1", + "eslint-plugin-vue": "^9.3.0", "fast-glob": "^3.2.11", "figlet": "^1.5.2", "fs-extra": "^10.1.0", "gulp": "^4.0.2", - "husky": "^7.0.4", + "husky": "^8.0.1", "inquirer": "^8.2.2", - "jsdom": "^19.0.0", - "lerna": "^4.0.0", - "less": "^4.1.2", + "jsdom": "^20.0.0", + "lerna": "^5.4.0", + "less": "^4.1.3", "less-plugin-clean-css": "^1.5.1", "less-plugin-npm-import": "^2.1.0", - "lint-staged": "^12.4.0", - "lodash-es": "^4.17.0", - "markdownlint-cli": "^0.30.0", - "marked": "^4.0.14", + "lint-staged": "^13.0.3", + "lodash-es": "^4.17.21", + "markdownlint-cli": "^0.32.0", + "marked": "^4.0.18", "npm-run-all": "^4.1.5", "ora": "^5.4.1", - "parse5": "^6.0.1", - "postcss-less": "^5.0.0", - "prettier": "^2.6.2", + "parse5": "^7.0.0", + "postcss": "^8.4.16", + "postcss-less": "^6.0.0", + "prettier": "^2.7.1", "prismjs": "^1.28.0", "remark": "^13.0.0", - "resolve-bin": "^1.0.0", - "rollup": "^2.70.2", - "rollup-plugin-typescript2": "^0.31.2", - "stylelint": "^14.8.3", + "resolve-bin": "^1.0.1", + "rollup": "^2.77.2", + "rollup-plugin-typescript2": "^0.32.0", + "stylelint": "^14.9.1", "stylelint-config-prettier": "^9.0.3", - "stylelint-config-standard": "^24.0.0", + "stylelint-config-standard": "^26.0.0", "svgo": "^2.8.0", - "ts-node": "^10.7.0", + "ts-node": "^10.9.1", "ts-toolbelt": "^9.6.0", "tslib": "^2.4.0", - "typescript": "^4.6.3", - "unplugin-vue-components": "^0.17.21", - "vite": "^2.9.5", - "vitest": "^0.8.5", - "vue": "^3.2.33", + "typescript": "^4.7.4", + "unplugin-vue-components": "^0.22.4", + "vite": "^3.0.5", + "vitest": "^0.21.1", + "vue": "^3.2.37", "yaml-front-matter": "^4.1.1" }, "engines": { diff --git a/packages/cdk/scroll/__tests__/blockScrollStrategy.spec.ts b/packages/cdk/scroll/__tests__/blockScrollStrategy.spec.ts index 83a9c5642..2f88a2f45 100644 --- a/packages/cdk/scroll/__tests__/blockScrollStrategy.spec.ts +++ b/packages/cdk/scroll/__tests__/blockScrollStrategy.spec.ts @@ -1,6 +1,6 @@ import { BlockScrollStrategy } from '../src/strategy/blockScrollStrategy' -describe('blockScrollStrategy.ts', () => { +describe.skip('blockScrollStrategy.ts', () => { const defaultClassName = 'cdk-scroll-block' let blockScrollStrategy: BlockScrollStrategy @@ -14,7 +14,7 @@ describe('blockScrollStrategy.ts', () => { } }) - it.skip('enable and disable work', () => { + it('enable and disable work', () => { blockScrollStrategy.enable() expect(document.documentElement.className).toBe(defaultClassName) @@ -24,7 +24,7 @@ describe('blockScrollStrategy.ts', () => { expect(document.documentElement.className).toBe('') }) - it.skip('className work', () => { + it('className work', () => { const testClassName = 'test-block' const scrollLocker1 = new BlockScrollStrategy({ className: testClassName }) @@ -44,7 +44,7 @@ describe('blockScrollStrategy.ts', () => { expect(document.documentElement.className).toBe('') }) - it.skip('multiple enable and disable work', () => { + it('multiple enable and disable work', () => { blockScrollStrategy.enable() blockScrollStrategy.enable() @@ -59,7 +59,7 @@ describe('blockScrollStrategy.ts', () => { expect(document.documentElement.className).toBe('') }) - it.skip('multiple instance work', () => { + it('multiple instance work', () => { const scrollLocker1 = new BlockScrollStrategy() const scrollLocker2 = new BlockScrollStrategy() diff --git a/packages/cdk/utils/src/props.ts b/packages/cdk/utils/src/props.ts index 5ab06b7eb..da43c948b 100644 --- a/packages/cdk/utils/src/props.ts +++ b/packages/cdk/utils/src/props.ts @@ -7,6 +7,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ +// eslint-disable-next-line vue/prefer-import-from-vue import type { IfAny } from '@vue/shared' import type { Prop } from 'vue' diff --git a/packages/cdk/utils/src/typeof.ts b/packages/cdk/utils/src/typeof.ts index bdd77f256..fb259b3a2 100644 --- a/packages/cdk/utils/src/typeof.ts +++ b/packages/cdk/utils/src/typeof.ts @@ -7,6 +7,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ +// eslint-disable-next-line vue/prefer-import-from-vue import { toRawType } from '@vue/shared' import { isFunction, isObject } from 'lodash-es' diff --git a/packages/components/badge/__tests__/__snapshots__/badge.spec.ts.snap b/packages/components/badge/__tests__/__snapshots__/badge.spec.ts.snap index 58887a243..e6c39fb42 100644 --- a/packages/components/badge/__tests__/__snapshots__/badge.spec.ts.snap +++ b/packages/components/badge/__tests__/__snapshots__/badge.spec.ts.snap @@ -1,6 +1,10 @@ // Vitest Snapshot v1 -exports[`Badge > color work 1`] = `""`; +exports[`Badge > color work 1`] = ` +" + +" +`; exports[`Badge > count slot work 1`] = `"
"`; @@ -10,9 +14,17 @@ exports[`Badge > count work 2`] = `" count work 3`] = `"1-1"`; -exports[`Badge > dot work 1`] = `""`; +exports[`Badge > dot work 1`] = ` +" + +" +`; -exports[`Badge > dot work 2`] = `""`; +exports[`Badge > dot work 2`] = ` +" + +" +`; exports[`Badge > overflowCount work 1`] = `"99+"`; @@ -24,6 +36,10 @@ exports[`Badge > overflowCount work 4`] = `" render work 1`] = `""`; -exports[`Badge > showZero work 1`] = `""`; +exports[`Badge > showZero work 1`] = ` +" + +" +`; exports[`Badge > showZero work 2`] = `"0"`; diff --git a/packages/components/cascader/src/contents/OverlayContent.tsx b/packages/components/cascader/src/contents/OverlayContent.tsx index 41e50af56..a27d16051 100644 --- a/packages/components/cascader/src/contents/OverlayContent.tsx +++ b/packages/components/cascader/src/contents/OverlayContent.tsx @@ -7,8 +7,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import { computed } from '@vue/reactivity' -import { type VNode, defineComponent, inject } from 'vue' +import { type VNode, computed, defineComponent, inject } from 'vue' import { ɵInput } from '@idux/components/_private/input' diff --git a/packages/components/cascader/src/contents/OverlayOptionGroup.tsx b/packages/components/cascader/src/contents/OverlayOptionGroup.tsx index fe979bf77..29eda0461 100644 --- a/packages/components/cascader/src/contents/OverlayOptionGroup.tsx +++ b/packages/components/cascader/src/contents/OverlayOptionGroup.tsx @@ -5,8 +5,7 @@ * found in the LICENSE file at https://github.com/IDuxFE/idux/blob/main/LICENSE */ -import { computed } from '@vue/reactivity' -import { type PropType, type VNode, defineComponent, inject, normalizeClass } from 'vue' +import { type PropType, type VNode, computed, defineComponent, inject, normalizeClass } from 'vue' import { CdkVirtualScroll, type VirtualItemRenderFn } from '@idux/cdk/scroll' import { ɵEmpty } from '@idux/components/_private/empty' diff --git a/packages/components/date-picker/__tests__/__snapshots__/datePicker.spec.ts.snap b/packages/components/date-picker/__tests__/__snapshots__/datePicker.spec.ts.snap index aa6782057..f9a233612 100644 --- a/packages/components/date-picker/__tests__/__snapshots__/datePicker.spec.ts.snap +++ b/packages/components/date-picker/__tests__/__snapshots__/datePicker.spec.ts.snap @@ -5,6 +5,5 @@ exports[`DatePicker > render work 1`] = `
- -" +" `; diff --git a/packages/components/date-picker/__tests__/__snapshots__/dateRangePicker.spec.ts.snap b/packages/components/date-picker/__tests__/__snapshots__/dateRangePicker.spec.ts.snap index 49514c9ec..7727dc409 100644 --- a/packages/components/date-picker/__tests__/__snapshots__/dateRangePicker.spec.ts.snap +++ b/packages/components/date-picker/__tests__/__snapshots__/dateRangePicker.spec.ts.snap @@ -5,6 +5,5 @@ exports[`DateRangePicker > render work 1`] = `
至
- -" +" `; diff --git a/packages/components/date-picker/__tests__/datePicker.spec.ts b/packages/components/date-picker/__tests__/datePicker.spec.ts index fa0d32a95..50b9d0f54 100644 --- a/packages/components/date-picker/__tests__/datePicker.spec.ts +++ b/packages/components/date-picker/__tests__/datePicker.spec.ts @@ -224,8 +224,7 @@ describe('DatePicker', () => { await wrapper .findComponent(Content) - .find('.ix-date-picker-overlay-inputs-date-input') - .find('input') + .find('.ix-date-picker-overlay-inputs-date-input') .setValue('2021-11-22') expect(onUpdateValue).toBeCalledWith(new Date('2021-11-22 00:00:00')) expect(onChange).toBeCalledWith(new Date('2021-11-22 00:00:00'), new Date('2021-10-11 00:00:00')) @@ -235,8 +234,7 @@ describe('DatePicker', () => { await wrapper .findComponent(Content) - .find('.ix-date-picker-overlay-inputs-time-input') - .find('input') + .find('.ix-date-picker-overlay-inputs-time-input') .setValue('13:03:04') expect(onUpdateValue).toBeCalledWith(new Date('2021-10-11 13:03:04')) expect(onChange).toBeCalledWith(new Date('2021-10-11 13:03:04'), new Date('2021-10-11 00:00:00')) @@ -262,10 +260,10 @@ describe('DatePicker', () => { expect(wrapper.find('.ix-date-picker').find('input').element.value).toBe('2021-10-11 13/03/04') expect( - wrapper.findComponent(Content).find('.ix-date-picker-overlay-inputs-date-input').find('input').element.value, + wrapper.findComponent(Content).find('.ix-date-picker-overlay-inputs-date-input').element.value, ).toBe('2021年10月11日') expect( - wrapper.findComponent(Content).find('.ix-date-picker-overlay-inputs-time-input').find('input').element.value, + wrapper.findComponent(Content).find('.ix-date-picker-overlay-inputs-time-input').element.value, ).toBe('13时03分04秒') }) }) diff --git a/packages/components/date-picker/__tests__/dateRangePicker.spec.ts b/packages/components/date-picker/__tests__/dateRangePicker.spec.ts index 56a519a26..a231d3ccf 100644 --- a/packages/components/date-picker/__tests__/dateRangePicker.spec.ts +++ b/packages/components/date-picker/__tests__/dateRangePicker.spec.ts @@ -231,14 +231,8 @@ describe('DateRangePicker', () => { }, }) - const dateInputs = wrapper - .findComponent(RangeContent) - .findAll('.ix-date-range-picker-overlay-inputs-date-input') - .map(el => el.find('input')) - const timeInputs = wrapper - .findComponent(RangeContent) - .findAll('.ix-date-range-picker-overlay-inputs-time-input') - .map(el => el.find('input')) + const dateInputs = wrapper.findComponent(RangeContent).findAll('.ix-date-range-picker-overlay-inputs-date-input') + const timeInputs = wrapper.findComponent(RangeContent).findAll('.ix-date-range-picker-overlay-inputs-time-input') await dateInputs[0].setValue('2021-11-22') await dateInputs[1].setValue('2021-12-25') diff --git a/packages/components/form/docs/Api.zh.md b/packages/components/form/docs/Api.zh.md index bb8b405f4..5c704c241 100644 --- a/packages/components/form/docs/Api.zh.md +++ b/packages/components/form/docs/Api.zh.md @@ -119,16 +119,9 @@ const onInput = (evt: Event) => { | `@form-padding-horizontal-sm` | `@spacing-sm - 2px` | - | - | | `@form-padding-horizontal-md` | `@spacing-md` | - | - | | `@form-padding-horizontal-lg` | `@spacing-sm + 2px` | - | - | -| `@form-padding-vertical-sm` | `max( - (round(((@form-height-sm - @form-font-size-sm * @form-line-height) / 2) * 10) / 10) - @form-border-width, - 0 -)` | - | - | -| `@form-padding-vertical-md` | `max( - (round(((@form-height-md - @form-font-size-md * @form-line-height) / 2) * 10) / 10) - @form-border-width, - 2px -)` | - | - | -| `@form-padding-vertical-lg` | `(ceil(((@form-height-lg - @form-font-size-lg * @form-line-height) / 2) * 10) / 10) - - @form-border-width` | - | - | +| `@form-padding-vertical-sm` | `max((round(((@form-height-sm - @form-font-size-sm * @form-line-height) / 2) * 10) / 10) - @form-border-width, 0)` | - | - | +| `@form-padding-vertical-md` | `max((round(((@form-height-md - @form-font-size-md * @form-line-height) / 2) * 10) / 10) - @form-border-width, 2px)` | - | - | +| `@form-padding-vertical-lg` | `(ceil(((@form-height-lg - @form-font-size-lg * @form-line-height) / 2) * 10) / 10) - @form-border-width` | - | - | | `@form-border-width` | `@border-width-sm` | - | - | | `@form-border-style` | `@border-style` | - | - | | `@form-border-color` | `@border-color` | - | - | diff --git a/packages/components/image/__tests__/__snapshots__/imageViewer.spec.ts.snap b/packages/components/image/__tests__/__snapshots__/imageViewer.spec.ts.snap index 61de56bf8..ac1c0ddf2 100644 --- a/packages/components/image/__tests__/__snapshots__/imageViewer.spec.ts.snap +++ b/packages/components/image/__tests__/__snapshots__/imageViewer.spec.ts.snap @@ -1,3 +1,3 @@ // Vitest Snapshot v1 -exports[`ImageViewer > render work 1`] = `""`; +exports[`ImageViewer > render work 1`] = `""`; diff --git a/packages/components/loading-bar/__tests__/__snapshots__/loadingBar.spec.ts.snap b/packages/components/loading-bar/__tests__/__snapshots__/loadingBar.spec.ts.snap index b43b1f619..4157bb22f 100644 --- a/packages/components/loading-bar/__tests__/__snapshots__/loadingBar.spec.ts.snap +++ b/packages/components/loading-bar/__tests__/__snapshots__/loadingBar.spec.ts.snap @@ -2,5 +2,6 @@ exports[`LoadingBarProvider > render work 1`] = ` " -<button>ok</button>" + +<button>ok</button>" `; diff --git a/packages/components/message/__tests__/__snapshots__/messageProvider.spec.ts.snap b/packages/components/message/__tests__/__snapshots__/messageProvider.spec.ts.snap index 24c3c867d..e54fdd250 100644 --- a/packages/components/message/__tests__/__snapshots__/messageProvider.spec.ts.snap +++ b/packages/components/message/__tests__/__snapshots__/messageProvider.spec.ts.snap @@ -1,6 +1,3 @@ // Vitest Snapshot v1 -exports[`MessageProvider > basic > render work 1`] = ` -"This is a message -" -`; +exports[`MessageProvider > basic > render work 1`] = `"This is a message"`; diff --git a/packages/components/select/__tests__/__snapshots__/select.spec.ts.snap b/packages/components/select/__tests__/__snapshots__/select.spec.ts.snap index 95327fafd..503890827 100644 --- a/packages/components/select/__tests__/__snapshots__/select.spec.ts.snap +++ b/packages/components/select/__tests__/__snapshots__/select.spec.ts.snap @@ -33,8 +33,7 @@ exports[`Select > multiple work > maxLabel responsive work 1`] = `
- -" +" `; exports[`Select > multiple work > maxLabel responsive work 2`] = ` @@ -61,8 +60,7 @@ exports[`Select > multiple work > maxLabel responsive work 2`] = `
- -" +" `; exports[`Select > multiple work > render work 1`] = ` @@ -86,8 +84,7 @@ exports[`Select > multiple work > render work 1`] = `
- -" +" `; exports[`Select > single work > render work 1`] = ` @@ -102,8 +99,7 @@ exports[`Select > single work > render work 1`] = `
- -" +" `; exports[`Select > template work > render work 1`] = ` @@ -118,6 +114,5 @@ exports[`Select > template work > render work 1`] = `
- -" +" `; diff --git a/packages/components/tree-select/__tests__/__snapshots__/treeSelect.spec.ts.snap b/packages/components/tree-select/__tests__/__snapshots__/treeSelect.spec.ts.snap index 24f7640a8..e3d5b1626 100644 --- a/packages/components/tree-select/__tests__/__snapshots__/treeSelect.spec.ts.snap +++ b/packages/components/tree-select/__tests__/__snapshots__/treeSelect.spec.ts.snap @@ -63,8 +63,7 @@ exports[`TreeSelect > single work > searchFn work 1`] = `
- -" +" `; exports[`TreeSelect > single work > searchFn work 2`] = ` @@ -81,8 +80,7 @@ exports[`TreeSelect > single work > searchFn work 2`] = ` - -" +" `; exports[`TreeSelect > single work > searchFn work 3`] = ` @@ -99,8 +97,7 @@ exports[`TreeSelect > single work > searchFn work 3`] = ` - -" +" `; exports[`TreeSelect > single work > searchable work 1`] = ` diff --git a/packages/components/tree/__tests__/tree.spec.ts b/packages/components/tree/__tests__/tree.spec.ts index 11a8c10c4..f741ec691 100644 --- a/packages/components/tree/__tests__/tree.spec.ts +++ b/packages/components/tree/__tests__/tree.spec.ts @@ -847,9 +847,7 @@ describe('Tree', () => { expect(allNodes.length).toBe(4) expect(allNodes[0].find('.ix-tree-node-expand').find('.ix-icon-loading').exists()).toBe(false) expect(allNodes[0].find('.ix-tree-node-expand').find('.ix-icon-right').exists()).toBe(true) - expect( - allNodes[1].find('.ix-tree-node').find('.ix-tree-node-indent').findAll('.ix-tree-node-indent-unit').length, - ).toBe(1) + expect(allNodes[1].find('.ix-tree-node-indent').findAll('.ix-tree-node-indent-unit').length).toBe(1) }) test('loadedKeys work', async () => { diff --git a/packages/components/upload/__tests__/__snapshots__/list.spec.ts.snap b/packages/components/upload/__tests__/__snapshots__/list.spec.ts.snap index 3aa5facfd..a7166c47d 100644 --- a/packages/components/upload/__tests__/__snapshots__/list.spec.ts.snap +++ b/packages/components/upload/__tests__/__snapshots__/list.spec.ts.snap @@ -1,3 +1,3 @@ // Vitest Snapshot v1 -exports[`Upload list render > render work 1`] = `""`; +exports[`Upload list render > render work 1`] = `""`; diff --git a/packages/pro/table/src/contents/LayoutToolTree.tsx b/packages/pro/table/src/contents/LayoutToolTree.tsx index 0c5639505..9a709dc16 100644 --- a/packages/pro/table/src/contents/LayoutToolTree.tsx +++ b/packages/pro/table/src/contents/LayoutToolTree.tsx @@ -5,8 +5,7 @@ * found in the LICENSE file at https://github.com/IDuxFE/idux/blob/main/LICENSE */ -import { computed } from '@vue/reactivity' -import { type PropType, defineComponent, inject } from 'vue' +import { type PropType, computed, defineComponent, inject } from 'vue' import { type VKey } from '@idux/cdk/utils' import { IxDivider } from '@idux/components/divider' diff --git a/scripts/gen/generate.ts b/scripts/gen/generate.ts index c2b03d82b..b4fa5d5d8 100644 --- a/scripts/gen/generate.ts +++ b/scripts/gen/generate.ts @@ -23,6 +23,7 @@ import { getIndexTemplate, getLessTemplate, getTestTemplate, + getThemeTemplate, getThemesIndexTemplate, getThemesTemplate, getThemesVariableTemplate, @@ -160,8 +161,8 @@ class Generate { writeFile(resolve(this.dirPath, 'docs', 'Index.en.md'), getDocsTemplate(category, compName, type, true)), writeFile(resolve(this.dirPath, 'docs', 'Api.zh.md'), getAPITemplate(category, compName)), writeFile(resolve(this.dirPath, 'docs', 'Api.en.md'), getAPITemplate(category, compName, true)), - writeFile(resolve(this.dirPath, 'docs', 'Theme.zh.md'), ''), - writeFile(resolve(this.dirPath, 'docs', 'Theme.en.md'), ''), + writeFile(resolve(this.dirPath, 'docs', 'Theme.zh.md'), getThemeTemplate()), + writeFile(resolve(this.dirPath, 'docs', 'Theme.en.md'), getThemeTemplate(true)), writeFile(resolve(this.dirPath, 'docs', 'Design.zh.md'), getDesignTemplate()), writeFile(resolve(this.dirPath, 'docs', 'Design.en.md'), getDesignTemplate(true)), writeFile(resolve(this.dirPath, 'demo', 'Basic.md'), getDemoTemplate()), @@ -196,13 +197,16 @@ class Generate { if (!this.isPrivate) { const currIndexPath = resolve(this.packageRoot, 'index.ts') let currIndexContent = await readFile(currIndexPath, 'utf-8') - currIndexContent += `\nimport { Ix${compName} } from '@idux/${category}/${kebabCase(name)}'` + currIndexContent += ` +import { Ix${compName} } from '@idux/${category}/${kebabCase(name)}' +export * from '@idux/${category}/${kebabCase(name)}' +` tasks.push(writeFile(currIndexPath, currIndexContent)) const typesPath = resolve(this.packageRoot, 'types.d.ts') let typesContent = await readFile(typesPath, 'utf-8') - typesContent += `\nimport { ${compName}Component } from '@idux/${category}/${kebabCase(name)}'` + typesContent += `\nimport type { ${compName}Component } from '@idux/${category}/${kebabCase(name)}'\n` tasks.push(writeFile(typesPath, typesContent)) } diff --git a/scripts/gen/template.ts b/scripts/gen/template.ts index 4848ed277..fe0344cb5 100644 --- a/scripts/gen/template.ts +++ b/scripts/gen/template.ts @@ -123,8 +123,7 @@ describe('use${compName}.ts', () => { } export function getAPITemplate(moduleName: string, compName: string, isEn = false): string { - return `--- -## API + return `## API ### Ix${compName} @@ -152,6 +151,23 @@ ${isEn ? '| Name | Description | Parameter Type | Remark |' : '| 名称 | 说明 ` } +export function getThemeTemplate(isEn = false): string { + if (isEn) { + return `## Theme variables + +| name | default | seer | mark | +| --- | --- | --- | --- | +| - | - | - | - | +` + } + return `## 主题变量 + +| 名称 | default | seer | 备注 | +| --- | --- | --- | --- | +| - | - | - | - | +` +} + export function getDocsTemplate(moduleName: string, compName: string, type = '', isEn = false): string { const [enType, zhType] = type.split('_') return `--- diff --git a/vitest.config.ts b/vitest.config.ts index e2589b7aa..bac9155c8 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -13,8 +13,6 @@ import vueJsxPlugin from '@vitejs/plugin-vue-jsx' import { defineConfig } from 'vitest/config' export default defineConfig({ - root: resolve(__dirname, './packages'), - plugins: [vuePlugin({ include: [/\.vue$/, /\.md$/] }), vueJsxPlugin({ enableObjectSlots: false })], resolve: { @@ -35,13 +33,12 @@ export default defineConfig({ coverage: { enabled: true, reporter: ['json', 'lcov', 'cobertura'], - excludeNodeModules: true, - include: ['packages/**/src/*.{ts,tsx}'], + include: ['**/src/*.{ts,tsx}'], exclude: [], }, reporters: ['default'], // 如果要测试单目录，可以修改这个配置 - include: ['packages/**/__tests__/*.spec.{ts,tsx}'], + include: ['**/__tests__/*.spec.{ts,tsx}'], }, define: {