kalugin66/webtorrent-desktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into greenkeeper/music-metadata-3.2.2

Browse Source 
# Conflicts:
#	package-lock.json
This commit is contained in:
Borewit
2018-12-16 17:15:16 +01:00
parent 2e85b4041f a56e14f0a0
commit cdf5c5364a
9 changed files with 811 additions and 2026 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
package.json
View File

@@ -14,13 +14,13 @@
"airplayer": "^2.0.0",
"application-config": "^1.0.0",
"arch": "^2.0.0",
"auto-launch": "^4.0.1",
"auto-launch": "^5.0.5",
"bitfield": "^1.0.2",
"capture-frame": "^2.0.0",
"chokidar": "^2.0.4",
"chromecasts": "^1.9.1",
"cp-file": "^6.0.0",
"create-torrent": "^3.24.5",
"create-torrent": "^3.33.0",
"debounce": "^1.0.0",
"deep-equal": "^1.0.1",
"dlnacasts": "^0.1.0",
@@ -28,20 +28,20 @@
"es6-error": "^4.0.0",
"fn-getter": "^1.0.0",
"iso-639-1": "^1.2.1",
"languagedetect": "^1.1.1",
"languagedetect": "^1.2.0",
"location-history": "^1.0.0",
"material-ui": "^0.17.0",
"material-ui": "^0.20.2",
"mkdirp": "^0.5.1",
"music-metadata": "^3.3.0",
"network-address": "^1.1.0",
"parse-torrent": "^6.0.1",
"prettier-bytes": "^1.0.1",
"react": "^15.4.2",
"react-dom": "^15.4.2",
"react-tap-event-plugin": "^2.0.1",
"prop-types": "^15.6.2",
"react": "^16.5.2",
"react-dom": "^16.5.2",
"rimraf": "^2.5.2",
"run-parallel": "^1.1.6",
"semver": "^5.1.0",
"semver": "^5.6.0",
"simple-concat": "^1.0.0",
"simple-get": "^3.0.3",
"srt-to-vtt": "^1.1.1",
@@ -52,25 +52,25 @@
},
"devDependencies": {
"babel-eslint": "^9.0.0",
"buble": "^0.19.3",
"buble": "^0.19.6",
"cross-zip": "^2.0.1",
"depcheck": "^0.6.4",
"electron": "1.6.16",
"electron-osx-sign": "^0.4.10",
"depcheck": "^0.6.11",
"electron": "^1.8.8",
"electron-osx-sign": "^0.4.11",
"electron-packager": "~8.5.1",
"electron-winstaller": "^2.6.4",
"gh-release": "^3.2.1",
"gh-release": "^3.4.0",
"minimist": "^1.2.0",
"nobin-debian-installer": "0.0.10",
"nodemon": "^1.10.2",
"nodemon": "^1.18.8",
"opn": "^5.4.0",
"plist": "^3.0.1",
"pngjs": "^3.0.0",
"run-series": "^1.1.4",
"spectron": "^3.3.0",
"standard": "*",
"tape": "^4.6.0",
"walk-sync": "^0.3.1"
"tape": "^4.9.1",
"walk-sync": "^0.3.4"
},
"engines": {
"node": ">=4.0.0"