Skip to content

Commit 57f5697

Browse files
author
Rodrigo Fernandes
committed
Merge pull request #14 from rtfpessoa/merge-npm
Merge npm package
2 parents 5ee366a + 527ecb9 commit 57f5697

File tree

9 files changed

+1202
-945
lines changed

9 files changed

+1202
-945
lines changed

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,10 @@
1414
# Maven
1515
log/
1616
target/
17+
18+
# Node
19+
node_modules/
20+
npm-debug.log
21+
22+
# Bower
23+
bower_components/

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ Diff to Html generates pretty HTML diffs from git word diff output.
2222

2323
* [Node Module](https://www.npmjs.org/package/diff2html)
2424

25-
* Manually download and import `diff2html.js` into your page
25+
* [Bower Package](http://bower.io/search/?q=diff2html)
26+
27+
* Manually download and import `dist/diff2html.min.js` into your page
2628

2729
## How to use
2830

bin/diff2html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/usr/bin/env node
2+
3+
require("../src/diff2html.js");

bower.json

Lines changed: 38 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,55 @@
22
"name": "diff2html",
33
"version": "0.2.5",
44
"homepage": "https://github.com/rtfpessoa/diff2html",
5+
"description": "Fast Diff to colorized HTML",
6+
"keywords": [
7+
"git",
8+
"diff",
9+
"pretty",
10+
"side",
11+
"line",
12+
"side-by-side",
13+
"line-by-line",
14+
"character",
15+
"highlight",
16+
"pretty",
17+
"color",
18+
"html",
19+
"diff2html",
20+
"difftohtml",
21+
"colorized"
22+
],
23+
524
"authors": [
625
"Rodrigo Fernandes <rtfrodrigo@gmail.com>"
726
],
27+
828
"repository": {
9-
"type": "git",
10-
"url": "git://github.com/rtfpessoa/diff2html.git"
29+
"type": "git",
30+
"url": "git://github.com/rtfpessoa/diff2html.git"
1131
},
12-
"description": "Fast Diff to colorized HTML",
32+
1333
"main": "./src/diff2html.js",
14-
"keywords": [
15-
"git",
16-
"diff",
17-
"pretty",
18-
"side",
19-
"line",
20-
"side-by-side",
21-
"line-by-line",
22-
"character",
23-
"highlight",
24-
"pretty",
25-
"color",
26-
"html",
27-
"diff2html",
28-
"difftohtml",
29-
"colorized"
30-
],
34+
3135
"license": "MIT",
36+
37+
"moduleType": [
38+
"globals",
39+
"node"
40+
],
41+
42+
"dependencies": {
43+
"jsdiff": ">= 1.4.0"
44+
},
45+
3246
"ignore": [
3347
"**/.*",
3448
"node_modules",
3549
"bower_components",
3650
"test",
37-
"tests"
51+
"tests",
52+
"bin",
53+
"package.json",
54+
"release.sh"
3855
]
3956
}

0 commit comments

Comments
 (0)