Merge master

This commit is contained in:
Jerome Wu 2019-10-25 19:18:23 +08:00
commit ff4ae62146
3 changed files with 15 additions and 6 deletions

View File

@ -2,6 +2,7 @@
"extends": "airbnb-base",
"rules": {
"no-underscore-dangle": 0,
"linebreak-style": 0
"global-require": 0
},
"env": {

14
package-lock.json generated
View File

@ -3077,12 +3077,14 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@ -3102,7 +3104,8 @@
"concat-map": {
"version": "0.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"console-control-strings": {
"version": "1.1.0",
@ -3250,6 +3253,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@ -3257,12 +3261,14 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"minipass": {
"version": "2.3.5",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@ -3281,6 +3287,7 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
@ -3373,6 +3380,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}

View File

@ -18,7 +18,7 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/jeromewu/ffmpeg.js.git"
"url": "git+https://github.com/ffmpegjs/ffmpeg.js.git"
},
"keywords": [
"ffmpeg",
@ -28,9 +28,9 @@
"author": "Jerome Wu <jeromewus@gmail.com>",
"license": "MIT",
"bugs": {
"url": "https://github.com/jeromewu/ffmpeg.js/issues"
"url": "https://github.com/ffmpegjs/ffmpeg.js/issues"
},
"homepage": "https://github.com/jeromewu/ffmpeg.js#readme",
"homepage": "https://github.com/ffmpegjs/ffmpeg.js#readme",
"dependencies": {
"@ffmpeg/core": "^0.2.0",
"is-url": "^1.2.4",