update editor dependencies (#230)

* remove playground

* [editor] bake in basic setup instead

* update dependencies

* add changeset

.changeset/sharp-news-cover.md

@@ -0,0 +1,9 @@
+---
+'@orgajs/cm-lang': patch
+'@orgajs/example-editor': patch
+'@orgajs/editor': patch
+'@orgajs/lezer': patch
+'website': patch
+---
+
+update editor dependencies

examples/editor/package.json

@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "devDependencies": {
-    "@codemirror/view": "^6.17.1",
+    "@codemirror/view": "^6.22.0",
     "typescript": "^5.2.2",
     "vite": "^4.4.9"
   },

packages/codemirror-lang/package.json

@@ -28,10 +28,10 @@
     "directory": "packages/cm-lang"
   },
   "dependencies": {
-    "@codemirror/language": "^6.9.0",
+    "@codemirror/language": "^6.9.2",
     "@orgajs/lezer": "workspace:^"
   },
   "devDependencies": {
-    "@lezer/common": "^1.1.0"
+    "@lezer/common": "^1.1.1"
   }
 }

packages/editor/lib/editor.js

@@ -11,10 +11,9 @@
  * @property {boolean} [dark=false]
  * @property {OnChange} [onChange=() => {}]
  */
-import { EditorView } from '@codemirror/view'
 import { Compartment, EditorState } from '@codemirror/state'
-import { org } from '@orgajs/cm-lang'
-import theme from './theme.js'
+import { EditorView } from '@codemirror/view'
+import { setup } from './setup.js'
 
 /**
  * @param {Config} config
@@ -31,9 +30,8 @@ export function makeEditor(config) {
   const state = EditorState.create({
     doc: content,
     extensions: [
-      org(),
+      setup,
       themeConfig.of(EditorView.theme({}, { dark })),
-      theme,
       extensions,
     ],
   })

packages/editor/lib/index.js

@@ -3,5 +3,4 @@
  */
 
 export { makeEditor } from './editor.js'
-export { battery } from './battery.js'
 export { tags } from '@orgajs/cm-lang'

packages/editor/lib/setup.js

@@ -0,0 +1,28 @@
+import { foldGutter, toggleFold, bracketMatching } from '@codemirror/language'
+import { defaultKeymap } from '@codemirror/commands'
+import { EditorView, highlightActiveLine, keymap } from '@codemirror/view'
+import { cleanup } from './extensions/index.js'
+import { org } from '@orgajs/cm-lang'
+import theme from './theme.js'
+
+const keys = [
+  {
+    key: 'Tab',
+    run: toggleFold,
+  },
+]
+
+export const setup = (() => [
+  org(),
+  theme,
+  keymap.of([...defaultKeymap]),
+  highlightActiveLine(),
+  foldGutter({
+    openText: '▾',
+    closedText: '▸',
+  }),
+  EditorView.lineWrapping,
+  bracketMatching(),
+  cleanup,
+  keymap.of([...defaultKeymap, ...keys]),
+])()

packages/editor/package.json

@@ -38,8 +38,9 @@
   "author": "Xiaoxing Hu <[email protected]>",
   "license": "MIT",
   "dependencies": {
-    "@codemirror/language": "^6.9.0",
-    "@codemirror/view": "^6.17.1",
+    "@codemirror/commands": "^6.3.0",
+    "@codemirror/language": "^6.9.2",
+    "@codemirror/view": "^6.22.0",
     "@orgajs/cm-lang": "workspace:^"
   },
   "devDependencies": {

packages/lezer/package.json

@@ -27,8 +27,8 @@
     "directory": "packages/lezer"
   },
   "dependencies": {
-    "@lezer/common": "^1.0.4",
-    "@lezer/highlight": "^1.1.6",
+    "@lezer/common": "^1.1.1",
+    "@lezer/highlight": "^1.2.0",
     "orga": "workspace:^",
     "unist-util-visit": "^5.0.0"
   },