diff --git a/.sequelizerc.example b/.sequelizerc.example
index 868712f44b..e7a489e659 100644
--- a/.sequelizerc.example
+++ b/.sequelizerc.example
@@ -2,8 +2,8 @@ const path = require('path')
const config = require('./lib/config')
module.exports = {
- config: path.resolve('config.json'),
+ config: path.resolve('config.js'),
'migrations-path': path.resolve('lib', 'migrations'),
'models-path': path.resolve('lib', 'models'),
- url: process.env['CMD_DB_URL'] || config.dbURL
+ url: config.dbURL
}
diff --git a/config.js b/config.js
new file mode 100644
index 0000000000..c8ad532fce
--- /dev/null
+++ b/config.js
@@ -0,0 +1,3 @@
+const config = require('./lib/config')
+
+module.exports = config.db
diff --git a/lib/config/index.js b/lib/config/index.js
index 150116f628..467ab123eb 100644
--- a/lib/config/index.js
+++ b/lib/config/index.js
@@ -189,7 +189,9 @@ switch (config.imageUploadType) {
'image/png',
'image/jpg',
'image/gif',
- 'image/svg+xml'
+ 'image/svg+xml',
+ 'image/bmp',
+ 'image/tiff'
]
}
diff --git a/lib/imageRouter/index.js b/lib/imageRouter/index.js
index 5af005bc15..5e2d3dfbb3 100644
--- a/lib/imageRouter/index.js
+++ b/lib/imageRouter/index.js
@@ -1,15 +1,30 @@
'use strict'
const fs = require('fs')
+const path = require('path')
const Router = require('express').Router
const formidable = require('formidable')
+const readChunk = require('read-chunk')
+const imageType = require('image-type')
+const mime = require('mime-types')
+
const config = require('../config')
const logger = require('../logger')
const response = require('../response')
const imageRouter = module.exports = Router()
+function checkImageValid (filepath) {
+ const buffer = readChunk.sync(filepath, 0, 12)
+ /** @type {{ ext: string, mime: string } | null} */
+ const mimetypeFromBuf = imageType(buffer)
+ const mimeTypeFromExt = mime.lookup(path.extname(filepath))
+
+ return mimetypeFromBuf && config.allowedUploadMimeTypes.includes(mimetypeFromBuf.mime) &&
+ mimeTypeFromExt && config.allowedUploadMimeTypes.includes(mimeTypeFromExt)
+}
+
// upload image
imageRouter.post('/uploadimage', function (req, res) {
var form = new formidable.IncomingForm()
@@ -24,6 +39,10 @@ imageRouter.post('/uploadimage', function (req, res) {
logger.info('SERVER received uploadimage: ' + JSON.stringify(files.image))
}
+ if (!checkImageValid(files.image.path)) {
+ return response.errorForbidden(req, res)
+ }
+
const uploadProvider = require('./' + config.imageUploadType)
uploadProvider.uploadImage(files.image.path, function (err, url) {
// remove temporary upload file, and ignore any error
diff --git a/lib/note/index.js b/lib/note/index.js
index a387b59dba..0a20238ed8 100644
--- a/lib/note/index.js
+++ b/lib/note/index.js
@@ -2,11 +2,12 @@
const config = require('../config')
const logger = require('../logger')
-const { Note, User } = require('../models')
+const { Note, User, Revision } = require('../models')
const { newCheckViewPermission, errorForbidden, responseCodiMD, errorNotFound, errorInternalError } = require('../response')
-const { updateHistory } = require('../history')
+const { updateHistory, historyDelete } = require('../history')
const { actionPublish, actionSlide, actionInfo, actionDownload, actionPDF, actionGist, actionRevision, actionPandoc } = require('./noteActions')
+const realtime = require('../realtime/realtime')
async function getNoteById (noteId, { includeUser } = { includeUser: false }) {
const id = await Note.parseNoteIdAsync(noteId)
@@ -232,7 +233,106 @@ function listMyNotes (req, res) {
}
}
+const deleteNote = async (req, res) => {
+ if (req.isAuthenticated()) {
+ const noteId = await Note.parseNoteIdAsync(req.params.noteId)
+ try {
+ const destroyed = await Note.destroy({
+ where: {
+ id: noteId,
+ ownerId: req.user.id
+ }
+ })
+ if (!destroyed) {
+ logger.error('Delete note failed: Make sure the noteId and ownerId are correct.')
+ return errorNotFound(req, res)
+ }
+
+ historyDelete(req, res)
+
+ if (realtime.isNoteExistsInPool(noteId)) {
+ const note = realtime.getNoteFromNotePool(noteId)
+ realtime.disconnectSocketOnNote(note)
+ }
+
+ res.send({
+ status: 'ok'
+ })
+ } catch (err) {
+ logger.error('Delete note failed: Internal Error.')
+ return errorInternalError(req, res)
+ }
+ } else {
+ return errorForbidden(req, res)
+ }
+}
+
+const updateNote = async (req, res) => {
+ if (req.isAuthenticated()) {
+ const noteId = await Note.parseNoteIdAsync(req.params.noteId)
+ try {
+ const note = await Note.findOne({
+ where: {
+ id: noteId
+ }
+ })
+ if (!note) {
+ logger.error('Update note failed: Can\'t find the note.')
+ return errorNotFound(req, res)
+ }
+
+ if (realtime.isNoteExistsInPool(noteId)) {
+ logger.error('Update note failed: There are online users opening this note.')
+ return res.status('403').json({ status: 'error', message: 'Update API can only be used when no users is online' })
+ }
+
+ const now = Date.now()
+ const content = req.body.content
+ const updated = await note.update({
+ title: Note.parseNoteTitle(content),
+ content: content,
+ lastchangeAt: now,
+ authorship: [
+ [
+ req.user.id,
+ 0,
+ content.length,
+ now,
+ now
+ ]
+ ]
+ })
+
+ if (!updated) {
+ logger.error('Update note failed: Write note content error.')
+ return errorInternalError(req, res)
+ }
+
+ updateHistory(req.user.id, note.id, content)
+
+ Revision.saveNoteRevision(note, (err, revision) => {
+ if (err) {
+ logger.error(err)
+ return errorInternalError(req, res)
+ }
+ if (!revision) return errorNotFound(req, res)
+ res.send({
+ status: 'ok'
+ })
+ })
+ } catch (err) {
+ logger.error(err)
+ logger.error('Update note failed: Internal Error.')
+ return errorInternalError(req, res)
+ }
+ } else {
+ return errorForbidden(req, res)
+ }
+}
+
exports.showNote = showNote
exports.showPublishNote = showPublishNote
exports.noteActions = noteActions
exports.listMyNotes = listMyNotes
+exports.deleteNote = deleteNote
+exports.updateNote = updateNote
diff --git a/lib/routes.js b/lib/routes.js
index 48ac61f3dc..9d15c3499b 100644
--- a/lib/routes.js
+++ b/lib/routes.js
@@ -12,6 +12,7 @@ const historyController = require('./history')
const userController = require('./user')
const noteController = require('./note')
const response = require('./response')
+const bodyParser = require('body-parser')
const appRouter = Router()
// register route
@@ -72,6 +73,10 @@ appRouter.get('/p/:shortid', response.showPublishSlide)
appRouter.get('/p/:shortid/:action', response.publishSlideActions)
// gey my note list
appRouter.get('/api/notes/myNotes', noteController.listMyNotes)
+// delete note by id
+appRouter.delete('/api/notes/:noteId', noteController.deleteNote)
+// update note content by id
+appRouter.put('/api/notes/:noteId', bodyParser.json(), noteController.updateNote)
// get note by id
appRouter.get('/:noteId', wrap(noteController.showNote))
// note actions
diff --git a/lib/utils.js b/lib/utils.js
index 4180e20267..eb10ca452f 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -2,29 +2,14 @@
const fs = require('fs')
const path = require('path')
const bodyParser = require('body-parser')
+const mime = require('mime-types')
exports.isSQLite = function isSQLite (sequelize) {
return sequelize.options.dialect === 'sqlite'
}
exports.getImageMimeType = function getImageMimeType (imagePath) {
- const fileExtension = /[^.]+$/.exec(imagePath)
-
- switch (fileExtension[0]) {
- case 'bmp':
- return 'image/bmp'
- case 'gif':
- return 'image/gif'
- case 'jpg':
- case 'jpeg':
- return 'image/jpeg'
- case 'png':
- return 'image/png'
- case 'tiff':
- return 'image/tiff'
- default:
- return undefined
- }
+ return mime.lookup(path.extname(imagePath))
}
exports.isRevealTheme = function isRevealTheme (theme) {
diff --git a/package-lock.json b/package-lock.json
index 8bb4481ffe..16daf25590 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "codimd",
- "version": "2.2.0",
+ "version": "2.3.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -786,9 +786,9 @@
"dev": true
},
"@hackmd/codemirror": {
- "version": "5.49.5",
- "resolved": "https://registry.npmjs.org/@hackmd/codemirror/-/codemirror-5.49.5.tgz",
- "integrity": "sha512-9R/5wfex+Ik0L5TChqByf/SpwMTRXCrbiD0TB+R61CTfpRIv4LJp/khOxRFoZNvpFu6LXuejey+2gjD47PDS9g==",
+ "version": "5.49.8",
+ "resolved": "https://registry.npmjs.org/@hackmd/codemirror/-/codemirror-5.49.8.tgz",
+ "integrity": "sha512-UIkcTHeVDta9/Otr1IljP9d52YfDQq35ypndichvAEWoTGpq+s9ED2zv2QkYdsdoJ0z6ggwOooFJAoWiHFfYVQ==",
"dev": true,
"requires": {
"blint": "^1",
@@ -1050,15 +1050,9 @@
}
},
"@types/clone": {
- "version": "0.1.30",
- "resolved": "https://registry.npmjs.org/@types/clone/-/clone-0.1.30.tgz",
- "integrity": "sha1-5zZWSMG0ITalnH1QQGN7O1yDthQ=",
- "dev": true
- },
- "@types/color-name": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
- "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/@types/clone/-/clone-2.1.0.tgz",
+ "integrity": "sha512-d/aS/lPOnUSruPhgNtT8jW39fHRVTLQy9sodysP1kkG8EdAtdZu1vt8NJaYA8w/6Z9j8izkAsx1A/yJhcYR1CA==",
"dev": true
},
"@types/connect": {
@@ -3190,9 +3184,9 @@
}
},
"blint": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/blint/-/blint-1.1.0.tgz",
- "integrity": "sha512-XSNoVy5Hu6fE3xSL4M7EDrIL5UrxkMlSpOChF9rf3aEKyx1/hI/WIetmfS72JVcDUozbl7usaVt5hWx620Fjig==",
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/blint/-/blint-1.1.1.tgz",
+ "integrity": "sha512-kpYOL/1xnokcGTUpwfpsfw25YyYHrbgTfx6ym2zgSWb+ok7ga30/ha8qOaiPQufSNIGcnNcZQUkQkRF6YkmmXQ==",
"dev": true,
"requires": {
"acorn": "^7.0.0",
@@ -3201,15 +3195,15 @@
},
"dependencies": {
"acorn": {
- "version": "7.1.0",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz",
- "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==",
+ "version": "7.4.0",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz",
+ "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==",
"dev": true
},
"acorn-walk": {
- "version": "7.1.1",
- "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.1.1.tgz",
- "integrity": "sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ==",
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+ "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
"dev": true
}
}
@@ -4881,9 +4875,9 @@
}
},
"d3-delaunay": {
- "version": "5.2.1",
- "resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-5.2.1.tgz",
- "integrity": "sha512-ZZdeJl6cKRyqYVFYK+/meXvWIrAvZsZTD7WSxl4OPXCmuXNgDyACAClAJHD63zL25TA+IJGURUNO7rFseNFCYw==",
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-5.3.0.tgz",
+ "integrity": "sha512-amALSrOllWVLaHTnDLHwMIiz0d1bBu9gZXd1FiLfXf8sHcX9jrcj81TVZOqD4UX7MgBZZ07c8GxzEgBpJqc74w==",
"dev": true,
"requires": {
"delaunator": "4"
@@ -4968,15 +4962,34 @@
}
},
"d3-geo-projection": {
- "version": "2.8.1",
- "resolved": "https://registry.npmjs.org/d3-geo-projection/-/d3-geo-projection-2.8.1.tgz",
- "integrity": "sha512-VObmT3vQQgU7IxkDwyIuOrWK4AS2OHyvucp1vHo98WE7DvAN+VcS3Pf/oKenszPfbMtHusOfQNBLEMyGHguvTg==",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/d3-geo-projection/-/d3-geo-projection-3.0.0.tgz",
+ "integrity": "sha512-1JE+filVbkEX2bT25dJdQ05iA4QHvUwev6o0nIQHOSrNlHCAKfVss/U10vEM3pA4j5v7uQoFdQ4KLbx9BlEbWA==",
"dev": true,
"requires": {
"commander": "2",
- "d3-array": "1",
- "d3-geo": "^1.10.0",
+ "d3-array": "1 - 2",
+ "d3-geo": "1.12.0 - 2",
"resolve": "^1.1.10"
+ },
+ "dependencies": {
+ "d3-geo": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-2.0.1.tgz",
+ "integrity": "sha512-M6yzGbFRfxzNrVhxDJXzJqSLQ90q1cCyb3EWFZ1LF4eWOBYxFypw7I/NFVBNXKNqxv1bqLathhYvdJ6DC+th3A==",
+ "dev": true,
+ "requires": {
+ "d3-array": ">=2.5"
+ },
+ "dependencies": {
+ "d3-array": {
+ "version": "2.9.1",
+ "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
+ "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg==",
+ "dev": true
+ }
+ }
+ }
}
},
"d3-hierarchy": {
@@ -5404,6 +5417,12 @@
"integrity": "sha512-+eqpz5j8WONSzxmc4avCN4XX/6q5+J6JfWz2AaluZIOVNgXPxUjXBhKS73+nRhM3nE1pGeRMqkyZevTQWgYTTw==",
"dev": true
},
+ "dictionary-en-gb": {
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/dictionary-en-gb/-/dictionary-en-gb-2.2.2.tgz",
+ "integrity": "sha512-36Pz/2BGmJfXtAo5+IGOi+U6gwtxFsFXFJMOX0FC1z2YeLd1IXkxsfAhieC06OrdGie3SqCZmUOYeYgct5Hzzw==",
+ "dev": true
+ },
"diff": {
"version": "3.5.0",
"resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
@@ -6065,6 +6084,12 @@
"es6-symbol": "^3.1.1"
}
},
+ "escalade": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+ "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+ "dev": true
+ },
"escallmatch": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/escallmatch/-/escallmatch-1.5.0.tgz",
@@ -7143,6 +7168,11 @@
"integrity": "sha512-Wz3c3XQ5xroCxd1G8b7yL0Ehkf0TC9oYC6buPFkNnU9EnaPlifeAFCyCh+iewXTyFRcg0a6j3J7FmJsIhlhBdw==",
"dev": true
},
+ "file-type": {
+ "version": "10.11.0",
+ "resolved": "https://registry.npmjs.org/file-type/-/file-type-10.11.0.tgz",
+ "integrity": "sha512-uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw=="
+ },
"file-uri-to-path": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
@@ -7441,21 +7471,21 @@
},
"ansi-regex": {
"version": "2.1.1",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
"dev": true,
"optional": true
},
"aproba": {
"version": "1.2.0",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
"integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
"dev": true,
"optional": true
},
"are-we-there-yet": {
"version": "1.1.5",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
"integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
"dev": true,
"optional": true,
@@ -7466,14 +7496,14 @@
},
"balanced-match": {
"version": "1.0.0",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
"dev": true,
"optional": true
},
"brace-expansion": {
"version": "1.1.11",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
"dev": true,
"optional": true,
@@ -7484,42 +7514,42 @@
},
"chownr": {
"version": "1.1.3",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz",
"integrity": "sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==",
"dev": true,
"optional": true
},
"code-point-at": {
"version": "1.1.0",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
"dev": true,
"optional": true
},
"concat-map": {
"version": "0.0.1",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
"dev": true,
"optional": true
},
"console-control-strings": {
"version": "1.1.0",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
"dev": true,
"optional": true
},
"core-util-is": {
"version": "1.0.2",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
"dev": true,
"optional": true
},
"debug": {
"version": "3.2.6",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
"dev": true,
"optional": true,
@@ -7529,28 +7559,28 @@
},
"deep-extend": {
"version": "0.6.0",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
"integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
"dev": true,
"optional": true
},
"delegates": {
"version": "1.0.0",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
"dev": true,
"optional": true
},
"detect-libc": {
"version": "1.0.3",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
"integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
"dev": true,
"optional": true
},
"fs-minipass": {
"version": "1.2.7",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
"integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
"dev": true,
"optional": true,
@@ -7560,14 +7590,14 @@
},
"fs.realpath": {
"version": "1.0.0",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
"dev": true,
"optional": true
},
"gauge": {
"version": "2.7.4",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
"dev": true,
"optional": true,
@@ -7584,7 +7614,7 @@
},
"glob": {
"version": "7.1.6",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
"integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
"dev": true,
"optional": true,
@@ -7599,14 +7629,14 @@
},
"has-unicode": {
"version": "2.0.1",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
"dev": true,
"optional": true
},
"iconv-lite": {
"version": "0.4.24",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
"dev": true,
"optional": true,
@@ -7616,7 +7646,7 @@
},
"ignore-walk": {
"version": "3.0.3",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz",
"integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==",
"dev": true,
"optional": true,
@@ -7626,7 +7656,7 @@
},
"inflight": {
"version": "1.0.6",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
"dev": true,
"optional": true,
@@ -7637,21 +7667,21 @@
},
"inherits": {
"version": "2.0.4",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
"dev": true,
"optional": true
},
"ini": {
"version": "1.3.5",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
"dev": true,
"optional": true
},
"is-fullwidth-code-point": {
"version": "1.0.0",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"dev": true,
"optional": true,
@@ -7661,14 +7691,14 @@
},
"isarray": {
"version": "1.0.0",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
"dev": true,
"optional": true
},
"minimatch": {
"version": "3.0.4",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
"dev": true,
"optional": true,
@@ -7678,14 +7708,14 @@
},
"minimist": {
"version": "0.0.8",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
"dev": true,
"optional": true
},
"minipass": {
"version": "2.9.0",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
"integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
"dev": true,
"optional": true,
@@ -7696,7 +7726,7 @@
},
"minizlib": {
"version": "1.3.3",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
"integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
"dev": true,
"optional": true,
@@ -7706,7 +7736,7 @@
},
"mkdirp": {
"version": "0.5.1",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
"dev": true,
"optional": true,
@@ -7716,14 +7746,14 @@
},
"ms": {
"version": "2.1.2",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"dev": true,
"optional": true
},
"needle": {
"version": "2.4.0",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz",
"integrity": "sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==",
"dev": true,
"optional": true,
@@ -7735,7 +7765,7 @@
},
"node-pre-gyp": {
"version": "0.14.0",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz",
"integrity": "sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==",
"dev": true,
"optional": true,
@@ -7754,7 +7784,7 @@
},
"nopt": {
"version": "4.0.1",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
"dev": true,
"optional": true,
@@ -7765,7 +7795,7 @@
},
"npm-bundled": {
"version": "1.1.1",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz",
"integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==",
"dev": true,
"optional": true,
@@ -7775,14 +7805,14 @@
},
"npm-normalize-package-bin": {
"version": "1.0.1",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz",
"integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==",
"dev": true,
"optional": true
},
"npm-packlist": {
"version": "1.4.7",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.7.tgz",
"integrity": "sha512-vAj7dIkp5NhieaGZxBJB8fF4R0078rqsmhJcAfXZ6O7JJhjhPK96n5Ry1oZcfLXgfun0GWTZPOxaEyqv8GBykQ==",
"dev": true,
"optional": true,
@@ -7793,7 +7823,7 @@
},
"npmlog": {
"version": "4.1.2",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
"dev": true,
"optional": true,
@@ -7806,21 +7836,21 @@
},
"number-is-nan": {
"version": "1.0.1",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
"dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
"dev": true,
"optional": true
},
"once": {
"version": "1.4.0",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
"dev": true,
"optional": true,
@@ -7830,21 +7860,21 @@
},
"os-homedir": {
"version": "1.0.2",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
"dev": true,
"optional": true
},
"os-tmpdir": {
"version": "1.0.2",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
"dev": true,
"optional": true
},
"osenv": {
"version": "0.1.5",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
"dev": true,
"optional": true,
@@ -7855,21 +7885,21 @@
},
"path-is-absolute": {
"version": "1.0.1",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
"dev": true,
"optional": true
},
"process-nextick-args": {
"version": "2.0.1",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
"dev": true,
"optional": true
},
"rc": {
"version": "1.2.8",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
"dev": true,
"optional": true,
@@ -7882,7 +7912,7 @@
"dependencies": {
"minimist": {
"version": "1.2.0",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
"dev": true,
"optional": true
@@ -7891,7 +7921,7 @@
},
"readable-stream": {
"version": "2.3.6",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
"dev": true,
"optional": true,
@@ -7907,7 +7937,7 @@
},
"rimraf": {
"version": "2.7.1",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
"dev": true,
"optional": true,
@@ -7917,49 +7947,49 @@
},
"safe-buffer": {
"version": "5.1.2",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
"dev": true,
"optional": true
},
"safer-buffer": {
"version": "2.1.2",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
"dev": true,
"optional": true
},
"sax": {
"version": "1.2.4",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
"dev": true,
"optional": true
},
"semver": {
"version": "5.7.1",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
"dev": true,
"optional": true
},
"set-blocking": {
"version": "2.0.0",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
"dev": true,
"optional": true
},
"signal-exit": {
"version": "3.0.2",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
"dev": true,
"optional": true
},
"string-width": {
"version": "1.0.2",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"dev": true,
"optional": true,
@@ -7971,7 +8001,7 @@
},
"string_decoder": {
"version": "1.1.1",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"dev": true,
"optional": true,
@@ -7981,7 +8011,7 @@
},
"strip-ansi": {
"version": "3.0.1",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"dev": true,
"optional": true,
@@ -7991,14 +8021,14 @@
},
"strip-json-comments": {
"version": "2.0.1",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
"dev": true,
"optional": true
},
"tar": {
"version": "4.4.13",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
"integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
"dev": true,
"optional": true,
@@ -8014,14 +8044,14 @@
},
"util-deprecate": {
"version": "1.0.2",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
"dev": true,
"optional": true
},
"wide-align": {
"version": "1.1.3",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
"integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
"dev": true,
"optional": true,
@@ -8031,14 +8061,14 @@
},
"wrappy": {
"version": "1.0.2",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
"dev": true,
"optional": true
},
"yallist": {
"version": "3.1.1",
- "resolved": false,
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
"dev": true,
"optional": true
@@ -8831,6 +8861,14 @@
"dev": true,
"optional": true
},
+ "image-type": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/image-type/-/image-type-4.1.0.tgz",
+ "integrity": "sha512-CFJMJ8QK8lJvRlTCEgarL4ro6hfDQKif2HjSvYCdQZESaIPV4v9imrf7BQHK+sQeTeNeMpWciR9hyC/g8ybXEg==",
+ "requires": {
+ "file-type": "^10.10.0"
+ }
+ },
"import-fresh": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
@@ -10272,9 +10310,9 @@
}
},
"magic-string": {
- "version": "0.25.6",
- "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.6.tgz",
- "integrity": "sha512-3a5LOMSGoCTH5rbqobC2HuDNRtE2glHZ8J7pK+QZYppyWA36yuNpsX994rIY2nCuyP7CZYy7lQq/X2jygiZ89g==",
+ "version": "0.25.7",
+ "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
+ "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
"dev": true,
"requires": {
"sourcemap-codec": "^1.4.4"
@@ -11954,8 +11992,7 @@
"p-finally": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
- "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
- "dev": true
+ "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
},
"p-is-promise": {
"version": "2.1.0",
@@ -13973,6 +14010,22 @@
"integrity": "sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==",
"dev": true
},
+ "read-chunk": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/read-chunk/-/read-chunk-3.2.0.tgz",
+ "integrity": "sha512-CEjy9LCzhmD7nUpJ1oVOE6s/hBkejlcJEgLQHVnQznOSilOPb+kpKktlLfFDK3/WP43+F80xkUTM2VOkYoSYvQ==",
+ "requires": {
+ "pify": "^4.0.1",
+ "with-open-file": "^0.1.6"
+ },
+ "dependencies": {
+ "pify": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+ "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
+ }
+ }
+ },
"read-pkg": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
@@ -14092,9 +14145,9 @@
"dev": true
},
"regenerate-unicode-properties": {
- "version": "8.1.0",
- "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz",
- "integrity": "sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==",
+ "version": "8.2.0",
+ "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz",
+ "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==",
"dev": true,
"requires": {
"regenerate": "^1.4.0"
@@ -14142,29 +14195,29 @@
"dev": true
},
"regexpu-core": {
- "version": "4.6.0",
- "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.6.0.tgz",
- "integrity": "sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==",
+ "version": "4.7.0",
+ "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz",
+ "integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==",
"dev": true,
"requires": {
"regenerate": "^1.4.0",
- "regenerate-unicode-properties": "^8.1.0",
- "regjsgen": "^0.5.0",
- "regjsparser": "^0.6.0",
+ "regenerate-unicode-properties": "^8.2.0",
+ "regjsgen": "^0.5.1",
+ "regjsparser": "^0.6.4",
"unicode-match-property-ecmascript": "^1.0.4",
- "unicode-match-property-value-ecmascript": "^1.1.0"
+ "unicode-match-property-value-ecmascript": "^1.2.0"
},
"dependencies": {
"regjsgen": {
- "version": "0.5.1",
- "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.1.tgz",
- "integrity": "sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==",
+ "version": "0.5.2",
+ "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz",
+ "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==",
"dev": true
},
"regjsparser": {
- "version": "0.6.3",
- "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.3.tgz",
- "integrity": "sha512-8uZvYbnfAtEm9Ab8NTb3hdLwL4g/LQzEYP7Xs27T96abJCCE2d6r3cPZPQEsLKy0vRSGVNG+/zVGtLr86HQduA==",
+ "version": "0.6.4",
+ "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz",
+ "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==",
"dev": true,
"requires": {
"jsesc": "~0.5.0"
@@ -16588,15 +16641,15 @@
}
},
"unicode-match-property-value-ecmascript": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz",
- "integrity": "sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==",
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz",
+ "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==",
"dev": true
},
"unicode-property-aliases-ecmascript": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz",
- "integrity": "sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz",
+ "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==",
"dev": true
},
"unified": {
@@ -16961,240 +17014,351 @@
}
},
"vega": {
- "version": "5.9.1",
- "resolved": "https://registry.npmjs.org/vega/-/vega-5.9.1.tgz",
- "integrity": "sha512-Wd5WAfaXPGuHk5cSFqiFNkkw5DXRSZcl+q4x351VUbmV5/IRipyGZx05EbBP5D9B40Xb/Tt2I+JQBBdxuYYIxQ==",
- "dev": true,
- "requires": {
- "vega-crossfilter": "4.0.1",
- "vega-dataflow": "5.5.0",
- "vega-encode": "4.5.2",
- "vega-event-selector": "2.0.2",
- "vega-expression": "2.6.3",
- "vega-force": "4.0.3",
- "vega-functions": "5.5.1",
- "vega-geo": "4.3.0",
- "vega-hierarchy": "4.0.3",
- "vega-loader": "4.1.3",
- "vega-parser": "5.12.0",
- "vega-projection": "1.4.0",
- "vega-regression": "1.0.4",
- "vega-runtime": "5.0.2",
- "vega-scale": "6.0.0",
- "vega-scenegraph": "4.5.0",
- "vega-statistics": "1.7.2",
- "vega-time": "1.0.0",
- "vega-transforms": "4.6.0",
- "vega-typings": "0.12.0",
- "vega-util": "1.12.2",
- "vega-view": "5.4.0",
- "vega-view-transforms": "4.5.0",
- "vega-voronoi": "4.1.1",
- "vega-wordcloud": "4.0.4"
+ "version": "5.17.1",
+ "resolved": "https://registry.npmjs.org/vega/-/vega-5.17.1.tgz",
+ "integrity": "sha512-ev1S6ohnsyeqps/bUVbhByoAbucap8vXPuiAJcxxft/EpgQGbIX/x42l0ijc3U1QHow2Lr3khtE1RshyU4lW2w==",
+ "dev": true,
+ "requires": {
+ "vega-crossfilter": "~4.0.5",
+ "vega-dataflow": "~5.7.3",
+ "vega-encode": "~4.8.3",
+ "vega-event-selector": "~2.0.6",
+ "vega-expression": "~3.0.1",
+ "vega-force": "~4.0.7",
+ "vega-format": "~1.0.4",
+ "vega-functions": "~5.8.0",
+ "vega-geo": "~4.3.8",
+ "vega-hierarchy": "~4.0.9",
+ "vega-label": "~1.0.0",
+ "vega-loader": "~4.4.0",
+ "vega-parser": "~6.1.0",
+ "vega-projection": "~1.4.5",
+ "vega-regression": "~1.0.9",
+ "vega-runtime": "~6.1.3",
+ "vega-scale": "~7.1.1",
+ "vega-scenegraph": "~4.9.2",
+ "vega-statistics": "~1.7.9",
+ "vega-time": "~2.0.4",
+ "vega-transforms": "~4.9.3",
+ "vega-typings": "~0.19.2",
+ "vega-util": "~1.16.0",
+ "vega-view": "~5.9.0",
+ "vega-view-transforms": "~4.5.8",
+ "vega-voronoi": "~4.1.5",
+ "vega-wordcloud": "~4.1.3"
}
},
"vega-canvas": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/vega-canvas/-/vega-canvas-1.2.1.tgz",
- "integrity": "sha512-k/S3EPeJ37D7fYDhv4sEg7fNWVpLheQY7flfLyAmJU7aSwCMgw8cZJi0CKHchJeculssfH+41NCqvRB1QtaJnw==",
+ "version": "1.2.6",
+ "resolved": "https://registry.npmjs.org/vega-canvas/-/vega-canvas-1.2.6.tgz",
+ "integrity": "sha512-rgeYUpslYn/amIfnuv3Sw6n4BGns94OjjZNtUc9IDji6b+K8LGS/kW+Lvay8JX/oFqtulBp8RLcHN6QjqPLA9Q==",
"dev": true
},
"vega-crossfilter": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/vega-crossfilter/-/vega-crossfilter-4.0.1.tgz",
- "integrity": "sha512-wLNS4JzKaOLj8EAzI/v8XBJjUWMRWYSu6EeQF4o9Opq/78u87Ol9Lc5I27UHsww5dNNH/tHubAV4QPIXnGOp5Q==",
+ "version": "4.0.5",
+ "resolved": "https://registry.npmjs.org/vega-crossfilter/-/vega-crossfilter-4.0.5.tgz",
+ "integrity": "sha512-yF+iyGP+ZxU7Tcj5yBsMfoUHTCebTALTXIkBNA99RKdaIHp1E690UaGVLZe6xde2n5WaYpho6I/I6wdAW3NXcg==",
"dev": true,
"requires": {
- "d3-array": "^2.0.3",
- "vega-dataflow": "^5.1.0",
- "vega-util": "^1.8.0"
+ "d3-array": "^2.7.1",
+ "vega-dataflow": "^5.7.3",
+ "vega-util": "^1.15.2"
},
"dependencies": {
"d3-array": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.4.0.tgz",
- "integrity": "sha512-KQ41bAF2BMakf/HdKT865ALd4cgND6VcIztVQZUTt0+BH3RWy6ZYnHghVXf6NFjt2ritLr8H1T8LreAAlfiNcw==",
+ "version": "2.9.1",
+ "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
+ "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg==",
"dev": true
}
}
},
"vega-dataflow": {
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/vega-dataflow/-/vega-dataflow-5.5.0.tgz",
- "integrity": "sha512-9eRe2qLpwvEegBoSaH3vdziSLMZSszY02wxVmvcFzHe57Rf/eYEr0YRuW4qc+gMmwURPYu9wtmeUTiK4XhDKXw==",
+ "version": "5.7.3",
+ "resolved": "https://registry.npmjs.org/vega-dataflow/-/vega-dataflow-5.7.3.tgz",
+ "integrity": "sha512-2ipzKgQUmbSXcQBH+9XF0BYbXyZrHvjlbJ8ifyRWYQk78w8kMvE6wy/rcdXYK6iVZ6aAbEDDT7jTI+rFt3tGLA==",
"dev": true,
"requires": {
- "vega-loader": "^4.0.0",
- "vega-util": "^1.11.0"
+ "vega-format": "^1.0.4",
+ "vega-loader": "^4.3.2",
+ "vega-util": "^1.15.2"
}
},
"vega-embed": {
- "version": "6.2.2",
- "resolved": "https://registry.npmjs.org/vega-embed/-/vega-embed-6.2.2.tgz",
- "integrity": "sha512-u9CX9jpIbu2DY2lqs0J7CLA7+VXNlR+qkzxOwaVKfS0ivB54dxQXKvE59VHV02Nwb5XhaDGTEMN0FRCAvgkdLQ==",
+ "version": "6.14.2",
+ "resolved": "https://registry.npmjs.org/vega-embed/-/vega-embed-6.14.2.tgz",
+ "integrity": "sha512-cZsI0+eSB1BubRFkpeZs9mdWQGfO0T7i78dffGULg+1+Up+74aB/cg7refC+KsnEEGOeOtP9RWz9Ttkabs2oYA==",
"dev": true,
"requires": {
"fast-json-patch": "^3.0.0-1",
"json-stringify-pretty-compact": "^2.0.0",
- "semver": "^6.3.0",
- "vega-schema-url-parser": "^1.1.0",
- "vega-themes": "^2.6.0",
- "vega-tooltip": "^0.20.0"
+ "semver": "^7.3.4",
+ "vega-schema-url-parser": "^2.1.0",
+ "vega-themes": "^2.9.1",
+ "vega-tooltip": "^0.24.2"
},
"dependencies": {
+ "lru-cache": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+ "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+ "dev": true,
+ "requires": {
+ "yallist": "^4.0.0"
+ }
+ },
"semver": {
- "version": "6.3.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
- "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+ "version": "7.3.4",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
+ "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+ "dev": true,
+ "requires": {
+ "lru-cache": "^6.0.0"
+ }
+ },
+ "yallist": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
"dev": true
}
}
},
"vega-encode": {
- "version": "4.5.2",
- "resolved": "https://registry.npmjs.org/vega-encode/-/vega-encode-4.5.2.tgz",
- "integrity": "sha512-iL1njX++VE0SAMJuDqc0k9kmsU8AeyRRHv15MXh2+PXe2JmyiSWn6HcF3RzFUy5xmKlZOU5BiL8KrTgTrxh+WA==",
+ "version": "4.8.3",
+ "resolved": "https://registry.npmjs.org/vega-encode/-/vega-encode-4.8.3.tgz",
+ "integrity": "sha512-JoRYtaV2Hs8spWLzTu/IjR7J9jqRmuIOEicAaWj6T9NSZrNWQzu2zF3IVsX85WnrIDIRUDaehXaFZvy9uv9RQg==",
"dev": true,
"requires": {
- "d3-array": "^2.4.0",
- "d3-format": "^1.4.2",
- "d3-interpolate": "^1.4.0",
- "vega-dataflow": "^5.5.0",
- "vega-scale": "^6.0.0",
- "vega-time": "^1.0.0",
- "vega-util": "^1.12.2"
+ "d3-array": "^2.7.1",
+ "d3-interpolate": "^2.0.1",
+ "vega-dataflow": "^5.7.3",
+ "vega-scale": "^7.0.3",
+ "vega-util": "^1.15.2"
},
"dependencies": {
"d3-array": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.4.0.tgz",
- "integrity": "sha512-KQ41bAF2BMakf/HdKT865ALd4cgND6VcIztVQZUTt0+BH3RWy6ZYnHghVXf6NFjt2ritLr8H1T8LreAAlfiNcw==",
+ "version": "2.9.1",
+ "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
+ "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg==",
"dev": true
+ },
+ "d3-interpolate": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz",
+ "integrity": "sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==",
+ "dev": true,
+ "requires": {
+ "d3-color": "1 - 2"
+ }
}
}
},
"vega-event-selector": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/vega-event-selector/-/vega-event-selector-2.0.2.tgz",
- "integrity": "sha512-Uv72vBfM0lrlI2belKHFMZuVnW2uJl2ShqWPwGSXPVe6p+PzgqoPJYC8A/i5N8B54UA4UMDzlbBeo3x7q2W9Yg==",
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/vega-event-selector/-/vega-event-selector-2.0.6.tgz",
+ "integrity": "sha512-UwCu50Sqd8kNZ1X/XgiAY+QAyQUmGFAwyDu7y0T5fs6/TPQnDo/Bo346NgSgINBEhEKOAMY1Nd/rPOk4UEm/ew==",
"dev": true
},
"vega-expression": {
- "version": "2.6.3",
- "resolved": "https://registry.npmjs.org/vega-expression/-/vega-expression-2.6.3.tgz",
- "integrity": "sha512-sME1+45BToTGsftb1Q6Ubs2iRYEoXkD2NRGnJuKS9YJ2ITzZwPHF/jy2kHW3iLpuNjj54meaO7HMQ/hUKrciUw==",
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/vega-expression/-/vega-expression-3.0.1.tgz",
+ "integrity": "sha512-+UwOFEkBnAWo8Zud6i8O4Pd2W6QqmPUOaAhjNtj0OxRL+d+Duoy7M4edUDZ+YuoUcMnjjBFfDQu7oRAA1fIMEQ==",
"dev": true,
"requires": {
- "vega-util": "^1.11.0"
+ "vega-util": "^1.15.2"
}
},
"vega-force": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/vega-force/-/vega-force-4.0.3.tgz",
- "integrity": "sha512-4stItN4jD9H1CENaCz4jXRNS1Bi9cozMOUjX2824FeJENi2RZSiAZAaGbscgerZQ/jbNcOHD8PHpC2pWldEvGA==",
+ "version": "4.0.7",
+ "resolved": "https://registry.npmjs.org/vega-force/-/vega-force-4.0.7.tgz",
+ "integrity": "sha512-pyLKdwXSZ9C1dVIqdJOobvBY29rLvZjvRRTla9BU/nMwAiAGlGi6WKUFdRGdneyGe3zo2nSZDTZlZM/Z5VaQNA==",
"dev": true,
"requires": {
- "d3-force": "^2.0.1",
- "vega-dataflow": "^5.4.0",
- "vega-util": "^1.11.0"
+ "d3-force": "^2.1.1",
+ "vega-dataflow": "^5.7.3",
+ "vega-util": "^1.15.2"
},
"dependencies": {
"d3-force": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-2.0.1.tgz",
- "integrity": "sha512-zh73/N6+MElRojiUG7vmn+3vltaKon7iD5vB/7r9nUaBeftXMzRo5IWEG63DLBCto4/8vr9i3m9lwr1OTJNiCg==",
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-2.1.1.tgz",
+ "integrity": "sha512-nAuHEzBqMvpFVMf9OX75d00OxvOXdxY+xECIXjW6Gv8BRrXu6gAWbv/9XKrvfJ5i5DCokDW7RYE50LRoK092ew==",
"dev": true,
"requires": {
- "d3-dispatch": "1",
- "d3-quadtree": "1",
- "d3-timer": "1"
+ "d3-dispatch": "1 - 2",
+ "d3-quadtree": "1 - 2",
+ "d3-timer": "1 - 2"
}
}
}
},
- "vega-functions": {
- "version": "5.5.1",
- "resolved": "https://registry.npmjs.org/vega-functions/-/vega-functions-5.5.1.tgz",
- "integrity": "sha512-VTfEwf/ChSOGc4d4yUIgu2XoScky6NH06WN4vwVGY5PREhsyVPsQ+p2zqgD/N/a00EyWPHeOSHEhsPU28oIMtQ==",
+ "vega-format": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/vega-format/-/vega-format-1.0.4.tgz",
+ "integrity": "sha512-oTAeub3KWm6nKhXoYCx1q9G3K43R6/pDMXvqDlTSUtjoY7b/Gixm8iLcir5S9bPjvH40n4AcbZsPmNfL/Up77A==",
"dev": true,
"requires": {
- "d3-array": "^2.4.0",
- "d3-color": "^1.4.0",
- "d3-format": "^1.4.2",
- "d3-geo": "^1.11.9",
- "d3-time-format": "^2.2.2",
- "vega-dataflow": "^5.5.0",
- "vega-expression": "^2.6.3",
- "vega-scale": "^6.0.0",
- "vega-scenegraph": "^4.5.0",
- "vega-selections": "^5.1.0",
- "vega-statistics": "^1.7.1",
- "vega-time": "^1.0.0",
- "vega-util": "^1.12.1"
+ "d3-array": "^2.7.1",
+ "d3-format": "^2.0.0",
+ "d3-time-format": "^3.0.0",
+ "vega-time": "^2.0.3",
+ "vega-util": "^1.15.2"
},
"dependencies": {
"d3-array": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.4.0.tgz",
- "integrity": "sha512-KQ41bAF2BMakf/HdKT865ALd4cgND6VcIztVQZUTt0+BH3RWy6ZYnHghVXf6NFjt2ritLr8H1T8LreAAlfiNcw==",
+ "version": "2.9.1",
+ "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
+ "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg==",
+ "dev": true
+ },
+ "d3-format": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-2.0.0.tgz",
+ "integrity": "sha512-Ab3S6XuE/Q+flY96HXT0jOXcM4EAClYFnRGY5zsjRGNy6qCYrQsMffs7cV5Q9xejb35zxW5hf/guKw34kvIKsA==",
+ "dev": true
+ },
+ "d3-time-format": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz",
+ "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==",
+ "dev": true,
+ "requires": {
+ "d3-time": "1 - 2"
+ }
+ }
+ }
+ },
+ "vega-functions": {
+ "version": "5.8.0",
+ "resolved": "https://registry.npmjs.org/vega-functions/-/vega-functions-5.8.0.tgz",
+ "integrity": "sha512-xaUqWZHEX+EuJuKfN0Biux3rrCHDEHmMbW7LHYyyEqguR0i6+zhtOSUEWmYqDfzB/+BlIwCk5Vif6q6/mzJxbQ==",
+ "dev": true,
+ "requires": {
+ "d3-array": "^2.7.1",
+ "d3-color": "^2.0.0",
+ "d3-geo": "^2.0.1",
+ "vega-dataflow": "^5.7.3",
+ "vega-expression": "^3.0.0",
+ "vega-scale": "^7.1.1",
+ "vega-scenegraph": "^4.9.2",
+ "vega-selections": "^5.1.4",
+ "vega-statistics": "^1.7.9",
+ "vega-time": "^2.0.4",
+ "vega-util": "^1.15.2"
+ },
+ "dependencies": {
+ "d3-array": {
+ "version": "2.9.1",
+ "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
+ "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg==",
"dev": true
+ },
+ "d3-color": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-2.0.0.tgz",
+ "integrity": "sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ==",
+ "dev": true
+ },
+ "d3-geo": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-2.0.1.tgz",
+ "integrity": "sha512-M6yzGbFRfxzNrVhxDJXzJqSLQ90q1cCyb3EWFZ1LF4eWOBYxFypw7I/NFVBNXKNqxv1bqLathhYvdJ6DC+th3A==",
+ "dev": true,
+ "requires": {
+ "d3-array": ">=2.5"
+ }
}
}
},
"vega-geo": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/vega-geo/-/vega-geo-4.3.0.tgz",
- "integrity": "sha512-Rcz4z+TR4qy727pjBWSsbMAn8eM9bDZ5MXKqo5AWuFkoj/8ngv13vafHd1tvEMTA8L5BjAW3/eTqN4tyx9KSQg==",
- "dev": true,
- "requires": {
- "d3-array": "^2.4.0",
- "d3-color": "^1.4.0",
- "d3-geo": "^1.11.9",
- "vega-canvas": "^1.2.1",
- "vega-dataflow": "^5.1.1",
- "vega-projection": "^1.4.0",
- "vega-statistics": "^1.7.1",
- "vega-util": "^1.12.1"
+ "version": "4.3.8",
+ "resolved": "https://registry.npmjs.org/vega-geo/-/vega-geo-4.3.8.tgz",
+ "integrity": "sha512-fsGxV96Q/QRgPqOPtMBZdI+DneIiROKTG3YDZvGn0EdV16OG5LzFhbNgLT5GPzI+kTwgLpAsucBHklexlB4kfg==",
+ "dev": true,
+ "requires": {
+ "d3-array": "^2.7.1",
+ "d3-color": "^2.0.0",
+ "d3-geo": "^2.0.1",
+ "vega-canvas": "^1.2.5",
+ "vega-dataflow": "^5.7.3",
+ "vega-projection": "^1.4.5",
+ "vega-statistics": "^1.7.9",
+ "vega-util": "^1.15.2"
},
"dependencies": {
"d3-array": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.4.0.tgz",
- "integrity": "sha512-KQ41bAF2BMakf/HdKT865ALd4cgND6VcIztVQZUTt0+BH3RWy6ZYnHghVXf6NFjt2ritLr8H1T8LreAAlfiNcw==",
+ "version": "2.9.1",
+ "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
+ "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg==",
"dev": true
+ },
+ "d3-color": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-2.0.0.tgz",
+ "integrity": "sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ==",
+ "dev": true
+ },
+ "d3-geo": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-2.0.1.tgz",
+ "integrity": "sha512-M6yzGbFRfxzNrVhxDJXzJqSLQ90q1cCyb3EWFZ1LF4eWOBYxFypw7I/NFVBNXKNqxv1bqLathhYvdJ6DC+th3A==",
+ "dev": true,
+ "requires": {
+ "d3-array": ">=2.5"
+ }
}
}
},
"vega-hierarchy": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/vega-hierarchy/-/vega-hierarchy-4.0.3.tgz",
- "integrity": "sha512-9wNe+KyKqZW1S4++jCC38HuAhZbqNhfY7gOvwiMLjsp65tMtRETrtvYfHkULClm3UokUIX54etAXREAGW7znbw==",
+ "version": "4.0.9",
+ "resolved": "https://registry.npmjs.org/vega-hierarchy/-/vega-hierarchy-4.0.9.tgz",
+ "integrity": "sha512-4XaWK6V38/QOZ+vllKKTafiwL25m8Kd+ebHmDV+Q236ONHmqc/gv82wwn9nBeXPEfPv4FyJw2SRoqa2Jol6fug==",
+ "dev": true,
+ "requires": {
+ "d3-hierarchy": "^2.0.0",
+ "vega-dataflow": "^5.7.3",
+ "vega-util": "^1.15.2"
+ },
+ "dependencies": {
+ "d3-hierarchy": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-2.0.0.tgz",
+ "integrity": "sha512-SwIdqM3HxQX2214EG9GTjgmCc/mbSx4mQBn+DuEETubhOw6/U3fmnji4uCVrmzOydMHSO1nZle5gh6HB/wdOzw==",
+ "dev": true
+ }
+ }
+ },
+ "vega-label": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/vega-label/-/vega-label-1.0.0.tgz",
+ "integrity": "sha512-hCdm2pcHgkKgxnzW9GvX5JmYNiUMlOXOibtMmBzvFBQHX3NiV9giQ5nsPiQiFbV08VxEPtM+VYXr2HyrIcq5zQ==",
"dev": true,
"requires": {
- "d3-hierarchy": "^1.1.8",
- "vega-dataflow": "^5.4.0",
- "vega-util": "^1.11.0"
+ "vega-canvas": "^1.2.5",
+ "vega-dataflow": "^5.7.3",
+ "vega-scenegraph": "^4.9.2",
+ "vega-util": "^1.15.2"
}
},
"vega-lite": {
- "version": "4.4.0",
- "resolved": "https://registry.npmjs.org/vega-lite/-/vega-lite-4.4.0.tgz",
- "integrity": "sha512-Np48CMrCJRDkYQOYdcQ1s6Fuwc4/m/mj3JgVve73J7AvX5nxDsliTk9z/A4krSyTh1O4sHgOhW/N/BtIz5DpIg==",
+ "version": "4.17.0",
+ "resolved": "https://registry.npmjs.org/vega-lite/-/vega-lite-4.17.0.tgz",
+ "integrity": "sha512-MO2XsaVZqx6iWWmVA5vwYFamvhRUsKfVp7n0pNlkZ2/21cuxelSl92EePZ2YGmzL6z4/3K7r/45zaG8p+qNHeg==",
"dev": true,
"requires": {
- "@types/clone": "~0.1.30",
+ "@types/clone": "~2.1.0",
"@types/fast-json-stable-stringify": "^2.0.0",
"array-flat-polyfill": "^1.0.1",
"clone": "~2.1.2",
- "fast-deep-equal": "~3.1.1",
+ "fast-deep-equal": "~3.1.3",
"fast-json-stable-stringify": "~2.1.0",
"json-stringify-pretty-compact": "~2.0.0",
- "tslib": "~1.10.0",
- "vega-event-selector": "~2.0.2",
- "vega-expression": "~2.6.3",
- "vega-scale": "^6.0.0",
- "vega-util": "~1.12.2",
- "yargs": "~15.1.0"
+ "tslib": "~2.0.3",
+ "vega-event-selector": "~2.0.6",
+ "vega-expression": "~3.0.0",
+ "vega-util": "~1.16.0",
+ "yargs": "~16.0.3"
},
"dependencies": {
"ansi-regex": {
@@ -17204,24 +17368,23 @@
"dev": true
},
"ansi-styles": {
- "version": "4.2.1",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
- "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"requires": {
- "@types/color-name": "^1.1.1",
"color-convert": "^2.0.1"
}
},
"cliui": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
- "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+ "version": "7.0.4",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+ "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
"dev": true,
"requires": {
"string-width": "^4.2.0",
"strip-ansi": "^6.0.0",
- "wrap-ansi": "^6.2.0"
+ "wrap-ansi": "^7.0.0"
}
},
"color-convert": {
@@ -17246,21 +17409,11 @@
"dev": true
},
"fast-deep-equal": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
- "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==",
+ "version": "3.1.3",
+ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
"dev": true
},
- "find-up": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
- "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
- "dev": true,
- "requires": {
- "locate-path": "^5.0.0",
- "path-exists": "^4.0.0"
- }
- },
"get-caller-file": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
@@ -17273,45 +17426,6 @@
"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
"dev": true
},
- "locate-path": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
- "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
- "dev": true,
- "requires": {
- "p-locate": "^4.1.0"
- }
- },
- "p-limit": {
- "version": "2.2.2",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
- "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
- "dev": true,
- "requires": {
- "p-try": "^2.0.0"
- }
- },
- "p-locate": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
- "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
- "dev": true,
- "requires": {
- "p-limit": "^2.2.0"
- }
- },
- "p-try": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
- "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
- "dev": true
- },
- "path-exists": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
- "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
- "dev": true
- },
"string-width": {
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
@@ -17332,10 +17446,16 @@
"ansi-regex": "^5.0.0"
}
},
+ "tslib": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
+ "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==",
+ "dev": true
+ },
"wrap-ansi": {
- "version": "6.2.0",
- "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
- "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+ "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
"dev": true,
"requires": {
"ansi-styles": "^4.0.0",
@@ -17343,318 +17463,383 @@
"strip-ansi": "^6.0.0"
}
},
+ "y18n": {
+ "version": "5.0.5",
+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz",
+ "integrity": "sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==",
+ "dev": true
+ },
"yargs": {
- "version": "15.1.0",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.1.0.tgz",
- "integrity": "sha512-T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg==",
+ "version": "16.0.3",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.0.3.tgz",
+ "integrity": "sha512-6+nLw8xa9uK1BOEOykaiYAJVh6/CjxWXK/q9b5FpRgNslt8s22F2xMBqVIKgCRjNgGvGPBy8Vog7WN7yh4amtA==",
"dev": true,
"requires": {
- "cliui": "^6.0.0",
- "decamelize": "^1.2.0",
- "find-up": "^4.1.0",
- "get-caller-file": "^2.0.1",
+ "cliui": "^7.0.0",
+ "escalade": "^3.0.2",
+ "get-caller-file": "^2.0.5",
"require-directory": "^2.1.1",
- "require-main-filename": "^2.0.0",
- "set-blocking": "^2.0.0",
"string-width": "^4.2.0",
- "which-module": "^2.0.0",
- "y18n": "^4.0.0",
- "yargs-parser": "^16.1.0"
+ "y18n": "^5.0.1",
+ "yargs-parser": "^20.0.0"
}
},
"yargs-parser": {
- "version": "16.1.0",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-16.1.0.tgz",
- "integrity": "sha512-H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg==",
- "dev": true,
- "requires": {
- "camelcase": "^5.0.0",
- "decamelize": "^1.2.0"
- }
+ "version": "20.2.4",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+ "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+ "dev": true
}
}
},
"vega-loader": {
- "version": "4.1.3",
- "resolved": "https://registry.npmjs.org/vega-loader/-/vega-loader-4.1.3.tgz",
- "integrity": "sha512-50aetjuct4WqU7LctwnZqF/NCyya9aZ1HDQZ9unFi++62vOQgRfbXLNL/dZavqwnWX3S9i0ltCznLyFMG4ck8g==",
+ "version": "4.4.0",
+ "resolved": "https://registry.npmjs.org/vega-loader/-/vega-loader-4.4.0.tgz",
+ "integrity": "sha512-e5enQECdau7rJob0NFB5pGumh3RaaSWWm90+boxMy3ay2b4Ki/3XIvo+C4F1Lx04qSxvQF7tO2LJcklRm6nqRA==",
"dev": true,
"requires": {
- "d3-dsv": "^1.1.1",
- "d3-time-format": "^2.2.1",
- "node-fetch": "^2.6.0",
- "topojson-client": "^3.0.1",
- "vega-util": "^1.11.0"
+ "d3-dsv": "^2.0.0",
+ "node-fetch": "^2.6.1",
+ "topojson-client": "^3.1.0",
+ "vega-format": "^1.0.4",
+ "vega-util": "^1.16.0"
},
"dependencies": {
+ "d3-dsv": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-2.0.0.tgz",
+ "integrity": "sha512-E+Pn8UJYx9mViuIUkoc93gJGGYut6mSDKy2+XaPwccwkRGlR+LO97L2VCCRjQivTwLHkSnAJG7yo00BWY6QM+w==",
+ "dev": true,
+ "requires": {
+ "commander": "2",
+ "iconv-lite": "0.4",
+ "rw": "1"
+ }
+ },
"node-fetch": {
- "version": "2.6.0",
- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
- "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==",
+ "version": "2.6.1",
+ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+ "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
"dev": true
}
}
},
"vega-parser": {
- "version": "5.12.0",
- "resolved": "https://registry.npmjs.org/vega-parser/-/vega-parser-5.12.0.tgz",
- "integrity": "sha512-sIQcWp7aqafpfELEJr+gQDsz7TlLYaHkowKhp3O/pcOdIuvqeI3IYpP2+oNpXVGi8ikcq8cJLcCUMi9oP2Xtrw==",
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/vega-parser/-/vega-parser-6.1.0.tgz",
+ "integrity": "sha512-u14bHXV8vtcuMIJkMNoDAJ4Xu3lwKIkep+YEkPumWvlwl3fClWy26EAcwTneeM3rXu2F6ZJI6W3ddu/If8u13w==",
"dev": true,
"requires": {
- "vega-dataflow": "^5.5.0",
- "vega-event-selector": "^2.0.2",
- "vega-expression": "^2.6.3",
- "vega-functions": "^5.5.0",
- "vega-scale": "^6.0.0",
- "vega-util": "^1.12.1"
+ "vega-dataflow": "^5.7.3",
+ "vega-event-selector": "^2.0.6",
+ "vega-functions": "^5.8.0",
+ "vega-scale": "^7.1.1",
+ "vega-util": "^1.15.2"
}
},
"vega-projection": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/vega-projection/-/vega-projection-1.4.0.tgz",
- "integrity": "sha512-Prb/E41PqZT5b+46rHv6BZLDsXMe+NFClHxJ9NbwW7mntz8aMGAHiYolVa/M2KuTLbsXVgDAPxk/aA9tbQ0SSg==",
+ "version": "1.4.5",
+ "resolved": "https://registry.npmjs.org/vega-projection/-/vega-projection-1.4.5.tgz",
+ "integrity": "sha512-85kWcPv0zrrNfxescqHtSYpRknilrS0K3CVRZc7IYQxnLtL1oma9WEbrSr1LCmDoCP5hl2Z1kKbomPXkrQX5Ag==",
"dev": true,
"requires": {
- "d3-geo": "^1.11.9",
- "d3-geo-projection": "^2.7.1"
+ "d3-geo": "^2.0.1",
+ "d3-geo-projection": "^3.0.0"
+ },
+ "dependencies": {
+ "d3-array": {
+ "version": "2.9.1",
+ "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
+ "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg==",
+ "dev": true
+ },
+ "d3-geo": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-2.0.1.tgz",
+ "integrity": "sha512-M6yzGbFRfxzNrVhxDJXzJqSLQ90q1cCyb3EWFZ1LF4eWOBYxFypw7I/NFVBNXKNqxv1bqLathhYvdJ6DC+th3A==",
+ "dev": true,
+ "requires": {
+ "d3-array": ">=2.5"
+ }
+ }
}
},
"vega-regression": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/vega-regression/-/vega-regression-1.0.4.tgz",
- "integrity": "sha512-fHWJ0t1VEZOzpfBrI66Wo6RxMnqvJXYnXcIUZlOrZ9RLLbb1I6cdEASZp0cQ8M2oYAqu0YVgC0UEjnLs9mJaxQ==",
+ "version": "1.0.9",
+ "resolved": "https://registry.npmjs.org/vega-regression/-/vega-regression-1.0.9.tgz",
+ "integrity": "sha512-KSr3QbCF0vJEAWFVY2MA9X786oiJncTTr3gqRMPoaLr/Yo3f7OPKXRoUcw36RiWa0WCOEMgTYtM28iK6ZuSgaA==",
"dev": true,
"requires": {
- "d3-array": "^2.4.0",
- "vega-dataflow": "^5.4.1",
- "vega-statistics": "^1.7.2",
- "vega-util": "^1.12.2"
+ "d3-array": "^2.7.1",
+ "vega-dataflow": "^5.7.3",
+ "vega-statistics": "^1.7.9",
+ "vega-util": "^1.15.2"
},
"dependencies": {
"d3-array": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.4.0.tgz",
- "integrity": "sha512-KQ41bAF2BMakf/HdKT865ALd4cgND6VcIztVQZUTt0+BH3RWy6ZYnHghVXf6NFjt2ritLr8H1T8LreAAlfiNcw==",
+ "version": "2.9.1",
+ "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
+ "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg==",
"dev": true
}
}
},
"vega-runtime": {
- "version": "5.0.2",
- "resolved": "https://registry.npmjs.org/vega-runtime/-/vega-runtime-5.0.2.tgz",
- "integrity": "sha512-Cuv+RY6kprH+vtNERg6xP4dgcdYGD2ZnxPxJNEtGi7dmtQQTBa1s7jQ0VDXTolsO6lKJ3B7np2GzKJYwevgj1A==",
+ "version": "6.1.3",
+ "resolved": "https://registry.npmjs.org/vega-runtime/-/vega-runtime-6.1.3.tgz",
+ "integrity": "sha512-gE+sO2IfxMUpV0RkFeQVnHdmPy3K7LjHakISZgUGsDI/ZFs9y+HhBf8KTGSL5pcZPtQsZh3GBQ0UonqL1mp9PA==",
"dev": true,
"requires": {
- "vega-dataflow": "^5.1.1",
- "vega-util": "^1.11.0"
+ "vega-dataflow": "^5.7.3",
+ "vega-util": "^1.15.2"
}
},
"vega-scale": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/vega-scale/-/vega-scale-6.0.0.tgz",
- "integrity": "sha512-uNJ5LC+s+XLxdO2iXC36/TLen3mMNv0wzhMZMNXa8h+Ih10geJ57sHbYYA8Z8403JC9AYTaWUe7m0H9CHgV9NA==",
+ "version": "7.1.1",
+ "resolved": "https://registry.npmjs.org/vega-scale/-/vega-scale-7.1.1.tgz",
+ "integrity": "sha512-yE0to0prA9E5PBJ/XP77TO0BMkzyUVyt7TH5PAwj+CZT7PMsMO6ozihelRhoIiVcP0Ae/ByCEQBUQkzN5zJ0ZA==",
"dev": true,
"requires": {
- "d3-array": "^2.4.0",
- "d3-interpolate": "^1.4.0",
- "d3-scale": "^3.2.1",
- "vega-util": "^1.12.1"
+ "d3-array": "^2.7.1",
+ "d3-interpolate": "^2.0.1",
+ "d3-scale": "^3.2.2",
+ "vega-time": "^2.0.4",
+ "vega-util": "^1.15.2"
},
"dependencies": {
"d3-array": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.4.0.tgz",
- "integrity": "sha512-KQ41bAF2BMakf/HdKT865ALd4cgND6VcIztVQZUTt0+BH3RWy6ZYnHghVXf6NFjt2ritLr8H1T8LreAAlfiNcw==",
+ "version": "2.9.1",
+ "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
+ "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg==",
"dev": true
},
+ "d3-interpolate": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz",
+ "integrity": "sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==",
+ "dev": true,
+ "requires": {
+ "d3-color": "1 - 2"
+ }
+ },
"d3-scale": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.1.tgz",
- "integrity": "sha512-huz5byJO/6MPpz6Q8d4lg7GgSpTjIZW/l+1MQkzKfu2u8P6hjaXaStOpmyrD6ymKoW87d2QVFCKvSjLwjzx/rA==",
+ "version": "3.2.3",
+ "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.3.tgz",
+ "integrity": "sha512-8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g==",
"dev": true,
"requires": {
- "d3-array": "1.2.0 - 2",
- "d3-format": "1",
- "d3-interpolate": "^1.2.0",
- "d3-time": "1",
- "d3-time-format": "2"
+ "d3-array": "^2.3.0",
+ "d3-format": "1 - 2",
+ "d3-interpolate": "1.2.0 - 2",
+ "d3-time": "1 - 2",
+ "d3-time-format": "2 - 3"
}
}
}
},
"vega-scenegraph": {
- "version": "4.5.0",
- "resolved": "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.5.0.tgz",
- "integrity": "sha512-nO1bTFwhLdkOPzJ++f8dmlMX6OLZya9c94/HZNwFRfGNfri1vXyCIudFwCJD9/h0dJ0kSWfG8ybH9wDQMcZZDw==",
+ "version": "4.9.2",
+ "resolved": "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.9.2.tgz",
+ "integrity": "sha512-epm1CxcB8AucXQlSDeFnmzy0FCj+HV2k9R6ch2lfLRln5lPLEfgJWgFcFhVf5jyheY0FSeHH52Q5zQn1vYI1Ow==",
"dev": true,
"requires": {
- "d3-path": "^1.0.9",
- "d3-shape": "^1.3.7",
- "vega-canvas": "^1.2.1",
- "vega-loader": "^4.1.3",
- "vega-util": "^1.12.1"
+ "d3-path": "^2.0.0",
+ "d3-shape": "^2.0.0",
+ "vega-canvas": "^1.2.5",
+ "vega-loader": "^4.3.3",
+ "vega-scale": "^7.1.1",
+ "vega-util": "^1.15.2"
+ },
+ "dependencies": {
+ "d3-path": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-2.0.0.tgz",
+ "integrity": "sha512-ZwZQxKhBnv9yHaiWd6ZU4x5BtCQ7pXszEV9CU6kRgwIQVQGLMv1oiL4M+MK/n79sYzsj+gcgpPQSctJUsLN7fA==",
+ "dev": true
+ },
+ "d3-shape": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-2.0.0.tgz",
+ "integrity": "sha512-djpGlA779ua+rImicYyyjnOjeubyhql1Jyn1HK0bTyawuH76UQRWXd+pftr67H6Fa8hSwetkgb/0id3agKWykw==",
+ "dev": true,
+ "requires": {
+ "d3-path": "1 - 2"
+ }
+ }
}
},
"vega-schema-url-parser": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/vega-schema-url-parser/-/vega-schema-url-parser-1.1.0.tgz",
- "integrity": "sha512-Tc85J2ofMZZOsxiqDM9sbvfsa+Vdo3GwNLjEEsPOsCDeYqsUHKAlc1IpbbhPLZ6jusyM9Lk0e1izF64GGklFDg==",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/vega-schema-url-parser/-/vega-schema-url-parser-2.1.0.tgz",
+ "integrity": "sha512-JHT1PfOyVzOohj89uNunLPirs05Nf59isPT5gnwIkJph96rRgTIBJE7l7yLqndd7fLjr3P8JXHGAryRp74sCaQ==",
"dev": true
},
"vega-selections": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/vega-selections/-/vega-selections-5.1.0.tgz",
- "integrity": "sha512-Gm+16RaCMkWbimqKh9kuIGMK91vutJsTbIDKBXxmq0c3pTvf+Djy6KfBoFsipEJ9wkwhXHSqpLqS1tExV93E9g==",
+ "version": "5.1.4",
+ "resolved": "https://registry.npmjs.org/vega-selections/-/vega-selections-5.1.4.tgz",
+ "integrity": "sha512-L7CHwcIjVf90GoW2tS2x5O496O5Joaerp5A1KM6VJ1uo4z6KfqxY6M/328a/uaAs0LC5qbQgXT3htFbtUrPW/A==",
"dev": true,
"requires": {
- "vega-expression": "^2.6.1",
- "vega-util": "^1.11.0"
+ "vega-expression": "^3.0.0",
+ "vega-util": "^1.15.2"
}
},
"vega-statistics": {
- "version": "1.7.2",
- "resolved": "https://registry.npmjs.org/vega-statistics/-/vega-statistics-1.7.2.tgz",
- "integrity": "sha512-G6rvZ50MqnmiN1fGqDnFoCLWFwBCYt3nCucXu3zWov7A1/lsatvbDKYeSlVlnvT9OHtv4L+3pRpepFh5IhXKFg==",
+ "version": "1.7.9",
+ "resolved": "https://registry.npmjs.org/vega-statistics/-/vega-statistics-1.7.9.tgz",
+ "integrity": "sha512-T0sd2Z08k/mHxr1Vb4ajLWytPluLFYnsYqyk4SIS5czzUs4errpP2gUu63QJ0B7CKNu33vnS9WdOMOo/Eprr/Q==",
"dev": true,
"requires": {
- "d3-array": "^2.4.0"
+ "d3-array": "^2.7.1"
},
"dependencies": {
"d3-array": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.4.0.tgz",
- "integrity": "sha512-KQ41bAF2BMakf/HdKT865ALd4cgND6VcIztVQZUTt0+BH3RWy6ZYnHghVXf6NFjt2ritLr8H1T8LreAAlfiNcw==",
+ "version": "2.9.1",
+ "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
+ "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg==",
"dev": true
}
}
},
"vega-themes": {
- "version": "2.7.1",
- "resolved": "https://registry.npmjs.org/vega-themes/-/vega-themes-2.7.1.tgz",
- "integrity": "sha512-EHCmMpHfEdLMxIH6JYE2+i6Ni8s0pDpaPr6YMDd0Oj7bRL5Z40KRNlHZikiCSdv45y1d6iCggjdGjazPX0RHJQ==",
+ "version": "2.9.1",
+ "resolved": "https://registry.npmjs.org/vega-themes/-/vega-themes-2.9.1.tgz",
+ "integrity": "sha512-N6GU8u1EpfqxswXpBKLYouD3gYGfvrKWTC07JSrnlvGUzKzXMPDm4fN8FP8+cBpTwBL6JDZBd86A1Haea/nTfQ==",
"dev": true
},
"vega-time": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/vega-time/-/vega-time-1.0.0.tgz",
- "integrity": "sha512-r0yOFr/VklJwD3ew1+fEcB7E0LBCLChYlwh0KoO6cTIWMdlC4KhIIUN3/FuBfUZ4qx4V/xp71xH2YYYZTH6izg==",
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/vega-time/-/vega-time-2.0.4.tgz",
+ "integrity": "sha512-U314UDR9+ZlWrD3KBaeH+j/c2WSMdvcZq5yJfFT0yTg1jsBKAQBYFGvl+orackD8Zx3FveHOxx3XAObaQeDX+Q==",
"dev": true,
"requires": {
- "d3-array": "^2.3.3",
- "d3-time": "^1.1.0",
- "d3-time-format": "^2.2.1",
- "vega-util": "^1.12.0"
+ "d3-array": "^2.7.1",
+ "d3-time": "^2.0.0",
+ "vega-util": "^1.15.2"
},
"dependencies": {
"d3-array": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.4.0.tgz",
- "integrity": "sha512-KQ41bAF2BMakf/HdKT865ALd4cgND6VcIztVQZUTt0+BH3RWy6ZYnHghVXf6NFjt2ritLr8H1T8LreAAlfiNcw==",
+ "version": "2.9.1",
+ "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
+ "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg==",
+ "dev": true
+ },
+ "d3-time": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-2.0.0.tgz",
+ "integrity": "sha512-2mvhstTFcMvwStWd9Tj3e6CEqtOivtD8AUiHT8ido/xmzrI9ijrUUihZ6nHuf/vsScRBonagOdj0Vv+SEL5G3Q==",
"dev": true
}
}
},
"vega-tooltip": {
- "version": "0.20.1",
- "resolved": "https://registry.npmjs.org/vega-tooltip/-/vega-tooltip-0.20.1.tgz",
- "integrity": "sha512-kk1p2VRDAZRdoi9C6UdItOO8GCFbtVfUNT1g3XPpHCYuQ4Lrjffa0SNcT/i69luC3n6qd9VyrceFoPBGM4YvTw==",
+ "version": "0.24.2",
+ "resolved": "https://registry.npmjs.org/vega-tooltip/-/vega-tooltip-0.24.2.tgz",
+ "integrity": "sha512-b7IeYQl/piNVsMmTliOgTnwSOhBs67KqoZ9UzP1I3XpH7TKbSuc3YHA7b1CSxkRR0hHKdradby4UI8c9rdH74w==",
"dev": true,
"requires": {
- "vega-util": "^1.12.2"
+ "vega-util": "^1.15.2"
}
},
"vega-transforms": {
- "version": "4.6.0",
- "resolved": "https://registry.npmjs.org/vega-transforms/-/vega-transforms-4.6.0.tgz",
- "integrity": "sha512-5nsMMnyOME/Xe1xLNGCcQ+BS94cix9gSItHiXqU7wR50ukp5U9JoUxnfeYJkuv37FAbnFpkuYlPcBCWp55zXhQ==",
+ "version": "4.9.3",
+ "resolved": "https://registry.npmjs.org/vega-transforms/-/vega-transforms-4.9.3.tgz",
+ "integrity": "sha512-PdqQd5oPlRyD405M2w+Sz9Bo+i7Rwi8o03SVK7RaeQsJC2FffKGJ6acIaSEgOq+yD1Q2k/1SePmCXcmLUlIiEA==",
"dev": true,
"requires": {
- "d3-array": "^2.4.0",
- "vega-dataflow": "^5.5.0",
- "vega-statistics": "^1.7.1",
- "vega-time": "^1.0.0",
- "vega-util": "^1.12.1"
+ "d3-array": "^2.7.1",
+ "vega-dataflow": "^5.7.3",
+ "vega-statistics": "^1.7.9",
+ "vega-time": "^2.0.4",
+ "vega-util": "^1.15.2"
},
"dependencies": {
"d3-array": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.4.0.tgz",
- "integrity": "sha512-KQ41bAF2BMakf/HdKT865ALd4cgND6VcIztVQZUTt0+BH3RWy6ZYnHghVXf6NFjt2ritLr8H1T8LreAAlfiNcw==",
+ "version": "2.9.1",
+ "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
+ "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg==",
"dev": true
}
}
},
"vega-typings": {
- "version": "0.12.0",
- "resolved": "https://registry.npmjs.org/vega-typings/-/vega-typings-0.12.0.tgz",
- "integrity": "sha512-K+IoUTTtXW3E1Qhr/y+JgLRxy476viAm6DeM8IiVrA8vvuLA3FTzHaeI7TCnaWEwk9xxLJBtdVKKC5FGbp0Nyw==",
+ "version": "0.19.2",
+ "resolved": "https://registry.npmjs.org/vega-typings/-/vega-typings-0.19.2.tgz",
+ "integrity": "sha512-YU/S9rDk4d+t4+4eTa9fzuw87PMNteeVtpcL51kUO8H7HvGaoW7ll8RHKLkR0NYBEGPRoFDKUxnoyMvhgjsdYw==",
"dev": true,
"requires": {
- "vega-util": "^1.12.1"
+ "vega-util": "^1.15.2"
}
},
"vega-util": {
- "version": "1.12.2",
- "resolved": "https://registry.npmjs.org/vega-util/-/vega-util-1.12.2.tgz",
- "integrity": "sha512-p02+oQ/XU/gzY9S/CTZinym2NKWEMIneLc+FYdUeJZZnDGa3DvcNgUDlVR90JlwLcYZNs5dBdfYLfdRHsKZKiw==",
+ "version": "1.16.0",
+ "resolved": "https://registry.npmjs.org/vega-util/-/vega-util-1.16.0.tgz",
+ "integrity": "sha512-6mmz6mI+oU4zDMeKjgvE2Fjz0Oh6zo6WGATcvCfxH2gXBzhBHmy5d25uW5Zjnkc6QBXSWPLV9Xa6SiqMsrsKog==",
"dev": true
},
"vega-view": {
- "version": "5.4.0",
- "resolved": "https://registry.npmjs.org/vega-view/-/vega-view-5.4.0.tgz",
- "integrity": "sha512-Q8nH93NceWJRB4/KTehOvsrpbCGGDnkjOCcNQpTsGgu6QRmgMTHtRQTHkE+LhLXMO/55zZrVR22thvMEH9r36w==",
- "dev": true,
- "requires": {
- "d3-array": "^2.4.0",
- "d3-timer": "^1.0.10",
- "vega-dataflow": "^5.5.0",
- "vega-functions": "^5.5.1",
- "vega-runtime": "^5.0.2",
- "vega-scenegraph": "^4.5.0",
- "vega-util": "^1.12.1"
+ "version": "5.9.0",
+ "resolved": "https://registry.npmjs.org/vega-view/-/vega-view-5.9.0.tgz",
+ "integrity": "sha512-HqRFuqO2OwoPHHK+CVt8vB8fu2L8GjQerLpmEpglWtCPDns5+gn5B6F7M8Ah8v24WlfqW7cLrY81t9OloPZOyw==",
+ "dev": true,
+ "requires": {
+ "d3-array": "^2.7.1",
+ "d3-timer": "^2.0.0",
+ "vega-dataflow": "^5.7.3",
+ "vega-format": "^1.0.4",
+ "vega-functions": "^5.8.0",
+ "vega-runtime": "^6.1.3",
+ "vega-scenegraph": "^4.9.2",
+ "vega-util": "^1.15.2"
},
"dependencies": {
"d3-array": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.4.0.tgz",
- "integrity": "sha512-KQ41bAF2BMakf/HdKT865ALd4cgND6VcIztVQZUTt0+BH3RWy6ZYnHghVXf6NFjt2ritLr8H1T8LreAAlfiNcw==",
+ "version": "2.9.1",
+ "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
+ "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg==",
+ "dev": true
+ },
+ "d3-timer": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-2.0.0.tgz",
+ "integrity": "sha512-TO4VLh0/420Y/9dO3+f9abDEFYeCUr2WZRlxJvbp4HPTQcSylXNiL6yZa9FIUvV1yRiFufl1bszTCLDqv9PWNA==",
"dev": true
}
}
},
"vega-view-transforms": {
- "version": "4.5.0",
- "resolved": "https://registry.npmjs.org/vega-view-transforms/-/vega-view-transforms-4.5.0.tgz",
- "integrity": "sha512-8n52147HxNSjQ23NeHN//AWt99zZP+Ukiy4kSbkCJGPZ3dW3NYdunEYNvZWyMmOKSrHIMtgdcHUM9FmPTQpE9w==",
+ "version": "4.5.8",
+ "resolved": "https://registry.npmjs.org/vega-view-transforms/-/vega-view-transforms-4.5.8.tgz",
+ "integrity": "sha512-966m7zbzvItBL8rwmF2nKG14rBp7q+3sLCKWeMSUrxoG+M15Smg5gWEGgwTG3A/RwzrZ7rDX5M1sRaAngRH25g==",
"dev": true,
"requires": {
- "vega-dataflow": "^5.4.1",
- "vega-scenegraph": "^4.4.0",
- "vega-util": "^1.12.0"
+ "vega-dataflow": "^5.7.3",
+ "vega-scenegraph": "^4.9.2",
+ "vega-util": "^1.15.2"
}
},
"vega-voronoi": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/vega-voronoi/-/vega-voronoi-4.1.1.tgz",
- "integrity": "sha512-agLmr+UGxJs5KB9D8GeZqxgeWWGoER/eVHPcFFPgVuoNBsrqf2bdoltmIkRnpiRsQnGCibGixhFEDCc9GGNAww==",
+ "version": "4.1.5",
+ "resolved": "https://registry.npmjs.org/vega-voronoi/-/vega-voronoi-4.1.5.tgz",
+ "integrity": "sha512-950IkgCFLj0zG33EWLAm1hZcp+FMqWcNQliMYt+MJzOD5S4MSpZpZ7K4wp2M1Jktjw/CLKFL9n38JCI0i3UonA==",
"dev": true,
"requires": {
- "d3-delaunay": "^5.1.3",
- "vega-dataflow": "^5.1.1",
- "vega-util": "^1.11.0"
+ "d3-delaunay": "^5.3.0",
+ "vega-dataflow": "^5.7.3",
+ "vega-util": "^1.15.2"
}
},
"vega-wordcloud": {
- "version": "4.0.4",
- "resolved": "https://registry.npmjs.org/vega-wordcloud/-/vega-wordcloud-4.0.4.tgz",
- "integrity": "sha512-+FwgCKTj8JBMbBjNiVciLvjQnk+rC59uyecmlTsmtUGVZz5wyANooYcXt4xtiRu+G8ohdlJ6L/59+UFTaUR8og==",
+ "version": "4.1.3",
+ "resolved": "https://registry.npmjs.org/vega-wordcloud/-/vega-wordcloud-4.1.3.tgz",
+ "integrity": "sha512-is4zYn9FMAyp9T4SAcz2P/U/wqc0Lx3P5YtpWKCbOH02a05vHjUQrQ2TTPOuvmMfAEDCSKvbMSQIJMOE018lJA==",
"dev": true,
"requires": {
- "vega-canvas": "^1.2.1",
- "vega-dataflow": "^5.4.1",
- "vega-scale": "^6.0.0",
- "vega-statistics": "^1.7.1",
- "vega-util": "^1.12.1"
+ "vega-canvas": "^1.2.5",
+ "vega-dataflow": "^5.7.3",
+ "vega-scale": "^7.1.1",
+ "vega-statistics": "^1.7.9",
+ "vega-util": "^1.15.2"
}
},
"velocity-animate": {
@@ -18040,6 +18225,28 @@
"triple-beam": "^1.2.0"
}
},
+ "with-open-file": {
+ "version": "0.1.7",
+ "resolved": "https://registry.npmjs.org/with-open-file/-/with-open-file-0.1.7.tgz",
+ "integrity": "sha512-ecJS2/oHtESJ1t3ZfMI3B7KIDKyfN0O16miWxdn30zdh66Yd3LsRFebXZXq6GU4xfxLf6nVxp9kIqElb5fqczA==",
+ "requires": {
+ "p-finally": "^1.0.0",
+ "p-try": "^2.1.0",
+ "pify": "^4.0.1"
+ },
+ "dependencies": {
+ "p-try": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+ },
+ "pify": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+ "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
+ }
+ }
+ },
"wkx": {
"version": "0.4.8",
"resolved": "https://registry.npmjs.org/wkx/-/wkx-0.4.8.tgz",
diff --git a/package.json b/package.json
index 395390497b..29fb2be4f9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "codimd",
- "version": "2.2.0",
+ "version": "2.3.0",
"description": "Realtime collaborative markdown notes on all platforms.",
"keywords": [
"Collaborative",
@@ -19,7 +19,7 @@
"dev": "webpack --config webpack.dev.js --progress --colors --watch",
"doctoc": "doctoc --title='# Table of Contents' README.md",
"lint": "standard",
- "jsonlint": "find . -type f -not -ipath \"./node_modules/*\" \\( -name \"*.json\" -o -name \"*.json.*\" \\) | xargs -n 1 -I{} -- bash -c 'echo {}; jq . {} > /dev/null;'",
+ "jsonlint": "find . -type f -not -ipath \"./node_modules/*\" -not -ipath \"./.vscode/*\" \\( -name \"*.json\" -o -name \"*.json.*\" \\) | xargs -n 1 -I{} -- bash -c 'echo {}; jq . {} > /dev/null;'",
"start": "sequelize db:migrate && node app.js",
"mocha": "mocha --require intelli-espower-loader --exit ./test --recursive",
"mocha:ci": "mocha --no-color -R dot --require intelli-espower-loader --exit ./test --recursive",
@@ -57,6 +57,7 @@
"helmet": "~3.20.0",
"https-proxy-agent": "^3.0.1",
"i18n": "~0.8.3",
+ "image-type": "^4.1.0",
"isomorphic-fetch": "~2.2.1",
"jsdom-nogyp": "~0.8.3",
"lodash": "~4.17.15",
@@ -89,6 +90,7 @@
"prom-client": "^12.0.0",
"prometheus-api-metrics": "^2.2.5",
"randomcolor": "~0.5.4",
+ "read-chunk": "^3.2.0",
"readline-sync": "~1.4.7",
"request": "~2.88.0",
"scrypt-kdf": "^2.0.1",
@@ -103,7 +105,7 @@
"ws": "~7.1.1"
},
"devDependencies": {
- "@hackmd/codemirror": "~5.49.5",
+ "@hackmd/codemirror": "~5.49.8",
"@hackmd/emojify.js": "^2.1.0",
"@hackmd/idle-js": "~1.0.1",
"@hackmd/js-sequence-diagrams": "~0.0.1-alpha.3",
@@ -121,6 +123,7 @@
"dictionary-de": "^2.0.3",
"dictionary-de-at": "^2.0.3",
"dictionary-de-ch": "^2.0.3",
+ "dictionary-en-gb": "^2.2.2",
"doctoc": "~1.4.0",
"ejs-loader": "~0.3.1",
"exports-loader": "~0.7.0",
@@ -190,9 +193,9 @@
"typo-js": "^1.0.3",
"uglifyjs-webpack-plugin": "~1.2.7",
"url-loader": "~1.0.1",
- "vega": "~5.9.1",
- "vega-embed": "~6.2.2",
- "vega-lite": "~4.4.0",
+ "vega": "~5.17.1",
+ "vega-embed": "~6.14.2",
+ "vega-lite": "~4.17.0",
"velocity-animate": "~1.5.2",
"visibilityjs": "~2.0.2",
"viz.js": "~2.1.2",
diff --git a/public/css/index.css b/public/css/index.css
index eeb1f8b98a..d2e3fe6db0 100644
--- a/public/css/index.css
+++ b/public/css/index.css
@@ -411,7 +411,7 @@ div[contenteditable]:empty:not(:focus):before{
color: #eee;
}
-.night .btn.btn-default.ui-view.active{
+.night .btn.btn-default.active{
background: #202020;
}
diff --git a/public/docs/features.md b/public/docs/features.md
index c4f081b03d..805ea7cc40 100644
--- a/public/docs/features.md
+++ b/public/docs/features.md
@@ -248,7 +248,7 @@ We use [Papa Parse](https://www.papaparse.com/) for parsing csv. The parsing opt
### PDF
**Caution: this might be blocked by your browser if not using an `https` URL.**
-{%pdf https://papers.nips.cc/paper/5346-sequence-to-sequence-learning-with-neural-networks.pdf %}
+{%pdf https://www.w3.org/TR/WAI-WEBCONTENT/wai-pageauth.pdf %}
## MathJax
@@ -369,15 +369,16 @@ stop
}
```
-### Fretboad
+### Fretboard
-```fretboard {title="horizontal, 5 frets", type="h6 noNut"}
+```fretboard {title="horizontal, 6 frets, with nut", type="h6"}
-oO-*-
--o-o-
-o-oo-
-o-oO-
-oo-o-
-*O-o-
+ 3
```
### Mindmap
@@ -410,7 +411,7 @@ stop
> More information about **abc** syntax [here](http://abcnotation.com/learn)
> More information about **plantuml** syntax [here](http://plantuml.com/index)
> More information about **vega** syntax [here](https://vega.github.io/vega-lite/docs)
-> More information about **fretboard** syntax [here](https://hackmd.io/c/codimd-documentation/%2F%40codimd%2Ffretboard-syntax)
+> More information about **fretboard** syntax [here](https://hackmd.io/@docs/fretboard-syntax)
Alert Area
---
diff --git a/public/docs/release-notes.md b/public/docs/release-notes.md
index 88de6b2fd6..91213e09f7 100644
--- a/public/docs/release-notes.md
+++ b/public/docs/release-notes.md
@@ -1,6 +1,48 @@
Release Notes
===
+
+
+
Isoetes taiwanensis
+
${escapeHTML(err.str)}
`)
@@ -502,6 +512,7 @@ export function finishView (view) {
try {
const $ele = $(value).parent().parent()
$ele.html(renderFretBoard($value.text(), params))
+ $ele.addClass('fretboard')
} catch (err) {
$value.unwrap()
$value.parent().append(`${escapeHTML(err)}
`)
@@ -516,7 +527,7 @@ export function finishView (view) {
$value.unwrap()
try {
const data = transform(content)
- $elem.html(`
`)
+ $elem.html('
')
markmap($elem.find('svg')[0], data, {
duration: 0
})
diff --git a/public/js/lib/editor/spellcheck.js b/public/js/lib/editor/spellcheck.js
index c3d619a566..00aa0062a0 100644
--- a/public/js/lib/editor/spellcheck.js
+++ b/public/js/lib/editor/spellcheck.js
@@ -18,6 +18,18 @@ export const supportLanguages = [
cdnUrl: `${serverurl}/vendor/codemirror-spell-checker/en_US.dic`
}
},
+ {
+ name: 'English (United Kingdom)',
+ value: 'en_GB',
+ aff: {
+ url: `${serverurl}/build/dictionary-en-gb/index.aff`,
+ cdnUrl: 'https://cdn.jsdelivr.net/npm/dictionary-en-gb@2.2.2/index.aff'
+ },
+ dic: {
+ url: `${serverurl}/build/dictionary-en-gb/index.dic`,
+ cdnUrl: 'https://cdn.jsdelivr.net/npm/dictionary-en-gb@2.2.2/index.dic'
+ }
+ },
{
name: 'German',
value: 'de',
diff --git a/public/js/lib/renderer/fretboard/css/i.css b/public/js/lib/renderer/fretboard/css/i.css
index 86e15080c6..4ce5336660 100644
--- a/public/js/lib/renderer/fretboard/css/i.css
+++ b/public/js/lib/renderer/fretboard/css/i.css
@@ -1,8 +1,8 @@
/* -- GENERAL TYPOGRAPHY -- */
.fretTitle {
color: #555;
+ text-align: center;
font-family: "Helvetica Neue", sans-serif;
- background: #eee;
line-height: 1.4;
font-size: 1.6em;
margin: 10px 0 10px 0;
@@ -20,14 +20,19 @@ section {
}
/* Fretboard Container/Wrapper */
+
+.fretContainer, .fretContainer_h {
+ outline: solid 1px #eeee;
+ margin: 0 auto;
+ padding: 15px 0;
+}
+
.fretContainer {
width: 320px;
- margin: 0 auto;
}
.fretContainer_h {
max-width: 400px;
- margin: 0 auto;
}
@media all and (max-width: 400px) {
@@ -59,7 +64,6 @@ section {
position: absolute;
top: 0;
left: 0;
- z-index: 10;
}
.svg_wrapper.v4 {
@@ -181,3 +185,7 @@ section {
}
/*# sourceMappingURL=i.css.map */
+
+.markdown-body pre.fretboard {
+ background-color: transparent;
+}
diff --git a/public/js/lib/renderer/fretboard/fretboard.js b/public/js/lib/renderer/fretboard/fretboard.js
index fdd97fd624..c7e56fd160 100644
--- a/public/js/lib/renderer/fretboard/fretboard.js
+++ b/public/js/lib/renderer/fretboard/fretboard.js
@@ -1,4 +1,5 @@
/* global $ */
+import escapeHTML from 'lodash/escape'
import './css/i.css'
import dotEmpty from './svg/dotEmpty.svg'
@@ -32,26 +33,33 @@ const switchListH = {
'\n': `${dotEmptyH}
${dotEmptyH}
`
}
-export const renderFretBoard = (content, { title: fretTitle, type }) => {
- const fretType = type.split(' ')
- const containerClass = fretType && fretType[0].startsWith('h') ? 'fretContainer_h' : 'fretContainer'
+export const renderFretBoard = (content, { title: fretTitle = '', type = '' }) => {
+ const isVertical = !(typeof type[0] === 'string' && type[0].startsWith('h'))
+
+ const containerClass = isVertical ? 'fretContainer' : 'fretContainer_h'
+
+ const [fretType, nutOption] = type.split(' ')
const fretboardHTML = $(`
`)
- $(fretboardHTML).append($(`${fretTitle}
`))
+ if (fretTitle) {
+ $(fretboardHTML).append(`${escapeHTML(fretTitle)}
`)
+ }
// create fretboard background HTML
- const fretbOrientation = fretType && fretType[0].startsWith('v') ? 'vert' : 'horiz'
- const fretbLen = fretType && fretType[0].substring(1)
- const fretbClass = fretType && fretType[0][0] + ' ' + fretType[0]
- const nut = (fretType[1] && fretType[1] === 'noNut') ? 'noNut' : ''
+ const fretbOrientation = isVertical ? 'vert' : 'horiz'
+ const fretbLen = fretType && fretType.substring(1)
+ const fretbClass = fretType && fretType[0] + ' ' + fretType
+ const nut = nutOption === 'noNut' ? 'noNut' : ''
+
const svgHTML = $(`
`)
const fretbBg = require(`./svg/fretb_${fretbOrientation}_${fretbLen}.svg`)
+
$(svgHTML).append($(fretbBg))
// create cells HTML
const cellsHTML = $('
')
- let switchList = ''
- if (fretbOrientation && fretbOrientation === 'vert') {
+ let switchList = {}
+ if (isVertical) {
switchList = switchListV
} else {
// calculate position
@@ -66,16 +74,16 @@ export const renderFretBoard = (content, { title: fretTitle, type }) => {
const numArray = [...Array(10).keys()].slice(1)
contentCell && contentCell.forEach(char => {
if (numArray.toString().indexOf(char) !== -1) {
- const numType = fretType && fretType[0].startsWith('h') ? '_h' : ''
+ const numType = isVertical ? '' : '_h'
const numSvg = require(`./svg/number${char}${numType}.svg`)
- cellsHTML.append($(`${numSvg}
`))
- } else if (switchList[char] !== undefined) {
- cellsHTML.append($(switchList[char]))
+ cellsHTML.append(`${numSvg}
`)
+ } else if (typeof switchList[char] !== 'undefined') {
+ cellsHTML.append(switchList[char])
}
})
- $(svgHTML).append($(cellsHTML))
- $(fretboardHTML).append($(svgHTML))
+ $(svgHTML).append(cellsHTML)
+ $(fretboardHTML).append(svgHTML)
return fretboardHTML[0].outerHTML
}
diff --git a/public/js/lib/renderer/lightbox/index.js b/public/js/lib/renderer/lightbox/index.js
index 3619e0aeec..e46e0a143a 100644
--- a/public/js/lib/renderer/lightbox/index.js
+++ b/public/js/lib/renderer/lightbox/index.js
@@ -1,4 +1,5 @@
import './lightbox.css'
+import escape from 'lodash/escape'
let images = []
/** @type {HTMLImageElement} */
@@ -74,7 +75,7 @@ function setImageInner (img, lightBoxContainer) {
const src = img.getAttribute('src')
const alt = img.getAttribute('alt')
- lightBoxContainer.querySelector('.lightbox-inner').innerHTML = `
+ Isoetes taiwanensis
+