Browse Source

Merge branch 'main' of https://github.com/xingyu4j/vue-vben-admin into deps

pull/6937/head
xingyu4j 3 months ago
parent
commit
273f3cbaf8
  1. 3
      package.json
  2. 1
      packages/@core/base/shared/package.json
  3. 7
      packages/@core/base/shared/src/utils/index.ts
  4. 583
      pnpm-lock.yaml
  5. 2
      pnpm-workspace.yaml

3
package.json

@ -113,7 +113,8 @@
"clsx": "catalog:",
"esbuild": "0.25.3",
"pinia": "catalog:",
"vue": "catalog:"
"vue": "catalog:",
"jiti": "^2.6.1"
},
"neverBuiltDependencies": [
"canvas",

1
packages/@core/base/shared/package.json

@ -86,6 +86,7 @@
"dayjs": "catalog:",
"defu": "catalog:",
"es-toolkit": "catalog:",
"lodash.clonedeep": "catalog:",
"nprogress": "catalog:",
"tailwind-merge": "catalog:",
"theme-colors": "catalog:"

7
packages/@core/base/shared/src/utils/index.ts

@ -16,8 +16,5 @@ export * from './update-css-variables';
export * from './util';
export * from './window';
export { get, isEqual, set } from 'es-toolkit/compat';
export { cloneDeep } from 'es-toolkit/object';
// export { default as cloneDeep } from 'lodash.clonedeep';
// export { default as get } from 'lodash.get';
// export { default as isEqual } from 'lodash.isequal';
// export { default as set } from 'lodash.set';
// export { cloneDeep } from 'es-toolkit/object';
export { default as cloneDeep } from 'lodash.clonedeep';

583
pnpm-lock.yaml

File diff suppressed because it is too large

2
pnpm-workspace.yaml

@ -193,5 +193,5 @@ catalog:
vxe-table: ^4.17.14
watermark-js-plus: ^1.6.2
zod: ^3.25.67
zod-defaults: ^0.1.3
zod-defaults: 0.1.3
es-toolkit: ^1.41.0

Loading…
Cancel
Save