diff --git a/.editorconfig b/.editorconfig index db2217d..7db57b1 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,5 +1,3 @@ -# http://editorconfig.org - root = true [*] @@ -11,7 +9,7 @@ insert_final_newline = true trim_trailing_whitespace = true [*.md] -indent_style = spaces +indent_style = space trim_trailing_whitespace = false [*.yml] diff --git a/.eslintrc.js b/.eslintrc.js index ac3db81..a588982 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,3 +1,12 @@ 'use strict'; -module.exports = require('pa11y-lint-config/eslint/es2017'); +const pa11yConfig = require('pa11y-lint-config/eslint/es2017'); + +const config = { + ...pa11yConfig, + parserOptions: { + ecmaVersion: 2019 + } +}; + +module.exports = config; diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9026986..196ff00 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,5 +1,3 @@ -name: Build and lint - on: push: branches: @@ -7,38 +5,54 @@ on: pull_request: jobs: - checkout_and_test: + lint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-node@v3 + with: + node-version: 12 + - run: npm ci + - run: npm run lint + + test: + name: test (node ${{ matrix.node }}, mongodb ${{ matrix.mongo }}) runs-on: ubuntu-20.04 strategy: + fail-fast: false matrix: + node: [12, 14, 16, 18, 20] + mongo: [latest] include: - - node-version: 12.x - lint: true # Linter is run only once to shorten the total build time - - node-version: 14.x + - { node: 12, mongo: 6.0.11 } + - { node: 12, mongo: 5.0.22 } + - { node: 12, mongo: 4.4.25 } + - { node: 12, mongo: 3.6.23 } + - { node: 12, mongo: 2.6.12 } steps: - - name: Checkout code from ${{ github.repository }} - uses: actions/checkout@v2 - - name: Setup node - uses: actions/setup-node@v2 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v3 with: - node-version: ${{ matrix.node-version }} - - name: MongoDB in GitHub Actions - uses: supercharge/mongodb-github-action@1.3.0 + node-version: ${{ matrix.node }} + - run: npm ci + + - name: Supply MongoDB ${{ matrix.mongo }} + uses: supercharge/mongodb-github-action@1.5.0 with: - mongodb-version: 3.4 - - name: Install dependencies - run: npm i - - name: Run linter - if: ${{ matrix.lint }} - run: make lint - - name: Create test config + mongodb-version: ${{ matrix.mongo }} + + - name: Supply integration test configuration file run: cp config/test.sample.json config/test.json - - name: Start test app + + - name: Make dashboard available to be integration-tested run: NODE_ENV=test node index.js & - - name: Wait / Sleep - uses: jakejarvis/wait-action@v0.1.0 + - name: Wait for dashboard to respond + uses: iFaxity/wait-on-action@v1.1.0 with: - time: '10s' - - name: Run tests - run: make ci + resource: http://localhost:4000 + delay: 1000 + timeout: 30000 + log: true + + - run: NODE_ENV=test npm test diff --git a/.gitignore b/.gitignore index 23fb3c9..4001e9b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ - # Config files config/development.json config/production.json @@ -8,5 +7,5 @@ config/test.json node_modules npm-debug.log -# JetBrains IDE +# Editors .idea diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..4812751 --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +lockfile-version=2 diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 0000000..8351c19 --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +14 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1cc42b0..4b246a2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,4 @@ - -Contributing Guide -================== +# Contributing Guide Thanks for getting involved :tada: @@ -14,8 +12,8 @@ Our website outlines the many ways that you can contribute to Pa11y: -[code-of-conduct]: http://pa11y.org/contributing/code-of-conduct/ -[communications]: http://pa11y.org/contributing/communications/ -[companies]: http://pa11y.org/contributing/companies/ -[designers]: http://pa11y.org/contributing/designers/ -[developers]: http://pa11y.org/contributing/developers/ +[code-of-conduct]: https://pa11y.org/contributing/code-of-conduct/ +[communications]: https://pa11y.org/contributing/communications/ +[companies]: https://pa11y.org/contributing/companies/ +[designers]: https://pa11y.org/contributing/designers/ +[developers]: https://pa11y.org/contributing/developers/ diff --git a/Makefile b/Makefile index ba2c59b..15442fc 100644 --- a/Makefile +++ b/Makefile @@ -1,25 +1,10 @@ -include Makefile.node - -# We need to run integration tests recursively -export INTEGRATION_FLAGS := --recursive - - -# Verify tasks -# ------------ - -# Lint alias for backwards compatibility -lint: verify - - # Client-side asset tasks # ----------------------- -# Compile LESS less: @lessc -x ./public/less/main.less ./public/css/site.min.css @$(TASK_DONE) -# Compile client-side JavaScript uglify: @uglifyjs \ public/js/vendor/jquery/jquery.min.js \ diff --git a/Makefile.node b/Makefile.node deleted file mode 100644 index b8eb780..0000000 --- a/Makefile.node +++ /dev/null @@ -1,125 +0,0 @@ -# -# Node.js Makefile -# ================ -# -# Do not update this file manually – it's maintained separately on GitHub: -# https://github.com/rowanmanning/makefiles/blob/master/Makefile.node -# -# To update to the latest version, run `make update-makefile`. -# - - -# Meta tasks -# ---------- - -.PHONY: test - - -# Useful variables -# ---------------- - -NPM_BIN = ./node_modules/.bin -export PATH := $(NPM_BIN):$(PATH) -export EXPECTED_COVERAGE := 90 -export INTEGRATION_TIMEOUT := 10000 -export INTEGRATION_SLOW := 4000 - - -# Output helpers -# -------------- - -TASK_DONE = echo "✓ $@ done" - - -# Group tasks -# ----------- - -all: install ci -ci: verify test - - -# Install tasks -# ------------- - -clean: - @git clean -fxd - @$(TASK_DONE) - -install: node_modules - @$(TASK_DONE) - -node_modules: package.json - @npm prune --production=false - @npm install - @$(TASK_DONE) - - -# Verify tasks -# ------------ - -verify: verify-javascript verify-dust verify-spaces - @$(TASK_DONE) - -verify-javascript: verify-eslint verify-jshint verify-jscs - @$(TASK_DONE) - -verify-dust: - @if [ -e .dustmiterc* ]; then dustmite --path ./view && $(TASK_DONE); fi - -verify-eslint: - @if [ -e .eslintrc* ]; then eslint . && $(TASK_DONE); fi - -verify-jshint: - @if [ -e .jshintrc* ]; then jshint . && $(TASK_DONE); fi - -verify-jscs: - @if [ -e .jscsrc* ]; then jscs . && $(TASK_DONE); fi - -verify-spaces: - @if [ -e .editorconfig* ] && [ -x $(NPM_BIN)/lintspaces ]; then \ - git ls-files | xargs lintspaces -e .editorconfig && $(TASK_DONE); \ - fi - -verify-coverage: - @if [ -d coverage ]; then \ - if [ -x $(NPM_BIN)/nyc ]; then \ - nyc check-coverage --lines $(EXPECTED_COVERAGE) --functions $(EXPECTED_COVERAGE) --branches $(EXPECTED_COVERAGE) && $(TASK_DONE); \ - else \ - if [ -x $(NPM_BIN)/istanbul ]; then \ - istanbul check-coverage --statement $(EXPECTED_COVERAGE) --branch $(EXPECTED_COVERAGE) --function $(EXPECTED_COVERAGE) && $(TASK_DONE); \ - fi \ - fi \ - fi - -# Test tasks -# ---------- - -test: test-unit-coverage verify-coverage test-integration - @$(TASK_DONE) - -test-unit: - @if [ -d test/unit ]; then mocha test/unit --recursive && $(TASK_DONE); fi - -test-unit-coverage: - @if [ -d test/unit ]; then \ - if [ -x $(NPM_BIN)/nyc ]; then \ - nyc --reporter=text --reporter=html $(NPM_BIN)/_mocha test/unit --recursive && $(TASK_DONE); \ - else \ - if [ -x $(NPM_BIN)/istanbul ]; then \ - istanbul cover $(NPM_BIN)/_mocha -- test/unit --recursive && $(TASK_DONE); \ - else \ - make test-unit; \ - fi \ - fi \ - fi - -test-integration: - @if [ -d test/integration ]; then mocha test/integration --timeout $(INTEGRATION_TIMEOUT) --slow $(INTEGRATION_SLOW) $(INTEGRATION_FLAGS) && $(TASK_DONE); fi - - -# Tooling tasks -# ------------- - -update-makefile: - @curl -s https://raw.githubusercontent.com/rowanmanning/makefiles/master/Makefile.node > Makefile.node - @$(TASK_DONE) diff --git a/README.md b/README.md index d8bc8e1..416ca4c 100644 --- a/README.md +++ b/README.md @@ -14,13 +14,14 @@ Pa11y Dashboard is a web interface to the [Pa11y][pa11y] accessibility reporter; ## Requirements -Pa11y Dashboard is a [Node.js][node] application and requires a stable or LTS version of Node, currently version 12 or 14. +- [Node.js][node]: Pa11y Dashboard 4 requires a stable (even-numbered) version of Node.js of 12 or above. +- [MongoDB][mongodb]: This project depends on Pa11y Webservice, which stores test results in a MongoDB database and expects one to be available and running. -⚠️ At the moment, Pa11y Dashboard won't work with Node.js v16. Please use Node.js 12 or 14. ⚠️ +### Pally Dashboard 4 and Linux/Ubuntu -Pa11y Dashboard uses a [MongoDB][mongo] database to store the results of the tests. The database doesn't have to be in the same server or computer where Pa11y Dashboard is running from. +Pa11y (and therefore this service) uses Headless Chrome to perform accessibility testing. On Linux and other Unix-like systems, Pa11y's attempt to install it as a dependency sometimes fails since additional operating system packages will be required. Your distribution's documentation should describe how to install these. -Pa11y Dashboard uses [puppeteer](https://www.npmjs.com/package/puppeteer) to create a headless instance of the Chromium browser in order to run the tests. On certain environments this may require additional dependencies to be installed. For example, in Debian/Ubuntu systems you may need to install the `libnss3` and `libgconf-2-4` libraries in order to be able to run tests on Pa11y Dashboard. Please refer to the documentation from your provider for details on how to do this. +In addition, to use Pa11y Dashboard 4 with a version of Ubuntu above 20.04, a path to the Chrome executable must be defined in `chromeLaunchConfig`, as `chromeLaunchConfig.executablePath`. Version 5 of Pa11y Dashboard, which will use Pa11y 7 along with a more recent version of Puppeteer, will resolve this issue. ## Setting up Pa11y Dashboard @@ -41,11 +42,11 @@ npm install Instructions for installing and running MongoDB are outside the scope of this document. When in doubt, please refer to the [MongoDB installation instructions](https://docs.mongodb.com/manual/installation/) for details of how to install and run MongoDB on your specific operating system. An example of the installation and configuration process for macOS follows. -Pa11y Dashboard currently uses version 3 of the Node.js MongoDB driver, which means that [only MongoDB servers of versions 4.4 or older are supported](https://docs.mongodb.com/drivers/node/current/compatibility/#mongodb-compatibility). Please ensure that your MongoDB server fills the requirements before trying to run Pa11y Dashboard. +Pa11y Dashboard uses [MongoDB Node.js Driver][mongodb-package] version 3, which [may not support some features][mongodb-package-compatibility] of MongoDB versions 6 and beyond. We do however test against MongoDB versions 2 to 6, plus the latest major version, which at the time of writing is `7`. #### Example MongoDB installation for macOS -On recent versions of macOS (10.13 or later), you can use [Homebrew](https://brew.sh/) to install MongoDB Community Edition. More recent versions of MongoDB are untested and unsupported. +On recent versions of macOS (10.13 or later), you can use [Homebrew] to install MongoDB Community Edition. Tap the MongoDB Homebrew Tap: @@ -67,8 +68,9 @@ brew services start mongodb/brew/mongodb-community@4.4 Check that the service has started properly: -```sh +```console $ brew services list + Name Status User Plist mongodb-community started pa11y /Users/pa11y/Library/LaunchAgents/homebrew.mxcl.mongodb-community.plist ``` @@ -99,43 +101,49 @@ Three example files are provided in this repository, you can copy and customise ```sh cp config/development.sample.json config/development.json +``` + +```sh cp config/production.sample.json config/production.json +``` + +```sh cp config/test.sample.json config/test.json ``` The [available configurations](#configurations) are documented in the next section. -If you run into problems, check the [troubleshooting guide][#troubleshooting]. +If you run into problems, check the [troubleshooting guide](#troubleshooting). ## Configurations The boot configurations for Pa11y Dashboard are as follows. Look at the sample JSON files in the repo for example usage. -### port +### `port` *(number)* The port to run the application on. Set via a config file or the `PORT` environment variable. -### noindex +### `noindex` *(boolean)* If set to `true` (default), the dashboard will not be indexed by search engines. Set to `false` to allow indexing. Set via a config file or the `NOINDEX` environment variable. -### readonly +### `readonly` *(boolean)* If set to `true`, users will not be able to add, delete or run URLs (defaults to `false`). Set via a config file or the `READONLY` environment variable. -### siteMessage +### `siteMessage` *(string)* A message to display prominently on the site home page. Defaults to `null`. -### webservice +### `webservice` -This can either be an object containing [Pa11y Webservice configurations][pa11y-webservice-config], or a string which is the base URL of a [Pa11y Webservice][pa11y-webservice] instance you are running separately. If using environment variables, prefix the webservice vars with `WEBSERVICE_`. +This can either be an object containing [Pa11y Webservice configurations][pa11y-webservice-config], or a string which is the base URL of a Pa11y Webservice instance you are running separately. If using environment variables, prefix the webservice vars with `WEBSERVICE_`. ## Contributing There are many ways to contribute to Pa11y Dashboard, we cover these in the [contributing guide](CONTRIBUTING.md) for this repo. -If you're ready to contribute some code, you'll need to clone the repo and get set up as outlined in the [setup guide](#setup). You'll then need to start the application in test mode with: +If you're ready to contribute some code, you'll need to clone the repo and get set up as outlined in the [setup guide](#setting-up-pa11y-dashboard). You'll then need to start the application in test mode with: ```sh NODE_ENV=test node index.js @@ -144,9 +152,8 @@ NODE_ENV=test node index.js You'll now be able to run the following commands: ```sh -make verify # Verify all of the code (ESLint) -make test # Run all tests -make test-integration # Run the integration tests +npm run lint # Lint the code +npm test # Run all tests ``` To compile the client-side JavaScript and CSS, you'll need the following commands. Compiled code is committed to the repository. @@ -158,51 +165,56 @@ make uglify # Compile and uglify the client-side JavaScript ## Useful resources -* [Setting up An Accessibility Dashboard from Scratch with Pa11y on DigitalOcean](https://una.im/pa11y-dash/) -* [Monitoring Web Accessibility Compliance With Pa11y Dashboard](https://www.lullabot.com/articles/monitoring-web-accessibility-compliance-with-pa11y-dashboard) +- [Setting up An Accessibility Dashboard from Scratch with Pa11y on DigitalOcean](https://una.im/pa11y-dash/) +- [Monitoring Web Accessibility Compliance With Pa11y Dashboard](https://www.lullabot.com/articles/monitoring-web-accessibility-compliance-with-pa11y-dashboard) ## Troubleshooting ### Common issues -* `500` errors or `Could not connect to pa11y-webservice` messages are often related to MongoDB. Ensure that you have the [appropriate version of MongoDB][#installing-mongodb] installed, and that it's running - it doesn't always start automatically. -* Error messages saying that pa11y-webservice isn't running may be due to dependency installation problems. Try deleting your `pa11y-dashboard/node_modules` directory and running `npm install` again. +- `500` errors or `Could not connect to pa11y-webservice` messages are often related to MongoDB. Ensure that you have the [appropriate version of MongoDB](#installing-mongodb) installed, and that it's running - it doesn't always start automatically. +- Error messages saying that pa11y-webservice isn't running may be due to dependency installation problems. Try deleting your `pa11y-dashboard/node_modules` directory and running `npm install` again. ### Create a new issue -Check the [issue tracker][issues] for similar issues before creating a new one. If the problem that you're experiencing is not covered by one of the existing issues, you can [create a new issue][create-issue]. Please include your node.js and MongoDB version numbers, and your operating system, as well as any information that may be useful in debugging the issue. +Check the [issue tracker][issues] for similar issues before creating a new one. If the problem that you're experiencing is not covered by one of the existing issues, you can [create a new issue][issues-create]. Please include your node.js and MongoDB version numbers, and your operating system, as well as any information that may be useful in debugging the issue. -## Support and Migration +## Support and migration -Pa11y Dashboard major versions are normally supported for 6 months after their last minor release. This means that patch-level changes will be added and bugs will be fixed. The table below outlines the end-of-support dates for major versions, and the last minor release for that version. +> [!NOTE] +> We maintain a [migration guide](MIGRATION.md) to help you migrate between major versions. -We also maintain a [migration guide](MIGRATION.md) to help you migrate. +When we release a new major version we will continue to support the previous major version for 6 months. This support will be limited to fixes for critical bugs and security issues. If you're opening an issue related to this project, please mention the specific version that the issue affects. -| :grey_question: | Major Version | Last Minor Release | Node.js Versions | Support End Date | -| :-------------- | :------------ | :----------------- | :--------------- | :--------------- | -| :heart: | 4 | N/A | 12+ | N/A | -| :hourglass: | 3 | 3.3.0 | 8+ | 2022-05-26 | -| :skull: | 2 | 2.4.2 | 4+ | 2020-01-16 | -| :skull: | 1 | 1.12 | 0.10–6 | 2016-12-05 | +The following table lists the major versions available and, for each previous major version, its end-of-support date, and its final minor version released. -If you're opening issues related to these, please mention the version that the issue relates to. +| Major version | Last minor release | Node.js support | Support end date | +| :------------ | :----------------- | :------------------------ | :--------------- | +| `4` | Imminent | `>= 12` | ✅ Current major version | +| `3` | `3.3.0` | `8`, `10` | 2022-05-26 | +| `2` | `2.4.2` | `4`, `6` | 2020-01-16 | +| `1` | `1.12.0` | `0.10`, `0.12`, `4`, `6` | 2016-12-05 | ## License -Pa11y Dashboard is licensed under the [GNU General Public License 3.0][info-license].
-Copyright © 2013–2020, Team Pa11y and contributors +Pa11y Dashboard is licensed under the [GNU General Public License 3.0][info-license]. +Copyright © 2023, Team Pa11y and contributors -[gpl]: http://www.gnu.org/licenses/gpl-3.0.html -[mongo]: http://www.mongodb.org/ +[homebrew]: https://brew.sh/ +[issues]: https://github.com/pa11y/pa11y-dashboard/issues?utf8=%E2%9C%93&q=is%3Aissue +[issues-create]: https://github.com/pa11y/pa11y-dashboard/issues/new +[mongodb]: http://www.mongodb.org/ +[mongodb-package]: https://www.npmjs.com/package/mongodb +[mongodb-package-compatibility]: https://docs.mongodb.com/drivers/node/current/compatibility [node]: http://nodejs.org/ [pa11y]: https://github.com/pa11y/pa11y [pa11y-webservice-config]: https://github.com/pa11y/webservice#configurations -[issues]: https://github.com/pa11y/pa11y-dashboard/issues?utf8=%E2%9C%93&q=is%3Aissue -[create-issue]: https://github.com/pa11y/pa11y-dashboard/issues/new + [info-node]: package.json -[info-build]: https://travis-ci.org/pa11y/pa11y-dashboard +[info-build]: https://github.com/pa11y/pa11y-dashboard/actions/workflows/tests.yml [info-license]: LICENSE + [shield-version]: https://img.shields.io/github/package-json/v/pa11y/pa11y-dashboard.svg [shield-node]: https://img.shields.io/node/v/pa11y/pa11y-dashboard.svg -[shield-build]: https://img.shields.io/travis/pa11y/pa11y-dashboard/master.svg +[shield-build]: https://github.com/pa11y/pa11y-dashboard/actions/workflows/tests.yml/badge.svg [shield-license]: https://img.shields.io/badge/license-GPL%203.0-blue.svg diff --git a/app.js b/app.js index 3d43a49..2addb94 100644 --- a/app.js +++ b/app.js @@ -17,7 +17,7 @@ const bodyParser = require('body-parser'); const compression = require('compression'); const createClient = require('pa11y-webservice-client-node'); -const EventEmitter = require('events').EventEmitter; +const {EventEmitter} = require('events'); const express = require('express'); const hbs = require('express-hbs'); const morgan = require('morgan'); @@ -27,7 +27,6 @@ const pkg = require('./package.json'); module.exports = initApp; -// Initialise the application function initApp(config, callback) { config = defaultConfig(config); @@ -54,7 +53,6 @@ function initApp(config, callback) { loadErrorHandling(app, config, callback); } -// Get default configurations function defaultConfig(config) { if (typeof config.noindex !== 'boolean') { config.noindex = true; @@ -66,7 +64,6 @@ function defaultConfig(config) { } function loadMiddleware(app) { - // Compression app.express.use(compression()); // Adds an ID to every request, used later for logging diff --git a/bower.json b/bower.json index 2864632..7802fbb 100644 --- a/bower.json +++ b/bower.json @@ -1,9 +1,8 @@ { "name": "pa11y-dashboard", - "dependencies": { "jquery": "~1.10", "bootstrap": "~3.0", "flot": "~0.8" } -} \ No newline at end of file +} diff --git a/config.js b/config.js index a67d5cd..9ccefad 100644 --- a/config.js +++ b/config.js @@ -15,6 +15,7 @@ 'use strict'; const fs = require('fs'); + const environment = (process.env.NODE_ENV || 'development'); const jsonPath = `./config/${environment}.json`; const jsPath = `./config/${environment}.js`; @@ -28,7 +29,6 @@ if (fs.existsSync(jsonPath)) { port: Number(env('PORT', '4000')), noindex: env('NOINDEX', 'true') === 'true', readonly: env('READONLY', 'false') === 'true', - webservice: env('WEBSERVICE_URL', { database: env('WEBSERVICE_DATABASE', 'mongodb://localhost/pa11y-webservice'), host: env('WEBSERVICE_HOST', '0.0.0.0'), diff --git a/config/development.sample.json b/config/development.sample.json index 433f43e..df66d78 100644 --- a/config/development.sample.json +++ b/config/development.sample.json @@ -2,11 +2,10 @@ "port": 4000, "noindex": true, "readonly": false, - "webservice": { "database": "mongodb://localhost/pa11y-webservice-dev", "host": "0.0.0.0", "port": 3000, "cron": "0 30 0 * * *" } -} \ No newline at end of file +} diff --git a/config/production.sample.json b/config/production.sample.json index 6057169..caeef6f 100644 --- a/config/production.sample.json +++ b/config/production.sample.json @@ -2,11 +2,10 @@ "port": 4000, "noindex": true, "readonly": false, - "webservice": { "database": "mongodb://localhost/pa11y-webservice", "host": "0.0.0.0", "port": 3000, "cron": "0 30 0 * * *" } -} \ No newline at end of file +} diff --git a/config/test.sample.json b/config/test.sample.json index 23ffdab..60f26a8 100644 --- a/config/test.sample.json +++ b/config/test.sample.json @@ -2,11 +2,10 @@ "port": 4000, "noindex": true, "readonly": false, - "webservice": { - "database": "mongodb://localhost/pa11y-webservice-test", - "host": "0.0.0.0", + "database": "mongodb://127.0.0.1/pa11y-dashboard-integration-test", + "host": "127.0.0.1", "port": 3000, "cron": "0 30 0 * * *" } -} \ No newline at end of file +} diff --git a/data/standards.js b/data/standards.js index f45da1a..b67ad94 100644 --- a/data/standards.js +++ b/data/standards.js @@ -12,13 +12,9 @@ // // You should have received a copy of the GNU General Public License // along with Pa11y Dashboard. If not, see . - -// jscs:disable maximumLineLength 'use strict'; -module.exports = getStandards; - -function getStandards() { +module.exports = function getStandards() { return [ { title: 'WCAG2A', @@ -1800,4 +1796,4 @@ function getStandards() { ] } ]; -} +}; diff --git a/data/techniques.js b/data/techniques.js index 3a07c8b..36edc3d 100644 --- a/data/techniques.js +++ b/data/techniques.js @@ -12,13 +12,9 @@ // // You should have received a copy of the GNU General Public License // along with Pa11y Dashboard. If not, see . - -// jscs:disable maximumLineLength 'use strict'; -module.exports = getTechniques; - -function getTechniques() { +module.exports = function getTechniques() { return { H30: { title: 'H30: Providing link text that describes the purpose of a link for anchor elements', @@ -713,4 +709,4 @@ function getTechniques() { url: 'https://www.w3.org/WAI/WCAG21/Techniques/failures/F96' } }; -} +}; diff --git a/package-lock.json b/package-lock.json index 69c483f..d12036a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,26 +15,27 @@ "express-hbs": "~2.4.0", "http-headers": "~3.0.2", "kleur": "~4.1.4", + "lodash.groupby": "~4.6.0", + "lodash.keys": "~4.2.0", "moment": "~2.29.4", "morgan": "~1.10.0", "nanoid": "~3.3.2", - "pa11y-webservice": "~4.0.1", - "pa11y-webservice-client-node": "~3.0.0", - "underscore": "~1.13.2" + "pa11y-webservice": "^4.3.1", + "pa11y-webservice-client-node": "~3.0.0" }, "devDependencies": { "bower": "^1.8.13", "cheerio": "^1.0.0-rc.10", "eslint": "^7.27.0", "less": "^3.11.1", - "mocha": "^8.4.0", - "pa11y-lint-config": "^2.0.0", + "mocha": "^10.2.0", + "node-fetch": "^2.7.0", + "pa11y-lint-config": "^3.0.0", "proclaim": "^3.6.0", - "request": "^2.88.2", "uglify-js": "^3.11.0" }, "engines": { - "node": ">=12 <16" + "node": ">=12" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -193,339 +194,290 @@ "dev": true }, "node_modules/@hapi/accept": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/@hapi/accept/-/accept-3.2.4.tgz", - "integrity": "sha512-soThGB+QMgfxlh0Vzhzlf3ZOEOPk5biEwcOXhkF0Eedqx8VnhGiggL9UYHrIsOb1rUg3Be3K8kp0iDL2wbVSOQ==", - "deprecated": "This version has been deprecated and is no longer supported or maintained", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@hapi/accept/-/accept-5.0.2.tgz", + "integrity": "sha512-CmzBx/bXUR8451fnZRuZAJRlzgm0Jgu5dltTX/bszmR2lheb9BpyN47Q1RbaGTsvFzn0PXAEs+lXDKfshccYZw==", "dependencies": { - "@hapi/boom": "7.x.x", - "@hapi/hoek": "8.x.x" + "@hapi/boom": "9.x.x", + "@hapi/hoek": "9.x.x" } }, - "node_modules/@hapi/address": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz", - "integrity": "sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ==", - "deprecated": "Moved to 'npm install @sideway/address'" - }, "node_modules/@hapi/ammo": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@hapi/ammo/-/ammo-3.1.2.tgz", - "integrity": "sha512-ej9OtFmiZv1qr45g1bxEZNGyaR4jRpyMxU6VhbxjaYThymvOwsyIsUKMZnP5Qw2tfYFuwqCJuIBHGpeIbdX9gQ==", - "deprecated": "This version has been deprecated and is no longer supported or maintained", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@hapi/ammo/-/ammo-5.0.1.tgz", + "integrity": "sha512-FbCNwcTbnQP4VYYhLNGZmA76xb2aHg9AMPiy18NZyWMG310P5KdFGyA9v2rm5ujrIny77dEEIkMOwl0Xv+fSSA==", "dependencies": { - "@hapi/hoek": "8.x.x" + "@hapi/hoek": "9.x.x" } }, "node_modules/@hapi/b64": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/@hapi/b64/-/b64-4.2.1.tgz", - "integrity": "sha512-zqHpQuH5CBMw6hADzKfU/IGNrxq1Q+/wTYV+OiZRQN9F3tMyk+9BUMeBvFRMamduuqL8iSp62QAnJ+7ATiYLWA==", - "deprecated": "This version has been deprecated and is no longer supported or maintained", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@hapi/b64/-/b64-5.0.0.tgz", + "integrity": "sha512-ngu0tSEmrezoiIaNGG6rRvKOUkUuDdf4XTPnONHGYfSGRmDqPZX5oJL6HAdKTo1UQHECbdB4OzhWrfgVppjHUw==", "dependencies": { - "@hapi/hoek": "8.x.x" + "@hapi/hoek": "9.x.x" } }, "node_modules/@hapi/boom": { - "version": "7.4.11", - "resolved": "https://registry.npmjs.org/@hapi/boom/-/boom-7.4.11.tgz", - "integrity": "sha512-VSU/Cnj1DXouukYxxkes4nNJonCnlogHvIff1v1RVoN4xzkKhMXX+GRmb3NyH1iar10I9WFPDv2JPwfH3GaV0A==", - "deprecated": "This version has been deprecated and is no longer supported or maintained", + "version": "9.1.4", + "resolved": "https://registry.npmjs.org/@hapi/boom/-/boom-9.1.4.tgz", + "integrity": "sha512-Ls1oH8jaN1vNsqcaHVYJrKmgMcKsC1wcp8bujvXrHaAqD2iDYq3HoOwsxwo09Cuda5R5nC0o0IxlrlTuvPuzSw==", "dependencies": { - "@hapi/hoek": "8.x.x" + "@hapi/hoek": "9.x.x" } }, "node_modules/@hapi/bounce": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/@hapi/bounce/-/bounce-1.3.2.tgz", - "integrity": "sha512-3bnb1AlcEByFZnpDIidxQyw1Gds81z/1rSqlx4bIEE+wUN0ATj0D49B5cE1wGocy90Rp/de4tv7GjsKd5RQeew==", - "deprecated": "This version has been deprecated and is no longer supported or maintained", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@hapi/bounce/-/bounce-2.0.0.tgz", + "integrity": "sha512-JesW92uyzOOyuzJKjoLHM1ThiOvHPOLDHw01YV8yh5nCso7sDwJho1h0Ad2N+E62bZyz46TG3xhAi/78Gsct6A==", "dependencies": { - "@hapi/boom": "7.x.x", - "@hapi/hoek": "^8.3.1" + "@hapi/boom": "9.x.x", + "@hapi/hoek": "9.x.x" } }, "node_modules/@hapi/bourne": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz", - "integrity": "sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA==", - "deprecated": "This version has been deprecated and is no longer supported or maintained" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@hapi/bourne/-/bourne-2.1.0.tgz", + "integrity": "sha512-i1BpaNDVLJdRBEKeJWkVO6tYX6DMFBuwMhSuWqLsY4ufeTKGVuV5rBsUhxPayXqnnWHgXUAmWK16H/ykO5Wj4Q==" }, "node_modules/@hapi/call": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/@hapi/call/-/call-5.1.3.tgz", - "integrity": "sha512-5DfWpMk7qZiYhvBhM5oUiT4GQ/O8a2rFR121/PdwA/eZ2C1EsuD547ZggMKAR5bZ+FtxOf0fdM20zzcXzq2mZA==", - "deprecated": "This version has been deprecated and is no longer supported or maintained", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@hapi/call/-/call-8.0.1.tgz", + "integrity": "sha512-bOff6GTdOnoe5b8oXRV3lwkQSb/LAWylvDMae6RgEWWntd0SHtkYbQukDHKlfaYtVnSAgIavJ0kqszF/AIBb6g==", "dependencies": { - "@hapi/boom": "7.x.x", - "@hapi/hoek": "8.x.x" + "@hapi/boom": "9.x.x", + "@hapi/hoek": "9.x.x" } }, "node_modules/@hapi/catbox": { - "version": "10.2.3", - "resolved": "https://registry.npmjs.org/@hapi/catbox/-/catbox-10.2.3.tgz", - "integrity": "sha512-kN9hXO4NYyOHW09CXiuj5qW1syc/0XeVOBsNNk0Tz89wWNQE5h21WF+VsfAw3uFR8swn/Wj3YEVBnWqo82m/JQ==", - "deprecated": "This version has been deprecated and is no longer supported or maintained", + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/@hapi/catbox/-/catbox-11.1.1.tgz", + "integrity": "sha512-u/8HvB7dD/6X8hsZIpskSDo4yMKpHxFd7NluoylhGrL6cUfYxdQPnvUp9YU2C6F9hsyBVLGulBd9vBN1ebfXOQ==", "dependencies": { - "@hapi/boom": "7.x.x", - "@hapi/hoek": "8.x.x", - "@hapi/joi": "16.x.x", - "@hapi/podium": "3.x.x" + "@hapi/boom": "9.x.x", + "@hapi/hoek": "9.x.x", + "@hapi/podium": "4.x.x", + "@hapi/validate": "1.x.x" } }, "node_modules/@hapi/catbox-memory": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@hapi/catbox-memory/-/catbox-memory-4.1.1.tgz", - "integrity": "sha512-T6Hdy8DExzG0jY7C8yYWZB4XHfc0v+p1EGkwxl2HoaPYAmW7I3E59M/IvmSVpis8RPcIoBp41ZpO2aZPBpM2Ww==", - "deprecated": "This version has been deprecated and is no longer supported or maintained", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@hapi/catbox-memory/-/catbox-memory-5.0.1.tgz", + "integrity": "sha512-QWw9nOYJq5PlvChLWV8i6hQHJYfvdqiXdvTupJFh0eqLZ64Xir7mKNi96d5/ZMUAqXPursfNDIDxjFgoEDUqeQ==", "dependencies": { - "@hapi/boom": "7.x.x", - "@hapi/hoek": "8.x.x" + "@hapi/boom": "9.x.x", + "@hapi/hoek": "9.x.x" } }, "node_modules/@hapi/content": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@hapi/content/-/content-4.1.1.tgz", - "integrity": "sha512-3TWvmwpVPxFSF3KBjKZ8yDqIKKZZIm7VurDSweYpXYENZrJH3C1hd1+qEQW9wQaUaI76pPBLGrXl6I3B7i3ipA==", - "deprecated": "This version has been deprecated and is no longer supported or maintained", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@hapi/content/-/content-5.0.2.tgz", + "integrity": "sha512-mre4dl1ygd4ZyOH3tiYBrOUBzV7Pu/EOs8VLGf58vtOEECWed8Uuw6B4iR9AN/8uQt42tB04qpVaMyoMQh0oMw==", "dependencies": { - "@hapi/boom": "7.x.x" + "@hapi/boom": "9.x.x" } }, "node_modules/@hapi/cryptiles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/@hapi/cryptiles/-/cryptiles-4.2.1.tgz", - "integrity": "sha512-XoqgKsHK0l/VpqPs+tr6j6vE+VQ3+2bkF2stvttmc7xAOf1oSAwHcJ0tlp/6MxMysktt1IEY0Csy3khKaP9/uQ==", - "deprecated": "This version has been deprecated and is no longer supported or maintained", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@hapi/cryptiles/-/cryptiles-5.1.0.tgz", + "integrity": "sha512-fo9+d1Ba5/FIoMySfMqPBR/7Pa29J2RsiPrl7bkwo5W5o+AN1dAYQRi4SPrPwwVxVGKjgLOEWrsvt1BonJSfLA==", "dependencies": { - "@hapi/boom": "7.x.x" + "@hapi/boom": "9.x.x" + }, + "engines": { + "node": ">=12.0.0" } }, "node_modules/@hapi/file": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@hapi/file/-/file-1.0.0.tgz", - "integrity": "sha512-Bsfp/+1Gyf70eGtnIgmScvrH8sSypO3TcK3Zf0QdHnzn/ACnAkI6KLtGACmNRPEzzIy+W7aJX5E+1fc9GwIABQ==", - "deprecated": "This version has been deprecated and is no longer supported or maintained" - }, - "node_modules/@hapi/formula": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@hapi/formula/-/formula-1.2.0.tgz", - "integrity": "sha512-UFbtbGPjstz0eWHb+ga/GM3Z9EzqKXFWIbSOFURU0A/Gku0Bky4bCk9/h//K2Xr3IrCfjFNhMm4jyZ5dbCewGA==", - "deprecated": "Moved to 'npm install @sideway/formula'" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@hapi/file/-/file-2.0.0.tgz", + "integrity": "sha512-WSrlgpvEqgPWkI18kkGELEZfXr0bYLtr16iIN4Krh9sRnzBZN6nnWxHFxtsnP684wueEySBbXPDg/WfA9xJdBQ==" }, "node_modules/@hapi/hapi": { - "version": "18.4.1", - "resolved": "https://registry.npmjs.org/@hapi/hapi/-/hapi-18.4.1.tgz", - "integrity": "sha512-9HjVGa0Z4Qv9jk9AVoUdJMQLA+KuZ+liKWyEEkVBx3e3H1F0JM6aGbPkY9jRfwsITBWGBU2iXazn65SFKSi/tg==", - "deprecated": "This version contains severe security issues and defects and should not be used! Please upgrade to the latest version of @hapi/hapi or consider a commercial license (https://github.com/hapijs/hapi/issues/4114)", + "version": "20.3.0", + "resolved": "https://registry.npmjs.org/@hapi/hapi/-/hapi-20.3.0.tgz", + "integrity": "sha512-zvPSRvaQyF3S6Nev9aiAzko2/hIFZmNSJNcs07qdVaVAvj8dGJSV4fVUuQSnufYJAGiSau+U5LxMLhx79se5WA==", "dependencies": { - "@hapi/accept": "^3.2.4", - "@hapi/ammo": "^3.1.2", - "@hapi/boom": "7.x.x", - "@hapi/bounce": "1.x.x", - "@hapi/call": "^5.1.3", - "@hapi/catbox": "10.x.x", - "@hapi/catbox-memory": "4.x.x", - "@hapi/heavy": "6.x.x", - "@hapi/hoek": "8.x.x", - "@hapi/joi": "15.x.x", - "@hapi/mimos": "4.x.x", - "@hapi/podium": "3.x.x", - "@hapi/shot": "4.x.x", - "@hapi/somever": "2.x.x", - "@hapi/statehood": "6.x.x", - "@hapi/subtext": "^6.1.3", - "@hapi/teamwork": "3.x.x", - "@hapi/topo": "3.x.x" - } - }, - "node_modules/@hapi/hapi/node_modules/@hapi/joi": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz", - "integrity": "sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==", - "deprecated": "Switch to 'npm install joi'", - "dependencies": { - "@hapi/address": "2.x.x", - "@hapi/bourne": "1.x.x", - "@hapi/hoek": "8.x.x", - "@hapi/topo": "3.x.x" + "@hapi/accept": "^5.0.1", + "@hapi/ammo": "^5.0.1", + "@hapi/boom": "^9.1.0", + "@hapi/bounce": "^2.0.0", + "@hapi/call": "^8.0.0", + "@hapi/catbox": "^11.1.1", + "@hapi/catbox-memory": "^5.0.0", + "@hapi/heavy": "^7.0.1", + "@hapi/hoek": "^9.0.4", + "@hapi/mimos": "^6.0.0", + "@hapi/podium": "^4.1.1", + "@hapi/shot": "^5.0.5", + "@hapi/somever": "^3.0.0", + "@hapi/statehood": "^7.0.3", + "@hapi/subtext": "^7.1.0", + "@hapi/teamwork": "^5.1.0", + "@hapi/topo": "^5.0.0", + "@hapi/validate": "^1.1.1" + }, + "engines": { + "node": ">=12.0.0" } }, "node_modules/@hapi/heavy": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/@hapi/heavy/-/heavy-6.2.2.tgz", - "integrity": "sha512-PY1dCCO6dsze7RlafIRhTaGeyTgVe49A/lSkxbhKGjQ7x46o/OFf7hLiRqTCDh3atcEKf6362EaB3+kTUbCsVA==", - "deprecated": "This version has been deprecated and is no longer supported or maintained", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/@hapi/heavy/-/heavy-7.0.1.tgz", + "integrity": "sha512-vJ/vzRQ13MtRzz6Qd4zRHWS3FaUc/5uivV2TIuExGTM9Qk+7Zzqj0e2G7EpE6KztO9SalTbiIkTh7qFKj/33cA==", "dependencies": { - "@hapi/boom": "7.x.x", - "@hapi/hoek": "8.x.x", - "@hapi/joi": "16.x.x" + "@hapi/boom": "9.x.x", + "@hapi/hoek": "9.x.x", + "@hapi/validate": "1.x.x" } }, "node_modules/@hapi/hoek": { - "version": "8.5.1", - "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz", - "integrity": "sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow==", - "deprecated": "This version has been deprecated and is no longer supported or maintained" + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz", + "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==" }, "node_modules/@hapi/iron": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/@hapi/iron/-/iron-5.1.4.tgz", - "integrity": "sha512-+ElC+OCiwWLjlJBmm8ZEWjlfzTMQTdgPnU/TsoU5QsktspIWmWi9IU4kU83nH+X/SSya8TP8h8P11Wr5L7dkQQ==", - "deprecated": "This version has been deprecated and is no longer supported or maintained", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@hapi/iron/-/iron-6.0.0.tgz", + "integrity": "sha512-zvGvWDufiTGpTJPG1Y/McN8UqWBu0k/xs/7l++HVU535NLHXsHhy54cfEMdW7EjwKfbBfM9Xy25FmTiobb7Hvw==", "dependencies": { - "@hapi/b64": "4.x.x", - "@hapi/boom": "7.x.x", - "@hapi/bourne": "1.x.x", - "@hapi/cryptiles": "4.x.x", - "@hapi/hoek": "8.x.x" - } - }, - "node_modules/@hapi/joi": { - "version": "16.1.8", - "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-16.1.8.tgz", - "integrity": "sha512-wAsVvTPe+FwSrsAurNt5vkg3zo+TblvC5Bb1zMVK6SJzZqw9UrJnexxR+76cpePmtUZKHAPxcQ2Bf7oVHyahhg==", - "deprecated": "Switch to 'npm install joi'", - "dependencies": { - "@hapi/address": "^2.1.2", - "@hapi/formula": "^1.2.0", - "@hapi/hoek": "^8.2.4", - "@hapi/pinpoint": "^1.0.2", - "@hapi/topo": "^3.1.3" + "@hapi/b64": "5.x.x", + "@hapi/boom": "9.x.x", + "@hapi/bourne": "2.x.x", + "@hapi/cryptiles": "5.x.x", + "@hapi/hoek": "9.x.x" } }, "node_modules/@hapi/mimos": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@hapi/mimos/-/mimos-4.1.1.tgz", - "integrity": "sha512-CXoi/zfcTWfKYX756eEea8rXJRIb9sR4d7VwyAH9d3BkDyNgAesZxvqIdm55npQc6S9mU3FExinMAQVlIkz0eA==", - "deprecated": "This version has been deprecated and is no longer supported or maintained", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@hapi/mimos/-/mimos-6.0.0.tgz", + "integrity": "sha512-Op/67tr1I+JafN3R3XN5DucVSxKRT/Tc+tUszDwENoNpolxeXkhrJ2Czt6B6AAqrespHoivhgZBWYSuANN9QXg==", "dependencies": { - "@hapi/hoek": "8.x.x", + "@hapi/hoek": "9.x.x", "mime-db": "1.x.x" } }, "node_modules/@hapi/nigel": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@hapi/nigel/-/nigel-3.1.1.tgz", - "integrity": "sha512-R9YWx4S8yu0gcCBrMUDCiEFm1SQT895dMlYoeNBp8I6YhF1BFF1iYPueKA2Kkp9BvyHdjmvrxCOns7GMmpl+Fw==", - "deprecated": "This version has been deprecated and is no longer supported or maintained", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@hapi/nigel/-/nigel-4.0.2.tgz", + "integrity": "sha512-ht2KoEsDW22BxQOEkLEJaqfpoKPXxi7tvabXy7B/77eFtOyG5ZEstfZwxHQcqAiZhp58Ae5vkhEqI03kawkYNw==", "dependencies": { - "@hapi/hoek": "8.x.x", - "@hapi/vise": "3.x.x" + "@hapi/hoek": "^9.0.4", + "@hapi/vise": "^4.0.0" + }, + "engines": { + "node": ">=12.0.0" } }, "node_modules/@hapi/pez": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/@hapi/pez/-/pez-4.1.2.tgz", - "integrity": "sha512-8zSdJ8cZrJLFldTgwjU9Fb1JebID+aBCrCsycgqKYe0OZtM2r3Yv3aAwW5z97VsZWCROC1Vx6Mdn4rujh5Ktcg==", - "deprecated": "This version has been deprecated and is no longer supported or maintained", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@hapi/pez/-/pez-5.1.0.tgz", + "integrity": "sha512-YfB0btnkLB3lb6Ry/1KifnMPBm5ZPfaAHWFskzOMAgDgXgcBgA+zjpIynyEiBfWEz22DBT8o1e2tAaBdlt8zbw==", "dependencies": { - "@hapi/b64": "4.x.x", - "@hapi/boom": "7.x.x", - "@hapi/content": "^4.1.1", - "@hapi/hoek": "8.x.x", - "@hapi/nigel": "3.x.x" + "@hapi/b64": "5.x.x", + "@hapi/boom": "9.x.x", + "@hapi/content": "^5.0.2", + "@hapi/hoek": "9.x.x", + "@hapi/nigel": "4.x.x" } }, - "node_modules/@hapi/pinpoint": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@hapi/pinpoint/-/pinpoint-1.0.2.tgz", - "integrity": "sha512-dtXC/WkZBfC5vxscazuiJ6iq4j9oNx1SHknmIr8hofarpKUZKmlUVYVIhNVzIEgK5Wrc4GMHL5lZtt1uS2flmQ==", - "deprecated": "Moved to 'npm install @sideway/pinpoint'" - }, "node_modules/@hapi/podium": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/@hapi/podium/-/podium-3.4.3.tgz", - "integrity": "sha512-QJlnYLEYZWlKQ9fSOtuUcpANyoVGwT68GA9P0iQQCAetBK0fI+nbRBt58+aMixoifczWZUthuGkNjqKxgPh/CQ==", - "deprecated": "This version has been deprecated and is no longer supported or maintained", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@hapi/podium/-/podium-4.1.3.tgz", + "integrity": "sha512-ljsKGQzLkFqnQxE7qeanvgGj4dejnciErYd30dbrYzUOF/FyS/DOF97qcrT3bhoVwCYmxa6PEMhxfCPlnUcD2g==", "dependencies": { - "@hapi/hoek": "8.x.x", - "@hapi/joi": "16.x.x" + "@hapi/hoek": "9.x.x", + "@hapi/teamwork": "5.x.x", + "@hapi/validate": "1.x.x" } }, "node_modules/@hapi/shot": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/@hapi/shot/-/shot-4.1.2.tgz", - "integrity": "sha512-6LeHLjvsq/bQ0R+fhEyr7mqExRGguNTrxFZf5DyKe3CK6pNabiGgYO4JVFaRrLZ3JyuhkS0fo8iiRE2Ql2oA/A==", - "deprecated": "This version has been deprecated and is no longer supported or maintained", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/@hapi/shot/-/shot-5.0.5.tgz", + "integrity": "sha512-x5AMSZ5+j+Paa8KdfCoKh+klB78otxF+vcJR/IoN91Vo2e5ulXIW6HUsFTCU+4W6P/Etaip9nmdAx2zWDimB2A==", "dependencies": { - "@hapi/hoek": "8.x.x", - "@hapi/joi": "16.x.x" + "@hapi/hoek": "9.x.x", + "@hapi/validate": "1.x.x" } }, "node_modules/@hapi/somever": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@hapi/somever/-/somever-2.1.1.tgz", - "integrity": "sha512-cic5Sto4KGd9B0oQSdKTokju+rYhCbdpzbMb0EBnrH5Oc1z048hY8PaZ1lx2vBD7I/XIfTQVQetBH57fU51XRA==", - "deprecated": "This version has been deprecated and is no longer supported or maintained", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@hapi/somever/-/somever-3.0.1.tgz", + "integrity": "sha512-4ZTSN3YAHtgpY/M4GOtHUXgi6uZtG9nEZfNI6QrArhK0XN/RDVgijlb9kOmXwCR5VclDSkBul9FBvhSuKXx9+w==", "dependencies": { - "@hapi/bounce": "1.x.x", - "@hapi/hoek": "8.x.x" + "@hapi/bounce": "2.x.x", + "@hapi/hoek": "9.x.x" } }, "node_modules/@hapi/statehood": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/@hapi/statehood/-/statehood-6.1.2.tgz", - "integrity": "sha512-pYXw1x6npz/UfmtcpUhuMvdK5kuOGTKcJNfLqdNptzietK2UZH5RzNJSlv5bDHeSmordFM3kGItcuQWX2lj2nQ==", - "deprecated": "This version has been deprecated and is no longer supported or maintained", + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/@hapi/statehood/-/statehood-7.0.4.tgz", + "integrity": "sha512-Fia6atroOVmc5+2bNOxF6Zv9vpbNAjEXNcUbWXavDqhnJDlchwUUwKS5LCi5mGtCTxRhUKKHwuxuBZJkmLZ7fw==", "dependencies": { - "@hapi/boom": "7.x.x", - "@hapi/bounce": "1.x.x", - "@hapi/bourne": "1.x.x", - "@hapi/cryptiles": "4.x.x", - "@hapi/hoek": "8.x.x", - "@hapi/iron": "5.x.x", - "@hapi/joi": "16.x.x" + "@hapi/boom": "9.x.x", + "@hapi/bounce": "2.x.x", + "@hapi/bourne": "2.x.x", + "@hapi/cryptiles": "5.x.x", + "@hapi/hoek": "9.x.x", + "@hapi/iron": "6.x.x", + "@hapi/validate": "1.x.x" } }, "node_modules/@hapi/subtext": { - "version": "6.1.3", - "resolved": "https://registry.npmjs.org/@hapi/subtext/-/subtext-6.1.3.tgz", - "integrity": "sha512-qWN6NbiHNzohVcJMeAlpku/vzbyH4zIpnnMPMPioQMwIxbPFKeNViDCNI6fVBbMPBiw/xB4FjqiJkRG5P9eWWg==", - "deprecated": "This version has been deprecated and is no longer supported or maintained", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@hapi/subtext/-/subtext-7.1.0.tgz", + "integrity": "sha512-n94cU6hlvsNRIpXaROzBNEJGwxC+HA69q769pChzej84On8vsU14guHDub7Pphr/pqn5b93zV3IkMPDU5AUiXA==", "dependencies": { - "@hapi/boom": "7.x.x", - "@hapi/bourne": "1.x.x", - "@hapi/content": "^4.1.1", - "@hapi/file": "1.x.x", - "@hapi/hoek": "8.x.x", - "@hapi/pez": "^4.1.2", - "@hapi/wreck": "15.x.x" + "@hapi/boom": "9.x.x", + "@hapi/bourne": "2.x.x", + "@hapi/content": "^5.0.2", + "@hapi/file": "2.x.x", + "@hapi/hoek": "9.x.x", + "@hapi/pez": "^5.1.0", + "@hapi/wreck": "17.x.x" } }, "node_modules/@hapi/teamwork": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/@hapi/teamwork/-/teamwork-3.3.1.tgz", - "integrity": "sha512-61tiqWCYvMKP7fCTXy0M4VE6uNIwA0qvgFoiDubgfj7uqJ0fdHJFQNnVPGrxhLWlwz0uBPWrQlBH7r8y9vFITQ==", - "deprecated": "This version has been deprecated and is no longer supported or maintained" + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/@hapi/teamwork/-/teamwork-5.1.1.tgz", + "integrity": "sha512-1oPx9AE5TIv+V6Ih54RP9lTZBso3rP8j4Xhb6iSVwPXtAM+sDopl5TFMv5Paw73UnpZJ9gjcrTE1BXrWt9eQrg==", + "engines": { + "node": ">=12.0.0" + } }, "node_modules/@hapi/topo": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz", - "integrity": "sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ==", - "deprecated": "This version has been deprecated and is no longer supported or maintained", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz", + "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==", "dependencies": { - "@hapi/hoek": "^8.3.0" + "@hapi/hoek": "^9.0.0" + } + }, + "node_modules/@hapi/validate": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@hapi/validate/-/validate-1.1.3.tgz", + "integrity": "sha512-/XMR0N0wjw0Twzq2pQOzPBZlDzkekGcoCtzO314BpIEsbXdYGthQUbxgkGDf4nhk1+IPDAsXqWjMohRQYO06UA==", + "dependencies": { + "@hapi/hoek": "^9.0.0", + "@hapi/topo": "^5.0.0" } }, "node_modules/@hapi/vise": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@hapi/vise/-/vise-3.1.1.tgz", - "integrity": "sha512-OXarbiCSadvtg+bSdVPqu31Z1JoBL+FwNYz3cYoBKQ5xq1/Cr4A3IkGpAZbAuxU5y4NL5pZFZG3d2a3ZGm/dOQ==", - "deprecated": "This version has been deprecated and is no longer supported or maintained", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@hapi/vise/-/vise-4.0.0.tgz", + "integrity": "sha512-eYyLkuUiFZTer59h+SGy7hUm+qE9p+UemePTHLlIWppEd+wExn3Df5jO04bFQTm7nleF5V8CtuYQYb+VFpZ6Sg==", "dependencies": { - "@hapi/hoek": "8.x.x" + "@hapi/hoek": "9.x.x" } }, "node_modules/@hapi/wreck": { - "version": "15.1.0", - "resolved": "https://registry.npmjs.org/@hapi/wreck/-/wreck-15.1.0.tgz", - "integrity": "sha512-tQczYRTTeYBmvhsek/D49En/5khcShaBEmzrAaDjMrFXKJRuF8xA8+tlq1ETLBFwGd6Do6g2OC74rt11kzawzg==", - "deprecated": "This version has been deprecated and is no longer supported or maintained", + "version": "17.2.0", + "resolved": "https://registry.npmjs.org/@hapi/wreck/-/wreck-17.2.0.tgz", + "integrity": "sha512-pJ5kjYoRPYDv+eIuiLQqhGon341fr2bNIYZjuotuPJG/3Ilzr/XtI+JAp0A86E2bYfsS3zBPABuS2ICkaXFT8g==", "dependencies": { - "@hapi/boom": "7.x.x", - "@hapi/bourne": "1.x.x", - "@hapi/hoek": "8.x.x" + "@hapi/boom": "9.x.x", + "@hapi/bourne": "2.x.x", + "@hapi/hoek": "9.x.x" } }, "node_modules/@humanwhocodes/config-array": { @@ -579,11 +531,6 @@ "@hapi/hoek": "^9.0.0" } }, - "node_modules/@sideway/address/node_modules/@hapi/hoek": { - "version": "9.3.0", - "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz", - "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==" - }, "node_modules/@sideway/formula": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz", @@ -594,6 +541,11 @@ "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz", "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==" }, + "node_modules/@types/luxon": { + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.3.4.tgz", + "integrity": "sha512-H9OXxv4EzJwE75aTPKpiGXJq+y4LFxjpsdgKwSmr503P5DkWc3AG7VAFYrFNVvqemT5DfgZJV9itYhqBHSGujA==" + }, "node_modules/@types/node": { "version": "20.9.0", "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.0.tgz", @@ -612,16 +564,11 @@ "@types/node": "*" } }, - "node_modules/@ungap/promise-all-settled": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", - "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", - "dev": true - }, "node_modules/abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", + "optional": true }, "node_modules/accepts": { "version": "1.3.8", @@ -824,9 +771,9 @@ "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==" }, "node_modules/axe-core": { - "version": "4.8.2", - "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.8.2.tgz", - "integrity": "sha512-/dlp0fxyM3R8YW7MFzaHWXrf4zzbr0vaYb23VBFCl83R7nWNPg/yaQw2Dc8jzCMmDVLhSdzH8MjrsuIUuvX+6g==", + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.2.4.tgz", + "integrity": "sha512-9AiDKFKUCWEQm1Kj4lcq7KFavLqSXdf2m/zJo+NVh4VXlW5iwXRJ6alkKmipCyYorsRnqsICH9XLubP1jBF+Og==", "engines": { "node": ">=4" } @@ -1108,36 +1055,30 @@ } }, "node_modules/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.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + ], "dependencies": { - "anymatch": "~3.1.1", + "anymatch": "~3.1.2", "braces": "~3.0.2", - "glob-parent": "~5.1.0", + "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" }, "engines": { "node": ">= 8.10.0" }, "optionalDependencies": { - "fsevents": "~2.3.1" - } - }, - "node_modules/chokidar/node_modules/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==", - "dev": true, - "dependencies": { - "picomatch": "^2.2.1" - }, - "engines": { - "node": ">=8.10.0" + "fsevents": "~2.3.2" } }, "node_modules/chownr": { @@ -1308,11 +1249,12 @@ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" }, "node_modules/cron": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/cron/-/cron-1.8.2.tgz", - "integrity": "sha512-Gk2c4y6xKEO8FSAUTklqtfSr7oTq0CiPQeLBG5Fl0qoXpZyMcj1SG59YL+hqq04bu6/IuEA7lMkYDAplQNKkyg==", + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/cron/-/cron-2.4.4.tgz", + "integrity": "sha512-MHlPImXJj3K7x7lyUHjtKEOl69CSlTOWxS89jiFgNkzXfvhVjhMz/nc7/EIfN9vgooZp8XTtXJ1FREdmbyXOiQ==", "dependencies": { - "moment-timezone": "^0.5.x" + "@types/luxon": "~3.3.0", + "luxon": "~3.3.0" } }, "node_modules/cross-spawn": { @@ -1529,9 +1471,9 @@ } }, "node_modules/editorconfig/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", "optional": true, "bin": { "semver": "bin/semver" @@ -2215,9 +2157,9 @@ } }, "node_modules/glob": { - "version": "7.1.7", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", - "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -2267,15 +2209,6 @@ "dev": true, "optional": true }, - "node_modules/growl": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", - "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", - "dev": true, - "engines": { - "node": ">=4.x" - } - }, "node_modules/handlebars": { "version": "4.7.7", "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz", @@ -2346,32 +2279,6 @@ "he": "bin/he" } }, - "node_modules/hogan.js": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/hogan.js/-/hogan.js-3.0.2.tgz", - "integrity": "sha512-RqGs4wavGYJWE07t35JQccByczmNUXQT0E12ZYV1VKYu5UiAU9lsos/yBAcf840+zrUQQxgVduCR5/B8nNtibg==", - "dependencies": { - "mkdirp": "0.3.0", - "nopt": "1.0.10" - }, - "bin": { - "hulk": "bin/hulk" - } - }, - "node_modules/hogan.js/node_modules/nopt": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", - "integrity": "sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==", - "dependencies": { - "abbrev": "1" - }, - "bin": { - "nopt": "bin/nopt.js" - }, - "engines": { - "node": "*" - } - }, "node_modules/hoopy": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz", @@ -2661,6 +2568,18 @@ "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" }, + "node_modules/is-unicode-supported": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/is-what": { "version": "3.14.1", "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz", @@ -2684,30 +2603,17 @@ "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, "node_modules/joi": { - "version": "17.4.3", - "resolved": "https://registry.npmjs.org/joi/-/joi-17.4.3.tgz", - "integrity": "sha512-8W3oOogFRuy2aLAdlhMpzS4fNBIMiyIa3xBaBYMFgA272/d5sob1DAth6jjo+5VrOlzbEgmbBGbU4cLrffPKog==", + "version": "17.11.0", + "resolved": "https://registry.npmjs.org/joi/-/joi-17.11.0.tgz", + "integrity": "sha512-NgB+lZLNoqISVy1rZocE9PZI36bL/77ie924Ri43yEvi9GUUMPeyVIr8KdFTMUlby1p0PBYMk9spIxEUQYqrJQ==", "dependencies": { "@hapi/hoek": "^9.0.0", "@hapi/topo": "^5.0.0", "@sideway/address": "^4.1.3", - "@sideway/formula": "^3.0.0", + "@sideway/formula": "^3.0.1", "@sideway/pinpoint": "^2.0.0" } }, - "node_modules/joi/node_modules/@hapi/hoek": { - "version": "9.3.0", - "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz", - "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==" - }, - "node_modules/joi/node_modules/@hapi/topo": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz", - "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==", - "dependencies": { - "@hapi/hoek": "^9.0.0" - } - }, "node_modules/js-beautify": { "version": "1.14.0", "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.0.tgz", @@ -2759,9 +2665,9 @@ "dev": true }, "node_modules/json-schema": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", - "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==" + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" }, "node_modules/json-schema-traverse": { "version": "0.4.1", @@ -2787,17 +2693,17 @@ "dev": true }, "node_modules/jsprim": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", - "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "engines": [ + "node >=0.6.0" + ], "dependencies": { "assert-plus": "1.0.0", "extsprintf": "1.3.0", - "json-schema": "0.4.0", + "json-schema": "0.2.3", "verror": "1.10.0" - }, - "engines": { - "node": ">=0.6.0" } }, "node_modules/keyv": { @@ -2810,9 +2716,9 @@ } }, "node_modules/kleur": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.4.tgz", - "integrity": "sha512-8QADVssbrFjivHWQU7KkMgptGTl6WAcSdlbBPY4uNF+mWr6DGcKrvY2w4FQJoXch7+fKMjj0dRrL75vk3k23OA==", + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz", + "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==", "engines": { "node": ">=6" } @@ -2881,6 +2787,16 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, + "node_modules/lodash.groupby": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.groupby/-/lodash.groupby-4.6.0.tgz", + "integrity": "sha512-5dcWxm23+VAoz+awKmBaiBvzox8+RqMgFhi7UvX9DHZr2HdxHXM/Wrf8cfKpsW37RNrvtPn6hSwNqurSILbmJw==" + }, + "node_modules/lodash.keys": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-4.2.0.tgz", + "integrity": "sha512-J79MkJcp7Df5mizHiVNpjoHXLi4HLjh9VLS/M7lQSGoQ+0oQ+lWEigREkqKyizPB1IawvQLLKY8mzEcm1tkyxQ==" + }, "node_modules/lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", @@ -2894,15 +2810,19 @@ "dev": true }, "node_modules/log-symbols": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz", - "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", + "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", "dev": true, "dependencies": { - "chalk": "^4.0.0" + "chalk": "^4.1.0", + "is-unicode-supported": "^0.1.0" }, "engines": { "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/lru-cache": { @@ -2915,6 +2835,14 @@ "yallist": "^2.1.2" } }, + "node_modules/luxon": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.3.0.tgz", + "integrity": "sha512-An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg==", + "engines": { + "node": ">=12" + } + }, "node_modules/make-dir": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", @@ -2930,9 +2858,9 @@ } }, "node_modules/make-dir/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", "dev": true, "optional": true, "bin": { @@ -3015,58 +2943,45 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/mkdirp": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz", - "integrity": "sha512-OHsdUcVAQ6pOtg5JYWpCBo9W/GySVuwvP9hueRMW7UqshC0tbfzLv8wjySTPm3tfUZ/21CE9E1pJagOA91Pxew==", - "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)", - "engines": { - "node": "*" - } - }, "node_modules/mkdirp-classic": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" }, "node_modules/mocha": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.4.0.tgz", - "integrity": "sha512-hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.2.0.tgz", + "integrity": "sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==", "dev": true, "dependencies": { - "@ungap/promise-all-settled": "1.1.2", "ansi-colors": "4.1.1", "browser-stdout": "1.3.1", - "chokidar": "3.5.1", - "debug": "4.3.1", + "chokidar": "3.5.3", + "debug": "4.3.4", "diff": "5.0.0", "escape-string-regexp": "4.0.0", "find-up": "5.0.0", - "glob": "7.1.6", - "growl": "1.10.5", + "glob": "7.2.0", "he": "1.2.0", - "js-yaml": "4.0.0", - "log-symbols": "4.0.0", - "minimatch": "3.0.4", + "js-yaml": "4.1.0", + "log-symbols": "4.1.0", + "minimatch": "5.0.1", "ms": "2.1.3", - "nanoid": "3.1.20", - "serialize-javascript": "5.0.1", + "nanoid": "3.3.3", + "serialize-javascript": "6.0.0", "strip-json-comments": "3.1.1", "supports-color": "8.1.1", - "which": "2.0.2", - "wide-align": "1.1.3", - "workerpool": "6.1.0", + "workerpool": "6.2.1", "yargs": "16.2.0", "yargs-parser": "20.2.4", "yargs-unparser": "2.0.0" }, "bin": { "_mocha": "bin/_mocha", - "mocha": "bin/mocha" + "mocha": "bin/mocha.js" }, "engines": { - "node": ">= 10.12.0" + "node": ">= 14.0.0" }, "funding": { "type": "opencollective", @@ -3088,10 +3003,19 @@ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "dev": true }, + "node_modules/mocha/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, "node_modules/mocha/node_modules/debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, "dependencies": { "ms": "2.1.2" @@ -3111,30 +3035,10 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, - "node_modules/mocha/node_modules/glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/mocha/node_modules/js-yaml": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz", - "integrity": "sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, "dependencies": { "argparse": "^2.0.1" @@ -3143,6 +3047,18 @@ "js-yaml": "bin/js-yaml.js" } }, + "node_modules/mocha/node_modules/minimatch": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz", + "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/mocha/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -3150,9 +3066,9 @@ "dev": true }, "node_modules/mocha/node_modules/nanoid": { - "version": "3.1.20", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz", - "integrity": "sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz", + "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==", "dev": true, "bin": { "nanoid": "bin/nanoid.cjs" @@ -3184,26 +3100,15 @@ "node": "*" } }, - "node_modules/moment-timezone": { - "version": "0.5.43", - "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.43.tgz", - "integrity": "sha512-72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ==", - "dependencies": { - "moment": "^2.29.4" - }, - "engines": { - "node": "*" - } - }, "node_modules/mongodb": { - "version": "3.6.12", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.6.12.tgz", - "integrity": "sha512-ErHpF4P4disEIQB8Nns2twIMVXcvmlwjpKqfVnyB/hhd/L5We48LfoBYjBjuUSiSqL6ffmcygPTgjvpy2LETRQ==", + "version": "3.7.4", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.7.4.tgz", + "integrity": "sha512-K5q8aBqEXMwWdVNh94UQTwZ6BejVbFhh1uB6c5FKtPE9eUMZPUO3sRZdgIEcHSrAWmxzpG/FeODDKL388sqRmw==", "dependencies": { "bl": "^2.2.1", "bson": "^1.1.4", "denque": "^1.4.1", - "optional-require": "^1.0.3", + "optional-require": "^1.1.8", "safe-buffer": "^5.1.2" }, "engines": { @@ -3261,6 +3166,14 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, + "node_modules/mustache": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz", + "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==", + "bin": { + "mustache": "bin/mustache" + } + }, "node_modules/nanoid": { "version": "3.3.7", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", @@ -3486,17 +3399,17 @@ } }, "node_modules/pa11y": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/pa11y/-/pa11y-6.1.1.tgz", - "integrity": "sha512-2NzqA3D9CUlDWj8WuOI4fM2P0qM1d/IUxsRRpzCOfDT5eMR1oEgmUwW2TAk+f90ff/GVck0BewdYT4et4BANew==", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/pa11y/-/pa11y-6.2.3.tgz", + "integrity": "sha512-69JoUlfW2QVmrgQAm+17XBxIvmd1u0ImFBYIHPyjC61CzAkmxO3kkbqDVxIcl0OKLvAMYSMbvfCH8kMFE9xsbg==", "dependencies": { - "axe-core": "^4.0.2", + "axe-core": "~4.2.1", "bfj": "~7.0.2", "commander": "~8.0.0", "envinfo": "~7.8.1", - "hogan.js": "^3.0.2", - "html_codesniffer": "^2.5.1", + "html_codesniffer": "~2.5.1", "kleur": "~4.1.4", + "mustache": "~4.2.0", "node.extend": "~2.0.2", "p-timeout": "~4.1.0", "puppeteer": "~9.1.1", @@ -3510,30 +3423,30 @@ } }, "node_modules/pa11y-lint-config": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pa11y-lint-config/-/pa11y-lint-config-2.0.0.tgz", - "integrity": "sha512-p/tWf4cMQk9BUzXMWgdd8DVzGH1geLwxukKN33cUaLdlrkUAgc2OkDYxNx3HqP6ipybLm2LvPzizcbBDaU0wlg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pa11y-lint-config/-/pa11y-lint-config-3.0.0.tgz", + "integrity": "sha512-3ELcP9d1ipmvwAy4FN18MT7a1c+e/JXClEhyYUE3ZN/7ammN0Lm0IFzQnJQI/FdO8BFRBDycP1TKP+0yEHh5+A==", "dev": true, "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/pa11y-webservice": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pa11y-webservice/-/pa11y-webservice-4.0.1.tgz", - "integrity": "sha512-kyZPCIghg8rDUG8khZWmnycmTWSRIyMoWSMVCyYzpq3CVxS7/dJhWFMm3fnDT5VImXnftAC4GPlsYQ76sr7mow==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/pa11y-webservice/-/pa11y-webservice-4.3.1.tgz", + "integrity": "sha512-lT6DHOYkpBl7oixKyYbBdnvy6raS7erJLKkLt6mAmJ3kEjqO7EjwUcRu+cUWod1pTuT/+5wGFQSMEkS8QuDPrg==", "dependencies": { - "@hapi/hapi": "~18.4.1", - "async": "~3.2.2", - "cron": "~1.8.2", - "joi": "~17.4.2", - "kleur": "~4.1.2", - "mongodb": "~3.6.10", - "pa11y": "~6.1.0", - "underscore": "~1.13.1" + "@hapi/hapi": "~20.3.0", + "async": "~3.2.4", + "cron": "~2.4.4", + "joi": "~17.11.0", + "kleur": "~4.1.5", + "lodash.groupby": "~4.6.0", + "mongodb": "~3.7.3", + "pa11y": "^6.2.3" }, "engines": { - "node": ">=12 <16" + "node": ">=12" } }, "node_modules/pa11y-webservice-client-node": { @@ -3988,9 +3901,9 @@ } }, "node_modules/request/node_modules/qs": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz", - "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==", + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", "engines": { "node": ">=0.6" } @@ -4128,9 +4041,9 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/serialize-javascript": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz", - "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", + "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", "dev": true, "dependencies": { "randombytes": "^2.1.0" @@ -4531,11 +4444,6 @@ "through": "^2.3.8" } }, - "node_modules/underscore": { - "version": "1.13.6", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz", - "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==" - }, "node_modules/undici-types": { "version": "5.26.5", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", @@ -4671,67 +4579,15 @@ "node": ">= 8" } }, - "node_modules/wide-align": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", - "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", - "dev": true, - "dependencies": { - "string-width": "^1.0.2 || 2" - } - }, - "node_modules/wide-align/node_modules/ansi-regex": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz", - "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/wide-align/node_modules/is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/wide-align/node_modules/string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "dependencies": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/wide-align/node_modules/strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "dependencies": { - "ansi-regex": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/wordwrap": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=" }, "node_modules/workerpool": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz", - "integrity": "sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz", + "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==", "dev": true }, "node_modules/wrap-ansi": { @@ -4981,308 +4837,278 @@ } }, "@hapi/accept": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/@hapi/accept/-/accept-3.2.4.tgz", - "integrity": "sha512-soThGB+QMgfxlh0Vzhzlf3ZOEOPk5biEwcOXhkF0Eedqx8VnhGiggL9UYHrIsOb1rUg3Be3K8kp0iDL2wbVSOQ==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@hapi/accept/-/accept-5.0.2.tgz", + "integrity": "sha512-CmzBx/bXUR8451fnZRuZAJRlzgm0Jgu5dltTX/bszmR2lheb9BpyN47Q1RbaGTsvFzn0PXAEs+lXDKfshccYZw==", "requires": { - "@hapi/boom": "7.x.x", - "@hapi/hoek": "8.x.x" + "@hapi/boom": "9.x.x", + "@hapi/hoek": "9.x.x" } }, - "@hapi/address": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz", - "integrity": "sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ==" - }, "@hapi/ammo": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@hapi/ammo/-/ammo-3.1.2.tgz", - "integrity": "sha512-ej9OtFmiZv1qr45g1bxEZNGyaR4jRpyMxU6VhbxjaYThymvOwsyIsUKMZnP5Qw2tfYFuwqCJuIBHGpeIbdX9gQ==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@hapi/ammo/-/ammo-5.0.1.tgz", + "integrity": "sha512-FbCNwcTbnQP4VYYhLNGZmA76xb2aHg9AMPiy18NZyWMG310P5KdFGyA9v2rm5ujrIny77dEEIkMOwl0Xv+fSSA==", "requires": { - "@hapi/hoek": "8.x.x" + "@hapi/hoek": "9.x.x" } }, "@hapi/b64": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/@hapi/b64/-/b64-4.2.1.tgz", - "integrity": "sha512-zqHpQuH5CBMw6hADzKfU/IGNrxq1Q+/wTYV+OiZRQN9F3tMyk+9BUMeBvFRMamduuqL8iSp62QAnJ+7ATiYLWA==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@hapi/b64/-/b64-5.0.0.tgz", + "integrity": "sha512-ngu0tSEmrezoiIaNGG6rRvKOUkUuDdf4XTPnONHGYfSGRmDqPZX5oJL6HAdKTo1UQHECbdB4OzhWrfgVppjHUw==", "requires": { - "@hapi/hoek": "8.x.x" + "@hapi/hoek": "9.x.x" } }, "@hapi/boom": { - "version": "7.4.11", - "resolved": "https://registry.npmjs.org/@hapi/boom/-/boom-7.4.11.tgz", - "integrity": "sha512-VSU/Cnj1DXouukYxxkes4nNJonCnlogHvIff1v1RVoN4xzkKhMXX+GRmb3NyH1iar10I9WFPDv2JPwfH3GaV0A==", + "version": "9.1.4", + "resolved": "https://registry.npmjs.org/@hapi/boom/-/boom-9.1.4.tgz", + "integrity": "sha512-Ls1oH8jaN1vNsqcaHVYJrKmgMcKsC1wcp8bujvXrHaAqD2iDYq3HoOwsxwo09Cuda5R5nC0o0IxlrlTuvPuzSw==", "requires": { - "@hapi/hoek": "8.x.x" + "@hapi/hoek": "9.x.x" } }, "@hapi/bounce": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/@hapi/bounce/-/bounce-1.3.2.tgz", - "integrity": "sha512-3bnb1AlcEByFZnpDIidxQyw1Gds81z/1rSqlx4bIEE+wUN0ATj0D49B5cE1wGocy90Rp/de4tv7GjsKd5RQeew==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@hapi/bounce/-/bounce-2.0.0.tgz", + "integrity": "sha512-JesW92uyzOOyuzJKjoLHM1ThiOvHPOLDHw01YV8yh5nCso7sDwJho1h0Ad2N+E62bZyz46TG3xhAi/78Gsct6A==", "requires": { - "@hapi/boom": "7.x.x", - "@hapi/hoek": "^8.3.1" + "@hapi/boom": "9.x.x", + "@hapi/hoek": "9.x.x" } }, "@hapi/bourne": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz", - "integrity": "sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA==" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@hapi/bourne/-/bourne-2.1.0.tgz", + "integrity": "sha512-i1BpaNDVLJdRBEKeJWkVO6tYX6DMFBuwMhSuWqLsY4ufeTKGVuV5rBsUhxPayXqnnWHgXUAmWK16H/ykO5Wj4Q==" }, "@hapi/call": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/@hapi/call/-/call-5.1.3.tgz", - "integrity": "sha512-5DfWpMk7qZiYhvBhM5oUiT4GQ/O8a2rFR121/PdwA/eZ2C1EsuD547ZggMKAR5bZ+FtxOf0fdM20zzcXzq2mZA==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@hapi/call/-/call-8.0.1.tgz", + "integrity": "sha512-bOff6GTdOnoe5b8oXRV3lwkQSb/LAWylvDMae6RgEWWntd0SHtkYbQukDHKlfaYtVnSAgIavJ0kqszF/AIBb6g==", "requires": { - "@hapi/boom": "7.x.x", - "@hapi/hoek": "8.x.x" + "@hapi/boom": "9.x.x", + "@hapi/hoek": "9.x.x" } }, "@hapi/catbox": { - "version": "10.2.3", - "resolved": "https://registry.npmjs.org/@hapi/catbox/-/catbox-10.2.3.tgz", - "integrity": "sha512-kN9hXO4NYyOHW09CXiuj5qW1syc/0XeVOBsNNk0Tz89wWNQE5h21WF+VsfAw3uFR8swn/Wj3YEVBnWqo82m/JQ==", + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/@hapi/catbox/-/catbox-11.1.1.tgz", + "integrity": "sha512-u/8HvB7dD/6X8hsZIpskSDo4yMKpHxFd7NluoylhGrL6cUfYxdQPnvUp9YU2C6F9hsyBVLGulBd9vBN1ebfXOQ==", "requires": { - "@hapi/boom": "7.x.x", - "@hapi/hoek": "8.x.x", - "@hapi/joi": "16.x.x", - "@hapi/podium": "3.x.x" + "@hapi/boom": "9.x.x", + "@hapi/hoek": "9.x.x", + "@hapi/podium": "4.x.x", + "@hapi/validate": "1.x.x" } }, "@hapi/catbox-memory": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@hapi/catbox-memory/-/catbox-memory-4.1.1.tgz", - "integrity": "sha512-T6Hdy8DExzG0jY7C8yYWZB4XHfc0v+p1EGkwxl2HoaPYAmW7I3E59M/IvmSVpis8RPcIoBp41ZpO2aZPBpM2Ww==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@hapi/catbox-memory/-/catbox-memory-5.0.1.tgz", + "integrity": "sha512-QWw9nOYJq5PlvChLWV8i6hQHJYfvdqiXdvTupJFh0eqLZ64Xir7mKNi96d5/ZMUAqXPursfNDIDxjFgoEDUqeQ==", "requires": { - "@hapi/boom": "7.x.x", - "@hapi/hoek": "8.x.x" + "@hapi/boom": "9.x.x", + "@hapi/hoek": "9.x.x" } }, "@hapi/content": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@hapi/content/-/content-4.1.1.tgz", - "integrity": "sha512-3TWvmwpVPxFSF3KBjKZ8yDqIKKZZIm7VurDSweYpXYENZrJH3C1hd1+qEQW9wQaUaI76pPBLGrXl6I3B7i3ipA==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@hapi/content/-/content-5.0.2.tgz", + "integrity": "sha512-mre4dl1ygd4ZyOH3tiYBrOUBzV7Pu/EOs8VLGf58vtOEECWed8Uuw6B4iR9AN/8uQt42tB04qpVaMyoMQh0oMw==", "requires": { - "@hapi/boom": "7.x.x" + "@hapi/boom": "9.x.x" } }, "@hapi/cryptiles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/@hapi/cryptiles/-/cryptiles-4.2.1.tgz", - "integrity": "sha512-XoqgKsHK0l/VpqPs+tr6j6vE+VQ3+2bkF2stvttmc7xAOf1oSAwHcJ0tlp/6MxMysktt1IEY0Csy3khKaP9/uQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@hapi/cryptiles/-/cryptiles-5.1.0.tgz", + "integrity": "sha512-fo9+d1Ba5/FIoMySfMqPBR/7Pa29J2RsiPrl7bkwo5W5o+AN1dAYQRi4SPrPwwVxVGKjgLOEWrsvt1BonJSfLA==", "requires": { - "@hapi/boom": "7.x.x" + "@hapi/boom": "9.x.x" } }, "@hapi/file": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@hapi/file/-/file-1.0.0.tgz", - "integrity": "sha512-Bsfp/+1Gyf70eGtnIgmScvrH8sSypO3TcK3Zf0QdHnzn/ACnAkI6KLtGACmNRPEzzIy+W7aJX5E+1fc9GwIABQ==" - }, - "@hapi/formula": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@hapi/formula/-/formula-1.2.0.tgz", - "integrity": "sha512-UFbtbGPjstz0eWHb+ga/GM3Z9EzqKXFWIbSOFURU0A/Gku0Bky4bCk9/h//K2Xr3IrCfjFNhMm4jyZ5dbCewGA==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@hapi/file/-/file-2.0.0.tgz", + "integrity": "sha512-WSrlgpvEqgPWkI18kkGELEZfXr0bYLtr16iIN4Krh9sRnzBZN6nnWxHFxtsnP684wueEySBbXPDg/WfA9xJdBQ==" }, "@hapi/hapi": { - "version": "18.4.1", - "resolved": "https://registry.npmjs.org/@hapi/hapi/-/hapi-18.4.1.tgz", - "integrity": "sha512-9HjVGa0Z4Qv9jk9AVoUdJMQLA+KuZ+liKWyEEkVBx3e3H1F0JM6aGbPkY9jRfwsITBWGBU2iXazn65SFKSi/tg==", + "version": "20.3.0", + "resolved": "https://registry.npmjs.org/@hapi/hapi/-/hapi-20.3.0.tgz", + "integrity": "sha512-zvPSRvaQyF3S6Nev9aiAzko2/hIFZmNSJNcs07qdVaVAvj8dGJSV4fVUuQSnufYJAGiSau+U5LxMLhx79se5WA==", "requires": { - "@hapi/accept": "^3.2.4", - "@hapi/ammo": "^3.1.2", - "@hapi/boom": "7.x.x", - "@hapi/bounce": "1.x.x", - "@hapi/call": "^5.1.3", - "@hapi/catbox": "10.x.x", - "@hapi/catbox-memory": "4.x.x", - "@hapi/heavy": "6.x.x", - "@hapi/hoek": "8.x.x", - "@hapi/joi": "15.x.x", - "@hapi/mimos": "4.x.x", - "@hapi/podium": "3.x.x", - "@hapi/shot": "4.x.x", - "@hapi/somever": "2.x.x", - "@hapi/statehood": "6.x.x", - "@hapi/subtext": "^6.1.3", - "@hapi/teamwork": "3.x.x", - "@hapi/topo": "3.x.x" - }, - "dependencies": { - "@hapi/joi": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz", - "integrity": "sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==", - "requires": { - "@hapi/address": "2.x.x", - "@hapi/bourne": "1.x.x", - "@hapi/hoek": "8.x.x", - "@hapi/topo": "3.x.x" - } - } + "@hapi/accept": "^5.0.1", + "@hapi/ammo": "^5.0.1", + "@hapi/boom": "^9.1.0", + "@hapi/bounce": "^2.0.0", + "@hapi/call": "^8.0.0", + "@hapi/catbox": "^11.1.1", + "@hapi/catbox-memory": "^5.0.0", + "@hapi/heavy": "^7.0.1", + "@hapi/hoek": "^9.0.4", + "@hapi/mimos": "^6.0.0", + "@hapi/podium": "^4.1.1", + "@hapi/shot": "^5.0.5", + "@hapi/somever": "^3.0.0", + "@hapi/statehood": "^7.0.3", + "@hapi/subtext": "^7.1.0", + "@hapi/teamwork": "^5.1.0", + "@hapi/topo": "^5.0.0", + "@hapi/validate": "^1.1.1" } }, "@hapi/heavy": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/@hapi/heavy/-/heavy-6.2.2.tgz", - "integrity": "sha512-PY1dCCO6dsze7RlafIRhTaGeyTgVe49A/lSkxbhKGjQ7x46o/OFf7hLiRqTCDh3atcEKf6362EaB3+kTUbCsVA==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/@hapi/heavy/-/heavy-7.0.1.tgz", + "integrity": "sha512-vJ/vzRQ13MtRzz6Qd4zRHWS3FaUc/5uivV2TIuExGTM9Qk+7Zzqj0e2G7EpE6KztO9SalTbiIkTh7qFKj/33cA==", "requires": { - "@hapi/boom": "7.x.x", - "@hapi/hoek": "8.x.x", - "@hapi/joi": "16.x.x" + "@hapi/boom": "9.x.x", + "@hapi/hoek": "9.x.x", + "@hapi/validate": "1.x.x" } }, "@hapi/hoek": { - "version": "8.5.1", - "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz", - "integrity": "sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow==" + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz", + "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==" }, "@hapi/iron": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/@hapi/iron/-/iron-5.1.4.tgz", - "integrity": "sha512-+ElC+OCiwWLjlJBmm8ZEWjlfzTMQTdgPnU/TsoU5QsktspIWmWi9IU4kU83nH+X/SSya8TP8h8P11Wr5L7dkQQ==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@hapi/iron/-/iron-6.0.0.tgz", + "integrity": "sha512-zvGvWDufiTGpTJPG1Y/McN8UqWBu0k/xs/7l++HVU535NLHXsHhy54cfEMdW7EjwKfbBfM9Xy25FmTiobb7Hvw==", "requires": { - "@hapi/b64": "4.x.x", - "@hapi/boom": "7.x.x", - "@hapi/bourne": "1.x.x", - "@hapi/cryptiles": "4.x.x", - "@hapi/hoek": "8.x.x" - } - }, - "@hapi/joi": { - "version": "16.1.8", - "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-16.1.8.tgz", - "integrity": "sha512-wAsVvTPe+FwSrsAurNt5vkg3zo+TblvC5Bb1zMVK6SJzZqw9UrJnexxR+76cpePmtUZKHAPxcQ2Bf7oVHyahhg==", - "requires": { - "@hapi/address": "^2.1.2", - "@hapi/formula": "^1.2.0", - "@hapi/hoek": "^8.2.4", - "@hapi/pinpoint": "^1.0.2", - "@hapi/topo": "^3.1.3" + "@hapi/b64": "5.x.x", + "@hapi/boom": "9.x.x", + "@hapi/bourne": "2.x.x", + "@hapi/cryptiles": "5.x.x", + "@hapi/hoek": "9.x.x" } }, "@hapi/mimos": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@hapi/mimos/-/mimos-4.1.1.tgz", - "integrity": "sha512-CXoi/zfcTWfKYX756eEea8rXJRIb9sR4d7VwyAH9d3BkDyNgAesZxvqIdm55npQc6S9mU3FExinMAQVlIkz0eA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@hapi/mimos/-/mimos-6.0.0.tgz", + "integrity": "sha512-Op/67tr1I+JafN3R3XN5DucVSxKRT/Tc+tUszDwENoNpolxeXkhrJ2Czt6B6AAqrespHoivhgZBWYSuANN9QXg==", "requires": { - "@hapi/hoek": "8.x.x", + "@hapi/hoek": "9.x.x", "mime-db": "1.x.x" } }, "@hapi/nigel": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@hapi/nigel/-/nigel-3.1.1.tgz", - "integrity": "sha512-R9YWx4S8yu0gcCBrMUDCiEFm1SQT895dMlYoeNBp8I6YhF1BFF1iYPueKA2Kkp9BvyHdjmvrxCOns7GMmpl+Fw==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@hapi/nigel/-/nigel-4.0.2.tgz", + "integrity": "sha512-ht2KoEsDW22BxQOEkLEJaqfpoKPXxi7tvabXy7B/77eFtOyG5ZEstfZwxHQcqAiZhp58Ae5vkhEqI03kawkYNw==", "requires": { - "@hapi/hoek": "8.x.x", - "@hapi/vise": "3.x.x" + "@hapi/hoek": "^9.0.4", + "@hapi/vise": "^4.0.0" } }, "@hapi/pez": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/@hapi/pez/-/pez-4.1.2.tgz", - "integrity": "sha512-8zSdJ8cZrJLFldTgwjU9Fb1JebID+aBCrCsycgqKYe0OZtM2r3Yv3aAwW5z97VsZWCROC1Vx6Mdn4rujh5Ktcg==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@hapi/pez/-/pez-5.1.0.tgz", + "integrity": "sha512-YfB0btnkLB3lb6Ry/1KifnMPBm5ZPfaAHWFskzOMAgDgXgcBgA+zjpIynyEiBfWEz22DBT8o1e2tAaBdlt8zbw==", "requires": { - "@hapi/b64": "4.x.x", - "@hapi/boom": "7.x.x", - "@hapi/content": "^4.1.1", - "@hapi/hoek": "8.x.x", - "@hapi/nigel": "3.x.x" + "@hapi/b64": "5.x.x", + "@hapi/boom": "9.x.x", + "@hapi/content": "^5.0.2", + "@hapi/hoek": "9.x.x", + "@hapi/nigel": "4.x.x" } }, - "@hapi/pinpoint": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@hapi/pinpoint/-/pinpoint-1.0.2.tgz", - "integrity": "sha512-dtXC/WkZBfC5vxscazuiJ6iq4j9oNx1SHknmIr8hofarpKUZKmlUVYVIhNVzIEgK5Wrc4GMHL5lZtt1uS2flmQ==" - }, "@hapi/podium": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/@hapi/podium/-/podium-3.4.3.tgz", - "integrity": "sha512-QJlnYLEYZWlKQ9fSOtuUcpANyoVGwT68GA9P0iQQCAetBK0fI+nbRBt58+aMixoifczWZUthuGkNjqKxgPh/CQ==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@hapi/podium/-/podium-4.1.3.tgz", + "integrity": "sha512-ljsKGQzLkFqnQxE7qeanvgGj4dejnciErYd30dbrYzUOF/FyS/DOF97qcrT3bhoVwCYmxa6PEMhxfCPlnUcD2g==", "requires": { - "@hapi/hoek": "8.x.x", - "@hapi/joi": "16.x.x" + "@hapi/hoek": "9.x.x", + "@hapi/teamwork": "5.x.x", + "@hapi/validate": "1.x.x" } }, "@hapi/shot": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/@hapi/shot/-/shot-4.1.2.tgz", - "integrity": "sha512-6LeHLjvsq/bQ0R+fhEyr7mqExRGguNTrxFZf5DyKe3CK6pNabiGgYO4JVFaRrLZ3JyuhkS0fo8iiRE2Ql2oA/A==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/@hapi/shot/-/shot-5.0.5.tgz", + "integrity": "sha512-x5AMSZ5+j+Paa8KdfCoKh+klB78otxF+vcJR/IoN91Vo2e5ulXIW6HUsFTCU+4W6P/Etaip9nmdAx2zWDimB2A==", "requires": { - "@hapi/hoek": "8.x.x", - "@hapi/joi": "16.x.x" + "@hapi/hoek": "9.x.x", + "@hapi/validate": "1.x.x" } }, "@hapi/somever": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@hapi/somever/-/somever-2.1.1.tgz", - "integrity": "sha512-cic5Sto4KGd9B0oQSdKTokju+rYhCbdpzbMb0EBnrH5Oc1z048hY8PaZ1lx2vBD7I/XIfTQVQetBH57fU51XRA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@hapi/somever/-/somever-3.0.1.tgz", + "integrity": "sha512-4ZTSN3YAHtgpY/M4GOtHUXgi6uZtG9nEZfNI6QrArhK0XN/RDVgijlb9kOmXwCR5VclDSkBul9FBvhSuKXx9+w==", "requires": { - "@hapi/bounce": "1.x.x", - "@hapi/hoek": "8.x.x" + "@hapi/bounce": "2.x.x", + "@hapi/hoek": "9.x.x" } }, "@hapi/statehood": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/@hapi/statehood/-/statehood-6.1.2.tgz", - "integrity": "sha512-pYXw1x6npz/UfmtcpUhuMvdK5kuOGTKcJNfLqdNptzietK2UZH5RzNJSlv5bDHeSmordFM3kGItcuQWX2lj2nQ==", + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/@hapi/statehood/-/statehood-7.0.4.tgz", + "integrity": "sha512-Fia6atroOVmc5+2bNOxF6Zv9vpbNAjEXNcUbWXavDqhnJDlchwUUwKS5LCi5mGtCTxRhUKKHwuxuBZJkmLZ7fw==", "requires": { - "@hapi/boom": "7.x.x", - "@hapi/bounce": "1.x.x", - "@hapi/bourne": "1.x.x", - "@hapi/cryptiles": "4.x.x", - "@hapi/hoek": "8.x.x", - "@hapi/iron": "5.x.x", - "@hapi/joi": "16.x.x" + "@hapi/boom": "9.x.x", + "@hapi/bounce": "2.x.x", + "@hapi/bourne": "2.x.x", + "@hapi/cryptiles": "5.x.x", + "@hapi/hoek": "9.x.x", + "@hapi/iron": "6.x.x", + "@hapi/validate": "1.x.x" } }, "@hapi/subtext": { - "version": "6.1.3", - "resolved": "https://registry.npmjs.org/@hapi/subtext/-/subtext-6.1.3.tgz", - "integrity": "sha512-qWN6NbiHNzohVcJMeAlpku/vzbyH4zIpnnMPMPioQMwIxbPFKeNViDCNI6fVBbMPBiw/xB4FjqiJkRG5P9eWWg==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@hapi/subtext/-/subtext-7.1.0.tgz", + "integrity": "sha512-n94cU6hlvsNRIpXaROzBNEJGwxC+HA69q769pChzej84On8vsU14guHDub7Pphr/pqn5b93zV3IkMPDU5AUiXA==", "requires": { - "@hapi/boom": "7.x.x", - "@hapi/bourne": "1.x.x", - "@hapi/content": "^4.1.1", - "@hapi/file": "1.x.x", - "@hapi/hoek": "8.x.x", - "@hapi/pez": "^4.1.2", - "@hapi/wreck": "15.x.x" + "@hapi/boom": "9.x.x", + "@hapi/bourne": "2.x.x", + "@hapi/content": "^5.0.2", + "@hapi/file": "2.x.x", + "@hapi/hoek": "9.x.x", + "@hapi/pez": "^5.1.0", + "@hapi/wreck": "17.x.x" } }, "@hapi/teamwork": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/@hapi/teamwork/-/teamwork-3.3.1.tgz", - "integrity": "sha512-61tiqWCYvMKP7fCTXy0M4VE6uNIwA0qvgFoiDubgfj7uqJ0fdHJFQNnVPGrxhLWlwz0uBPWrQlBH7r8y9vFITQ==" + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/@hapi/teamwork/-/teamwork-5.1.1.tgz", + "integrity": "sha512-1oPx9AE5TIv+V6Ih54RP9lTZBso3rP8j4Xhb6iSVwPXtAM+sDopl5TFMv5Paw73UnpZJ9gjcrTE1BXrWt9eQrg==" }, "@hapi/topo": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz", - "integrity": "sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz", + "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==", "requires": { - "@hapi/hoek": "^8.3.0" + "@hapi/hoek": "^9.0.0" + } + }, + "@hapi/validate": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@hapi/validate/-/validate-1.1.3.tgz", + "integrity": "sha512-/XMR0N0wjw0Twzq2pQOzPBZlDzkekGcoCtzO314BpIEsbXdYGthQUbxgkGDf4nhk1+IPDAsXqWjMohRQYO06UA==", + "requires": { + "@hapi/hoek": "^9.0.0", + "@hapi/topo": "^5.0.0" } }, "@hapi/vise": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@hapi/vise/-/vise-3.1.1.tgz", - "integrity": "sha512-OXarbiCSadvtg+bSdVPqu31Z1JoBL+FwNYz3cYoBKQ5xq1/Cr4A3IkGpAZbAuxU5y4NL5pZFZG3d2a3ZGm/dOQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@hapi/vise/-/vise-4.0.0.tgz", + "integrity": "sha512-eYyLkuUiFZTer59h+SGy7hUm+qE9p+UemePTHLlIWppEd+wExn3Df5jO04bFQTm7nleF5V8CtuYQYb+VFpZ6Sg==", "requires": { - "@hapi/hoek": "8.x.x" + "@hapi/hoek": "9.x.x" } }, "@hapi/wreck": { - "version": "15.1.0", - "resolved": "https://registry.npmjs.org/@hapi/wreck/-/wreck-15.1.0.tgz", - "integrity": "sha512-tQczYRTTeYBmvhsek/D49En/5khcShaBEmzrAaDjMrFXKJRuF8xA8+tlq1ETLBFwGd6Do6g2OC74rt11kzawzg==", + "version": "17.2.0", + "resolved": "https://registry.npmjs.org/@hapi/wreck/-/wreck-17.2.0.tgz", + "integrity": "sha512-pJ5kjYoRPYDv+eIuiLQqhGon341fr2bNIYZjuotuPJG/3Ilzr/XtI+JAp0A86E2bYfsS3zBPABuS2ICkaXFT8g==", "requires": { - "@hapi/boom": "7.x.x", - "@hapi/bourne": "1.x.x", - "@hapi/hoek": "8.x.x" + "@hapi/boom": "9.x.x", + "@hapi/bourne": "2.x.x", + "@hapi/hoek": "9.x.x" } }, "@humanwhocodes/config-array": { @@ -5325,13 +5151,6 @@ "integrity": "sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==", "requires": { "@hapi/hoek": "^9.0.0" - }, - "dependencies": { - "@hapi/hoek": { - "version": "9.3.0", - "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz", - "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==" - } } }, "@sideway/formula": { @@ -5344,6 +5163,11 @@ "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz", "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==" }, + "@types/luxon": { + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.3.4.tgz", + "integrity": "sha512-H9OXxv4EzJwE75aTPKpiGXJq+y4LFxjpsdgKwSmr503P5DkWc3AG7VAFYrFNVvqemT5DfgZJV9itYhqBHSGujA==" + }, "@types/node": { "version": "20.9.0", "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.0.tgz", @@ -5362,16 +5186,11 @@ "@types/node": "*" } }, - "@ungap/promise-all-settled": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", - "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", - "dev": true - }, "abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", + "optional": true }, "accepts": { "version": "1.3.8", @@ -5526,9 +5345,9 @@ "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==" }, "axe-core": { - "version": "4.8.2", - "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.8.2.tgz", - "integrity": "sha512-/dlp0fxyM3R8YW7MFzaHWXrf4zzbr0vaYb23VBFCl83R7nWNPg/yaQw2Dc8jzCMmDVLhSdzH8MjrsuIUuvX+6g==" + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.2.4.tgz", + "integrity": "sha512-9AiDKFKUCWEQm1Kj4lcq7KFavLqSXdf2m/zJo+NVh4VXlW5iwXRJ6alkKmipCyYorsRnqsICH9XLubP1jBF+Og==" }, "balanced-match": { "version": "1.0.2", @@ -5725,30 +5544,19 @@ } }, "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.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", "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" - }, - "dependencies": { - "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==", - "dev": true, - "requires": { - "picomatch": "^2.2.1" - } - } + "readdirp": "~3.6.0" } }, "chownr": { @@ -5885,11 +5693,12 @@ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" }, "cron": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/cron/-/cron-1.8.2.tgz", - "integrity": "sha512-Gk2c4y6xKEO8FSAUTklqtfSr7oTq0CiPQeLBG5Fl0qoXpZyMcj1SG59YL+hqq04bu6/IuEA7lMkYDAplQNKkyg==", + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/cron/-/cron-2.4.4.tgz", + "integrity": "sha512-MHlPImXJj3K7x7lyUHjtKEOl69CSlTOWxS89jiFgNkzXfvhVjhMz/nc7/EIfN9vgooZp8XTtXJ1FREdmbyXOiQ==", "requires": { - "moment-timezone": "^0.5.x" + "@types/luxon": "~3.3.0", + "luxon": "~3.3.0" } }, "cross-spawn": { @@ -6049,9 +5858,9 @@ }, "dependencies": { "semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", "optional": true } } @@ -6565,9 +6374,9 @@ } }, "glob": { - "version": "7.1.7", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", - "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -6602,12 +6411,6 @@ "dev": true, "optional": true }, - "growl": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", - "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", - "dev": true - }, "handlebars": { "version": "4.7.7", "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz", @@ -6654,25 +6457,6 @@ "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", "dev": true }, - "hogan.js": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/hogan.js/-/hogan.js-3.0.2.tgz", - "integrity": "sha512-RqGs4wavGYJWE07t35JQccByczmNUXQT0E12ZYV1VKYu5UiAU9lsos/yBAcf840+zrUQQxgVduCR5/B8nNtibg==", - "requires": { - "mkdirp": "0.3.0", - "nopt": "1.0.10" - }, - "dependencies": { - "nopt": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", - "integrity": "sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==", - "requires": { - "abbrev": "1" - } - } - } - }, "hoopy": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz", @@ -6874,6 +6658,12 @@ "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" }, + "is-unicode-supported": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "dev": true + }, "is-what": { "version": "3.14.1", "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz", @@ -6897,30 +6687,15 @@ "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, "joi": { - "version": "17.4.3", - "resolved": "https://registry.npmjs.org/joi/-/joi-17.4.3.tgz", - "integrity": "sha512-8W3oOogFRuy2aLAdlhMpzS4fNBIMiyIa3xBaBYMFgA272/d5sob1DAth6jjo+5VrOlzbEgmbBGbU4cLrffPKog==", + "version": "17.11.0", + "resolved": "https://registry.npmjs.org/joi/-/joi-17.11.0.tgz", + "integrity": "sha512-NgB+lZLNoqISVy1rZocE9PZI36bL/77ie924Ri43yEvi9GUUMPeyVIr8KdFTMUlby1p0PBYMk9spIxEUQYqrJQ==", "requires": { "@hapi/hoek": "^9.0.0", "@hapi/topo": "^5.0.0", "@sideway/address": "^4.1.3", - "@sideway/formula": "^3.0.0", + "@sideway/formula": "^3.0.1", "@sideway/pinpoint": "^2.0.0" - }, - "dependencies": { - "@hapi/hoek": { - "version": "9.3.0", - "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz", - "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==" - }, - "@hapi/topo": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz", - "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==", - "requires": { - "@hapi/hoek": "^9.0.0" - } - } } }, "js-beautify": { @@ -6963,9 +6738,9 @@ "dev": true }, "json-schema": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", - "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==" + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" }, "json-schema-traverse": { "version": "0.4.1", @@ -6990,13 +6765,13 @@ "dev": true }, "jsprim": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", - "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", "requires": { "assert-plus": "1.0.0", "extsprintf": "1.3.0", - "json-schema": "0.4.0", + "json-schema": "0.2.3", "verror": "1.10.0" } }, @@ -7010,9 +6785,9 @@ } }, "kleur": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.4.tgz", - "integrity": "sha512-8QADVssbrFjivHWQU7KkMgptGTl6WAcSdlbBPY4uNF+mWr6DGcKrvY2w4FQJoXch7+fKMjj0dRrL75vk3k23OA==" + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz", + "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==" }, "less": { "version": "3.13.1", @@ -7063,6 +6838,16 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, + "lodash.groupby": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.groupby/-/lodash.groupby-4.6.0.tgz", + "integrity": "sha512-5dcWxm23+VAoz+awKmBaiBvzox8+RqMgFhi7UvX9DHZr2HdxHXM/Wrf8cfKpsW37RNrvtPn6hSwNqurSILbmJw==" + }, + "lodash.keys": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-4.2.0.tgz", + "integrity": "sha512-J79MkJcp7Df5mizHiVNpjoHXLi4HLjh9VLS/M7lQSGoQ+0oQ+lWEigREkqKyizPB1IawvQLLKY8mzEcm1tkyxQ==" + }, "lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", @@ -7076,12 +6861,13 @@ "dev": true }, "log-symbols": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz", - "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", + "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", "dev": true, "requires": { - "chalk": "^4.0.0" + "chalk": "^4.1.0", + "is-unicode-supported": "^0.1.0" } }, "lru-cache": { @@ -7094,6 +6880,11 @@ "yallist": "^2.1.2" } }, + "luxon": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.3.0.tgz", + "integrity": "sha512-An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg==" + }, "make-dir": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", @@ -7106,9 +6897,9 @@ }, "dependencies": { "semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", "dev": true, "optional": true } @@ -7166,44 +6957,35 @@ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==" }, - "mkdirp": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz", - "integrity": "sha512-OHsdUcVAQ6pOtg5JYWpCBo9W/GySVuwvP9hueRMW7UqshC0tbfzLv8wjySTPm3tfUZ/21CE9E1pJagOA91Pxew==" - }, "mkdirp-classic": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" }, "mocha": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.4.0.tgz", - "integrity": "sha512-hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.2.0.tgz", + "integrity": "sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==", "dev": true, "requires": { - "@ungap/promise-all-settled": "1.1.2", "ansi-colors": "4.1.1", "browser-stdout": "1.3.1", - "chokidar": "3.5.1", - "debug": "4.3.1", + "chokidar": "3.5.3", + "debug": "4.3.4", "diff": "5.0.0", "escape-string-regexp": "4.0.0", "find-up": "5.0.0", - "glob": "7.1.6", - "growl": "1.10.5", + "glob": "7.2.0", "he": "1.2.0", - "js-yaml": "4.0.0", - "log-symbols": "4.0.0", - "minimatch": "3.0.4", + "js-yaml": "4.1.0", + "log-symbols": "4.1.0", + "minimatch": "5.0.1", "ms": "2.1.3", - "nanoid": "3.1.20", - "serialize-javascript": "5.0.1", + "nanoid": "3.3.3", + "serialize-javascript": "6.0.0", "strip-json-comments": "3.1.1", "supports-color": "8.1.1", - "which": "2.0.2", - "wide-align": "1.1.3", - "workerpool": "6.1.0", + "workerpool": "6.2.1", "yargs": "16.2.0", "yargs-parser": "20.2.4", "yargs-unparser": "2.0.0" @@ -7221,10 +7003,19 @@ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "dev": true }, + "brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0" + } + }, "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, "requires": { "ms": "2.1.2" @@ -7238,29 +7029,24 @@ } } }, - "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, "js-yaml": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz", - "integrity": "sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, "requires": { "argparse": "^2.0.1" } }, + "minimatch": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz", + "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==", + "dev": true, + "requires": { + "brace-expansion": "^2.0.1" + } + }, "ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -7268,9 +7054,9 @@ "dev": true }, "nanoid": { - "version": "3.1.20", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz", - "integrity": "sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz", + "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==", "dev": true }, "supports-color": { @@ -7289,23 +7075,15 @@ "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==" }, - "moment-timezone": { - "version": "0.5.43", - "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.43.tgz", - "integrity": "sha512-72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ==", - "requires": { - "moment": "^2.29.4" - } - }, "mongodb": { - "version": "3.6.12", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.6.12.tgz", - "integrity": "sha512-ErHpF4P4disEIQB8Nns2twIMVXcvmlwjpKqfVnyB/hhd/L5We48LfoBYjBjuUSiSqL6ffmcygPTgjvpy2LETRQ==", + "version": "3.7.4", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.7.4.tgz", + "integrity": "sha512-K5q8aBqEXMwWdVNh94UQTwZ6BejVbFhh1uB6c5FKtPE9eUMZPUO3sRZdgIEcHSrAWmxzpG/FeODDKL388sqRmw==", "requires": { "bl": "^2.2.1", "bson": "^1.1.4", "denque": "^1.4.1", - "optional-require": "^1.0.3", + "optional-require": "^1.1.8", "safe-buffer": "^5.1.2", "saslprep": "^1.0.0" } @@ -7334,6 +7112,11 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, + "mustache": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz", + "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==" + }, "nanoid": { "version": "3.3.7", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", @@ -7485,17 +7268,17 @@ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" }, "pa11y": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/pa11y/-/pa11y-6.1.1.tgz", - "integrity": "sha512-2NzqA3D9CUlDWj8WuOI4fM2P0qM1d/IUxsRRpzCOfDT5eMR1oEgmUwW2TAk+f90ff/GVck0BewdYT4et4BANew==", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/pa11y/-/pa11y-6.2.3.tgz", + "integrity": "sha512-69JoUlfW2QVmrgQAm+17XBxIvmd1u0ImFBYIHPyjC61CzAkmxO3kkbqDVxIcl0OKLvAMYSMbvfCH8kMFE9xsbg==", "requires": { - "axe-core": "^4.0.2", + "axe-core": "~4.2.1", "bfj": "~7.0.2", "commander": "~8.0.0", "envinfo": "~7.8.1", - "hogan.js": "^3.0.2", - "html_codesniffer": "^2.5.1", + "html_codesniffer": "~2.5.1", "kleur": "~4.1.4", + "mustache": "~4.2.0", "node.extend": "~2.0.2", "p-timeout": "~4.1.0", "puppeteer": "~9.1.1", @@ -7531,24 +7314,24 @@ } }, "pa11y-lint-config": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pa11y-lint-config/-/pa11y-lint-config-2.0.0.tgz", - "integrity": "sha512-p/tWf4cMQk9BUzXMWgdd8DVzGH1geLwxukKN33cUaLdlrkUAgc2OkDYxNx3HqP6ipybLm2LvPzizcbBDaU0wlg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pa11y-lint-config/-/pa11y-lint-config-3.0.0.tgz", + "integrity": "sha512-3ELcP9d1ipmvwAy4FN18MT7a1c+e/JXClEhyYUE3ZN/7ammN0Lm0IFzQnJQI/FdO8BFRBDycP1TKP+0yEHh5+A==", "dev": true }, "pa11y-webservice": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pa11y-webservice/-/pa11y-webservice-4.0.1.tgz", - "integrity": "sha512-kyZPCIghg8rDUG8khZWmnycmTWSRIyMoWSMVCyYzpq3CVxS7/dJhWFMm3fnDT5VImXnftAC4GPlsYQ76sr7mow==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/pa11y-webservice/-/pa11y-webservice-4.3.1.tgz", + "integrity": "sha512-lT6DHOYkpBl7oixKyYbBdnvy6raS7erJLKkLt6mAmJ3kEjqO7EjwUcRu+cUWod1pTuT/+5wGFQSMEkS8QuDPrg==", "requires": { - "@hapi/hapi": "~18.4.1", - "async": "~3.2.2", - "cron": "~1.8.2", - "joi": "~17.4.2", - "kleur": "~4.1.2", - "mongodb": "~3.6.10", - "pa11y": "~6.1.0", - "underscore": "~1.13.1" + "@hapi/hapi": "~20.3.0", + "async": "~3.2.4", + "cron": "~2.4.4", + "joi": "~17.11.0", + "kleur": "~4.1.5", + "lodash.groupby": "~4.6.0", + "mongodb": "~3.7.3", + "pa11y": "^6.2.3" } }, "pa11y-webservice-client-node": { @@ -7871,9 +7654,9 @@ }, "dependencies": { "qs": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz", - "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==" + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" } } }, @@ -7981,9 +7764,9 @@ } }, "serialize-javascript": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz", - "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", + "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", "dev": true, "requires": { "randombytes": "^2.1.0" @@ -8301,11 +8084,6 @@ "through": "^2.3.8" } }, - "underscore": { - "version": "1.13.6", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz", - "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==" - }, "undici-types": { "version": "5.26.5", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", @@ -8420,57 +8198,15 @@ "isexe": "^2.0.0" } }, - "wide-align": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", - "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", - "dev": true, - "requires": { - "string-width": "^1.0.2 || 2" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz", - "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, "wordwrap": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=" }, "workerpool": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz", - "integrity": "sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz", + "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==", "dev": true }, "wrap-ansi": { diff --git a/package.json b/package.json index c6b4806..dc04b3f 100644 --- a/package.json +++ b/package.json @@ -15,13 +15,13 @@ ], "repository": { "type": "git", - "url": "https://github.com/pa11y/dashboard.git" + "url": "https://github.com/pa11y/pa11y-dashboard.git" }, - "homepage": "https://github.com/pa11y/dashboard", - "bugs": "https://github.com/pa11y/dashboard/issues", + "homepage": "https://github.com/pa11y/pa11y-dashboard", + "bugs": "https://github.com/pa11y/pa11y-dashboard/issues", "license": "GPL-3.0", "engines": { - "node": ">=12 <16" + "node": ">=12" }, "dependencies": { "body-parser": "~1.19.2", @@ -30,26 +30,29 @@ "express-hbs": "~2.4.0", "http-headers": "~3.0.2", "kleur": "~4.1.4", + "lodash.groupby": "~4.6.0", + "lodash.keys": "~4.2.0", "moment": "~2.29.4", "morgan": "~1.10.0", "nanoid": "~3.3.2", - "pa11y-webservice": "~4.0.1", - "pa11y-webservice-client-node": "~3.0.0", - "underscore": "~1.13.2" + "pa11y-webservice": "^4.3.1", + "pa11y-webservice-client-node": "~3.0.0" }, "devDependencies": { "bower": "^1.8.13", "cheerio": "^1.0.0-rc.10", "eslint": "^7.27.0", "less": "^3.11.1", - "mocha": "^8.4.0", - "pa11y-lint-config": "^2.0.0", + "mocha": "^10.2.0", + "node-fetch": "^2.7.0", + "pa11y-lint-config": "^3.0.0", "proclaim": "^3.6.0", - "request": "^2.88.2", "uglify-js": "^3.11.0" }, "scripts": { "start": "node index.js", - "test": "make ci" + "test": "npm run test:integration", + "test:integration": "mocha 'test/integration/**/*.js' --recursive --timeout 20000 --slow 4000", + "lint": "eslint ." } } diff --git a/route/index.js b/route/index.js index 2aa46b5..0c50df9 100644 --- a/route/index.js +++ b/route/index.js @@ -16,10 +16,7 @@ const presentTask = require('../view/presenter/task'); -module.exports = route; - -// Route definition -function route(app) { +module.exports = function index(app) { app.express.get('/', (request, response, next) => { app.webservice.tasks.get({lastres: true}, (error, tasks) => { if (error) { @@ -32,4 +29,4 @@ function route(app) { }); }); }); -} +}; diff --git a/route/new.js b/route/new.js index 9abc3ad..01a6910 100644 --- a/route/new.js +++ b/route/new.js @@ -18,18 +18,15 @@ const getStandards = require('../data/standards'); const httpHeaders = require('http-headers'); -module.exports = route; - -// Route definition -function route(app) { - +module.exports = function route(app) { app.express.get('/new', (request, response) => { - const standards = getStandards().map(standard => { - if (standard.title === 'WCAG2AA') { - standard.selected = true; - } - return standard; - }); + const standards = getStandards().map( + standard => { + if (standard.title === 'WCAG2AA') { + standard.selected = true; + } + return standard; + }); response.render('new', { standards, isNewTaskPage: true @@ -37,43 +34,38 @@ function route(app) { }); app.express.post('/new', (request, response) => { - const parsedActions = parseActions(request.body.actions); - let parsedHeaders; - - if (request.body.headers) { - parsedHeaders = httpHeaders(request.body.headers, true); - } + const parsedHeaders = request.body.headers && httpHeaders(request.body.headers, true); const newTask = createNewTask(request, parsedActions, parsedHeaders); app.webservice.tasks.create(newTask, (error, task) => { - if (error) { - const standards = getStandards().map(standard => { - if (standard.title === newTask.standard) { - standard.selected = true; - } - standard.rules = standard.rules.map(rule => { - if (newTask.ignore.indexOf(rule.name) !== -1) { - rule.ignored = true; - } - return rule; - }); - return standard; - }); - newTask.actions = request.body.actions; - newTask.headers = request.body.headers; - return response.render('new', { - error, - standards, - task: newTask - }); + if (!error) { + return response.redirect(`/${task.id}?added`); } - response.redirect(`/${task.id}?added`); + + const standards = getStandards().map(standard => { + if (standard.title === newTask.standard) { + standard.selected = true; + } + standard.rules = standard.rules.map(rule => { + if (newTask.ignore.indexOf(rule.name) !== -1) { + rule.ignored = true; + } + return rule; + }); + return standard; + }); + newTask.actions = request.body.actions; + newTask.headers = request.body.headers; + response.render('new', { + error, + standards, + task: newTask + }); }); }); - -} +}; function parseActions(actions) { if (actions) { @@ -87,19 +79,19 @@ function parseActions(actions) { } } -/* eslint-disable complexity */ -function createNewTask(request, actions, headers) { + +function createNewTask({body}, actions, headers) { return { - name: request.body.name, - url: request.body.url, - standard: request.body.standard, - ignore: request.body.ignore || [], - timeout: request.body.timeout || undefined, - wait: request.body.wait || undefined, + name: body.name, + url: body.url, + standard: body.standard, + ignore: body.ignore || [], + timeout: body.timeout || undefined, + wait: body.wait || undefined, actions, - username: request.body.username || undefined, - password: request.body.password || undefined, + username: body.username || undefined, + password: body.password || undefined, headers, - hideElements: request.body.hideElements || undefined + hideElements: body.hideElements || undefined }; } diff --git a/route/result/download.js b/route/result/download.js index 2db0661..47dad18 100644 --- a/route/result/download.js +++ b/route/result/download.js @@ -16,11 +16,7 @@ const moment = require('moment'); -module.exports = route; - -// Route definition -function route(app) { - +module.exports = function download(app) { function getTaskAndResult(request, response, next) { app.webservice.task(request.params.id).get({}, (error, task) => { if (error) { @@ -83,5 +79,4 @@ function route(app) { result.task = task; response.send(result); }); - -} +}; diff --git a/route/result/index.js b/route/result/index.js index 011cf8e..0029979 100644 --- a/route/result/index.js +++ b/route/result/index.js @@ -17,19 +17,15 @@ const presentTask = require('../../view/presenter/task'); const presentResult = require('../../view/presenter/result'); -module.exports = route; - -// Route definition -function route(app) { - - app.express.get('/:id/:rid', (request, response, next) => { - app.webservice.task(request.params.id).get({}, (error, task) => { +module.exports = function resultIndex(app) { + app.express.get('/:id/:rid', ({params}, response, next) => { + app.webservice.task(params.id).get({}, (error, task) => { if (error) { return next(); } app.webservice - .task(request.params.id) - .result(request.params.rid) + .task(params.id) + .result(params.rid) .get({full: true}, (webserviceError, result) => { if (webserviceError) { return next(); @@ -42,5 +38,4 @@ function route(app) { }); }); }); - -} +}; diff --git a/route/task/delete.js b/route/task/delete.js index 6d9d946..bcc6135 100644 --- a/route/task/delete.js +++ b/route/task/delete.js @@ -16,13 +16,9 @@ const presentTask = require('../../view/presenter/task'); -module.exports = route; - -// Route definition -function route(app) { - - app.express.get('/:id/delete', (request, response, next) => { - app.webservice.task(request.params.id).get({}, (error, task) => { +module.exports = function del(app) { + app.express.get('/:id/delete', ({params}, response, next) => { + app.webservice.task(params.id).get({}, (error, task) => { if (error) { return next(); } @@ -33,13 +29,12 @@ function route(app) { }); }); - app.express.post('/:id/delete', (request, response, next) => { - app.webservice.task(request.params.id).remove(error => { + app.express.post('/:id/delete', ({params}, response, next) => { + app.webservice.task(params.id).remove(error => { if (error) { return next(); } response.redirect('/?deleted'); }); }); - -} +}; diff --git a/route/task/edit.js b/route/task/edit.js index 9fa4b55..dec77ce 100644 --- a/route/task/edit.js +++ b/route/task/edit.js @@ -18,11 +18,7 @@ const presentTask = require('../../view/presenter/task'); const getStandards = require('../../data/standards'); const httpHeaders = require('http-headers'); -module.exports = route; - -// Route definition -function route(app) { - +module.exports = function edit(app) { app.express.get('/:id/edit', (request, response, next) => { app.webservice.task(request.params.id).get({}, (error, task) => { if (error) { @@ -117,5 +113,4 @@ function route(app) { }); }); }); - -} +}; diff --git a/route/task/ignore.js b/route/task/ignore.js index 2bf4073..d0fc19c 100644 --- a/route/task/ignore.js +++ b/route/task/ignore.js @@ -1,10 +1,6 @@ 'use strict'; -module.exports = route; - -// Route definition -function route(app) { - +module.exports = function ignore(app) { app.express.post('/:id/ignore', (request, response, next) => { app.webservice.task(request.params.id).get({}, (error, task) => { if (error) { @@ -22,5 +18,4 @@ function route(app) { }); }); }); - -} +}; diff --git a/route/task/index.js b/route/task/index.js index aa14e8c..3453467 100644 --- a/route/task/index.js +++ b/route/task/index.js @@ -18,11 +18,7 @@ const presentTask = require('../../view/presenter/task'); const presentResult = require('../../view/presenter/result'); const presentResultList = require('../../view/presenter/result-list'); -module.exports = route; - -// Route definition -function route(app) { - +module.exports = function taskIndex(app) { app.express.get('/:id', (request, response, next) => { app.webservice.task(request.params.id).get({lastres: true}, (error, task) => { if (error) { @@ -47,5 +43,4 @@ function route(app) { }); }); }); - -} +}; diff --git a/route/task/run.js b/route/task/run.js index 9cb0102..3aa4a40 100644 --- a/route/task/run.js +++ b/route/task/run.js @@ -14,11 +14,7 @@ // along with Pa11y Dashboard. If not, see . 'use strict'; -module.exports = route; - -// Route definition -function route(app) { - +module.exports = function run(app) { app.express.get('/:id/run', (request, response, next) => { app.webservice.task(request.params.id).run(error => { if (error) { @@ -27,5 +23,4 @@ function route(app) { response.redirect(`/${request.params.id}?running`); }); }); - -} +}; diff --git a/route/task/unignore.js b/route/task/unignore.js index 6c9e98e..85bc827 100644 --- a/route/task/unignore.js +++ b/route/task/unignore.js @@ -2,9 +2,7 @@ module.exports = route; -// Route definition function route(app) { - app.express.post('/:id/unignore', (request, response, next) => { app.webservice.task(request.params.id).get({}, (error, task) => { if (error) { @@ -23,5 +21,4 @@ function route(app) { }); }); }); - } diff --git a/test/.eslintrc.js b/test/.eslintrc.js index a904012..e51e5ea 100644 --- a/test/.eslintrc.js +++ b/test/.eslintrc.js @@ -1,15 +1,9 @@ 'use strict'; -// Clone the main config -const config = module.exports = JSON.parse(JSON.stringify(require('../.eslintrc'))); +const config = require('../.eslintrc'); // We use `this` all over the integration tests config.rules['no-invalid-this'] = 'off'; - -// Because of our use of `this`, arrow functions -// aren't really gonna work in the integration tests config.rules['prefer-arrow-callback'] = 'off'; -// Disable max line length/statements -config.rules['max-len'] = 'off'; -config.rules['max-statements'] = 'off'; +module.exports = config; diff --git a/test/integration/helper/navigate.js b/test/integration/helper/navigate.js index 9294684..386f973 100644 --- a/test/integration/helper/navigate.js +++ b/test/integration/helper/navigate.js @@ -12,19 +12,13 @@ // // You should have received a copy of the GNU General Public License // along with Pa11y Dashboard. If not, see . - -// jscs:disable requireArrowFunctions 'use strict'; const cheerio = require('cheerio'); const request = require('request'); -module.exports = createNavigator; - -// Create a navigate function function createNavigator(baseUrl, store) { return function(opts, callback) { - store.body = null; store.dom = null; store.request = null; @@ -54,8 +48,8 @@ function createNavigator(baseUrl, store) { store.dom = cheerio.load(store.body); } callback(); - }); - }; } + +module.exports = createNavigator; diff --git a/test/integration/helper/webservice.js b/test/integration/helper/webservice.js deleted file mode 100644 index 9001e95..0000000 --- a/test/integration/helper/webservice.js +++ /dev/null @@ -1,30 +0,0 @@ -// This file is part of Pa11y Dashboard. -// -// Pa11y Dashboard is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// Pa11y Dashboard is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with Pa11y Dashboard. If not, see . - -// jscs:disable requireArrowFunctions -'use strict'; - -const createClient = require('pa11y-webservice-client-node'); - -module.exports = createWebserviceClient; - -// Create a webservice client -function createWebserviceClient(config) { - let webserviceUrl = config.webservice; - if (typeof webserviceUrl === 'object') { - webserviceUrl = `http://${webserviceUrl.host}:${webserviceUrl.port}/`; - } - return createClient(webserviceUrl); -} diff --git a/test/integration/route/index.js b/test/integration/route/index.js index 8c49f7c..ce516dd 100644 --- a/test/integration/route/index.js +++ b/test/integration/route/index.js @@ -12,14 +12,11 @@ // // You should have received a copy of the GNU General Public License // along with Pa11y Dashboard. If not, see . - -// jscs:disable maximumLineLength, requireArrowFunctions 'use strict'; const assert = require('proclaim'); -describe.only('GET /', function() { - +describe('GET /', function() { beforeEach(function(done) { const request = { method: 'GET', @@ -94,7 +91,7 @@ describe.only('GET /', function() { assert.match(tasks.eq(0).text(), /3\s*notices/i); }); - it('should display a message indicating that there are no results if the task has not been run', function() { + it('should indicate there are no results if the task has not been run', function() { const tasks = this.last.dom('[data-test=task]'); assert.match(tasks.eq(2).text(), /no results/i); }); @@ -102,5 +99,4 @@ describe.only('GET /', function() { it('should not display an alert message', function() { assert.strictEqual(this.last.dom('[data-test=alert]').length, 0); }); - }); diff --git a/test/integration/route/new.js b/test/integration/route/new.js index e1efba5..765c514 100644 --- a/test/integration/route/new.js +++ b/test/integration/route/new.js @@ -12,20 +12,16 @@ // // You should have received a copy of the GNU General Public License // along with Pa11y Dashboard. If not, see . - -// jscs:disable maximumLineLength, requireArrowFunctions 'use strict'; const assert = require('proclaim'); describe('GET /new', function() { - beforeEach(function(done) { - const request = { + this.navigate({ method: 'GET', endpoint: '/new' - }; - this.navigate(request, done); + }, done); }); it('should send a 200 status', function() { @@ -44,7 +40,6 @@ describe('GET /new', function() { }); describe('"Add New URL" form', function() { - beforeEach(function() { this.form = this.last.dom('[data-test=new-url-form]').eq(0); }); @@ -92,7 +87,7 @@ describe('GET /new', function() { it('should have a "standard" field', function() { const field = this.form.find('select[name=standard]').eq(0); assert.isDefined(field); - assert.strictEqual(field.find('option').length, 4); + assert.greaterThanOrEqual(field.find('option').length, 1); }); it('should have "ignore" fields', function() { @@ -112,15 +107,11 @@ describe('GET /new', function() { const field = this.form.find('textarea[name=headers]').eq(0); assert.isDefined(field); }); - }); - }); describe('POST /new', function() { - describe('with invalid query', function() { - beforeEach(function(done) { const request = { method: 'POST', @@ -140,22 +131,21 @@ describe('POST /new', function() { it('should display an error message', function() { assert.strictEqual(this.last.dom('[data-test=error]').length, 1); }); - }); describe('with valid query', function() { + const requestOptions = { + method: 'POST', + endpoint: '/new', + form: { + name: 'Example', + url: 'http://example.com/', + standard: 'WCAG2AA' + } + }; beforeEach(function(done) { - const request = { - method: 'POST', - endpoint: '/new', - form: { - name: 'Example', - url: 'http://example.com/', - standard: 'WCAG2AA' - } - }; - this.navigate(request, done); + this.navigate(requestOptions, done); }); it('should send a 200 status', function() { @@ -163,9 +153,18 @@ describe('POST /new', function() { }); it('should create the task', function(done) { - this.webservice.tasks.get({}, function(error, tasks) { - assert.strictEqual(tasks.length, 4); - done(error); + const getTaskCount = then => + this.webservice.tasks.get({}, (error, tasks) => { + then(tasks.length); + }); + + getTaskCount(firstTaskCount => { + this.navigate(requestOptions, () => { + getTaskCount(secondTaskCount => { + assert.strictEqual(secondTaskCount, firstTaskCount + 1); + done(); + }); + }); }); }); @@ -180,9 +179,7 @@ describe('POST /new', function() { it('should display a success message', function() { const alert = this.last.dom('[data-test=alert]').eq(0); assert.isDefined(alert); - assert.match(alert.textContent, /url has been added/i); + assert.match(alert.text(), /url has been added/i); }); - }); - }); diff --git a/test/integration/route/result/download.js b/test/integration/route/result/download.js index dd1a3c7..9869720 100644 --- a/test/integration/route/result/download.js +++ b/test/integration/route/result/download.js @@ -12,14 +12,11 @@ // // You should have received a copy of the GNU General Public License // along with Pa11y Dashboard. If not, see . - -// jscs:disable maximumLineLength, requireArrowFunctions 'use strict'; const assert = require('proclaim'); describe('GET //.csv', function() { - beforeEach(function(done) { const request = { method: 'GET', @@ -36,11 +33,9 @@ describe('GET //.csv', function() { it('should output CSV results', function() { assert.match(this.last.body, /^"code","message","type"/); }); - }); describe('GET //.json', function() { - beforeEach(function(done) { const request = { method: 'GET', @@ -64,5 +59,4 @@ describe('GET //.json', function() { assert.strictEqual(json.count.notice, 3); assert.isArray(json.results); }); - }); diff --git a/test/integration/route/result/index.js b/test/integration/route/result/index.js index 7ebafaa..8d52848 100644 --- a/test/integration/route/result/index.js +++ b/test/integration/route/result/index.js @@ -12,8 +12,6 @@ // // You should have received a copy of the GNU General Public License // along with Pa11y Dashboard. If not, see . - -// jscs:disable maximumLineLength, requireArrowFunctions 'use strict'; const assert = require('proclaim'); @@ -35,13 +33,19 @@ describe('GET //', function() { it('should display a "Download CSV" button', function() { const elem = this.last.dom('[data-test=download-csv]'); assert.strictEqual(elem.length, 1); - assert.strictEqual(elem.eq(0).attr('href'), '/abc000000000000000000001/def000000000000000000001.csv'); + assert.strictEqual( + elem.eq(0).attr('href'), + '/abc000000000000000000001/def000000000000000000001.csv' + ); }); it('should display a "Download JSON" button', function() { const elem = this.last.dom('[data-test=download-json]'); assert.strictEqual(elem.length, 1); - assert.strictEqual(elem.eq(0).attr('href'), '/abc000000000000000000001/def000000000000000000001.json'); + assert.strictEqual( + elem.eq(0).attr('href'), + '/abc000000000000000000001/def000000000000000000001.json' + ); }); it('should display a link back to the task', function() { diff --git a/test/integration/route/task/delete.js b/test/integration/route/task/delete.js index 8b5c257..f05c6c3 100644 --- a/test/integration/route/task/delete.js +++ b/test/integration/route/task/delete.js @@ -12,8 +12,6 @@ // // You should have received a copy of the GNU General Public License // along with Pa11y Dashboard. If not, see . - -// jscs:disable maximumLineLength, requireArrowFunctions 'use strict'; const assert = require('proclaim'); diff --git a/test/integration/route/task/edit.js b/test/integration/route/task/edit.js index 2eb89e7..c9ae477 100644 --- a/test/integration/route/task/edit.js +++ b/test/integration/route/task/edit.js @@ -12,20 +12,16 @@ // // You should have received a copy of the GNU General Public License // along with Pa11y Dashboard. If not, see . - -// jscs:disable maximumLineLength, requireArrowFunctions 'use strict'; const assert = require('proclaim'); describe('GET //edit', function() { - beforeEach(function(done) { - const request = { + this.navigate({ method: 'GET', endpoint: '/abc000000000000000000001/edit' - }; - this.navigate(request, done); + }, done); }); it('should send a 200 status', function() { @@ -113,13 +109,10 @@ describe('GET //edit', function() { assert.isDefined(fields); assert.notStrictEqual(fields.length, 0); }); - }); - }); describe('POST //edit', function() { - beforeEach(function(done) { const request = { method: 'POST', @@ -153,5 +146,4 @@ describe('POST //edit', function() { assert.isDefined(alert); assert.match(alert.text(), /been saved/i); }); - }); diff --git a/test/integration/route/task/index.js b/test/integration/route/task/index.js index 124821d..29e661f 100644 --- a/test/integration/route/task/index.js +++ b/test/integration/route/task/index.js @@ -12,22 +12,17 @@ // // You should have received a copy of the GNU General Public License // along with Pa11y Dashboard. If not, see . - -// jscs:disable maximumLineLength, requireArrowFunctions 'use strict'; const assert = require('proclaim'); describe('GET /', function() { - describe('when task has results', function() { - beforeEach(function(done) { - const request = { + this.navigate({ method: 'GET', endpoint: '/abc000000000000000000001' - }; - this.navigate(request, done); + }, done); }); it('should send a 200 status', function() { @@ -76,11 +71,9 @@ describe('GET /', function() { assert.isDefined(elem); assert.match(elem.text(), /notices \( 3 \)/i); }); - }); describe('when task has no results', function() { - beforeEach(function(done) { const request = { method: 'GET', @@ -104,7 +97,5 @@ describe('GET /', function() { assert.isDefined(alert); assert.match(alert.text(), /there are no results to show/i); }); - }); - }); diff --git a/test/integration/route/task/run.js b/test/integration/route/task/run.js index 8659669..4963151 100644 --- a/test/integration/route/task/run.js +++ b/test/integration/route/task/run.js @@ -12,8 +12,6 @@ // // You should have received a copy of the GNU General Public License // along with Pa11y Dashboard. If not, see . - -// jscs:disable maximumLineLength, requireArrowFunctions 'use strict'; const assert = require('proclaim'); @@ -21,11 +19,10 @@ const assert = require('proclaim'); describe('GET //run', function() { beforeEach(function(done) { - const request = { + this.navigate({ method: 'GET', endpoint: '/abc000000000000000000001/run' - }; - this.navigate(request, done); + }, done); }); it('should send a 200 status', function() { diff --git a/test/integration/setup.js b/test/integration/setup.js index 103af94..f6b3c7b 100644 --- a/test/integration/setup.js +++ b/test/integration/setup.js @@ -12,39 +12,54 @@ // // You should have received a copy of the GNU General Public License // along with Pa11y Dashboard. If not, see . - -// jscs:disable requireArrowFunctions 'use strict'; -const config = require('../../config/test.json'); +const {promisify} = require('util'); const createNavigator = require('./helper/navigate'); -const createWebserviceClient = require('./helper/webservice'); -const loadFixtures = require('pa11y-webservice/data/fixture/load'); -const request = require('request'); +const createWebserviceClient = require('pa11y-webservice-client-node'); +const fetch = require('node-fetch'); + +const loadFixtures = promisify(require('pa11y-webservice/data/fixture/load')); + +const config = { + host: process.env.HOST || '0.0.0.0', + port: Number(process.env.PORT) || 4000, + noindex: true, + readonly: false +}; + +const webserviceConfig = { + database: process.env.WEBSERVICE_DATABASE || 'mongodb://127.0.0.1/pa11y-dashboard-integration-test', + host: process.env.WEBSERVICE_HOST || '0.0.0.0', + port: Number(process.env.WEBSERVICE_PORT) || 3000, + dbOnly: true +}; + +async function assertDashboardIsAvailable(baseUrl) { + try { + const response = await fetch(baseUrl); + if (!response.ok) { + console.error('Service found but returned an error. HTTP status:', response.status); + throw Error(); + } + } catch (error) { + console.error('Service under test not found or returned error.'); + throw error; + } +} + +before(async function() { + this.baseUrl = `http://${config.host}:${config.port}`; + + await assertDashboardIsAvailable(this.baseUrl); + await loadFixtures('test', webserviceConfig); + + this.webservice = createWebserviceClient(`http://${webserviceConfig.host}:${webserviceConfig.port}/`); -// Run before all tests -before(function(done) { - this.baseUrl = `http://localhost:${config.port}`; this.last = {}; this.navigate = createNavigator(this.baseUrl, this.last); - this.webservice = createWebserviceClient(config); - assertTestAppIsRunning(this.baseUrl, () => { - loadFixtures('test', config.webservice, done); - }); }); -// Run after each test -afterEach(function(done) { - loadFixtures('test', config.webservice, done); +afterEach(async function() { + await loadFixtures('test', webserviceConfig); }); - -// Check that the test application is running, and exit if not -function assertTestAppIsRunning(url, done) { - request(url, error => { - if (error) { - console.error('Error: Test app not started; run with `NODE_ENV=test node index.js`'); - process.exit(1); - } - done(); - }); -} diff --git a/view/presenter/result-list.js b/view/presenter/result-list.js index 3126065..339eb1f 100644 --- a/view/presenter/result-list.js +++ b/view/presenter/result-list.js @@ -14,17 +14,18 @@ // along with Pa11y Dashboard. If not, see . 'use strict'; -const _ = require('underscore'); +const groupBy = require('lodash.groupby'); +const keys = require('lodash.keys'); const moment = require('moment'); module.exports = presentResultList; function presentResultList(results) { - const resultsByDay = _.groupBy(results, result => { + const resultsByDay = groupBy(results, result => { return moment(result.date).format('YYYY-MM-DD'); }); const uniqueDayResults = []; - _.keys(resultsByDay).forEach(day => { + keys(resultsByDay).forEach(day => { uniqueDayResults.push(resultsByDay[day][0]); }); return uniqueDayResults; diff --git a/view/presenter/result.js b/view/presenter/result.js index b6b5011..fa5c113 100644 --- a/view/presenter/result.js +++ b/view/presenter/result.js @@ -14,7 +14,8 @@ // along with Pa11y Dashboard. If not, see . 'use strict'; -const _ = require('underscore'); +const groupBy = require('lodash.groupby'); +const keys = require('lodash.keys'); const presentIgnoreRules = require('./ignore'); const techs = require('../../data/techniques')(); @@ -35,12 +36,12 @@ function presentResult(result) { // Split out message types if (result.results) { - const groupedByType = _.groupBy(result.results, 'type'); + const groupedByType = groupBy(result.results, 'type'); ['error', 'warning', 'notice'].forEach(type => { const pluralType = `${type}s`; const results = groupedByType[type] || []; - const groupedByCode = _.groupBy(results, 'code'); - result[pluralType] = _.keys(groupedByCode).map(group => { + const groupedByCode = groupBy(results, 'code'); + result[pluralType] = keys(groupedByCode).map(group => { const groupMessage = groupedByCode[group][0]; groupMessage.count = groupedByCode[group].length; groupMessage.items = groupedByCode[group].map(plural => ({