@slidev/client 0.35.6 → 0.36.2

package/logic/shortcuts.ts

@@ -42,10 +42,10 @@ export function strokeShortcut(key: KeyFilter, fn: Fn) {
 }
 
 export function registerShortcuts() {
-  const { customShortcuts, defaultShortcuts } = setupShortcuts()
+  const allShortcuts = setupShortcuts()
 
   const shortcuts = new Map<string | Ref<Boolean>, ShortcutOptions>(
-    [...defaultShortcuts, ...customShortcuts].map((options: ShortcutOptions) => [options.key, options]),
+    allShortcuts.map((options: ShortcutOptions) => [options.key, options]),
   )
 
   shortcuts.forEach((options) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slidev/client",
-  "version": "0.35.6",
+  "version": "0.36.2",
   "description": "Presentation slides for developers",
   "author": "antfu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -16,13 +16,13 @@
   },
   "dependencies": {
     "@antfu/utils": "^0.5.2",
-    "@slidev/parser": "0.35.6",
-    "@slidev/types": "0.35.6",
-    "@unocss/reset": "^0.45.14",
-    "@vueuse/core": "^9.1.1",
-    "@vueuse/head": "^0.7.9",
-    "@vueuse/math": "^9.1.1",
-    "@vueuse/motion": "^2.0.0-beta.18",
+    "@slidev/parser": "0.36.2",
+    "@slidev/types": "0.36.2",
+    "@unocss/reset": "^0.45.20",
+    "@vueuse/core": "^9.2.0",
+    "@vueuse/head": "^0.7.10",
+    "@vueuse/math": "^9.2.0",
+    "@vueuse/motion": "^2.0.0-beta.22",
     "codemirror": "^5.65.5",
     "defu": "^6.1.0",
     "drauu": "^0.3.1",
@@ -36,14 +36,14 @@
     "prettier": "^2.7.1",
     "recordrtc": "^5.6.2",
     "resolve": "^1.22.1",
-    "unocss": "^0.45.14",
-    "vite-plugin-windicss": "^1.8.7",
-    "vue": "^3.2.38",
+    "unocss": "^0.45.20",
+    "vite-plugin-windicss": "^1.8.8",
+    "vue": "^3.2.39",
     "vue-router": "^4.1.5",
     "vue-starport": "^0.3.0",
     "windicss": "^3.5.6"
   },
   "devDependencies": {
-    "vite": "^3.0.9"
+    "vite": "^3.1.0"
   }
 }

package/setup/shortcuts.ts

@@ -28,7 +28,8 @@ export default function setupShortcuts() {
     showGotoDialog: () => showGotoDialog.value = !showGotoDialog.value,
   }
 
-  const injection_arg_2: ShortcutOptions[] = [
+  // eslint-disable-next-line prefer-const
+  let injection_return: ShortcutOptions[] = [
     { name: 'next_space', key: and(space, not(shift)), fn: next, autoRepeat: true },
     { name: 'prev_space', key: and(space, shift), fn: prev, autoRepeat: true },
     { name: 'next_right', key: and(right, not(shift), not(showOverview)), fn: next, autoRepeat: true },
@@ -50,10 +51,23 @@ export default function setupShortcuts() {
     { name: 'goto_from_overview', key: and(enter, showOverview), fn: () => { go(currentOverviewPage.value); showOverview.value = false } },
   ]
 
-  // eslint-disable-next-line prefer-const
-  let injection_return: Array<ShortcutOptions> = []
+  const baseShortcutNames = new Set(injection_return.map(s => s.name))
+
+  /* __chained_injections__ */
 
-  /* __injections__ */
+  const remainingBaseShortcutNames = injection_return.filter(s => s.name && baseShortcutNames.has(s.name))
+  if (remainingBaseShortcutNames.length === 0) {
+    const message = [
+      '========== WARNING ==========',
+      'defineShortcutsSetup did not return any of the base shortcuts.',
+      'See https://sli.dev/custom/config-shortcuts.html for migration.',
+      'If it is intentional, return at least one shortcut with one of the base names (e.g. name:"goto").',
+    ].join('\n\n')
+    // eslint-disable-next-line no-alert
+    alert(message)
+
+    console.warn(message)
+  }
 
-  return { customShortcuts: injection_return, defaultShortcuts: injection_arg_2 }
+  return injection_return
 }