diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 58d818ed..8244cc19 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,10 +15,10 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-node@v2 with: - node-version: '14' + node-version: '16' - name: Install dependencies - run: npm install + run: npm ci - name: Run linter run: npm run lint @@ -28,3 +28,35 @@ jobs: - name: Report coverage run: npm run test:send + + test-node-14: + name: Test Node.js v14 + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v2 + with: + node-version: '14' + + - name: Install dependencies + run: npm ci + + - name: Run test + run: npm run test + + test-node-12: + name: Test Node.js v12 + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v2 + with: + node-version: '12' + + - name: Install dependencies + run: npm ci + + - name: Run test + run: npm run test diff --git a/.gitignore b/.gitignore index abaa4f34..be051c70 100755 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ node_modules npm-debug.log env tmp -.nyc_output coverage coverage.lcov .DS_Store diff --git a/app.js b/app.js index 9a3e47bc..44b6b475 100755 --- a/app.js +++ b/app.js @@ -8,12 +8,15 @@ /* System dependencies */ -const async = require('async'); +import async from 'async'; /* Internal dependencies */ -const { console } = require('./lib/Cluster'); -const Response = require('./lib/Response'); -const Utils = require('./lib/Utils'); +import { console } from './lib/Cluster.js'; +import Response from './lib/Response.js'; +import Utils from './lib/Utils.js'; + +import parseMethodRouteKey from './core/parseMethodRouteKey.js'; +import runHook from './core/runHook.js'; /** @@ -43,51 +46,51 @@ class App { /* Load everything */ async.series([ - callback => require('./core/loadConfig').call(this, callback), - callback => { + async callback => await (await import('./core/loadConfig.js')).default.call(this, callback), + async callback => { if (options.loadServer !== false) { - require('./core/loadServer').call(this, options, callback); + await (await import('./core/loadServer.js')).default.call(this, options, callback); } }, - callback => { + async callback => { if (options.loadModel !== false) { - require('./core/loadModel').call(this, callback); + await (await import('./core/loadModel.js')).default.call(this, callback); } }, - callback => { + async callback => { if (options.loadPermissions !== false) { - require('./core/loadPermissions').call(this, callback); + await (await import('./core/loadPermissions.js')).default.call(this, callback); } }, - callback => { + async callback => { if (options.loadController !== false) { - require('./core/loadController').call(this, callback); + await (await import('./core/loadController.js')).default.call(this, callback); } }, - callback => { + async callback => { if (options.loadHooks !== false) { - require('./core/loadHooks').call(this, callback); + await (await import('./core/loadHooks.js')).default.call(this, callback); } }, - callback => { + async callback => { if (options.loadViews !== false) { - require('./core/loadCustomTags').call(this, callback); + await (await import('./core/loadCustomTags.js')).default.call(this, callback); } }, - callback => { - require('./core/loadModules').call(this, callback); + async callback => { + await (await import('./core/loadModules.js')).default.call(this, callback); }, - callback => { + async callback => { if (options.loadViews !== false) { for (const route in this.controller) { if ({}.hasOwnProperty.call(this.controller, route)) { - require('./core/initRoute').call(this, route, this.controller[route]); + await (await import('./core/initRoute.js')).default.call(this, route, this.controller[route]); } } } if (options.loadREST !== false) { - require('./core/loadRest').call(this, callback); + await (await import('./core/loadRest.js')).default.call(this, callback); } }, callback => { @@ -111,8 +114,8 @@ class App { } /* Load remaining methods */ - parseMethodRouteKey = require('./core/parseMethodRouteKey'); - runHook = require('./core/runHook'); + parseMethodRouteKey = parseMethodRouteKey; + runHook = runHook; } -module.exports = App; +export default App; diff --git a/core/initRoute.js b/core/initRoute.js index 1789a1dc..266a158c 100644 --- a/core/initRoute.js +++ b/core/initRoute.js @@ -6,9 +6,9 @@ /* Dependencies */ -const { console } = require('../lib/Cluster'); -const Response = require('../lib/Response'); -const SaplingError = require('../lib/SaplingError'); +import { console } from '../lib/Cluster.js'; +import Response from '../lib/Response.js'; +import SaplingError from '../lib/SaplingError.js'; /** @@ -18,7 +18,7 @@ const SaplingError = require('../lib/SaplingError'); * @param {string} route Name of the route to be loaded * @param {function} view Chain callback */ -module.exports = async function (route, view) { +export default async function initRoute(route, view) { console.log('Loaded route', `${route}`); /* Create a handler for incoming requests */ @@ -38,4 +38,4 @@ module.exports = async function (route, view) { /* Save the routes for later */ this.routeStack.get.push(route); this.routeStack.post.push(route); -}; +} diff --git a/core/loadConfig.js b/core/loadConfig.js index 842c8fb7..5cee77b6 100644 --- a/core/loadConfig.js +++ b/core/loadConfig.js @@ -6,13 +6,15 @@ /* Dependencies */ -const argv = require('yargs').argv; -const fs = require('fs'); -const path = require('path'); -const _ = require('underscore'); +import yargs from 'yargs'; +/* eslint-disable-next-line node/file-extension-in-import */ +import { hideBin } from 'yargs/helpers'; +import fs from 'fs'; +import path from 'path'; +import _ from 'underscore'; -const { console } = require('../lib/Cluster'); -const SaplingError = require('../lib/SaplingError'); +import { console } from '../lib/Cluster.js'; +import SaplingError from '../lib/SaplingError.js'; /** @@ -21,7 +23,9 @@ const SaplingError = require('../lib/SaplingError'); * * @param {function} next Chain callback */ -module.exports = async function (next) { +export default async function loadConfig(next) { + const argv = yargs(hideBin(process.argv)).argv; + /* Default configuration values */ const defaultConfig = { publicDir: 'public', @@ -141,4 +145,4 @@ module.exports = async function (next) { if (next) { next(); } -}; +} diff --git a/core/loadController.js b/core/loadController.js index 7346a350..911dcb6d 100644 --- a/core/loadController.js +++ b/core/loadController.js @@ -6,11 +6,11 @@ /* Dependencies */ -const fs = require('fs'); -const path = require('path'); +import fs from 'fs'; +import path from 'path'; -const { console } = require('../lib/Cluster'); -const Templating = require('../lib/Templating'); +import { console } from '../lib/Cluster.js'; +import Templating from '../lib/Templating.js'; /** @@ -18,9 +18,10 @@ const Templating = require('../lib/Templating'); * * @param {function} next Chain callback */ -module.exports = async function (next) { +export default async function loadController(next) { /* Load templating engine */ this.templating = new Templating(this); + await this.templating.importDriver(); this.controller = {}; @@ -71,11 +72,10 @@ module.exports = async function (next) { /* Load the controller file */ if (fs.existsSync(controllerPath) && fs.lstatSync(controllerPath).isFile()) { - /* If we have a controller file, let's load it */ - const file = fs.readFileSync(controllerPath); - /* Parse and merge the controller, or throw an error if it's malformed */ try { + /* Load the controller file */ + const file = fs.readFileSync(controllerPath); const routes = JSON.parse(file.toString()); /* Remove file extension */ @@ -99,4 +99,4 @@ module.exports = async function (next) { if (next) { next(); } -}; +} diff --git a/core/loadCustomTags.js b/core/loadCustomTags.js index bf6ba9af..89dc83da 100644 --- a/core/loadCustomTags.js +++ b/core/loadCustomTags.js @@ -11,7 +11,7 @@ * * @param {function} next Chain callback */ -module.exports = async function (next) { +export default async function loadCustomTags(next) { await this.templating.renderer.registerTags({ /** @@ -51,4 +51,4 @@ module.exports = async function (next) { if (next) { next(); } -}; +} diff --git a/core/loadHooks.js b/core/loadHooks.js index 8866d2c4..a1b4be33 100644 --- a/core/loadHooks.js +++ b/core/loadHooks.js @@ -6,12 +6,12 @@ /* Dependencies */ -const fs = require('fs'); -const path = require('path'); +import fs from 'fs'; +import path from 'path'; -const { console } = require('../lib/Cluster'); -const Response = require('../lib/Response'); -const SaplingError = require('../lib/SaplingError'); +import { console } from '../lib/Cluster.js'; +import Response from '../lib/Response.js'; +import SaplingError from '../lib/SaplingError.js'; /** @@ -19,7 +19,7 @@ const SaplingError = require('../lib/SaplingError'); * * @param {function} next Chain callback */ -module.exports = async function (next) { +export default async function loadHooks(next) { /* Location of the hooks file */ const hooksPath = path.join(this.dir, this.config.hooks); @@ -49,7 +49,7 @@ module.exports = async function (next) { for (const hook of Object.keys(hooks)) { const { method, route } = this.parseMethodRouteKey(hook); - this.hooks[`${method} ${route}`] = require(path.join(this.dir, this.config.hooksDir, hooks[hook])); + this.hooks[`${method} ${route}`] = (await import(path.join(this.dir, this.config.hooksDir, hooks[hook]))).default; /* Initialise hook if it doesn't exist in the controller */ if (!(route in this.controller) && !route.startsWith('/data') && !route.startsWith('data')) { @@ -72,4 +72,4 @@ module.exports = async function (next) { if (next) { next(); } -}; +} diff --git a/core/loadModel.js b/core/loadModel.js index 96db5622..eb01888a 100644 --- a/core/loadModel.js +++ b/core/loadModel.js @@ -6,12 +6,12 @@ /* Dependencies */ -const fs = require('fs'); -const path = require('path'); +import fs from 'fs'; +import path from 'path'; -const { console } = require('../lib/Cluster'); -const SaplingError = require('../lib/SaplingError'); -const Storage = require('../lib/Storage'); +import { console } from '../lib/Cluster.js'; +import SaplingError from '../lib/SaplingError.js'; +import Storage from '../lib/Storage.js'; /** @@ -20,7 +20,7 @@ const Storage = require('../lib/Storage'); * * @param {function} next Chain callback */ -module.exports = async function (next) { +export default async function loadModel(next) { const modelPath = path.join(this.dir, this.config.modelsDir); const structure = {}; let files = {}; @@ -85,4 +85,4 @@ module.exports = async function (next) { if (next) { next(); } -}; +} diff --git a/core/loadModules.js b/core/loadModules.js index 14afd6a1..d35ef9e9 100644 --- a/core/loadModules.js +++ b/core/loadModules.js @@ -6,9 +6,9 @@ /* Dependencies */ -const Notifications = require('../lib/Notifications'); -const Uploads = require('../lib/Uploads'); -const User = require('../lib/User'); +import Notifications from '../lib/Notifications.js'; +import Uploads from '../lib/Uploads.js'; +import User from '../lib/User.js'; /** @@ -16,7 +16,7 @@ const User = require('../lib/User'); * * @param {function} next Chain callback */ -module.exports = async function (next) { +export default async function loadModules(next) { this.user = new User(this); if (this.config.mail) { @@ -30,4 +30,4 @@ module.exports = async function (next) { if (next) { next(); } -}; +} diff --git a/core/loadPermissions.js b/core/loadPermissions.js index 3c99cc32..506d0a0f 100644 --- a/core/loadPermissions.js +++ b/core/loadPermissions.js @@ -6,12 +6,12 @@ /* Dependencies */ -const fs = require('fs'); -const path = require('path'); +import fs from 'fs'; +import path from 'path'; -const { console } = require('../lib/Cluster'); -const Response = require('../lib/Response'); -const SaplingError = require('../lib/SaplingError'); +import { console } from '../lib/Cluster.js'; +import Response from '../lib/Response.js'; +import SaplingError from '../lib/SaplingError.js'; /** @@ -21,7 +21,7 @@ const SaplingError = require('../lib/SaplingError'); * * @param {function} next Chain callback */ -module.exports = async function (next) { +export default async function loadPermissions(next) { /* Load the permissions file */ const permissionsPath = path.join(this.dir, this.config.permissions); this.permissions = {}; @@ -91,4 +91,4 @@ module.exports = async function (next) { if (next) { next(); } -}; +} diff --git a/core/loadRest.js b/core/loadRest.js index e7967dd9..b807387d 100644 --- a/core/loadRest.js +++ b/core/loadRest.js @@ -6,8 +6,8 @@ /* Dependencies */ -const Response = require('../lib/Response'); -const SaplingError = require('../lib/SaplingError'); +import Response from '../lib/Response.js'; +import SaplingError from '../lib/SaplingError.js'; /** @@ -15,9 +15,9 @@ const SaplingError = require('../lib/SaplingError'); * * @param {function} next Chain callback */ -module.exports = async function (next) { +export default async function loadRest(next) { /* Direct user creation to a special case endpoint */ - this.server.post(/\/data\/users\/?$/, (request, response) => { + this.server.post(/\/data\/users\/?$/, async (request, response) => { this.runHook('post', '/api/user/register', request, response); }); @@ -27,7 +27,7 @@ module.exports = async function (next) { const data = await this.storage.get(request, response); /* Run hooks, then send data */ - await this.runHook('get', request.originalUrl, request, response, data, (app, request, response, data) => { + this.runHook('get', request.originalUrl, request, response, data, (app, request, response, data) => { if (data) { new Response(this, request, response, null, data || []); } else { @@ -40,7 +40,7 @@ module.exports = async function (next) { const data = await this.storage.post(request, response); /* Run hooks, then send data */ - await this.runHook('post', request.originalUrl, request, response, data, (app, request, response, data) => { + this.runHook('post', request.originalUrl, request, response, data, (app, request, response, data) => { if (data) { new Response(this, request, response, null, data || []); } else { @@ -53,7 +53,7 @@ module.exports = async function (next) { await this.storage.delete(request, response); /* Run hooks, then send data */ - await this.runHook('delete', request.originalUrl, request, response, [], (app, request, response, data) => { + this.runHook('delete', request.originalUrl, request, response, [], (app, request, response, data) => { if (data) { new Response(this, request, response, null, data || []); } else { @@ -65,4 +65,4 @@ module.exports = async function (next) { if (next) { next(); } -}; +} diff --git a/core/loadServer.js b/core/loadServer.js index a5a8f3e2..17ce6bb9 100644 --- a/core/loadServer.js +++ b/core/loadServer.js @@ -6,18 +6,18 @@ /* Dependencies */ -const path = require('path'); -const { Cluster } = require('../lib/Cluster'); -const Response = require('../lib/Response'); -const SaplingError = require('../lib/SaplingError'); +import path from 'path'; +import Cluster from '../lib/Cluster.js'; +import Response from '../lib/Response.js'; +import SaplingError from '../lib/SaplingError.js'; -const express = require('express'); -const session = require('express-session'); -const cookieParser = require('cookie-parser'); -const bodyParser = require('body-parser'); -const logger = require('morgan'); -const compression = require('compression'); -const csrf = require('csurf'); +import express from 'express'; +import session from 'express-session'; +import cookieParser from 'cookie-parser'; +import bodyParser from 'body-parser'; +import logger from 'morgan'; +import compression from 'compression'; +import csrf from 'csurf'; /** @@ -26,7 +26,7 @@ const csrf = require('csurf'); * @param {object} opts Options for reload and listen * @param {function} next Chain callback */ -module.exports = function ({ reload, listen }, next) { +export default function loadServer({ reload, listen }, next) { let server; if (reload && this.server) { @@ -61,7 +61,7 @@ module.exports = function ({ reload, listen }, next) { /* If we've defined a type, load it */ if ('type' in this.config.sessionStore && this.config.sessionStore.type !== null) { - const Store = require(this.config.sessionStore.type)(session); + const Store = import(this.config.sessionStore.type); sessionConfig.store = new Store(this.config.sessionStore.options); } @@ -145,4 +145,4 @@ module.exports = function ({ reload, listen }, next) { if (next) { next(); } -}; +} diff --git a/core/parseMethodRouteKey.js b/core/parseMethodRouteKey.js index 17d148e3..e3c5b15b 100644 --- a/core/parseMethodRouteKey.js +++ b/core/parseMethodRouteKey.js @@ -6,7 +6,7 @@ /* Dependencies */ -const SaplingError = require('../lib/SaplingError'); +import SaplingError from '../lib/SaplingError.js'; /** @@ -15,7 +15,7 @@ const SaplingError = require('../lib/SaplingError'); * * @param {string} key */ -module.exports = function (key) { +export default function parseMethodRouteKey(key) { const object = { method: false, route: false @@ -53,4 +53,4 @@ module.exports = function (key) { } return object; -}; +} diff --git a/core/runHook.js b/core/runHook.js index 0b297056..bdd410cb 100644 --- a/core/runHook.js +++ b/core/runHook.js @@ -6,9 +6,9 @@ /* Dependencies */ -const routeMatcher = require('path-match')(); +import routeMatcher from 'path-match'; -const { console } = require('../lib/Cluster'); +import { console } from '../lib/Cluster.js'; /** @@ -23,7 +23,7 @@ const { console } = require('../lib/Cluster'); * @param {string} data Data, if any * @param {function} next Callback for after the hook */ -module.exports = async function (method, route, request, response, data, next) { +export default async function runHook(method, route, request, response, data, next) { console.log('Finding hooks for', method, route); let found = false; @@ -34,7 +34,7 @@ module.exports = async function (method, route, request, response, data, next) { const { method: hookMethod, route: hookRoute } = this.parseMethodRouteKey(hook); /* If the route and method match, run the hook */ - if (routeMatcher(hookRoute)(route) !== false && hookMethod.toLowerCase() === method.toLowerCase()) { + if (routeMatcher()(hookRoute)(route) !== false && hookMethod.toLowerCase() === method.toLowerCase()) { await this.hooks[hook](this, request, response, data, next); found = true; break; @@ -45,4 +45,4 @@ module.exports = async function (method, route, request, response, data, next) { if (!found) { return next(this, request, response, data); } -}; +} diff --git a/drivers/db/Interface.js b/drivers/db/Interface.js index 4ad47bfd..7d4a537f 100755 --- a/drivers/db/Interface.js +++ b/drivers/db/Interface.js @@ -10,13 +10,13 @@ /* Dependencies */ -const SaplingError = require('../../lib/SaplingError'); +import SaplingError from '../../lib/SaplingError.js'; /** * The Interface class */ -module.exports = class Interface { +export default class Interface { /** * The connection object that should be populated by the connect() method */ diff --git a/drivers/db/Memory.js b/drivers/db/Memory.js index f918b37f..228a98ab 100644 --- a/drivers/db/Memory.js +++ b/drivers/db/Memory.js @@ -9,17 +9,17 @@ /* Dependencies */ -const _ = require('underscore'); -const Interface = require('./Interface'); +import _ from 'underscore'; +import Interface from './Interface.js'; -const SaplingError = require('../../lib/SaplingError'); -const Utils = require('../../lib/Utils'); +import SaplingError from '../../lib/SaplingError.js'; +import Utils from '../../lib/Utils.js'; /** * The Memory class */ -module.exports = class Memory extends Interface { +export default class Memory extends Interface { /** * The object that contains everything */ @@ -224,4 +224,4 @@ module.exports = class Memory extends Interface { return matches.length > 0 ? matches : false; } -}; +} diff --git a/drivers/render/Html.js b/drivers/render/Html.js index ebd8c1ae..ebeb6c3d 100644 --- a/drivers/render/Html.js +++ b/drivers/render/Html.js @@ -9,18 +9,18 @@ /* Dependencies */ -const fs = require('fs'); -const path = require('path'); -const _ = require('underscore'); -const Interface = require('./Interface'); +import fs from 'fs'; +import path from 'path'; +import _ from 'underscore'; +import Interface from './Interface.js'; -const SaplingError = require('../../lib/SaplingError'); +import SaplingError from '../../lib/SaplingError.js'; /** * The HTML class */ -module.exports = class HTML extends Interface { +export default class HTML extends Interface { /** * Initialise HTML */ @@ -62,4 +62,4 @@ module.exports = class HTML extends Interface { registerTags() { return true; } -}; +} diff --git a/drivers/render/Interface.js b/drivers/render/Interface.js index 3b374137..c2e1f49d 100644 --- a/drivers/render/Interface.js +++ b/drivers/render/Interface.js @@ -11,13 +11,13 @@ /* Dependencies */ -const SaplingError = require('../../lib/SaplingError'); +import SaplingError from '../../lib/SaplingError.js'; /** * The Interface class */ -module.exports = class Interface { +export default class Interface { /** * Load parent app */ diff --git a/hooks/sapling/model/retrieve.js b/hooks/sapling/model/retrieve.js index 0b52ec4b..c53c8129 100644 --- a/hooks/sapling/model/retrieve.js +++ b/hooks/sapling/model/retrieve.js @@ -8,13 +8,13 @@ /* Dependencies */ -const Response = require('@sapling/sapling/lib/Response'); -const SaplingError = require('@sapling/sapling/lib/SaplingError'); -const Utils = require('@sapling/sapling/lib/Utils'); +import Response from '@sapling/sapling/lib/Response.js'; +import SaplingError from '@sapling/sapling/lib/SaplingError.js'; +import Utils from '@sapling/sapling/lib/Utils.js'; /* Hook /api/model/:model */ -module.exports = async function (app, request, response) { +export default async function retrieve(app, request, response) { if (request.params.model) { /* Fetch the given model */ const schema = new Utils().deepClone(app.storage.schema[request.params.model] || []); @@ -36,4 +36,4 @@ module.exports = async function (app, request, response) { } return new Response(app, request, response, new SaplingError('No model specified')); -}; +} diff --git a/hooks/sapling/user/forgot.js b/hooks/sapling/user/forgot.js index 51dc6d27..e9db842a 100644 --- a/hooks/sapling/user/forgot.js +++ b/hooks/sapling/user/forgot.js @@ -9,14 +9,14 @@ /* Dependencies */ -const { console } = require('@sapling/sapling/lib/Cluster'); -const Response = require('@sapling/sapling/lib/Response'); -const SaplingError = require('@sapling/sapling/lib/SaplingError'); -const Validation = require('@sapling/sapling/lib/Validation'); +import { console } from '@sapling/sapling/lib/Cluster.js'; +import Response from '@sapling/sapling/lib/Response.js'; +import SaplingError from '@sapling/sapling/lib/SaplingError.js'; +import Validation from '@sapling/sapling/lib/Validation.js'; /* Hook /api/user/forgot */ -module.exports = async function (app, request, response) { +export default async function forgot(app, request, response) { /* Check email for format */ const errors = new Validation().validate(request.body.email, 'email', { email: true, required: true }); if (errors.length > 0) { @@ -65,4 +65,4 @@ module.exports = async function (app, request, response) { /* Respond positively */ return new Response(app, request, response); } -}; +} diff --git a/hooks/sapling/user/logged.js b/hooks/sapling/user/logged.js index 70def7bd..35c7ab66 100644 --- a/hooks/sapling/user/logged.js +++ b/hooks/sapling/user/logged.js @@ -9,13 +9,13 @@ /* Dependencies */ -const _ = require('underscore'); +import _ from 'underscore'; -const Response = require('@sapling/sapling/lib/Response'); +import Response from '@sapling/sapling/lib/Response.js'; /* Hook /api/user/logged */ -module.exports = async function (app, request, response) { +export default async function logged(app, request, response) { /* If session exists */ if (request.session && request.session.user) { /* Get the user from storage */ @@ -37,4 +37,4 @@ module.exports = async function (app, request, response) { /* If no session, return empty object */ return new Response(app, request, response, null, {}); -}; +} diff --git a/hooks/sapling/user/login.js b/hooks/sapling/user/login.js index 4663e50e..45d45144 100644 --- a/hooks/sapling/user/login.js +++ b/hooks/sapling/user/login.js @@ -9,15 +9,15 @@ /* Dependencies */ -const _ = require('underscore'); +import _ from 'underscore'; -const Hash = require('@sapling/sapling/lib/Hash'); -const Response = require('@sapling/sapling/lib/Response'); -const SaplingError = require('@sapling/sapling/lib/SaplingError'); +import Hash from '@sapling/sapling/lib/Hash.js'; +import Response from '@sapling/sapling/lib/Response.js'; +import SaplingError from '@sapling/sapling/lib/SaplingError.js'; /* Hook /api/user/login */ -module.exports = async function (app, request, response) { +export default async function login(app, request, response) { /* Find all identifiable fields */ const identifiables = Object.keys(app.storage.schema.users).filter(field => app.storage.schema.users[field].identifiable); @@ -127,4 +127,4 @@ module.exports = async function (app, request, response) { /* Otherwise, reply with the user object */ return new Response(app, request, response, null, request.session.user); } -}; +} diff --git a/hooks/sapling/user/logout.js b/hooks/sapling/user/logout.js index a06a478e..264e83f3 100644 --- a/hooks/sapling/user/logout.js +++ b/hooks/sapling/user/logout.js @@ -8,11 +8,11 @@ /* Dependencies */ -const Response = require('@sapling/sapling/lib/Response'); +import Response from '@sapling/sapling/lib/Response.js'; /* Hook /api/user/logout */ -module.exports = async function (app, request, response) { +export default async function logout(app, request, response) { /* Destroy the session */ request.session.destroy(); request.session = null; @@ -23,4 +23,4 @@ module.exports = async function (app, request, response) { } else { return new Response(app, request, response); } -}; +} diff --git a/hooks/sapling/user/recover.js b/hooks/sapling/user/recover.js index d4c74c5e..e7fb0f36 100644 --- a/hooks/sapling/user/recover.js +++ b/hooks/sapling/user/recover.js @@ -8,14 +8,14 @@ /* Dependencies */ -const Hash = require('@sapling/sapling/lib/Hash'); +import Hash from '@sapling/sapling/lib/Hash.js'; -const Response = require('@sapling/sapling/lib/Response'); -const SaplingError = require('@sapling/sapling/lib/SaplingError'); +import Response from '@sapling/sapling/lib/Response.js'; +import SaplingError from '@sapling/sapling/lib/SaplingError.js'; /* Hook /api/user/recover */ -module.exports = async function (app, request, response) { +export default async function recover(app, request, response) { /* If the new password has not been provided, throw error */ if (!request.body.new_password) { return new Response(app, request, response, new SaplingError({ @@ -124,4 +124,4 @@ module.exports = async function (app, request, response) { /* Respond with the user object */ return new Response(app, request, response, null, userData); } -}; +} diff --git a/hooks/sapling/user/register.js b/hooks/sapling/user/register.js index 383246a9..7ef1d9ee 100644 --- a/hooks/sapling/user/register.js +++ b/hooks/sapling/user/register.js @@ -8,16 +8,16 @@ /* Dependencies */ -const _ = require('underscore'); +import _ from 'underscore'; -const { console } = require('@sapling/sapling/lib/Cluster'); -const Hash = require('@sapling/sapling/lib/Hash'); -const Response = require('@sapling/sapling/lib/Response'); -const SaplingError = require('@sapling/sapling/lib/SaplingError'); +import { console } from '@sapling/sapling/lib/Cluster.js'; +import Hash from '@sapling/sapling/lib/Hash.js'; +import Response from '@sapling/sapling/lib/Response.js'; +import SaplingError from '@sapling/sapling/lib/SaplingError.js'; /* Hook /api/user/register */ -module.exports = async function (app, request, response) { +export default async function register(app, request, response) { /* Error collection */ const errors = []; @@ -106,4 +106,4 @@ module.exports = async function (app, request, response) { /* Respond with the user object */ return new Response(app, request, response, null, userData); } -}; +} diff --git a/hooks/sapling/user/update.js b/hooks/sapling/user/update.js index 65584966..45221718 100644 --- a/hooks/sapling/user/update.js +++ b/hooks/sapling/user/update.js @@ -9,14 +9,14 @@ /* Dependencies */ -const Hash = require('@sapling/sapling/lib/Hash'); +import Hash from '@sapling/sapling/lib/Hash.js'; -const Response = require('@sapling/sapling/lib/Response'); -const SaplingError = require('@sapling/sapling/lib/SaplingError'); +import Response from '@sapling/sapling/lib/Response.js'; +import SaplingError from '@sapling/sapling/lib/SaplingError.js'; /* Hook /api/user/update */ -module.exports = async function (app, request, response) { +export default async function update(app, request, response) { /* If the user isn't logged in */ if (!request.session || !request.session.user) { return new Response(app, request, response, new SaplingError({ @@ -118,4 +118,4 @@ module.exports = async function (app, request, response) { /* Respond with the user object */ return new Response(app, request, response, null, userData); } -}; +} diff --git a/index.js b/index.js index 8aebc6e0..2f6da53f 100755 --- a/index.js +++ b/index.js @@ -13,12 +13,20 @@ /* Require native clustering bits */ -const cluster = require('cluster'); -const os = require('os'); -const chalk = require('chalk'); -const argv = require('yargs').argv; -const path = require('path'); -const fs = require('fs'); +import cluster from 'cluster'; +import os from 'os'; +import chalk from 'chalk'; +import yargs from 'yargs'; +/* eslint-disable-next-line node/file-extension-in-import */ +import { hideBin } from 'yargs/helpers'; +import path from 'path'; +import fs from 'fs'; + +import App from './app.js'; + + +const argv = yargs(hideBin(process.argv)).argv; + /* Determine if session store is configured */ const configPath = path.join(process.cwd(), 'config.json'); @@ -56,6 +64,5 @@ if (cluster.isMaster && !argv.single && sessionAvailable) { } /* Load a single instance */ - const App = require('./app'); new App(process.cwd()); } diff --git a/lib/Cluster.js b/lib/Cluster.js index 1da9a034..37c91d4e 100644 --- a/lib/Cluster.js +++ b/lib/Cluster.js @@ -9,44 +9,49 @@ /* Dependencies */ -const cluster = require('cluster'); -const chalk = require('chalk'); +import cluster from 'cluster'; +import chalk from 'chalk'; const pid = process.pid; let currentIndent = 0; const indentAmount = 4; +const originalConsole = console; -const Cluster = { - /* Prefixing native console methods with worker ID */ - console: { - log(...args) { - if (process.env.NODE_ENV !== 'test') { - console.log(Cluster.workerID() + ' '.repeat(currentIndent), ...args); - } - }, - warn(...args) { - if (process.env.NODE_ENV !== 'test') { - console.warn(Cluster.workerID() + ' '.repeat(currentIndent), ...args); - } - }, - error(...args) { - if (process.env.NODE_ENV !== 'test') { - console.error(Cluster.workerID() + ' '.repeat(currentIndent), ...args); - } - }, - group(...args) { - if (process.env.NODE_ENV !== 'test') { - console.log(Cluster.workerID(), chalk.blue.bold(...args)); - currentIndent += indentAmount; - } - }, - groupEnd() { - if (process.env.NODE_ENV !== 'test') { - currentIndent -= indentAmount; - } + +/* Prefixing native console methods with worker ID */ +const prefixedConsole = { + log(...args) { + if (process.env.NODE_ENV !== 'test') { + originalConsole.log(Cluster.workerID() + ' '.repeat(currentIndent), ...args); + } + }, + warn(...args) { + if (process.env.NODE_ENV !== 'test') { + originalConsole.warn(Cluster.workerID() + ' '.repeat(currentIndent), ...args); } }, + error(...args) { + if (process.env.NODE_ENV !== 'test') { + originalConsole.error(Cluster.workerID() + ' '.repeat(currentIndent), ...args); + } + }, + group(...args) { + if (process.env.NODE_ENV !== 'test') { + originalConsole.log(Cluster.workerID(), chalk.blue.bold(...args)); + currentIndent += indentAmount; + } + }, + groupEnd() { + if (process.env.NODE_ENV !== 'test') { + currentIndent -= indentAmount; + } + } +}; + + +const Cluster = { + console: prefixedConsole, /* Create an access log line */ logger(tokens, request, response) { @@ -75,4 +80,5 @@ const Cluster = { } }; -module.exports = { Cluster, console: Cluster.console }; +export { prefixedConsole as console }; +export default Cluster; diff --git a/lib/Hash.js b/lib/Hash.js index d659b254..b947851b 100755 --- a/lib/Hash.js +++ b/lib/Hash.js @@ -8,20 +8,15 @@ /* Dependencies */ -const SaplingError = require('./SaplingError'); +import crypto from 'crypto'; -let crypto; -try { - crypto = require('crypto'); -} catch { - throw new SaplingError('Cannot load required dependency: `crypto`'); -} +import SaplingError from './SaplingError.js'; /** * The Hash class */ -module.exports = class Hash { +export default class Hash { /* Bytesize */ length = 128; @@ -105,4 +100,4 @@ module.exports = class Hash { }); }); } -}; +} diff --git a/lib/Notifications.js b/lib/Notifications.js index dfb23c51..30288dad 100644 --- a/lib/Notifications.js +++ b/lib/Notifications.js @@ -8,21 +8,21 @@ /* Dependencies */ -const _ = require('underscore'); -const path = require('path'); +import _ from 'underscore'; +import path from 'path'; -const SaplingError = require('./SaplingError'); -const Templating = require('./Templating'); -const Validation = require('./Validation'); +import SaplingError from './SaplingError.js'; +import Templating from './Templating.js'; +import Validation from './Validation.js'; -const frontMatter = require('front-matter'); -const nodemailer = require('nodemailer'); +import frontMatter from 'front-matter'; +import nodemailer from 'nodemailer'; /** * The Notifications class */ -module.exports = class Notifications { +export default class Notifications { /** * Initialise the Notifications class * @@ -55,9 +55,11 @@ module.exports = class Notifications { let html = ''; let meta = {}; + await this.templating.importDriver(); + try { /* Read template */ - html = await this.templating.renderer.render(`${template}.${this.app.config.extension}`, data); + html = await this.templating.renderView(template, data); /* Parse front matter */ meta = frontMatter(html); @@ -82,4 +84,4 @@ module.exports = class Notifications { throw new SaplingError('Cannot send notification: mail host or authentication not set'); } -}; +} diff --git a/lib/Response.js b/lib/Response.js index 1b0602b3..34699e77 100644 --- a/lib/Response.js +++ b/lib/Response.js @@ -9,17 +9,17 @@ /* Dependencies */ -const isobject = require('isobject'); -const path = require('path'); +import isobject from 'isobject'; +import path from 'path'; -const { console } = require('./Cluster'); -const Templating = require('./Templating'); +import { console } from './Cluster.js'; +import Templating from './Templating.js'; /** * The Response class */ -module.exports = class Response { +export default class Response { /** * Initialise the Response class * @@ -36,9 +36,6 @@ module.exports = class Response { this.error = error; this.content = content; - /* Create a Templating instance */ - this.templating = new Templating(this.app, path.join(this.app.dir, 'static/response')); - /* Try to detect if this is an AJAX request */ if (this.request) { this.ajax = request.xhr || (request.headers && request.headers.accept && request.headers.accept.includes('json')); @@ -143,6 +140,18 @@ module.exports = class Response { } + /** + * Load Templating class and the driver + */ + async initTemplating() { + /* Create a Templating instance */ + this.templating = new Templating(this.app, path.join(this.app.dir, 'static/response')); + + /* Load the driver */ + return await this.templating.importDriver(); + } + + /** * Respond with a pre-rendered view */ @@ -177,9 +186,12 @@ module.exports = class Response { /* Otherwise just return the data */ if (!this.ajax && !this.app.config.strict && !this.app.config.production) { + /* Load templating driver */ + await this.initTemplating(); + /* As a view */ - this.response.send(await this.templating.renderer.render( - 'data.html', + this.response.send(await this.templating.renderView( + 'data', { request: this.request.method + ' ' + this.request.originalUrl, status: this.getRecordsFound(this.content), @@ -208,10 +220,13 @@ module.exports = class Response { /* Respond with the error */ if (this.ajax === false) { try { + /* Load templating driver */ + await this.initTemplating(); + /* As a view */ if (this.app.config.showError) { - this.response.send(await this.templating.renderer.render( - 'error.html', + this.response.send(await this.templating.renderView( + 'error', { error: this.convertArrayToTables(this.error.json.errors), stack: this.app.config.strict || this.app.config.production ? '' : this.error.stack, @@ -219,7 +234,7 @@ module.exports = class Response { } )); } else { - this.response.send(await this.templating.renderer.render('500.html')); + this.response.send(await this.templating.renderView('500')); } } catch { this.response.status(errorCode).json(this.error.json); @@ -239,9 +254,12 @@ module.exports = class Response { /* Respond with the error */ if (this.ajax === false) { + /* Load templating driver */ + await this.initTemplating(); + try { /* As a view */ - this.response.send(await this.templating.renderer.render('404.html')); + this.response.send(await this.templating.renderView('404')); } catch { this.response.status(404).send(); } @@ -249,4 +267,4 @@ module.exports = class Response { this.response.status(404).send(); } } -}; +} diff --git a/lib/SaplingError.js b/lib/SaplingError.js index e31e5af9..c4133755 100755 --- a/lib/SaplingError.js +++ b/lib/SaplingError.js @@ -10,7 +10,7 @@ /** * The SaplingError class */ -module.exports = class SaplingError extends Error { +export default class SaplingError extends Error { /** * Initialise the SaplingError class * @@ -55,4 +55,4 @@ module.exports = class SaplingError extends Error { this.json.errors.push(error); } } -}; +} diff --git a/lib/Storage.js b/lib/Storage.js index b1a7cb1a..10257c49 100755 --- a/lib/Storage.js +++ b/lib/Storage.js @@ -9,13 +9,13 @@ /* Dependencies */ -const _ = require('underscore'); -const moment = require('moment'); +import _ from 'underscore'; +import moment from 'moment'; -const { console } = require('./Cluster'); -const SaplingError = require('./SaplingError'); -const Response = require('./Response'); -const Validation = require('./Validation'); +import { console } from './Cluster.js'; +import SaplingError from './SaplingError.js'; +import Response from './Response.js'; +import Validation from './Validation.js'; /* Default user structure */ @@ -53,7 +53,13 @@ const uploadStructure = { /** * The Storage class */ -module.exports = class Storage { +export default class Storage { + /** + * DB class + */ + db = null; + + /** * Initialise the Storage class * @@ -63,6 +69,7 @@ module.exports = class Storage { constructor(App, options) { /* Load the options into the class */ this.app = App; + this.options = options; this.name = options.name; this.schema = options.schema; this.config = options.config; @@ -83,7 +90,7 @@ module.exports = class Storage { } /* Create dbs */ - this.createDatabase(options); + this.createDatabase(); } @@ -153,32 +160,45 @@ module.exports = class Storage { /** - * Connect to the database and create each collection defined in the schema - * - * @param {object} opts Options object from constructor + * Import DB driver if needed; no-op if already loaded. */ - async createDatabase(options) { - const dbConfig = this.config.db; - dbConfig.name = this.name; - dbConfig.dataLimit = this.config.dataLimit; - - /* Connect to the database backend with the desired driver */ - const driver = String(this.config.db.driver).toLowerCase(); - - if (driver === 'memory') { - this.db = new (require('../drivers/db/Memory'))(options); - } else { - try { - this.db = new (require(`@sapling/db-driver-${driver}`))(options); - } catch { + async importDriver() { + if (this.db === null) { + /* Connect to the database backend with the desired driver */ + const driver = String(this.config.db.driver).toLowerCase(); + + if (driver === 'memory') { + /* eslint-disable-next-line new-cap */ + this.db = new (await import('../drivers/db/Memory.js')).default(this.options); + } else { try { - this.db = new (require(driver))(options); + /* eslint-disable-next-line new-cap */ + this.db = new (await import(`@sapling/db-driver-${driver}`)).default(this.options); } catch { - throw new SaplingError(`Cannot find any DB driver for '${driver}'`); + try { + /* eslint-disable-next-line new-cap */ + this.db = new (await import(driver)).default(this.options); + } catch { + throw new SaplingError(`Cannot find any DB driver for '${driver}'`); + } } } } + return this.db; + } + + + /** + * Connect to the database and create each collection defined in the scheme + */ + async createDatabase() { + await this.importDriver(); + + const dbConfig = this.config.db; + dbConfig.name = this.name; + dbConfig.dataLimit = this.config.dataLimit; + await this.db.connect(dbConfig); /* Create each collection in the schema in the database */ @@ -483,6 +503,8 @@ module.exports = class Storage { * @param {object} response Response object from Express */ async get(request, response) { + await this.importDriver(); + /* Prepare the raw request */ request = this.parseRequest(request); @@ -594,6 +616,8 @@ module.exports = class Storage { * @param {object} response Response object from Express */ async post(request, response) { + await this.importDriver(); + /* Prepare the raw request */ request = this.parseRequest(request); @@ -703,6 +727,8 @@ module.exports = class Storage { * @param {object} request Request object from Express */ async delete(request) { + await this.importDriver(); + /* Prepare the raw request */ request = this.parseRequest(request); @@ -718,4 +744,4 @@ module.exports = class Storage { /* Send it to the database */ return await this.db.remove(request.collection, conditions); } -}; +} diff --git a/lib/Templating.js b/lib/Templating.js index ba041a59..6d836bdc 100644 --- a/lib/Templating.js +++ b/lib/Templating.js @@ -9,16 +9,16 @@ /* Dependencies */ -const path = require('path'); -const _ = require('underscore'); +import path from 'path'; +import _ from 'underscore'; -const SaplingError = require('./SaplingError'); +import SaplingError from './SaplingError.js'; /** * The Templating class */ -module.exports = class Templating { +export default class Templating { /** * Render class */ @@ -36,23 +36,36 @@ module.exports = class Templating { /* Infer base path if not supplied */ this.viewsPath = viewsPath ? viewsPath : path.join(this.app.dir, this.app.config.viewsDir); + } + - /* Set up the the desired driver */ - const driver = String(this.app.config.render.driver).toLowerCase(); + /** + * Import render driver if needed; no-op if already loaded. + */ + async importDriver() { + if (this.renderer === null) { + /* Set up the the desired driver */ + const driver = String(this.app.config.render.driver).toLowerCase(); - if (driver === 'html') { - this.renderer = new (require('../drivers/render/Html'))(App, this.viewsPath); - } else { - try { - this.renderer = new (require(`@sapling/render-driver-${driver}`))(App, this.viewsPath); - } catch { + if (driver === 'html') { + /* eslint-disable-next-line new-cap */ + this.renderer = new (await import('../drivers/render/Html.js')).default(this.app, this.viewsPath); + } else { try { - this.renderer = new (require(driver))(App, this.viewsPath); + /* eslint-disable-next-line new-cap */ + this.renderer = new (await import(`@sapling/render-driver-${driver}`)).default(this.app, this.viewsPath); } catch { - throw new SaplingError(`Cannot find any render driver for '${driver}'`); + try { + /* eslint-disable-next-line new-cap */ + this.renderer = new (await import(driver)).default(this.app, this.viewsPath); + } catch { + throw new SaplingError(`Cannot find any render driver for '${driver}'`); + } } } } + + return this.renderer; } @@ -64,22 +77,26 @@ module.exports = class Templating { * @param {object} request Express request object */ async renderView(view, data, request) { + await this.importDriver(); + /* Build the data to pass into template */ - _.extend(data, { - params: _.extend({}, request.params), - query: request.query, - headers: request.headers, - session: request.session, - form: request.body, - $_POST: request.body, // Php-like alias - $_GET: request.query, - self: { - dir: this.viewsPath, - url: request.url, - method: request.method, - name: this.app.name - } - }); + if (request) { + _.extend(data, { + params: _.extend({}, request.params), + query: request.query, + headers: request.headers, + session: request.session, + form: request.body, + $_POST: request.body, // Php-like alias + $_GET: request.query, + self: { + dir: this.viewsPath, + url: request.url, + method: request.method, + name: this.app.name + } + }); + } /* Add CSRF token if needed */ if (this.app.config.csrf || this.app.config.strict) { @@ -91,4 +108,4 @@ module.exports = class Templating { /* Create new template engine instance */ return await this.renderer.render(`${view}.${this.app.config.extension}`, data); } -}; +} diff --git a/lib/Uploads.js b/lib/Uploads.js index e0281018..249158dc 100644 --- a/lib/Uploads.js +++ b/lib/Uploads.js @@ -8,23 +8,23 @@ /* Dependencies */ -const fs = require('fs'); -const path = require('path'); -const fileUpload = require('express-fileupload'); +import fs from 'fs'; +import path from 'path'; +import fileUpload from 'express-fileupload'; -const filenamify = require('filenamify'); -const unusedFilename = require('unused-filename'); -const imageSize = require('image-size'); +import filenamify from 'filenamify'; +import unusedFilename from 'unused-filename'; +import imageSize from 'image-size'; -const SaplingError = require('./SaplingError'); -const Response = require('./Response'); -const Validation = require('./Validation'); +import SaplingError from './SaplingError.js'; +import Response from './Response.js'; +import Validation from './Validation.js'; /** * The Uploads class */ -module.exports = class Uploads { +export default class Uploads { /* File categories */ uploadTypes = { archive: ['application/zip', 'application/gzip', 'application/x-7z-compressed', 'application/x-bzip', 'application/x-bzip2', 'application/vnd.rar', 'application/x-rar-compressed', 'application/x-zip-compressed', 'application/x-tar'], @@ -139,4 +139,4 @@ module.exports = class Uploads { return data; } -}; +} diff --git a/lib/User.js b/lib/User.js index 5b5cfd63..a1e129e4 100644 --- a/lib/User.js +++ b/lib/User.js @@ -8,16 +8,16 @@ /* Dependencies */ -const routeMatcher = require('path-match')(); +import routeMatcher from 'path-match'; -const Response = require('./Response'); -const SaplingError = require('./SaplingError'); +import Response from './Response.js'; +import SaplingError from './SaplingError.js'; /** * The User class */ -module.exports = class User { +export default class User { /** * Initialise the User class * @@ -137,14 +137,15 @@ module.exports = class User { * @param {string} url The route being tested */ getRolesForRoute(method, url) { - const routes = this.app.routeStack[method] || []; + const lowerMethod = String(method).toLowerCase(); + const routes = this.app.routeStack[lowerMethod] || []; /* Go through all the routes */ for (const route of routes) { /* If the given route matches the url */ - if (routeMatcher(route)(url) !== false) { + if (routeMatcher()(route)(url) !== false) { /* Find the given permission rule in the loaded permissionset */ - const permissionKey = `${method} ${route}`.toLowerCase(); + const permissionKey = `${lowerMethod} ${route}`.toLowerCase(); const userType = permissionKey in this.app.permissions ? this.app.permissions[permissionKey].role : 'anyone'; /* Return the first match */ @@ -155,4 +156,4 @@ module.exports = class User { /* Default to anyone */ return ['anyone']; } -}; +} diff --git a/lib/Utils.js b/lib/Utils.js index 754457fe..db12668f 100644 --- a/lib/Utils.js +++ b/lib/Utils.js @@ -8,15 +8,15 @@ /* Dependencies */ -const fs = require('fs'); +import fs from 'fs'; -const SaplingError = require('./SaplingError'); +import SaplingError from './SaplingError.js'; /** * The Utils class */ -module.exports = class Utils { +export default class Utils { /** * Initialise the Utils class * @@ -119,4 +119,4 @@ module.exports = class Utils { return false; } } -}; +} diff --git a/lib/Validation.js b/lib/Validation.js index f0245210..35aabcec 100755 --- a/lib/Validation.js +++ b/lib/Validation.js @@ -10,7 +10,7 @@ /** * The Validation class */ -module.exports = class Validation { +export default class Validation { /** * Initialise the Validation class */ @@ -493,4 +493,4 @@ module.exports = class Validation { return this.errors; } -}; +} diff --git a/package-lock.json b/package-lock.json index 93ab9518..82c1bbf5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,18 +5,18 @@ "requires": true, "dependencies": { "@babel/code-frame": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz", - "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz", + "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==", "dev": true, "requires": { - "@babel/highlight": "^7.12.13" + "@babel/highlight": "^7.14.5" } }, "@babel/compat-data": { - "version": "7.14.7", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.7.tgz", - "integrity": "sha512-nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw==", + "version": "7.14.9", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.9.tgz", + "integrity": "sha512-p3QjZmMGHDGdpcwEYYWu7i7oJShJvtgMjJeb0W95PPhSm++3lm8YXYOh45Y6iCN9PkZLTZ7CIX5nFrp7pw7TXw==", "dev": true }, "@babel/core": { @@ -42,151 +42,6 @@ "source-map": "^0.5.0" }, "dependencies": { - "@babel/code-frame": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz", - "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==", - "dev": true, - "requires": { - "@babel/highlight": "^7.14.5" - } - }, - "@babel/generator": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.8.tgz", - "integrity": "sha512-cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg==", - "dev": true, - "requires": { - "@babel/types": "^7.14.8", - "jsesc": "^2.5.1", - "source-map": "^0.5.0" - } - }, - "@babel/helper-function-name": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz", - "integrity": "sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==", - "dev": true, - "requires": { - "@babel/helper-get-function-arity": "^7.14.5", - "@babel/template": "^7.14.5", - "@babel/types": "^7.14.5" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz", - "integrity": "sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==", - "dev": true, - "requires": { - "@babel/types": "^7.14.5" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz", - "integrity": "sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==", - "dev": true, - "requires": { - "@babel/types": "^7.14.5" - } - }, - "@babel/helper-validator-identifier": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz", - "integrity": "sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow==", - "dev": true - }, - "@babel/highlight": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz", - "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.14.5", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - } - }, - "@babel/parser": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.8.tgz", - "integrity": "sha512-syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA==", - "dev": true - }, - "@babel/template": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz", - "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.14.5", - "@babel/parser": "^7.14.5", - "@babel/types": "^7.14.5" - } - }, - "@babel/traverse": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.8.tgz", - "integrity": "sha512-kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.14.5", - "@babel/generator": "^7.14.8", - "@babel/helper-function-name": "^7.14.5", - "@babel/helper-hoist-variables": "^7.14.5", - "@babel/helper-split-export-declaration": "^7.14.5", - "@babel/parser": "^7.14.8", - "@babel/types": "^7.14.8", - "debug": "^4.1.0", - "globals": "^11.1.0" - } - }, - "@babel/types": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.8.tgz", - "integrity": "sha512-iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.14.8", - "to-fast-properties": "^2.0.0" - } - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, "debug": { "version": "4.3.2", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", @@ -196,65 +51,32 @@ "ms": "2.1.2" } }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } } } }, "@babel/eslint-parser": { - "version": "7.14.7", - "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.14.7.tgz", - "integrity": "sha512-6WPwZqO5priAGIwV6msJcdc9TsEPzYeYdS/Xuoap+/ihkgN6dzHp2bcAAwyWZ5bLzk0vvjDmKvRwkqNaiJ8BiQ==", + "version": "7.14.9", + "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.14.9.tgz", + "integrity": "sha512-W3En2CT6iOZJ+jEujLlwL2h/Jraj6S/IHrh63nV+TfX83DYe9pI4pcu0Luj6/hJ2kIr/3hOttxzaEsSQnUKx+w==", "dev": true, "requires": { "eslint-scope": "^5.1.1", "eslint-visitor-keys": "^2.1.0", "semver": "^6.3.0" - }, - "dependencies": { - "eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", - "dev": true, - "requires": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" - } - }, - "eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", - "dev": true - } } }, "@babel/generator": { - "version": "7.13.9", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz", - "integrity": "sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==", + "version": "7.14.9", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.9.tgz", + "integrity": "sha512-4yoHbhDYzFa0GLfCzLp5GxH7vPPMAHdZjyE7M/OajM9037zhx0rf+iNsJwp4PT0MSFpwjG7BsHEbPkBQpZ6cYA==", "dev": true, "requires": { - "@babel/types": "^7.13.0", + "@babel/types": "^7.14.9", "jsesc": "^2.5.1", "source-map": "^0.5.0" } @@ -272,23 +94,23 @@ } }, "@babel/helper-function-name": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz", - "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz", + "integrity": "sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==", "dev": true, "requires": { - "@babel/helper-get-function-arity": "^7.12.13", - "@babel/template": "^7.12.13", - "@babel/types": "^7.12.13" + "@babel/helper-get-function-arity": "^7.14.5", + "@babel/template": "^7.14.5", + "@babel/types": "^7.14.5" } }, "@babel/helper-get-function-arity": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz", - "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz", + "integrity": "sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==", "dev": true, "requires": { - "@babel/types": "^7.12.13" + "@babel/types": "^7.14.5" } }, "@babel/helper-hoist-variables": { @@ -298,24 +120,6 @@ "dev": true, "requires": { "@babel/types": "^7.14.5" - }, - "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz", - "integrity": "sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow==", - "dev": true - }, - "@babel/types": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.8.tgz", - "integrity": "sha512-iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.14.8", - "to-fast-properties": "^2.0.0" - } - } } }, "@babel/helper-member-expression-to-functions": { @@ -325,24 +129,6 @@ "dev": true, "requires": { "@babel/types": "^7.14.5" - }, - "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz", - "integrity": "sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow==", - "dev": true - }, - "@babel/types": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.8.tgz", - "integrity": "sha512-iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.14.8", - "to-fast-properties": "^2.0.0" - } - } } }, "@babel/helper-module-imports": { @@ -352,24 +138,6 @@ "dev": true, "requires": { "@babel/types": "^7.14.5" - }, - "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz", - "integrity": "sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow==", - "dev": true - }, - "@babel/types": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.8.tgz", - "integrity": "sha512-iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.14.8", - "to-fast-properties": "^2.0.0" - } - } } }, "@babel/helper-module-transforms": { @@ -386,399 +154,27 @@ "@babel/template": "^7.14.5", "@babel/traverse": "^7.14.8", "@babel/types": "^7.14.8" - }, - "dependencies": { - "@babel/code-frame": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz", - "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==", - "dev": true, - "requires": { - "@babel/highlight": "^7.14.5" - } - }, - "@babel/generator": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.8.tgz", - "integrity": "sha512-cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg==", - "dev": true, - "requires": { - "@babel/types": "^7.14.8", - "jsesc": "^2.5.1", - "source-map": "^0.5.0" - } - }, - "@babel/helper-function-name": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz", - "integrity": "sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==", - "dev": true, - "requires": { - "@babel/helper-get-function-arity": "^7.14.5", - "@babel/template": "^7.14.5", - "@babel/types": "^7.14.5" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz", - "integrity": "sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==", - "dev": true, - "requires": { - "@babel/types": "^7.14.5" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz", - "integrity": "sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==", - "dev": true, - "requires": { - "@babel/types": "^7.14.5" - } - }, - "@babel/helper-validator-identifier": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz", - "integrity": "sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow==", - "dev": true - }, - "@babel/highlight": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz", - "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.14.5", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - } - }, - "@babel/parser": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.8.tgz", - "integrity": "sha512-syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA==", - "dev": true - }, - "@babel/template": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz", - "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.14.5", - "@babel/parser": "^7.14.5", - "@babel/types": "^7.14.5" - } - }, - "@babel/traverse": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.8.tgz", - "integrity": "sha512-kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.14.5", - "@babel/generator": "^7.14.8", - "@babel/helper-function-name": "^7.14.5", - "@babel/helper-hoist-variables": "^7.14.5", - "@babel/helper-split-export-declaration": "^7.14.5", - "@babel/parser": "^7.14.8", - "@babel/types": "^7.14.8", - "debug": "^4.1.0", - "globals": "^11.1.0" - } - }, - "@babel/types": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.8.tgz", - "integrity": "sha512-iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.14.8", - "to-fast-properties": "^2.0.0" - } - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } } }, "@babel/helper-optimise-call-expression": { "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz", - "integrity": "sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==", - "dev": true, - "requires": { - "@babel/types": "^7.14.5" - }, - "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz", - "integrity": "sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow==", - "dev": true - }, - "@babel/types": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.8.tgz", - "integrity": "sha512-iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.14.8", - "to-fast-properties": "^2.0.0" - } - } - } - }, - "@babel/helper-replace-supers": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz", - "integrity": "sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==", - "dev": true, - "requires": { - "@babel/helper-member-expression-to-functions": "^7.14.5", - "@babel/helper-optimise-call-expression": "^7.14.5", - "@babel/traverse": "^7.14.5", - "@babel/types": "^7.14.5" - }, - "dependencies": { - "@babel/code-frame": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz", - "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==", - "dev": true, - "requires": { - "@babel/highlight": "^7.14.5" - } - }, - "@babel/generator": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.8.tgz", - "integrity": "sha512-cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg==", - "dev": true, - "requires": { - "@babel/types": "^7.14.8", - "jsesc": "^2.5.1", - "source-map": "^0.5.0" - } - }, - "@babel/helper-function-name": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz", - "integrity": "sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==", - "dev": true, - "requires": { - "@babel/helper-get-function-arity": "^7.14.5", - "@babel/template": "^7.14.5", - "@babel/types": "^7.14.5" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz", - "integrity": "sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==", - "dev": true, - "requires": { - "@babel/types": "^7.14.5" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz", - "integrity": "sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==", - "dev": true, - "requires": { - "@babel/types": "^7.14.5" - } - }, - "@babel/helper-validator-identifier": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz", - "integrity": "sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow==", - "dev": true - }, - "@babel/highlight": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz", - "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.14.5", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - } - }, - "@babel/parser": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.8.tgz", - "integrity": "sha512-syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA==", - "dev": true - }, - "@babel/template": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz", - "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.14.5", - "@babel/parser": "^7.14.5", - "@babel/types": "^7.14.5" - } - }, - "@babel/traverse": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.8.tgz", - "integrity": "sha512-kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.14.5", - "@babel/generator": "^7.14.8", - "@babel/helper-function-name": "^7.14.5", - "@babel/helper-hoist-variables": "^7.14.5", - "@babel/helper-split-export-declaration": "^7.14.5", - "@babel/parser": "^7.14.8", - "@babel/types": "^7.14.8", - "debug": "^4.1.0", - "globals": "^11.1.0" - } - }, - "@babel/types": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.8.tgz", - "integrity": "sha512-iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.14.8", - "to-fast-properties": "^2.0.0" - } - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } + "integrity": "sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==", + "dev": true, + "requires": { + "@babel/types": "^7.14.5" + } + }, + "@babel/helper-replace-supers": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz", + "integrity": "sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==", + "dev": true, + "requires": { + "@babel/helper-member-expression-to-functions": "^7.14.5", + "@babel/helper-optimise-call-expression": "^7.14.5", + "@babel/traverse": "^7.14.5", + "@babel/types": "^7.14.5" } }, "@babel/helper-simple-access": { @@ -788,39 +184,21 @@ "dev": true, "requires": { "@babel/types": "^7.14.8" - }, - "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz", - "integrity": "sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow==", - "dev": true - }, - "@babel/types": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.8.tgz", - "integrity": "sha512-iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.14.8", - "to-fast-properties": "^2.0.0" - } - } } }, "@babel/helper-split-export-declaration": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz", - "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz", + "integrity": "sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==", "dev": true, "requires": { - "@babel/types": "^7.12.13" + "@babel/types": "^7.14.5" } }, "@babel/helper-validator-identifier": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", - "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", + "version": "7.14.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz", + "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==", "dev": true }, "@babel/helper-validator-option": { @@ -838,192 +216,15 @@ "@babel/template": "^7.14.5", "@babel/traverse": "^7.14.8", "@babel/types": "^7.14.8" - }, - "dependencies": { - "@babel/code-frame": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz", - "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==", - "dev": true, - "requires": { - "@babel/highlight": "^7.14.5" - } - }, - "@babel/generator": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.8.tgz", - "integrity": "sha512-cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg==", - "dev": true, - "requires": { - "@babel/types": "^7.14.8", - "jsesc": "^2.5.1", - "source-map": "^0.5.0" - } - }, - "@babel/helper-function-name": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz", - "integrity": "sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==", - "dev": true, - "requires": { - "@babel/helper-get-function-arity": "^7.14.5", - "@babel/template": "^7.14.5", - "@babel/types": "^7.14.5" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz", - "integrity": "sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==", - "dev": true, - "requires": { - "@babel/types": "^7.14.5" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz", - "integrity": "sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==", - "dev": true, - "requires": { - "@babel/types": "^7.14.5" - } - }, - "@babel/helper-validator-identifier": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz", - "integrity": "sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow==", - "dev": true - }, - "@babel/highlight": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz", - "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.14.5", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - } - }, - "@babel/parser": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.8.tgz", - "integrity": "sha512-syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA==", - "dev": true - }, - "@babel/template": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz", - "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.14.5", - "@babel/parser": "^7.14.5", - "@babel/types": "^7.14.5" - } - }, - "@babel/traverse": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.8.tgz", - "integrity": "sha512-kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.14.5", - "@babel/generator": "^7.14.8", - "@babel/helper-function-name": "^7.14.5", - "@babel/helper-hoist-variables": "^7.14.5", - "@babel/helper-split-export-declaration": "^7.14.5", - "@babel/parser": "^7.14.8", - "@babel/types": "^7.14.8", - "debug": "^4.1.0", - "globals": "^11.1.0" - } - }, - "@babel/types": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.8.tgz", - "integrity": "sha512-iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.14.8", - "to-fast-properties": "^2.0.0" - } - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } } }, "@babel/highlight": { - "version": "7.13.10", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.10.tgz", - "integrity": "sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz", + "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.12.11", + "@babel/helper-validator-identifier": "^7.14.5", "chalk": "^2.0.0", "js-tokens": "^4.0.0" }, @@ -1081,43 +282,43 @@ } }, "@babel/parser": { - "version": "7.13.12", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.12.tgz", - "integrity": "sha512-4T7Pb244rxH24yR116LAuJ+adxXXnHhZaLJjegJVKSdoNCe4x1eDBaud5YIcQFcqzsaD5BHvJw5BQ0AZapdCRw==", + "version": "7.14.9", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.9.tgz", + "integrity": "sha512-RdUTOseXJ8POjjOeEBEvNMIZU/nm4yu2rufRkcibzkkg7DmQvXU8v3M4Xk9G7uuI86CDGkKcuDWgioqZm+mScQ==", "dev": true }, "@babel/template": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz", - "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz", + "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==", "dev": true, "requires": { - "@babel/code-frame": "^7.12.13", - "@babel/parser": "^7.12.13", - "@babel/types": "^7.12.13" + "@babel/code-frame": "^7.14.5", + "@babel/parser": "^7.14.5", + "@babel/types": "^7.14.5" } }, "@babel/traverse": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz", - "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==", + "version": "7.14.9", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.9.tgz", + "integrity": "sha512-bldh6dtB49L8q9bUyB7bC20UKgU+EFDwKJylwl234Kv+ySZeMD31Xeht6URyueQ6LrRRpF2tmkfcZooZR9/e8g==", "dev": true, "requires": { - "@babel/code-frame": "^7.12.13", - "@babel/generator": "^7.13.0", - "@babel/helper-function-name": "^7.12.13", - "@babel/helper-split-export-declaration": "^7.12.13", - "@babel/parser": "^7.13.0", - "@babel/types": "^7.13.0", + "@babel/code-frame": "^7.14.5", + "@babel/generator": "^7.14.9", + "@babel/helper-function-name": "^7.14.5", + "@babel/helper-hoist-variables": "^7.14.5", + "@babel/helper-split-export-declaration": "^7.14.5", + "@babel/parser": "^7.14.9", + "@babel/types": "^7.14.9", "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.19" + "globals": "^11.1.0" }, "dependencies": { "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", "dev": true, "requires": { "ms": "2.1.2" @@ -1132,16 +333,21 @@ } }, "@babel/types": { - "version": "7.13.12", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.12.tgz", - "integrity": "sha512-K4nY2xFN4QMvQwkQ+zmBDp6ANMbVNw6BbxWmYA4qNjhR9W+Lj/8ky5MEY2Me5r+B2c6/v6F53oMndG+f9s3IiA==", + "version": "7.14.9", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.9.tgz", + "integrity": "sha512-u0bLTnv3DFHeaQLYzb7oRJ1JHr1sv/SYDM7JSqHFFLwXG1wTZRughxFI5NCP8qBEo1rVVsn7Yg2Lvw49nne/Ow==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.12.11", - "lodash": "^4.17.19", + "@babel/helper-validator-identifier": "^7.14.9", "to-fast-properties": "^2.0.0" } }, + "@bcoe/v8-coverage": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", + "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", + "dev": true + }, "@concordance/react": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@concordance/react/-/react-2.0.0.tgz", @@ -1254,27 +460,6 @@ "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==", "dev": true }, - "@istanbuljs/load-nyc-config": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", - "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", - "dev": true, - "requires": { - "camelcase": "^5.3.1", - "find-up": "^4.1.0", - "get-package-type": "^0.1.0", - "js-yaml": "^3.13.1", - "resolve-from": "^5.0.0" - }, - "dependencies": { - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true - } - } - }, "@istanbuljs/schema": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", @@ -1300,28 +485,28 @@ } }, "@nodelib/fs.scandir": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz", - "integrity": "sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", "dev": true, "requires": { - "@nodelib/fs.stat": "2.0.4", + "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" } }, "@nodelib/fs.stat": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz", - "integrity": "sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", "dev": true }, "@nodelib/fs.walk": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz", - "integrity": "sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", "dev": true, "requires": { - "@nodelib/fs.scandir": "2.1.4", + "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" } }, @@ -1338,12 +523,18 @@ "csurf": "^1.11.0", "express": "4.17.1", "express-fileupload": "^1.2.1", + "express-session": "1.17.2", "filenamify": "^4.2.0", "front-matter": "^4.0.2", + "image-size": "^1.0.0", "isobject": "^4.0.0", "moment": "2.29.1", "morgan": "^1.9.1", - "path-match": "^1.2.4" + "nodemailer": "6.6.3", + "path-match": "^1.2.4", + "underscore": "1.13.1", + "unused-filename": "^3.0.0", + "yargs": "^17.0.1" } }, "@sindresorhus/is": { @@ -1388,49 +579,49 @@ "dev": true }, "@types/glob": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz", - "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==", + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.4.tgz", + "integrity": "sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==", "dev": true, "requires": { "@types/minimatch": "*", "@types/node": "*" } }, - "@types/json-schema": { - "version": "7.0.7", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz", - "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==", + "@types/istanbul-lib-coverage": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz", + "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==", "dev": true }, - "@types/json5": { - "version": "0.0.29", - "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", - "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", + "@types/json-schema": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz", + "integrity": "sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg==", "dev": true }, "@types/minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", + "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==", "dev": true }, "@types/minimist": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz", - "integrity": "sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz", + "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==", "dev": true }, "@types/node": { - "version": "14.14.36", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.36.tgz", - "integrity": "sha512-kjivUwDJfIjngzbhooRnOLhGYz6oRFi+L+EpMjxroDYXwDw9lHrJJ43E+dJ6KAd3V3WxWAJ/qZE9XKYHhjPOFQ==", + "version": "16.4.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.4.10.tgz", + "integrity": "sha512-TmVHsm43br64js9BqHWqiDZA+xMtbUpI1MBIA0EyiBmoV9pcEYFOSdj5fr6enZNfh4fChh+AGOLIzGwJnkshyQ==", "dev": true }, "@types/normalize-package-data": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz", + "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==", "dev": true }, "@types/parse-json": { @@ -1440,25 +631,24 @@ "dev": true }, "@typescript-eslint/eslint-plugin": { - "version": "4.22.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.22.0.tgz", - "integrity": "sha512-U8SP9VOs275iDXaL08Ln1Fa/wLXfj5aTr/1c0t0j6CdbOnxh+TruXu1p4I0NAvdPBQgoPjHsgKn28mOi0FzfoA==", + "version": "4.28.5", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.5.tgz", + "integrity": "sha512-m31cPEnbuCqXtEZQJOXAHsHvtoDi9OVaeL5wZnO2KZTnkvELk+u6J6jHg+NzvWQxk+87Zjbc4lJS4NHmgImz6Q==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "4.22.0", - "@typescript-eslint/scope-manager": "4.22.0", - "debug": "^4.1.1", + "@typescript-eslint/experimental-utils": "4.28.5", + "@typescript-eslint/scope-manager": "4.28.5", + "debug": "^4.3.1", "functional-red-black-tree": "^1.0.1", - "lodash": "^4.17.15", - "regexpp": "^3.0.0", - "semver": "^7.3.2", - "tsutils": "^3.17.1" + "regexpp": "^3.1.0", + "semver": "^7.3.5", + "tsutils": "^3.21.0" }, "dependencies": { "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", "dev": true, "requires": { "ms": "2.1.2" @@ -1482,35 +672,46 @@ } }, "@typescript-eslint/experimental-utils": { - "version": "4.22.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.0.tgz", - "integrity": "sha512-xJXHHl6TuAxB5AWiVrGhvbGL8/hbiCQ8FiWwObO3r0fnvBdrbWEDy1hlvGQOAWc6qsCWuWMKdVWlLAEMpxnddg==", + "version": "4.28.5", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.5.tgz", + "integrity": "sha512-bGPLCOJAa+j49hsynTaAtQIWg6uZd8VLiPcyDe4QPULsvQwLHGLSGKKcBN8/lBxIX14F74UEMK2zNDI8r0okwA==", "dev": true, "requires": { - "@types/json-schema": "^7.0.3", - "@typescript-eslint/scope-manager": "4.22.0", - "@typescript-eslint/types": "4.22.0", - "@typescript-eslint/typescript-estree": "4.22.0", - "eslint-scope": "^5.0.0", - "eslint-utils": "^2.0.0" + "@types/json-schema": "^7.0.7", + "@typescript-eslint/scope-manager": "4.28.5", + "@typescript-eslint/types": "4.28.5", + "@typescript-eslint/typescript-estree": "4.28.5", + "eslint-scope": "^5.1.1", + "eslint-utils": "^3.0.0" + }, + "dependencies": { + "eslint-utils": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", + "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^2.0.0" + } + } } }, "@typescript-eslint/parser": { - "version": "4.22.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.22.0.tgz", - "integrity": "sha512-z/bGdBJJZJN76nvAY9DkJANYgK3nlRstRRi74WHm3jjgf2I8AglrSY+6l7ogxOmn55YJ6oKZCLLy+6PW70z15Q==", + "version": "4.28.5", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.28.5.tgz", + "integrity": "sha512-NPCOGhTnkXGMqTznqgVbA5LqVsnw+i3+XA1UKLnAb+MG1Y1rP4ZSK9GX0kJBmAZTMIktf+dTwXToT6kFwyimbw==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "4.22.0", - "@typescript-eslint/types": "4.22.0", - "@typescript-eslint/typescript-estree": "4.22.0", - "debug": "^4.1.1" + "@typescript-eslint/scope-manager": "4.28.5", + "@typescript-eslint/types": "4.28.5", + "@typescript-eslint/typescript-estree": "4.28.5", + "debug": "^4.3.1" }, "dependencies": { "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", "dev": true, "requires": { "ms": "2.1.2" @@ -1525,40 +726,40 @@ } }, "@typescript-eslint/scope-manager": { - "version": "4.22.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz", - "integrity": "sha512-OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q==", + "version": "4.28.5", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.5.tgz", + "integrity": "sha512-PHLq6n9nTMrLYcVcIZ7v0VY1X7dK309NM8ya9oL/yG8syFINIMHxyr2GzGoBYUdv3NUfCOqtuqps0ZmcgnZTfQ==", "dev": true, "requires": { - "@typescript-eslint/types": "4.22.0", - "@typescript-eslint/visitor-keys": "4.22.0" + "@typescript-eslint/types": "4.28.5", + "@typescript-eslint/visitor-keys": "4.28.5" } }, "@typescript-eslint/types": { - "version": "4.22.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.22.0.tgz", - "integrity": "sha512-sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA==", + "version": "4.28.5", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.5.tgz", + "integrity": "sha512-MruOu4ZaDOLOhw4f/6iudyks/obuvvZUAHBDSW80Trnc5+ovmViLT2ZMDXhUV66ozcl6z0LJfKs1Usldgi/WCA==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "4.22.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz", - "integrity": "sha512-TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg==", + "version": "4.28.5", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.5.tgz", + "integrity": "sha512-FzJUKsBX8poCCdve7iV7ShirP8V+ys2t1fvamVeD1rWpiAnIm550a+BX/fmTHrjEpQJ7ZAn+Z7ZZwJjytk9rZw==", "dev": true, "requires": { - "@typescript-eslint/types": "4.22.0", - "@typescript-eslint/visitor-keys": "4.22.0", - "debug": "^4.1.1", - "globby": "^11.0.1", + "@typescript-eslint/types": "4.28.5", + "@typescript-eslint/visitor-keys": "4.28.5", + "debug": "^4.3.1", + "globby": "^11.0.3", "is-glob": "^4.0.1", - "semver": "^7.3.2", - "tsutils": "^3.17.1" + "semver": "^7.3.5", + "tsutils": "^3.21.0" }, "dependencies": { "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", "dev": true, "requires": { "ms": "2.1.2" @@ -1582,21 +783,13 @@ } }, "@typescript-eslint/visitor-keys": { - "version": "4.22.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz", - "integrity": "sha512-nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw==", + "version": "4.28.5", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.5.tgz", + "integrity": "sha512-dva/7Rr+EkxNWdJWau26xU/0slnFlkh88v3TsyTgRS/IIYFi5iIfpCFM4ikw0vQTFUR9FYSSyqgK4w64gsgxhg==", "dev": true, "requires": { - "@typescript-eslint/types": "4.22.0", + "@typescript-eslint/types": "4.28.5", "eslint-visitor-keys": "^2.0.0" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz", - "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==", - "dev": true - } } }, "@webassemblyjs/ast": { @@ -1767,21 +960,21 @@ } }, "acorn": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.1.0.tgz", - "integrity": "sha512-LWCF/Wn0nfHOmJ9rzQApGnxnvgfROzGilS8936rqN/lfcYkY9MYZzdMqN+2NJ4SlTc+m5HiSa+kNfDtI64dwUA==", + "version": "8.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz", + "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==", "dev": true }, "acorn-jsx": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz", - "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", "dev": true }, "acorn-walk": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.0.2.tgz", - "integrity": "sha512-+bpA9MJsHdZ4bgfDcpk0ozQyhhVct7rzOmO0s1IIr0AGGgKBljss8n2zp11rRP2wid5VGeh04CgeKzgat5/25A==", + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.1.1.tgz", + "integrity": "sha512-FbJdceMlPHEAWJOILDk1fXD8lnTlEIWFkqtfk+MvmL5q/qlHfN7GEHcsFZWt/Tea9jRNPWUZG4G976nqAAmU9w==", "dev": true }, "addressparser": { @@ -1910,30 +1103,15 @@ } }, "anymatch": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", - "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", "dev": true, "requires": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" } }, - "append-transform": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz", - "integrity": "sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==", - "dev": true, - "requires": { - "default-require-extensions": "^3.0.0" - } - }, - "archy": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", - "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=", - "dev": true - }, "argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", @@ -2022,67 +1200,20 @@ "arraybuffer.slice": { "version": "0.0.7", "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz", - "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==", - "dev": true - }, - "arrgv": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/arrgv/-/arrgv-1.0.2.tgz", - "integrity": "sha512-a4eg4yhp7mmruZDQFqVMlxNRFGi/i1r87pt8SDHy0/I8PqSXoUTlWZRdAZo0VXgvEARcujbtTk8kiZRi1uDGRw==", - "dev": true - }, - "arrify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", - "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", - "dev": true - }, - "asn1.js": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", - "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", - "dev": true, - "requires": { - "bn.js": "^4.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "safer-buffer": "^2.1.0" - }, - "dependencies": { - "bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", - "dev": true - } - } - }, - "assert": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz", - "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==", - "dev": true, - "requires": { - "object-assign": "^4.1.1", - "util": "0.10.3" - }, - "dependencies": { - "inherits": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=", - "dev": true - }, - "util": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", - "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", - "dev": true, - "requires": { - "inherits": "2.0.1" - } - } - } + "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==", + "dev": true + }, + "arrgv": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/arrgv/-/arrgv-1.0.2.tgz", + "integrity": "sha512-a4eg4yhp7mmruZDQFqVMlxNRFGi/i1r87pt8SDHy0/I8PqSXoUTlWZRdAZo0VXgvEARcujbtTk8kiZRi1uDGRw==", + "dev": true + }, + "arrify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", + "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", + "dev": true }, "assign-symbols": { "version": "1.0.0", @@ -2190,15 +1321,15 @@ }, "dependencies": { "ansi-styles": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.1.0.tgz", - "integrity": "sha512-osxifZo3ar56+e8tdYreU6p8FZGciBHo5O0JoDAxMUqZuyNUb+yHEwYtJZ+Z32R459jEgtwVf1u8D7qYwU0l6w==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", "dev": true }, "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", "dev": true, "requires": { "ms": "2.1.2" @@ -2235,20 +1366,6 @@ } } }, - "babel-eslint": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz", - "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.7.0", - "@babel/traverse": "^7.7.0", - "@babel/types": "^7.7.0", - "eslint-visitor-keys": "^1.0.0", - "resolve": "^1.12.0" - } - }, "backo2": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz", @@ -2256,9 +1373,9 @@ "dev": true }, "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", "dev": true }, "base": { @@ -2400,12 +1517,6 @@ "integrity": "sha512-vE52okJvzsVWhcgUHOv+69OG3Mdg151xyn41aVQN/5W5S+S43qZhxECtYLAEHMSFWX6Mv5IZrzj3T5+JqXfj5Q==", "dev": true }, - "bn.js": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz", - "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==", - "dev": true - }, "body-parser": { "version": "1.19.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", @@ -2424,9 +1535,9 @@ } }, "boxen": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-5.0.0.tgz", - "integrity": "sha512-5bvsqw+hhgUi3oYGK0Vf4WpIkyemp60WBInn7+WNfoISzAqk/HX4L7WNROq38E6UR/y3YADpv6pEm4BfkeEAdA==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/boxen/-/boxen-5.0.1.tgz", + "integrity": "sha512-49VBlw+PrWEF51aCmy7QIteYPIFZxSpvqBdP/2itCPPlJ49kj9zg/XPRFrdkne2W+CfwXUls8exMvu1RysZpKA==", "dev": true, "requires": { "ansi-align": "^3.0.0", @@ -2466,99 +1577,6 @@ "fill-range": "^7.0.1" } }, - "brorand": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", - "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=", - "dev": true - }, - "browserify-aes": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", - "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", - "dev": true, - "requires": { - "buffer-xor": "^1.0.3", - "cipher-base": "^1.0.0", - "create-hash": "^1.1.0", - "evp_bytestokey": "^1.0.3", - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } - }, - "browserify-cipher": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz", - "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", - "dev": true, - "requires": { - "browserify-aes": "^1.0.4", - "browserify-des": "^1.0.0", - "evp_bytestokey": "^1.0.0" - } - }, - "browserify-des": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz", - "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", - "dev": true, - "requires": { - "cipher-base": "^1.0.1", - "des.js": "^1.0.0", - "inherits": "^2.0.1", - "safe-buffer": "^5.1.2" - } - }, - "browserify-rsa": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz", - "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==", - "dev": true, - "requires": { - "bn.js": "^5.0.0", - "randombytes": "^2.0.1" - } - }, - "browserify-sign": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", - "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", - "dev": true, - "requires": { - "bn.js": "^5.1.1", - "browserify-rsa": "^4.0.1", - "create-hash": "^1.2.0", - "create-hmac": "^1.1.7", - "elliptic": "^6.5.3", - "inherits": "^2.0.4", - "parse-asn1": "^5.1.5", - "readable-stream": "^3.6.0", - "safe-buffer": "^5.2.0" - }, - "dependencies": { - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true - }, - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true - } - } - }, - "browserify-zlib": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", - "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", - "dev": true, - "requires": { - "pako": "~1.0.5" - } - }, "browserslist": { "version": "4.16.6", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz", @@ -2570,20 +1588,6 @@ "electron-to-chromium": "^1.3.723", "escalade": "^3.1.1", "node-releases": "^1.1.71" - }, - "dependencies": { - "caniuse-lite": { - "version": "1.0.30001228", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz", - "integrity": "sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==", - "dev": true - }, - "electron-to-chromium": { - "version": "1.3.736", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.736.tgz", - "integrity": "sha512-DY8dA7gR51MSo66DqitEQoUMQ0Z+A2DSXFi7tK304bdTVqczCAfUuyQw6Wdg8hIoo5zIxkU1L24RQtUce1Ioig==", - "dev": true - } } }, "buf-compare": { @@ -2603,21 +1607,9 @@ } }, "buffer-from": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", - "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", - "dev": true - }, - "buffer-xor": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", - "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=", - "dev": true - }, - "builtin-status-codes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", - "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "dev": true }, "busboy": { @@ -2633,6 +1625,80 @@ "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==" }, + "c8": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/c8/-/c8-7.8.0.tgz", + "integrity": "sha512-x2Bx+IIEd608B1LmjiNQ/kizRPkCWo5XzuV57J9afPjAHSnYXALwbCSOkQ7cSaNXBNblfqcvdycj+klmL+j6yA==", + "dev": true, + "requires": { + "@bcoe/v8-coverage": "^0.2.3", + "@istanbuljs/schema": "^0.1.2", + "find-up": "^5.0.0", + "foreground-child": "^2.0.0", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-report": "^3.0.0", + "istanbul-reports": "^3.0.2", + "rimraf": "^3.0.0", + "test-exclude": "^6.0.0", + "v8-to-istanbul": "^8.0.0", + "yargs": "^16.2.0", + "yargs-parser": "^20.2.7" + }, + "dependencies": { + "find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "requires": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + } + }, + "locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "requires": { + "p-locate": "^5.0.0" + } + }, + "p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "requires": { + "yocto-queue": "^0.1.0" + } + }, + "p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "requires": { + "p-limit": "^3.0.2" + } + }, + "yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, + "requires": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + } + } + } + }, "cache-base": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", @@ -2690,18 +1756,6 @@ } } }, - "caching-transform": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz", - "integrity": "sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==", - "dev": true, - "requires": { - "hasha": "^5.0.0", - "make-dir": "^3.0.0", - "package-hash": "^4.0.0", - "write-file-atomic": "^3.0.0" - } - }, "call-bind": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", @@ -2755,29 +1809,35 @@ } } }, + "caniuse-lite": { + "version": "1.0.30001248", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001248.tgz", + "integrity": "sha512-NwlQbJkxUFJ8nMErnGtT0QTM2TJ33xgz4KXJSMIrjXIbDVdaYueGyjOrLKRtJC+rTiWfi6j5cnZN1NBiSBJGNw==", + "dev": true + }, "chalk": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", - "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "chokidar": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz", - "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz", + "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==", "dev": true, "requires": { - "anymatch": "~3.1.1", + "anymatch": "~3.1.2", "braces": "~3.0.2", - "fsevents": "~2.3.1", - "glob-parent": "~5.1.0", + "fsevents": "~2.3.2", + "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", - "readdirp": "~3.5.0" + "readdirp": "~3.6.0" } }, "chrome-trace-event": { @@ -2804,16 +1864,6 @@ "integrity": "sha512-uvzpYrpmidaoxvIQHM+rKSrigjOe9feHYbw4uOI2gdfe1C3xIlxO+kVXq83WQWNniTf8bAxVpy+cQeFQsMERKg==", "dev": true }, - "cipher-base": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", - "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", - "dev": true, - "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } - }, "class-utils": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", @@ -3091,24 +2141,6 @@ "integrity": "sha512-gNld/3lySHwuhaVluJUKLePYirM3QNCKzVxqAdhJII9/WXKVX5PURzMVJspS1jTslSqjeuG4KMVTSouit5YPHA==", "dev": true }, - "console-browserify": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz", - "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==", - "dev": true - }, - "constants-browserify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", - "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=", - "dev": true - }, - "contains-path": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz", - "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=", - "dev": true - }, "content-disposition": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", @@ -3123,9 +2155,9 @@ "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" }, "convert-source-map": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", - "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", + "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", "dev": true, "requires": { "safe-buffer": "~5.1.1" @@ -3178,12 +2210,6 @@ "is-error": "^2.2.0" } }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true - }, "cors": { "version": "2.8.5", "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", @@ -3221,51 +2247,6 @@ } } }, - "create-ecdh": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz", - "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==", - "dev": true, - "requires": { - "bn.js": "^4.1.0", - "elliptic": "^6.5.3" - }, - "dependencies": { - "bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", - "dev": true - } - } - }, - "create-hash": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", - "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", - "dev": true, - "requires": { - "cipher-base": "^1.0.1", - "inherits": "^2.0.1", - "md5.js": "^1.3.4", - "ripemd160": "^2.0.1", - "sha.js": "^2.4.0" - } - }, - "create-hmac": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", - "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", - "dev": true, - "requires": { - "cipher-base": "^1.0.3", - "create-hash": "^1.1.0", - "inherits": "^2.0.1", - "ripemd160": "^2.0.0", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" - } - }, "cron": { "version": "1.8.2", "resolved": "https://registry.npmjs.org/cron/-/cron-1.8.2.tgz", @@ -3285,25 +2266,6 @@ "which": "^2.0.1" } }, - "crypto-browserify": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", - "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", - "dev": true, - "requires": { - "browserify-cipher": "^1.0.0", - "browserify-sign": "^4.0.0", - "create-ecdh": "^4.0.0", - "create-hash": "^1.1.0", - "create-hmac": "^1.1.0", - "diffie-hellman": "^5.0.0", - "inherits": "^2.0.1", - "pbkdf2": "^3.0.3", - "public-encrypt": "^4.0.0", - "randombytes": "^2.0.0", - "randomfill": "^1.0.3" - } - }, "crypto-random-string": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", @@ -3442,23 +2404,6 @@ "core-assert": "^0.2.0" } }, - "default-require-extensions": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.0.tgz", - "integrity": "sha512-ek6DpXq/SCpvjhpFsLFRVtIxJCRw6fUR42lYMVZuUMK7n8eMz4Uh5clckdBjEpLhn/gEBZo7hDJnJcwdKLKQjg==", - "dev": true, - "requires": { - "strip-bom": "^4.0.0" - }, - "dependencies": { - "strip-bom": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", - "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", - "dev": true - } - } - }, "defaults": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", @@ -3557,16 +2502,6 @@ "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" }, - "des.js": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz", - "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==", - "dev": true, - "requires": { - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" - } - }, "destroy": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", @@ -3580,25 +2515,6 @@ "streamsearch": "0.1.2" } }, - "diffie-hellman": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", - "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", - "dev": true, - "requires": { - "bn.js": "^4.1.0", - "miller-rabin": "^4.0.0", - "randombytes": "^2.0.0" - }, - "dependencies": { - "bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", - "dev": true - } - } - }, "dir-glob": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", @@ -3617,12 +2533,6 @@ "esutils": "^2.0.2" } }, - "domain-browser": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz", - "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==", - "dev": true - }, "dot-prop": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", @@ -3636,41 +2546,18 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=", - "dev": true - }, - "ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" - }, - "elliptic": { - "version": "6.5.4", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", - "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", - "dev": true, - "requires": { - "bn.js": "^4.11.9", - "brorand": "^1.1.0", - "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.1", - "inherits": "^2.0.4", - "minimalistic-assert": "^1.0.1", - "minimalistic-crypto-utils": "^1.0.1" - }, - "dependencies": { - "bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", - "dev": true - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true - } - } + "dev": true + }, + "ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" + }, + "electron-to-chromium": { + "version": "1.3.792", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.792.tgz", + "integrity": "sha512-RM2O2xrNarM7Cs+XF/OE2qX/aBROyOZqqgP+8FXMXSuWuUqCfUUzg7NytQrzZU3aSqk1Qq6zqnVkJsbfMkIatg==", + "dev": true }, "emittery": { "version": "0.8.1", @@ -3729,9 +2616,9 @@ } }, "engine.io-client": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.3.2.tgz", - "integrity": "sha512-y0CPINnhMvPuwtqXfsGuWE8BB66+B6wTtCofQDRecMQPYX3MYUZXFNKDhdrSe3EVjgOu4V3rxdeqN/Tr91IgbQ==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.3.3.tgz", + "integrity": "sha512-PXIgpzb1brtBzh8Q6vCjzCMeu4nfEPmaDm+L3Qb2sVHwLkxC1qRiBMSjOB0NJNjZ0hbPNUKQa+s8J2XxLOIEeQ==", "dev": true, "requires": { "component-emitter": "1.2.1", @@ -3743,7 +2630,7 @@ "parseqs": "0.0.5", "parseuri": "0.0.5", "ws": "~6.1.0", - "xmlhttprequest-ssl": "~1.5.4", + "xmlhttprequest-ssl": "~1.6.3", "yeast": "0.1.2" }, "dependencies": { @@ -3821,9 +2708,9 @@ } }, "es-abstract": { - "version": "1.18.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz", - "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==", + "version": "1.18.4", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.4.tgz", + "integrity": "sha512-xjDAPJRxKc1uoTkdW8MEk7Fq/2bzz3YoCADYniDV7+KITCUdu9c90fj1aKI7nEZFZxRrHlDo3wtma/C6QkhlXQ==", "dev": true, "requires": { "call-bind": "^1.0.2", @@ -3832,16 +2719,17 @@ "get-intrinsic": "^1.1.1", "has": "^1.0.3", "has-symbols": "^1.0.2", + "internal-slot": "^1.0.3", "is-callable": "^1.2.3", "is-negative-zero": "^2.0.1", - "is-regex": "^1.1.2", - "is-string": "^1.0.5", - "object-inspect": "^1.9.0", + "is-regex": "^1.1.3", + "is-string": "^1.0.6", + "object-inspect": "^1.11.0", "object-keys": "^1.1.1", "object.assign": "^4.1.2", "string.prototype.trimend": "^1.0.4", "string.prototype.trimstart": "^1.0.4", - "unbox-primitive": "^1.0.0" + "unbox-primitive": "^1.0.1" } }, "es-module-lexer": { @@ -3861,12 +2749,6 @@ "is-symbol": "^1.0.2" } }, - "es6-error": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", - "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", - "dev": true - }, "escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", @@ -3889,9 +2771,9 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "eslint": { - "version": "7.31.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.31.0.tgz", - "integrity": "sha512-vafgJpSh2ia8tnTkNUkwxGmnumgckLh5aAbLa1xRmIn9+owi8qBNGKL+B881kNKNTy7FFqTEkpNkUvmw0n6PkA==", + "version": "7.32.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz", + "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==", "dev": true, "requires": { "@babel/code-frame": "7.12.11", @@ -3960,22 +2842,6 @@ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "dev": true }, - "eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", - "dev": true, - "requires": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" - } - }, - "eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", - "dev": true - }, "globals": { "version": "13.10.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.10.0.tgz", @@ -4021,9 +2887,9 @@ } }, "eslint-config-prettier": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.2.0.tgz", - "integrity": "sha512-dWV9EVeSo2qodOPi1iBYU/x6F6diHv8uujxbxr77xExs3zTAlNXvVZKiyLsQGNz7yPV2K49JY5WjPzNIuDc2Bw==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz", + "integrity": "sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==", "dev": true }, "eslint-config-xo": { @@ -4042,11 +2908,12 @@ "dev": true }, "eslint-formatter-pretty": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eslint-formatter-pretty/-/eslint-formatter-pretty-4.0.0.tgz", - "integrity": "sha512-QgdeZxQwWcN0TcXXNZJiS6BizhAANFhCzkE7Yl9HKB7WjElzwED6+FbbZB2gji8ofgJTGPqKm6VRCNT3OGCeEw==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/eslint-formatter-pretty/-/eslint-formatter-pretty-4.1.0.tgz", + "integrity": "sha512-IsUTtGxF1hrH6lMWiSl1WbGaiP01eT6kzywdY1U+zLc0MP+nwEnUiS9UI8IaOTUhTeQJLlCEWIbXINBH4YJbBQ==", "dev": true, "requires": { + "@types/eslint": "^7.2.13", "ansi-escapes": "^4.2.1", "chalk": "^4.1.0", "eslint-rule-docs": "^1.1.5", @@ -4067,23 +2934,33 @@ } }, "eslint-import-resolver-webpack": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.13.0.tgz", - "integrity": "sha512-hZWGcmjaJZK/WSCYGI/y4+FMGQZT+cwW/1E/P4rDwFj2PbanlQHISViw4ccDJ+2wxAqjgwBfxwy3seABbVKDEw==", + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.13.1.tgz", + "integrity": "sha512-O/8mG6AHmaKYSMb4lWxiXPpaARxOJ4rMQEHJ8vTgjS1MXooJA3KPgBPPAdOPoV17v5ML5120qod5FBLM+DtgEw==", "dev": true, "requires": { "array-find": "^1.0.0", - "debug": "^2.6.9", + "debug": "^3.2.7", "enhanced-resolve": "^0.9.1", "find-root": "^1.1.0", "has": "^1.0.3", - "interpret": "^1.2.0", - "lodash": "^4.17.15", - "node-libs-browser": "^1.0.0 || ^2.0.0", - "resolve": "^1.13.1", + "interpret": "^1.4.0", + "is-core-module": "^2.4.0", + "is-regex": "^1.1.3", + "lodash": "^4.17.21", + "resolve": "^1.20.0", "semver": "^5.7.1" }, "dependencies": { + "debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, "enhanced-resolve": { "version": "0.9.1", "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz", @@ -4095,6 +2972,12 @@ "tapable": "^0.1.8" } }, + "ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true + }, "semver": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", @@ -4110,15 +2993,24 @@ } }, "eslint-module-utils": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz", - "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz", + "integrity": "sha512-ZXI9B8cxAJIH4nfkhTwcRTEAnrVfobYqwjWy/QMCZ8rHkZHFjf9yO4BzpiF9kCSfNlMG54eKigISHpX0+AaT4A==", "dev": true, "requires": { - "debug": "^2.6.9", + "debug": "^3.2.7", "pkg-dir": "^2.0.0" }, "dependencies": { + "debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, "find-up": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", @@ -4138,6 +3030,12 @@ "path-exists": "^3.0.0" } }, + "ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true + }, "p-limit": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", @@ -4265,40 +3163,84 @@ } }, "eslint-plugin-import": { - "version": "2.22.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz", - "integrity": "sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==", + "version": "2.23.4", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.23.4.tgz", + "integrity": "sha512-6/wP8zZRsnQFiR3iaPFgh5ImVRM1WN5NUWfTIRqwOdeiGJlBcSk82o1FEVq8yXmy4lkIzTo7YhHCIxlU/2HyEQ==", "dev": true, "requires": { - "array-includes": "^3.1.1", - "array.prototype.flat": "^1.2.3", - "contains-path": "^0.1.0", + "array-includes": "^3.1.3", + "array.prototype.flat": "^1.2.4", "debug": "^2.6.9", - "doctrine": "1.5.0", + "doctrine": "^2.1.0", "eslint-import-resolver-node": "^0.3.4", - "eslint-module-utils": "^2.6.0", + "eslint-module-utils": "^2.6.1", + "find-up": "^2.0.0", "has": "^1.0.3", + "is-core-module": "^2.4.0", "minimatch": "^3.0.4", - "object.values": "^1.1.1", - "read-pkg-up": "^2.0.0", - "resolve": "^1.17.0", + "object.values": "^1.1.3", + "pkg-up": "^2.0.0", + "read-pkg-up": "^3.0.0", + "resolve": "^1.20.0", "tsconfig-paths": "^3.9.0" }, "dependencies": { "doctrine": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz", - "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", "dev": true, "requires": { - "esutils": "^2.0.2", - "isarray": "^1.0.0" + "esutils": "^2.0.2" } }, - "isarray": { + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "^2.0.0" + } + }, + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "dev": true, + "requires": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + } + }, + "p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "dev": true, + "requires": { + "p-try": "^1.0.0" + } + }, + "p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "dev": true, + "requires": { + "p-limit": "^1.1.0" + } + }, + "p-try": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "dev": true + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", "dev": true } } @@ -4366,15 +3308,9 @@ }, "dependencies": { "ci-info": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.1.1.tgz", - "integrity": "sha512-kdRWLBIJwdsYJWYJFtAFFYxybguqeF91qpZaggjG5Nf8QKdizFG2hjqvaTXbxFIcYbSaD74KpAXv6BSm17DHEQ==", - "dev": true - }, - "eslint-visitor-keys": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz", - "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz", + "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==", "dev": true }, "read-pkg-up": { @@ -4406,18 +3342,18 @@ } }, "eslint-rule-docs": { - "version": "1.1.224", - "resolved": "https://registry.npmjs.org/eslint-rule-docs/-/eslint-rule-docs-1.1.224.tgz", - "integrity": "sha512-Rq1Hn4dODLewC8HbCGlQL69VW8ifqldCHHdfhKmU+h+C+Q2wR7WeYcVgz/Wh7E5KUWlmUUKWkBfyYq0Ltrtk3g==", + "version": "1.1.231", + "resolved": "https://registry.npmjs.org/eslint-rule-docs/-/eslint-rule-docs-1.1.231.tgz", + "integrity": "sha512-egHz9A1WG7b8CS0x1P6P/Rj5FqZOjray/VjpJa14tMZalfRKvpE2ONJ3plCM7+PcinmU4tcmbPLv0VtwzSdLVA==", "dev": true }, "eslint-scope": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz", - "integrity": "sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", "dev": true, "requires": { - "esrecurse": "^4.1.0", + "esrecurse": "^4.3.0", "estraverse": "^4.1.1" } }, @@ -4432,14 +3368,6 @@ "eslint-visitor-keys": "^2.0.0", "esquery": "^1.3.1", "multimap": "^1.1.0" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz", - "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==", - "dev": true - } } }, "eslint-utils": { @@ -4449,12 +3377,20 @@ "dev": true, "requires": { "eslint-visitor-keys": "^1.1.0" + }, + "dependencies": { + "eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true + } } }, "eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", "dev": true }, "espree": { @@ -4473,6 +3409,12 @@ "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", "dev": true + }, + "eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true } } }, @@ -4544,16 +3486,6 @@ "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", "dev": true }, - "evp_bytestokey": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", - "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", - "dev": true, - "requires": { - "md5.js": "^1.3.4", - "safe-buffer": "^5.1.1" - } - }, "execa": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", @@ -4811,17 +3743,16 @@ "dev": true }, "fast-glob": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz", - "integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz", + "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==", "dev": true, "requires": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.0", + "glob-parent": "^5.1.2", "merge2": "^1.3.0", - "micromatch": "^4.0.2", - "picomatch": "^2.2.1" + "micromatch": "^4.0.4" } }, "fast-json-stable-stringify": { @@ -4843,9 +3774,9 @@ "dev": true }, "fastq": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz", - "integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.1.tgz", + "integrity": "sha512-HOnr8Mc60eNYl1gzwp6r5RoUyAn5/glBolUzP/Ez6IFVPMPirxn/9phgL6zhOtaTy7ISwPvQ+wT+hfcRZh/bzw==", "dev": true, "requires": { "reusify": "^1.0.4" @@ -4954,9 +3885,9 @@ } }, "flatted": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.1.tgz", - "integrity": "sha512-OMQjaErSFHmHqZe+PSidH5n8j3O0F2DdnVh8JB4j4eUQ2k6KvB0qGfrKIhapvez5JerBbmWkaLYUYWISaESoXg==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz", + "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==", "dev": true }, "for-in": { @@ -4993,9 +3924,9 @@ "dev": true }, "forwarded": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", - "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=" + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==" }, "fragment-cache": { "version": "0.2.1", @@ -5011,12 +3942,6 @@ "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" }, - "fromentries": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz", - "integrity": "sha512-cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==", - "dev": true - }, "front-matter": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/front-matter/-/front-matter-4.0.2.tgz", @@ -5090,12 +4015,6 @@ "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==", "dev": true }, - "get-package-type": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", - "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", - "dev": true - }, "get-set-props": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/get-set-props/-/get-set-props-0.1.0.tgz", @@ -5124,9 +4043,9 @@ "dev": true }, "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "version": "7.1.7", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", + "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", "dev": true, "requires": { "fs.realpath": "^1.0.0", @@ -5168,9 +4087,9 @@ "dev": true }, "globby": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz", - "integrity": "sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==", + "version": "11.0.4", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz", + "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==", "dev": true, "requires": { "array-union": "^2.1.0", @@ -5327,70 +4246,6 @@ "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==", "dev": true }, - "hash-base": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz", - "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==", - "dev": true, - "requires": { - "inherits": "^2.0.4", - "readable-stream": "^3.6.0", - "safe-buffer": "^5.2.0" - }, - "dependencies": { - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true - }, - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true - } - } - }, - "hash.js": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", - "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "minimalistic-assert": "^1.0.1" - } - }, - "hasha": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz", - "integrity": "sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==", - "dev": true, - "requires": { - "is-stream": "^2.0.0", - "type-fest": "^0.8.0" - }, - "dependencies": { - "type-fest": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", - "dev": true - } - } - }, - "hmac-drbg": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", - "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", - "dev": true, - "requires": { - "hash.js": "^1.0.3", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.1" - } - }, "hosted-git-info": { "version": "2.8.9", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", @@ -5421,12 +4276,6 @@ "toidentifier": "1.0.0" } }, - "https-browserify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", - "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=", - "dev": true - }, "human-signals": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", @@ -5612,6 +4461,17 @@ "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==", "dev": true }, + "internal-slot": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz", + "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==", + "dev": true, + "requires": { + "get-intrinsic": "^1.1.0", + "has": "^1.0.3", + "side-channel": "^1.0.4" + } + }, "interpret": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz", @@ -5630,9 +4490,9 @@ "dev": true }, "irregular-plurals": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.2.0.tgz", - "integrity": "sha512-YqTdPLfwP7YFN0SsD3QUVCkm9ZG2VzOXv3DOrw5G5mkMbVwptTwVcFv7/C0vOpBmgTxAeTG19XpUs1E522LW9Q==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.3.0.tgz", + "integrity": "sha512-MVBLKUTangM3EfRPFROhmWQQKRDsrgI83J8GS3jXy+OwYqiR2/aoWndYQ5416jLE3uaGgLH7ncme3X9y09gZ3g==", "dev": true }, "is-absolute": { @@ -5672,9 +4532,9 @@ "dev": true }, "is-bigint": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.1.tgz", - "integrity": "sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz", + "integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==", "dev": true }, "is-binary-path": { @@ -5687,12 +4547,12 @@ } }, "is-boolean-object": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz", - "integrity": "sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz", + "integrity": "sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==", "dev": true, "requires": { - "call-bind": "^1.0.0" + "call-bind": "^1.0.2" } }, "is-buffer": { @@ -5717,9 +4577,9 @@ } }, "is-core-module": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz", - "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.5.0.tgz", + "integrity": "sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==", "dev": true, "requires": { "has": "^1.0.3" @@ -5746,9 +4606,9 @@ } }, "is-date-object": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz", - "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.4.tgz", + "integrity": "sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==", "dev": true }, "is-descriptor": { @@ -5868,9 +4728,9 @@ "dev": true }, "is-number-object": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz", - "integrity": "sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz", + "integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==", "dev": true }, "is-obj": { @@ -5930,13 +4790,13 @@ } }, "is-regex": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz", - "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz", + "integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==", "dev": true, "requires": { "call-bind": "^1.0.2", - "has-symbols": "^1.0.1" + "has-symbols": "^1.0.2" } }, "is-regexp": { @@ -5955,24 +4815,24 @@ } }, "is-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", - "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", "dev": true }, "is-string": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz", - "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz", + "integrity": "sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==", "dev": true }, "is-symbol": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", - "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", + "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", "dev": true, "requires": { - "has-symbols": "^1.0.1" + "has-symbols": "^1.0.2" } }, "is-typedarray": { @@ -6036,96 +4896,15 @@ "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==", "dev": true }, - "istanbul-lib-hook": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz", - "integrity": "sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==", - "dev": true, - "requires": { - "append-transform": "^2.0.0" - } - }, - "istanbul-lib-instrument": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz", - "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==", - "dev": true, - "requires": { - "@babel/core": "^7.7.5", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.0.0", - "semver": "^6.3.0" - } - }, - "istanbul-lib-processinfo": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.2.tgz", - "integrity": "sha512-kOwpa7z9hme+IBPZMzQ5vdQj8srYgAtaRqeI48NGmAQ+/5yKiHLV0QbYqQpxsdEF0+w14SoB8YbnHKcXE2KnYw==", - "dev": true, - "requires": { - "archy": "^1.0.0", - "cross-spawn": "^7.0.0", - "istanbul-lib-coverage": "^3.0.0-alpha.1", - "make-dir": "^3.0.0", - "p-map": "^3.0.0", - "rimraf": "^3.0.0", - "uuid": "^3.3.3" - }, - "dependencies": { - "p-map": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz", - "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==", - "dev": true, - "requires": { - "aggregate-error": "^3.0.0" - } - } - } - }, "istanbul-lib-report": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", - "dev": true, - "requires": { - "istanbul-lib-coverage": "^3.0.0", - "make-dir": "^3.0.0", - "supports-color": "^7.1.0" - } - }, - "istanbul-lib-source-maps": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz", - "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==", + "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", "dev": true, "requires": { - "debug": "^4.1.1", "istanbul-lib-coverage": "^3.0.0", - "source-map": "^0.6.1" - }, - "dependencies": { - "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } + "make-dir": "^3.0.0", + "supports-color": "^7.1.0" } }, "istanbul-reports": { @@ -6331,27 +5110,11 @@ "ms": "2.1.2" } }, - "micromatch": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", - "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", - "dev": true, - "requires": { - "braces": "^3.0.1", - "picomatch": "^2.2.3" - } - }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true - }, - "picomatch": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", - "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", - "dev": true } } }, @@ -6410,12 +5173,6 @@ "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", "dev": true }, - "lodash.flattendeep": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", - "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=", - "dev": true - }, "lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", @@ -6602,26 +5359,15 @@ "blueimp-md5": "^2.10.0" } }, - "md5.js": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", - "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", - "dev": true, - "requires": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1", - "safe-buffer": "^5.1.2" - } - }, "media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" }, "mem": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-8.1.0.tgz", - "integrity": "sha512-FIkgXo0kTi3XpvaznV5Muk6Y6w8SkdmRXcY7ZLonQesuYezp59UooLxAVBcGuN6PH2tXN84mR3vyzSc6oSMUfA==", + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/mem/-/mem-8.1.1.tgz", + "integrity": "sha512-qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA==", "dev": true, "requires": { "map-age-cleaner": "^0.1.3", @@ -6748,31 +5494,13 @@ "dev": true }, "micromatch": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", - "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", + "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", "dev": true, "requires": { "braces": "^3.0.1", - "picomatch": "^2.0.5" - } - }, - "miller-rabin": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", - "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", - "dev": true, - "requires": { - "bn.js": "^4.0.0", - "brorand": "^1.0.1" - }, - "dependencies": { - "bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", - "dev": true - } + "picomatch": "^2.2.3" } }, "mime": { @@ -6781,9 +5509,9 @@ "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" }, "mime-db": { - "version": "1.46.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.46.0.tgz", - "integrity": "sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ==" + "version": "1.49.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz", + "integrity": "sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==" }, "mime-types": { "version": "2.1.32", @@ -6791,13 +5519,6 @@ "integrity": "sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A==", "requires": { "mime-db": "1.49.0" - }, - "dependencies": { - "mime-db": { - "version": "1.49.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz", - "integrity": "sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==" - } } }, "mimic-fn": { @@ -6818,18 +5539,6 @@ "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==", "dev": true }, - "minimalistic-assert": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", - "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", - "dev": true - }, - "minimalistic-crypto-utils": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", - "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=", - "dev": true - }, "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", @@ -6979,101 +5688,10 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, - "node-libs-browser": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz", - "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==", - "dev": true, - "requires": { - "assert": "^1.1.1", - "browserify-zlib": "^0.2.0", - "buffer": "^4.3.0", - "console-browserify": "^1.1.0", - "constants-browserify": "^1.0.0", - "crypto-browserify": "^3.11.0", - "domain-browser": "^1.1.1", - "events": "^3.0.0", - "https-browserify": "^1.0.0", - "os-browserify": "^0.3.0", - "path-browserify": "0.0.1", - "process": "^0.11.10", - "punycode": "^1.2.4", - "querystring-es3": "^0.2.0", - "readable-stream": "^2.3.3", - "stream-browserify": "^2.0.1", - "stream-http": "^2.7.2", - "string_decoder": "^1.0.0", - "timers-browserify": "^2.0.4", - "tty-browserify": "0.0.0", - "url": "^0.11.0", - "util": "^0.11.0", - "vm-browserify": "^1.0.1" - }, - "dependencies": { - "buffer": { - "version": "4.9.2", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz", - "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==", - "dev": true, - "requires": { - "base64-js": "^1.0.2", - "ieee754": "^1.1.4", - "isarray": "^1.0.0" - } - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", - "dev": true - }, - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - }, - "dependencies": { - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - } - } - } - } - }, - "node-preload": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz", - "integrity": "sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==", - "dev": true, - "requires": { - "process-on-spawn": "^1.0.0" - } - }, "node-releases": { - "version": "1.1.71", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz", - "integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==", + "version": "1.1.73", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz", + "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==", "dev": true }, "nodemailer": { @@ -7122,115 +5740,6 @@ "path-key": "^3.0.0" } }, - "nyc": { - "version": "15.1.0", - "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz", - "integrity": "sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==", - "dev": true, - "requires": { - "@istanbuljs/load-nyc-config": "^1.0.0", - "@istanbuljs/schema": "^0.1.2", - "caching-transform": "^4.0.0", - "convert-source-map": "^1.7.0", - "decamelize": "^1.2.0", - "find-cache-dir": "^3.2.0", - "find-up": "^4.1.0", - "foreground-child": "^2.0.0", - "get-package-type": "^0.1.0", - "glob": "^7.1.6", - "istanbul-lib-coverage": "^3.0.0", - "istanbul-lib-hook": "^3.0.0", - "istanbul-lib-instrument": "^4.0.0", - "istanbul-lib-processinfo": "^2.0.2", - "istanbul-lib-report": "^3.0.0", - "istanbul-lib-source-maps": "^4.0.0", - "istanbul-reports": "^3.0.2", - "make-dir": "^3.0.0", - "node-preload": "^0.2.1", - "p-map": "^3.0.0", - "process-on-spawn": "^1.0.0", - "resolve-from": "^5.0.0", - "rimraf": "^3.0.0", - "signal-exit": "^3.0.2", - "spawn-wrap": "^2.0.0", - "test-exclude": "^6.0.0", - "yargs": "^15.0.2" - }, - "dependencies": { - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true - }, - "cliui": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", - "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", - "dev": true, - "requires": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^6.2.0" - } - }, - "p-map": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz", - "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==", - "dev": true, - "requires": { - "aggregate-error": "^3.0.0" - } - }, - "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==", - "dev": true, - "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - } - }, - "y18n": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz", - "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==", - "dev": true - }, - "yargs": { - "version": "15.4.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", - "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", - "dev": true, - "requires": { - "cliui": "^6.0.0", - "decamelize": "^1.2.0", - "find-up": "^4.1.0", - "get-caller-file": "^2.0.1", - "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": "^18.1.2" - } - }, - "yargs-parser": { - "version": "18.1.3", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", - "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } - } - } - }, "obj-props": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/obj-props/-/obj-props-1.3.0.tgz", @@ -7281,9 +5790,9 @@ } }, "object-inspect": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz", - "integrity": "sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz", + "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==", "dev": true }, "object-keys": { @@ -7339,15 +5848,14 @@ } }, "object.values": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.3.tgz", - "integrity": "sha512-nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz", + "integrity": "sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==", "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.2", - "has": "^1.0.3" + "es-abstract": "^1.18.2" } }, "on-finished": { @@ -7412,37 +5920,6 @@ "execa": "^5.0.0", "line-column-path": "^2.0.0", "open": "^7.3.0" - }, - "dependencies": { - "execa": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz", - "integrity": "sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==", - "dev": true, - "requires": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" - } - }, - "get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true - }, - "human-signals": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", - "dev": true - } } }, "opencollective-postinstall": { @@ -7475,9 +5952,9 @@ } }, "ora": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.0.tgz", - "integrity": "sha512-1StwyXQGoU6gdjYkyVcqOLnVlbKj+6yPNNOxJVgpt9t4eksKjiriiHuxktLYkgllwk+D6MbC4ihH84L1udRXPg==", + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", + "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", "dev": true, "requires": { "bl": "^4.1.0", @@ -7491,12 +5968,6 @@ "wcwidth": "^1.0.1" } }, - "os-browserify": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", - "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=", - "dev": true - }, "p-cancelable": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", @@ -7572,18 +6043,6 @@ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "dev": true }, - "package-hash": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz", - "integrity": "sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.15", - "hasha": "^5.0.0", - "lodash.flattendeep": "^4.4.0", - "release-zalgo": "^1.0.0" - } - }, "package-json": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz", @@ -7596,12 +6055,6 @@ "semver": "^6.2.0" } }, - "pako": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", - "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", - "dev": true - }, "parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -7611,19 +6064,6 @@ "callsites": "^3.0.0" } }, - "parse-asn1": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz", - "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==", - "dev": true, - "requires": { - "asn1.js": "^5.2.0", - "browserify-aes": "^1.0.0", - "evp_bytestokey": "^1.0.0", - "pbkdf2": "^3.0.3", - "safe-buffer": "^5.1.1" - } - }, "parse-json": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", @@ -7669,12 +6109,6 @@ "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", "dev": true }, - "path-browserify": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz", - "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==", - "dev": true - }, "path-dirname": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", @@ -7732,9 +6166,9 @@ } }, "path-parse": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", "dev": true }, "path-to-regexp": { @@ -7748,23 +6182,10 @@ "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", "dev": true }, - "pbkdf2": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz", - "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==", - "dev": true, - "requires": { - "create-hash": "^1.1.2", - "create-hmac": "^1.1.4", - "ripemd160": "^2.0.1", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" - } - }, "picomatch": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", - "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", + "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", "dev": true }, "pify": { @@ -7792,25 +6213,94 @@ "locate-path": "^3.0.0" } }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "requires": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + } + }, + "p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "requires": { + "p-limit": "^2.0.0" + } + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + } + } + }, + "pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "requires": { + "find-up": "^4.0.0" + } + }, + "pkg-up": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz", + "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=", + "dev": true, + "requires": { + "find-up": "^2.1.0" + }, + "dependencies": { + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "^2.0.0" + } + }, + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "dev": true, + "requires": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + } + }, + "p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", "dev": true, "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" + "p-try": "^1.0.0" } }, "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "dev": true, "requires": { - "p-limit": "^2.0.0" + "p-limit": "^1.1.0" } }, + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "dev": true + }, "path-exists": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", @@ -7819,15 +6309,6 @@ } } }, - "pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "dev": true, - "requires": { - "find-up": "^4.0.0" - } - }, "please-upgrade-node": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz", @@ -7871,9 +6352,9 @@ "dev": true }, "prettier": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz", - "integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz", + "integrity": "sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==", "dev": true }, "prettier-linter-helpers": { @@ -7894,27 +6375,6 @@ "parse-ms": "^2.1.0" } }, - "process": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", - "dev": true - }, - "process-nextick-args": { - "version": "2.0.1", - "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 - }, - "process-on-spawn": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.0.0.tgz", - "integrity": "sha512-1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==", - "dev": true, - "requires": { - "fromentries": "^1.2.0" - } - }, "progress": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", @@ -7928,36 +6388,14 @@ "dev": true }, "proxy-addr": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz", - "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", "requires": { - "forwarded": "~0.1.2", + "forwarded": "0.2.0", "ipaddr.js": "1.9.1" } }, - "public-encrypt": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz", - "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", - "dev": true, - "requires": { - "bn.js": "^4.1.0", - "browserify-rsa": "^4.0.0", - "create-hash": "^1.1.0", - "parse-asn1": "^5.0.0", - "randombytes": "^2.0.1", - "safe-buffer": "^5.1.2" - }, - "dependencies": { - "bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", - "dev": true - } - } - }, "pump": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", @@ -7988,18 +6426,6 @@ "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" }, - "querystring": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", - "dev": true - }, - "querystring-es3": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", - "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=", - "dev": true - }, "queue": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/queue/-/queue-6.0.2.tgz", @@ -8034,16 +6460,6 @@ "safe-buffer": "^5.1.0" } }, - "randomfill": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", - "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", - "dev": true, - "requires": { - "randombytes": "^2.0.5", - "safe-buffer": "^5.1.0" - } - }, "range-parser": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", @@ -8113,13 +6529,13 @@ } }, "read-pkg-up": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", - "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz", + "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=", "dev": true, "requires": { "find-up": "^2.0.0", - "read-pkg": "^2.0.0" + "read-pkg": "^3.0.0" }, "dependencies": { "find-up": { @@ -8132,14 +6548,14 @@ } }, "load-json-file": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", - "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", + "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", "dev": true, "requires": { "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", + "parse-json": "^4.0.0", + "pify": "^3.0.0", "strip-bom": "^3.0.0" } }, @@ -8177,15 +6593,6 @@ "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", "dev": true }, - "parse-json": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", - "dev": true, - "requires": { - "error-ex": "^1.2.0" - } - }, "path-exists": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", @@ -8193,29 +6600,29 @@ "dev": true }, "path-type": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", - "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", + "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", "dev": true, "requires": { - "pify": "^2.0.0" + "pify": "^3.0.0" } }, "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", "dev": true }, "read-pkg": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", - "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", + "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=", "dev": true, "requires": { - "load-json-file": "^2.0.0", + "load-json-file": "^4.0.0", "normalize-package-data": "^2.3.2", - "path-type": "^2.0.0" + "path-type": "^3.0.0" } } } @@ -8232,9 +6639,9 @@ } }, "readdirp": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", - "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", "dev": true, "requires": { "picomatch": "^2.2.1" @@ -8278,9 +6685,9 @@ "dev": true }, "regexpp": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz", - "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", + "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", "dev": true }, "registry-auth-token": { @@ -8301,15 +6708,6 @@ "rc": "^1.2.8" } }, - "release-zalgo": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz", - "integrity": "sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=", - "dev": true, - "requires": { - "es6-error": "^4.0.1" - } - }, "repeat-element": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz", @@ -8333,12 +6731,6 @@ "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", "dev": true }, - "require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", - "dev": true - }, "reserved-words": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/reserved-words/-/reserved-words-0.1.2.tgz", @@ -8416,16 +6808,6 @@ "glob": "^7.1.3" } }, - "ripemd160": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz", - "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", - "dev": true, - "requires": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1" - } - }, "rndm": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz", @@ -8477,14 +6859,6 @@ "@types/json-schema": "^7.0.8", "ajv": "^6.12.5", "ajv-keywords": "^3.5.2" - }, - "dependencies": { - "@types/json-schema": { - "version": "7.0.8", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz", - "integrity": "sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg==", - "dev": true - } } }, "semver": { @@ -8578,12 +6952,6 @@ "send": "0.17.1" } }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "dev": true - }, "set-value": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", @@ -8622,27 +6990,11 @@ } } }, - "setimmediate": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=", - "dev": true - }, "setprototypeof": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" }, - "sha.js": { - "version": "2.4.11", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", - "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", - "dev": true, - "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } - }, "shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -8988,20 +7340,6 @@ "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==", "dev": true }, - "spawn-wrap": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-2.0.0.tgz", - "integrity": "sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==", - "dev": true, - "requires": { - "foreground-child": "^2.0.0", - "is-windows": "^1.0.2", - "make-dir": "^3.0.0", - "rimraf": "^3.0.0", - "signal-exit": "^3.0.2", - "which": "^2.0.1" - } - }, "spdx-correct": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", @@ -9029,9 +7367,9 @@ } }, "spdx-license-ids": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz", - "integrity": "sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==", + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz", + "integrity": "sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ==", "dev": true }, "split-string": { @@ -9091,93 +7429,6 @@ "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" }, - "stream-browserify": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz", - "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==", - "dev": true, - "requires": { - "inherits": "~2.0.1", - "readable-stream": "^2.0.2" - }, - "dependencies": { - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - } - } - }, - "stream-http": { - "version": "2.8.3", - "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz", - "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==", - "dev": true, - "requires": { - "builtin-status-codes": "^3.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.3.6", - "to-arraybuffer": "^1.0.0", - "xtend": "^4.0.0" - }, - "dependencies": { - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - } - } - }, "streamsearch": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz", @@ -9547,15 +7798,6 @@ "integrity": "sha1-mcW/VZWJZq9tBtg73zgA3IL67F0=", "dev": true }, - "timers-browserify": { - "version": "2.0.12", - "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz", - "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==", - "dev": true, - "requires": { - "setimmediate": "^1.0.4" - } - }, "to-absolute-glob": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz", @@ -9572,12 +7814,6 @@ "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=", "dev": true }, - "to-arraybuffer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", - "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=", - "dev": true - }, "to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", @@ -9668,26 +7904,14 @@ } }, "tsconfig-paths": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz", - "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==", + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.10.1.tgz", + "integrity": "sha512-rETidPDgCpltxF7MjBZlAFPUHv5aHH2MymyPvh+vEyWAED4Eb/WeMbsnD/JDr4OKPOA1TssDHgIcpTN5Kh0p6Q==", "dev": true, "requires": { - "@types/json5": "^0.0.29", - "json5": "^1.0.1", + "json5": "^2.2.0", "minimist": "^1.2.0", "strip-bom": "^3.0.0" - }, - "dependencies": { - "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", - "dev": true, - "requires": { - "minimist": "^1.2.0" - } - } } }, "tslib": { @@ -9710,12 +7934,6 @@ "tslib": "^1.8.1" } }, - "tty-browserify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", - "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", - "dev": true - }, "type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", @@ -9750,9 +7968,9 @@ } }, "typescript": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz", - "integrity": "sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==", + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz", + "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==", "dev": true }, "uid-safe": { @@ -9934,24 +8152,6 @@ "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", "dev": true }, - "url": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", - "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", - "dev": true, - "requires": { - "punycode": "1.3.2", - "querystring": "0.2.0" - }, - "dependencies": { - "punycode": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", - "dev": true - } - } - }, "url-parse-lax": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", @@ -9967,15 +8167,6 @@ "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==", "dev": true }, - "util": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz", - "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==", - "dev": true, - "requires": { - "inherits": "2.0.3" - } - }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -9997,18 +8188,31 @@ "extend": "~3.0.0" } }, - "uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "dev": true - }, "v8-compile-cache": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", "dev": true }, + "v8-to-istanbul": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.0.0.tgz", + "integrity": "sha512-LkmXi8UUNxnCC+JlH7/fsfsKr5AU110l+SYGJimWNkWhxbN5EyeOtm1MJ0hhvqMMOhGwBj1Fp70Yv9i+hX0QAg==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.1", + "convert-source-map": "^1.6.0", + "source-map": "^0.7.3" + }, + "dependencies": { + "source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", + "dev": true + } + } + }, "validate-npm-package-license": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", @@ -10024,12 +8228,6 @@ "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" }, - "vm-browserify": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", - "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==", - "dev": true - }, "watchpack": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.2.0.tgz", @@ -10078,30 +8276,12 @@ "terser-webpack-plugin": "^5.1.3", "watchpack": "^2.2.0", "webpack-sources": "^3.1.1" - }, - "dependencies": { - "acorn": { - "version": "8.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz", - "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==", - "dev": true - }, - "eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", - "dev": true, - "requires": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" - } - } } }, "webpack-sources": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.1.1.tgz", - "integrity": "sha512-ztUmIWq0LWaw+1YyR3bXtUPjt8vQedtI9WxGn/q1V1ASHsombnaso7MN9S25lzKS/OuC9Q8lEg3GsZexjDbdlQ==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.1.2.tgz", + "integrity": "sha512-//DeuK5SzM6yFRXNOGK+4tX7QB8PghkL8kFBPyqSlN62oJOUkmby8ptV7+IBGH6BkIuIw5Rjd7OvvwZaoiF4ag==", "dev": true }, "well-known-symbols": { @@ -10132,12 +8312,6 @@ "is-symbol": "^1.0.3" } }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", - "dev": true - }, "which-pm-runs": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz", @@ -10209,9 +8383,9 @@ "dev": true }, "xmlhttprequest-ssl": { - "version": "1.5.5", - "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz", - "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.3.tgz", + "integrity": "sha512-3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q==", "dev": true }, "xo": { @@ -10310,9 +8484,9 @@ } }, "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", "dev": true, "requires": { "ms": "2.1.2" @@ -10483,51 +8657,6 @@ "p-locate": "^5.0.0" } }, - "micromatch": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", - "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", - "dev": true, - "requires": { - "braces": "^3.0.1", - "picomatch": "^2.2.3" - }, - "dependencies": { - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, - "requires": { - "fill-range": "^7.0.1" - } - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "requires": { - "is-number": "^7.0.0" - } - } - } - }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -10569,12 +8698,6 @@ } } }, - "picomatch": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz", - "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==", - "dev": true - }, "semver": { "version": "7.3.5", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", @@ -10596,12 +8719,6 @@ } } }, - "xtend": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", - "dev": true - }, "y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", @@ -10634,9 +8751,9 @@ } }, "yargs-parser": { - "version": "20.2.7", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz", - "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==" + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==" }, "yeast": { "version": "0.1.2", diff --git a/package.json b/package.json index c3285cc2..8c81248f 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "version": "0.1.4", "license": "MPL-2.0", "description": "Node.js framework for faster-than-light web development.", + "type": "module", "keywords": [ "framework", "server", @@ -52,13 +53,12 @@ "@babel/eslint-parser": "^7.13.4", "@sapling/sapling": "file:.", "ava": "^3.15.0", - "babel-eslint": "^10.1.0", + "c8": "^7.8.0", "eslint": "^7.22.0", "husky": "4.3.8", "lint-staged": ">=10", "maildev": "^1.1.0", "mime-types": "^2.1.29", - "nyc": "^15.1.0", "supertest": "^6.1.3", "webpack": "^5.28.0", "xo": "^0.39.1" @@ -70,8 +70,8 @@ "precommit": "lint-staged", "lint-fix": "xo --fix", "lint": "xo", - "test": "nyc ava", - "test:report": "nyc --reporter=lcov npm test", + "test": "npx c8 ava", + "test:report": "npx c8 --reporter=lcov npm test", "test:send": "npx codecov" }, "xo": { @@ -81,7 +81,10 @@ "node_modules/**/*.*", "test/**/*.*" ], - "parser": "babel-eslint", + "parser": "@babel/eslint-parser", + "parserOptions": { + "requireConfigFile": false + }, "rules": { "max-params": [ "warn", diff --git a/test/_utils/app.js b/test/_utils/app.js index dcd7b4ed..0eb24f2f 100644 --- a/test/_utils/app.js +++ b/test/_utils/app.js @@ -1,9 +1,11 @@ -const path = require('path'); -const Utils = require('../../lib/Utils'); +import path from 'path'; +import { fileURLToPath } from 'url'; -module.exports = () => { +import Utils from '../../lib/Utils.js'; + +export default () => { const app = { - dir: path.join(__dirname, '../../'), + dir: path.join(path.dirname(fileURLToPath(import.meta.url)), '../../'), config: { render: { driver: 'html' diff --git a/test/_utils/request.js b/test/_utils/request.js index d75c9b88..b4f8ac29 100644 --- a/test/_utils/request.js +++ b/test/_utils/request.js @@ -1,4 +1,4 @@ -module.exports = () => { +export default () => { return { xhr: true, method: 'GET', diff --git a/test/_utils/response.js b/test/_utils/response.js index 40e98d88..14428926 100644 --- a/test/_utils/response.js +++ b/test/_utils/response.js @@ -1,4 +1,4 @@ -module.exports = () => { +export default () => { const response = {}; response.redirect = () => { diff --git a/test/core/initRoute.test.js b/test/core/initRoute.test.js index b81d7126..a0684408 100644 --- a/test/core/initRoute.test.js +++ b/test/core/initRoute.test.js @@ -1,21 +1,22 @@ -const test = require('ava'); +import test from 'ava'; -const Response = require('../../lib/Response'); -const SaplingError = require('../../lib/SaplingError'); -const Templating = require('../../lib/Templating'); +import Response from '../../lib/Response.js'; +import SaplingError from '../../lib/SaplingError.js'; +import Templating from '../../lib/Templating.js'; -const initRoute = require('../../core/initRoute'); +import runHook from '../../core/runHook.js'; +import initRoute from '../../core/initRoute.js'; -test.beforeEach(t => { - t.context.app = require('../_utils/app')(); +test.beforeEach(async t => { + t.context.app = (await import('../_utils/app.js')).default(); - t.context.app.runHook = require('../../core/runHook'); + t.context.app.runHook = runHook; t.context.app.templating = new Templating(t.context.app); - t.context.request = require('../_utils/request')(); - t.context.response = require('../_utils/response')(); + t.context.request = (await import('../_utils/request.js')).default(); + t.context.response = (await import('../_utils/response.js')).default(); }); diff --git a/test/core/loadConfig.test.js b/test/core/loadConfig.test.js index d7621ec3..a8ac1df8 100644 --- a/test/core/loadConfig.test.js +++ b/test/core/loadConfig.test.js @@ -1,13 +1,17 @@ -const test = require('ava'); -const path = require('path'); +import test from 'ava'; +import path from 'path'; +import { fileURLToPath } from 'url'; -const SaplingError = require('../../lib/SaplingError'); +import SaplingError from '../../lib/SaplingError.js'; -const loadConfig = require('../../core/loadConfig'); +import loadConfig from '../../core/loadConfig.js'; -test.beforeEach(t => { - t.context.app = require('../_utils/app')(); +const __dirname = path.dirname(fileURLToPath(import.meta.url)); + + +test.beforeEach(async t => { + t.context.app = (await import('../_utils/app.js')).default(); process.env.NODE_ENV = 'test'; }); diff --git a/test/core/loadController.test.js b/test/core/loadController.test.js index a2e9d708..0cff1cd5 100644 --- a/test/core/loadController.test.js +++ b/test/core/loadController.test.js @@ -1,18 +1,22 @@ -const test = require('ava'); -const path = require('path'); -const _ = require('underscore'); +import test from 'ava'; +import path from 'path'; +import _ from 'underscore'; +import { fileURLToPath } from 'url'; -const loadController = require('../../core/loadController'); +import loadController from '../../core/loadController.js'; -test.beforeEach(t => { +const __dirname = path.dirname(fileURLToPath(import.meta.url)); + + +test.beforeEach(async t => { t.context.app = _.defaults({ dir: path.join(__dirname, '../_data') - }, require('../_utils/app')()); + }, (await import('../_utils/app.js')).default()); }); -test('generates a controller from a plain view directory', async t => { +test.serial('generates a controller from a plain view directory', async t => { t.plan(1); t.context.app.config.autoRouting = true; @@ -27,7 +31,7 @@ test('generates a controller from a plain view directory', async t => { }); }); -test('generates a controller from a view directory with protected files', async t => { +test.serial('generates a controller from a view directory with protected files', async t => { t.plan(1); t.context.app.config.autoRouting = true; @@ -42,7 +46,7 @@ test('generates a controller from a view directory with protected files', async }); }); -test('generates a controller from a view directory with protected folders', async t => { +test.serial('generates a controller from a view directory with protected folders', async t => { t.plan(1); t.context.app.config.autoRouting = true; @@ -57,7 +61,7 @@ test('generates a controller from a view directory with protected folders', asyn }); }); -test('does not generate a controller from an improper directory', async t => { +test.serial('does not generate a controller from an improper directory', async t => { t.plan(1); t.context.app.config.autoRouting = true; @@ -73,13 +77,13 @@ test('does not generate a controller from an improper directory', async t => { }); -test('loads a controller file correctly', t => { +test.serial('loads a controller file correctly', async t => { t.plan(1); t.context.app.config.autoRouting = false; t.context.app.config.routes = 'controller/controller.json'; - loadController.call(t.context.app, () => { + await loadController.call(t.context.app, () => { t.deepEqual( t.context.app.controller, { '/': 'index', '/my-account': 'my-account' } @@ -87,7 +91,7 @@ test('loads a controller file correctly', t => { }); }); -test('logs an error if controller file is mangled', async t => { +test.serial('logs an error if controller file is mangled', async t => { t.plan(2); process.env.NODE_ENV = 'production'; @@ -106,7 +110,7 @@ test('logs an error if controller file is mangled', async t => { }); }); -test('fails silently if controller file does not exist', async t => { +test.serial('fails silently if controller file does not exist', async t => { t.plan(1); t.context.app.config.autoRouting = false; @@ -121,7 +125,7 @@ test('fails silently if controller file does not exist', async t => { }); }); -test('fails silently if controller file is a directory', async t => { +test.serial('fails silently if controller file is a directory', async t => { t.plan(1); t.context.app.config.autoRouting = false; @@ -136,7 +140,7 @@ test('fails silently if controller file is a directory', async t => { }); }); -test('fails silently if controller file is undefined', async t => { +test.serial('fails silently if controller file is undefined', async t => { t.plan(1); t.context.app.config.autoRouting = false; @@ -151,7 +155,7 @@ test('fails silently if controller file is undefined', async t => { }); -test('merges autorouted and explicit controllers correctly', async t => { +test.serial('merges autorouted and explicit controllers correctly', async t => { t.plan(1); t.context.app.config.autoRouting = true; diff --git a/test/core/loadCustomTags.test.js b/test/core/loadCustomTags.test.js index 25daba77..197941dd 100644 --- a/test/core/loadCustomTags.test.js +++ b/test/core/loadCustomTags.test.js @@ -1,14 +1,19 @@ -const test = require('ava'); -const _ = require('underscore'); +import test from 'ava'; +import _ from 'underscore'; +import path from 'path'; +import { fileURLToPath } from 'url'; -const Storage = require('../../lib/Storage'); -const User = require('../../lib/User'); +import Storage from '../../lib/Storage.js'; +import User from '../../lib/User.js'; -const loadCustomTags = require('../../core/loadCustomTags'); +import loadCustomTags from '../../core/loadCustomTags.js'; -test.beforeEach(t => { - t.context.app = require('../_utils/app')(); +const __dirname = path.dirname(fileURLToPath(import.meta.url)); + + +test.beforeEach(async t => { + t.context.app = (await import('../_utils/app.js')).default(); t.context.app.templating = { renderer: { @@ -24,6 +29,7 @@ test.beforeEach(t => { config: { db: { driver: 'Memory' } }, dir: __dirname }); + await t.context.app.storage.importDriver(); }); diff --git a/test/core/loadHooks.test.js b/test/core/loadHooks.test.js index 98af7892..0a43b9d0 100644 --- a/test/core/loadHooks.test.js +++ b/test/core/loadHooks.test.js @@ -1,25 +1,32 @@ -const test = require('ava'); -const fs = require('fs'); -const path = require('path'); +import test from 'ava'; +import fs from 'fs'; +import path from 'path'; +import { fileURLToPath } from 'url'; -const loadHooks = require('../../core/loadHooks'); -const SaplingError = require('../../lib/SaplingError'); +import SaplingError from '../../lib/SaplingError.js'; +import parseMethodRouteKey from '../../core/parseMethodRouteKey.js'; +import runHook from '../../core/runHook.js'; + +import loadHooks from '../../core/loadHooks.js'; + + +const __dirname = path.dirname(fileURLToPath(import.meta.url)); test.before(t => { fs.chmodSync(path.join(__dirname, '../_data/hooks/inaccessible.json'), 0o100); }); -test.beforeEach(t => { - t.context.app = require('../_utils/app')(); +test.beforeEach(async t => { + t.context.app = (await import('../_utils/app.js')).default(); t.context.app.controller = {}; t.context.app.config.hooks = 'test/_data/hooks/get.json'; - t.context.app.parseMethodRouteKey = require('../../core/parseMethodRouteKey'); - t.context.app.runHook = require('../../core/runHook'); + t.context.app.parseMethodRouteKey = parseMethodRouteKey; + t.context.app.runHook = runHook; - t.context.request = require('../_utils/request')(); - t.context.response = require('../_utils/response')(); + t.context.request = (await import('../_utils/request.js')).default(); + t.context.response = (await import('../_utils/response.js')).default(); }); diff --git a/test/core/loadModel.test.js b/test/core/loadModel.test.js index 6870e048..1c9d4c6a 100644 --- a/test/core/loadModel.test.js +++ b/test/core/loadModel.test.js @@ -1,10 +1,10 @@ -const test = require('ava'); -const _ = require('underscore'); -const path = require('path'); +import test from 'ava'; +import _ from 'underscore'; +import path from 'path'; -const SaplingError = require('../../lib/SaplingError'); +import SaplingError from '../../lib/SaplingError.js'; -const loadModel = require('../../core/loadModel'); +import loadModel from '../../core/loadModel.js'; test.before(t => { @@ -12,10 +12,10 @@ test.before(t => { console.log = () => true; }); -test.beforeEach(t => { +test.beforeEach(async t => { t.context.app = _.defaults({ config: { db: { driver: 'Memory' } } - }, require('../_utils/app')()); + }, (await import('../_utils/app.js')).default()); }); diff --git a/test/core/loadModules.test.js b/test/core/loadModules.test.js index 579d7eda..c9ee471b 100644 --- a/test/core/loadModules.test.js +++ b/test/core/loadModules.test.js @@ -1,15 +1,15 @@ -const test = require('ava'); -const _ = require('underscore'); +import test from 'ava'; +import _ from 'underscore'; -const Notifications = require('../../lib/Notifications'); -const Uploads = require('../../lib/Uploads'); -const User = require('../../lib/User'); +import Notifications from '../../lib/Notifications.js'; +import Uploads from '../../lib/Uploads.js'; +import User from '../../lib/User.js'; -const loadModules = require('../../core/loadModules'); +import loadModules from '../../core/loadModules.js'; -test.beforeEach(t => { - t.context.app = require('../_utils/app')(); +test.beforeEach(async t => { + t.context.app = (await import('../_utils/app.js')).default(); }); diff --git a/test/core/loadPermissions.test.js b/test/core/loadPermissions.test.js index 6155c706..cfc7347b 100644 --- a/test/core/loadPermissions.test.js +++ b/test/core/loadPermissions.test.js @@ -1,21 +1,26 @@ -const test = require('ava'); -const path = require('path'); -const _ = require('underscore'); +import test from 'ava'; +import path from 'path'; +import _ from 'underscore'; +import { fileURLToPath } from 'url'; -const Response = require('../../lib/Response'); -const SaplingError = require('../../lib/SaplingError'); -const Storage = require('../../lib/Storage'); -const User = require('../../lib/User'); +import Response from '../../lib/Response.js'; +import SaplingError from '../../lib/SaplingError.js'; +import Storage from '../../lib/Storage.js'; +import User from '../../lib/User.js'; +import parseMethodRouteKey from '../../core/parseMethodRouteKey.js'; -const loadPermissions = require('../../core/loadPermissions'); +import loadPermissions from '../../core/loadPermissions.js'; -test.beforeEach(t => { - t.context.app = require('../_utils/app')(); +const __dirname = path.dirname(fileURLToPath(import.meta.url)); + + +test.beforeEach(async t => { + t.context.app = (await import('../_utils/app.js')).default(); t.context.app.dir = path.join(__dirname, '../_data/permissions'); t.context.app.config.permissions = 'string.json'; - t.context.app.parseMethodRouteKey = require('../../core/parseMethodRouteKey'); + t.context.app.parseMethodRouteKey = parseMethodRouteKey; t.context.app.user = new User(t.context.app); @@ -25,9 +30,10 @@ test.beforeEach(t => { config: { db: { driver: 'Memory' } }, dir: __dirname }); + await t.context.app.storage.importDriver(); - t.context.request = require('../_utils/request')(); - t.context.response = require('../_utils/response')(); + t.context.request = (await import('../_utils/request.js')).default(); + t.context.response = (await import('../_utils/response.js')).default(); }); diff --git a/test/core/loadRest.test.js b/test/core/loadRest.test.js index b23ea0fe..a72dc678 100644 --- a/test/core/loadRest.test.js +++ b/test/core/loadRest.test.js @@ -1,34 +1,46 @@ -const test = require('ava'); -const _ = require('underscore'); -const express = require('express'); -const request = require('supertest'); +import test from 'ava'; +import _ from 'underscore'; +import express from 'express'; +import session from 'express-session'; +import bodyParser from 'body-parser'; +import request from 'supertest'; +import path from 'path'; +import { fileURLToPath } from 'url'; -const Storage = require('../../lib/Storage'); -const User = require('../../lib/User'); +import Storage from '../../lib/Storage.js'; +import User from '../../lib/User.js'; +import runHook from '../../core/runHook.js'; -const loadRest = require('../../core/loadRest'); +import loadRest from '../../core/loadRest.js'; -test.beforeEach(t => { +const __dirname = path.dirname(fileURLToPath(import.meta.url)); + + +test.beforeEach(async t => { t.context.app = _.extend({ name: 'test' - }, require('../_utils/app')()); + }, (await import('../_utils/app.js')).default()); t.context.app.server = express(); + t.context.app.server.use(session({ secret: 'abc', resave: false, saveUninitialized: true, cookie: { maxAge: null } })); + t.context.app.server.use(bodyParser.urlencoded({ extended: true })); + t.context.app.server.use(bodyParser.json()); t.context.app.storage = new Storage(t.context.app, { name: 'test', - schema: {}, + schema: { posts: { title: { type: 'string' } } }, config: { db: { driver: 'Memory' } }, dir: __dirname }); + await t.context.app.storage.importDriver(); t.context.app.user = new User(t.context.app); - t.context.app.runHook = require('../../core/runHook'); + t.context.app.runHook = runHook; - t.context.request = require('../_utils/request')(); - t.context.response = require('../_utils/response')(); + t.context.request = (await import('../_utils/request.js')).default(); + t.context.response = (await import('../_utils/response.js')).default(); }); @@ -47,8 +59,7 @@ test.serial.cb('loads get endpoints', t => { }); }); -/* Hangs on line 693 of Storage.js for some reason */ -test.serial.cb.skip('loads post endpoints', t => { +test.serial.cb('loads post endpoints', t => { t.plan(2); t.notThrows(() => { @@ -57,7 +68,7 @@ test.serial.cb.skip('loads post endpoints', t => { request(t.context.app.server) .post('/data/posts') - .send({ title: 'Hello' }) + .send('title=Hello') .set('Accept', 'application/json') .expect(200, (error, response) => { t.is(response.status, 200); @@ -80,7 +91,7 @@ test.serial.cb('loads delete endpoints', t => { }); }); -test('calls callback when specified', async t => { +test.serial('calls callback when specified', async t => { await loadRest.call(t.context.app, () => { t.pass(); }); diff --git a/test/core/loadServer.test.js b/test/core/loadServer.test.js index 96edd7f6..44b80dc2 100644 --- a/test/core/loadServer.test.js +++ b/test/core/loadServer.test.js @@ -1,7 +1,7 @@ -const test = require('ava'); -const request = require('supertest'); +import test from 'ava'; +import request from 'supertest'; -const loadServer = require('../../core/loadServer'); +import loadServer from '../../core/loadServer.js'; const cookies = response => { @@ -11,8 +11,8 @@ const cookies = response => { }; -test.beforeEach(t => { - t.context.app = require('../_utils/app')(); +test.beforeEach(async t => { + t.context.app = (await import('../_utils/app.js')).default(); t.context.app.config = { sessionStore: { diff --git a/test/core/parseMethodRouteKey.test.js b/test/core/parseMethodRouteKey.test.js index 993dbb61..1dc66011 100644 --- a/test/core/parseMethodRouteKey.test.js +++ b/test/core/parseMethodRouteKey.test.js @@ -1,8 +1,8 @@ -const test = require('ava'); +import test from 'ava'; -const SaplingError = require('../../lib/SaplingError'); +import SaplingError from '../../lib/SaplingError.js'; -const parseMethodRouteKey = require('../../core/parseMethodRouteKey'); +import parseMethodRouteKey from '../../core/parseMethodRouteKey.js'; test('parses uppercase GET correctly', t => { diff --git a/test/core/runHook.test.js b/test/core/runHook.test.js index 55992893..fa0c4bec 100644 --- a/test/core/runHook.test.js +++ b/test/core/runHook.test.js @@ -1,18 +1,24 @@ -const test = require('ava'); -const _ = require('underscore'); +import test from 'ava'; +import _ from 'underscore'; +import path from 'path'; +import { fileURLToPath } from 'url'; -const runHook = require('../../core/runHook'); +import parseMethodRouteKey from '../../core/parseMethodRouteKey.js'; +import runHook from '../../core/runHook.js'; -test.beforeEach(t => { +const __dirname = path.dirname(fileURLToPath(import.meta.url)); + + +test.beforeEach(async t => { t.context.app = _.defaults({ dir: __dirname - }, require('../_utils/app')()); + }, (await import('../_utils/app.js')).default()); - t.context.app.parseMethodRouteKey = require('../../core/parseMethodRouteKey'); + t.context.app.parseMethodRouteKey = parseMethodRouteKey; - t.context.request = require('../_utils/request')(); - t.context.response = require('../_utils/response')(); + t.context.request = (await import('../_utils/request.js')).default(); + t.context.response = (await import('../_utils/response.js')).default(); }); diff --git a/test/drivers/db/Interface.test.js b/test/drivers/db/Interface.test.js index 2ba1fa7e..f71fe4c9 100644 --- a/test/drivers/db/Interface.test.js +++ b/test/drivers/db/Interface.test.js @@ -1,8 +1,8 @@ -const test = require('ava'); +import test from 'ava'; -const SaplingError = require('../../../lib/SaplingError'); +import SaplingError from '../../../lib/SaplingError.js'; -const Interface = require('../../../drivers/db/Interface'); +import Interface from '../../../drivers/db/Interface.js'; test.before(t => { diff --git a/test/drivers/db/Memory.test.js b/test/drivers/db/Memory.test.js index 171f868a..00f33fb4 100644 --- a/test/drivers/db/Memory.test.js +++ b/test/drivers/db/Memory.test.js @@ -1,8 +1,8 @@ -const test = require('ava'); +import test from 'ava'; -const SaplingError = require('../../../lib/SaplingError'); +import SaplingError from '../../../lib/SaplingError.js'; -const Memory = require('../../../drivers/db/Memory'); +import Memory from '../../../drivers/db/Memory.js'; test.before(t => { diff --git a/test/drivers/render/Html.test.js b/test/drivers/render/Html.test.js index 3eb38319..b1deeb11 100644 --- a/test/drivers/render/Html.test.js +++ b/test/drivers/render/Html.test.js @@ -1,9 +1,13 @@ -const test = require('ava'); -const path = require('path'); +import test from 'ava'; +import path from 'path'; +import { fileURLToPath } from 'url'; -const SaplingError = require('../../../lib/SaplingError'); +import SaplingError from '../../../lib/SaplingError.js'; -const Html = require('../../../drivers/render/Html'); +import Html from '../../../drivers/render/Html.js'; + + +const __dirname = path.dirname(fileURLToPath(import.meta.url)); test.before(t => { diff --git a/test/drivers/render/Interface.test.js b/test/drivers/render/Interface.test.js index e76d47ee..1ebd8347 100644 --- a/test/drivers/render/Interface.test.js +++ b/test/drivers/render/Interface.test.js @@ -1,8 +1,8 @@ -const test = require('ava'); +import test from 'ava'; -const SaplingError = require('../../../lib/SaplingError'); +import SaplingError from '../../../lib/SaplingError.js'; -const Interface = require('../../../drivers/render/Interface'); +import Interface from '../../../drivers/render/Interface.js'; test.before(t => { diff --git a/test/hooks/model/retrieve.test.js b/test/hooks/model/retrieve.test.js index c676f4c6..558cead3 100644 --- a/test/hooks/model/retrieve.test.js +++ b/test/hooks/model/retrieve.test.js @@ -1,14 +1,19 @@ -const test = require('ava'); -const _ = require('underscore'); +import test from 'ava'; +import _ from 'underscore'; +import path from 'path'; +import { fileURLToPath } from 'url'; -const Response = require('../../../lib/Response'); -const SaplingError = require('../../../lib/SaplingError'); -const Storage = require('../../../lib/Storage'); +import Response from '../../../lib/Response.js'; +import SaplingError from '../../../lib/SaplingError.js'; +import Storage from '../../../lib/Storage.js'; -const retrieve = require('../../../hooks/sapling/model/retrieve'); +import retrieve from '../../../hooks/sapling/model/retrieve.js'; -test.beforeEach(t => { +const __dirname = path.dirname(fileURLToPath(import.meta.url)); + + +test.beforeEach(async t => { t.context.app = _.defaults({ storage: new Storage({}, { name: 'test', @@ -16,10 +21,11 @@ test.beforeEach(t => { config: { db: { driver: 'Memory' } }, dir: __dirname }) - }, require('../../_utils/app')()); + }, (await import('../../_utils/app.js')).default()); + await t.context.app.storage.importDriver(); - t.context.request = require('../../_utils/request')(); - t.context.response = require('../../_utils/response')(); + t.context.request = (await import('../../_utils/request.js')).default(); + t.context.response = (await import('../../_utils/response.js')).default(); }); diff --git a/test/hooks/user/forgot.test.js b/test/hooks/user/forgot.test.js index 7f26b51c..f45bcfc0 100644 --- a/test/hooks/user/forgot.test.js +++ b/test/hooks/user/forgot.test.js @@ -1,18 +1,23 @@ -const test = require('ava'); -const _ = require('underscore'); +import test from 'ava'; +import _ from 'underscore'; +import path from 'path'; +import { fileURLToPath } from 'url'; -const Response = require('../../../lib/Response'); -const SaplingError = require('../../../lib/SaplingError'); -const Storage = require('../../../lib/Storage'); -const User = require('../../../lib/User'); +import Response from '../../../lib/Response.js'; +import SaplingError from '../../../lib/SaplingError.js'; +import Storage from '../../../lib/Storage.js'; +import User from '../../../lib/User.js'; -const forgot = require('../../../hooks/sapling/user/forgot'); +import forgot from '../../../hooks/sapling/user/forgot.js'; -test.beforeEach(t => { +const __dirname = path.dirname(fileURLToPath(import.meta.url)); + + +test.beforeEach(async t => { t.context.app = _.extend({ name: 'untitled' - }, require('../../_utils/app')()); + }, (await import('../../_utils/app.js')).default()); t.context.app.storage = new Storage(t.context.app, { name: 'test', @@ -20,11 +25,12 @@ test.beforeEach(t => { config: { db: { driver: 'Memory' } }, dir: __dirname }); + await t.context.app.storage.importDriver(); t.context.app.user = new User(t.context.app); - t.context.request = require('../../_utils/request')(); - t.context.response = require('../../_utils/response')(); + t.context.request = (await import('../../_utils/request.js')).default(); + t.context.response = (await import('../../_utils/response.js')).default(); }); diff --git a/test/hooks/user/logged.test.js b/test/hooks/user/logged.test.js index 6aa312a7..49088950 100644 --- a/test/hooks/user/logged.test.js +++ b/test/hooks/user/logged.test.js @@ -1,15 +1,20 @@ -const test = require('ava'); -const _ = require('underscore'); +import test from 'ava'; +import _ from 'underscore'; +import path from 'path'; +import { fileURLToPath } from 'url'; -const Response = require('../../../lib/Response'); -const Storage = require('../../../lib/Storage'); -const User = require('../../../lib/User'); +import Response from '../../../lib/Response.js'; +import Storage from '../../../lib/Storage.js'; +import User from '../../../lib/User.js'; -const logged = require('../../../hooks/sapling/user/logged'); +import logged from '../../../hooks/sapling/user/logged.js'; -test.beforeEach(t => { - t.context.app = require('../../_utils/app')(); +const __dirname = path.dirname(fileURLToPath(import.meta.url)); + + +test.beforeEach(async t => { + t.context.app = (await import('../../_utils/app.js')).default(); t.context.app.storage = new Storage(t.context.app, { name: 'test', @@ -17,11 +22,12 @@ test.beforeEach(t => { config: { db: { driver: 'Memory' } }, dir: __dirname }); + await t.context.app.storage.importDriver(); t.context.app.user = new User(t.context.app); - t.context.request = require('../../_utils/request')(); - t.context.response = require('../../_utils/response')(); + t.context.request = (await import('../../_utils/request.js')).default(); + t.context.response = (await import('../../_utils/response.js')).default(); }); diff --git a/test/hooks/user/login.test.js b/test/hooks/user/login.test.js index 70563468..66efe972 100644 --- a/test/hooks/user/login.test.js +++ b/test/hooks/user/login.test.js @@ -1,12 +1,17 @@ -const test = require('ava'); -const _ = require('underscore'); +import test from 'ava'; +import _ from 'underscore'; +import path from 'path'; +import { fileURLToPath } from 'url'; -const Response = require('../../../lib/Response'); -const SaplingError = require('../../../lib/SaplingError'); -const Storage = require('../../../lib/Storage'); -const User = require('../../../lib/User'); +import Response from '../../../lib/Response.js'; +import SaplingError from '../../../lib/SaplingError.js'; +import Storage from '../../../lib/Storage.js'; +import User from '../../../lib/User.js'; -const login = require('../../../hooks/sapling/user/login'); +import login from '../../../hooks/sapling/user/login.js'; + + +const __dirname = path.dirname(fileURLToPath(import.meta.url)); const createUser = async t => { @@ -20,10 +25,10 @@ const createUser = async t => { }; -test.beforeEach(t => { +test.beforeEach(async t => { t.context.app = _.extend({ name: 'untitled' - }, require('../../_utils/app')()); + }, (await import('../../_utils/app.js')).default()); t.context.app.storage = new Storage(t.context.app, { name: 'test', @@ -31,11 +36,12 @@ test.beforeEach(t => { config: { db: { driver: 'Memory' } }, dir: __dirname }); + await t.context.app.storage.importDriver(); t.context.app.user = new User(t.context.app); - t.context.request = require('../../_utils/request')(); - t.context.response = require('../../_utils/response')(); + t.context.request = (await import('../../_utils/request.js')).default(); + t.context.response = (await import('../../_utils/response.js')).default(); }); diff --git a/test/hooks/user/logout.test.js b/test/hooks/user/logout.test.js index c0fdbebc..d68d5c9c 100644 --- a/test/hooks/user/logout.test.js +++ b/test/hooks/user/logout.test.js @@ -1,15 +1,15 @@ -const test = require('ava'); +import test from 'ava'; -const Response = require('../../../lib/Response'); +import Response from '../../../lib/Response.js'; -const logout = require('../../../hooks/sapling/user/logout'); +import logout from '../../../hooks/sapling/user/logout.js'; -test.beforeEach(t => { - t.context.app = require('../../_utils/app')(); +test.beforeEach(async t => { + t.context.app = (await import('../../_utils/app.js')).default(); - t.context.request = require('../../_utils/request')(); - t.context.response = require('../../_utils/response')(); + t.context.request = (await import('../../_utils/request.js')).default(); + t.context.response = (await import('../../_utils/response.js')).default(); }); diff --git a/test/hooks/user/recover.test.js b/test/hooks/user/recover.test.js index 07931721..5cbae26f 100644 --- a/test/hooks/user/recover.test.js +++ b/test/hooks/user/recover.test.js @@ -1,14 +1,19 @@ -const test = require('ava'); -const _ = require('underscore'); +import test from 'ava'; +import _ from 'underscore'; +import path from 'path'; +import { fileURLToPath } from 'url'; -const Hash = require('../../../lib/Hash'); -const Response = require('../../../lib/Response'); -const SaplingError = require('../../../lib/SaplingError'); -const Storage = require('../../../lib/Storage'); -const User = require('../../../lib/User'); +import Hash from '../../../lib/Hash.js'; +import Response from '../../../lib/Response.js'; +import SaplingError from '../../../lib/SaplingError.js'; +import Storage from '../../../lib/Storage.js'; +import User from '../../../lib/User.js'; -const forgot = require('../../../hooks/sapling/user/forgot'); -const recover = require('../../../hooks/sapling/user/recover'); +import forgot from '../../../hooks/sapling/user/forgot.js'; +import recover from '../../../hooks/sapling/user/recover.js'; + + +const __dirname = path.dirname(fileURLToPath(import.meta.url)); const requestReset = async t => { @@ -28,10 +33,10 @@ const requestReset = async t => { }; -test.beforeEach(t => { +test.beforeEach(async t => { t.context.app = _.extend({ name: 'untitled' - }, require('../../_utils/app')()); + }, (await import('../../_utils/app.js')).default()); t.context.app.storage = new Storage(t.context.app, { name: 'test', @@ -39,11 +44,12 @@ test.beforeEach(t => { config: { db: { driver: 'Memory' } }, dir: __dirname }); + await t.context.app.storage.importDriver(); t.context.app.user = new User(t.context.app); - t.context.request = require('../../_utils/request')(); - t.context.response = require('../../_utils/response')(); + t.context.request = (await import('../../_utils/request.js')).default(); + t.context.response = (await import('../../_utils/response.js')).default(); }); diff --git a/test/hooks/user/register.test.js b/test/hooks/user/register.test.js index 127be55d..3c0f7215 100644 --- a/test/hooks/user/register.test.js +++ b/test/hooks/user/register.test.js @@ -1,18 +1,23 @@ -const test = require('ava'); -const _ = require('underscore'); +import test from 'ava'; +import _ from 'underscore'; +import path from 'path'; +import { fileURLToPath } from 'url'; -const Response = require('../../../lib/Response'); -const SaplingError = require('../../../lib/SaplingError'); -const Storage = require('../../../lib/Storage'); -const User = require('../../../lib/User'); +import Response from '../../../lib/Response.js'; +import SaplingError from '../../../lib/SaplingError.js'; +import Storage from '../../../lib/Storage.js'; +import User from '../../../lib/User.js'; -const register = require('../../../hooks/sapling/user/register'); +import register from '../../../hooks/sapling/user/register.js'; -test.beforeEach(t => { +const __dirname = path.dirname(fileURLToPath(import.meta.url)); + + +test.beforeEach(async t => { t.context.app = _.extend({ name: 'untitled' - }, require('../../_utils/app')()); + }, (await import('../../_utils/app.js')).default()); t.context.app.storage = new Storage(t.context.app, { name: 'test', @@ -20,11 +25,12 @@ test.beforeEach(t => { config: { db: { driver: 'Memory' } }, dir: __dirname }); + await t.context.app.storage.importDriver(); t.context.app.user = new User(t.context.app); - t.context.request = require('../../_utils/request')(); - t.context.response = require('../../_utils/response')(); + t.context.request = (await import('../../_utils/request.js')).default(); + t.context.response = (await import('../../_utils/response.js')).default(); }); diff --git a/test/hooks/user/update.test.js b/test/hooks/user/update.test.js index c27c75c9..94b99d3c 100644 --- a/test/hooks/user/update.test.js +++ b/test/hooks/user/update.test.js @@ -1,13 +1,18 @@ -const test = require('ava'); -const _ = require('underscore'); +import test from 'ava'; +import _ from 'underscore'; +import path from 'path'; +import { fileURLToPath } from 'url'; -const Hash = require('../../../lib/Hash'); -const Response = require('../../../lib/Response'); -const SaplingError = require('../../../lib/SaplingError'); -const Storage = require('../../../lib/Storage'); -const User = require('../../../lib/User'); +import Hash from '../../../lib/Hash.js'; +import Response from '../../../lib/Response.js'; +import SaplingError from '../../../lib/SaplingError.js'; +import Storage from '../../../lib/Storage.js'; +import User from '../../../lib/User.js'; -const update = require('../../../hooks/sapling/user/update'); +import update from '../../../hooks/sapling/user/update.js'; + + +const __dirname = path.dirname(fileURLToPath(import.meta.url)); const createUser = async t => { @@ -23,10 +28,10 @@ const createUser = async t => { }; -test.beforeEach(t => { +test.beforeEach(async t => { t.context.app = _.extend({ name: 'untitled' - }, require('../../_utils/app')()); + }, (await import('../../_utils/app.js')).default()); t.context.app.storage = new Storage(t.context.app, { name: 'test', @@ -34,11 +39,12 @@ test.beforeEach(t => { config: { db: { driver: 'Memory' } }, dir: __dirname }); + await t.context.app.storage.importDriver(); t.context.app.user = new User(t.context.app); - t.context.request = require('../../_utils/request')(); - t.context.response = require('../../_utils/response')(); + t.context.request = (await import('../../_utils/request.js')).default(); + t.context.response = (await import('../../_utils/response.js')).default(); }); diff --git a/test/lib/Cluster.test.js b/test/lib/Cluster.test.js index ac365f35..396dcb07 100644 --- a/test/lib/Cluster.test.js +++ b/test/lib/Cluster.test.js @@ -1,8 +1,8 @@ -const test = require('ava'); +import test from 'ava'; -const cluster = require('cluster'); +import cluster from 'cluster'; -const { Cluster } = require('../../lib/Cluster'); +import Cluster from '../../lib/Cluster.js'; test.beforeEach(t => { diff --git a/test/lib/Hash.test.js b/test/lib/Hash.test.js index 8abf85a7..99f0e793 100644 --- a/test/lib/Hash.test.js +++ b/test/lib/Hash.test.js @@ -1,6 +1,6 @@ -const test = require('ava'); +import test from 'ava'; -const Hash = require('../../lib/Hash'); +import Hash from '../../lib/Hash.js'; test.before(t => { diff --git a/test/lib/Notifications.test.js b/test/lib/Notifications.test.js index 86dd30fd..cf4ea5a6 100644 --- a/test/lib/Notifications.test.js +++ b/test/lib/Notifications.test.js @@ -1,9 +1,9 @@ -const test = require('ava'); -const MailDev = require('maildev'); +import test from 'ava'; +import MailDev from 'maildev'; -const SaplingError = require('../../lib/SaplingError'); +import SaplingError from '../../lib/SaplingError.js'; -const Notifications = require('../../lib/Notifications'); +import Notifications from '../../lib/Notifications.js'; const setup = (t, host, port) => { @@ -37,12 +37,13 @@ test.before(t => { }; }); -test.beforeEach(t => { - t.context.app = require('../_utils/app')(); +test.beforeEach(async t => { + t.context.app = (await import('../_utils/app.js')).default(); }); test.cb('sends a notification', t => { + process.env.NODE_ENV = 'production'; t.timeout(1000); t.plan(3); diff --git a/test/lib/Response.test.js b/test/lib/Response.test.js index 03a81adc..4e799874 100644 --- a/test/lib/Response.test.js +++ b/test/lib/Response.test.js @@ -1,8 +1,7 @@ -const test = require('ava'); -const path = require('path'); +import test from 'ava'; -const Response = require('../../lib/Response'); -const SaplingError = require('../../lib/SaplingError'); +import Response from '../../lib/Response.js'; +import SaplingError from '../../lib/SaplingError.js'; const noAjax = t => { @@ -11,10 +10,10 @@ const noAjax = t => { } -test.beforeEach(t => { - t.context.app = require('../_utils/app')(); +test.beforeEach(async t => { + t.context.app = (await import('../_utils/app.js')).default(); - t.context.request = require('../_utils/request')(); + t.context.request = (await import('../_utils/request.js')).default(); t.context.response = () => { const response = {}; @@ -119,7 +118,7 @@ test('returns empty string for bad data', t => { /* viewResponse */ -test('responds with a view when pre-rendered HTML is passed', async t => { +test.cb('responds with a view when pre-rendered HTML is passed', t => { noAjax(t); const response = t.context.response(); @@ -131,13 +130,14 @@ test('responds with a view when pre-rendered HTML is passed', async t => { response.send = data => { t.is(typeof data, 'string'); t.is(data, '

Hello

'); + t.end(); return response; }; new Response(t.context.app, t.context.request, response, null, '

Hello

'); }); -test('responds with data JSON when a string of data is passed', async t => { +test.cb('responds with data JSON when a string of data is passed', t => { const response = t.context.response(); response.status = statusCode => { @@ -146,13 +146,14 @@ test('responds with data JSON when a string of data is passed', async t => { }; response.json = data => { t.deepEqual(data, [{foo:"bar"}]); + t.end(); return response; }; new Response(t.context.app, t.context.request, response, null, '[{"foo":"bar"}]'); }); -test('responds with a data view when a string of data is passed', async t => { +test.cb('responds with a data view when a string of data is passed', t => { noAjax(t); const response = t.context.response(); @@ -164,6 +165,7 @@ test('responds with a data view when a string of data is passed', async t => { response.send = data => { t.is(typeof data, 'string'); t.true(data.includes('Response to')); + t.end(); return response; }; @@ -173,7 +175,7 @@ test('responds with a data view when a string of data is passed', async t => { /* genericResponse */ -test('responds with a generic success status when no content is passed', async t => { +test.cb('responds with a generic success status when no content is passed', t => { const response = t.context.response(); response.status = statusCode => { @@ -182,6 +184,7 @@ test('responds with a generic success status when no content is passed', async t }; response.send = data => { t.true(data.success); + t.end(); return response; }; @@ -191,20 +194,21 @@ test('responds with a generic success status when no content is passed', async t /* dataResponse */ -test('redirects when redirect query string is passed', async t => { +test.cb('redirects when redirect query string is passed', t => { t.context.request.query.redirect = '/my-account'; const response = t.context.response(); response.redirect = destination => { t.is(destination, '/my-account'); + t.end(); return response; }; new Response(t.context.app, t.context.request, response, null, []); }); -test('responds with data JSON when data is passed', async t => { +test.cb('responds with data JSON when data is passed', t => { const response = t.context.response(); response.status = statusCode => { @@ -213,13 +217,14 @@ test('responds with data JSON when data is passed', async t => { }; response.json = data => { t.deepEqual(data, [{foo:'bar'}]); + t.end(); return response; }; new Response(t.context.app, t.context.request, response, null, [{foo:'bar'}]); }); -test('responds with a data view when data is passed', async t => { +test.cb('responds with a data view when data is passed', t => { noAjax(t); const response = t.context.response(); @@ -231,6 +236,7 @@ test('responds with a data view when data is passed', async t => { response.send = data => { t.is(typeof data, 'string'); t.true(data.includes('Response to')); + t.end(); return response; }; @@ -240,7 +246,7 @@ test('responds with a data view when data is passed', async t => { /* errorResponse */ -test('responds with an error JSON when an error is passed', async t => { +test.cb('responds with an error JSON when an error is passed', t => { const response = t.context.response(); response.status = statusCode => { @@ -249,13 +255,14 @@ test('responds with an error JSON when an error is passed', async t => { }; response.json = data => { t.is(data.errors.length, 1); + t.end(); return response; }; new Response(t.context.app, t.context.request, response, new SaplingError('error')); }); -test('responds with an error view when an error is passed', async t => { +test.cb('responds with an error view when an error is passed', t => { noAjax(t); t.context.app.config.showError = true; @@ -268,13 +275,14 @@ test('responds with an error view when an error is passed', async t => { response.send = data => { t.is(typeof data, 'string'); t.true(data.includes('SaplingError')); + t.end(); return response; }; new Response(t.context.app, t.context.request, response, new SaplingError('error')); }); -test('responds with a plain error view when an error is passed', async t => { +test.cb('responds with a plain error view when an error is passed', t => { noAjax(t); t.context.app.config.showError = false; @@ -287,6 +295,7 @@ test('responds with a plain error view when an error is passed', async t => { response.send = data => { t.is(typeof data, 'string'); t.true(data.includes('A critical error has occurred with this website. Please try again later.')); + t.end(); return response; }; @@ -296,7 +305,7 @@ test('responds with a plain error view when an error is passed', async t => { /* notFoundResponse */ -test('responds with a 404 status when an empty content is passed', async t => { +test.cb('responds with a 404 status when an empty content is passed', t => { const response = t.context.response(); response.status = statusCode => { @@ -305,13 +314,14 @@ test('responds with a 404 status when an empty content is passed', async t => { }; response.send = data => { t.falsy(data); + t.end(); return response; }; new Response(t.context.app, t.context.request, response, null, false); }); -test('responds with a 404 error view when an empty content is passed', async t => { +test.cb('responds with a 404 error view when an empty content is passed', t => { noAjax(t); const response = t.context.response(); @@ -323,6 +333,7 @@ test('responds with a 404 error view when an empty content is passed', async t = response.send = data => { t.is(typeof data, 'string'); t.true(data.includes('This page either does not exist, or you do not have permission to see it.')); + t.end(); return response; }; diff --git a/test/lib/SaplingError.test.js b/test/lib/SaplingError.test.js index b984d7bc..73a2ff85 100644 --- a/test/lib/SaplingError.test.js +++ b/test/lib/SaplingError.test.js @@ -1,6 +1,6 @@ -const test = require('ava'); +import test from 'ava'; -const SaplingError = require('../../lib/SaplingError'); +import SaplingError from '../../lib/SaplingError.js'; test('creates an error with a string', t => { diff --git a/test/lib/Storage.test.js b/test/lib/Storage.test.js index 32127059..ca8c08c7 100644 --- a/test/lib/Storage.test.js +++ b/test/lib/Storage.test.js @@ -1,5 +1,5 @@ -const test = require('ava'); +import test from 'ava'; -const Storage = require('../../lib/Storage'); +import Storage from '../../lib/Storage.js'; test.todo('tests Storage'); diff --git a/test/lib/Templating.test.js b/test/lib/Templating.test.js index 3e909628..fab913ab 100644 --- a/test/lib/Templating.test.js +++ b/test/lib/Templating.test.js @@ -1,36 +1,43 @@ -const test = require('ava'); -const path = require('path'); +import test from 'ava'; +import path from 'path'; +import { fileURLToPath } from 'url'; -const SaplingError = require('../../lib/SaplingError'); +import SaplingError from '../../lib/SaplingError.js'; -const Templating = require('../../lib/Templating'); +import Templating from '../../lib/Templating.js'; -test.beforeEach(t => { - t.context.app = require('../_utils/app')(); - t.context.request = require('../_utils/request')(); +const __dirname = path.dirname(fileURLToPath(import.meta.url)); + + +test.beforeEach(async t => { + t.context.app = (await import('../_utils/app.js')).default(); + t.context.request = (await import('../_utils/request.js')).default(); }); -test.serial('loads the default renderer', t => { - t.notThrows(() => { +test.serial('loads the default renderer', async t => { + await t.notThrowsAsync(async () => { t.context.app.templating = new Templating(t.context.app); + return await t.context.app.templating.importDriver(); }); }); -test.serial('loads a renderer case insensitively', t => { +test.serial('loads a renderer case insensitively', async t => { t.context.app.config.render.driver = 'hTMl'; - t.notThrows(() => { + await t.notThrowsAsync(async () => { t.context.app.templating = new Templating(t.context.app); + return await t.context.app.templating.importDriver(); }); }); -test.serial('loads a custom renderer', t => { +test.serial('loads a custom renderer', async t => { t.context.app.config.render.driver = 'render-driver-custom'; - t.throws(() => { + await t.throwsAsync(async () => { t.context.app.templating = new Templating(t.context.app); + return await t.context.app.templating.importDriver(); }, { instanceOf: SaplingError, message: 'Cannot find any render driver for \'render-driver-custom\'' diff --git a/test/lib/Uploads.test.js b/test/lib/Uploads.test.js index 25319138..dfc70bf2 100644 --- a/test/lib/Uploads.test.js +++ b/test/lib/Uploads.test.js @@ -1,13 +1,17 @@ -const test = require('ava'); -const path = require('path'); -const fs = require('fs'); -const _ = require('underscore'); -const mimeTypes = require('mime-types'); +import test from 'ava'; +import path from 'path'; +import fs from 'fs'; +import _ from 'underscore'; +import mimeTypes from 'mime-types'; +import { fileURLToPath } from 'url'; -const Response = require('../../lib/Response'); -const SaplingError = require('../../lib/SaplingError'); +import Response from '../../lib/Response.js'; +import SaplingError from '../../lib/SaplingError.js'; -const Uploads = require('../../lib/Uploads'); +import Uploads from '../../lib/Uploads.js'; + + +const __dirname = path.dirname(fileURLToPath(import.meta.url)); const getFileObject = (filename, cb) => { @@ -28,7 +32,7 @@ const getFileObject = (filename, cb) => { }; -test.beforeEach(t => { +test.beforeEach(async t => { t.context.app = _.defaults({ dir: __dirname, config: { @@ -40,10 +44,10 @@ test.beforeEach(t => { driver: 'Html' } } - }, require('../_utils/app')()); + }, (await import('../_utils/app.js')).default()); - t.context.request = require('../_utils/request')(); - t.context.response = require('../_utils/response')(); + t.context.request = (await import('../_utils/request.js')).default(); + t.context.response = (await import('../_utils/response.js')).default(); }); diff --git a/test/lib/User.test.js b/test/lib/User.test.js index 329d05de..19be3b55 100644 --- a/test/lib/User.test.js +++ b/test/lib/User.test.js @@ -1,12 +1,17 @@ -const test = require('ava'); -const _ = require('underscore'); +import test from 'ava'; +import _ from 'underscore'; +import path from 'path'; +import { fileURLToPath } from 'url'; -const Storage = require('../../lib/Storage'); +import Storage from '../../lib/Storage.js'; -const User = require('../../lib/User'); +import User from '../../lib/User.js'; -test.beforeEach(t => { +const __dirname = path.dirname(fileURLToPath(import.meta.url)); + + +test.beforeEach(async t => { t.context.app = _.defaults({ storage: new Storage({}, { name: 'test', @@ -30,9 +35,10 @@ test.beforeEach(t => { 'get /edit': { role: ['member', 'admin'] }, 'get /admin': { role: 'admin' } } - }, require('../_utils/app')()); + }, (await import('../_utils/app.js')).default()); + await t.context.app.storage.importDriver(); - t.context.response = require('../_utils/response'); + t.context.response = (await import('../_utils/response.js')).default(); t.context.user = new User(t.context.app); }); @@ -145,7 +151,7 @@ test('allows a user that is logged in for a protected route', t => { role: 'member' } } - }, t.context.response())); + }, t.context.response)); }); test('denies a user that is not logged in for a protected route', t => { @@ -154,7 +160,7 @@ test('denies a user that is not logged in for a protected route', t => { role: [ 'member' ] }, session: {} - }, t.context.response())); + }, t.context.response)); }); test('allows a user that is logged in for a public route', t => { @@ -167,7 +173,7 @@ test('allows a user that is logged in for a public route', t => { role: 'member' } } - }, t.context.response())); + }, t.context.response)); }); test('allows a user that is not logged in for a public route', t => { @@ -176,7 +182,7 @@ test('allows a user that is not logged in for a public route', t => { role: [ 'anyone' ] }, session: {} - }, t.context.response())); + }, t.context.response)); }); test('denies a user that is logged in for a stranger route', t => { @@ -189,7 +195,7 @@ test('denies a user that is logged in for a stranger route', t => { role: 'member' } } - }, t.context.response())); + }, t.context.response)); }); test('allows a user that is not logged in for a stranger route', t => { @@ -198,14 +204,14 @@ test('allows a user that is not logged in for a stranger route', t => { role: [ 'stranger' ] }, session: {} - }, t.context.response())); + }, t.context.response)); }); test('allows a user that is not logged in for an undefined route', t => { t.true(t.context.user.isUserAuthenticatedForRoute({ permission: null, session: {} - }, t.context.response())); + }, t.context.response)); }); test('allows a user that is logged in for an undefined route', t => { @@ -214,7 +220,7 @@ test('allows a user that is logged in for an undefined route', t => { session: { role: 'member' } - }, t.context.response())); + }, t.context.response)); }); diff --git a/test/lib/Utils.test.js b/test/lib/Utils.test.js index 3be530f4..eead4116 100644 --- a/test/lib/Utils.test.js +++ b/test/lib/Utils.test.js @@ -1,10 +1,14 @@ -const test = require('ava'); -const fs = require('fs'); -const path = require('path'); +import test from 'ava'; +import fs from 'fs'; +import path from 'path'; +import { fileURLToPath } from 'url'; -const SaplingError = require('../../lib/SaplingError'); +import SaplingError from '../../lib/SaplingError.js'; -const Utils = require('../../lib/Utils'); +import Utils from '../../lib/Utils.js'; + + +const __dirname = path.dirname(fileURLToPath(import.meta.url)); test.before(t => { diff --git a/test/lib/Validation.test.js b/test/lib/Validation.test.js index 182678c4..64137af6 100644 --- a/test/lib/Validation.test.js +++ b/test/lib/Validation.test.js @@ -1,6 +1,6 @@ -const test = require('ava'); +import test from 'ava'; -const Validation = require('../../lib/Validation'); +import Validation from '../../lib/Validation.js'; test.beforeEach(t => { t.context.validator = new Validation();