andras/reconcile
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Bump versions to 0.12.0
Some checks failed
Check / build (push) Successful in 8m51s
Details
Publish / build (push) Successful in 8m16s
Details
Publish / publish-crate (push) Has been skipped
Details
Publish / publish-pypi (push) Failing after 3m39s
Details
Publish / publish-npm (push) Successful in 1m43s
Details

Browse source
This commit is contained in:
Andras Schmelczer 2026-05-31 20:28:49 +01:00
parent a8fbac6934
commit 171045ad66
9 changed files with 24 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -428,7 +428,7 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
[[package]]
name = "reconcile-text"
version = "0.11.0"
version = "0.12.0"
dependencies = [
"console_error_panic_hook",
"diff-match-patch-rs",

2
Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "reconcile-text"
description = "Intelligent 3-way text merging with automated conflict resolution"
version = "0.11.0"
version = "0.12.0"
rust-version = "1.94"
authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
edition = "2024"

15
examples/website/package-lock.json generated
View file

@ -28,11 +28,12 @@
},
"../../reconcile-js": {
"name": "reconcile-text",
"version": "0.11.0",
"version": "0.12.0",
"dev": true,
"license": "MIT",
"devDependencies": {
"@types/jest": "^30.0.0",
"binaryen": "^123.0.0",
"jest": "^30.3.0",
"prettier": "^3.8.1",
"reconcile-text": "file:../pkg",
@ -1135,6 +1136,7 @@
"integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
"dev": true,
"license": "MIT",
"peer": true,
"bin": {
"acorn": "bin/acorn"
},
@ -1175,6 +1177,7 @@
"integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"fast-deep-equal": "^3.1.3",
"fast-uri": "^3.0.1",
@ -1411,6 +1414,7 @@
}
],
"license": "MIT",
"peer": true,
"dependencies": {
"baseline-browser-mapping": "^2.9.0",
"caniuse-lite": "^1.0.30001759",
@ -3976,6 +3980,7 @@
}
],
"license": "MIT",
"peer": true,
"dependencies": {
"nanoid": "^3.3.11",
"picocolors": "^1.1.1",
@ -4484,6 +4489,7 @@
"integrity": "sha512-+4N/u9dZ4PrgzGgPlKnaaRQx64RO0JBKs9sDhQ2pLgN6JQZ25uPQZKQYaBJU48Kd5BxgXoJ4e09Dq7nMcOUW3A==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"chokidar": "^4.0.0",
"immutable": "^5.1.5",
@ -5303,6 +5309,7 @@
"integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
"dev": true,
"license": "MIT",
"peer": true,
"engines": {
"node": ">=12"
},
@ -5386,7 +5393,8 @@
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
"integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
"dev": true,
"license": "0BSD"
"license": "0BSD",
"peer": true
},
"node_modules/tsyringe": {
"version": "4.10.0",
@ -5428,6 +5436,7 @@
"integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
"dev": true,
"license": "Apache-2.0",
"peer": true,
"bin": {
"tsc": "bin/tsc",
"tsserver": "bin/tsserver"
@ -5568,6 +5577,7 @@
"integrity": "sha512-jTywjboN9aHxFlToqb0K0Zs9SbBoW4zRUlGzI2tYNxVYcEi/IPpn+Xi4ye5jTLvX2YeLuic/IvxNot+Q1jMoOw==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@types/eslint-scope": "^3.7.7",
"@types/estree": "^1.0.8",
@ -5617,6 +5627,7 @@
"integrity": "sha512-MfwFQ6SfwinsUVi0rNJm7rHZ31GyTcpVE5pgVA3hwFRb7COD4TzjUUwhGWKfO50+xdc2MQPuEBBJoqIMGt3JDw==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@discoveryjs/json-ext": "^0.6.1",
"@webpack-cli/configtest": "^3.0.1",

6
reconcile-js/package-lock.json generated
View file

@ -1,12 +1,12 @@
{
"name": "reconcile-text",
"version": "0.11.0",
"version": "0.12.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "reconcile-text",
"version": "0.11.0",
"version": "0.12.0",
"license": "MIT",
"devDependencies": {
"@types/jest": "^30.0.0",
@ -25,7 +25,7 @@
},
"../pkg": {
"name": "reconcile-text",
"version": "0.11.0",
"version": "0.12.0",
"dev": true,
"license": "MIT"
},

2
reconcile-js/package.json
View file

@ -1,6 +1,6 @@
{
"name": "reconcile-text",
"version": "0.11.0",
"version": "0.12.0",
"description": "Intelligent 3-way text merging with automated conflict resolution",
"main": "dist/reconcile.node.js",
"browser": "dist/reconcile.web.js",

4
reconcile-python/Cargo.lock generated
View file

@ -104,14 +104,14 @@ dependencies = [
[[package]]
name = "reconcile-text"
version = "0.11.0"
version = "0.12.0"
dependencies = [
"thiserror",
]
[[package]]
name = "reconcile-text-python"
version = "0.11.0"
version = "0.12.0"
dependencies = [
"pyo3",
"reconcile-text",

2
reconcile-python/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "reconcile-text-python"
version = "0.11.0"
version = "0.12.0"
edition = "2024"
rust-version = "1.94"
authors = ["Andras Schmelczer <andras@schmelczer.dev>"]

2
reconcile-python/pyproject.toml
View file

@ -4,7 +4,7 @@ build-backend = "maturin"
[project]
name = "reconcile-text"
version = "0.11.0"
version = "0.12.0"
description = "Intelligent 3-way text merging with automated conflict resolution"
readme = "README.md"
license = { text = "MIT" }

2
reconcile-python/uv.lock generated
View file

@ -168,7 +168,7 @@ wheels = [
[[package]]
name = "reconcile-text"
version = "0.11.0"
version = "0.12.0"
source = { editable = "." }
[package.dev-dependencies]