diff --git a/package-lock.json b/package-lock.json index f0dc1d699..020861e2c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5365,26 +5365,34 @@ }, "node_modules/fsevents/node_modules/abbrev": { "version": "1.1.1", + "dev": true, "inBundle": true, - "license": "ISC" + "license": "ISC", + "optional": true }, "node_modules/fsevents/node_modules/ansi-regex": { "version": "2.1.1", + "dev": true, "inBundle": true, "license": "MIT", + "optional": true, "engines": { "node": ">=0.10.0" } }, "node_modules/fsevents/node_modules/aproba": { "version": "1.2.0", + "dev": true, "inBundle": true, - "license": "ISC" + "license": "ISC", + "optional": true }, "node_modules/fsevents/node_modules/are-we-there-yet": { "version": "1.1.5", + "dev": true, "inBundle": true, "license": "ISC", + "optional": true, "dependencies": { "delegates": "^1.0.0", "readable-stream": "^2.0.6" @@ -5392,13 +5400,17 @@ }, "node_modules/fsevents/node_modules/balanced-match": { "version": "1.0.0", + "dev": true, "inBundle": true, - "license": "MIT" + "license": "MIT", + "optional": true }, "node_modules/fsevents/node_modules/brace-expansion": { "version": "1.1.11", + "dev": true, "inBundle": true, "license": "MIT", + "optional": true, "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -5406,57 +5418,75 @@ }, "node_modules/fsevents/node_modules/chownr": { "version": "1.1.3", + "dev": true, "inBundle": true, - "license": "ISC" + "license": "ISC", + "optional": true }, "node_modules/fsevents/node_modules/code-point-at": { "version": "1.1.0", + "dev": true, "inBundle": true, "license": "MIT", + "optional": true, "engines": { "node": ">=0.10.0" } }, "node_modules/fsevents/node_modules/concat-map": { "version": "0.0.1", + "dev": true, "inBundle": true, - "license": "MIT" + "license": "MIT", + "optional": true }, "node_modules/fsevents/node_modules/console-control-strings": { "version": "1.1.0", + "dev": true, "inBundle": true, - "license": "ISC" + "license": "ISC", + "optional": true }, "node_modules/fsevents/node_modules/core-util-is": { "version": "1.0.2", + "dev": true, "inBundle": true, - "license": "MIT" + "license": "MIT", + "optional": true }, "node_modules/fsevents/node_modules/debug": { "version": "3.2.6", + "dev": true, "inBundle": true, "license": "MIT", + "optional": true, "dependencies": { "ms": "^2.1.1" } }, "node_modules/fsevents/node_modules/deep-extend": { "version": "0.6.0", + "dev": true, "inBundle": true, "license": "MIT", + "optional": true, "engines": { "node": ">=4.0.0" } }, "node_modules/fsevents/node_modules/delegates": { "version": "1.0.0", + "dev": true, "inBundle": true, - "license": "MIT" + "license": "MIT", + "optional": true }, "node_modules/fsevents/node_modules/detect-libc": { "version": "1.0.3", + "dev": true, "inBundle": true, "license": "Apache-2.0", + "optional": true, "bin": { "detect-libc": "bin/detect-libc.js" }, @@ -5466,21 +5496,27 @@ }, "node_modules/fsevents/node_modules/fs-minipass": { "version": "1.2.7", + "dev": true, "inBundle": true, "license": "ISC", + "optional": true, "dependencies": { "minipass": "^2.6.0" } }, "node_modules/fsevents/node_modules/fs.realpath": { "version": "1.0.0", + "dev": true, "inBundle": true, - "license": "ISC" + "license": "ISC", + "optional": true }, "node_modules/fsevents/node_modules/gauge": { "version": "2.7.4", + "dev": true, "inBundle": true, "license": "ISC", + "optional": true, "dependencies": { "aproba": "^1.0.3", "console-control-strings": "^1.0.0", @@ -5494,8 +5530,10 @@ }, "node_modules/fsevents/node_modules/glob": { "version": "7.1.6", + "dev": true, "inBundle": true, "license": "ISC", + "optional": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -5513,13 +5551,17 @@ }, "node_modules/fsevents/node_modules/has-unicode": { "version": "2.0.1", + "dev": true, "inBundle": true, - "license": "ISC" + "license": "ISC", + "optional": true }, "node_modules/fsevents/node_modules/iconv-lite": { "version": "0.4.24", + "dev": true, "inBundle": true, "license": "MIT", + "optional": true, "dependencies": { "safer-buffer": ">= 2.1.2 < 3" }, @@ -5529,16 +5571,20 @@ }, "node_modules/fsevents/node_modules/ignore-walk": { "version": "3.0.3", + "dev": true, "inBundle": true, "license": "ISC", + "optional": true, "dependencies": { "minimatch": "^3.0.4" } }, "node_modules/fsevents/node_modules/inflight": { "version": "1.0.6", + "dev": true, "inBundle": true, "license": "ISC", + "optional": true, "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -5546,21 +5592,27 @@ }, "node_modules/fsevents/node_modules/inherits": { "version": "2.0.4", + "dev": true, "inBundle": true, - "license": "ISC" + "license": "ISC", + "optional": true }, "node_modules/fsevents/node_modules/ini": { "version": "1.3.5", + "dev": true, "inBundle": true, "license": "ISC", + "optional": true, "engines": { "node": "*" } }, "node_modules/fsevents/node_modules/is-fullwidth-code-point": { "version": "1.0.0", + "dev": true, "inBundle": true, "license": "MIT", + "optional": true, "dependencies": { "number-is-nan": "^1.0.0" }, @@ -5570,13 +5622,17 @@ }, "node_modules/fsevents/node_modules/isarray": { "version": "1.0.0", + "dev": true, "inBundle": true, - "license": "MIT" + "license": "MIT", + "optional": true }, "node_modules/fsevents/node_modules/minimatch": { "version": "3.0.4", + "dev": true, "inBundle": true, "license": "ISC", + "optional": true, "dependencies": { "brace-expansion": "^1.1.7" }, @@ -5586,13 +5642,17 @@ }, "node_modules/fsevents/node_modules/minimist": { "version": "0.0.8", + "dev": true, "inBundle": true, - "license": "MIT" + "license": "MIT", + "optional": true }, "node_modules/fsevents/node_modules/minipass": { "version": "2.9.0", + "dev": true, "inBundle": true, "license": "ISC", + "optional": true, "dependencies": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -5600,16 +5660,20 @@ }, "node_modules/fsevents/node_modules/minizlib": { "version": "1.3.3", + "dev": true, "inBundle": true, "license": "MIT", + "optional": true, "dependencies": { "minipass": "^2.9.0" } }, "node_modules/fsevents/node_modules/mkdirp": { "version": "0.5.1", + "dev": true, "inBundle": true, "license": "MIT", + "optional": true, "dependencies": { "minimist": "0.0.8" }, @@ -5619,8 +5683,10 @@ }, "node_modules/fsevents/node_modules/ms": { "version": "2.1.2", + "dev": true, "inBundle": true, - "license": "MIT" + "license": "MIT", + "optional": true }, "node_modules/fsevents/node_modules/nan": { "version": "2.14.0", @@ -5631,8 +5697,10 @@ }, "node_modules/fsevents/node_modules/needle": { "version": "2.4.0", + "dev": true, "inBundle": true, "license": "MIT", + "optional": true, "dependencies": { "debug": "^3.2.6", "iconv-lite": "^0.4.4", @@ -5647,8 +5715,10 @@ }, "node_modules/fsevents/node_modules/node-pre-gyp": { "version": "0.14.0", + "dev": true, "inBundle": true, "license": "BSD-3-Clause", + "optional": true, "dependencies": { "detect-libc": "^1.0.2", "mkdirp": "^0.5.1", @@ -5667,8 +5737,10 @@ }, "node_modules/fsevents/node_modules/nopt": { "version": "4.0.1", + "dev": true, "inBundle": true, "license": "ISC", + "optional": true, "dependencies": { "abbrev": "1", "osenv": "^0.1.4" @@ -5679,21 +5751,27 @@ }, "node_modules/fsevents/node_modules/npm-bundled": { "version": "1.1.1", + "dev": true, "inBundle": true, "license": "ISC", + "optional": true, "dependencies": { "npm-normalize-package-bin": "^1.0.1" } }, "node_modules/fsevents/node_modules/npm-normalize-package-bin": { "version": "1.0.1", + "dev": true, "inBundle": true, - "license": "ISC" + "license": "ISC", + "optional": true }, "node_modules/fsevents/node_modules/npm-packlist": { "version": "1.4.7", + "dev": true, "inBundle": true, "license": "ISC", + "optional": true, "dependencies": { "ignore-walk": "^3.0.1", "npm-bundled": "^1.0.1" @@ -5701,8 +5779,10 @@ }, "node_modules/fsevents/node_modules/npmlog": { "version": "4.1.2", + "dev": true, "inBundle": true, "license": "ISC", + "optional": true, "dependencies": { "are-we-there-yet": "~1.1.2", "console-control-strings": "~1.1.0", @@ -5712,48 +5792,60 @@ }, "node_modules/fsevents/node_modules/number-is-nan": { "version": "1.0.1", + "dev": true, "inBundle": true, "license": "MIT", + "optional": true, "engines": { "node": ">=0.10.0" } }, "node_modules/fsevents/node_modules/object-assign": { "version": "4.1.1", + "dev": true, "inBundle": true, "license": "MIT", + "optional": true, "engines": { "node": ">=0.10.0" } }, "node_modules/fsevents/node_modules/once": { "version": "1.4.0", + "dev": true, "inBundle": true, "license": "ISC", + "optional": true, "dependencies": { "wrappy": "1" } }, "node_modules/fsevents/node_modules/os-homedir": { "version": "1.0.2", + "dev": true, "inBundle": true, "license": "MIT", + "optional": true, "engines": { "node": ">=0.10.0" } }, "node_modules/fsevents/node_modules/os-tmpdir": { "version": "1.0.2", + "dev": true, "inBundle": true, "license": "MIT", + "optional": true, "engines": { "node": ">=0.10.0" } }, "node_modules/fsevents/node_modules/osenv": { "version": "0.1.5", + "dev": true, "inBundle": true, "license": "ISC", + "optional": true, "dependencies": { "os-homedir": "^1.0.0", "os-tmpdir": "^1.0.0" @@ -5761,21 +5853,27 @@ }, "node_modules/fsevents/node_modules/path-is-absolute": { "version": "1.0.1", + "dev": true, "inBundle": true, "license": "MIT", + "optional": true, "engines": { "node": ">=0.10.0" } }, "node_modules/fsevents/node_modules/process-nextick-args": { "version": "2.0.1", + "dev": true, "inBundle": true, - "license": "MIT" + "license": "MIT", + "optional": true }, "node_modules/fsevents/node_modules/rc": { "version": "1.2.8", + "dev": true, "inBundle": true, "license": "(BSD-2-Clause OR MIT OR Apache-2.0)", + "optional": true, "dependencies": { "deep-extend": "^0.6.0", "ini": "~1.3.0", @@ -5788,13 +5886,17 @@ }, "node_modules/fsevents/node_modules/rc/node_modules/minimist": { "version": "1.2.0", + "dev": true, "inBundle": true, - "license": "MIT" + "license": "MIT", + "optional": true }, "node_modules/fsevents/node_modules/readable-stream": { "version": "2.3.6", + "dev": true, "inBundle": true, "license": "MIT", + "optional": true, "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -5807,8 +5909,10 @@ }, "node_modules/fsevents/node_modules/rimraf": { "version": "2.7.1", + "dev": true, "inBundle": true, "license": "ISC", + "optional": true, "dependencies": { "glob": "^7.1.3" }, @@ -5818,49 +5922,65 @@ }, "node_modules/fsevents/node_modules/safe-buffer": { "version": "5.1.2", + "dev": true, "inBundle": true, - "license": "MIT" + "license": "MIT", + "optional": true }, "node_modules/fsevents/node_modules/safer-buffer": { "version": "2.1.2", + "dev": true, "inBundle": true, - "license": "MIT" + "license": "MIT", + "optional": true }, "node_modules/fsevents/node_modules/sax": { "version": "1.2.4", + "dev": true, "inBundle": true, - "license": "ISC" + "license": "ISC", + "optional": true }, "node_modules/fsevents/node_modules/semver": { "version": "5.7.1", + "dev": true, "inBundle": true, "license": "ISC", + "optional": true, "bin": { "semver": "bin/semver" } }, "node_modules/fsevents/node_modules/set-blocking": { "version": "2.0.0", + "dev": true, "inBundle": true, - "license": "ISC" + "license": "ISC", + "optional": true }, "node_modules/fsevents/node_modules/signal-exit": { "version": "3.0.2", + "dev": true, "inBundle": true, - "license": "ISC" + "license": "ISC", + "optional": true }, "node_modules/fsevents/node_modules/string_decoder": { "version": "1.1.1", + "dev": true, "inBundle": true, "license": "MIT", + "optional": true, "dependencies": { "safe-buffer": "~5.1.0" } }, "node_modules/fsevents/node_modules/string-width": { "version": "1.0.2", + "dev": true, "inBundle": true, "license": "MIT", + "optional": true, "dependencies": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -5872,8 +5992,10 @@ }, "node_modules/fsevents/node_modules/strip-ansi": { "version": "3.0.1", + "dev": true, "inBundle": true, "license": "MIT", + "optional": true, "dependencies": { "ansi-regex": "^2.0.0" }, @@ -5883,16 +6005,20 @@ }, "node_modules/fsevents/node_modules/strip-json-comments": { "version": "2.0.1", + "dev": true, "inBundle": true, "license": "MIT", + "optional": true, "engines": { "node": ">=0.10.0" } }, "node_modules/fsevents/node_modules/tar": { "version": "4.4.13", + "dev": true, "inBundle": true, "license": "ISC", + "optional": true, "dependencies": { "chownr": "^1.1.1", "fs-minipass": "^1.2.5", @@ -5908,26 +6034,34 @@ }, "node_modules/fsevents/node_modules/util-deprecate": { "version": "1.0.2", + "dev": true, "inBundle": true, - "license": "MIT" + "license": "MIT", + "optional": true }, "node_modules/fsevents/node_modules/wide-align": { "version": "1.1.3", + "dev": true, "inBundle": true, "license": "ISC", + "optional": true, "dependencies": { "string-width": "^1.0.2 || 2" } }, "node_modules/fsevents/node_modules/wrappy": { "version": "1.0.2", + "dev": true, "inBundle": true, - "license": "ISC" + "license": "ISC", + "optional": true }, "node_modules/fsevents/node_modules/yallist": { "version": "3.1.1", + "dev": true, "inBundle": true, - "license": "ISC" + "license": "ISC", + "optional": true }, "node_modules/function-bind": { "version": "1.1.1", @@ -23585,19 +23719,27 @@ "dependencies": { "abbrev": { "version": "1.1.1", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "ansi-regex": { "version": "2.1.1", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "are-we-there-yet": { "version": "1.1.5", "bundled": true, + "dev": true, + "optional": true, "requires": { "delegates": "^1.0.0", "readable-stream": "^2.0.6" @@ -23605,11 +23747,15 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true + "bundled": 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" @@ -23617,57 +23763,81 @@ }, "chownr": { "version": "1.1.3", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "code-point-at": { "version": "1.1.0", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "debug": { "version": "3.2.6", "bundled": true, + "dev": true, + "optional": true, "requires": { "ms": "^2.1.1" } }, "deep-extend": { "version": "0.6.0", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "delegates": { "version": "1.0.0", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "detect-libc": { "version": "1.0.3", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "fs-minipass": { "version": "1.2.7", "bundled": true, + "dev": true, + "optional": true, "requires": { "minipass": "^2.6.0" } }, "fs.realpath": { "version": "1.0.0", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "gauge": { "version": "2.7.4", "bundled": true, + "dev": true, + "optional": true, "requires": { "aproba": "^1.0.3", "console-control-strings": "^1.0.0", @@ -23682,6 +23852,8 @@ "glob": { "version": "7.1.6", "bundled": true, + "dev": true, + "optional": true, "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -23693,11 +23865,15 @@ }, "has-unicode": { "version": "2.0.1", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "iconv-lite": { "version": "0.4.24", "bundled": true, + "dev": true, + "optional": true, "requires": { "safer-buffer": ">= 2.1.2 < 3" } @@ -23705,6 +23881,8 @@ "ignore-walk": { "version": "3.0.3", "bundled": true, + "dev": true, + "optional": true, "requires": { "minimatch": "^3.0.4" } @@ -23712,6 +23890,8 @@ "inflight": { "version": "1.0.6", "bundled": true, + "dev": true, + "optional": true, "requires": { "once": "^1.3.0", "wrappy": "1" @@ -23719,37 +23899,51 @@ }, "inherits": { "version": "2.0.4", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, + "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } }, "isarray": { "version": "1.0.0", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "minimatch": { "version": "3.0.4", "bundled": true, + "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "minipass": { "version": "2.9.0", "bundled": true, + "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -23758,6 +23952,8 @@ "minizlib": { "version": "1.3.3", "bundled": true, + "dev": true, + "optional": true, "requires": { "minipass": "^2.9.0" } @@ -23765,13 +23961,17 @@ "mkdirp": { "version": "0.5.1", "bundled": true, + "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } }, "ms": { "version": "2.1.2", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "nan": { "version": "2.14.0", @@ -23783,6 +23983,8 @@ "needle": { "version": "2.4.0", "bundled": true, + "dev": true, + "optional": true, "requires": { "debug": "^3.2.6", "iconv-lite": "^0.4.4", @@ -23792,6 +23994,8 @@ "node-pre-gyp": { "version": "0.14.0", "bundled": true, + "dev": true, + "optional": true, "requires": { "detect-libc": "^1.0.2", "mkdirp": "^0.5.1", @@ -23808,6 +24012,8 @@ "nopt": { "version": "4.0.1", "bundled": true, + "dev": true, + "optional": true, "requires": { "abbrev": "1", "osenv": "^0.1.4" @@ -23816,17 +24022,23 @@ "npm-bundled": { "version": "1.1.1", "bundled": true, + "dev": true, + "optional": true, "requires": { "npm-normalize-package-bin": "^1.0.1" } }, "npm-normalize-package-bin": { "version": "1.0.1", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "npm-packlist": { "version": "1.4.7", "bundled": true, + "dev": true, + "optional": true, "requires": { "ignore-walk": "^3.0.1", "npm-bundled": "^1.0.1" @@ -23835,6 +24047,8 @@ "npmlog": { "version": "4.1.2", "bundled": true, + "dev": true, + "optional": true, "requires": { "are-we-there-yet": "~1.1.2", "console-control-strings": "~1.1.0", @@ -23844,30 +24058,42 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "once": { "version": "1.4.0", "bundled": true, + "dev": true, + "optional": true, "requires": { "wrappy": "1" } }, "os-homedir": { "version": "1.0.2", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "os-tmpdir": { "version": "1.0.2", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "osenv": { "version": "0.1.5", "bundled": true, + "dev": true, + "optional": true, "requires": { "os-homedir": "^1.0.0", "os-tmpdir": "^1.0.0" @@ -23875,15 +24101,21 @@ }, "path-is-absolute": { "version": "1.0.1", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "process-nextick-args": { "version": "2.0.1", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "rc": { "version": "1.2.8", "bundled": true, + "dev": true, + "optional": true, "requires": { "deep-extend": "^0.6.0", "ini": "~1.3.0", @@ -23893,13 +24125,17 @@ "dependencies": { "minimist": { "version": "1.2.0", - "bundled": true + "bundled": true, + "dev": true, + "optional": true } } }, "readable-stream": { "version": "2.3.6", "bundled": true, + "dev": true, + "optional": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -23913,37 +24149,53 @@ "rimraf": { "version": "2.7.1", "bundled": true, + "dev": true, + "optional": true, "requires": { "glob": "^7.1.3" } }, "safe-buffer": { "version": "5.1.2", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "sax": { "version": "1.2.4", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "semver": { "version": "5.7.1", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "set-blocking": { "version": "2.0.0", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "signal-exit": { "version": "3.0.2", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "string_decoder": { "version": "1.1.1", "bundled": true, + "dev": true, + "optional": true, "requires": { "safe-buffer": "~5.1.0" } @@ -23951,6 +24203,8 @@ "string-width": { "version": "1.0.2", "bundled": true, + "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -23960,17 +24214,23 @@ "strip-ansi": { "version": "3.0.1", "bundled": true, + "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } }, "strip-json-comments": { "version": "2.0.1", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "tar": { "version": "4.4.13", "bundled": true, + "dev": true, + "optional": true, "requires": { "chownr": "^1.1.1", "fs-minipass": "^1.2.5", @@ -23983,22 +24243,30 @@ }, "util-deprecate": { "version": "1.0.2", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "wide-align": { "version": "1.1.3", "bundled": true, + "dev": true, + "optional": true, "requires": { "string-width": "^1.0.2 || 2" } }, "wrappy": { "version": "1.0.2", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, "yallist": { "version": "3.1.1", - "bundled": true + "bundled": true, + "dev": true, + "optional": true } } }, diff --git a/src/client/components/editor/info-panel.js b/src/client/components/editor/info-panel.js index 3041a805d..5e9586299 100644 --- a/src/client/components/editor/info-panel.js +++ b/src/client/components/editor/info-panel.js @@ -72,9 +72,13 @@ export class InfoPanel extends Component { const retractedPubType = _.find( citation.pubTypes, ['UI', 'D016441'] ); const retractFlag = retractedPubType ? h('span.editor-info-flag.super-salient-button.danger', retractedPubType.value) : null; + const hasPubmedMetadata = pmid != null; + return h('div.editor-info-panel', [ h('div.editor-info-flags', [ retractFlag ]), + h('div.editor-info-title', title), + h('div.editor-info-authors', _.flatten(authorProfiles.map((a, i) => { let orcid = findOrcidIdentifier( a.orcid ); // Backwards compatible with URI if ( orcid ) { @@ -90,30 +94,27 @@ export class InfoPanel extends Component { i !== authorProfiles.length - 1 ? h('span.editor-info-author-spacer', ', ') : null ]; }))), + h(Credits, { controller, bus, document }), - h('div.editor-info-links', [ + + hasPubmedMetadata ? h('div.editor-info-links', [ h( doi ? 'a.editor-info-link.plain-link': 'div.editor-info-link', doi ? { target: '_blank', href: `${DOI_LINK_BASE_URL}${doi}` }: {}, reference), h('a.editor-info-link.plain-link', { target: '_blank', href: `${PUBMED_LINK_BASE_URL}${pmid}` }, 'PubMed'), h('a.editor-info-link.plain-link', { target: '_blank', href: `${GOOGLE_SCHOLAR_BASE_URL}${ doi ? doi : ( "\u0022" + title + "\u0022") }` }, 'Google Scholar') - ]), - h('div.editor-info-main-sections', [ + ]) : null, + + abstract ? h('div.editor-info-main-sections', [ h('div.editor-info-abstract-section.editor-info-main-section', [ h('div.editor-info-section-title', abstract ? 'Abstract': 'Summary'), h('div.editor-info-abstract-content', abstract ? abstract : document.toText() ) ]), - // h('div.editor-info-carousel-title', 'Recommended articles'), - // h('div.editor-info-carousel', [ - // h(Carousel, { content: CAROUSEL_CONTENT.ABSTRACT }) - // ]), - // h('div.editor-info-carousel-title', 'Trending articles'), - // h('div.editor-info-carousel', [ - // h(Carousel, { content: CAROUSEL_CONTENT.ABSTRACT }) - // ]), h('div.editor-info-related-papers-section.editor-info-main-section', [ h('div.editor-info-section-title', 'Recommended articles'), h('div.editor-info-related-papers', [ h(RelatedPapers, { document, source: document }) ]) ]) - ]) + ]) : null, + + !hasPubmedMetadata && !document.editable() ? h('div.editor-coming-soon-placeholder', `Biofactoid is looking for more information about this article from PubMed and pathway databases. This information will appear here as soon as it is available.`) : null ]); } } diff --git a/src/client/components/element-info/entity-info.js b/src/client/components/element-info/entity-info.js index 5b67344c7..81b43de08 100644 --- a/src/client/components/element-info/entity-info.js +++ b/src/client/components/element-info/entity-info.js @@ -365,6 +365,11 @@ class EntityInfo extends DataComponent { let doc = p.document; let children = []; + const citation = doc.citation(); + const { pmid } = citation; + + const hasPubmedMetadata = pmid != null; + let Loader = ({ loading = true }) => h('div.entity-info-matches-loading' + (loading ? '.entity-info-matches-loading-active' : ''), [ loading ? h('i.icon.icon-spinner') : h('i.material-icons', 'remove') ]); @@ -596,6 +601,9 @@ class EntityInfo extends DataComponent { assocDisp.link(m) ); + const relPprs = s.element.relatedPapers(); + const hasRelatedPapers = relPprs != null && relPprs.length > 0; + if( !doc.editable() ){ if( assoc == null ){ const type = s.element.type(); @@ -604,9 +612,16 @@ class EntityInfo extends DataComponent { if( isComplex(s.element.type()) ){ const entityNames = s.element.participants().map(ppt => ppt.name()); children.push( h('div.entity-info-assoc', targetFromAssoc({ type, name, entityNames }, true )) ); - children.push( h('div.entity-info-related-papers', [ - h(RelatedPapers, { document, source: s.element }) - ]) ); + + if (hasRelatedPapers) { + children.push( h('div.entity-info-reld-papers-title', `Recommended articles`) ); + + children.push( h('div.entity-info-related-papers', [ + h(RelatedPapers, { document, source: s.element }) + ]) ); + } else { + children.push( h('div.editor-coming-soon-placeholder', `Biofactoid is looking for more information about this article from PubMed and pathway databases. This information will appear here as soon as it is available.`) ); + } } else { children.push( h('div.entity-info-no-assoc', [ h('div.element-info-message.element-info-no-data', [ @@ -618,11 +633,15 @@ class EntityInfo extends DataComponent { } else { children.push( h('div.entity-info-assoc', allAssoc( assoc, true, false )) ); - children.push( h('div.entity-info-reld-papers-title', `Recommended articles`) ); + if (hasRelatedPapers) { + children.push( h('div.entity-info-reld-papers-title', `Recommended articles`) ); - children.push( h('div.entity-info-related-papers', [ - h(RelatedPapers, { document, source: s.element }) - ]) ); + children.push( h('div.entity-info-related-papers', [ + h(RelatedPapers, { document, source: s.element }) + ]) ); + } else if(!doc.editable()) { + children.push( h('div.editor-coming-soon-placeholder', `Biofactoid is looking for more information about this article from PubMed and pathway databases. This information will appear here as soon as it is available.`) ); + } } } else { let placeholder; diff --git a/src/client/components/element-info/interaction-info.js b/src/client/components/element-info/interaction-info.js index 7e6a6528b..3ccdc34be 100644 --- a/src/client/components/element-info/interaction-info.js +++ b/src/client/components/element-info/interaction-info.js @@ -212,7 +212,9 @@ class InteractionInfo extends DataComponent { if( stage === STAGES.COMPLETED || !doc.editable() ){ let showEditButton = doc.editable(); - let showRelatedPapers = !doc.editable(); + const relPprs = el.relatedPapers(); + const hasRelatedPapers = relPprs != null && relPprs.length > 0; + let showRelatedPapers = !doc.editable() && hasRelatedPapers; let assoc = el.association(); let summaryChildren = []; @@ -230,17 +232,13 @@ class InteractionInfo extends DataComponent { } if( showRelatedPapers ){ - // summaryChildren.push( h('div.interaction-info-carousel-title', 'Recommended articles') ); - - // summaryChildren.push( h('div.interaction-info-carousel', [ - // h(Carousel, { content: CAROUSEL_CONTENT.ABSTRACT }) - // ]) ); - summaryChildren.push( h('div.interaction-info-reld-papers-title', 'Recommended articles') ); summaryChildren.push( h('div.interaction-info-related-papers', [ h(RelatedPapers, { document, source: el }) ]) ); + } else if(!doc.editable()) { + summaryChildren.push( h('div.editor-coming-soon-placeholder', `Biofactoid is looking for more information about this article from PubMed and pathway databases. This information will appear here as soon as it is available.`) ); } children.push( h('div.interaction-info-summary', summaryChildren) ); diff --git a/src/styles/editor/editor.css b/src/styles/editor/editor.css index 4cf84d3b5..8414f42d1 100644 --- a/src/styles/editor/editor.css +++ b/src/styles/editor/editor.css @@ -221,6 +221,7 @@ .editor-read-only .editor-graph { right: 0; bottom: 50%; + margin-bottom: 2em; } .editor-explore-share { @@ -375,6 +376,13 @@ justify-content: center; } +.editor-caption-text { + display: inline-block; + background: cyan; + background: rgba(255, 255, 255, 0.666); + border-radius: 0.25em; +} + .editor-read-only .editor-caption { bottom: 50vh; margin: 0.5em; @@ -394,6 +402,17 @@ } } +.editor-coming-soon-placeholder { + text-align: center; + height: 14em; + /* background-color: cyan; */ + display: flex; + align-items: center; + justify-content: center; + color: #888; + padding: 0 25%; +} + @media (min-width: 1000px) { .editor-info-panel { padding: 1em;