luciano/diff2html
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update dependencies

Browse source
This commit is contained in:
Rodrigo Fernandes 2016-12-17 23:39:21 +00:00
parent 0517e840b8
commit ba239b6f15
No known key found for this signature in database
GPG key ID: 08E3C5F38969078E
5 changed files with 207 additions and 177 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
package.json
View file

@ -59,18 +59,18 @@
"whatwg-fetch": "^2.0.1" "whatwg-fetch": "^2.0.1"
}, },
"devDependencies": { "devDependencies": {
"autoprefixer": "^6.5.3", "autoprefixer": "^6.5.4",
"browserify": "^13.1.1", "browserify": "^13.1.1",
"clean-css": "^3.4.21", "clean-css": "^3.4.23",
"codacy-coverage": "^2.0.0", "codacy-coverage": "^2.0.0",
"eslint": "^3.12.0", "eslint": "^3.12.2",
"eslint-plugin-promise": "^3.4.0", "eslint-plugin-promise": "^3.4.0",
"eslint-plugin-standard": "^2.0.1", "eslint-plugin-standard": "^2.0.1",
"fast-html-parser": "^1.0.1", "fast-html-parser": "^1.0.1",
"istanbul": "^0.4.5", "istanbul": "^0.4.5",
"mkdirp": "^0.5.1", "mkdirp": "^0.5.1",
"mocha": "^3.2.0", "mocha": "^3.2.0",
"nopt": "^3.0.6", "nopt": "^4.0.1",
"postcss-cli": "^2.6.0", "postcss-cli": "^2.6.0",
"uglifyjs": "^2.4.10" "uglifyjs": "^2.4.10"
}, },

18
test/diff2html-tests.js
View file

@ -12,9 +12,12 @@ var diffExample1 =
'+test1\n'; '+test1\n';
var jsonExample1 = var jsonExample1 =
[{ [
blocks: [{ {
lines: [{ blocks: [
{
lines: [
{
content: '-test', content: '-test',
type: 'd2h-del', type: 'd2h-del',
oldNumber: 1, oldNumber: 1,
@ -25,12 +28,14 @@ var jsonExample1 =
type: 'd2h-ins', type: 'd2h-ins',
oldNumber: null, oldNumber: null,
newNumber: 1 newNumber: 1
}], }
],
oldStartLine: '1', oldStartLine: '1',
oldStartLine2: null, oldStartLine2: null,
newStartLine: '1', newStartLine: '1',
header: '@@ -1 +1 @@' header: '@@ -1 +1 @@'
}], }
],
deletedLines: 1, deletedLines: 1,
addedLines: 1, addedLines: 1,
checksumBefore: '0000001', checksumBefore: '0000001',
@ -39,7 +44,8 @@ var jsonExample1 =
language: undefined, language: undefined,
newName: 'sample', newName: 'sample',
isCombined: false isCombined: false
}]; }
];
var filesExample1 = var filesExample1 =
'<div class="d2h-file-list-wrapper">\n' + '<div class="d2h-file-list-wrapper">\n' +

30
test/line-by-line-tests.js
View file

