diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 19480ea330..7172d7d727 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -17,11 +17,15 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Install pnpm + uses: pnpm/action-setup@v2 + with: + version: 6 - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v2 with: node-version: ${{ matrix.node-version }} - cache: 'yarn' - - run: yarn - - run: yarn build + cache: 'pnpm' + - run: pnpm i + - run: pnpm build # - run: yarn test diff --git a/.gitignore b/.gitignore index d8963337f9..19dc38196f 100644 --- a/.gitignore +++ b/.gitignore @@ -6,8 +6,8 @@ build lib types *.local -pnpm-lock.yaml package-lock.json +yarn.lock yarn-error.log .history .vscode @@ -16,4 +16,3 @@ packages/devui-vue/devui/vue-devui.ts packages/devui-vue/devui/theme/theme.scss packages/devui-vue/docs/.vitepress/config/sidebar.ts packages/devui-vue/docs/.vitepress/config/enSidebar.ts -yarn.lock diff --git a/lerna.json b/lerna.json deleted file mode 100644 index 793042fdd1..0000000000 --- a/lerna.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "packages": [ - "packages/*" - ], - "version": "0.0.0", - "npmClient": "yarn", - "useWorkspaces": true -} diff --git a/package.json b/package.json index f6b9845dd9..c4de1712a0 100644 --- a/package.json +++ b/package.json @@ -2,17 +2,18 @@ "name": "root", "private": true, "scripts": { - "dev": "lerna exec --scope vue-devui yarn dev", - "build": "lerna exec --scope vue-devui yarn build", - "build:lib": "lerna exec --scope vue-devui yarn build:lib", - "build:cli": "lerna exec --scope @devui/cli yarn build", + "dev": "pnpm dev --filter vue-devui", + "build": "pnpm build --filter vue-devui", + "build:lib": "pnpm build:lib --filter vue-devui", + "build:cli": "pnpm build --filter @devui/cli", "prepare": "husky install", "precommit": "lint-staged", "lint:fix": "eslint --fix \"{packages}/**/*.{vue,js,ts,jsx,tsx}\"", "stylelint": "stylelint --fix \"{packages}/**/*.{scss,css}\"", - "test": "lerna exec --scope vue-devui yarn test" + "test": "pnpm test --filter vue-devui" }, "devDependencies": { + "@commitlint/cli": "^11.0.0", "@ls-lint/ls-lint": "^1.10.0", "all-contributors-cli": "^6.20.0", "esbuild-register": "^2.6.0", @@ -20,16 +21,12 @@ "eslint-plugin-import": "^2.24.2", "eslint-plugin-vue": "^7.11.1", "husky": "^7.0.4", - "lerna": "^4.0.0", "lint-staged": "^11.0.0", "stylelint": "^13.13.1", "stylelint-config-recommended-scss": "^4.3.0", "stylelint-config-standard": "^22.0.0", "stylelint-scss": "^3.20.1" }, - "workspaces": [ - "packages/*" - ], "lint-staged": { ".{js,ts,jsx,tsx,vue}": "eslint --fix", ".{scss,css}": "stylelint --fix" diff --git a/packages/devui-vue/.yarnrc b/packages/devui-vue/.yarnrc deleted file mode 100644 index f4074f57d7..0000000000 --- a/packages/devui-vue/.yarnrc +++ /dev/null @@ -1 +0,0 @@ -registry "https://registry.npm.taobao.org" \ No newline at end of file diff --git a/packages/devui-vue/devui/cascader/hooks/use-cascader-item.ts b/packages/devui-vue/devui/cascader/hooks/use-cascader-item.ts index 603d7b4a09..de4a70fbe0 100644 --- a/packages/devui-vue/devui/cascader/hooks/use-cascader-item.ts +++ b/packages/devui-vue/devui/cascader/hooks/use-cascader-item.ts @@ -1,7 +1,7 @@ /** * 处理cascader-item中需要的参数 */ -import { cloneDeep } from 'lodash-es' +import { cloneDeep } from 'lodash' import { ref, reactive, Ref } from 'vue' import { CascaderProps, UseCascaderItemCallback, CascaderItem } from '../src/cascader-types' diff --git a/packages/devui-vue/devui/cascader/src/cascader.tsx b/packages/devui-vue/devui/cascader/src/cascader.tsx index a0e87f10ed..4ff039a2ea 100644 --- a/packages/devui-vue/devui/cascader/src/cascader.tsx +++ b/packages/devui-vue/devui/cascader/src/cascader.tsx @@ -1,5 +1,5 @@ // 公共库 -import { cloneDeep } from 'lodash-es' +import { cloneDeep } from 'lodash' import { defineComponent, ref, Ref, reactive, watch, toRef } from 'vue' // 组件 diff --git a/packages/devui-vue/devui/color-picker/src/components/color-history/color-history.tsx b/packages/devui-vue/devui/color-picker/src/components/color-history/color-history.tsx index 2ce842c1a2..f9c0ed30ee 100644 --- a/packages/devui-vue/devui/color-picker/src/components/color-history/color-history.tsx +++ b/packages/devui-vue/devui/color-picker/src/components/color-history/color-history.tsx @@ -4,7 +4,7 @@ import { Icon } from '../../../../icon' import './color-history.scss' import { fromHexa } from '../../utils/color-utils' import { provideColorOptions, ColorPickerColor } from '../../utils/color-utils-types' -import { debounce } from 'lodash-es' +import { debounce } from 'lodash' const STORAGE_KEY = 'STORAGE_COLOR_PICKER_HISTORY_KEY' const MAX_HISOTRY_COUNT = 8 diff --git a/packages/devui-vue/devui/form/src/directive/d-validate-rules.ts b/packages/devui-vue/devui/form/src/directive/d-validate-rules.ts index f8f08980f0..da5a360670 100644 --- a/packages/devui-vue/devui/form/src/directive/d-validate-rules.ts +++ b/packages/devui-vue/devui/form/src/directive/d-validate-rules.ts @@ -1,6 +1,6 @@ import AsyncValidator, { RuleItem } from 'async-validator'; import { VNode, DirectiveBinding } from 'vue'; -import { debounce } from 'lodash-es'; +import { debounce } from 'lodash'; import { EventBus, isObject, hasKey } from '../util'; import './style.scss'; diff --git a/packages/devui-vue/devui/form/src/form-control/form-control.tsx b/packages/devui-vue/devui/form/src/form-control/form-control.tsx index c9907d3bd7..263d68d0d9 100644 --- a/packages/devui-vue/devui/form/src/form-control/form-control.tsx +++ b/packages/devui-vue/devui/form/src/form-control/form-control.tsx @@ -1,5 +1,5 @@ import { defineComponent, inject, ref, computed, reactive, onMounted, Teleport } from 'vue'; -import { uniqueId } from 'lodash-es'; +import { uniqueId } from 'lodash'; import { IForm, formControlProps, formInjectionKey } from '../form-types'; import { ShowPopoverErrorMessageEventData } from '../directive/d-validate-rules' import clickoutsideDirective from '../../../shared/devui-directive/clickoutside' diff --git a/packages/devui-vue/devui/nav-sprite/src/nav-sprite.tsx b/packages/devui-vue/devui/nav-sprite/src/nav-sprite.tsx index 378e15c6b1..77a02c2f00 100644 --- a/packages/devui-vue/devui/nav-sprite/src/nav-sprite.tsx +++ b/packages/devui-vue/devui/nav-sprite/src/nav-sprite.tsx @@ -1,4 +1,4 @@ -import { defineComponent } from '@vue/runtime-core'; +import { defineComponent } from 'vue'; import { navSpriteProps } from './nav-sprite-types'; export default defineComponent({ diff --git a/packages/devui-vue/devui/quadrant-diagram/src/components/axis/index.tsx b/packages/devui-vue/devui/quadrant-diagram/src/components/axis/index.tsx index b4b25b9f80..8929a29847 100644 --- a/packages/devui-vue/devui/quadrant-diagram/src/components/axis/index.tsx +++ b/packages/devui-vue/devui/quadrant-diagram/src/components/axis/index.tsx @@ -2,7 +2,7 @@ import { defineComponent, toRefs, onMounted, ExtractPropTypes, reactive, ref, wa import { IViewConfigs, IAxisConfigs } from '../../../type' import { AXIS_TITLE_SPACE } from '../../../config' import { quadrantDiagramAxisProps, QuadrantDiagramAxisProps } from './types' -import { debounce } from 'lodash-es' +import { debounce } from 'lodash' import './index.scss' diff --git a/packages/devui-vue/devui/search/src/hooks/use-search-keydown.ts b/packages/devui-vue/devui/search/src/hooks/use-search-keydown.ts index c3b73f92ed..fab596c393 100644 --- a/packages/devui-vue/devui/search/src/hooks/use-search-keydown.ts +++ b/packages/devui-vue/devui/search/src/hooks/use-search-keydown.ts @@ -3,7 +3,7 @@ */ import { SetupContext, Ref, } from 'vue' import { KeydownReturnTypes } from '../search-types' -import { debounce } from 'lodash-es' +import { debounce } from 'lodash' const KEYS_MAP = { enter: 'Enter' } as const diff --git a/packages/devui-vue/devui/toast/src/toast.tsx b/packages/devui-vue/devui/toast/src/toast.tsx index 59295e0c3f..c6600dd7b4 100644 --- a/packages/devui-vue/devui/toast/src/toast.tsx +++ b/packages/devui-vue/devui/toast/src/toast.tsx @@ -4,7 +4,7 @@ import { computed, defineComponent, nextTick, onUnmounted, ref, watch } from 'vu import { Message, ToastProps, toastProps } from './toast-types' import ToastIconClose from './toast-icon-close' import ToastImage from './toast-image' -import { cloneDeep, isEqual, merge, omit, throttle } from 'lodash-es' +import { cloneDeep, isEqual, merge, omit, throttle } from 'lodash' import { useToastEvent } from './hooks/use-toast-event' import { useToastHelper } from './hooks/use-toast-helper' import { useToastConstant } from './hooks/use-toast-constant' diff --git a/packages/devui-vue/devui/tree/src/composables/use-draggable.ts b/packages/devui-vue/devui/tree/src/composables/use-draggable.ts index f653358294..0089d14e84 100644 --- a/packages/devui-vue/devui/tree/src/composables/use-draggable.ts +++ b/packages/devui-vue/devui/tree/src/composables/use-draggable.ts @@ -1,7 +1,7 @@ import { reactive, ref, watch } from 'vue' import type { Ref } from 'vue' import { TreeItem, IDropType, Nullable } from '../tree-types' -import { cloneDeep } from 'lodash-es' +import { cloneDeep } from 'lodash' const ACTIVE_NODE = 'devui-tree-node__content--value-wrapper' interface DragState { diff --git a/packages/devui-vue/docs/.vitepress/devui-theme/components/BackToTop.vue b/packages/devui-vue/docs/.vitepress/devui-theme/components/BackToTop.vue index e0c580acf7..9027ab995c 100644 --- a/packages/devui-vue/docs/.vitepress/devui-theme/components/BackToTop.vue +++ b/packages/devui-vue/docs/.vitepress/devui-theme/components/BackToTop.vue @@ -31,7 +31,7 @@