@pierre/diffs 1.1.2 → 1.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (89) hide show
  1. package/dist/components/AdvancedVirtualizedFileDiff.d.ts.map +1 -1
  2. package/dist/components/File.d.ts.map +1 -1
  3. package/dist/components/FileDiff.d.ts +4 -4
  4. package/dist/components/FileDiff.d.ts.map +1 -1
  5. package/dist/components/FileDiff.js.map +1 -1
  6. package/dist/components/UnresolvedFile.d.ts +18 -9
  7. package/dist/components/UnresolvedFile.d.ts.map +1 -1
  8. package/dist/components/UnresolvedFile.js +199 -57
  9. package/dist/components/UnresolvedFile.js.map +1 -1
  10. package/dist/components/VirtulizerDevelopment.d.ts.map +1 -1
  11. package/dist/constants.d.ts +5 -1
  12. package/dist/constants.d.ts.map +1 -1
  13. package/dist/constants.js +5 -1
  14. package/dist/constants.js.map +1 -1
  15. package/dist/index.d.ts +7 -6
  16. package/dist/index.js +5 -4
  17. package/dist/react/UnresolvedFile.d.ts +3 -1
  18. package/dist/react/UnresolvedFile.d.ts.map +1 -1
  19. package/dist/react/UnresolvedFile.js.map +1 -1
  20. package/dist/react/index.d.ts +2 -2
  21. package/dist/react/jsx.d.ts.map +1 -1
  22. package/dist/react/utils/renderDiffChildren.d.ts +1 -1
  23. package/dist/react/utils/renderDiffChildren.d.ts.map +1 -1
  24. package/dist/react/utils/renderDiffChildren.js +6 -4
  25. package/dist/react/utils/renderDiffChildren.js.map +1 -1
  26. package/dist/react/utils/useUnresolvedFileInstance.d.ts +5 -4
  27. package/dist/react/utils/useUnresolvedFileInstance.d.ts.map +1 -1
  28. package/dist/react/utils/useUnresolvedFileInstance.js +15 -12
  29. package/dist/react/utils/useUnresolvedFileInstance.js.map +1 -1
  30. package/dist/renderers/DiffHunksRenderer.d.ts +15 -7
  31. package/dist/renderers/DiffHunksRenderer.d.ts.map +1 -1
  32. package/dist/renderers/DiffHunksRenderer.js +9 -7
  33. package/dist/renderers/DiffHunksRenderer.js.map +1 -1
  34. package/dist/renderers/UnresolvedFileHunksRenderer.d.ts +11 -16
  35. package/dist/renderers/UnresolvedFileHunksRenderer.d.ts.map +1 -1
  36. package/dist/renderers/UnresolvedFileHunksRenderer.js +68 -75
  37. package/dist/renderers/UnresolvedFileHunksRenderer.js.map +1 -1
  38. package/dist/ssr/index.d.ts +2 -2
  39. package/dist/ssr/preloadDiffs.d.ts +2 -2
  40. package/dist/ssr/preloadDiffs.d.ts.map +1 -1
  41. package/dist/ssr/preloadDiffs.js +4 -3
  42. package/dist/ssr/preloadDiffs.js.map +1 -1
  43. package/dist/style.js +1 -1
  44. package/dist/style.js.map +1 -1
  45. package/dist/types.d.ts +41 -1
  46. package/dist/types.d.ts.map +1 -1
  47. package/dist/utils/areMergeConflictActionsEqual.js +1 -1
  48. package/dist/utils/areMergeConflictActionsEqual.js.map +1 -1
  49. package/dist/utils/diffAcceptRejectHunk.d.ts +3 -2
  50. package/dist/utils/diffAcceptRejectHunk.d.ts.map +1 -1
  51. package/dist/utils/diffAcceptRejectHunk.js +24 -89
  52. package/dist/utils/diffAcceptRejectHunk.js.map +1 -1
  53. package/dist/utils/getMergeConflictActionSlotName.d.ts +4 -6
  54. package/dist/utils/getMergeConflictActionSlotName.d.ts.map +1 -1
  55. package/dist/utils/getMergeConflictActionSlotName.js +2 -2
  56. package/dist/utils/getMergeConflictActionSlotName.js.map +1 -1
  57. package/dist/utils/getMergeConflictLineTypes.d.ts +1 -2
  58. package/dist/utils/getMergeConflictLineTypes.d.ts.map +1 -1
  59. package/dist/utils/getMergeConflictLineTypes.js +7 -12
  60. package/dist/utils/getMergeConflictLineTypes.js.map +1 -1
  61. package/dist/utils/normalizeDiffResolution.d.ts +7 -0
  62. package/dist/utils/normalizeDiffResolution.d.ts.map +1 -0
  63. package/dist/utils/normalizeDiffResolution.js +11 -0
  64. package/dist/utils/normalizeDiffResolution.js.map +1 -0
  65. package/dist/utils/parseMergeConflictDiffFromFile.d.ts +16 -12
  66. package/dist/utils/parseMergeConflictDiffFromFile.d.ts.map +1 -1
  67. package/dist/utils/parseMergeConflictDiffFromFile.js +474 -117
  68. package/dist/utils/parseMergeConflictDiffFromFile.js.map +1 -1
  69. package/dist/utils/resolveConflict.d.ts +7 -0
  70. package/dist/utils/resolveConflict.d.ts.map +1 -0
  71. package/dist/utils/resolveConflict.js +23 -0
  72. package/dist/utils/resolveConflict.js.map +1 -0
  73. package/dist/utils/resolveRegion.d.ts +14 -0
  74. package/dist/utils/resolveRegion.d.ts.map +1 -0
  75. package/dist/utils/resolveRegion.js +215 -0
  76. package/dist/utils/resolveRegion.js.map +1 -0
  77. package/dist/utils/trimPatchContext.js +19 -20
  78. package/dist/utils/trimPatchContext.js.map +1 -1
  79. package/dist/worker/{wasm-BlUZCxHM.js → wasm-BaDzIkIn.js} +2 -2
  80. package/dist/worker/wasm-BaDzIkIn.js.map +1 -0
  81. package/dist/worker/worker-portable.js +4880 -4810
  82. package/dist/worker/worker-portable.js.map +1 -1
  83. package/dist/worker/worker.js.map +1 -1
  84. package/package.json +2 -1
  85. package/dist/utils/resolveMergeConflict.d.ts +0 -7
  86. package/dist/utils/resolveMergeConflict.d.ts.map +0 -1
  87. package/dist/utils/resolveMergeConflict.js +0 -30
  88. package/dist/utils/resolveMergeConflict.js.map +0 -1
  89. package/dist/worker/wasm-BlUZCxHM.js.map +0 -1

There are too many changes on this page to be displayed.

The amount of changes on this page would crash your brower.

You can still verify the content by downloading the package file manually.