From 838eae4a572b42da27fe62814511174bc91f074c Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Mon, 24 May 2021 13:14:10 +0200 Subject: [PATCH] chore: apply latest eslint rules closes #163 --- packages/app/src/plugins/head/index.ts | 2 +- packages/app/src/plugins/vuex.ts | 2 +- packages/kit/src/module/container.ts | 8 +- packages/kit/src/module/install.ts | 4 +- packages/kit/src/types/hooks.ts | 2 +- packages/kit/src/types/module.ts | 2 +- packages/nitro/src/context.ts | 4 +- packages/nitro/src/rollup/config.ts | 2 +- packages/nitro/src/rollup/plugins/assets.ts | 2 +- .../nitro/src/rollup/plugins/middleware.ts | 2 +- packages/nitro/src/runtime/entries/dev.ts | 2 +- packages/pages/src/runtime/router.ts | 2 +- packages/vite/src/vite.ts | 6 +- packages/webpack/src/configs/client.ts | 2 +- packages/webpack/src/webpack.ts | 8 +- test/presets/_utils.ts | 2 +- yarn.lock | 274 ++++++------------ 17 files changed, 122 insertions(+), 204 deletions(-) diff --git a/packages/app/src/plugins/head/index.ts b/packages/app/src/plugins/head/index.ts index fba1ce6bac..8abd30efaf 100644 --- a/packages/app/src/plugins/head/index.ts +++ b/packages/app/src/plugins/head/index.ts @@ -1,6 +1,6 @@ import { createHead, renderHeadToString } from '@vueuse/head' -import { Head, Html, Body, Title, Meta, Link, Script, Style } from './head' import type { Plugin } from '@nuxt/app' +import { Head, Html, Body, Title, Meta, Link, Script, Style } from './head' export default function head (nuxt) { const { app, ssrContext } = nuxt diff --git a/packages/app/src/plugins/vuex.ts b/packages/app/src/plugins/vuex.ts index 5925066b13..a15c464328 100644 --- a/packages/app/src/plugins/vuex.ts +++ b/packages/app/src/plugins/vuex.ts @@ -1,6 +1,6 @@ import { createVuex, defineStore, useStore } from 'vuex5/dist/vuex.esm' -import { useHydration } from '../composables' import type { Plugin } from '@nuxt/app' +import { useHydration } from '../composables' export default function ({ app }) { const vuex = createVuex({ }) diff --git a/packages/kit/src/module/container.ts b/packages/kit/src/module/container.ts index a4a308e2f1..aef1f9d683 100644 --- a/packages/kit/src/module/container.ts +++ b/packages/kit/src/module/container.ts @@ -1,5 +1,7 @@ import { nuxtCtx } from '../nuxt' -import { installModule } from './install' +import type { Nuxt } from '../types/nuxt' +import type { NuxtOptions } from '../types/config' +import type { TemplateOpts, PluginTemplateOpts } from '../types/module' import { addTemplate, addErrorLayout, @@ -9,9 +11,7 @@ import { extendBuild, extendRoutes } from './utils' -import type { Nuxt } from '../types/nuxt' -import type { NuxtOptions } from '../types/config' -import type { TemplateOpts, PluginTemplateOpts } from '../types/module' +import { installModule } from './install' /** Legacy ModuleContainer for backwards compatibility with existing Nuxt 2 modules. */ export class ModuleContainer { diff --git a/packages/kit/src/module/install.ts b/packages/kit/src/module/install.ts index 682f48d0b2..7bb18b2fd4 100644 --- a/packages/kit/src/module/install.ts +++ b/packages/kit/src/module/install.ts @@ -1,10 +1,10 @@ import { resolveModule, requireModule } from '../utils/cjs' import { resolveAlias } from '../utils/resolve' import { nuxtCtx } from '../nuxt' -import { defineNuxtModule } from './define' -import { ModuleContainer } from './container' import type { LegacyNuxtModule, NuxtModule, ModuleMeta, ModuleInstallOptions, ModuleOptions, ModuleSrc } from '../types/module' import type { Nuxt } from '../types/nuxt' +import { defineNuxtModule } from './define' +import { ModuleContainer } from './container' /** Installs a module on a Nuxt instance. */ export async function installModule (nuxt: Nuxt, installOpts: ModuleInstallOptions) { diff --git a/packages/kit/src/types/hooks.ts b/packages/kit/src/types/hooks.ts index 2b144db8cf..ac89e7a481 100644 --- a/packages/kit/src/types/hooks.ts +++ b/packages/kit/src/types/hooks.ts @@ -1,8 +1,8 @@ -import { Nuxt, NuxtApp } from './nuxt' import type { IncomingMessage, ServerResponse } from 'http' import type { Compiler, Configuration, Stats } from 'webpack' import type { NuxtConfig, NuxtOptions } from '..' import type { ModuleContainer } from '../module/container' +import { Nuxt, NuxtApp } from './nuxt' type HookResult = Promise | void diff --git a/packages/kit/src/types/module.ts b/packages/kit/src/types/module.ts index f71d022104..945d21da3a 100644 --- a/packages/kit/src/types/module.ts +++ b/packages/kit/src/types/module.ts @@ -1,6 +1,6 @@ +import type { ModuleContainer } from '../module/container' import { Nuxt } from './nuxt' import { NuxtHooks } from './hooks' -import type { ModuleContainer } from '../module/container' export interface ModuleMeta { /** The module name. */ diff --git a/packages/nitro/src/context.ts b/packages/nitro/src/context.ts index 2351a199ad..f0ad6d18b0 100644 --- a/packages/nitro/src/context.ts +++ b/packages/nitro/src/context.ts @@ -1,10 +1,10 @@ import { resolve, dirname } from 'upath' import defu from 'defu' import Hookable, { configHooksT } from 'hookable' -import { tryImport, resolvePath, detectTarget, extendPreset } from './utils' -import * as PRESETS from './presets' import type { Preset } from 'unenv' import type { NuxtOptions } from '@nuxt/kit' +import { tryImport, resolvePath, detectTarget, extendPreset } from './utils' +import * as PRESETS from './presets' import type { NodeExternalsOptions } from './rollup/plugins/externals' import type { StorageOptions } from './rollup/plugins/storage' import type { AssetOptions } from './rollup/plugins/assets' diff --git a/packages/nitro/src/rollup/config.ts b/packages/nitro/src/rollup/config.ts index d868717eaf..5d9551c288 100644 --- a/packages/nitro/src/rollup/config.ts +++ b/packages/nitro/src/rollup/config.ts @@ -12,6 +12,7 @@ import inject from '@rollup/plugin-inject' import analyze from 'rollup-plugin-analyzer' import * as unenv from 'unenv' +import type { Preset } from 'unenv' import { NitroContext } from '../context' import { resolvePath, MODULE_DIR } from '../utils' @@ -25,7 +26,6 @@ import { middleware } from './plugins/middleware' import { esbuild } from './plugins/esbuild' import { raw } from './plugins/raw' import { storage } from './plugins/storage' -import type { Preset } from 'unenv' export type RollupConfig = InputOptions & { output: OutputOptions } diff --git a/packages/nitro/src/rollup/plugins/assets.ts b/packages/nitro/src/rollup/plugins/assets.ts index e128cadcb0..5776e15d2e 100644 --- a/packages/nitro/src/rollup/plugins/assets.ts +++ b/packages/nitro/src/rollup/plugins/assets.ts @@ -3,8 +3,8 @@ import createEtag from 'etag' import mime from 'mime' import { resolve } from 'upath' import globby from 'globby' -import virtual from './virtual' import type { Plugin } from 'rollup' +import virtual from './virtual' export interface AssetOptions { inline: Boolean diff --git a/packages/nitro/src/rollup/plugins/middleware.ts b/packages/nitro/src/rollup/plugins/middleware.ts index aca674631f..b9048c0b46 100644 --- a/packages/nitro/src/rollup/plugins/middleware.ts +++ b/packages/nitro/src/rollup/plugins/middleware.ts @@ -3,8 +3,8 @@ import { relative } from 'upath' import { table, getBorderCharacters } from 'table' import isPrimitive from 'is-primitive' import stdenv from 'std-env' -import virtual from './virtual' import type { ServerMiddleware } from '../../server/middleware' +import virtual from './virtual' export function middleware (getMiddleware: () => ServerMiddleware[]) { const getImportId = p => '_' + hasha(p).substr(0, 6) diff --git a/packages/nitro/src/runtime/entries/dev.ts b/packages/nitro/src/runtime/entries/dev.ts index f40d9abc4d..7386fb5f39 100644 --- a/packages/nitro/src/runtime/entries/dev.ts +++ b/packages/nitro/src/runtime/entries/dev.ts @@ -1,8 +1,8 @@ import '~polyfill' import { Server } from 'http' import { parentPort } from 'worker_threads' -import { handle } from '../server' import type { AddressInfo } from 'net' +import { handle } from '../server' const server = new Server(handle) diff --git a/packages/pages/src/runtime/router.ts b/packages/pages/src/runtime/router.ts index ddb7f720d4..361e6a6f3a 100644 --- a/packages/pages/src/runtime/router.ts +++ b/packages/pages/src/runtime/router.ts @@ -6,8 +6,8 @@ import { RouterLink } from 'vue-router' // @ts-ignore -import NuxtPage from './page.vue' import type { Plugin } from '@nuxt/app' +import NuxtPage from './page.vue' // @ts-ignore import routes from '#build/routes' diff --git a/packages/vite/src/vite.ts b/packages/vite/src/vite.ts index f5f9148baf..14e8fded13 100644 --- a/packages/vite/src/vite.ts +++ b/packages/vite/src/vite.ts @@ -1,11 +1,11 @@ import * as vite from 'vite' import consola from 'consola' -import { buildClient } from './client' -import { buildServer } from './server' -import { warmupViteServer } from './utils/warmup' import type { Nuxt } from '@nuxt/kit' import type { InlineConfig, SSROptions } from 'vite' import type { Options } from '@vitejs/plugin-vue' +import { buildClient } from './client' +import { buildServer } from './server' +import { warmupViteServer } from './utils/warmup' export interface ViteOptions extends InlineConfig { vue?: Options diff --git a/packages/webpack/src/configs/client.ts b/packages/webpack/src/configs/client.ts index 8d6a238388..57842134d9 100644 --- a/packages/webpack/src/configs/client.ts +++ b/packages/webpack/src/configs/client.ts @@ -3,9 +3,9 @@ import querystring from 'querystring' import webpack from 'webpack' import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer' +import type { ClientOptions } from 'webpack-hot-middleware' import { applyPresets, WebpackConfigContext } from '../utils/config' import { nuxt } from '../presets/nuxt' -import type { ClientOptions } from 'webpack-hot-middleware' export function client (ctx: WebpackConfigContext) { ctx.name = 'client' diff --git a/packages/webpack/src/webpack.ts b/packages/webpack/src/webpack.ts index c9431e95bc..bc9062e014 100644 --- a/packages/webpack/src/webpack.ts +++ b/packages/webpack/src/webpack.ts @@ -1,4 +1,5 @@ import path from 'path' +import type { IncomingMessage, ServerResponse } from 'http' import pify from 'pify' import webpack from 'webpack' import Glob from 'glob' @@ -6,15 +7,14 @@ import webpackDevMiddleware from 'webpack-dev-middleware' import webpackHotMiddleware from 'webpack-hot-middleware' import consola from 'consola' -import { createWebpackConfigContext, applyPresets, getWebpackConfig } from './utils/config' -import { client, server } from './configs' -import { createMFS } from './utils/mfs' import type { Compiler, Watching } from 'webpack' import type { Context as WebpackDevMiddlewareContext, Options as WebpackDevMiddlewareOptions } from 'webpack-dev-middleware' import type { MiddlewareOptions as WebpackHotMiddlewareOptions } from 'webpack-hot-middleware' import type { Nuxt } from '@nuxt/kit' -import type { IncomingMessage, ServerResponse } from 'http' +import { createMFS } from './utils/mfs' +import { client, server } from './configs' +import { createWebpackConfigContext, applyPresets, getWebpackConfig } from './utils/config' const glob = pify(Glob) class WebpackBundler { diff --git a/test/presets/_utils.ts b/test/presets/_utils.ts index c31a3b7be0..d84a46d14c 100644 --- a/test/presets/_utils.ts +++ b/test/presets/_utils.ts @@ -5,8 +5,8 @@ import consola from 'consola' import { Listener, listen } from 'listhen' import { $fetch } from 'ohmyfetch/node' import createRequire from 'create-require' -import { fixtureDir, buildFixture, loadFixture } from '../utils' import type { LoadNuxtOptions } from '@nuxt/kit' +import { fixtureDir, buildFixture, loadFixture } from '../utils' const isCompat = Boolean(process.env.TEST_COMPAT) diff --git a/yarn.lock b/yarn.lock index 7f12ba7476..3d9c90c96d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1923,10 +1923,10 @@ __metadata: languageName: node linkType: hard -"@octokit/openapi-types@npm:^7.0.0": - version: 7.0.0 - resolution: "@octokit/openapi-types@npm:7.0.0" - checksum: 703727ff2e1956c353350628cdbc54f7c206cd363908b887b632c7b7c8840e7d25528442485f77d3c7059c85ed3797de9083fdfd036b1d8f752bbd1bb12979ec +"@octokit/openapi-types@npm:^7.2.0": + version: 7.2.1 + resolution: "@octokit/openapi-types@npm:7.2.1" + checksum: 4bf89367c4e211f7cfa9561d5534cff272ee6293407bb4ad50055786eac8fc54a799123d58aef7d4e616aa12ff5d1d32dd9fa65030b5f39ceb3f0f88423ff306 languageName: node linkType: hard @@ -2007,11 +2007,11 @@ __metadata: linkType: hard "@octokit/types@npm:^6.0.3, @octokit/types@npm:^6.11.0, @octokit/types@npm:^6.13.1, @octokit/types@npm:^6.7.1": - version: 6.14.2 - resolution: "@octokit/types@npm:6.14.2" + version: 6.16.0 + resolution: "@octokit/types@npm:6.16.0" dependencies: - "@octokit/openapi-types": ^7.0.0 - checksum: b717cb855c7ea65b721452e278d6543a0cbe9729f9dc1fa02da93d726202e6526f95f21870ef0c67d7dceeb769e4ff183f650f362aceb6bd6b766caa781ca025 + "@octokit/openapi-types": ^7.2.0 + checksum: e24da19b64b6ce856b55d6e614de7675431eaecb13e507cb9e58ba3c5e288d114d10b186ad8c93c872d59de62b21b93becd96e43b284b77843745f107b627ee8 languageName: node linkType: hard @@ -2168,13 +2168,6 @@ __metadata: languageName: node linkType: hard -"@types/anymatch@npm:*": - version: 1.3.1 - resolution: "@types/anymatch@npm:1.3.1" - checksum: 1647865e528a168f66f57a077e9651c10a4c172b656cc3686fddf176555d42ca0a1647bfc626ea2fceb68fc7701426ab708224be1762b4a5216fe8368ffdba3c - languageName: node - linkType: hard - "@types/babel__core@npm:^7.0.0, @types/babel__core@npm:^7.1.7": version: 7.1.14 resolution: "@types/babel__core@npm:7.1.14" @@ -2257,12 +2250,12 @@ __metadata: linkType: hard "@types/eslint@npm:*": - version: 7.2.10 - resolution: "@types/eslint@npm:7.2.10" + version: 7.2.11 + resolution: "@types/eslint@npm:7.2.11" dependencies: "@types/estree": "*" "@types/json-schema": "*" - checksum: d85af4ab456fcf5d243e5a39d192d01ec71e14352b9ec803394ce6ac994fca0b876405dbdc07b97449275aee8285f9570a82117bbfeb132f97e01b8ddc35477a + checksum: d7614357ba6d8d8af9b81d7a23e752482e6e8c88145aeb62b6d871a7b3eee519e47b9e27950bba0ff0f770631a2f985fc5dbc03cad6ac6f798e52a38c75c5e53 languageName: node linkType: hard @@ -2445,9 +2438,9 @@ __metadata: linkType: hard "@types/node@npm:*": - version: 15.3.1 - resolution: "@types/node@npm:15.3.1" - checksum: 1c3c94f4c8e1df26b24a00637fdd5a50a5ea7afd0e97cbd298cf675d49ad5436b8b2b111b349194e2fb8bfc81291a67dff9eac80abbf610f938f7a89ba5ba426 + version: 15.6.0 + resolution: "@types/node@npm:15.6.0" + checksum: 54515155db4f5d18e36725dafa477e0cee664b5a807560a026692c2c2251034675d9ef55a15bc44b7694a4a2e4866b9ca063872915b34a0564ab955b0da101eb languageName: node linkType: hard @@ -2624,16 +2617,16 @@ __metadata: linkType: hard "@types/webpack@npm:^4": - version: 4.41.28 - resolution: "@types/webpack@npm:4.41.28" + version: 4.41.29 + resolution: "@types/webpack@npm:4.41.29" dependencies: - "@types/anymatch": "*" "@types/node": "*" "@types/tapable": ^1 "@types/uglify-js": "*" "@types/webpack-sources": "*" + anymatch: ^3.0.0 source-map: ^0.6.0 - checksum: 0edd48873e23e3f9290721596ad3a553495d16e906a8ee81d03dca1453a15a10ca90a71fc1b8a056ef97fa861ae36c69f9df880f3c69b1ec728fbb40fae7026f + checksum: 09e343cbd59512c9b30ecbe3bb71b7d6539bb3a23b617f36966ae5947bd0e9c3ac60567797abc2b4382455e06d1ac713585d511f2a265b17e71363a8411bab01 languageName: node linkType: hard @@ -2960,9 +2953,9 @@ __metadata: linkType: hard "@vue/devtools-api@npm:^6.0.0-beta.10": - version: 6.0.0-beta.10 - resolution: "@vue/devtools-api@npm:6.0.0-beta.10" - checksum: 337a8a45d49f6498ac1d4b0cff0035143530e19e435d0e4774e03c36deccbeb6a2edcb0a922e7f1cbe5bcea5027068b7dfa0c6a32f80a363ee7d1b4dd488aa33 + version: 6.0.0-beta.11 + resolution: "@vue/devtools-api@npm:6.0.0-beta.11" + checksum: 0ddce20d35bfee57516f8c6a29d93ab8e506669f944701eaeb389eca928b5e4f03730129804dfbfa06f2571365842199cb875ff30c45a7fdc321bf9ef1b8f941 languageName: node linkType: hard @@ -3303,7 +3296,7 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.0.4, acorn@npm:^8.1.0, acorn@npm:^8.2.1": +"acorn@npm:^8.0.4, acorn@npm:^8.1.0, acorn@npm:^8.2.1, acorn@npm:^8.2.4": version: 8.2.4 resolution: "acorn@npm:8.2.4" bin: @@ -3371,14 +3364,14 @@ __metadata: linkType: hard "ajv@npm:^8.0.1": - version: 8.4.0 - resolution: "ajv@npm:8.4.0" + version: 8.5.0 + resolution: "ajv@npm:8.5.0" dependencies: fast-deep-equal: ^3.1.1 json-schema-traverse: ^1.0.0 require-from-string: ^2.0.2 uri-js: ^4.2.2 - checksum: 0dcdfe0ecaafca2de60d01601c041853a1057f26bcb24de79484a3f6947486cad7b84d2779f93a9a315345451248aca14ed4996213905b42fac4ec11c7a76a6c + checksum: 91274ac6627004c68467e8a05643b448d5581e77218c0331527d080c494cd24b5713c662ad8632fb2e46cbe5c9475aa73c8385ed59fa44b5813ff1c5e7b066c8 languageName: node linkType: hard @@ -3470,7 +3463,7 @@ __metadata: languageName: node linkType: hard -"anymatch@npm:^3.0.3, anymatch@npm:^3.1.1, anymatch@npm:~3.1.1": +"anymatch@npm:^3.0.0, anymatch@npm:^3.0.3, anymatch@npm:^3.1.1, anymatch@npm:~3.1.1": version: 3.1.2 resolution: "anymatch@npm:3.1.2" dependencies: @@ -4558,10 +4551,10 @@ __metadata: languageName: node linkType: hard -"colord@npm:^1.7.0": - version: 1.7.2 - resolution: "colord@npm:1.7.2" - checksum: 6701308a1a61620c281f813c714ad2986fa524a039f048b411015e4eef34f2815d587e11e6f8824d3dfaa4bacd0372c8317c68e91a6dc05536979de735d4b022 +"colord@npm:^2.0.0": + version: 2.0.0 + resolution: "colord@npm:2.0.0" + checksum: 0452f216baabe1d873d595c5896df3bb065cb69ef73b96b3f3f7263d0cc03f15a186d914490fc47bd8e10e55438bd648bf098925cb8843e02ecdfc87628ed5b8 languageName: node linkType: hard @@ -4726,16 +4719,6 @@ __metadata: languageName: node linkType: hard -"contains-path@npm:^1.0.0": - version: 1.0.0 - resolution: "contains-path@npm:1.0.0" - dependencies: - normalize-path: ^2.1.1 - path-starts-with: ^1.0.0 - checksum: d8ed140161cfa7ff308a75b08f7380fbec3e7884fdfbb54192b45da241c242bbe3e527d9725dec7e05dac513401712831aa2d8a640d94c39a4523c228bb66403 - languageName: node - linkType: hard - "conventional-changelog-angular@npm:^5.0.12": version: 5.0.12 resolution: "conventional-changelog-angular@npm:5.0.12" @@ -5036,14 +5019,14 @@ __metadata: languageName: node linkType: hard -"cssnano-preset-default@npm:^5.1.0": - version: 5.1.0 - resolution: "cssnano-preset-default@npm:5.1.0" +"cssnano-preset-default@npm:^5.1.1": + version: 5.1.1 + resolution: "cssnano-preset-default@npm:5.1.1" dependencies: css-declaration-sorter: ^6.0.3 cssnano-utils: ^2.0.1 postcss-calc: ^8.0.0 - postcss-colormin: ^5.1.0 + postcss-colormin: ^5.1.1 postcss-convert-values: ^5.0.1 postcss-discard-comments: ^5.0.1 postcss-discard-duplicates: ^5.0.1 @@ -5071,7 +5054,7 @@ __metadata: postcss-unique-selectors: ^5.0.1 peerDependencies: postcss: ^8.2.15 - checksum: 70573c69e8bb0ade34545ea2c7ea6fb721b727e65db351d3f5059a734889e4b0b0629fbcb59f8c6d930ae35f7f210818ee4a856e2b3546b967eef1d5d541f52a + checksum: 711f814825baf31e6a82a8f46ca8c061f0a72f0401849fb89e331970eb0239e148825855035486765bd126682968652ff903d1e13d7f1be584265b19620ea6b1 languageName: node linkType: hard @@ -5085,15 +5068,15 @@ __metadata: linkType: hard "cssnano@npm:^5.0.0": - version: 5.0.3 - resolution: "cssnano@npm:5.0.3" + version: 5.0.4 + resolution: "cssnano@npm:5.0.4" dependencies: cosmiconfig: ^7.0.0 - cssnano-preset-default: ^5.1.0 + cssnano-preset-default: ^5.1.1 is-resolvable: ^1.1.0 peerDependencies: postcss: ^8.2.15 - checksum: fca229b56378c397fa9677a41b73efc86c0f74fb607ed1752b464ca5a04ad1b833acbb1d98e7e3efda7210b100c3e0da8f7b1b09bfe272d3b47990c36ea34022 + checksum: 95889c6e477058acb1da5b9ce9353d05a96803ca6f5283e7e00da17fe5a4bcda42f7f7528402ad8053f160afc078554d1e4811c55b7699ee992a2551a03f10c3 languageName: node linkType: hard @@ -5631,9 +5614,9 @@ __metadata: linkType: hard "electron-to-chromium@npm:^1.3.723": - version: 1.3.734 - resolution: "electron-to-chromium@npm:1.3.734" - checksum: 8e3867fe110fee853b17f00c62cefbfc16a423bce45f3e4f0f6aa86291a477d3a55f0bb3c5f742b57b6637e03848a326009073c8f4cc11a898ce0511c28be4ed + version: 1.3.736 + resolution: "electron-to-chromium@npm:1.3.736" + checksum: 93502d598c0506948713e43511611bfe81d81d807fb4121159d9ff5037c96efe1ed3ca7a517c68e04535344759679276b99b736dd3169170f3f4e80c1da38aaa languageName: node linkType: hard @@ -5946,12 +5929,11 @@ __metadata: linkType: hard "eslint-plugin-import@npm:^2.22.1": - version: 2.23.2 - resolution: "eslint-plugin-import@npm:2.23.2" + version: 2.23.3 + resolution: "eslint-plugin-import@npm:2.23.3" dependencies: array-includes: ^3.1.3 array.prototype.flat: ^1.2.4 - contains-path: ^1.0.0 debug: ^2.6.9 doctrine: ^2.1.0 eslint-import-resolver-node: ^0.3.4 @@ -5967,7 +5949,7 @@ __metadata: tsconfig-paths: ^3.9.0 peerDependencies: eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 - checksum: fff1f13edbfb523c7c1075bbd45ca4a2faf892b9ccaf94122ccb2a725978c1def76b851bd70bf59fb82c514bb49aea1ed2b085c2e75c24229e0b5d437e56b159 + checksum: 25f2ec03f1a3b12b98e4e9787dca9023fffd7e7df6c3a08d514476a861a028d9299546f6b09e3d80cfa370aaffd52179cbb6ef397c6397a321a94525d4e009df languageName: node linkType: hard @@ -7615,11 +7597,11 @@ __metadata: linkType: hard "iconv-lite@npm:^0.6.2": - version: 0.6.2 - resolution: "iconv-lite@npm:0.6.2" + version: 0.6.3 + resolution: "iconv-lite@npm:0.6.3" dependencies: safer-buffer: ">= 2.1.2 < 3.0.0" - checksum: 0785670120f57b5912c6a4391d6a69914906746d259b59de884dc6d324a52a0abde38d5804f67370192fec6878d01e7306de525568abcea70eb41c2bceb9f547 + checksum: 9b4f24db662b717340ae20ec9ebbaf0648b378a2d0fc64aef83c6bccdd9918b622216c020e177ddf2d02eeff8456a732e85b6d989eb2cd3a40519f3e179b273c languageName: node linkType: hard @@ -7804,8 +7786,8 @@ __metadata: linkType: hard "ioredis@npm:^4.26.0": - version: 4.27.2 - resolution: "ioredis@npm:4.27.2" + version: 4.27.3 + resolution: "ioredis@npm:4.27.3" dependencies: cluster-key-slot: ^1.1.0 debug: ^4.3.1 @@ -7817,7 +7799,7 @@ __metadata: redis-errors: ^1.2.0 redis-parser: ^3.0.0 standard-as-callback: ^2.1.0 - checksum: 8e6e21495bbbc726e4dc6349441d48fd013713f6de9896db3b1790e7d707b36652fa96060121e7aac875c22fdf96a0e95a0ebb5a076d08d02ddce1f5f4fc5913 + checksum: f7080a5912fed5e4ebec45be37eb7288049d5865f9e02e77bcb135533d88c93766a5eea95ead973cbadcdbaf7e15019fb7f6e3286a5c5a820dcd945cc345dd2f languageName: node linkType: hard @@ -8200,7 +8182,7 @@ __metadata: languageName: node linkType: hard -"is-potential-custom-element-name@npm:^1.0.0": +"is-potential-custom-element-name@npm:^1.0.1": version: 1.0.1 resolution: "is-potential-custom-element-name@npm:1.0.1" checksum: 25520ce8de393b87c8a2ce4d410c424d16baab0d5a43cbf76af148940725e489dbf3541a43371bcc0881fcb186d9a4ed18b774a11ac8743dd064303cea8de50d @@ -8932,11 +8914,11 @@ __metadata: linkType: hard "jsdom@npm:^16.4.0": - version: 16.5.3 - resolution: "jsdom@npm:16.5.3" + version: 16.6.0 + resolution: "jsdom@npm:16.6.0" dependencies: abab: ^2.0.5 - acorn: ^8.1.0 + acorn: ^8.2.4 acorn-globals: ^6.0.0 cssom: ^0.4.4 cssstyle: ^2.3.0 @@ -8944,12 +8926,13 @@ __metadata: decimal.js: ^10.2.1 domexception: ^2.0.1 escodegen: ^2.0.0 + form-data: ^3.0.0 html-encoding-sniffer: ^2.0.1 - is-potential-custom-element-name: ^1.0.0 + http-proxy-agent: ^4.0.1 + https-proxy-agent: ^5.0.0 + is-potential-custom-element-name: ^1.0.1 nwsapi: ^2.2.0 parse5: 6.0.1 - request: ^2.88.2 - request-promise-native: ^1.0.9 saxes: ^5.0.1 symbol-tree: ^3.2.4 tough-cookie: ^4.0.0 @@ -8959,14 +8942,14 @@ __metadata: whatwg-encoding: ^1.0.5 whatwg-mimetype: ^2.3.0 whatwg-url: ^8.5.0 - ws: ^7.4.4 + ws: ^7.4.5 xml-name-validator: ^3.0.0 peerDependencies: canvas: ^2.5.0 peerDependenciesMeta: canvas: optional: true - checksum: 02f6e3b5bb6c75f70b256f9fb522ce67cdf035c8e073a61f152876570d29453f164a4f1ea38a62e419511f81f6f75ced793e6332b66a647dc8012daacff27b8e + checksum: ee0c9ef2cf499d01d6186622a3788df72fa970a2eb695a237efebace6d99875a3402062842420badddad02cf1e90a0de88c65a266366721a45732144f7616db6 languageName: node linkType: hard @@ -10522,8 +10505,8 @@ __metadata: linkType: hard "npm-registry-fetch@npm:^10.0.0": - version: 10.1.1 - resolution: "npm-registry-fetch@npm:10.1.1" + version: 10.1.2 + resolution: "npm-registry-fetch@npm:10.1.2" dependencies: lru-cache: ^6.0.0 make-fetch-happen: ^8.0.9 @@ -10532,7 +10515,7 @@ __metadata: minipass-json-stream: ^1.0.1 minizlib: ^2.0.0 npm-package-arg: ^8.0.0 - checksum: 485ee8cffcd9481cddbe8c5f441be5bc1b3404566b14efc97afe6fe5fb0b0f2864f2163d18a70bf97a6afb3735f4c2967750d38c4096c4ceb88f3db0b32909e6 + checksum: 974a36df896156e5bd15341ad8c52aeeebd27c9bb2acf6011bef7ddd4231beacc265742dec7afc6a8369bb3fdef06c7ea679fa5b50314157158431cd6534d25c languageName: node linkType: hard @@ -10846,13 +10829,13 @@ __metadata: linkType: hard "open@npm:^8.0.5": - version: 8.0.9 - resolution: "open@npm:8.0.9" + version: 8.1.0 + resolution: "open@npm:8.1.0" dependencies: define-lazy-prop: ^2.0.0 is-docker: ^2.1.1 is-wsl: ^2.2.0 - checksum: 936ea1a4ec8c87de8e825efe385c146307fec8bb0ec72e08ce1a79103b046e82bc268a9b74d6f1861abb21476c9b3b96a8a54b4f3becf744f0fefe30cb3e7ba3 + checksum: 21593d6ba7393a50f957618944de5dd61cccf24a995b0447e09dfc26fcd2ef1cd37f694815e5f91590d9841585d77dec210cee1d7544f215efdfa769709e1e70 languageName: node linkType: hard @@ -11265,15 +11248,6 @@ __metadata: languageName: node linkType: hard -"path-starts-with@npm:^1.0.0": - version: 1.0.0 - resolution: "path-starts-with@npm:1.0.0" - dependencies: - normalize-path: ^2.1.1 - checksum: 40b1d54ad6a09a14b983a10607383d7f38d4811e3fed9b19c81a79814485adc747c67627c7af4bd89379c89da15bab717a30586bff1738f4b6a8dfc8dae9b8f1 - languageName: node - linkType: hard - "path-type@npm:^1.0.0": version: 1.1.0 resolution: "path-type@npm:1.1.0" @@ -11309,9 +11283,9 @@ __metadata: linkType: hard "picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.2.2, picomatch@npm:^2.2.3": - version: 2.2.3 - resolution: "picomatch@npm:2.2.3" - checksum: f8c9323bc3b21ff448e81dd32277135d781abae5d53a1415d69a4ce6317a2c11404d449c550110b8fa402c07d5e80ff0e2657f263a312517cc809e9010d25791 + version: 2.3.0 + resolution: "picomatch@npm:2.3.0" + checksum: 80113a0fb70cfa62730d5aa3fd3d45b76bf3985f8494080ab2de1cc1fa3ba96d77990c7553a81401e16c51c0eb19c27cf5bc94f2196155090f26c8a167968001 languageName: node linkType: hard @@ -11421,16 +11395,16 @@ __metadata: languageName: node linkType: hard -"postcss-colormin@npm:^5.1.0": - version: 5.1.0 - resolution: "postcss-colormin@npm:5.1.0" +"postcss-colormin@npm:^5.1.1": + version: 5.1.1 + resolution: "postcss-colormin@npm:5.1.1" dependencies: browserslist: ^4.16.0 - colord: ^1.7.0 + colord: ^2.0.0 postcss-value-parser: ^4.1.0 peerDependencies: postcss: ^8.2.15 - checksum: f7955c59b88479ed2e29dd90c9c08821578bd3d860e3c36e83fe7d32d0b0d648b7a1e4436e50bcf1525cb1e8187632b4c1f93f18437d91c9964fbf1547fd0ced + checksum: a239e7826e93f607b2688c46f42eb8970346c679a0ca2cce555de4b58c2006870091dbdde703e019094e7dc423a9a2702fc468f23129bb91d5b40dc00f3dbe01 languageName: node linkType: hard @@ -11826,18 +11800,7 @@ __metadata: languageName: node linkType: hard -"postcss@npm:^8.1.10, postcss@npm:^8.2.10, postcss@npm:^8.2.15, postcss@npm:^8.2.9": - version: 8.2.15 - resolution: "postcss@npm:8.2.15" - dependencies: - colorette: ^1.2.2 - nanoid: ^3.1.23 - source-map: ^0.6.1 - checksum: 2d26bc29dedd7656d1f53fa002374a014a8c2c7b9f1538d0fafadb9eae2494f5b037c87de4390d620f622b31d7f15c8c8d88de2bd682e206104fb44e781737df - languageName: node - linkType: hard - -"postcss@npm:^8.3.0": +"postcss@npm:^8.1.10, postcss@npm:^8.2.10, postcss@npm:^8.2.15, postcss@npm:^8.2.9, postcss@npm:^8.3.0": version: 8.3.0 resolution: "postcss@npm:8.3.0" dependencies: @@ -12465,30 +12428,6 @@ __metadata: languageName: node linkType: hard -"request-promise-core@npm:1.1.4": - version: 1.1.4 - resolution: "request-promise-core@npm:1.1.4" - dependencies: - lodash: ^4.17.19 - peerDependencies: - request: ^2.34 - checksum: 7c9c90bf00158f6669e7167425cd113edadaca44b5aebc7c6a7969d9f50d93bfae8275038bdf6389b4e94f1cacacca7e5830d28701692818bdfba353eeb2ddfd - languageName: node - linkType: hard - -"request-promise-native@npm:^1.0.9": - version: 1.0.9 - resolution: "request-promise-native@npm:1.0.9" - dependencies: - request-promise-core: 1.1.4 - stealthy-require: ^1.1.1 - tough-cookie: ^2.3.3 - peerDependencies: - request: ^2.34 - checksum: 532570f00559f826ad372d36a152c3cf1aa184d0876b04ed7c18a9fa391fa2108978eca837ae1fb681d2dab63bd6c74c6660022b82ecdb2682d77859314d0b6e - languageName: node - linkType: hard - "request@npm:^2.88.0, request@npm:^2.88.2": version: 2.88.2 resolution: "request@npm:2.88.2" @@ -12729,21 +12668,7 @@ __metadata: languageName: node linkType: hard -"rollup@npm:^2.38.5, rollup@npm:^2.45.2": - version: 2.48.0 - resolution: "rollup@npm:2.48.0" - dependencies: - fsevents: ~2.3.1 - dependenciesMeta: - fsevents: - optional: true - bin: - rollup: dist/bin/rollup - checksum: 3f50c1e023adcf9fc14100b7ca128482ea58cd27af0aad344affbd9622fc35bbd28ca13ceac35b252d137aedd36df39886b3a308e42b437bcb46918584ee89d3 - languageName: node - linkType: hard - -"rollup@npm:^2.49.0": +"rollup@npm:^2.38.5, rollup@npm:^2.45.2, rollup@npm:^2.49.0": version: 2.49.0 resolution: "rollup@npm:2.49.0" dependencies: @@ -13343,9 +13268,9 @@ __metadata: linkType: hard "spdx-license-ids@npm:^3.0.0": - version: 3.0.8 - resolution: "spdx-license-ids@npm:3.0.8" - checksum: f6a996f2d4ca7116e6a820e1dc702833f2c7dcb0997e28baa721a74fac53d675de88c27ae2e76498a8d5bffe30a194aadc130eca01bc71a9706832062aca7316 + version: 3.0.9 + resolution: "spdx-license-ids@npm:3.0.9" + checksum: a4d970d859bc5eeef3a95d7597fa39b36b2c046153d3d2c9876293d84457b0456a56aef7f45e1d3c3129cf7557c35305dffaddbcff630f7df72cb359aed78ce1 languageName: node linkType: hard @@ -13476,13 +13401,6 @@ __metadata: languageName: node linkType: hard -"stealthy-require@npm:^1.1.1": - version: 1.1.1 - resolution: "stealthy-require@npm:1.1.1" - checksum: f24a9bc613817dea37afcbf64578f2ba0195916d906ebdaa1c1d5b8e9d51fd462cbf4c61ae04217babd0cf662e6c0115fd972dffa8e62a7f6f44f3109fb4c796 - languageName: node - linkType: hard - "strict-uri-encode@npm:^2.0.0": version: 2.0.0 resolution: "strict-uri-encode@npm:2.0.0" @@ -14079,16 +13997,6 @@ __metadata: languageName: node linkType: hard -"tough-cookie@npm:^2.3.3, tough-cookie@npm:~2.5.0": - version: 2.5.0 - resolution: "tough-cookie@npm:2.5.0" - dependencies: - psl: ^1.1.28 - punycode: ^2.1.1 - checksum: bf5d6fac5ce0bebc5876cb9b9a79d3d9ea21c9e4099f3d3e64701d6ba170a052cb88cece6737ec2473bac4f0a4f6c75d46ec17985be8587c6bbdd38d91625cb4 - languageName: node - linkType: hard - "tough-cookie@npm:^4.0.0": version: 4.0.0 resolution: "tough-cookie@npm:4.0.0" @@ -14100,12 +14008,22 @@ __metadata: languageName: node linkType: hard +"tough-cookie@npm:~2.5.0": + version: 2.5.0 + resolution: "tough-cookie@npm:2.5.0" + dependencies: + psl: ^1.1.28 + punycode: ^2.1.1 + checksum: bf5d6fac5ce0bebc5876cb9b9a79d3d9ea21c9e4099f3d3e64701d6ba170a052cb88cece6737ec2473bac4f0a4f6c75d46ec17985be8587c6bbdd38d91625cb4 + languageName: node + linkType: hard + "tr46@npm:^2.0.2": - version: 2.0.2 - resolution: "tr46@npm:2.0.2" + version: 2.1.0 + resolution: "tr46@npm:2.1.0" dependencies: punycode: ^2.1.1 - checksum: c8c221907944e8b577c4fff14d180a213c21a29b54a12a031aa6986cbb711a5d470588b556a7be9c7844f09142e12deef6b76fe10f6bd4d274b54f1a7e0aac9e + checksum: d6da91f2463fa8d30c938331d02bebf01bd96af68016bc233ad37c9e4bc7e607a46065f5eab2034076aab5fdac362c02421b34c29c57095d0d310d3833e2736f languageName: node linkType: hard @@ -15215,7 +15133,7 @@ typescript@^4.2.4: languageName: node linkType: hard -"windicss@npm:3.0.9, windicss@npm:^3.0.9": +"windicss@npm:3.0.9": version: 3.0.9 resolution: "windicss@npm:3.0.9" bin: @@ -15224,7 +15142,7 @@ typescript@^4.2.4: languageName: node linkType: hard -"windicss@npm:^3.0.10": +"windicss@npm:^3.0.10, windicss@npm:^3.0.9": version: 3.0.10 resolution: "windicss@npm:3.0.10" bin: @@ -15338,7 +15256,7 @@ typescript@^4.2.4: languageName: node linkType: hard -"ws@npm:^7.3.1, ws@npm:^7.4.4": +"ws@npm:^7.3.1, ws@npm:^7.4.4, ws@npm:^7.4.5": version: 7.4.5 resolution: "ws@npm:7.4.5" peerDependencies: