diff2html 3.4.11 β 3.4.15
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.
- package/README.md +79 -33
- package/bundles/js/diff2html-ui-base.min.js +1 -1
- package/bundles/js/diff2html-ui-slim.min.js +1 -1
- package/bundles/js/diff2html-ui.min.js +1 -1
- package/bundles/js/diff2html.min.js +1 -1
- package/lib/diff-parser.js +10 -6
- package/lib/diff-parser.js.map +1 -1
- package/lib/render-utils.js +3 -3
- package/lib/render-utils.js.map +1 -1
- package/lib/ui/js/diff2html-ui-base.js +5 -5
- package/lib/ui/js/diff2html-ui-base.js.map +1 -1
- package/lib-esm/diff-parser.js +9 -5
- package/lib-esm/diff-parser.js.map +1 -1
- package/package.json +33 -32
package/README.md
CHANGED
|
@@ -269,12 +269,12 @@ document.addEventListener('DOMContentLoaded', () => {
|
|
|
269
269
|
</head>
|
|
270
270
|
<script>
|
|
271
271
|
const diffString = `diff --git a/sample.js b/sample.js
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
272
|
+
index 0000001..0ddf2ba
|
|
273
|
+
--- a/sample.js
|
|
274
|
+
+++ b/sample.js
|
|
275
|
+
@@ -1 +1 @@
|
|
276
|
+
-console.log("Hello World!")
|
|
277
|
+
+console.log("Hello from Diff2Html!")`;
|
|
278
278
|
|
|
279
279
|
document.addEventListener('DOMContentLoaded', function () {
|
|
280
280
|
var targetElement = document.getElementById('myDiffElement');
|
|
@@ -300,6 +300,41 @@ document.addEventListener('DOMContentLoaded', () => {
|
|
|
300
300
|
</html>
|
|
301
301
|
```
|
|
302
302
|
|
|
303
|
+
#### StimulusJS with TypeScript
|
|
304
|
+
|
|
305
|
+
```ts
|
|
306
|
+
import { Controller } from '@hotwired/stimulus';
|
|
307
|
+
|
|
308
|
+
import { Diff2HtmlUI, Diff2HtmlUIConfig } from 'diff2html/lib/ui/js/diff2html-ui-slim.js';
|
|
309
|
+
|
|
310
|
+
// Requires `yarn add highlight.js`
|
|
311
|
+
import 'highlight.js/styles/github.css';
|
|
312
|
+
import 'diff2html/bundles/css/diff2html.min.css';
|
|
313
|
+
|
|
314
|
+
export default class extends Controller {
|
|
315
|
+
connect(): void {
|
|
316
|
+
const diff2htmlUi = new Diff2HtmlUI(this.diffElement, this.unifiedDiff, this.diffConfiguration);
|
|
317
|
+
|
|
318
|
+
diff2htmlUi.draw();
|
|
319
|
+
}
|
|
320
|
+
|
|
321
|
+
get unifiedDiff(): string {
|
|
322
|
+
return this.data.get('unifiedDiff') || '';
|
|
323
|
+
}
|
|
324
|
+
|
|
325
|
+
get diffElement(): HTMLElement {
|
|
326
|
+
return this.element as HTMLElement;
|
|
327
|
+
}
|
|
328
|
+
|
|
329
|
+
get diffConfiguration(): Diff2HtmlUIConfig {
|
|
330
|
+
return {
|
|
331
|
+
drawFileList: true,
|
|
332
|
+
matching: 'lines',
|
|
333
|
+
};
|
|
334
|
+
}
|
|
335
|
+
}
|
|
336
|
+
```
|
|
337
|
+
|
|
303
338
|
## Diff2Html Usage
|
|
304
339
|
|
|
305
340
|
### Diff2Html API
|
|
@@ -494,42 +529,53 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
|
|
|
494
529
|
<!-- markdownlint-disable -->
|
|
495
530
|
<table>
|
|
496
531
|
<tr>
|
|
497
|
-
<td align="center"><a href="https://rtfpessoa.xyz"><img src="https://avatars0.githubusercontent.com/u/902384?v=4" width="100px;" alt=""/><br /><sub><b>Rodrigo Fernandes</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/commits?author=rtfpessoa" title="Code">π»</a></td>
|
|
498
|
-
<td align="center"><a href="https://github.com/stockmind"><img src="https://avatars3.githubusercontent.com/u/5653847?v=4" width="100px;" alt=""/><br /><sub><b>stockmind</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/commits?author=stockmind" title="Code">π»</a></td>
|
|
499
|
-
<td align="center"><a href="https://github.com/lantian"><img src="https://avatars3.githubusercontent.com/u/535545?v=4" width="100px;" alt=""/><br /><sub><b>Ivan Vorontsov</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/commits?author=lantian" title="Code">π»</a></td>
|
|
500
|
-
<td align="center"><a href="http://www.nick-brewer.com"><img src="https://avatars1.githubusercontent.com/u/129300?v=4" width="100px;" alt=""/><br /><sub><b>Nick Brewer</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/commits?author=brewern" title="Code">π»</a></td>
|
|
501
|
-
<td align="center"><a href="http://heyitsmattwade.com"><img src="https://avatars0.githubusercontent.com/u/8504000?v=4" width="100px;" alt=""/><br /><sub><b>Matt Wade</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/issues?q=author%3Aromellem" title="Bug reports">π</a></td>
|
|
502
|
-
<td align="center"><a href="http://mrfyda.github.io"><img src="https://avatars1.githubusercontent.com/u/593860?v=4" width="100px;" alt=""/><br /><sub><b>Rafael CortΓͺs</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/commits?author=mrfyda" title="Code">π»</a></td>
|
|
503
|
-
<td align="center"><a href="https://github.com/nmatpt"><img src="https://avatars2.githubusercontent.com/u/5034733?v=4" width="100px;" alt=""/><br /><sub><b>Nuno Teixeira</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/commits?author=nmatpt" title="Code">π»</a></td>
|
|
532
|
+
<td align="center"><a href="https://rtfpessoa.xyz"><img src="https://avatars0.githubusercontent.com/u/902384?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rodrigo Fernandes</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/commits?author=rtfpessoa" title="Code">π»</a></td>
|
|
533
|
+
<td align="center"><a href="https://github.com/stockmind"><img src="https://avatars3.githubusercontent.com/u/5653847?v=4?s=100" width="100px;" alt=""/><br /><sub><b>stockmind</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/commits?author=stockmind" title="Code">π»</a></td>
|
|
534
|
+
<td align="center"><a href="https://github.com/lantian"><img src="https://avatars3.githubusercontent.com/u/535545?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ivan Vorontsov</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/commits?author=lantian" title="Code">π»</a></td>
|
|
535
|
+
<td align="center"><a href="http://www.nick-brewer.com"><img src="https://avatars1.githubusercontent.com/u/129300?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nick Brewer</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/commits?author=brewern" title="Code">π»</a></td>
|
|
536
|
+
<td align="center"><a href="http://heyitsmattwade.com"><img src="https://avatars0.githubusercontent.com/u/8504000?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matt Wade</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/issues?q=author%3Aromellem" title="Bug reports">π</a> <a href="https://github.com/rtfpessoa/diff2html/commits?author=romellem" title="Code">π»</a></td>
|
|
537
|
+
<td align="center"><a href="http://mrfyda.github.io"><img src="https://avatars1.githubusercontent.com/u/593860?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rafael CortΓͺs</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/commits?author=mrfyda" title="Code">π»</a></td>
|
|
538
|
+
<td align="center"><a href="https://github.com/nmatpt"><img src="https://avatars2.githubusercontent.com/u/5034733?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nuno Teixeira</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/commits?author=nmatpt" title="Code">π»</a></td>
|
|
539
|
+
</tr>
|
|
540
|
+
<tr>
|
|
541
|
+
<td align="center"><a href="https://saino.me/"><img src="https://avatars0.githubusercontent.com/u/1567423?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Koki Oyatsu</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/issues?q=author%3Akaishuu0123" title="Bug reports">π</a> <a href="https://github.com/rtfpessoa/diff2html/commits?author=kaishuu0123" title="Code">π»</a></td>
|
|
542
|
+
<td align="center"><a href="http://www.jamesmonger.com"><img src="https://avatars2.githubusercontent.com/u/2037007?v=4?s=100" width="100px;" alt=""/><br /><sub><b>James Monger</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/commits?author=Jameskmonger" title="Documentation">π</a></td>
|
|
543
|
+
<td align="center"><a href="http://wesssel.github.io/"><img src="https://avatars2.githubusercontent.com/u/7767299?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wessel van der Pal</b></sub></a><br /><a href="#security-wesssel" title="Security">π‘οΈ</a> <a href="https://github.com/rtfpessoa/diff2html/commits?author=wesssel" title="Code">π»</a></td>
|
|
544
|
+
<td align="center"><a href="https://jung-kim.github.io"><img src="https://avatars2.githubusercontent.com/u/5281068?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jk-kim</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/commits?author=jung-kim" title="Code">π»</a></td>
|
|
545
|
+
<td align="center"><a href="https://github.com/sss0791"><img src="https://avatars1.githubusercontent.com/u/1446970?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sergey Semenov</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/issues?q=author%3Asss0791" title="Bug reports">π</a> <a href="https://github.com/rtfpessoa/diff2html/commits?author=sss0791" title="Code">π»</a></td>
|
|
546
|
+
<td align="center"><a href="http://researcher.watson.ibm.com/researcher/view.php?person=us-nickm"><img src="https://avatars3.githubusercontent.com/u/4741620?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nick Mitchell</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/issues?q=author%3Astarpit" title="Bug reports">π</a> <a href="https://github.com/rtfpessoa/diff2html/commits?author=starpit" title="Code">π»</a></td>
|
|
547
|
+
<td align="center"><a href="https://github.com/samiraguiar"><img src="https://avatars0.githubusercontent.com/u/13439135?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Samir Aguiar</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/commits?author=samiraguiar" title="Documentation">π</a></td>
|
|
504
548
|
</tr>
|
|
505
549
|
<tr>
|
|
506
|
-
<td align="center"><a href="https://
|
|
507
|
-
<td align="center"><a href="
|
|
508
|
-
<td align="center"><a href="
|
|
509
|
-
<td align="center"><a href="https://
|
|
510
|
-
<td align="center"><a href="
|
|
511
|
-
<td align="center"><a href="
|
|
512
|
-
<td align="center"><a href="
|
|
550
|
+
<td align="center"><a href="https://twitter.com/pubkeypubkey"><img src="https://avatars3.githubusercontent.com/u/8926560?v=4?s=100" width="100px;" alt=""/><br /><sub><b>pubkey</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/commits?author=pubkey" title="Documentation">π</a> <a href="https://github.com/rtfpessoa/diff2html/commits?author=pubkey" title="Code">π»</a></td>
|
|
551
|
+
<td align="center"><a href="https://github.com/iliyaZelenko"><img src="https://avatars1.githubusercontent.com/u/13103045?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ΠΠ»ΡΡ</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/commits?author=iliyaZelenko" title="Documentation">π</a></td>
|
|
552
|
+
<td align="center"><a href="https://akr.am"><img src="https://avatars0.githubusercontent.com/u/1823771?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mohamed Akram</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/issues?q=author%3Amohd-akram" title="Bug reports">π</a> <a href="https://github.com/rtfpessoa/diff2html/commits?author=mohd-akram" title="Documentation">π</a> <a href="https://github.com/rtfpessoa/diff2html/commits?author=mohd-akram" title="Code">π»</a></td>
|
|
553
|
+
<td align="center"><a href="https://github.com/emarcotte"><img src="https://avatars0.githubusercontent.com/u/249390?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Eugene Marcotte</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/commits?author=emarcotte" title="Code">π»</a></td>
|
|
554
|
+
<td align="center"><a href="http://twitter.com/dimasabanin"><img src="https://avatars0.githubusercontent.com/u/8316?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dima Sabanin</b></sub></a><br /><a href="#maintenance-dsabanin" title="Maintenance">π§</a> <a href="https://github.com/rtfpessoa/diff2html/commits?author=dsabanin" title="Code">π»</a></td>
|
|
555
|
+
<td align="center"><a href="https://github.com/benabbottnz"><img src="https://avatars2.githubusercontent.com/u/2616473?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ben Abbott</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/commits?author=benabbottnz" title="Documentation">π</a></td>
|
|
556
|
+
<td align="center"><a href="http://webminer.js.org"><img src="https://avatars1.githubusercontent.com/u/2196373?v=4?s=100" width="100px;" alt=""/><br /><sub><b>εΌζ @ιΏι</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/issues?q=author%3Adickeylth" title="Bug reports">π</a> <a href="https://github.com/rtfpessoa/diff2html/commits?author=dickeylth" title="Documentation">π</a></td>
|
|
513
557
|
</tr>
|
|
514
558
|
<tr>
|
|
515
|
-
<td align="center"><a href="https://
|
|
516
|
-
<td align="center"><a href="https://github.com/
|
|
517
|
-
<td align="center"><a href="https://
|
|
518
|
-
<td align="center"><a href="https://github.com/
|
|
519
|
-
<td align="center"><a href="http://
|
|
520
|
-
<td align="center"><a href="https://github.com/
|
|
521
|
-
<td align="center"><a href="
|
|
559
|
+
<td align="center"><a href="https://github.com/Rantanen"><img src="https://avatars0.githubusercontent.com/u/385385?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mikko Rantanen</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/issues?q=author%3ARantanen" title="Bug reports">π</a></td>
|
|
560
|
+
<td align="center"><a href="https://github.com/extend1994"><img src="https://avatars2.githubusercontent.com/u/13430892?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ann</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/commits?author=extend1994" title="Documentation">π</a></td>
|
|
561
|
+
<td align="center"><a href="https://github.com/escitalopram"><img src="https://avatars0.githubusercontent.com/u/1155220?v=4?s=100" width="100px;" alt=""/><br /><sub><b>escitalopram</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/commits?author=escitalopram" title="Code">π»</a></td>
|
|
562
|
+
<td align="center"><a href="https://github.com/apps/dependabot"><img src="https://avatars0.githubusercontent.com/in/29110?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dependabot[bot]</b></sub></a><br /><a href="#security-dependabot[bot]" title="Security">π‘οΈ</a> <a href="#maintenance-dependabot[bot]" title="Maintenance">π§</a></td>
|
|
563
|
+
<td align="center"><a href="http://www.joshuakgoldberg.com"><img src="https://avatars1.githubusercontent.com/u/3335181?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Josh Goldberg</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/commits?author=JoshuaKGoldberg" title="Code">π»</a></td>
|
|
564
|
+
<td align="center"><a href="https://github.com/apeckham"><img src="https://avatars.githubusercontent.com/u/14110?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Aaron</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/commits?author=apeckham" title="Documentation">π</a></td>
|
|
565
|
+
<td align="center"><a href="https://github.com/pgrimaud"><img src="https://avatars.githubusercontent.com/u/1866496?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pierre Grimaud</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/commits?author=pgrimaud" title="Documentation">π</a></td>
|
|
522
566
|
</tr>
|
|
523
567
|
<tr>
|
|
524
|
-
<td align="center"><a href="https://github.
|
|
525
|
-
<td align="center"><a href="https://github.com/
|
|
526
|
-
<td align="center"><a href="https://
|
|
527
|
-
<td align="center"><a href="https://github.com/
|
|
528
|
-
<td align="center"><a href="
|
|
568
|
+
<td align="center"><a href="https://domdomegg.github.io/"><img src="https://avatars.githubusercontent.com/u/4953590?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Adam Jones</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/commits?author=domdomegg" title="Documentation">π</a></td>
|
|
569
|
+
<td align="center"><a href="https://github.com/charguer"><img src="https://avatars.githubusercontent.com/u/1830652?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Arthur CharguΓ©raud</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/commits?author=charguer" title="Documentation">π</a></td>
|
|
570
|
+
<td align="center"><a href="https://twitter.com/pierrci"><img src="https://avatars.githubusercontent.com/u/5020707?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pierric Cistac</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/commits?author=Pierrci" title="Documentation">π</a> <a href="https://github.com/rtfpessoa/diff2html/commits?author=Pierrci" title="Code">π»</a></td>
|
|
571
|
+
<td align="center"><a href="https://github.com/xlith"><img src="https://avatars.githubusercontent.com/u/510560?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Civan YavuzΕen</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/commits?author=xlith" title="Code">π»</a></td>
|
|
572
|
+
<td align="center"><a href="https://github.com/timgates42"><img src="https://avatars.githubusercontent.com/u/47873678?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tim Gates</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/commits?author=timgates42" title="Documentation">π</a></td>
|
|
573
|
+
<td align="center"><a href="https://github.com/campersau"><img src="https://avatars.githubusercontent.com/u/4009570?v=4?s=100" width="100px;" alt=""/><br /><sub><b>campersau</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/commits?author=campersau" title="Code">π»</a></td>
|
|
574
|
+
<td align="center"><a href="https://github.com/apps/dependabot-preview"><img src="https://avatars.githubusercontent.com/in/2141?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dependabot-preview[bot]</b></sub></a><br /><a href="https://github.com/rtfpessoa/diff2html/commits?author=dependabot-preview[bot]" title="Code">π»</a></td>
|
|
529
575
|
</tr>
|
|
530
576
|
</table>
|
|
531
577
|
|
|
532
|
-
<!-- markdownlint-
|
|
578
|
+
<!-- markdownlint-restore -->
|
|
533
579
|
<!-- prettier-ignore-end -->
|
|
534
580
|
|
|
535
581
|
<!-- ALL-CONTRIBUTORS-LIST:END -->
|