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", "extends": "airbnb-base",
"rules": { "rules": {
"no-underscore-dangle": 0, "no-underscore-dangle": 0,
"linebreak-style": 0
"global-require": 0 "global-require": 0
}, },
"env": { "env": {

14
package-lock.json generated
View File

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

View File

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