diff --git a/.eslintrc.js b/.eslintrc.js index 379a93b10..abb291fd3 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -116,6 +116,7 @@ module.exports = { 'prettier/prettier': ['error', prettierConfig], // ts + '@typescript-eslint/ban-ts-comment': 'off', '@typescript-eslint/brace-style': ['error', '1tbs'], '@typescript-eslint/explicit-module-boundary-types': 'error', '@typescript-eslint/member-delimiter-style': [ diff --git a/package.json b/package.json index 77a62d59b..02423a06d 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "clean": "lerna run clean && rimraf coverage dist node_modules pnpm-lock.yaml", "start": "gulp start --cwd ./packages/site --gulpfile ./scripts/gulp/gulpfile.ts", "build": "npm-run-all -s build:clean -p build:lib build:declaration build:style build:site", + "build:package": "npm-run-all -s build:clean -p build:lib build:declaration build:style", "build:pre-version": "npm-run-all -s build:clean -p build:lib build:declaration build:style build:site-pre-version", "build:clean": "gulp build:clean --gulpfile ./scripts/gulp/gulpfile.ts", "build:lib": "gulp build:lib --gulpfile ./scripts/gulp/gulpfile.ts", @@ -17,6 +18,8 @@ "build:site-pre-version": "gulp build:site-pre-version --cwd ./packages/site --gulpfile ./scripts/gulp/gulpfile.ts", "icons": "gulp icons --gulpfile ./scripts/gulp/gulpfile.ts", "gen": "ts-node scripts/gen/generate.ts", + "theme:update": "ts-node scripts/gen/theme/run.ts", + "colors:update": "ts-node scripts/gen/colors/run.ts", "lessvariable:update": "ts-node scripts/gen/style-variable/update.ts", "prepare": "husky install", "preinstall": "npx only-allow pnpm", @@ -105,12 +108,14 @@ "figlet": "^1.6.0", "fs-extra": "^10.1.0", "gulp": "^4.0.2", + "happy-dom": "^12.10.3", "husky": "^8.0.3", "inquirer": "^8.2.6", "jsdom": "^20.0.3", "lerna": "^7.2.0", "less": "^4.2.0", "lint-staged": "^13.3.0", + "lodash": "^4.17.21", "lodash-es": "^4.17.21", "markdownlint-cli": "^0.32.2", "marked": "^4.3.0", @@ -135,6 +140,7 @@ "typescript": "^4.9.5", "unplugin-vue-components": "^0.22.12", "vite": "^4.4.9", + "vite-node": "^0.34.6", "vite-plugin-chunk-split": "^0.4.7", "vite-plugin-static-copy": "^0.9.0", "vitest": "^0.24.5", diff --git a/packages/cdk/a11y/demo/FocusMonitor.vue b/packages/cdk/a11y/demo/FocusMonitor.vue index 3b425bda6..53e277e4e 100644 --- a/packages/cdk/a11y/demo/FocusMonitor.vue +++ b/packages/cdk/a11y/demo/FocusMonitor.vue @@ -52,23 +52,23 @@ onBeforeUnmount(() => { diff --git a/packages/cdk/popper/demo/Placement.vue b/packages/cdk/popper/demo/Placement.vue index fd3b52ebb..ec28ab6a7 100644 --- a/packages/cdk/popper/demo/Placement.vue +++ b/packages/cdk/popper/demo/Placement.vue @@ -49,8 +49,8 @@ export default defineComponent({ diff --git a/packages/components/_private/collapse-transition/style/index.less b/packages/components/_private/collapse-transition/style/index.less index a675e71e8..36a7e436d 100644 --- a/packages/components/_private/collapse-transition/style/index.less +++ b/packages/components/_private/collapse-transition/style/index.less @@ -1,3 +1,4 @@ +@import '../../../style/variable/index.less'; .@{collapse-transition-prefix} { &-enter-active, &-leave-active { @@ -6,12 +7,12 @@ } &-enter-active { - transition-duration: var(--ix-transition-duration-slow); - transition-timing-function: var(--ix-ease-out-quint); + transition-duration: var(--ix-motion-duration-slow); + transition-timing-function: var(--ix-motion-ease-out-quint); } &-leave-active { - transition-duration: var(--ix-transition-duration-medium); - transition-timing-function: var(--ix-ease-out-quint); + transition-duration: var(--ix-motion-duration-medium); + transition-timing-function: var(--ix-motion-ease-out-quint); } } diff --git a/packages/components/_private/collapse-transition/style/index.ts b/packages/components/_private/collapse-transition/style/index.ts new file mode 100644 index 000000000..1526e4dff --- /dev/null +++ b/packages/components/_private/collapse-transition/style/index.ts @@ -0,0 +1 @@ +import './index.less' diff --git a/packages/components/_private/collapse-transition/style/themes/default.less b/packages/components/_private/collapse-transition/style/themes/default.less deleted file mode 100644 index ff538d50b..000000000 --- a/packages/components/_private/collapse-transition/style/themes/default.less +++ /dev/null @@ -1,4 +0,0 @@ -@import '../../../../style/themes/default.less'; -@import './default.variable.less'; - -@import '../index.less'; diff --git a/packages/components/_private/collapse-transition/style/themes/default.ts b/packages/components/_private/collapse-transition/style/themes/default.ts deleted file mode 100644 index 8572b839e..000000000 --- a/packages/components/_private/collapse-transition/style/themes/default.ts +++ /dev/null @@ -1 +0,0 @@ -import './default.less' diff --git a/packages/components/_private/collapse-transition/style/themes/default.variable.less b/packages/components/_private/collapse-transition/style/themes/default.variable.less deleted file mode 100644 index 4e18f5388..000000000 --- a/packages/components/_private/collapse-transition/style/themes/default.variable.less +++ /dev/null @@ -1 +0,0 @@ -// _private diff --git a/packages/components/_private/collapse-transition/style/themes/seer.less b/packages/components/_private/collapse-transition/style/themes/seer.less deleted file mode 100644 index 232fa6955..000000000 --- a/packages/components/_private/collapse-transition/style/themes/seer.less +++ /dev/null @@ -1,4 +0,0 @@ -@import '../../../../style/themes/seer.less'; -@import './seer.variable.less'; - -@import '../index.less'; diff --git a/packages/components/_private/collapse-transition/style/themes/seer.ts b/packages/components/_private/collapse-transition/style/themes/seer.ts deleted file mode 100644 index 1caeb714f..000000000 --- a/packages/components/_private/collapse-transition/style/themes/seer.ts +++ /dev/null @@ -1 +0,0 @@ -import './seer.less' diff --git a/packages/components/_private/collapse-transition/style/themes/seer.variable.less b/packages/components/_private/collapse-transition/style/themes/seer.variable.less deleted file mode 100644 index 498793af1..000000000 --- a/packages/components/_private/collapse-transition/style/themes/seer.variable.less +++ /dev/null @@ -1 +0,0 @@ -@import './default.variable.less'; diff --git a/packages/components/_private/date-panel/src/DatePanel.tsx b/packages/components/_private/date-panel/src/DatePanel.tsx index 51110870f..84b80239e 100644 --- a/packages/components/_private/date-panel/src/DatePanel.tsx +++ b/packages/components/_private/date-panel/src/DatePanel.tsx @@ -8,6 +8,7 @@ import { computed, defineComponent, provide } from 'vue' import { useDateConfig, useGlobalConfig } from '@idux/components/config' +import { useThemeToken } from '@idux/components/theme' import { useActiveDate } from './composables/useActiveDate' import { useActiveType } from './composables/useActiveType' @@ -22,6 +23,8 @@ export default defineComponent({ props: datePanelProps, setup(props, { slots }) { const common = useGlobalConfig('common') + const { globalHashId } = useThemeToken() + const locale = useGlobalConfig('locale') const mergedPrefixCls = computed(() => `${common.prefixCls}-date-panel`) const dateConfig = useDateConfig() @@ -47,7 +50,7 @@ export default defineComponent({ return () => { const prefixCls = mergedPrefixCls.value return ( -