Mark version 6.11.0

marijnh · marijnh · commit 202a670d909e · 2025-03-13T14:59:31.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 6.11.0 (2025-03-13)
+
+### New features
+
+Stream parsers now support a `mergeTokens` option that can be used to turn off automatic merging of adjacent tokens.
+
 ## 6.10.8 (2024-12-23)
 
 ### Bug fixes
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@codemirror/language",
-  "version": "6.10.8",
+  "version": "6.11.0",
   "description": "Language support infrastructure for the CodeMirror code editor",
   "scripts": {
     "test": "cm-runtests",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@codemirror/language",`
`3`		`- "version": "6.10.8",`
	`3`	`+ "version": "6.11.0",`
`4`	`4`	`"description": "Language support infrastructure for the CodeMirror code editor",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"test": "cm-runtests",`