From 049bd32dce18ec794af1400281975e2ab73362f7 Mon Sep 17 00:00:00 2001
From: Zihua Li <i@zihua.li>
Date: Tue, 16 Jan 2024 22:31:48 +0800
Subject: [PATCH 1/3] Upgrade Parchment

---
 package-lock.json           | 9 ++++-----
 packages/quill/package.json | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b1e930f3b1..ca739c34cc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19146,10 +19146,9 @@
       }
     },
     "node_modules/parchment": {
-      "version": "3.0.0-alpha.1",
-      "resolved": "git+ssh://git@github.com/quilljs/parchment.git#9d148df41cc3d62ab07c25ebcead46a3d513d2c6",
-      "integrity": "sha512-kfi1efkh2AOqw7AnlwD9IBgw3tTHW8auDfVtz7jjgARuK/jg8RXN2gFTAuaNnjXHuXzNaWFmv9slTz96G90YNg==",
-      "license": "BSD-3-Clause"
+      "version": "3.0.0-alpha.2",
+      "resolved": "https://registry.npmjs.org/parchment/-/parchment-3.0.0-alpha.2.tgz",
+      "integrity": "sha512-r/DoIj7e8efiTWUg+BHUlolpdE9/iNVtcFg8i7SvdlF7a7fgTAAwcXrpamNrf49IsGykyDcsfUZKGFVwMXZcyg=="
     },
     "node_modules/parent-module": {
       "version": "1.0.1",
@@ -26418,7 +26417,7 @@
       "dependencies": {
         "eventemitter3": "^5.0.1",
         "lodash-es": "^4.17.21",
-        "parchment": "github:quilljs/parchment#9d148df41cc3d62ab07c25ebcead46a3d513d2c6",
+        "parchment": "^3.0.0-alpha.2",
         "quill-delta": "^5.1.0"
       },
       "devDependencies": {
diff --git a/packages/quill/package.json b/packages/quill/package.json
index 99913ad803..b6c1828b91 100644
--- a/packages/quill/package.json
+++ b/packages/quill/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "eventemitter3": "^5.0.1",
     "lodash-es": "^4.17.21",
-    "parchment": "github:quilljs/parchment#9d148df41cc3d62ab07c25ebcead46a3d513d2c6",
+    "parchment": "^3.0.0-alpha.2",
     "quill-delta": "^5.1.0"
   },
   "devDependencies": {

From 0ffb00ad380d2f44c06e6634273e035702383c1f Mon Sep 17 00:00:00 2001
From: Zihua Li <i@zihua.li>
Date: Tue, 16 Jan 2024 22:32:46 +0800
Subject: [PATCH 2/3] Remove 'v' prefix from CHANGELOG

---
 CHANGELOG.md       | 3 ++-
 scripts/release.js | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce349acfbd..564d4f5629 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,8 +3,9 @@
 - Fix syntax label from "Javascript" to "JavaScript".
 - Fix typing errors for emitter.
 - Inline SVG images for easier bundler setup.
+- Improve typing for Registry.
 
-# v2.0.0-beta.0
+# 2.0.0-beta.0
 
 In the upcoming 2.0 release, Quill has been significantly modernized. Leveraging the latest browser-supported APIs, Quill now delivers a more efficient and reliable editing experience.
 
diff --git a/scripts/release.js b/scripts/release.js
index c676a9762e..51aaca4f3f 100755
--- a/scripts/release.js
+++ b/scripts/release.js
@@ -97,7 +97,7 @@ const index = changelog.indexOf(UNRELEASED_PLACEHOLDER);
 if (index === -1) {
   exitWithError(`Could not find "${UNRELEASED_PLACEHOLDER}" in CHANGELOG.md`);
 }
-let nextVersionIndex = changelog.indexOf("\n# v", index);
+let nextVersionIndex = changelog.indexOf("\n# ", index);
 if (nextVersionIndex === -1) {
   nextVersionIndex = changelog.length - 1;
 }
@@ -110,7 +110,7 @@ fs.writeFileSync(
   "CHANGELOG.md",
   changelog.replace(
     UNRELEASED_PLACEHOLDER,
-    `${UNRELEASED_PLACEHOLDER}\n\n# v${version}`
+    `${UNRELEASED_PLACEHOLDER}\n\n# ${version}`
   )
 );
 

From 3536d8220e2285e571f24be012ca52e90eb2600e Mon Sep 17 00:00:00 2001
From: Zihua Li <i@zihua.li>
Date: Wed, 17 Jan 2024 00:44:23 +0800
Subject: [PATCH 3/3] Remove unnecessary ts comments

---
 packages/quill/src/modules/syntax.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/quill/src/modules/syntax.ts b/packages/quill/src/modules/syntax.ts
index 14daa09415..f1c8b48004 100644
--- a/packages/quill/src/modules/syntax.ts
+++ b/packages/quill/src/modules/syntax.ts
@@ -30,7 +30,6 @@ class CodeToken extends Inline {
   constructor(scroll: ScrollBlot, domNode: Node, value: unknown) {
     // @ts-expect-error
     super(scroll, domNode, value);
-    // @ts-expect-error
     TokenAttributor.add(this.domNode, value);
   }
 
@@ -38,7 +37,6 @@ class CodeToken extends Inline {
     if (format !== CodeToken.blotName) {
       super.format(format, value);
     } else if (value) {
-      // @ts-expect-error
       TokenAttributor.add(this.domNode, value);
     } else {
       TokenAttributor.remove(this.domNode);