From ba239b6f151697c35cc41f912a988aa5f9f869e8 Mon Sep 17 00:00:00 2001 From: Rodrigo Fernandes Date: Sat, 17 Dec 2016 23:39:21 +0000 Subject: [PATCH] Update dependencies --- package.json | 8 +- test/diff2html-tests.js | 60 +++++++------- test/line-by-line-tests.js | 124 ++++++++++++++++------------- test/side-by-side-printer-tests.js | 124 +++++++++++++++-------------- yarn.lock | 68 ++++++++-------- 5 files changed, 207 insertions(+), 177 deletions(-) diff --git a/package.json b/package.json index fb7a48f..f7b3d2f 100644 --- a/package.json +++ b/package.json @@ -59,18 +59,18 @@ "whatwg-fetch": "^2.0.1" }, "devDependencies": { - "autoprefixer": "^6.5.3", + "autoprefixer": "^6.5.4", "browserify": "^13.1.1", - "clean-css": "^3.4.21", + "clean-css": "^3.4.23", "codacy-coverage": "^2.0.0", - "eslint": "^3.12.0", + "eslint": "^3.12.2", "eslint-plugin-promise": "^3.4.0", "eslint-plugin-standard": "^2.0.1", "fast-html-parser": "^1.0.1", "istanbul": "^0.4.5", "mkdirp": "^0.5.1", "mocha": "^3.2.0", - "nopt": "^3.0.6", + "nopt": "^4.0.1", "postcss-cli": "^2.6.0", "uglifyjs": "^2.4.10" }, diff --git a/test/diff2html-tests.js b/test/diff2html-tests.js index 73e0354..97c79ad 100644 --- a/test/diff2html-tests.js +++ b/test/diff2html-tests.js @@ -12,34 +12,40 @@ var diffExample1 = '+test1\n'; var jsonExample1 = - [{ - blocks: [{ - lines: [{ - content: '-test', - type: 'd2h-del', - oldNumber: 1, - newNumber: null - }, + [ + { + blocks: [ { - content: '+test1', - type: 'd2h-ins', - oldNumber: null, - newNumber: 1 - }], - oldStartLine: '1', - oldStartLine2: null, - newStartLine: '1', - header: '@@ -1 +1 @@' - }], - deletedLines: 1, - addedLines: 1, - checksumBefore: '0000001', - checksumAfter: '0ddf2ba', - oldName: 'sample', - language: undefined, - newName: 'sample', - isCombined: false - }]; + lines: [ + { + content: '-test', + type: 'd2h-del', + oldNumber: 1, + newNumber: null + }, + { + content: '+test1', + type: 'd2h-ins', + oldNumber: null, + newNumber: 1 + } + ], + oldStartLine: '1', + oldStartLine2: null, + newStartLine: '1', + header: '@@ -1 +1 @@' + } + ], + deletedLines: 1, + addedLines: 1, + checksumBefore: '0000001', + checksumAfter: '0ddf2ba', + oldName: 'sample', + language: undefined, + newName: 'sample', + isCombined: false + } + ]; var filesExample1 = '
\n' + diff --git a/test/line-by-line-tests.js b/test/line-by-line-tests.js index 8869b3d..483bd97 100644 --- a/test/line-by-line-tests.js +++ b/test/line-by-line-tests.js @@ -303,34 +303,40 @@ describe('LineByLinePrinter', function() { describe('generateLineByLineJsonHtml', function() { it('should work for list of files', function() { - var exampleJson = [{ - blocks: [{ - lines: [{ - content: '-test', - type: 'd2h-del', - oldNumber: 1, - newNumber: null - }, + var exampleJson = [ + { + blocks: [ { - content: '+test1r', - type: 'd2h-ins', - oldNumber: null, - newNumber: 1 - }], - oldStartLine: '1', - oldStartLine2: null, - newStartLine: '1', - header: '@@ -1 +1 @@' - }], - deletedLines: 1, - addedLines: 1, - checksumBefore: '0000001', - checksumAfter: '0ddf2ba', - oldName: 'sample', - language: undefined, - newName: 'sample', - isCombined: false - }]; + lines: [ + { + content: '-test', + type: 'd2h-del', + oldNumber: 1, + newNumber: null + }, + { + content: '+test1r', + type: 'd2h-ins', + oldNumber: null, + newNumber: 1 + } + ], + oldStartLine: '1', + oldStartLine2: null, + newStartLine: '1', + header: '@@ -1 +1 @@' + } + ], + deletedLines: 1, + addedLines: 1, + checksumBefore: '0000001', + checksumAfter: '0ddf2ba', + oldName: 'sample', + language: undefined, + newName: 'sample', + isCombined: false + } + ]; var lineByLinePrinter = new LineByLinePrinter({matching: 'lines'}); var html = lineByLinePrinter.generateLineByLineJsonHtml(exampleJson); @@ -484,36 +490,40 @@ describe('LineByLinePrinter', function() { it('should work for simple file', function() { var lineByLinePrinter = new LineByLinePrinter({}); var file = { - blocks: [{ - lines: [{ - content: ' one context line', - type: 'd2h-cntx', - oldNumber: 1, - newNumber: 1 - }, - { - content: '-test', - type: 'd2h-del', - oldNumber: 2, - newNumber: null - }, - { - content: '+test1r', - type: 'd2h-ins', - oldNumber: null, - newNumber: 2 - }, - { - content: '+test2r', - type: 'd2h-ins', - oldNumber: null, - newNumber: 3 - }], - oldStartLine: '1', - oldStartLine2: null, - newStartLine: '1', - header: '@@ -1 +1 @@' - }], + blocks: [ + { + lines: [ + { + content: ' one context line', + type: 'd2h-cntx', + oldNumber: 1, + newNumber: 1 + }, + { + content: '-test', + type: 'd2h-del', + oldNumber: 2, + newNumber: null + }, + { + content: '+test1r', + type: 'd2h-ins', + oldNumber: null, + newNumber: 2 + }, + { + content: '+test2r', + type: 'd2h-ins', + oldNumber: null, + newNumber: 3 + } + ], + oldStartLine: '1', + oldStartLine2: null, + newStartLine: '1', + header: '@@ -1 +1 @@' + } + ], deletedLines: 1, addedLines: 1, checksumBefore: '0000001', diff --git a/test/side-by-side-printer-tests.js b/test/side-by-side-printer-tests.js index 771daaa..21b1f90 100644 --- a/test/side-by-side-printer-tests.js +++ b/test/side-by-side-printer-tests.js @@ -26,37 +26,39 @@ describe('SideBySidePrinter', function() { var sideBySidePrinter = new SideBySidePrinter({}); var file = { - 'blocks': [{ - 'lines': [ - { - 'content': ' context', - 'type': 'd2h-cntx', - 'oldNumber': 19, - 'newNumber': 19 - }, - { - 'content': '-removed', - 'type': 'd2h-del', - 'oldNumber': 20, - 'newNumber': null - }, - { - 'content': '+added', - 'type': 'd2h-ins', - 'oldNumber': null, - 'newNumber': 20 - }, - { - 'content': '+another added', - 'type': 'd2h-ins', - 'oldNumber': null, - 'newNumber': 21 - } - ], - 'oldStartLine': '19', - 'newStartLine': '19', - 'header': '@@ -19,7 +19,7 @@' - }], + 'blocks': [ + { + 'lines': [ + { + 'content': ' context', + 'type': 'd2h-cntx', + 'oldNumber': 19, + 'newNumber': 19 + }, + { + 'content': '-removed', + 'type': 'd2h-del', + 'oldNumber': 20, + 'newNumber': null + }, + { + 'content': '+added', + 'type': 'd2h-ins', + 'oldNumber': null, + 'newNumber': 20 + }, + { + 'content': '+another added', + 'type': 'd2h-ins', + 'oldNumber': null, + 'newNumber': 21 + } + ], + 'oldStartLine': '19', + 'newStartLine': '19', + 'header': '@@ -19,7 +19,7 @@' + } + ], 'deletedLines': 1, 'addedLines': 1, 'checksumBefore': 'fc56817', @@ -193,34 +195,40 @@ describe('SideBySidePrinter', function() { describe('generateSideBySideJsonHtml', function() { it('should work for list of files', function() { - var exampleJson = [{ - blocks: [{ - lines: [{ - content: '-test', - type: 'd2h-del', - oldNumber: 1, - newNumber: null - }, + var exampleJson = [ + { + blocks: [ { - content: '+test1r', - type: 'd2h-ins', - oldNumber: null, - newNumber: 1 - }], - oldStartLine: '1', - oldStartLine2: null, - newStartLine: '1', - header: '@@ -1 +1 @@' - }], - deletedLines: 1, - addedLines: 1, - checksumBefore: '0000001', - checksumAfter: '0ddf2ba', - oldName: 'sample', - language: undefined, - newName: 'sample', - isCombined: false - }]; + lines: [ + { + content: '-test', + type: 'd2h-del', + oldNumber: 1, + newNumber: null + }, + { + content: '+test1r', + type: 'd2h-ins', + oldNumber: null, + newNumber: 1 + } + ], + oldStartLine: '1', + oldStartLine2: null, + newStartLine: '1', + header: '@@ -1 +1 @@' + } + ], + deletedLines: 1, + addedLines: 1, + checksumBefore: '0000001', + checksumAfter: '0ddf2ba', + oldName: 'sample', + language: undefined, + newName: 'sample', + isCombined: false + } + ]; var sideBySidePrinter = new SideBySidePrinter({matching: 'lines'}); var html = sideBySidePrinter.generateSideBySideJsonHtml(exampleJson); diff --git a/yarn.lock b/yarn.lock index defaafa..2cd6f52 100644 --- a/yarn.lock +++ b/yarn.lock @@ -186,15 +186,15 @@ asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" -autoprefixer@^6.5.3: - version "6.5.3" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.5.3.tgz#2d853af66d04449fcf50db3066279ab54c3e4b01" +autoprefixer@^6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.5.4.tgz#1386eb6708ccff36aefff70adc694ecfd60af1b0" dependencies: browserslist "~1.4.0" - caniuse-db "^1.0.30000578" + caniuse-db "^1.0.30000597" normalize-range "^0.1.2" num2fraction "^1.2.2" - postcss "^5.2.5" + postcss "^5.2.6" postcss-value-parser "^3.2.3" aws-sign2@~0.6.0: @@ -445,7 +445,7 @@ camelcase@^3.0.0: version "3.0.0" 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" 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" resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.1.tgz#be8b36aefccde8b3ca7aa2d6afc07a37242c0d2d" -clean-css@^3.4.21: - version "3.4.21" - resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.21.tgz#2101d5dbd19d63dbc16a75ebd570e7c33948f65b" +clean-css@^3.4.23: + version "3.4.23" + resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.23.tgz#604fbbca24c12feb59b02f00b84f1fb7ded6d001" dependencies: commander "2.8.x" source-map "0.4.x" @@ -562,13 +562,13 @@ combined-stream@^1.0.5, combined-stream@~1.0.5: dependencies: delayed-stream "~1.0.0" -commander@2.8.x: +commander@2.8.x, commander@^2.x: version "2.8.1" resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4" dependencies: 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" resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" dependencies: @@ -881,9 +881,9 @@ eslint-plugin-standard@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-2.0.1.tgz#3589699ff9c917f2c25f76a916687f641c369ff3" -eslint@^3.12.0: - version "3.12.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.12.0.tgz#1dfa4ef0082e35feed90a0fb1f7996d1d426b249" +eslint@^3.12.2: + version "3.12.2" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.12.2.tgz#6be5a9aa29658252abd7f91e9132bab1f26f3c34" dependencies: babel-code-frame "^6.16.0" chalk "^1.1.3" @@ -1909,12 +1909,19 @@ nopt@1.0.10: dependencies: abbrev "1" -nopt@3.x, nopt@^3.0.6, nopt@~3.0.6: +nopt@3.x, nopt@~3.0.6: version "3.0.6" resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" dependencies: 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: version "2.3.5" 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: 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: version "0.2.9" 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" 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" resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.6.tgz#a252cd67cd52585035f17e9ad12b35137a7bdd9e" dependencies: @@ -2225,9 +2243,9 @@ read-pkg@^1.0.0: normalize-package-data "^2.3.2" path-type "^1.0.0" -"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.1.0, readable-stream@^2.1.5: - version "2.2.2" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e" +"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.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" @@ -2248,18 +2266,6 @@ readable-stream@^2.0.2, readable-stream@~2.0.0: string_decoder "~0.10.x" 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: version "2.1.0" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"