Merge branch 'main' into renovate/html-webpack-plugin-5.x-lockfile

Cargo.toml

@@ -7,7 +7,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 readme = "README.md"
-repository = "https://github.com/schmelczer/reconcile"
+repository = "https://git.schmelczer.dev/andras/reconcile"
 homepage = "https://schmelczer.dev/reconcile"
 keywords = ["merge", "OT", "CRDT", "3-way", "diff"]
 categories = ["wasm", "text-processing", "text-editors", "algorithms", "data-structures"]

README.md

@@ -6,6 +6,8 @@ A Rust, TypeScript, and Python library for merging conflicting text edits withou
 
 ✨ **[Try the interactive demo][8]** to see it in action!
 
+> Or read my [blog post](https://schmelczer.dev/articles/reconcile-text-3-way-merge/) on it!
+
 ### Install it in your project
 
 - `cargo add reconcile-text` ([reconcile-text on crates.io][9])

examples/website/package.json

@@ -9,18 +9,18 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/schmelczer/reconcile.git"
+    "url": "git+https://git.schmelczer.dev/andras/reconcile.git"
   },
   "keywords": [],
   "author": "Andras Schmelczer",
   "license": "GPL-3.0-or-later",
   "bugs": {
-    "url": "https://github.com/schmelczer/reconcile/issues"
+    "url": "https://git.schmelczer.dev/andras/reconcile/issues"
   },
   "browserslist": [
     "defaults"
   ],
-  "homepage": "https://github.com/schmelczer/reconcile#readme",
+  "homepage": "https://git.schmelczer.dev/andras/reconcile#readme",
   "devDependencies": {
     "copy-webpack-plugin": "^14.0.0",
     "css-loader": "^7.1.4",

examples/website/src/index.html

@@ -49,7 +49,7 @@
             (or more specifically, <code>git merge</code>), but with intelligent conflict
             resolution that requires no user intervention. The
             <a
-              href="https://github.com/schmelczer/reconcile"
+              href="https://git.schmelczer.dev/andras/reconcile"
               target="_blank"
               rel="noopener noreferrer"
               >reconcile-text</a
@@ -80,7 +80,7 @@
           <p>
             Ready to dive deeper? Check out the
             <a
-              href="https://github.com/schmelczer/reconcile"
+              href="https://git.schmelczer.dev/andras/reconcile"
               target="_blank"
               rel="noopener noreferrer"
               >documentation</a
@@ -245,7 +245,7 @@
               </svg>
             </a>
             <a
-              href="https://github.com/schmelczer/reconcile"
+              href="https://git.schmelczer.dev/andras/reconcile"
               target="_blank"
               rel="noopener noreferrer"
               aria-label="GitHub repository"

reconcile-js/package.json

@@ -19,10 +19,10 @@
   "homepage": "https://schmelczer.dev/reconcile/",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/schmelczer/reconcile.git"
+    "url": "git+https://git.schmelczer.dev/andras/reconcile.git"
   },
   "bugs": {
-    "url": "https://github.com/schmelczer/reconcile/issues",
+    "url": "https://git.schmelczer.dev/andras/reconcile/issues",
     "email": "andras@schmelczer.dev"
   },
   "author": "András Schmelczer <andras@schmelczer.dev>",

reconcile-python/pyproject.toml

@@ -25,8 +25,8 @@ dev = ["maturin>=1.0,<2.0", "pytest>=8", "ruff>=0.15", "pyright>=1"]
 
 [project.urls]
 Homepage = "https://schmelczer.dev/reconcile"
-Repository = "https://github.com/schmelczer/reconcile"
+Repository = "https://git.schmelczer.dev/andras/reconcile"
-Issues = "https://github.com/schmelczer/reconcile/issues"
+Issues = "https://git.schmelczer.dev/andras/reconcile/issues"
 
 [tool.maturin]
 manifest-path = "Cargo.toml"

src/lib.rs

@@ -208,7 +208,7 @@
 //! ## Algorithm overview
 //!
 //! For detailed algorithm explanation, see the
-//! [README](https://github.com/schmelczer/reconcile/blob/main/README.md#how-it-works).
+//! [README](https://git.schmelczer.dev/andras/reconcile/blob/main/README.md#how-it-works).
 
 mod operation_transformation;
 mod raw_operation;