Merge pull request samwarnick#50 from NomarCub/cm-migration

CM migration

Author: samwarnick

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+# [1.12.1]
+
+### Fixed
+
+- Migrated to CodeMirror 6.0 required in Obsidian v0.15.
+
 # [1.12.0]
 
 ### Added

manifest.json

@@ -1,8 +1,8 @@
 {
   "id": "simple-embeds",
   "name": "Simple Embeds",
-  "version": "1.12.0",
-  "minAppVersion": "0.13.8",
+  "version": "1.12.1",
+  "minAppVersion": "0.15.0",
   "description": "Replaces links, like Twitter and YouTube, with embeds when previewing a file.",
   "author": "Sam Warnick",
   "authorUrl": "https://github.com/samwarnick",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "simple-embeds",
-  "version": "1.12.0",
+  "version": "1.12.1",
   "description": "Searches for Twitter and YouTube links and replaces them with embeds when previewed.",
   "main": "main.js",
   "scripts": {
@@ -12,24 +12,15 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "@codemirror/commands": "^0.19.0",
-    "@codemirror/fold": "0.19.0",
-    "@codemirror/history": "^0.19.0",
-    "@codemirror/language": "^0.19.0",
-    "@codemirror/matchbrackets": "^0.19.0",
-    "@codemirror/panel": "^0.19.0",
-    "@codemirror/rangeset": "^0.19.0",
-    "@codemirror/search": "^0.19.0",
-    "@codemirror/state": "^0.19.0",
-    "@codemirror/stream-parser": "https://github.com/lishid/stream-parser",
-    "@codemirror/view": "^0.19.0",
+    "@codemirror/state": "^6.0.0",
+    "@codemirror/view": "^6.0.0",
     "@rollup/plugin-commonjs": "^18.0.0",
     "@rollup/plugin-node-resolve": "^11.2.1",
     "@rollup/plugin-typescript": "^8.2.1",
     "@types/jest": "^27.0.2",
     "@types/node": "^14.14.37",
     "jest": "^27.3.1",
-    "obsidian": "^0.13.0",
+    "obsidian": "^0.15.0",
     "rollup": "^2.32.1",
     "rollup-plugin-import-css": "^3.0.3",
     "ts-jest": "^27.0.7",

rollup.config.js

@@ -24,29 +24,16 @@ export default {
   external: [
     "obsidian",
     "electron",
-    "codemirror",
     "@codemirror/autocomplete",
-    "@codemirror/closebrackets",
     "@codemirror/collab",
     "@codemirror/commands",
-    "@codemirror/comment",
-    "@codemirror/fold",
-    "@codemirror/gutter",
-    "@codemirror/highlight",
-    "@codemirror/history",
     "@codemirror/language",
     "@codemirror/lint",
-    "@codemirror/matchbrackets",
-    "@codemirror/panel",
-    "@codemirror/rangeset",
-    "@codemirror/rectangular-selection",
     "@codemirror/search",
     "@codemirror/state",
-    "@codemirror/stream-parser",
-    "@codemirror/text",
-    "@codemirror/tooltip",
     "@codemirror/view",
     "@lezer/common",
+    "@lezer/highlight",
     "@lezer/lr",
     ...builtins,
   ],

versions.json

@@ -1,4 +1,5 @@
 {
+  "1.12.1": "0.15.0",
   "1.10.0": "0.13.8",
   "1.0.0": "0.12.0"
 }

view-plugin.ts

@@ -1,4 +1,4 @@
-import { RangeSetBuilder } from "@codemirror/rangeset";
+import { RangeSetBuilder } from "@codemirror/state";
 import {
   Decoration,
   DecorationSet,