diff --git a/package-lock.json b/package-lock.json
index 8e5cf48..2544bb0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,12 +10,12 @@
]
},
"node_modules/@babel/code-frame": {
- "version": "7.24.6",
- "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.6.tgz",
- "integrity": "sha512-ZJhac6FkEd1yhG2AHOmfcXG4ceoLltoCVJjN5XsWN9BifBQr+cHJbWi0h68HZuSORq+3WtJ2z0hwF2NG1b5kcA==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
+ "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
"dev": true,
"dependencies": {
- "@babel/highlight": "^7.24.6",
+ "@babel/highlight": "^7.24.7",
"picocolors": "^1.0.0"
},
"engines": {
@@ -23,21 +23,21 @@
}
},
"node_modules/@babel/helper-validator-identifier": {
- "version": "7.24.6",
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.6.tgz",
- "integrity": "sha512-4yA7s865JHaqUdRbnaxarZREuPTHrjpDT+pXoAZ1yhyo6uFnIEpS8VMu16siFOHDpZNKYv5BObhsB//ycbICyw==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
+ "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
"dev": true,
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/highlight": {
- "version": "7.24.6",
- "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.6.tgz",
- "integrity": "sha512-2YnuOp4HAk2BsBrJJvYCbItHx0zWscI1C3zgWkz+wDyD9I7GIVrfnLyrR4Y1VR+7p+chAEcrgRQYZAGIKMV7vQ==",
+ "version": "7.24.7",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
+ "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
"dev": true,
"dependencies": {
- "@babel/helper-validator-identifier": "^7.24.6",
+ "@babel/helper-validator-identifier": "^7.24.7",
"chalk": "^2.4.2",
"js-tokens": "^4.0.0",
"picocolors": "^1.0.0"
@@ -109,9 +109,9 @@
}
},
"node_modules/@esbuild/aix-ppc64": {
- "version": "0.20.2",
- "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz",
- "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==",
+ "version": "0.21.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
+ "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
"cpu": [
"ppc64"
],
@@ -125,9 +125,9 @@
}
},
"node_modules/@esbuild/android-arm": {
- "version": "0.20.2",
- "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz",
- "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==",
+ "version": "0.21.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
+ "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
"cpu": [
"arm"
],
@@ -141,9 +141,9 @@
}
},
"node_modules/@esbuild/android-arm64": {
- "version": "0.20.2",
- "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz",
- "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==",
+ "version": "0.21.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
+ "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
"cpu": [
"arm64"
],
@@ -157,9 +157,9 @@
}
},
"node_modules/@esbuild/android-x64": {
- "version": "0.20.2",
- "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz",
- "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==",
+ "version": "0.21.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
+ "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
"cpu": [
"x64"
],
@@ -173,9 +173,9 @@
}
},
"node_modules/@esbuild/darwin-arm64": {
- "version": "0.20.2",
- "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz",
- "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==",
+ "version": "0.21.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
+ "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
"cpu": [
"arm64"
],
@@ -189,9 +189,9 @@
}
},
"node_modules/@esbuild/darwin-x64": {
- "version": "0.20.2",
- "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz",
- "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==",
+ "version": "0.21.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
+ "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
"cpu": [
"x64"
],
@@ -205,9 +205,9 @@
}
},
"node_modules/@esbuild/freebsd-arm64": {
- "version": "0.20.2",
- "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz",
- "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==",
+ "version": "0.21.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
+ "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
"cpu": [
"arm64"
],
@@ -221,9 +221,9 @@
}
},
"node_modules/@esbuild/freebsd-x64": {
- "version": "0.20.2",
- "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz",
- "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==",
+ "version": "0.21.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
+ "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
"cpu": [
"x64"
],
@@ -237,9 +237,9 @@
}
},
"node_modules/@esbuild/linux-arm": {
- "version": "0.20.2",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz",
- "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==",
+ "version": "0.21.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
+ "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
"cpu": [
"arm"
],
@@ -253,9 +253,9 @@
}
},
"node_modules/@esbuild/linux-arm64": {
- "version": "0.20.2",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz",
- "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==",
+ "version": "0.21.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
+ "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
"cpu": [
"arm64"
],
@@ -269,9 +269,9 @@
}
},
"node_modules/@esbuild/linux-ia32": {
- "version": "0.20.2",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz",
- "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==",
+ "version": "0.21.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
+ "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
"cpu": [
"ia32"
],
@@ -285,9 +285,9 @@
}
},
"node_modules/@esbuild/linux-loong64": {
- "version": "0.20.2",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz",
- "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==",
+ "version": "0.21.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
+ "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
"cpu": [
"loong64"
],
@@ -301,9 +301,9 @@
}
},
"node_modules/@esbuild/linux-mips64el": {
- "version": "0.20.2",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz",
- "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==",
+ "version": "0.21.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
+ "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
"cpu": [
"mips64el"
],
@@ -317,9 +317,9 @@
}
},
"node_modules/@esbuild/linux-ppc64": {
- "version": "0.20.2",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz",
- "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==",
+ "version": "0.21.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
+ "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
"cpu": [
"ppc64"
],
@@ -333,9 +333,9 @@
}
},
"node_modules/@esbuild/linux-riscv64": {
- "version": "0.20.2",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz",
- "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==",
+ "version": "0.21.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
+ "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
"cpu": [
"riscv64"
],
@@ -349,9 +349,9 @@
}
},
"node_modules/@esbuild/linux-s390x": {
- "version": "0.20.2",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz",
- "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==",
+ "version": "0.21.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
+ "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
"cpu": [
"s390x"
],
@@ -365,9 +365,9 @@
}
},
"node_modules/@esbuild/linux-x64": {
- "version": "0.20.2",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz",
- "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==",
+ "version": "0.21.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+ "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
"cpu": [
"x64"
],
@@ -381,9 +381,9 @@
}
},
"node_modules/@esbuild/netbsd-x64": {
- "version": "0.20.2",
- "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz",
- "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==",
+ "version": "0.21.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
+ "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
"cpu": [
"x64"
],
@@ -397,9 +397,9 @@
}
},
"node_modules/@esbuild/openbsd-x64": {
- "version": "0.20.2",
- "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz",
- "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==",
+ "version": "0.21.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
+ "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
"cpu": [
"x64"
],
@@ -413,9 +413,9 @@
}
},
"node_modules/@esbuild/sunos-x64": {
- "version": "0.20.2",
- "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz",
- "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==",
+ "version": "0.21.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
+ "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
"cpu": [
"x64"
],
@@ -429,9 +429,9 @@
}
},
"node_modules/@esbuild/win32-arm64": {
- "version": "0.20.2",
- "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz",
- "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==",
+ "version": "0.21.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
+ "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
"cpu": [
"arm64"
],
@@ -445,9 +445,9 @@
}
},
"node_modules/@esbuild/win32-ia32": {
- "version": "0.20.2",
- "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz",
- "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==",
+ "version": "0.21.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
+ "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
"cpu": [
"ia32"
],
@@ -461,9 +461,9 @@
}
},
"node_modules/@esbuild/win32-x64": {
- "version": "0.20.2",
- "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz",
- "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==",
+ "version": "0.21.5",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+ "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
"cpu": [
"x64"
],
@@ -512,9 +512,9 @@
}
},
"node_modules/@rollup/rollup-android-arm-eabi": {
- "version": "4.18.0",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.18.0.tgz",
- "integrity": "sha512-Tya6xypR10giZV1XzxmH5wr25VcZSncG0pZIjfePT0OVBvqNEurzValetGNarVrGiq66EBVAFn15iYX4w6FKgQ==",
+ "version": "4.18.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.18.1.tgz",
+ "integrity": "sha512-lncuC4aHicncmbORnx+dUaAgzee9cm/PbIqgWz1PpXuwc+sa1Ct83tnqUDy/GFKleLiN7ZIeytM6KJ4cAn1SxA==",
"cpu": [
"arm"
],
@@ -525,9 +525,9 @@
]
},
"node_modules/@rollup/rollup-android-arm64": {
- "version": "4.18.0",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.18.0.tgz",
- "integrity": "sha512-avCea0RAP03lTsDhEyfy+hpfr85KfyTctMADqHVhLAF3MlIkq83CP8UfAHUssgXTYd+6er6PaAhx/QGv4L1EiA==",
+ "version": "4.18.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.18.1.tgz",
+ "integrity": "sha512-F/tkdw0WSs4ojqz5Ovrw5r9odqzFjb5LIgHdHZG65dFI1lWTWRVy32KDJLKRISHgJvqUeUhdIvy43fX41znyDg==",
"cpu": [
"arm64"
],
@@ -538,9 +538,9 @@
]
},
"node_modules/@rollup/rollup-darwin-arm64": {
- "version": "4.18.0",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.18.0.tgz",
- "integrity": "sha512-IWfdwU7KDSm07Ty0PuA/W2JYoZ4iTj3TUQjkVsO/6U+4I1jN5lcR71ZEvRh52sDOERdnNhhHU57UITXz5jC1/w==",
+ "version": "4.18.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.18.1.tgz",
+ "integrity": "sha512-vk+ma8iC1ebje/ahpxpnrfVQJibTMyHdWpOGZ3JpQ7Mgn/3QNHmPq7YwjZbIE7km73dH5M1e6MRRsnEBW7v5CQ==",
"cpu": [
"arm64"
],
@@ -551,9 +551,9 @@
]
},
"node_modules/@rollup/rollup-darwin-x64": {
- "version": "4.18.0",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.18.0.tgz",
- "integrity": "sha512-n2LMsUz7Ynu7DoQrSQkBf8iNrjOGyPLrdSg802vk6XT3FtsgX6JbE8IHRvposskFm9SNxzkLYGSq9QdpLYpRNA==",
+ "version": "4.18.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.18.1.tgz",
+ "integrity": "sha512-IgpzXKauRe1Tafcej9STjSSuG0Ghu/xGYH+qG6JwsAUxXrnkvNHcq/NL6nz1+jzvWAnQkuAJ4uIwGB48K9OCGA==",
"cpu": [
"x64"
],
@@ -564,9 +564,9 @@
]
},
"node_modules/@rollup/rollup-linux-arm-gnueabihf": {
- "version": "4.18.0",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.18.0.tgz",
- "integrity": "sha512-C/zbRYRXFjWvz9Z4haRxcTdnkPt1BtCkz+7RtBSuNmKzMzp3ZxdM28Mpccn6pt28/UWUCTXa+b0Mx1k3g6NOMA==",
+ "version": "4.18.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.18.1.tgz",
+ "integrity": "sha512-P9bSiAUnSSM7EmyRK+e5wgpqai86QOSv8BwvkGjLwYuOpaeomiZWifEos517CwbG+aZl1T4clSE1YqqH2JRs+g==",
"cpu": [
"arm"
],
@@ -577,9 +577,9 @@
]
},
"node_modules/@rollup/rollup-linux-arm-musleabihf": {
- "version": "4.18.0",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.18.0.tgz",
- "integrity": "sha512-l3m9ewPgjQSXrUMHg93vt0hYCGnrMOcUpTz6FLtbwljo2HluS4zTXFy2571YQbisTnfTKPZ01u/ukJdQTLGh9A==",
+ "version": "4.18.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.18.1.tgz",
+ "integrity": "sha512-5RnjpACoxtS+aWOI1dURKno11d7krfpGDEn19jI8BuWmSBbUC4ytIADfROM1FZrFhQPSoP+KEa3NlEScznBTyQ==",
"cpu": [
"arm"
],
@@ -590,9 +590,9 @@
]
},
"node_modules/@rollup/rollup-linux-arm64-gnu": {
- "version": "4.18.0",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.18.0.tgz",
- "integrity": "sha512-rJ5D47d8WD7J+7STKdCUAgmQk49xuFrRi9pZkWoRD1UeSMakbcepWXPF8ycChBoAqs1pb2wzvbY6Q33WmN2ftw==",
+ "version": "4.18.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.18.1.tgz",
+ "integrity": "sha512-8mwmGD668m8WaGbthrEYZ9CBmPug2QPGWxhJxh/vCgBjro5o96gL04WLlg5BA233OCWLqERy4YUzX3bJGXaJgQ==",
"cpu": [
"arm64"
],
@@ -603,9 +603,9 @@
]
},
"node_modules/@rollup/rollup-linux-arm64-musl": {
- "version": "4.18.0",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.18.0.tgz",
- "integrity": "sha512-be6Yx37b24ZwxQ+wOQXXLZqpq4jTckJhtGlWGZs68TgdKXJgw54lUUoFYrg6Zs/kjzAQwEwYbp8JxZVzZLRepQ==",
+ "version": "4.18.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.18.1.tgz",
+ "integrity": "sha512-dJX9u4r4bqInMGOAQoGYdwDP8lQiisWb9et+T84l2WXk41yEej8v2iGKodmdKimT8cTAYt0jFb+UEBxnPkbXEQ==",
"cpu": [
"arm64"
],
@@ -616,9 +616,9 @@
]
},
"node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
- "version": "4.18.0",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.18.0.tgz",
- "integrity": "sha512-hNVMQK+qrA9Todu9+wqrXOHxFiD5YmdEi3paj6vP02Kx1hjd2LLYR2eaN7DsEshg09+9uzWi2W18MJDlG0cxJA==",
+ "version": "4.18.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.18.1.tgz",
+ "integrity": "sha512-V72cXdTl4EI0x6FNmho4D502sy7ed+LuVW6Ym8aI6DRQ9hQZdp5sj0a2usYOlqvFBNKQnLQGwmYnujo2HvjCxQ==",
"cpu": [
"ppc64"
],
@@ -629,9 +629,9 @@
]
},
"node_modules/@rollup/rollup-linux-riscv64-gnu": {
- "version": "4.18.0",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.18.0.tgz",
- "integrity": "sha512-ROCM7i+m1NfdrsmvwSzoxp9HFtmKGHEqu5NNDiZWQtXLA8S5HBCkVvKAxJ8U+CVctHwV2Gb5VUaK7UAkzhDjlg==",
+ "version": "4.18.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.18.1.tgz",
+ "integrity": "sha512-f+pJih7sxoKmbjghrM2RkWo2WHUW8UbfxIQiWo5yeCaCM0TveMEuAzKJte4QskBp1TIinpnRcxkquY+4WuY/tg==",
"cpu": [
"riscv64"
],
@@ -642,9 +642,9 @@
]
},
"node_modules/@rollup/rollup-linux-s390x-gnu": {
- "version": "4.18.0",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.18.0.tgz",
- "integrity": "sha512-0UyyRHyDN42QL+NbqevXIIUnKA47A+45WyasO+y2bGJ1mhQrfrtXUpTxCOrfxCR4esV3/RLYyucGVPiUsO8xjg==",
+ "version": "4.18.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.18.1.tgz",
+ "integrity": "sha512-qb1hMMT3Fr/Qz1OKovCuUM11MUNLUuHeBC2DPPAWUYYUAOFWaxInaTwTQmc7Fl5La7DShTEpmYwgdt2hG+4TEg==",
"cpu": [
"s390x"
],
@@ -655,9 +655,9 @@
]
},
"node_modules/@rollup/rollup-linux-x64-gnu": {
- "version": "4.18.0",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.18.0.tgz",
- "integrity": "sha512-xuglR2rBVHA5UsI8h8UbX4VJ470PtGCf5Vpswh7p2ukaqBGFTnsfzxUBetoWBWymHMxbIG0Cmx7Y9qDZzr648w==",
+ "version": "4.18.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.18.1.tgz",
+ "integrity": "sha512-7O5u/p6oKUFYjRbZkL2FLbwsyoJAjyeXHCU3O4ndvzg2OFO2GinFPSJFGbiwFDaCFc+k7gs9CF243PwdPQFh5g==",
"cpu": [
"x64"
],
@@ -668,9 +668,9 @@
]
},
"node_modules/@rollup/rollup-linux-x64-musl": {
- "version": "4.18.0",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.18.0.tgz",
- "integrity": "sha512-LKaqQL9osY/ir2geuLVvRRs+utWUNilzdE90TpyoX0eNqPzWjRm14oMEE+YLve4k/NAqCdPkGYDaDF5Sw+xBfg==",
+ "version": "4.18.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.18.1.tgz",
+ "integrity": "sha512-pDLkYITdYrH/9Cv/Vlj8HppDuLMDUBmgsM0+N+xLtFd18aXgM9Nyqupb/Uw+HeidhfYg2lD6CXvz6CjoVOaKjQ==",
"cpu": [
"x64"
],
@@ -681,9 +681,9 @@
]
},
"node_modules/@rollup/rollup-win32-arm64-msvc": {
- "version": "4.18.0",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.18.0.tgz",
- "integrity": "sha512-7J6TkZQFGo9qBKH0pk2cEVSRhJbL6MtfWxth7Y5YmZs57Pi+4x6c2dStAUvaQkHQLnEQv1jzBUW43GvZW8OFqA==",
+ "version": "4.18.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.18.1.tgz",
+ "integrity": "sha512-W2ZNI323O/8pJdBGil1oCauuCzmVd9lDmWBBqxYZcOqWD6aWqJtVBQ1dFrF4dYpZPks6F+xCZHfzG5hYlSHZ6g==",
"cpu": [
"arm64"
],
@@ -694,9 +694,9 @@
]
},
"node_modules/@rollup/rollup-win32-ia32-msvc": {
- "version": "4.18.0",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.18.0.tgz",
- "integrity": "sha512-Txjh+IxBPbkUB9+SXZMpv+b/vnTEtFyfWZgJ6iyCmt2tdx0OF5WhFowLmnh8ENGNpfUlUZkdI//4IEmhwPieNg==",
+ "version": "4.18.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.18.1.tgz",
+ "integrity": "sha512-ELfEX1/+eGZYMaCIbK4jqLxO1gyTSOIlZr6pbC4SRYFaSIDVKOnZNMdoZ+ON0mrFDp4+H5MhwNC1H/AhE3zQLg==",
"cpu": [
"ia32"
],
@@ -707,9 +707,9 @@
]
},
"node_modules/@rollup/rollup-win32-x64-msvc": {
- "version": "4.18.0",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.18.0.tgz",
- "integrity": "sha512-UOo5FdvOL0+eIVTgS4tIdbW+TtnBLWg1YBCcU2KWM7nuNwRz9bksDX1bekJJCpu25N1DVWaCwnT39dVQxzqS8g==",
+ "version": "4.18.1",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.18.1.tgz",
+ "integrity": "sha512-yjk2MAkQmoaPYCSu35RLJ62+dz358nE83VfTePJRp8CG7aMg25mEJYpXFiD+NcevhX8LxD5OP5tktPXnXN7GDw==",
"cpu": [
"x64"
],
@@ -720,9 +720,9 @@
]
},
"node_modules/@tauri-apps/api": {
- "version": "1.5.6",
- "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-1.5.6.tgz",
- "integrity": "sha512-LH5ToovAHnDVe5Qa9f/+jW28I6DeMhos8bNDtBOmmnaDpPmJmYLyHdeDblAWWWYc7KKRDg9/66vMuKyq0WIeFA==",
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-1.6.0.tgz",
+ "integrity": "sha512-rqI++FWClU5I2UBp4HXFvl+sBWkdigBkxnpJDQUWttNyG7IZP4FwQGhTNL5EOw0vI8i6eSAJ5frLqO7n7jbJdg==",
"engines": {
"node": ">= 14.6.0",
"npm": ">= 6.6.0",
@@ -734,9 +734,9 @@
}
},
"node_modules/@tauri-apps/cli": {
- "version": "1.5.14",
- "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-1.5.14.tgz",
- "integrity": "sha512-JOSMKymlg116UdEXSj69eg5p1OtZnQkUE0qIGbtNDO1sk3X/KgBN6+oHBW0BzPStp/W0AjBgrMWCqjHPwEpOug==",
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-1.6.0.tgz",
+ "integrity": "sha512-DBBpBl6GhTzm8ImMbKkfaZ4fDTykWrC7Q5OXP4XqD91recmDEn2LExuvuiiS3HYe7uP8Eb5B9NPHhqJb+Zo7qQ==",
"dev": true,
"bin": {
"tauri": "tauri.js"
@@ -749,22 +749,22 @@
"url": "https://opencollective.com/tauri"
},
"optionalDependencies": {
- "@tauri-apps/cli-darwin-arm64": "1.5.14",
- "@tauri-apps/cli-darwin-x64": "1.5.14",
- "@tauri-apps/cli-linux-arm-gnueabihf": "1.5.14",
- "@tauri-apps/cli-linux-arm64-gnu": "1.5.14",
- "@tauri-apps/cli-linux-arm64-musl": "1.5.14",
- "@tauri-apps/cli-linux-x64-gnu": "1.5.14",
- "@tauri-apps/cli-linux-x64-musl": "1.5.14",
- "@tauri-apps/cli-win32-arm64-msvc": "1.5.14",
- "@tauri-apps/cli-win32-ia32-msvc": "1.5.14",
- "@tauri-apps/cli-win32-x64-msvc": "1.5.14"
+ "@tauri-apps/cli-darwin-arm64": "1.6.0",
+ "@tauri-apps/cli-darwin-x64": "1.6.0",
+ "@tauri-apps/cli-linux-arm-gnueabihf": "1.6.0",
+ "@tauri-apps/cli-linux-arm64-gnu": "1.6.0",
+ "@tauri-apps/cli-linux-arm64-musl": "1.6.0",
+ "@tauri-apps/cli-linux-x64-gnu": "1.6.0",
+ "@tauri-apps/cli-linux-x64-musl": "1.6.0",
+ "@tauri-apps/cli-win32-arm64-msvc": "1.6.0",
+ "@tauri-apps/cli-win32-ia32-msvc": "1.6.0",
+ "@tauri-apps/cli-win32-x64-msvc": "1.6.0"
}
},
"node_modules/@tauri-apps/cli-darwin-arm64": {
- "version": "1.5.14",
- "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.5.14.tgz",
- "integrity": "sha512-lxoSOp3KKSqzHJa7iT32dukPGMlfsTuja1xXSgwR8o/fqzpYJY7FY/3ZxesP8HR66FcK+vtqa//HNqeOQ0mHkA==",
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.6.0.tgz",
+ "integrity": "sha512-SNRwUD9nqGxY47mbY1CGTt/jqyQOU7Ps7Mx/mpgahL0FVUDiCEY/5L9QfEPPhEgccgcelEVn7i6aQHIkHyUtCA==",
"cpu": [
"arm64"
],
@@ -778,9 +778,9 @@
}
},
"node_modules/@tauri-apps/cli-darwin-x64": {
- "version": "1.5.14",
- "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.5.14.tgz",
- "integrity": "sha512-EXSwN1n5spfG8FoXuyc90ACtmDJXzaZ1gxyENaq9xEpQoo7j/Q1vb6qXxmr6azKr8zmqY4h08ZFbv3exh93xJg==",
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.6.0.tgz",
+ "integrity": "sha512-g2/uDR/eeH2arvuawA4WwaEOqv/7jDO/ZLNI3JlBjP5Pk8GGb3Kdy0ro1xQzF94mtk2mOnOXa4dMgAet4sUJ1A==",
"cpu": [
"x64"
],
@@ -794,9 +794,9 @@
}
},
"node_modules/@tauri-apps/cli-linux-arm-gnueabihf": {
- "version": "1.5.14",
- "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.5.14.tgz",
- "integrity": "sha512-Yb8BH/KYR7Tl+de40sZPfrqbhcU3Jlu+UPIrnXt05sjn48xqIps74Xjz8zzVp0TuHxUp8FmIGtCVhQgsbrsvvg==",
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.6.0.tgz",
+ "integrity": "sha512-EVwf4oRkQyG8BpSrk0gqO7oA0sDM2MdNDtJpMfleYFEgCxLIOGZKNqaOW3M7U+0Y4qikmG3TtRK+ngc8Ymtrjg==",
"cpu": [
"arm"
],
@@ -810,9 +810,9 @@
}
},
"node_modules/@tauri-apps/cli-linux-arm64-gnu": {
- "version": "1.5.14",
- "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.5.14.tgz",
- "integrity": "sha512-QrKHP4gRaHiup478rPBZ+BmNd88yze9jMmheoNy9mN1K/aECRmTHO+tWhsxv5moFHZzRhO0QDWxxvTtiaPXaGg==",
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.6.0.tgz",
+ "integrity": "sha512-YdpY17cAySrhK9dX4BUVEmhAxE2o+6skIEFg8iN/xrDwRxhaNPI9I80YXPatUTX54Kx55T5++25VJG9+3iw83A==",
"cpu": [
"arm64"
],
@@ -826,9 +826,9 @@
}
},
"node_modules/@tauri-apps/cli-linux-arm64-musl": {
- "version": "1.5.14",
- "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.5.14.tgz",
- "integrity": "sha512-Hb1C1VMxmUcyGjW/K/INKF87zzzgLEVRmWZZnQd7M1P4uue4xPyIwUELSdX12Z2jREPgmLW4AXPD0m6wsNu7iw==",
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.6.0.tgz",
+ "integrity": "sha512-4U628tuf2U8pMr4tIBJhEkrFwt+46dwhXrDlpdyWSZtnop5RJAVKHODm0KbWns4xGKfTW1F3r6sSv+2ZxLcISA==",
"cpu": [
"arm64"
],
@@ -842,9 +842,9 @@
}
},
"node_modules/@tauri-apps/cli-linux-x64-gnu": {
- "version": "1.5.14",
- "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.5.14.tgz",
- "integrity": "sha512-kD9v/UwPDuhIgq2TJj/s2/7rqk+vmExVV6xHPKI8vVbIvlNAOZqmx3fpxjej1241vhJ/piGd/m6q6YMWGsL0oQ==",
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.6.0.tgz",
+ "integrity": "sha512-AKRzp76fVUaJyXj5KRJT9bJyhwZyUnRQU0RqIRqOtZCT5yr6qGP8rjtQ7YhCIzWrseBlOllc3Qvbgw3Yl0VQcA==",
"cpu": [
"x64"
],
@@ -858,9 +858,9 @@
}
},
"node_modules/@tauri-apps/cli-linux-x64-musl": {
- "version": "1.5.14",
- "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.5.14.tgz",
- "integrity": "sha512-204Drgg9Zx0+THKndqASz4+iPCwqA3gQVF9C0CDIArNXrjPyJjVvW8VP5CHiZYaTNWxlz/ltyxluM6UFWbXNFw==",
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.6.0.tgz",
+ "integrity": "sha512-0edIdq6aMBTaRMIXddHfyAFL361JqulLLd2Wi2aoOie7DkQ2MYh6gv3hA7NB9gqFwNIGE+xtJ4BkXIP2tSGPlg==",
"cpu": [
"x64"
],
@@ -874,9 +874,9 @@
}
},
"node_modules/@tauri-apps/cli-win32-arm64-msvc": {
- "version": "1.5.14",
- "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-1.5.14.tgz",
- "integrity": "sha512-sqPSni2MnWNCm+8YZnLdWCclxfSHaYqKuPFSz8q7Tn1G1m/cA9gyPoC1G0esHftY7bu/ZM5lB4kM3I4U0KlLiA==",
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-1.6.0.tgz",
+ "integrity": "sha512-QwWpWk4ubcwJ1rljsRAmINgB2AwkyzZhpYbalA+MmzyYMREcdXWGkyixWbRZgqc6fEWEBmq5UG73qz5eBJiIKg==",
"cpu": [
"arm64"
],
@@ -890,9 +890,9 @@
}
},
"node_modules/@tauri-apps/cli-win32-ia32-msvc": {
- "version": "1.5.14",
- "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.5.14.tgz",
- "integrity": "sha512-8xN8W0zTs8oFsQmvYLxHFeqhzVI7oTaPK1xQMc5gbpFP45jN41c21aCXfjnvzT+h90EfCHUF9EWj2HTEJSb7Iw==",
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.6.0.tgz",
+ "integrity": "sha512-Vtw0yxO9+aEFuhuxQ57ALG43tjECopRimRuKGbtZYDCriB/ty5TrT3QWMdy0dxBkpDTu3Rqsz30sbDzw6tlP3Q==",
"cpu": [
"ia32"
],
@@ -906,9 +906,9 @@
}
},
"node_modules/@tauri-apps/cli-win32-x64-msvc": {
- "version": "1.5.14",
- "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.5.14.tgz",
- "integrity": "sha512-U0slee5tNM2PYECBpPHavLSwkT3szGMZ+qhcikQQbDan84bQdLn/kHWjyXOgLJs4KSve4+KxcrN+AVqj0VyHnw==",
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.6.0.tgz",
+ "integrity": "sha512-h54FHOvGi7+LIfRchzgZYSCHB1HDlP599vWXQQJ/XnwJY+6Rwr2E5bOe/EhqoG8rbGkfK0xX3KPAvXPbUlmggg==",
"cpu": [
"x64"
],
@@ -1139,9 +1139,9 @@
"link": true
},
"node_modules/esbuild": {
- "version": "0.20.2",
- "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz",
- "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==",
+ "version": "0.21.5",
+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
+ "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
"dev": true,
"hasInstallScript": true,
"bin": {
@@ -1151,29 +1151,29 @@
"node": ">=12"
},
"optionalDependencies": {
- "@esbuild/aix-ppc64": "0.20.2",
- "@esbuild/android-arm": "0.20.2",
- "@esbuild/android-arm64": "0.20.2",
- "@esbuild/android-x64": "0.20.2",
- "@esbuild/darwin-arm64": "0.20.2",
- "@esbuild/darwin-x64": "0.20.2",
- "@esbuild/freebsd-arm64": "0.20.2",
- "@esbuild/freebsd-x64": "0.20.2",
- "@esbuild/linux-arm": "0.20.2",
- "@esbuild/linux-arm64": "0.20.2",
- "@esbuild/linux-ia32": "0.20.2",
- "@esbuild/linux-loong64": "0.20.2",
- "@esbuild/linux-mips64el": "0.20.2",
- "@esbuild/linux-ppc64": "0.20.2",
- "@esbuild/linux-riscv64": "0.20.2",
- "@esbuild/linux-s390x": "0.20.2",
- "@esbuild/linux-x64": "0.20.2",
- "@esbuild/netbsd-x64": "0.20.2",
- "@esbuild/openbsd-x64": "0.20.2",
- "@esbuild/sunos-x64": "0.20.2",
- "@esbuild/win32-arm64": "0.20.2",
- "@esbuild/win32-ia32": "0.20.2",
- "@esbuild/win32-x64": "0.20.2"
+ "@esbuild/aix-ppc64": "0.21.5",
+ "@esbuild/android-arm": "0.21.5",
+ "@esbuild/android-arm64": "0.21.5",
+ "@esbuild/android-x64": "0.21.5",
+ "@esbuild/darwin-arm64": "0.21.5",
+ "@esbuild/darwin-x64": "0.21.5",
+ "@esbuild/freebsd-arm64": "0.21.5",
+ "@esbuild/freebsd-x64": "0.21.5",
+ "@esbuild/linux-arm": "0.21.5",
+ "@esbuild/linux-arm64": "0.21.5",
+ "@esbuild/linux-ia32": "0.21.5",
+ "@esbuild/linux-loong64": "0.21.5",
+ "@esbuild/linux-mips64el": "0.21.5",
+ "@esbuild/linux-ppc64": "0.21.5",
+ "@esbuild/linux-riscv64": "0.21.5",
+ "@esbuild/linux-s390x": "0.21.5",
+ "@esbuild/linux-x64": "0.21.5",
+ "@esbuild/netbsd-x64": "0.21.5",
+ "@esbuild/openbsd-x64": "0.21.5",
+ "@esbuild/sunos-x64": "0.21.5",
+ "@esbuild/win32-arm64": "0.21.5",
+ "@esbuild/win32-ia32": "0.21.5",
+ "@esbuild/win32-x64": "0.21.5"
}
},
"node_modules/escape-string-regexp": {
@@ -1338,9 +1338,9 @@
}
},
"node_modules/lit-html": {
- "version": "3.1.3",
- "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-3.1.3.tgz",
- "integrity": "sha512-FwIbqDD8O/8lM4vUZ4KvQZjPPNx7V1VhT7vmRB8RBAO0AU6wuTVdoXiu2CivVjEGdugvcbPNBLtPE1y0ifplHA==",
+ "version": "3.1.4",
+ "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-3.1.4.tgz",
+ "integrity": "sha512-yKKO2uVv7zYFHlWMfZmqc+4hkmSbFp8jgjdZY9vvR9jr4J8fH6FUMXhr+ljfELgmjpvlF7Z1SJ5n5/Jeqtc9YA==",
"dependencies": {
"@types/trusted-types": "^2.0.2"
}
@@ -1446,9 +1446,9 @@
}
},
"node_modules/postcss": {
- "version": "8.4.38",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
- "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
+ "version": "8.4.39",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.39.tgz",
+ "integrity": "sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==",
"dev": true,
"funding": [
{
@@ -1466,7 +1466,7 @@
],
"dependencies": {
"nanoid": "^3.3.7",
- "picocolors": "^1.0.0",
+ "picocolors": "^1.0.1",
"source-map-js": "^1.2.0"
},
"engines": {
@@ -1531,9 +1531,9 @@
}
},
"node_modules/rollup": {
- "version": "4.18.0",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.18.0.tgz",
- "integrity": "sha512-QmJz14PX3rzbJCN1SG4Xe/bAAX2a6NpCP8ab2vfu2GiUr8AQcr2nCV/oEO3yneFarB67zk8ShlIyWb2LGTb3Sg==",
+ "version": "4.18.1",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.18.1.tgz",
+ "integrity": "sha512-Elx2UT8lzxxOXMpy5HWQGZqkrQOtrVDDa/bm9l10+U4rQnVzbL/LgZ4NOM1MPIDyHk69W4InuYDF5dzRh4Kw1A==",
"dev": true,
"dependencies": {
"@types/estree": "1.0.5"
@@ -1546,22 +1546,22 @@
"npm": ">=8.0.0"
},
"optionalDependencies": {
- "@rollup/rollup-android-arm-eabi": "4.18.0",
- "@rollup/rollup-android-arm64": "4.18.0",
- "@rollup/rollup-darwin-arm64": "4.18.0",
- "@rollup/rollup-darwin-x64": "4.18.0",
- "@rollup/rollup-linux-arm-gnueabihf": "4.18.0",
- "@rollup/rollup-linux-arm-musleabihf": "4.18.0",
- "@rollup/rollup-linux-arm64-gnu": "4.18.0",
- "@rollup/rollup-linux-arm64-musl": "4.18.0",
- "@rollup/rollup-linux-powerpc64le-gnu": "4.18.0",
- "@rollup/rollup-linux-riscv64-gnu": "4.18.0",
- "@rollup/rollup-linux-s390x-gnu": "4.18.0",
- "@rollup/rollup-linux-x64-gnu": "4.18.0",
- "@rollup/rollup-linux-x64-musl": "4.18.0",
- "@rollup/rollup-win32-arm64-msvc": "4.18.0",
- "@rollup/rollup-win32-ia32-msvc": "4.18.0",
- "@rollup/rollup-win32-x64-msvc": "4.18.0",
+ "@rollup/rollup-android-arm-eabi": "4.18.1",
+ "@rollup/rollup-android-arm64": "4.18.1",
+ "@rollup/rollup-darwin-arm64": "4.18.1",
+ "@rollup/rollup-darwin-x64": "4.18.1",
+ "@rollup/rollup-linux-arm-gnueabihf": "4.18.1",
+ "@rollup/rollup-linux-arm-musleabihf": "4.18.1",
+ "@rollup/rollup-linux-arm64-gnu": "4.18.1",
+ "@rollup/rollup-linux-arm64-musl": "4.18.1",
+ "@rollup/rollup-linux-powerpc64le-gnu": "4.18.1",
+ "@rollup/rollup-linux-riscv64-gnu": "4.18.1",
+ "@rollup/rollup-linux-s390x-gnu": "4.18.1",
+ "@rollup/rollup-linux-x64-gnu": "4.18.1",
+ "@rollup/rollup-linux-x64-musl": "4.18.1",
+ "@rollup/rollup-win32-arm64-msvc": "4.18.1",
+ "@rollup/rollup-win32-ia32-msvc": "4.18.1",
+ "@rollup/rollup-win32-x64-msvc": "4.18.1",
"fsevents": "~2.3.2"
}
},
@@ -1664,9 +1664,9 @@
}
},
"node_modules/typescript": {
- "version": "5.4.5",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
- "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
+ "version": "5.5.3",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz",
+ "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==",
"dev": true,
"bin": {
"tsc": "bin/tsc",
@@ -1686,13 +1686,13 @@
}
},
"node_modules/vite": {
- "version": "5.2.12",
- "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.12.tgz",
- "integrity": "sha512-/gC8GxzxMK5ntBwb48pR32GGhENnjtY30G4A0jemunsBkiEZFw60s8InGpN8gkhHEkjnRK1aSAxeQgwvFhUHAA==",
+ "version": "5.3.3",
+ "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.3.tgz",
+ "integrity": "sha512-NPQdeCU0Dv2z5fu+ULotpuq5yfCS1BzKUIPhNbP3YBfAMGJXbt2nS+sbTFu+qchaqWTD+H3JK++nRwr6XIcp6A==",
"dev": true,
"dependencies": {
- "esbuild": "^0.20.1",
- "postcss": "^8.4.38",
+ "esbuild": "^0.21.3",
+ "postcss": "^8.4.39",
"rollup": "^4.13.0"
},
"bin": {
@@ -1867,7 +1867,6 @@
"dev": true
},
"webapp": {
- "name": "diffedit3-webapp",
"version": "0.4.0",
"dependencies": {
"@tauri-apps/api": "^1.5.3",
diff --git a/webapp/dist/assets/index-C5Gd23_Q.js b/webapp/dist/assets/index-s6fJNVky.js
similarity index 97%
rename from webapp/dist/assets/index-C5Gd23_Q.js
rename to webapp/dist/assets/index-s6fJNVky.js
index a19b444..0d25d22 100644
--- a/webapp/dist/assets/index-C5Gd23_Q.js
+++ b/webapp/dist/assets/index-s6fJNVky.js
@@ -1,9 +1,6 @@
var __defProp = Object.defineProperty;
var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
- __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
- return value;
-};
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
(function polyfill() {
const relList = document.createElement("link").relList;
if (relList && relList.supports && relList.supports("modulepreload")) {
@@ -25,16 +22,12 @@ var __publicField = (obj, key, value) => {
}).observe(document, { childList: true, subtree: true });
function getFetchOpts(link) {
const fetchOpts = {};
- if (link.integrity)
- fetchOpts.integrity = link.integrity;
- if (link.referrerPolicy)
- fetchOpts.referrerPolicy = link.referrerPolicy;
+ if (link.integrity) fetchOpts.integrity = link.integrity;
+ if (link.referrerPolicy) fetchOpts.referrerPolicy = link.referrerPolicy;
if (link.crossOrigin === "use-credentials")
fetchOpts.credentials = "include";
- else if (link.crossOrigin === "anonymous")
- fetchOpts.credentials = "omit";
- else
- fetchOpts.credentials = "same-origin";
+ else if (link.crossOrigin === "anonymous") fetchOpts.credentials = "omit";
+ else fetchOpts.credentials = "same-origin";
return fetchOpts;
}
function processPreload(link) {
@@ -62,8 +55,7 @@ function getDefaultExportFromCjs(x2) {
var codemirror = { exports: {} };
var hasRequiredCodemirror;
function requireCodemirror() {
- if (hasRequiredCodemirror)
- return codemirror.exports;
+ if (hasRequiredCodemirror) return codemirror.exports;
hasRequiredCodemirror = 1;
(function(module, exports) {
(function(global2, factory) {
@@ -1084,19 +1076,18 @@ function requireCodemirror() {
}
function lineAtHeight(chunk, h2) {
var n2 = chunk.first;
- outer:
- do {
- for (var i$12 = 0; i$12 < chunk.children.length; ++i$12) {
- var child = chunk.children[i$12], ch = child.height;
- if (h2 < ch) {
- chunk = child;
- continue outer;
- }
- h2 -= ch;
- n2 += child.chunkSize();
+ outer: do {
+ for (var i$12 = 0; i$12 < chunk.children.length; ++i$12) {
+ var child = chunk.children[i$12], ch = child.height;
+ if (h2 < ch) {
+ chunk = child;
+ continue outer;
}
- return n2;
- } while (!chunk.lines);
+ h2 -= ch;
+ n2 += child.chunkSize();
+ }
+ return n2;
+ } while (!chunk.lines);
var i3 = 0;
for (; i3 < chunk.lines.length; ++i3) {
var line = chunk.lines[i3], lh = line.height;
@@ -1114,8 +1105,7 @@ function requireCodemirror() {
return String(options.lineNumberFormatter(i3 + options.firstLineNumber));
}
function Pos(line, ch, sticky) {
- if (sticky === void 0)
- sticky = null;
+ if (sticky === void 0) sticky = null;
if (!(this instanceof Pos)) {
return new Pos(line, ch, sticky);
}
@@ -1262,8 +1252,7 @@ function requireCodemirror() {
context.baseTokens = null;
context.baseTokenPos = 1;
};
- for (var o2 = 0; o2 < cm.state.overlays.length; ++o2)
- loop(o2);
+ for (var o2 = 0; o2 < cm.state.overlays.length; ++o2) loop(o2);
return { styles: st, classes: lineClasses.bgClass || lineClasses.textClass ? lineClasses : null };
}
function getLineStyles(cm, line, updateFrontier) {
@@ -3405,8 +3394,7 @@ function requireCodemirror() {
cm.display.input.showSelection(cm.display.input.prepareSelection());
}
function prepareSelection(cm, primary) {
- if (primary === void 0)
- primary = true;
+ if (primary === void 0) primary = true;
var doc2 = cm.doc, result = {};
var curFragment = result.cursors = document.createDocumentFragment();
var selFragment = result.selection = document.createDocumentFragment();
@@ -4539,8 +4527,7 @@ function requireCodemirror() {
var view = display.view, lineN = display.viewFrom;
for (var i3 = 0; i3 < view.length; i3++) {
var lineView = view[i3];
- if (lineView.hidden)
- ;
+ if (lineView.hidden) ;
else if (!lineView.node || lineView.node.parentNode != container) {
var node = buildLineElement(cm, lineView, lineN, dims);
container.insertBefore(node, cur);
@@ -4799,15 +4786,14 @@ function requireCodemirror() {
return;
}
if (dy && mac && webkit) {
- outer:
- for (var cur = e2.target, view = display.view; cur != scroll; cur = cur.parentNode) {
- for (var i3 = 0; i3 < view.length; i3++) {
- if (view[i3].node == cur) {
- cm.display.currentWheelTarget = cur;
- break outer;
- }
+ outer: for (var cur = e2.target, view = display.view; cur != scroll; cur = cur.parentNode) {
+ for (var i3 = 0; i3 < view.length; i3++) {
+ if (view[i3].node == cur) {
+ cm.display.currentWheelTarget = cur;
+ break outer;
}
}
+ }
}
if (dx && !gecko && !presto && pixelsPerUnit != null) {
if (dy && canScrollY) {
@@ -5268,16 +5254,15 @@ function requireCodemirror() {
for (var i3 = 0; i3 < old.length; ++i3) {
var oldCur = old[i3], stretchCur = stretched[i3];
if (oldCur && stretchCur) {
- spans:
- for (var j2 = 0; j2 < stretchCur.length; ++j2) {
- var span = stretchCur[j2];
- for (var k2 = 0; k2 < oldCur.length; ++k2) {
- if (oldCur[k2].marker == span.marker) {
- continue spans;
- }
+ spans: for (var j2 = 0; j2 < stretchCur.length; ++j2) {
+ var span = stretchCur[j2];
+ for (var k2 = 0; k2 < oldCur.length; ++k2) {
+ if (oldCur[k2].marker == span.marker) {
+ continue spans;
}
- oldCur.push(span);
}
+ oldCur.push(span);
+ }
} else if (stretchCur) {
old[i3] = stretchCur;
}
@@ -5641,8 +5626,7 @@ function requireCodemirror() {
};
for (var i$12 = event.changes.length - 1; i$12 >= 0; --i$12) {
var returned = loop(i$12);
- if (returned)
- return returned.v;
+ if (returned) return returned.v;
}
}
function shiftDoc(doc2, distance) {
@@ -6378,8 +6362,7 @@ function requireCodemirror() {
}
}
};
- for (var i3 = 0; i3 < markers.length; i3++)
- loop(i3);
+ for (var i3 = 0; i3 < markers.length; i3++) loop(i3);
}
var nextDocId = 0;
var Doc = function(text, mode, firstLine, lineSep, direction) {
@@ -10817,8 +10800,7 @@ const CodeMirror = /* @__PURE__ */ getDefaultExportFromCjs(codemirrorExports);
var merge = { exports: {} };
var hasRequiredMerge;
function requireMerge() {
- if (hasRequiredMerge)
- return merge.exports;
+ if (hasRequiredMerge) return merge.exports;
hasRequiredMerge = 1;
(function(module, exports) {
(function(mod) {
@@ -10852,16 +10834,14 @@ function requireMerge() {
(this.edit.state.diffViews || (this.edit.state.diffViews = [])).push(this);
this.orig = CodeMirror2(pane, copyObj({ value: orig, readOnly: !this.mv.options.allowEditingOriginals }, copyObj(options)));
if (this.mv.options.connect == "align") {
- if (!this.edit.state.trackAlignable)
- this.edit.state.trackAlignable = new TrackAlignable(this.edit);
+ if (!this.edit.state.trackAlignable) this.edit.state.trackAlignable = new TrackAlignable(this.edit);
this.orig.state.trackAlignable = new TrackAlignable(this.orig);
}
this.lockButton.title = this.edit.phrase("Toggle locked scrolling");
this.lockButton.setAttribute("aria-label", this.lockButton.title);
this.orig.state.diffViews = [this];
var classLocation = options.chunkClassLocation || "background";
- if (Object.prototype.toString.call(classLocation) != "[object Array]")
- classLocation = [classLocation];
+ if (Object.prototype.toString.call(classLocation) != "[object Array]") classLocation = [classLocation];
this.classes.classLocation = classLocation;
this.diff = getDiff(asString(orig), asString(options.value), this.mv.options.ignoreWhitespace);
this.chunks = getChunks(this.diff);
@@ -10899,10 +10879,8 @@ function requireMerge() {
updating = true;
updatingFast = false;
if (mode == "full") {
- if (dv.svg)
- clear(dv.svg);
- if (dv.copyButtons)
- clear(dv.copyButtons);
+ if (dv.svg) clear(dv.svg);
+ if (dv.copyButtons) clear(dv.copyButtons);
clearMarks(dv.edit, edit.marked, dv.classes);
clearMarks(dv.orig, orig.marked, dv.classes);
edit.from = edit.to = orig.from = orig.to = 0;
@@ -10915,22 +10893,18 @@ function requireMerge() {
if (dv.mv.options.connect == "align")
alignChunks(dv);
makeConnections(dv);
- if (dv.needsScrollSync != null)
- syncScroll(dv, dv.needsScrollSync);
+ if (dv.needsScrollSync != null) syncScroll(dv, dv.needsScrollSync);
updating = false;
}
function setDealign(fast) {
- if (updating)
- return;
+ if (updating) return;
dv.dealigned = true;
set(fast);
}
function set(fast) {
- if (updating || updatingFast)
- return;
+ if (updating || updatingFast) return;
clearTimeout(debounceChange);
- if (fast === true)
- updatingFast = true;
+ if (fast === true) updatingFast = true;
debounceChange = setTimeout(update, fast === true ? 20 : 250);
}
function change(_cm, change2) {
@@ -10968,19 +10942,16 @@ function requireMerge() {
});
dv.orig.on("scroll", function() {
syncScroll(dv, false) && makeConnections(dv);
- if (otherDv)
- syncScroll(otherDv, true) && makeConnections(otherDv);
+ if (otherDv) syncScroll(otherDv, true) && makeConnections(otherDv);
});
}
function syncScroll(dv, toOrig) {
if (dv.diffOutOfDate) {
- if (dv.lockScroll && dv.needsScrollSync == null)
- dv.needsScrollSync = toOrig;
+ if (dv.lockScroll && dv.needsScrollSync == null) dv.needsScrollSync = toOrig;
return false;
}
dv.needsScrollSync = null;
- if (!dv.lockScroll)
- return true;
+ if (!dv.lockScroll) return true;
var editor, other, now = +/* @__PURE__ */ new Date();
if (toOrig) {
editor = dv.edit;
@@ -10989,8 +10960,7 @@ function requireMerge() {
editor = dv.orig;
other = dv.edit;
}
- if (editor.state.scrollSetBy == dv && (editor.state.scrollSetAt || 0) + 250 > now)
- return false;
+ if (editor.state.scrollSetBy == dv && (editor.state.scrollSetAt || 0) + 250 > now) return false;
var sInfo = editor.getScrollInfo();
if (dv.mv.options.connect == "align") {
targetPos = sInfo.top;
@@ -11019,8 +10989,7 @@ function requireMerge() {
}
function getOffsets(editor, around) {
var bot = around.after;
- if (bot == null)
- bot = editor.lastLine() + 1;
+ if (bot == null) bot = editor.lastLine() + 1;
return {
top: editor.heightAtLine(around.before || 0, "local"),
bot: editor.heightAtLine(bot, "local")
@@ -11028,8 +10997,7 @@ function requireMerge() {
}
function setScrollLock(dv, val, action) {
dv.lockScroll = val;
- if (val && action != false)
- syncScroll(dv, DIFF_INSERT) && makeConnections(dv);
+ if (val && action != false) syncScroll(dv, DIFF_INSERT) && makeConnections(dv);
(val ? CodeMirror2.addClass : CodeMirror2.rmClass)(dv.lockButton, "CodeMirror-merge-scrolllock-enabled");
}
function removeClass(editor, line, classes) {
@@ -11073,12 +11041,9 @@ function requireMerge() {
function addClass(editor, lineNr, classes, main, start, end) {
var locs = classes.classLocation, line = editor.getLineHandle(lineNr);
for (var i2 = 0; i2 < locs.length; i2++) {
- if (main)
- editor.addLineClass(line, locs[i2], classes.chunk);
- if (start)
- editor.addLineClass(line, locs[i2], classes.start);
- if (end)
- editor.addLineClass(line, locs[i2], classes.end);
+ if (main) editor.addLineClass(line, locs[i2], classes.chunk);
+ if (start) editor.addLineClass(line, locs[i2], classes.start);
+ if (end) editor.addLineClass(line, locs[i2], classes.end);
}
return line;
}
@@ -11122,19 +11087,16 @@ function requireMerge() {
}
}
}
- if (pending)
- markChunk(chunkStart, pos.line + 1);
+ if (pending) markChunk(chunkStart, pos.line + 1);
}
function makeConnections(dv) {
- if (!dv.showDifferences)
- return;
+ if (!dv.showDifferences) return;
if (dv.svg) {
clear(dv.svg);
var w2 = dv.gap.offsetWidth;
attrs(dv.svg, "width", w2, "height", dv.gap.offsetHeight);
}
- if (dv.copyButtons)
- clear(dv.copyButtons);
+ if (dv.copyButtons) clear(dv.copyButtons);
var vpEdit = dv.edit.getViewport(), vpOrig = dv.orig.getViewport();
var outerTop = dv.mv.wrap.getBoundingClientRect().top;
var sTopEdit = outerTop - dv.edit.getScrollerElement().getBoundingClientRect().top + dv.edit.getScrollInfo().top;
@@ -11149,10 +11111,8 @@ function requireMerge() {
var editStart = 0, origStart = 0;
for (var i2 = 0; i2 < chunks.length; i2++) {
var chunk = chunks[i2];
- if (chunk.editTo > editLine && chunk.editFrom <= editLine)
- return null;
- if (chunk.editFrom > editLine)
- break;
+ if (chunk.editTo > editLine && chunk.editFrom <= editLine) return null;
+ if (chunk.editFrom > editLine) break;
editStart = chunk.editTo;
origStart = chunk.origTo;
}
@@ -11167,65 +11127,55 @@ function requireMerge() {
var chunkStart = !chunk ? 1e9 : isOrig ? chunk.origFrom : chunk.editFrom;
for (; trackI < tracker.alignable.length; trackI += 2) {
var n2 = tracker.alignable[trackI] + 1;
- if (n2 <= start)
- continue;
- if (n2 <= chunkStart)
- result.push(n2);
- else
- break;
+ if (n2 <= start) continue;
+ if (n2 <= chunkStart) result.push(n2);
+ else break;
}
- if (!chunk)
- break;
+ if (!chunk) break;
result.push(start = isOrig ? chunk.origTo : chunk.editTo);
}
return result;
}
function mergeAlignable(result, origAlignable, chunks, setIndex) {
var rI = 0, origI = 0, chunkI = 0, diff = 0;
- outer:
- for (; ; rI++) {
- var nextR = result[rI], nextO = origAlignable[origI];
- if (!nextR && nextO == null)
- break;
- var rLine = nextR ? nextR[0] : 1e9, oLine = nextO == null ? 1e9 : nextO;
- while (chunkI < chunks.length) {
- var chunk = chunks[chunkI];
- if (chunk.origFrom <= oLine && chunk.origTo > oLine) {
- origI++;
- rI--;
- continue outer;
- }
- if (chunk.editTo > rLine) {
- if (chunk.editFrom <= rLine)
- continue outer;
- break;
- }
- diff += chunk.origTo - chunk.origFrom - (chunk.editTo - chunk.editFrom);
- chunkI++;
- }
- if (rLine == oLine - diff) {
- nextR[setIndex] = oLine;
- origI++;
- } else if (rLine < oLine - diff) {
- nextR[setIndex] = rLine + diff;
- } else {
- var record = [oLine - diff, null, null];
- record[setIndex] = oLine;
- result.splice(rI, 0, record);
+ outer: for (; ; rI++) {
+ var nextR = result[rI], nextO = origAlignable[origI];
+ if (!nextR && nextO == null) break;
+ var rLine = nextR ? nextR[0] : 1e9, oLine = nextO == null ? 1e9 : nextO;
+ while (chunkI < chunks.length) {
+ var chunk = chunks[chunkI];
+ if (chunk.origFrom <= oLine && chunk.origTo > oLine) {
origI++;
+ rI--;
+ continue outer;
}
+ if (chunk.editTo > rLine) {
+ if (chunk.editFrom <= rLine) continue outer;
+ break;
+ }
+ diff += chunk.origTo - chunk.origFrom - (chunk.editTo - chunk.editFrom);
+ chunkI++;
}
+ if (rLine == oLine - diff) {
+ nextR[setIndex] = oLine;
+ origI++;
+ } else if (rLine < oLine - diff) {
+ nextR[setIndex] = rLine + diff;
+ } else {
+ var record = [oLine - diff, null, null];
+ record[setIndex] = oLine;
+ result.splice(rI, 0, record);
+ origI++;
+ }
+ }
}
function findAlignedLines(dv, other) {
var alignable = alignableFor(dv.edit, dv.chunks, false), result = [];
- if (other)
- for (var i2 = 0, j2 = 0; i2 < other.chunks.length; i2++) {
- var n2 = other.chunks[i2].editTo;
- while (j2 < alignable.length && alignable[j2] < n2)
- j2++;
- if (j2 == alignable.length || alignable[j2] != n2)
- alignable.splice(j2++, 0, n2);
- }
+ if (other) for (var i2 = 0, j2 = 0; i2 < other.chunks.length; i2++) {
+ var n2 = other.chunks[i2].editTo;
+ while (j2 < alignable.length && alignable[j2] < n2) j2++;
+ if (j2 == alignable.length || alignable[j2] != n2) alignable.splice(j2++, 0, n2);
+ }
for (var i2 = 0; i2 < alignable.length; i2++)
result.push([alignable[i2], null, null]);
mergeAlignable(result, alignableFor(dv.orig, dv.chunks, true), dv.chunks, 1);
@@ -11234,12 +11184,10 @@ function requireMerge() {
return result;
}
function alignChunks(dv, force) {
- if (!dv.dealigned && !force)
- return;
- if (!dv.orig.curOp)
- return dv.orig.operation(function() {
- alignChunks(dv, force);
- });
+ if (!dv.dealigned && !force) return;
+ if (!dv.orig.curOp) return dv.orig.operation(function() {
+ alignChunks(dv, force);
+ });
dv.dealigned = false;
var other = dv.mv.left == dv ? dv.mv.right : dv.mv.left;
if (other) {
@@ -11252,8 +11200,7 @@ function requireMerge() {
aligners[i2].clear();
aligners.length = 0;
var cm = [dv.edit, dv.orig], scroll = [], offset = [];
- if (other)
- cm.push(other.orig);
+ if (other) cm.push(other.orig);
for (var i2 = 0; i2 < cm.length; i2++) {
scroll.push(cm[i2].getScrollInfo().top);
offset.push(-cm[i2].getScrollerElement().getBoundingClientRect().top);
@@ -11267,18 +11214,16 @@ function requireMerge() {
}
function alignLines(cm, cmOffset, lines, aligners) {
var maxOffset = -1e8, offset = [];
- for (var i2 = 0; i2 < cm.length; i2++)
- if (lines[i2] != null) {
- var off = cm[i2].heightAtLine(lines[i2], "local") - cmOffset[i2];
- offset[i2] = off;
- maxOffset = Math.max(maxOffset, off);
- }
- for (var i2 = 0; i2 < cm.length; i2++)
- if (lines[i2] != null) {
- var diff = maxOffset - offset[i2];
- if (diff > 1)
- aligners.push(padAbove(cm[i2], lines[i2], diff));
- }
+ for (var i2 = 0; i2 < cm.length; i2++) if (lines[i2] != null) {
+ var off = cm[i2].heightAtLine(lines[i2], "local") - cmOffset[i2];
+ offset[i2] = off;
+ maxOffset = Math.max(maxOffset, off);
+ }
+ for (var i2 = 0; i2 < cm.length; i2++) if (lines[i2] != null) {
+ var diff = maxOffset - offset[i2];
+ if (diff > 1)
+ aligners.push(padAbove(cm[i2], lines[i2], diff));
+ }
}
function padAbove(cm, line, size) {
var above = true;
@@ -11356,8 +11301,7 @@ function requireMerge() {
}
}
function copyChunk(dv, to, from, chunk) {
- if (dv.diffOutOfDate)
- return;
+ if (dv.diffOutOfDate) return;
var origStart = chunk.origTo > from.lastLine() ? Pos(chunk.origFrom - 1) : Pos(chunk.origFrom, 0);
var origEnd = Pos(chunk.origTo, 0);
var editStart = chunk.editTo > to.lastLine() ? Pos(chunk.editFrom - 1) : Pos(chunk.editFrom, 0);
@@ -11369,8 +11313,7 @@ function requireMerge() {
to.replaceRange(from.getRange(origStart, origEnd), editStart, editEnd);
}
var MergeView = CodeMirror2.MergeView = function(node, options) {
- if (!(this instanceof MergeView))
- return new MergeView(node, options);
+ if (!(this instanceof MergeView)) return new MergeView(node, options);
this.options = options;
var origLeft = options.origLeft, origRight = options.origRight == null ? options.orig : options.origRight;
var hasLeft = origLeft != null, hasRight = origRight != null;
@@ -11395,10 +11338,8 @@ function requireMerge() {
wrap.push(elt("div", null, null, "height: 0; clear: both;"));
var wrapElt = this.wrap = node.appendChild(elt("div", wrap, "CodeMirror-merge CodeMirror-merge-" + panes + "pane"));
this.edit = CodeMirror2(editPane, copyObj(options));
- if (left)
- left.init(leftPane, origLeft, options);
- if (right)
- right.init(rightPane, origRight, options);
+ if (left) left.init(leftPane, origLeft, options);
+ if (right) right.init(rightPane, origRight, options);
if (options.collapseIdentical)
this.editor().operation(function() {
collapseIdenticalStretches(self2, options.collapseIdentical);
@@ -11407,15 +11348,11 @@ function requireMerge() {
this.aligners = [];
alignChunks(this.left || this.right, true);
}
- if (left)
- left.registerEvents(right);
- if (right)
- right.registerEvents(left);
+ if (left) left.registerEvents(right);
+ if (right) right.registerEvents(left);
var onResize = function() {
- if (left)
- makeConnections(left);
- if (right)
- makeConnections(right);
+ if (left) makeConnections(left);
+ if (right) makeConnections(right);
};
CodeMirror2.on(window, "resize", onResize);
var resizeInterval = setInterval(function() {
@@ -11443,8 +11380,7 @@ function requireMerge() {
dv.copyButtons = elt("div", null, "CodeMirror-merge-copybuttons-" + dv.type);
var copyButtons = function(e2) {
var node = e2.target || e2.srcElement;
- if (!node.chunk)
- return;
+ if (!node.chunk) return;
if (node.className == "CodeMirror-merge-copy-reverse") {
copyChunk(dv, dv.orig, dv.edit, node.chunk);
return;
@@ -11459,11 +11395,9 @@ function requireMerge() {
}
if (dv.mv.options.connect != "align") {
var svg = document.createElementNS && document.createElementNS(svgNS, "svg");
- if (svg && !svg.createSVGRect)
- svg = null;
+ if (svg && !svg.createSVGRect) svg = null;
dv.svg = svg;
- if (svg)
- gapElts.push(svg);
+ if (svg) gapElts.push(svg);
}
return dv.gap = elt("div", gapElts, "CodeMirror-merge-gap");
}
@@ -11479,10 +11413,8 @@ function requireMerge() {
return this.left && this.left.orig;
},
setShowDifferences: function(val) {
- if (this.right)
- this.right.setShowDifferences(val);
- if (this.left)
- this.left.setShowDifferences(val);
+ if (this.right) this.right.setShowDifferences(val);
+ if (this.left) this.left.setShowDifferences(val);
},
rightChunks: function() {
if (this.right) {
@@ -11498,15 +11430,12 @@ function requireMerge() {
}
};
function asString(obj) {
- if (typeof obj == "string")
- return obj;
- else
- return obj.getValue();
+ if (typeof obj == "string") return obj;
+ else return obj.getValue();
}
var dmp;
function getDiff(a2, b, ignoreWhitespace) {
- if (!dmp)
- dmp = new diff_match_patch();
+ if (!dmp) dmp = new diff_match_patch();
var diff = dmp.diff_main(a2, b);
for (var i2 = 0; i2 < diff.length; ++i2) {
var part = diff[i2];
@@ -11521,8 +11450,7 @@ function requireMerge() {
}
function getChunks(diff) {
var chunks = [];
- if (!diff.length)
- return chunks;
+ if (!diff.length) return chunks;
var startEdit = 0, startOrig = 0;
var edit = Pos(0, 0), orig = Pos(0, 0);
for (var i2 = 0; i2 < diff.length; ++i2) {
@@ -11534,13 +11462,12 @@ function requireMerge() {
var endOff = endOfLineClean(diff, i2) ? 1 : 0;
var cleanToEdit = edit.line + endOff, cleanToOrig = orig.line + endOff;
if (cleanToEdit > cleanFromEdit) {
- if (i2)
- chunks.push({
- origFrom: startOrig,
- origTo: cleanFromOrig,
- editFrom: startEdit,
- editTo: cleanFromEdit
- });
+ if (i2) chunks.push({
+ origFrom: startOrig,
+ origTo: cleanFromOrig,
+ editFrom: startEdit,
+ editTo: cleanFromEdit
+ });
startEdit = cleanToEdit;
startOrig = cleanToOrig;
}
@@ -11558,24 +11485,18 @@ function requireMerge() {
return chunks;
}
function endOfLineClean(diff, i2) {
- if (i2 == diff.length - 1)
- return true;
+ if (i2 == diff.length - 1) return true;
var next = diff[i2 + 1][1];
- if (next.length == 1 && i2 < diff.length - 2 || next.charCodeAt(0) != 10)
- return false;
- if (i2 == diff.length - 2)
- return true;
+ if (next.length == 1 && i2 < diff.length - 2 || next.charCodeAt(0) != 10) return false;
+ if (i2 == diff.length - 2) return true;
next = diff[i2 + 2][1];
return (next.length > 1 || i2 == diff.length - 3) && next.charCodeAt(0) == 10;
}
function startOfLineClean(diff, i2) {
- if (i2 == 0)
- return true;
+ if (i2 == 0) return true;
var last = diff[i2 - 1][1];
- if (last.charCodeAt(last.length - 1) != 10)
- return false;
- if (i2 == 1)
- return true;
+ if (last.charCodeAt(last.length - 1) != 10) return false;
+ if (i2 == 1) return true;
last = diff[i2 - 2][1];
return last.charCodeAt(last.length - 1) == 10;
}
@@ -11619,8 +11540,7 @@ function requireMerge() {
mark.clear();
cm.removeLineClass(from, "wrap", "CodeMirror-merge-collapsed-line");
}
- if (mark.explicitlyCleared)
- clear2();
+ if (mark.explicitlyCleared) clear2();
CodeMirror2.on(widget, "click", clear2);
mark.on("clear", clear2);
CodeMirror2.on(widget, "click", clear2);
@@ -11629,8 +11549,7 @@ function requireMerge() {
function collapseStretch(size, editors) {
var marks = [];
function clear2() {
- for (var i3 = 0; i3 < marks.length; i3++)
- marks[i3].clear();
+ for (var i3 = 0; i3 < marks.length; i3++) marks[i3].clear();
}
for (var i2 = 0; i2 < editors.length; i2++) {
var editor = editors[i2];
@@ -11645,21 +11564,16 @@ function requireMerge() {
var chunk = dv.chunks[i2];
for (var l2 = chunk.editFrom - margin; l2 < chunk.editTo + margin; l2++) {
var pos = l2 + off;
- if (pos >= 0 && pos < clear2.length)
- clear2[pos] = false;
+ if (pos >= 0 && pos < clear2.length) clear2[pos] = false;
}
}
}
function collapseIdenticalStretches(mv, margin) {
- if (typeof margin != "number")
- margin = 2;
+ if (typeof margin != "number") margin = 2;
var clear2 = [], edit = mv.editor(), off = edit.firstLine();
- for (var l2 = off, e2 = edit.lastLine(); l2 <= e2; l2++)
- clear2.push(true);
- if (mv.left)
- unclearNearChunks(mv.left, margin, off, clear2);
- if (mv.right)
- unclearNearChunks(mv.right, margin, off, clear2);
+ for (var l2 = off, e2 = edit.lastLine(); l2 <= e2; l2++) clear2.push(true);
+ if (mv.left) unclearNearChunks(mv.left, margin, off, clear2);
+ if (mv.right) unclearNearChunks(mv.right, margin, off, clear2);
for (var i2 = 0; i2 < clear2.length; i2++) {
if (clear2[i2]) {
var line = i2 + off;
@@ -11667,28 +11581,20 @@ function requireMerge() {
}
if (size > margin) {
var editors = [{ line, cm: edit }];
- if (mv.left)
- editors.push({ line: getMatchingOrigLine(line, mv.left.chunks), cm: mv.left.orig });
- if (mv.right)
- editors.push({ line: getMatchingOrigLine(line, mv.right.chunks), cm: mv.right.orig });
+ if (mv.left) editors.push({ line: getMatchingOrigLine(line, mv.left.chunks), cm: mv.left.orig });
+ if (mv.right) editors.push({ line: getMatchingOrigLine(line, mv.right.chunks), cm: mv.right.orig });
var mark = collapseStretch(size, editors);
- if (mv.options.onCollapse)
- mv.options.onCollapse(mv, line, size, mark);
+ if (mv.options.onCollapse) mv.options.onCollapse(mv, line, size, mark);
}
}
}
}
function elt(tag, content, className, style) {
var e2 = document.createElement(tag);
- if (className)
- e2.className = className;
- if (style)
- e2.style.cssText = style;
- if (typeof content == "string")
- e2.appendChild(document.createTextNode(content));
- else if (content)
- for (var i2 = 0; i2 < content.length; ++i2)
- e2.appendChild(content[i2]);
+ if (className) e2.className = className;
+ if (style) e2.style.cssText = style;
+ if (typeof content == "string") e2.appendChild(document.createTextNode(content));
+ else if (content) for (var i2 = 0; i2 < content.length; ++i2) e2.appendChild(content[i2]);
return e2;
}
function clear(node) {
@@ -11700,27 +11606,21 @@ function requireMerge() {
elt2.setAttribute(arguments[i2], arguments[i2 + 1]);
}
function copyObj(obj, target) {
- if (!target)
- target = {};
- for (var prop in obj)
- if (obj.hasOwnProperty(prop))
- target[prop] = obj[prop];
+ if (!target) target = {};
+ for (var prop in obj) if (obj.hasOwnProperty(prop)) target[prop] = obj[prop];
return target;
}
function moveOver(pos, str, copy, other) {
var out = copy ? Pos(pos.line, pos.ch) : pos, at = 0;
for (; ; ) {
var nl = str.indexOf("\n", at);
- if (nl == -1)
- break;
+ if (nl == -1) break;
++out.line;
- if (other)
- ++other.line;
+ if (other) ++other.line;
at = nl + 1;
}
out.ch = (at ? 0 : out.ch) + (str.length - at);
- if (other)
- other.ch = (at ? 0 : other.ch) + (str.length - at);
+ if (other) other.ch = (at ? 0 : other.ch) + (str.length - at);
return out;
}
var F_WIDGET = 1, F_WIDGET_BELOW = 2, F_MARKER = 4;
@@ -11730,11 +11630,9 @@ function requireMerge() {
this.height = cm.doc.height;
var self2 = this;
cm.on("markerAdded", function(_2, marker) {
- if (!marker.collapsed)
- return;
+ if (!marker.collapsed) return;
var found = marker.find(1);
- if (found != null)
- self2.set(found.line, F_MARKER);
+ if (found != null) self2.set(found.line, F_MARKER);
});
cm.on("markerCleared", function(_2, marker, _min, max) {
if (max != null && marker.collapsed)
@@ -11742,34 +11640,25 @@ function requireMerge() {
});
cm.on("markerChanged", this.signal.bind(this));
cm.on("lineWidgetAdded", function(_2, widget, lineNo) {
- if (widget.mergeSpacer)
- return;
- if (widget.above)
- self2.set(lineNo - 1, F_WIDGET_BELOW);
- else
- self2.set(lineNo, F_WIDGET);
+ if (widget.mergeSpacer) return;
+ if (widget.above) self2.set(lineNo - 1, F_WIDGET_BELOW);
+ else self2.set(lineNo, F_WIDGET);
});
cm.on("lineWidgetCleared", function(_2, widget, lineNo) {
- if (widget.mergeSpacer)
- return;
- if (widget.above)
- self2.check(lineNo - 1, F_WIDGET_BELOW, self2.hasWidgetBelow);
- else
- self2.check(lineNo, F_WIDGET, self2.hasWidget);
+ if (widget.mergeSpacer) return;
+ if (widget.above) self2.check(lineNo - 1, F_WIDGET_BELOW, self2.hasWidgetBelow);
+ else self2.check(lineNo, F_WIDGET, self2.hasWidget);
});
cm.on("lineWidgetChanged", this.signal.bind(this));
cm.on("change", function(_2, change) {
var start = change.from.line, nBefore = change.to.line - change.from.line;
var nAfter = change.text.length - 1, end = start + nAfter;
- if (nBefore || nAfter)
- self2.map(start, nBefore, nAfter);
+ if (nBefore || nAfter) self2.map(start, nBefore, nAfter);
self2.check(end, F_MARKER, self2.hasMarker);
- if (nBefore || nAfter)
- self2.check(change.from.line, F_MARKER, self2.hasMarker);
+ if (nBefore || nAfter) self2.check(change.from.line, F_MARKER, self2.hasMarker);
});
cm.on("viewportChange", function() {
- if (self2.cm.doc.height != self2.height)
- self2.signal();
+ if (self2.cm.doc.height != self2.height) self2.signal();
});
}
TrackAlignable.prototype = {
@@ -11782,35 +11671,29 @@ function requireMerge() {
for (; pos < this.alignable.length; pos += 2) {
var diff = this.alignable[pos] - n2;
if (diff == 0) {
- if ((this.alignable[pos + 1] & flags) == flags)
- return;
+ if ((this.alignable[pos + 1] & flags) == flags) return;
this.alignable[pos + 1] |= flags;
this.signal();
return;
}
- if (diff > 0)
- break;
+ if (diff > 0) break;
}
this.signal();
this.alignable.splice(pos, 0, n2, flags);
},
find: function(n2) {
for (var i2 = 0; i2 < this.alignable.length; i2 += 2)
- if (this.alignable[i2] == n2)
- return i2;
+ if (this.alignable[i2] == n2) return i2;
return -1;
},
check: function(n2, flag, pred) {
var found = this.find(n2);
- if (found == -1 || !(this.alignable[found + 1] & flag))
- return;
+ if (found == -1 || !(this.alignable[found + 1] & flag)) return;
if (!pred.call(this, n2)) {
this.signal();
var flags = this.alignable[found + 1] & ~flag;
- if (flags)
- this.alignable[found + 1] = flags;
- else
- this.alignable.splice(found, 2);
+ if (flags) this.alignable[found + 1] = flags;
+ else this.alignable.splice(found, 2);
}
},
hasMarker: function(n2) {
@@ -11826,19 +11709,16 @@ function requireMerge() {
var handle = this.cm.getLineHandle(n2);
if (handle.widgets) {
for (var i2 = 0; i2 < handle.widgets.length; i2++)
- if (!handle.widgets[i2].above && !handle.widgets[i2].mergeSpacer)
- return true;
+ if (!handle.widgets[i2].above && !handle.widgets[i2].mergeSpacer) return true;
}
return false;
},
hasWidgetBelow: function(n2) {
- if (n2 == this.cm.lastLine())
- return false;
+ if (n2 == this.cm.lastLine()) return false;
var handle = this.cm.getLineHandle(n2 + 1);
if (handle.widgets) {
for (var i2 = 0; i2 < handle.widgets.length; i2++)
- if (handle.widgets[i2].above && !handle.widgets[i2].mergeSpacer)
- return true;
+ if (handle.widgets[i2].above && !handle.widgets[i2].mergeSpacer) return true;
}
return false;
},
@@ -11846,23 +11726,16 @@ function requireMerge() {
var diff = nAfter - nBefore, to = from + nBefore, widgetFrom = -1, widgetTo = -1;
for (var i2 = 0; i2 < this.alignable.length; i2 += 2) {
var n2 = this.alignable[i2];
- if (n2 == from && this.alignable[i2 + 1] & F_WIDGET_BELOW)
- widgetFrom = i2;
- if (n2 == to && this.alignable[i2 + 1] & F_WIDGET_BELOW)
- widgetTo = i2;
- if (n2 <= from)
- continue;
- else if (n2 < to)
- this.alignable.splice(i2--, 2);
- else
- this.alignable[i2] += diff;
+ if (n2 == from && this.alignable[i2 + 1] & F_WIDGET_BELOW) widgetFrom = i2;
+ if (n2 == to && this.alignable[i2 + 1] & F_WIDGET_BELOW) widgetTo = i2;
+ if (n2 <= from) continue;
+ else if (n2 < to) this.alignable.splice(i2--, 2);
+ else this.alignable[i2] += diff;
}
if (widgetFrom > -1) {
var flags = this.alignable[widgetFrom + 1];
- if (flags == F_WIDGET_BELOW)
- this.alignable.splice(widgetFrom, 2);
- else
- this.alignable[widgetFrom + 1] = flags & ~F_WIDGET_BELOW;
+ if (flags == F_WIDGET_BELOW) this.alignable.splice(widgetFrom, 2);
+ else this.alignable[widgetFrom + 1] = flags & ~F_WIDGET_BELOW;
}
if (widgetTo > -1 && nAfter)
this.set(from + nAfter, F_WIDGET_BELOW);
@@ -11881,28 +11754,25 @@ function requireMerge() {
for (var i2 = chunks.length - 1; i2 >= 0; i2--) {
var chunk = chunks[i2];
var to = (isOrig ? chunk.origTo : chunk.editTo) - 1;
- if (to < start)
- return to;
+ if (to < start) return to;
}
}
function findNextDiff(chunks, start, isOrig) {
for (var i2 = 0; i2 < chunks.length; i2++) {
var chunk = chunks[i2];
var from = isOrig ? chunk.origFrom : chunk.editFrom;
- if (from > start)
- return from;
+ if (from > start) return from;
}
}
function goNearbyDiff(cm, dir) {
var found = null, views = cm.state.diffViews, line = cm.getCursor().line;
- if (views)
- for (var i2 = 0; i2 < views.length; i2++) {
- var dv = views[i2], isOrig = cm == dv.orig;
- ensureDiff(dv);
- var pos = dir < 0 ? findPrevDiff(dv.chunks, line, isOrig) : findNextDiff(dv.chunks, line, isOrig);
- if (pos != null && (found == null || (dir < 0 ? pos > found : pos < found)))
- found = pos;
- }
+ if (views) for (var i2 = 0; i2 < views.length; i2++) {
+ var dv = views[i2], isOrig = cm == dv.orig;
+ ensureDiff(dv);
+ var pos = dir < 0 ? findPrevDiff(dv.chunks, line, isOrig) : findNextDiff(dv.chunks, line, isOrig);
+ if (pos != null && (found == null || (dir < 0 ? pos > found : pos < found)))
+ found = pos;
+ }
if (found != null)
cm.setCursor(found, 0);
else
@@ -11922,8 +11792,7 @@ requireMerge();
var diff_match_patch$1 = {};
var hasRequiredDiff_match_patch;
function requireDiff_match_patch() {
- if (hasRequiredDiff_match_patch)
- return diff_match_patch$1;
+ if (hasRequiredDiff_match_patch) return diff_match_patch$1;
hasRequiredDiff_match_patch = 1;
(function(exports) {
function diff_match_patch2() {
@@ -13311,8 +13180,7 @@ function requireDiff_match_patch() {
patch.diffs.push([DIFF_EQUAL2, line]);
} else if (sign == "@") {
break;
- } else if (sign === "")
- ;
+ } else if (sign === "") ;
else {
throw new Error('Invalid patch mode "' + sign + '" in: ' + line);
}
@@ -13384,8 +13252,7 @@ globalThis.DIFF_DELETE = diff_match_patchExports.DIFF_DELETE;
const t = globalThis, i = t.trustedTypes, s = i ? i.createPolicy("lit-html", { createHTML: (t2) => t2 }) : void 0, e = "$lit$", h = `lit$${Math.random().toFixed(9).slice(2)}$`, o = "?" + h, n = `<${o}>`, r = document, l = () => r.createComment(""), c = (t2) => null === t2 || "object" != typeof t2 && "function" != typeof t2, a = Array.isArray, u = (t2) => a(t2) || "function" == typeof (t2 == null ? void 0 : t2[Symbol.iterator]), d = "[ \n\f\r]", f = /<(?:(!--|\/[^a-zA-Z])|(\/?[a-zA-Z][^>\s]*)|(\/?$))/g, v = /-->/g, _ = />/g, m = RegExp(`>|${d}(?:([^\\s"'>=/]+)(${d}*=${d}*(?:[^
\f\r"'\`<>=]|("|')|))|$)`, "g"), p = /'/g, g = /"/g, $ = /^(?:script|style|textarea|title)$/i, y = (t2) => (i2, ...s2) => ({ _$litType$: t2, strings: i2, values: s2 }), x = y(1), w = Symbol.for("lit-noChange"), T = Symbol.for("lit-nothing"), A = /* @__PURE__ */ new WeakMap(), E = r.createTreeWalker(r, 129);
function C(t2, i2) {
- if (!Array.isArray(t2) || !t2.hasOwnProperty("raw"))
- throw Error("invalid template strings array");
+ if (!Array.isArray(t2) || !t2.hasOwnProperty("raw")) throw Error("invalid template strings array");
return void 0 !== s ? s.createHTML(i2) : i2;
}
const P = (t2, i2) => {
@@ -13394,8 +13261,7 @@ const P = (t2, i2) => {
for (let i3 = 0; i3 < s2; i3++) {
const s3 = t2[i3];
let a2, u2, d2 = -1, y2 = 0;
- for (; y2 < s3.length && (c2.lastIndex = y2, u2 = c2.exec(s3), null !== u2); )
- y2 = c2.lastIndex, c2 === f ? "!--" === u2[1] ? c2 = v : void 0 !== u2[1] ? c2 = _ : void 0 !== u2[2] ? ($.test(u2[2]) && (r2 = RegExp("" === u2[0] ? (c2 = r2 ?? f, d2 = -1) : void 0 === u2[1] ? d2 = -2 : (d2 = c2.lastIndex - u2[2].length, a2 = u2[1], c2 = void 0 === u2[3] ? m : '"' === u2[3] ? g : p) : c2 === g || c2 === p ? c2 = m : c2 === v || c2 === _ ? c2 = f : (c2 = m, r2 = void 0);
+ for (; y2 < s3.length && (c2.lastIndex = y2, u2 = c2.exec(s3), null !== u2); ) y2 = c2.lastIndex, c2 === f ? "!--" === u2[1] ? c2 = v : void 0 !== u2[1] ? c2 = _ : void 0 !== u2[2] ? ($.test(u2[2]) && (r2 = RegExp("" === u2[0] ? (c2 = r2 ?? f, d2 = -1) : void 0 === u2[1] ? d2 = -2 : (d2 = c2.lastIndex - u2[2].length, a2 = u2[1], c2 = void 0 === u2[3] ? m : '"' === u2[3] ? g : p) : c2 === g || c2 === p ? c2 = m : c2 === v || c2 === _ ? c2 = f : (c2 = m, r2 = void 0);
const x2 = c2 === m && t2[i3 + 1].startsWith("/>") ? " " : "";
l2 += c2 === f ? s3 + n : d2 >= 0 ? (o2.push(a2), s3.slice(0, d2) + e + s3.slice(d2) + h + x2) : s3 + h + (-2 === d2 ? i3 : x2);
}
@@ -13413,30 +13279,23 @@ class V {
}
for (; null !== (r2 = E.nextNode()) && d2.length < u2; ) {
if (1 === r2.nodeType) {
- if (r2.hasAttributes())
- for (const t3 of r2.getAttributeNames())
- if (t3.endsWith(e)) {
- const i2 = v2[a2++], s3 = r2.getAttribute(t3).split(h), e2 = /([.?@])?(.*)/.exec(i2);
- d2.push({ type: 1, index: c2, name: e2[2], strings: s3, ctor: "." === e2[1] ? k : "?" === e2[1] ? H : "@" === e2[1] ? I : R }), r2.removeAttribute(t3);
- } else
- t3.startsWith(h) && (d2.push({ type: 6, index: c2 }), r2.removeAttribute(t3));
+ if (r2.hasAttributes()) for (const t3 of r2.getAttributeNames()) if (t3.endsWith(e)) {
+ const i2 = v2[a2++], s3 = r2.getAttribute(t3).split(h), e2 = /([.?@])?(.*)/.exec(i2);
+ d2.push({ type: 1, index: c2, name: e2[2], strings: s3, ctor: "." === e2[1] ? k : "?" === e2[1] ? H : "@" === e2[1] ? I : R }), r2.removeAttribute(t3);
+ } else t3.startsWith(h) && (d2.push({ type: 6, index: c2 }), r2.removeAttribute(t3));
if ($.test(r2.tagName)) {
const t3 = r2.textContent.split(h), s3 = t3.length - 1;
if (s3 > 0) {
r2.textContent = i ? i.emptyScript : "";
- for (let i2 = 0; i2 < s3; i2++)
- r2.append(t3[i2], l()), E.nextNode(), d2.push({ type: 2, index: ++c2 });
+ for (let i2 = 0; i2 < s3; i2++) r2.append(t3[i2], l()), E.nextNode(), d2.push({ type: 2, index: ++c2 });
r2.append(t3[s3], l());
}
}
- } else if (8 === r2.nodeType)
- if (r2.data === o)
- d2.push({ type: 2, index: c2 });
- else {
- let t3 = -1;
- for (; -1 !== (t3 = r2.data.indexOf(h, t3 + 1)); )
- d2.push({ type: 7, index: c2 }), t3 += h.length - 1;
- }
+ } else if (8 === r2.nodeType) if (r2.data === o) d2.push({ type: 2, index: c2 });
+ else {
+ let t3 = -1;
+ for (; -1 !== (t3 = r2.data.indexOf(h, t3 + 1)); ) d2.push({ type: 7, index: c2 }), t3 += h.length - 1;
+ }
c2++;
}
}
@@ -13447,8 +13306,7 @@ class V {
}
function N(t2, i2, s2 = t2, e2) {
var _a, _b;
- if (i2 === w)
- return i2;
+ if (i2 === w) return i2;
let h2 = void 0 !== e2 ? (_a = s2._$Co) == null ? void 0 : _a[e2] : s2._$Cl;
const o2 = c(i2) ? void 0 : i2._$litDirective$;
return (h2 == null ? void 0 : h2.constructor) !== o2 && ((_b = h2 == null ? void 0 : h2._$AO) == null ? void 0 : _b.call(h2, false), void 0 === o2 ? h2 = void 0 : (h2 = new o2(t2), h2._$AT(t2, s2, e2)), void 0 !== e2 ? (s2._$Co ?? (s2._$Co = []))[e2] = h2 : s2._$Cl = h2), void 0 !== h2 && (i2 = N(t2, h2._$AS(t2, i2.values), h2, e2)), i2;
@@ -13478,8 +13336,7 @@ class S {
}
p(t2) {
let i2 = 0;
- for (const s2 of this._$AV)
- void 0 !== s2 && (void 0 !== s2.strings ? (s2._$AI(t2, s2, i2), i2 += s2.strings.length - 2) : s2._$AI(t2[i2])), i2++;
+ for (const s2 of this._$AV) void 0 !== s2 && (void 0 !== s2.strings ? (s2._$AI(t2, s2, i2), i2 += s2.strings.length - 2) : s2._$AI(t2[i2])), i2++;
}
}
class M {
@@ -13516,8 +13373,7 @@ class M {
$(t2) {
var _a;
const { values: i2, _$litType$: s2 } = t2, e2 = "number" == typeof s2 ? this._$AC(t2) : (void 0 === s2.el && (s2.el = V.createElement(C(s2.h, s2.h[0]), this.options)), s2);
- if (((_a = this._$AH) == null ? void 0 : _a._$AD) === e2)
- this._$AH.p(i2);
+ if (((_a = this._$AH) == null ? void 0 : _a._$AD) === e2) this._$AH.p(i2);
else {
const t3 = new S(e2, this), s3 = t3.u(this.options);
t3.p(i2), this.T(s3), this._$AH = t3;
@@ -13531,8 +13387,7 @@ class M {
a(this._$AH) || (this._$AH = [], this._$AR());
const i2 = this._$AH;
let s2, e2 = 0;
- for (const h2 of t2)
- e2 === i2.length ? i2.push(s2 = new M(this.S(l()), this.S(l()), this, this.options)) : s2 = i2[e2], s2._$AI(h2), e2++;
+ for (const h2 of t2) e2 === i2.length ? i2.push(s2 = new M(this.S(l()), this.S(l()), this, this.options)) : s2 = i2[e2], s2._$AI(h2), e2++;
e2 < i2.length && (this._$AR(s2 && s2._$AB.nextSibling, e2), i2.length = e2);
}
_$AR(t2 = this._$AA.nextSibling, i2) {
@@ -13560,13 +13415,11 @@ class R {
_$AI(t2, i2 = this, s2, e2) {
const h2 = this.strings;
let o2 = false;
- if (void 0 === h2)
- t2 = N(this, t2, i2, 0), o2 = !c(t2) || t2 !== this._$AH && t2 !== w, o2 && (this._$AH = t2);
+ if (void 0 === h2) t2 = N(this, t2, i2, 0), o2 = !c(t2) || t2 !== this._$AH && t2 !== w, o2 && (this._$AH = t2);
else {
const e3 = t2;
let n2, r2;
- for (t2 = h2[0], n2 = 0; n2 < h2.length - 1; n2++)
- r2 = N(this, e3[s2 + n2], i2, n2), r2 === w && (r2 = this._$AH[n2]), o2 || (o2 = !c(r2) || r2 !== this._$AH[n2]), r2 === T ? t2 = T : t2 !== T && (t2 += (r2 ?? "") + h2[n2 + 1]), this._$AH[n2] = r2;
+ for (t2 = h2[0], n2 = 0; n2 < h2.length - 1; n2++) r2 = N(this, e3[s2 + n2], i2, n2), r2 === w && (r2 = this._$AH[n2]), o2 || (o2 = !c(r2) || r2 !== this._$AH[n2]), r2 === T ? t2 = T : t2 !== T && (t2 += (r2 ?? "") + h2[n2 + 1]), this._$AH[n2] = r2;
}
o2 && !e2 && this.j(t2);
}
@@ -13595,8 +13448,7 @@ class I extends R {
super(t2, i2, s2, e2, h2), this.type = 5;
}
_$AI(t2, i2 = this) {
- if ((t2 = N(this, t2, i2, 0) ?? T) === w)
- return;
+ if ((t2 = N(this, t2, i2, 0) ?? T) === w) return;
const s2 = this._$AH, e2 = t2 === T && s2 !== T || t2.capture !== s2.capture || t2.once !== s2.once || t2.passive !== s2.passive, h2 = t2 !== T && (s2 === T || e2);
e2 && this.element.removeEventListener(this.name, this, s2), h2 && this.element.addEventListener(this.name, this, t2), this._$AH = t2;
}
@@ -13617,7 +13469,7 @@ class L {
}
}
const Z = t.litHtmlPolyfillSupport;
-Z == null ? void 0 : Z(V, M), (t.litHtmlVersions ?? (t.litHtmlVersions = [])).push("3.1.3");
+Z == null ? void 0 : Z(V, M), (t.litHtmlVersions ?? (t.litHtmlVersions = [])).push("3.1.4");
const j = (t2, i2, s2) => {
const e2 = i2;
let h2 = e2._$litPart$;
diff --git a/webapp/dist/index.html b/webapp/dist/index.html
index 9b12d96..08adeec 100644
--- a/webapp/dist/index.html
+++ b/webapp/dist/index.html
@@ -10,7 +10,7 @@
/>
Diffedit3
-
+