@ -303,9 +303,12 @@ describe('LineByLinePrinter', function() {
describe('generateLineByLineJsonHtml', function() { describe('generateLineByLineJsonHtml', function() {
it('should work for list of files', function() { it('should work for list of files', function() {
var exampleJson = [{ var exampleJson = [
blocks: [{ {
lines: [{ blocks: [
{
lines: [
{
content: '-test', content: '-test',
type: 'd2h-del', type: 'd2h-del',
oldNumber: 1, oldNumber: 1,
@ -316,12 +319,14 @@ describe('LineByLinePrinter', function() {
type: 'd2h-ins', type: 'd2h-ins',
oldNumber: null, oldNumber: null,
newNumber: 1 newNumber: 1
}], }
],
oldStartLine: '1', oldStartLine: '1',
oldStartLine2: null, oldStartLine2: null,
newStartLine: '1', newStartLine: '1',
header: '@@ -1 +1 @@' header: '@@ -1 +1 @@'
}], }
],
deletedLines: 1, deletedLines: 1,
addedLines: 1, addedLines: 1,
checksumBefore: '0000001', checksumBefore: '0000001',
@ -330,7 +335,8 @@ describe('LineByLinePrinter', function() {
language: undefined, language: undefined,
newName: 'sample', newName: 'sample',
isCombined: false isCombined: false
}]; }
];
var lineByLinePrinter = new LineByLinePrinter({matching: 'lines'}); var lineByLinePrinter = new LineByLinePrinter({matching: 'lines'});
var html = lineByLinePrinter.generateLineByLineJsonHtml(exampleJson); var html = lineByLinePrinter.generateLineByLineJsonHtml(exampleJson);
@ -484,8 +490,10 @@ describe('LineByLinePrinter', function() {
it('should work for simple file', function() { it('should work for simple file', function() {
var lineByLinePrinter = new LineByLinePrinter({}); var lineByLinePrinter = new LineByLinePrinter({});
var file = { var file = {
blocks: [{ blocks: [
lines: [{ {
lines: [
{
content: ' one context line', content: ' one context line',
type: 'd2h-cntx', type: 'd2h-cntx',
oldNumber: 1, oldNumber: 1,
@ -508,12 +516,14 @@ describe('LineByLinePrinter', function() {
type: 'd2h-ins', type: 'd2h-ins',
oldNumber: null, oldNumber: null,
newNumber: 3 newNumber: 3
}], }
],
oldStartLine: '1', oldStartLine: '1',
oldStartLine2: null, oldStartLine2: null,
newStartLine: '1', newStartLine: '1',
header: '@@ -1 +1 @@' header: '@@ -1 +1 @@'
}], }
],
deletedLines: 1, deletedLines: 1,
addedLines: 1, addedLines: 1,
checksumBefore: '0000001', checksumBefore: '0000001',

24
test/side-by-side-printer-tests.js
View file

@ -26,7 +26,8 @@ describe('SideBySidePrinter', function() {
var sideBySidePrinter = new SideBySidePrinter({}); var sideBySidePrinter = new SideBySidePrinter({});
var file = { var file = {
'blocks': [{ 'blocks': [
{
'lines': [ 'lines': [
{ {
'content': ' context', 'content': ' context',
@ -56,7 +57,8 @@ describe('SideBySidePrinter', function() {
'oldStartLine': '19', 'oldStartLine': '19',
'newStartLine': '19', 'newStartLine': '19',
'header': '@@ -19,7 +19,7 @@' 'header': '@@ -19,7 +19,7 @@'
}], }
],
'deletedLines': 1, 'deletedLines': 1,
'addedLines': 1, 'addedLines': 1,
'checksumBefore': 'fc56817', 'checksumBefore': 'fc56817',
@ -193,9 +195,12 @@ describe('SideBySidePrinter', function() {
describe('generateSideBySideJsonHtml', function() { describe('generateSideBySideJsonHtml', function() {
it('should work for list of files', function() { it('should work for list of files', function() {
var exampleJson = [{ var exampleJson = [
blocks: [{ {
lines: [{ blocks: [
{
lines: [
{
content: '-test', content: '-test',
type: 'd2h-del', type: 'd2h-del',
oldNumber: 1, oldNumber: 1,
@ -206,12 +211,14 @@ describe('SideBySidePrinter', function() {
type: 'd2h-ins', type: 'd2h-ins',
oldNumber: null, oldNumber: null,
newNumber: 1 newNumber: 1
}], }
],
oldStartLine: '1', oldStartLine: '1',
oldStartLine2: null, oldStartLine2: null,
newStartLine: '1', newStartLine: '1',
header: '@@ -1 +1 @@' header: '@@ -1 +1 @@'
}], }
],
deletedLines: 1, deletedLines: 1,
addedLines: 1, addedLines: 1,
checksumBefore: '0000001', checksumBefore: '0000001',
@ -220,7 +227,8 @@ describe('SideBySidePrinter', function() {
language: undefined, language: undefined,
newName: 'sample', newName: 'sample',
isCombined: false isCombined: false
}]; }
];
var sideBySidePrinter = new SideBySidePrinter({matching: 'lines'}); var sideBySidePrinter = new SideBySidePrinter({matching: 'lines'});
var html = sideBySidePrinter.generateSideBySideJsonHtml(exampleJson); var html = sideBySidePrinter.generateSideBySideJsonHtml(exampleJson);

68
yarn.lock
View file

@ -186,15 +186,15 @@ asynckit@^0.4.0:
version "0.4.0" version "0.4.0"
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
autoprefixer@^6.5.3: autoprefixer@^6.5.4:
version "6.5.3" version "6.5.4"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.5.3.tgz#2d853af66d04449fcf50db3066279ab54c3e4b01" resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.5.4.tgz#1386eb6708ccff36aefff70adc694ecfd60af1b0"
dependencies: dependencies:
browserslist "~1.4.0" browserslist "~1.4.0"
caniuse-db "^1.0.30000578" caniuse-db "^1.0.30000597"
normalize-range "^0.1.2" normalize-range "^0.1.2"
num2fraction "^1.2.2" num2fraction "^1.2.2"
postcss "^5.2.5" postcss "^5.2.6"
postcss-value-parser "^3.2.3" postcss-value-parser "^3.2.3"
aws-sign2@~0.6.0: aws-sign2@~0.6.0:
@ -445,7 +445,7 @@ camelcase@^3.0.0:
version "3.0.0" version "3.0.0"
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
caniuse-db@^1.0.30000539, caniuse-db@^1.0.30000578: caniuse-db@^1.0.30000539, caniuse-db@^1.0.30000597:
version "1.0.30000597" version "1.0.30000597"
resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000597.tgz#b52e6cbe9dc83669affb98501629feaee1af6588" resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000597.tgz#b52e6cbe9dc83669affb98501629feaee1af6588"
@ -495,9 +495,9 @@ circular-json@^0.3.0:
version "0.3.1" version "0.3.1"
resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.1.tgz#be8b36aefccde8b3ca7aa2d6afc07a37242c0d2d" resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.1.tgz#be8b36aefccde8b3ca7aa2d6afc07a37242c0d2d"
clean-css@^3.4.21: clean-css@^3.4.23:
version "3.4.21" version "3.4.23"
resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.21.tgz#2101d5dbd19d63dbc16a75ebd570e7c33948f65b" resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.23.tgz#604fbbca24c12feb59b02f00b84f1fb7ded6d001"
dependencies: dependencies:
commander "2.8.x" commander "2.8.x"
source-map "0.4.x" source-map "0.4.x"
@ -562,13 +562,13 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
dependencies: dependencies:
delayed-stream "~1.0.0" delayed-stream "~1.0.0"
commander@2.8.x: commander@2.8.x, commander@^2.x:
version "2.8.1" version "2.8.1"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4" resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
dependencies: dependencies:
graceful-readlink ">= 1.0.0" graceful-readlink ">= 1.0.0"
commander@2.9.0, commander@^2.9.0, commander@^2.x: commander@2.9.0, commander@^2.9.0:
version "2.9.0" version "2.9.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
dependencies: dependencies:
@ -881,9 +881,9 @@ eslint-plugin-standard@^2.0.1:
version "2.0.1" version "2.0.1"
resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-2.0.1.tgz#3589699ff9c917f2c25f76a916687f641c369ff3" resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-2.0.1.tgz#3589699ff9c917f2c25f76a916687f641c369ff3"
eslint@^3.12.0: eslint@^3.12.2:
version "3.12.0" version "3.12.2"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.12.0.tgz#1dfa4ef0082e35feed90a0fb1f7996d1d426b249" resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.12.2.tgz#6be5a9aa29658252abd7f91e9132bab1f26f3c34"
dependencies: dependencies:
babel-code-frame "^6.16.0" babel-code-frame "^6.16.0"
chalk "^1.1.3" chalk "^1.1.3"
@ -1909,12 +1909,19 @@ nopt@1.0.10:
dependencies: dependencies:
abbrev "1" abbrev "1"
nopt@3.x, nopt@^3.0.6, nopt@~3.0.6: nopt@3.x, nopt@~3.0.6:
version "3.0.6" version "3.0.6"
resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
dependencies: dependencies:
abbrev "1" abbrev "1"
nopt@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
dependencies:
abbrev "1"
osenv "^0.1.4"
normalize-package-data@^2.3.2: normalize-package-data@^2.3.2:
version "2.3.5" version "2.3.5"
resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.5.tgz#8d924f142960e1777e7ffe170543631cc7cb02df" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.5.tgz#8d924f142960e1777e7ffe170543631cc7cb02df"
@ -2012,6 +2019,17 @@ os-locale@^1.4.0:
dependencies: dependencies:
lcid "^1.0.0" lcid "^1.0.0"
os-tmpdir@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
osenv@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644"
dependencies:
os-homedir "^1.0.0"
os-tmpdir "^1.0.0"
pako@~0.2.0: pako@~0.2.0:
version "0.2.9" version "0.2.9"
resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75" resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
@ -2119,7 +2137,7 @@ postcss-value-parser@^3.2.3:
version "3.3.0" version "3.3.0"
resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
postcss@^5.0.0, postcss@^5.2.5: postcss@^5.0.0, postcss@^5.2.6:
version "5.2.6" version "5.2.6"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.6.tgz#a252cd67cd52585035f17e9ad12b35137a7bdd9e" resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.6.tgz#a252cd67cd52585035f17e9ad12b35137a7bdd9e"
dependencies: dependencies:
@ -2225,9 +2243,9 @@ read-pkg@^1.0.0:
normalize-package-data "^2.3.2" normalize-package-data "^2.3.2"
path-type "^1.0.0" path-type "^1.0.0"
"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.1.0, readable-stream@^2.1.5: "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.1.0, readable-stream@^2.1.5, readable-stream@~2.1.4:
version "2.2.2" version "2.1.5"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz#66fa8b720e1438b364681f2ad1a63c618448c9d0"
dependencies: dependencies:
buffer-shims "^1.0.0" buffer-shims "^1.0.0"
core-util-is "~1.0.0" core-util-is "~1.0.0"
@ -2248,18 +2266,6 @@ readable-stream@^2.0.2, readable-stream@~2.0.0:
string_decoder "~0.10.x" string_decoder "~0.10.x"
util-deprecate "~1.0.1" util-deprecate "~1.0.1"
readable-stream@~2.1.4:
version "2.1.5"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz#66fa8b720e1438b364681f2ad1a63c618448c9d0"
dependencies:
buffer-shims "^1.0.0"
core-util-is "~1.0.0"
inherits "~2.0.1"
isarray "~1.0.0"
process-nextick-args "~1.0.6"
string_decoder "~0.10.x"
util-deprecate "~1.0.1"
readdirp@^2.0.0: readdirp@^2.0.0:
version "2.1.0" version "2.1.0"
resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"