remanso-space/remanso
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(deps): add node-diff3 for three-way merge

Browse Source
This commit is contained in:
Julien Calixte
2026-06-30 00:26:54 +02:00
parent 57ef4a9e50
commit c2764deb49
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@@ -49,6 +49,7 @@
"markdown-it-shikiji": "^0.10.2", "markdown-it-shikiji": "^0.10.2",
"mermaid": "^11.12.1", "mermaid": "^11.12.1",
"nanoid": "^5.1.6", "nanoid": "^5.1.6",
"node-diff3": "^3.2.1",
"notyf": "^3.10.0", "notyf": "^3.10.0",
"pastel-color": "^1.0.3", "pastel-color": "^1.0.3",
"pinia": "^2.2.6", "pinia": "^2.2.6",

9
pnpm-lock.yaml generated
View File

@@ -104,6 +104,9 @@ importers:
nanoid: nanoid:
specifier: ^5.1.6 specifier: ^5.1.6
version: 5.1.6 version: 5.1.6
node-diff3:
specifier: ^3.2.1
version: 3.2.1
notyf: notyf:
specifier: ^3.10.0 specifier: ^3.10.0
version: 3.10.0 version: 3.10.0
@@ -5130,6 +5133,10 @@ packages:
node-addon-api@7.1.1: node-addon-api@7.1.1:
resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==} resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==}
node-diff3@3.2.1:
resolution: {integrity: sha512-eKZcJ8RtMQ3cIaA15EgmtwG927fYnRlhtdA4Q9HAcCpAZPQhhU2XptnTH9GeAkMiX2bAXxlJSAFa9shFbztPgw==}
engines: {bun: '>=1.3.10'}
node-fetch@2.6.12: node-fetch@2.6.12:
resolution: {integrity: sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==} resolution: {integrity: sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==}
engines: {node: 4.x || >=6.0.0} engines: {node: 4.x || >=6.0.0}
@@ -12079,6 +12086,8 @@ snapshots:
node-addon-api@7.1.1: node-addon-api@7.1.1:
optional: true optional: true
node-diff3@3.2.1: {}
node-fetch@2.6.12: node-fetch@2.6.12:
dependencies: dependencies:
whatwg-url: 5.0.0 whatwg-url: 5.0.0