Merge branch 'develop' into beta

imzbf · Jul 2, 2024 · 3d3c5eb · 3d3c5eb
2 parents 679d538 + dfcd47f
commit 3d3c5eb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/package.json b/package.json
@@ -90,21 +90,19 @@
     "vite": "^5.2.10",
     "vite-plugin-dts": "^3.8.3"
   },
+  "peerDependencies": {
+    "react": ">=16.9.0",
+    "react-dom": ">=16.9.0"
+  },
+  "resolutions": {
+    "@codemirror/view": "6.27.0"
+  },
   "prettier": {
     "singleQuote": true,
     "trailingComma": "none",
     "semi": true,
     "printWidth": 90,
     "proseWrap": "never",
     "endOfLine": "auto"
-  },
-  "peerDependencies": {
-    "react": ">=16.9.0",
-    "react-dom": ">=16.9.0"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not dead"
-  ]
+  }
 }
diff --git a/yarn.lock b/yarn.lock
@@ -648,10 +648,10 @@
   resolved "https://registry.npmjs.org/@codemirror/state/-/state-6.4.1.tgz#da57143695c056d9a3c38705ed34136e2b68171b"
   integrity sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A==
 
-"@codemirror/view@^6.0.0", "@codemirror/view@^6.17.0", "@codemirror/view@^6.23.0":
-  version "6.26.1"
-  resolved "https://registry.npmjs.org/@codemirror/view/-/view-6.26.1.tgz#ab99cf35c576bc65f5804ab49db730b65c3fad3f"
-  integrity sha512-wLw0t3R9AwOSQThdZ5Onw8QQtem5asE7+bPlnzc57eubPqiuJKIzwjMZ+C42vQett+iva+J8VgFV4RYWDBh5FA==
+"@codemirror/view@6.27.0", "@codemirror/view@^6.0.0", "@codemirror/view@^6.17.0", "@codemirror/view@^6.23.0":
+  version "6.27.0"
+  resolved "https://registry.npmjs.org/@codemirror/view/-/view-6.27.0.tgz#829882b171106bc50b4f17b7e5d2f7277832c92f"
+  integrity sha512-8kqX1sHbVW1lVzWwrjAbh4dR7eKhV8eIQ952JKaBXOoXE04WncoqCy4DMU701LSrPZ3N2Q4zsTawz7GQ+2mrUw==
   dependencies:
     "@codemirror/state" "^6.4.0"
     style-mod "^4.1.0"