fix(preset-theme-default): merge user shortcutOverrides in shortcuts

fixes jd-solanki#41
therealokoro · Dec 30, 2022 · 407862a · 407862a
1 parent a1f46c5
commit 407862a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 17 deletions.
diff --git a/packages/preset-theme-default/build.config.ts b/packages/preset-theme-default/build.config.ts
@@ -14,7 +14,6 @@ export default defineBuildConfig({
   externals: [
     '@unocss/core',
     '@unocss/reset',
-    'defu',
   ],
   hooks: {
     'mkdist:done': () => {

diff --git a/packages/preset-theme-default/package.json b/packages/preset-theme-default/package.json
@@ -43,9 +43,6 @@
     "vuejs",
     "vue"
   ],
-  "dependencies": {
-    "defu": "^6.1.1"
-  },
   "devDependencies": {
     "@types/fs-extra": "^9.0.13",
     "@unocss/core": "^0.45.30",

diff --git a/packages/preset-theme-default/src/index.ts b/packages/preset-theme-default/src/index.ts
@@ -1,5 +1,4 @@
 import type { Preset } from '@unocss/core'
-import { defu } from 'defu'
 import { rules } from './rules'
 import { shortcuts } from './shortcuts'
 import { variants } from './variants'
@@ -15,7 +14,7 @@ interface PresetOptions {
 export const colors = ['primary', 'success', 'info', 'warning', 'danger'] as const
 export type Colors = typeof colors
 
-export function presetThemeDefault(options: PresetOptions = {}): Preset {
+export function presetThemeDefault(options: PresetOptions = {}): Preset {  
   return {
     name: '@anu-vue/preset-theme-default',
     theme: {
@@ -47,9 +46,11 @@ export function presetThemeDefault(options: PresetOptions = {}): Preset {
       ...['top', 'right', 'bottom', 'left'].map(dir => `a-drawer-anchor-${dir}`),
     ],
     rules,
-    shortcuts: options.shortcutOverrides
-      ? defu(options.shortcutOverrides, shortcuts)
-      : shortcuts,
+    shortcuts: options.shortcutOverrides === undefined
+      ? shortcuts
+      : Array.isArray(options.shortcutOverrides)
+        ? [...options.shortcutOverrides, ...shortcuts]
+        : [...Object.entries(options.shortcutOverrides), ...shortcuts],
     variants,
   }
 }
diff --git a/packages/preset-theme-default/src/shortcuts.ts b/packages/preset-theme-default/src/shortcuts.ts
@@ -1,6 +1,6 @@
-import type { Preset } from '@unocss/core'
+import type { Preset, StaticShortcutMap } from '@unocss/core'
 
-const shortcuts: Preset['shortcuts'] = [
+const shortcuts: Exclude<Preset['shortcuts'], undefined | StaticShortcutMap> = [
   // 👉 States
   [/^states:?(\d+)?$/, ([, op]) => `\
       relative \

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml