From fb7781cabc6ebf1149e7a0015bdfb34be56675f0 Mon Sep 17 00:00:00 2001 From: James Addison Date: Sun, 11 Oct 2020 14:28:23 +0100 Subject: [PATCH 01/37] Upgrade to webpack v5.0.0 --- package.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 05b679f..579624b 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "license": "MIT", "peerDependencies": { "mocha": ">=6 <=7", - "webpack": "^4.0.0" + "webpack": "^5.0.0" }, "devDependencies": { "@babel/cli": "^7.0.0", @@ -66,7 +66,6 @@ "@types/node": "^12.12.17", "@types/sinon": "^9.0.0", "@types/sinon-chai": "^3.2.4", - "@types/webpack": "^4.41.0", "@types/yargs": "^15.0.4", "@typescript-eslint/eslint-plugin": "^2.11.0", "@typescript-eslint/parser": "^2.11.0", @@ -106,7 +105,7 @@ "tiny-worker": "2.3.0", "ts-mocha": "^7.0.0", "typescript": "^3.8.3", - "webpack": "4.41.0", + "webpack": "5.0.0", "worker-loader": "2.0.0", "write-file-webpack-plugin": "^4.2.0" }, From a66eb1596a9da82be440ca13fff20ae78f8084cd Mon Sep 17 00:00:00 2001 From: James Addison Date: Sun, 11 Oct 2020 14:31:53 +0100 Subject: [PATCH 02/37] Typing: Plugin -> WebpackPluginInstance --- src/runner/runnerUtils/createWebpackConfig/index.ts | 4 ++-- src/runner/runnerUtils/createWebpackConfig/types.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/runner/runnerUtils/createWebpackConfig/index.ts b/src/runner/runnerUtils/createWebpackConfig/index.ts index dfe6c52..b336d1d 100644 --- a/src/runner/runnerUtils/createWebpackConfig/index.ts +++ b/src/runner/runnerUtils/createWebpackConfig/index.ts @@ -5,7 +5,7 @@ import { has as _has, merge as _merge } from 'lodash' -import { Configuration, Plugin, RuleSetRule } from 'webpack' +import { Configuration, WebpackPluginInstance, RuleSetRule } from 'webpack' import { glob } from '../../../util/glob' import { EntryConfig } from '../../../webpack/loader/entryLoader' import { buildProgressPlugin } from '../../../webpack/plugin/buildProgressPlugin' @@ -48,7 +48,7 @@ const getPublicPath = ( const buildPluginsArray = ( webpackConfig: Configuration, interactive: boolean -): Plugin[] => { +): WebpackPluginInstance[] => { const plugins = webpackConfig.plugins || [] if (interactive) { diff --git a/src/runner/runnerUtils/createWebpackConfig/types.ts b/src/runner/runnerUtils/createWebpackConfig/types.ts index 93abb3c..68bb02e 100644 --- a/src/runner/runnerUtils/createWebpackConfig/types.ts +++ b/src/runner/runnerUtils/createWebpackConfig/types.ts @@ -1,4 +1,4 @@ -import { Configuration, Plugin, RuleSetRule } from 'webpack' +import { Configuration, WebpackPluginInstance, RuleSetRule } from 'webpack' import { EntryConfig } from '../../../webpack/loader/entryLoader' export interface CreateWebpackConfigOptions { @@ -19,7 +19,7 @@ export interface BuildLoaderRulesOptions extends CreateWebpackConfigOptions { export interface BuildWebpackConfigOptions extends BuildLoaderRulesOptions { loaderRules: RuleSetRule[] outputPath: string - plugins: Plugin[] + plugins: WebpackPluginInstance[] publicPath: string } From c6d05280337ab49242232724236608925e43e96e Mon Sep 17 00:00:00 2001 From: James Addison Date: Sun, 11 Oct 2020 14:33:12 +0100 Subject: [PATCH 03/37] Typing: use WebpackError type definition from webpack --- src/webpack/compiler/registerReadyCallback.ts | 6 ++++-- src/webpack/util/createStatsFormatter.ts | 11 ++--------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/webpack/compiler/registerReadyCallback.ts b/src/webpack/compiler/registerReadyCallback.ts index 4a89598..921bbb9 100644 --- a/src/webpack/compiler/registerReadyCallback.ts +++ b/src/webpack/compiler/registerReadyCallback.ts @@ -3,9 +3,11 @@ import { MOCHAPACK_NAME } from '../../util/constants' export default function registerReadyCallback( compiler: Compiler, - cb: (err: (Error | string) | null, stats: Stats | null) => void + cb: (err: Error, stats: Stats | null) => void ) { - compiler.hooks.failed.tap(MOCHAPACK_NAME, cb) + compiler.hooks.failed.tap(MOCHAPACK_NAME, (err: Error) => { + cb(err, null) + }); compiler.hooks.done.tap(MOCHAPACK_NAME, (stats: Stats) => { if (stats.hasErrors()) { const jsonStats = stats.toJson() diff --git a/src/webpack/util/createStatsFormatter.ts b/src/webpack/util/createStatsFormatter.ts index c60b685..b5fcd23 100644 --- a/src/webpack/util/createStatsFormatter.ts +++ b/src/webpack/util/createStatsFormatter.ts @@ -2,8 +2,8 @@ import { EOL } from 'os' import chalk from 'chalk' import { Stats } from 'webpack' import RequestShortener from 'webpack/lib/RequestShortener' +import WebpackError from 'webpack/lib/WebpackError' import { formatErrorMessage, stripLoaderFromPath } from './formatUtil' -import { WebpackError } from '../types' const createGetFile = (requestShortener: RequestShortener) => ( e: WebpackError @@ -29,14 +29,7 @@ const createGetFile = (requestShortener: RequestShortener) => ( const ensureWebpackErrors = ( errors: Array ): Array => - errors.map((e: string | WebpackError) => { - /* istanbul ignore if */ - if (typeof e === 'string') { - // webpack does this also, so there must be case when this happens - return ({ message: e } as any) as WebpackError - } - return e - }) + errors.map((e: WebpackError) => e.toString()) const prependWarning = (message: string) => `${chalk.yellow('Warning')} ${message}` From ef3582ea97c5fa85bf2ba4d7eedfa3825b59f00d Mon Sep 17 00:00:00 2001 From: James Addison Date: Sun, 11 Oct 2020 14:34:19 +0100 Subject: [PATCH 04/37] Typing: update exit promise resolution handler TODO: Determine how to retrieve failure count --- src/cli/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cli/index.ts b/src/cli/index.ts index 3da77d1..00ab00f 100644 --- a/src/cli/index.ts +++ b/src/cli/index.ts @@ -43,8 +43,8 @@ async function cli() { } return mochaWebpack.run() }) - .then((failures: number) => { - exit(cliOptions.mocha.cli.exit, failures) + .then(() => { + exit(cliOptions.mocha.cli.exit, 0) }) .catch((e: Error) => { if (e) console.error(e.stack) // eslint-disable-line From 0f33cf26f043c6b07f9e3faecf0499a30dfce32f Mon Sep 17 00:00:00 2001 From: James Addison Date: Sun, 11 Oct 2020 14:34:57 +0100 Subject: [PATCH 05/37] Typing: Use upstream Chunk, Module types from webpack, and adhere to new Set interface --- src/webpack/util/getAffectedModuleIds.ts | 30 +++++++++++++----------- src/webpack/util/getBuildStats.ts | 3 ++- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/webpack/util/getAffectedModuleIds.ts b/src/webpack/util/getAffectedModuleIds.ts index 64f481b..23b5b91 100644 --- a/src/webpack/util/getAffectedModuleIds.ts +++ b/src/webpack/util/getAffectedModuleIds.ts @@ -1,4 +1,5 @@ -import { Module, Chunk } from '../types' +import Chunk from 'webpack/lib/Chunk' +import Module from 'webpack/lib/Module' type ModuleMap = { [key: string]: Module @@ -38,8 +39,8 @@ const affectedModules = ( * [moduleId]: Module * } */ -const buildModuleMap = (modules: Array): ModuleMap => { - const moduleMap = modules.reduce( +const buildModuleMap = (modules: Set): ModuleMap => { + const moduleMap = Array.from(modules).reduce( (memo, module: Module) => ({ ...memo, [module.id]: module }), {} ) @@ -55,12 +56,13 @@ const buildModuleMap = (modules: Array): ModuleMap => { * } * } * - * @param modules Array + * @param chunks Set + * @param modules Set * @return ModuleUsageMap */ const buildModuleUsageMap = ( - chunks: Array, - modules: Array + chunks: Set, + modules: Set ): ModuleUsageMap => { // build a map of all modules with their parent // { @@ -69,7 +71,7 @@ const buildModuleUsageMap = ( // } // } // - const moduleUsageMap: ModuleUsageMap = modules.reduce( + const moduleUsageMap: ModuleUsageMap = Array.from(modules).reduce( (memo, module: Module) => { module.dependencies.forEach(dependency => { const dependentModule = dependency.module @@ -93,12 +95,12 @@ const buildModuleUsageMap = ( // [moduleId]: Module // } // } - const chunkModuleMap: ModuleUsageMap = chunks.reduce((memo, chunk: Chunk) => { + const chunkModuleMap: ModuleUsageMap = Array.from(chunks).reduce((memo, chunk: Chunk) => { // build chunk map first to get also empty chunks (without modules) memo[chunk.id] = {} // eslint-disable-line no-param-reassign return memo }, {}) - modules.reduce((memo, module: Module) => { + Array.from(modules).reduce((memo, module: Module) => { module.getChunks().forEach((chunk: Chunk) => { memo[chunk.id][module.id] = module // eslint-disable-line no-param-reassign }) @@ -133,18 +135,18 @@ const buildModuleUsageMap = ( * - affected directly by a file change * - affected indirectly by a change of it's dependencies and so on * - * @param chunks Array - * @param modules Array + * @param chunks Set + * @param modules Set * @return {Array.} */ export default function getAffectedModuleIds( - chunks: Array, - modules: Array + chunks: Set, + modules: Set ): Array { const moduleMap: ModuleMap = buildModuleMap(modules) const moduleUsageMap: ModuleUsageMap = buildModuleUsageMap(chunks, modules) - const builtModules = modules.filter(isBuilt) + const builtModules = Array.from(modules).filter(isBuilt) const affectedMap: ModuleMap = {} builtModules.forEach((module: Module) => affectedModules(moduleMap, moduleUsageMap, affectedMap, module.id) diff --git a/src/webpack/util/getBuildStats.ts b/src/webpack/util/getBuildStats.ts index 14a1904..8024473 100644 --- a/src/webpack/util/getBuildStats.ts +++ b/src/webpack/util/getBuildStats.ts @@ -1,8 +1,9 @@ import path from 'path' import { Stats } from 'webpack' +import Chunk from 'webpack/lib/Chunk' +import Module from 'webpack/lib/Module' import sortChunks from './sortChunks' import getAffectedModuleIds from './getAffectedModuleIds' -import { Chunk, Module } from '../types' export type BuildStats = { affectedModules: Array From a23607c46500f6fc201d36fac56b26fa501b9d48 Mon Sep 17 00:00:00 2001 From: James Addison Date: Sun, 11 Oct 2020 15:14:42 +0100 Subject: [PATCH 06/37] Update to use new ChunkGraph, ModuleGraph APIs --- src/webpack/util/getAffectedModuleIds.ts | 53 +++++++++++++++--------- src/webpack/util/getBuildStats.ts | 10 ++--- 2 files changed, 38 insertions(+), 25 deletions(-) diff --git a/src/webpack/util/getAffectedModuleIds.ts b/src/webpack/util/getAffectedModuleIds.ts index 23b5b91..46141bb 100644 --- a/src/webpack/util/getAffectedModuleIds.ts +++ b/src/webpack/util/getAffectedModuleIds.ts @@ -1,5 +1,7 @@ import Chunk from 'webpack/lib/Chunk' +import ChunkGraph from 'webpack/lib/ChunkGraph' import Module from 'webpack/lib/Module' +import ModuleGraph from 'webpack/lib/ModuleGraph' type ModuleMap = { [key: string]: Module @@ -12,6 +14,7 @@ const isBuilt = (module: Module): boolean => module.built const getId = (module: any): number | string => module.id const affectedModules = ( + chunkGraph: ChunkGraph, map: ModuleMap, usageMap: ModuleUsageMap, affected: ModuleMap, @@ -23,13 +26,13 @@ const affectedModules = ( } // module is identified as affected by this function call const module = map[moduleId] - affected[module.id] = module // eslint-disable-line no-param-reassign + affected[moduleId] = module // eslint-disable-line no-param-reassign // next we need to mark all usages aka parents also as affected - const usages = usageMap[module.id] + const usages = usageMap[moduleId] if (typeof usages !== 'undefined') { const ids = Object.keys(usages) - ids.forEach((id: string) => affectedModules(map, usageMap, affected, id)) + ids.forEach((id: string) => affectedModules(chunkGraph, map, usageMap, affected, id)) } } @@ -39,9 +42,9 @@ const affectedModules = ( * [moduleId]: Module * } */ -const buildModuleMap = (modules: Set): ModuleMap => { +const buildModuleMap = (chunkGraph: ChunkGraph, modules: Set): ModuleMap => { const moduleMap = Array.from(modules).reduce( - (memo, module: Module) => ({ ...memo, [module.id]: module }), + (memo, module: Module) => ({ ...memo, [chunkGraph.getModuleId(module)]: module }), {} ) return moduleMap @@ -62,7 +65,9 @@ const buildModuleMap = (modules: Set): ModuleMap => { */ const buildModuleUsageMap = ( chunks: Set, - modules: Set + chunkGraph: ChunkGraph, + modules: Set, + moduleGraph: ModuleGraph ): ModuleUsageMap => { // build a map of all modules with their parent // { @@ -74,15 +79,17 @@ const buildModuleUsageMap = ( const moduleUsageMap: ModuleUsageMap = Array.from(modules).reduce( (memo, module: Module) => { module.dependencies.forEach(dependency => { - const dependentModule = dependency.module + const dependentModule = moduleGraph.getModule(dependency) if (!dependentModule) { return } - if (typeof memo[dependentModule.id] === 'undefined') { - memo[dependentModule.id] = {} // eslint-disable-line no-param-reassign + const dependentModuleId = chunkGraph.getModuleId(dependentModule) + if (typeof memo[dependentModuleId] === 'undefined') { + memo[dependentModuleId] = {} // eslint-disable-line no-param-reassign } - memo[dependentModule.id][module.id] = module // eslint-disable-line no-param-reassign + const moduleId = chunkGraph.getModuleId(module) + memo[dependentModuleId][moduleId] = module // eslint-disable-line no-param-reassign }) return memo }, @@ -101,8 +108,9 @@ const buildModuleUsageMap = ( return memo }, {}) Array.from(modules).reduce((memo, module: Module) => { - module.getChunks().forEach((chunk: Chunk) => { - memo[chunk.id][module.id] = module // eslint-disable-line no-param-reassign + chunkGraph.getModuleChunksIterable(module).forEach((chunk: Chunk) => { + const moduleId = chunkGraph.getModuleId(module) + memo[chunk.id][moduleId] = module // eslint-disable-line no-param-reassign }) return memo }, chunkModuleMap) @@ -117,10 +125,12 @@ const buildModuleUsageMap = ( // and mark all modules of this chunk as a direct dependency of the original module Object.values(chunkModuleMap[chunkId] as ModuleMap).forEach( (childModule: any) => { - if (typeof moduleUsageMap[childModule.id] === 'undefined') { - moduleUsageMap[childModule.id] = {} + const childModuleId = chunkGraph.getModuleId(childModule) + if (typeof moduleUsageMap[childModuleId] === 'undefined') { + moduleUsageMap[childModuleId] = {} } - moduleUsageMap[childModule.id][module.id] = module + const moduleId = chunkGraph.getModuleId(module) + moduleUsageMap[childModuleId][moduleId] = module } ) }) @@ -141,16 +151,19 @@ const buildModuleUsageMap = ( */ export default function getAffectedModuleIds( chunks: Set, - modules: Set + chunkGraph: ChunkGraph, + modules: Set, + moduleGraph: ModuleGraph ): Array { - const moduleMap: ModuleMap = buildModuleMap(modules) - const moduleUsageMap: ModuleUsageMap = buildModuleUsageMap(chunks, modules) + const moduleMap: ModuleMap = buildModuleMap(chunkGraph, modules) + const moduleUsageMap: ModuleUsageMap = buildModuleUsageMap(chunks, chunkGraph, modules, moduleGraph) const builtModules = Array.from(modules).filter(isBuilt) const affectedMap: ModuleMap = {} + const moduleId: string = chunkGraph.getModuleId(module) builtModules.forEach((module: Module) => - affectedModules(moduleMap, moduleUsageMap, affectedMap, module.id) + affectedModules(chunkGraph, moduleMap, moduleUsageMap, affectedMap, moduleId) ) - return Object.values(affectedMap).map(getId) + return Object.values(affectedMap).map(chunkGraph.getModuleId) } diff --git a/src/webpack/util/getBuildStats.ts b/src/webpack/util/getBuildStats.ts index 8024473..946a0b7 100644 --- a/src/webpack/util/getBuildStats.ts +++ b/src/webpack/util/getBuildStats.ts @@ -15,10 +15,10 @@ export default function getBuildStats( stats: Stats, outputPath: string ): BuildStats { - const { chunks, chunkGroups, modules } = stats.compilation + const { chunks, chunkGraph, chunkGroups, modules, moduleGraph } = stats.compilation const sortedChunks = sortChunks(chunks, chunkGroups) - const affectedModules = getAffectedModuleIds(chunks, modules) + const affectedModules = getAffectedModuleIds(chunks, chunkGraph, modules, moduleGraph) const entries = [] const js = [] @@ -34,9 +34,9 @@ export default function getBuildStats( } if ( - chunk - .getModules() - .some((module: Module) => affectedModules.indexOf(module.id) !== -1) + chunkGraph + .getChunkModules(chunk) + .some((module: Module) => affectedModules.indexOf(chunkGraph.getModuleId(module)) !== -1) ) { files.forEach(file => { if (/\.js$/.test(file)) { From 47904703593c486f8e17add0b11e6ebf4273ed7d Mon Sep 17 00:00:00 2001 From: James Addison Date: Sun, 11 Oct 2020 19:48:37 +0100 Subject: [PATCH 07/37] Add Travis build env definition for webpack v5 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 25bddae..11d0473 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,7 @@ install: env: - WEBPACK_VERSION=4 MOCHA_VERSION=6 - WEBPACK_VERSION=4 MOCHA_VERSION=7 + - WEBPACK_VERSION=5 MOCHA_VERSION=7 before_script: - "yarn add -D webpack@$WEBPACK_VERSION" From bb9674fc5fa9c4912542e283c6bd2c84ce4b62dc Mon Sep 17 00:00:00 2001 From: James Addison Date: Sun, 11 Oct 2020 19:57:16 +0100 Subject: [PATCH 08/37] Update yarn.lock --- yarn.lock | 1568 ++++++++++++++++++++--------------------------------- 1 file changed, 593 insertions(+), 975 deletions(-) diff --git a/yarn.lock b/yarn.lock index e2dc78c..27e7e4b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1199,6 +1199,15 @@ __metadata: languageName: node linkType: hard +"@npmcli/move-file@npm:^1.0.1": + version: 1.0.1 + resolution: "@npmcli/move-file@npm:1.0.1" + dependencies: + mkdirp: ^1.0.4 + checksum: 5574a1cb2058fcfd227cd03d142ed622c871ca40f397bcc1bd25454ef9e9a44c172ade4f33a26bac4add86b83811cc4e483e791e13ac4771abff0302a8bc70a4 + languageName: node + linkType: hard + "@samverschueren/stream-to-observable@npm:^0.3.0": version: 0.3.0 resolution: "@samverschueren/stream-to-observable@npm:0.3.0" @@ -1270,13 +1279,6 @@ __metadata: languageName: node linkType: hard -"@types/anymatch@npm:*": - version: 1.3.1 - resolution: "@types/anymatch@npm:1.3.1" - checksum: fe3bf8054df266dabc59c40aca43aaa9b2635f6312cfb116c4f7a45299d3e2ab344c08ef07becf3392bf2ac38fef073e14abe6d7c850326fef0f9ffa45554541 - languageName: node - linkType: hard - "@types/chai@npm:*, @types/chai@npm:^4.2.7": version: 4.2.11 resolution: "@types/chai@npm:4.2.11" @@ -1291,6 +1293,16 @@ __metadata: languageName: node linkType: hard +"@types/eslint-scope@npm:^3.7.0": + version: 3.7.0 + resolution: "@types/eslint-scope@npm:3.7.0" + dependencies: + "@types/eslint": "*" + "@types/estree": "*" + checksum: f6c8a0b23879b5c27caf060684642d5a39aefad0d29a763a32fa0d61d68ee8a2fa24dd59782ec9bdb32d3988464ceb497b48d7b0cc1141a0336f2da317cfda49 + languageName: node + linkType: hard + "@types/eslint-visitor-keys@npm:^1.0.0": version: 1.0.0 resolution: "@types/eslint-visitor-keys@npm:1.0.0" @@ -1298,6 +1310,23 @@ __metadata: languageName: node linkType: hard +"@types/eslint@npm:*": + version: 7.2.4 + resolution: "@types/eslint@npm:7.2.4" + dependencies: + "@types/estree": "*" + "@types/json-schema": "*" + checksum: 3a683fc154dfdd5ac459d24819d6ffc7fd3caa30bb695f22124bb452095eab762863b8d39f0a32fee1a804aa2d98d9f4354bb9410a9b86ab62114235ef43a490 + languageName: node + linkType: hard + +"@types/estree@npm:*, @types/estree@npm:^0.0.45": + version: 0.0.45 + resolution: "@types/estree@npm:0.0.45" + checksum: 28986101dfc998c282d2b5523c45cc8cbd061be7afde91875f63381d53671f956effc3ab9b61ad2dec75a6a87c167b8e9e7a35531a2e8c36cc9af459ca1fbf8e + languageName: node + linkType: hard + "@types/events@npm:*": version: 3.0.0 resolution: "@types/events@npm:3.0.0" @@ -1316,6 +1345,13 @@ __metadata: languageName: node linkType: hard +"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.6": + version: 7.0.6 + resolution: "@types/json-schema@npm:7.0.6" + checksum: 16fa81868966133fe284d09ad4db8aa20bb30130338341af9971b2523c53ebc156f5fb2bd02f09362ee71929663ce8afe92caf3f5583aa0922e830bb1f54dfef + languageName: node + linkType: hard + "@types/json-schema@npm:^7.0.3": version: 7.0.4 resolution: "@types/json-schema@npm:7.0.4" @@ -1409,54 +1445,6 @@ __metadata: languageName: node linkType: hard -"@types/source-list-map@npm:*": - version: 0.1.2 - resolution: "@types/source-list-map@npm:0.1.2" - checksum: 5680815c5b4f82f95d811ef7888050e6e95f97946881d865854fa064b09cc7085006f53604fdc390b583489f84af2d9c310987e3275d1a00f3bbb4213b4d0eb5 - languageName: node - linkType: hard - -"@types/tapable@npm:*": - version: 1.0.5 - resolution: "@types/tapable@npm:1.0.5" - checksum: baf72d0fe34418834ad8bf9d32b896c6d198a7ab4409fc46507ab557c90d0d58c635b3ee2d558e8fe3c22043a844f155708e45c4afba6a82fa30cf3d97712178 - languageName: node - linkType: hard - -"@types/uglify-js@npm:*": - version: 3.9.0 - resolution: "@types/uglify-js@npm:3.9.0" - dependencies: - source-map: ^0.6.1 - checksum: 68d6be6df39a9e276dbeca1a8ab29cab9bf2216604b4198ac5281b60c73b123abc4c12c115fe9654e7fc6163fe197a48531af2360957a3551ef0e0fbf8d70371 - languageName: node - linkType: hard - -"@types/webpack-sources@npm:*": - version: 0.1.7 - resolution: "@types/webpack-sources@npm:0.1.7" - dependencies: - "@types/node": "*" - "@types/source-list-map": "*" - source-map: ^0.6.1 - checksum: b37c8a95bf4e764be6ba19b96f2e2dd8d495f5de069c2968ab342de92078417f7d651320cef1f20406fea5def9db14fd7cbafd0aca5f64c7fba232506871c760 - languageName: node - linkType: hard - -"@types/webpack@npm:^4.41.0": - version: 4.41.12 - resolution: "@types/webpack@npm:4.41.12" - dependencies: - "@types/anymatch": "*" - "@types/node": "*" - "@types/tapable": "*" - "@types/uglify-js": "*" - "@types/webpack-sources": "*" - source-map: ^0.6.0 - checksum: bae77f927114621d7980e188ec268fe037f6b36ef334d14e64ac20d20b207c527613e92de77e5c291f24d5b7637762efb31a5c2b005e9100fa26be2e4b6a89b3 - languageName: node - linkType: hard - "@types/yargs-parser@npm:*": version: 15.0.0 resolution: "@types/yargs-parser@npm:15.0.0" @@ -1544,185 +1532,184 @@ __metadata: languageName: node linkType: hard -"@webassemblyjs/ast@npm:1.8.5": - version: 1.8.5 - resolution: "@webassemblyjs/ast@npm:1.8.5" +"@webassemblyjs/ast@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/ast@npm:1.9.0" dependencies: - "@webassemblyjs/helper-module-context": 1.8.5 - "@webassemblyjs/helper-wasm-bytecode": 1.8.5 - "@webassemblyjs/wast-parser": 1.8.5 - checksum: d5f324f0b66ab1f46e7c5532ee30c2d6c167c6c4baaeda19ed4bc72a14fcdc39be195198fdf0341b358082d87cf91d4c1716144bc38110615b9497f6b2fa1f3c + "@webassemblyjs/helper-module-context": 1.9.0 + "@webassemblyjs/helper-wasm-bytecode": 1.9.0 + "@webassemblyjs/wast-parser": 1.9.0 + checksum: 488da5e6a0a47e140ab9509cbb84b78189c2dc5e2d61294510a13a460125cd7d52e29aa67a7d4d06fb233dcfff5b8d6fc81a76a90da0eba54a8089cf15e47fe1 languageName: node linkType: hard -"@webassemblyjs/floating-point-hex-parser@npm:1.8.5": - version: 1.8.5 - resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.8.5" - checksum: d5b48c37510a8d12b12b9b1aee0111fbabee1f3f9f33f5ad78adf43023f844ff8a1a478a87e75e78ea9dd0ee79876b91309e42a40afb028425d97ed9b4cda35e +"@webassemblyjs/floating-point-hex-parser@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.9.0" + checksum: 3a1b98cf6f6a5f843fef21712049f769884db4bce04552cbc9677f32c2876683ac27c4bd71a06757aa5a55d62defbf0ad390abaf510e44362880c437c2cba8d7 languageName: node linkType: hard -"@webassemblyjs/helper-api-error@npm:1.8.5": - version: 1.8.5 - resolution: "@webassemblyjs/helper-api-error@npm:1.8.5" - checksum: e6bc9cf2827ff55f510819419a0b1f9886a3e33725ce86a6583fd2767537d8c55ea7afdc4c95dbe5b3e8f94ae5c1dad8c438b0be4944a42c1db159e726b85fcf +"@webassemblyjs/helper-api-error@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/helper-api-error@npm:1.9.0" + checksum: c3ae4b627f7555b902a819a70867ca4a32cfe075fcd01100d7fedd5e7f9d449cef7fdaa507db2c67f3d02195727167a708021caabb30e082476c86ce66066e4a languageName: node linkType: hard -"@webassemblyjs/helper-buffer@npm:1.8.5": - version: 1.8.5 - resolution: "@webassemblyjs/helper-buffer@npm:1.8.5" - checksum: 6fb5b2853325f2a816e279915815b79239163c8067249570ad2a7a77ad7ddc252e3ef7fd6198ccaaa182136be016a94f5b0f253da33f8b0f31625abdbdccf0e1 +"@webassemblyjs/helper-buffer@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/helper-buffer@npm:1.9.0" + checksum: f58253eb623915c83487f178a80486c9bf1df6b3b870b9bb60d94576adc7755b675da172112bf6810f065b72813cf3d993fe03293e2030b90c1a524b04faa972 languageName: node linkType: hard -"@webassemblyjs/helper-code-frame@npm:1.8.5": - version: 1.8.5 - resolution: "@webassemblyjs/helper-code-frame@npm:1.8.5" +"@webassemblyjs/helper-code-frame@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/helper-code-frame@npm:1.9.0" dependencies: - "@webassemblyjs/wast-printer": 1.8.5 - checksum: 9be884ea5a23503ca1fb960568c4815feeec700a5ed508a2f1dba89021e969c181948a07707f6248fd2f512fa14b44e0c03d85ebeb90d3133257f600f4b8e491 + "@webassemblyjs/wast-printer": 1.9.0 + checksum: 53ff748705526521ab1ceaec22f8949616c1667422e65379aaff0367217c9dff84f9cbce332a2437dd63c5fe96e89122579edc9130fa7cb819707089c0f94364 languageName: node linkType: hard -"@webassemblyjs/helper-fsm@npm:1.8.5": - version: 1.8.5 - resolution: "@webassemblyjs/helper-fsm@npm:1.8.5" - checksum: ec68cc03ab145a5f2499e2c328236fa3643321369b47884269adc8e97c6e2b7985745ac6f1051172f487f15e368ae956b0d3eb2f00ea794e960deb5da3a163f2 +"@webassemblyjs/helper-fsm@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/helper-fsm@npm:1.9.0" + checksum: 3fbf6a9387fa93f90cfb56c0545b241425f73f12a688a298fb6d8af76cd829f46f7be1268ca20501b764485ec0ce007ab613bb99147b70f430a9858d0845e4d4 languageName: node linkType: hard -"@webassemblyjs/helper-module-context@npm:1.8.5": - version: 1.8.5 - resolution: "@webassemblyjs/helper-module-context@npm:1.8.5" +"@webassemblyjs/helper-module-context@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/helper-module-context@npm:1.9.0" dependencies: - "@webassemblyjs/ast": 1.8.5 - mamacro: ^0.0.3 - checksum: 5c113d88270ee02b35f0974916dd25aaa9c52be905760144ff8acdb8c812bfa57fe1b5eb466c5e055201056643eee666e8c3e6f48194879262f0826f5a1889f1 + "@webassemblyjs/ast": 1.9.0 + checksum: e2ba20d5eb04fafa2dfbf06f21b715a6744ad058f967cb5b7c5fffe042af0e69227a46d566c5c3c44d360c621f086fd710295c412b3d65cd96be6a5f5522f5e3 languageName: node linkType: hard -"@webassemblyjs/helper-wasm-bytecode@npm:1.8.5": - version: 1.8.5 - resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.8.5" - checksum: 3bbb24b65b795a7837e31033b0d3304c479411a7cc9b8bde243557564e13a0559acdc5cd6a9929ae3b173e58ac2902a1587f3c887a4c464b8bdb60f1f962beac +"@webassemblyjs/helper-wasm-bytecode@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.9.0" + checksum: f754af81135b5594badef25a48de548c25387aa66f874cec6297e2c834d09734ba1d8fa5015dd995bcf3ef302cb37a24dc2a49ae3765adfc20fcd8ad182bc36f languageName: node linkType: hard -"@webassemblyjs/helper-wasm-section@npm:1.8.5": - version: 1.8.5 - resolution: "@webassemblyjs/helper-wasm-section@npm:1.8.5" +"@webassemblyjs/helper-wasm-section@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/helper-wasm-section@npm:1.9.0" dependencies: - "@webassemblyjs/ast": 1.8.5 - "@webassemblyjs/helper-buffer": 1.8.5 - "@webassemblyjs/helper-wasm-bytecode": 1.8.5 - "@webassemblyjs/wasm-gen": 1.8.5 - checksum: 292e2ce4a113e0f6914021d9feaffac139c6d523fae213dfe69925e24fadb56742271fa039f14ca14d1353f668ceaf4bb057c33676a6ce703977804c829653d3 + "@webassemblyjs/ast": 1.9.0 + "@webassemblyjs/helper-buffer": 1.9.0 + "@webassemblyjs/helper-wasm-bytecode": 1.9.0 + "@webassemblyjs/wasm-gen": 1.9.0 + checksum: e8ffc0cdc0baee21a611c64b68cd4c6a7b66d67955badd3c4d99e6d41581cae6ecc8e04fcbb6a59190a3716252693aea52f69ef063341a2c696cc03b94a50834 languageName: node linkType: hard -"@webassemblyjs/ieee754@npm:1.8.5": - version: 1.8.5 - resolution: "@webassemblyjs/ieee754@npm:1.8.5" +"@webassemblyjs/ieee754@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/ieee754@npm:1.9.0" dependencies: "@xtuc/ieee754": ^1.2.0 - checksum: 022a7db000324c3b7de27c78eb42ce9942329751dc9fe7d5ceca4e4e811dea446232104e5ba84e21cb6119638997f68c14be0cca35107e512f3567bcd017700e + checksum: eb81142cd8dbf4084dd7f4c3e07ad6191e41963726d2d059c2264c95dbdc2c4c0e9b73ea167fa765baf9a61ae66a8abe10518d05191f5da0ed52aacf3869c297 languageName: node linkType: hard -"@webassemblyjs/leb128@npm:1.8.5": - version: 1.8.5 - resolution: "@webassemblyjs/leb128@npm:1.8.5" +"@webassemblyjs/leb128@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/leb128@npm:1.9.0" dependencies: "@xtuc/long": 4.2.2 - checksum: df70ae7e23fe9e4dedd4c30f55c4fb8cb7fd73d8a57ba63c00dd367e491c5f921d0e0224ea5a22132fce71d00351d51d34560b43af6b94d5c3d296586a5b4e77 + checksum: af049fb0377733252141fb54a2b4dda4d9f681882e66e6b6a57cd8b5cd37c6a0a58e8da4f93e6eeddf97d7f6de1bd7982619de3efa02fd6f6828a0799caca52b languageName: node linkType: hard -"@webassemblyjs/utf8@npm:1.8.5": - version: 1.8.5 - resolution: "@webassemblyjs/utf8@npm:1.8.5" - checksum: 97b962411f3b456b0eca84727fa3a88f2a354fc473feb830c8300e646ee3a635c15d4a78ece4506429c350b21f0ec56766a8451a15413f22116c07c96f61197e +"@webassemblyjs/utf8@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/utf8@npm:1.9.0" + checksum: c9c76cac7b11a1ef5c33f9625581233aaf3b96d1c9641a22061621629dae8779644dc1bb6a776db930197b9a93261185684a588d94ab2f63ea755d6aa0f29e11 languageName: node linkType: hard -"@webassemblyjs/wasm-edit@npm:1.8.5": - version: 1.8.5 - resolution: "@webassemblyjs/wasm-edit@npm:1.8.5" +"@webassemblyjs/wasm-edit@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/wasm-edit@npm:1.9.0" dependencies: - "@webassemblyjs/ast": 1.8.5 - "@webassemblyjs/helper-buffer": 1.8.5 - "@webassemblyjs/helper-wasm-bytecode": 1.8.5 - "@webassemblyjs/helper-wasm-section": 1.8.5 - "@webassemblyjs/wasm-gen": 1.8.5 - "@webassemblyjs/wasm-opt": 1.8.5 - "@webassemblyjs/wasm-parser": 1.8.5 - "@webassemblyjs/wast-printer": 1.8.5 - checksum: 505ac5b0f9fa125c46aa150c09515b52891dc78e6bc2e175685d71261c859091f82f67d3e8b0f13bd4f4ee75488c78f232627c57d1f32ee7b4b0706445865603 + "@webassemblyjs/ast": 1.9.0 + "@webassemblyjs/helper-buffer": 1.9.0 + "@webassemblyjs/helper-wasm-bytecode": 1.9.0 + "@webassemblyjs/helper-wasm-section": 1.9.0 + "@webassemblyjs/wasm-gen": 1.9.0 + "@webassemblyjs/wasm-opt": 1.9.0 + "@webassemblyjs/wasm-parser": 1.9.0 + "@webassemblyjs/wast-printer": 1.9.0 + checksum: 7f676653f12130f43324db862673d842d591f5b22ffa303c88793320c6ed862f5454011b620f0dcc7c7d51b9f1220d30e0cf0a086df58a32da5a4ba7df4976b3 languageName: node linkType: hard -"@webassemblyjs/wasm-gen@npm:1.8.5": - version: 1.8.5 - resolution: "@webassemblyjs/wasm-gen@npm:1.8.5" +"@webassemblyjs/wasm-gen@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/wasm-gen@npm:1.9.0" dependencies: - "@webassemblyjs/ast": 1.8.5 - "@webassemblyjs/helper-wasm-bytecode": 1.8.5 - "@webassemblyjs/ieee754": 1.8.5 - "@webassemblyjs/leb128": 1.8.5 - "@webassemblyjs/utf8": 1.8.5 - checksum: 51fbf23c5a1bca03cda9eb8343fb95250f472523fa2cd0428c06d0224a282e2354ba77e31b8cca283a19bca9971d9344a065f73ac2b99d137521951f1c1ab569 + "@webassemblyjs/ast": 1.9.0 + "@webassemblyjs/helper-wasm-bytecode": 1.9.0 + "@webassemblyjs/ieee754": 1.9.0 + "@webassemblyjs/leb128": 1.9.0 + "@webassemblyjs/utf8": 1.9.0 + checksum: d33f3ac76da2faf7adf4207a7a4e3e9af40949a044a6bcb9b3b6882733e29af5e0eb69fd9ffccc95b9c6ac7aa24b7ce51f87e50c6d72706775c9929e04805f0f languageName: node linkType: hard -"@webassemblyjs/wasm-opt@npm:1.8.5": - version: 1.8.5 - resolution: "@webassemblyjs/wasm-opt@npm:1.8.5" +"@webassemblyjs/wasm-opt@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/wasm-opt@npm:1.9.0" dependencies: - "@webassemblyjs/ast": 1.8.5 - "@webassemblyjs/helper-buffer": 1.8.5 - "@webassemblyjs/wasm-gen": 1.8.5 - "@webassemblyjs/wasm-parser": 1.8.5 - checksum: 671ed40900c5231895eca6f449f9973b1d388cbb77de78e0419415df53814196f5a878db2c0ea6b71be4819762aa62c47bb1e3a2715a2daf5d6184443c0729e8 + "@webassemblyjs/ast": 1.9.0 + "@webassemblyjs/helper-buffer": 1.9.0 + "@webassemblyjs/wasm-gen": 1.9.0 + "@webassemblyjs/wasm-parser": 1.9.0 + checksum: e582bb42e2069ba4430dff80e6306328e9d12607d4beb1ad31f1e9d1bc22407c3e07f09ccfbf9d43fc1a1fab59f2ee246e6c93c57101fc74d14bfa2ab0fc811a languageName: node linkType: hard -"@webassemblyjs/wasm-parser@npm:1.8.5": - version: 1.8.5 - resolution: "@webassemblyjs/wasm-parser@npm:1.8.5" +"@webassemblyjs/wasm-parser@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/wasm-parser@npm:1.9.0" dependencies: - "@webassemblyjs/ast": 1.8.5 - "@webassemblyjs/helper-api-error": 1.8.5 - "@webassemblyjs/helper-wasm-bytecode": 1.8.5 - "@webassemblyjs/ieee754": 1.8.5 - "@webassemblyjs/leb128": 1.8.5 - "@webassemblyjs/utf8": 1.8.5 - checksum: c8d5b12dc6d47e2a73ac8e5a9bf3f9f1e5f6bb110237665a3a59271bb8691151e429e5ceaef31526c908029950e18b8faa28f505232f0a885d37375d125bd7bd + "@webassemblyjs/ast": 1.9.0 + "@webassemblyjs/helper-api-error": 1.9.0 + "@webassemblyjs/helper-wasm-bytecode": 1.9.0 + "@webassemblyjs/ieee754": 1.9.0 + "@webassemblyjs/leb128": 1.9.0 + "@webassemblyjs/utf8": 1.9.0 + checksum: edee409b190feabd1ace4c104832d849c4a6857390f88eb822a3f58be6a3b7c2fe7593686aaeb7320c20fd7efc2c5363a8a9f42b50e5d8931f9fc94d8a5293df languageName: node linkType: hard -"@webassemblyjs/wast-parser@npm:1.8.5": - version: 1.8.5 - resolution: "@webassemblyjs/wast-parser@npm:1.8.5" +"@webassemblyjs/wast-parser@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/wast-parser@npm:1.9.0" dependencies: - "@webassemblyjs/ast": 1.8.5 - "@webassemblyjs/floating-point-hex-parser": 1.8.5 - "@webassemblyjs/helper-api-error": 1.8.5 - "@webassemblyjs/helper-code-frame": 1.8.5 - "@webassemblyjs/helper-fsm": 1.8.5 + "@webassemblyjs/ast": 1.9.0 + "@webassemblyjs/floating-point-hex-parser": 1.9.0 + "@webassemblyjs/helper-api-error": 1.9.0 + "@webassemblyjs/helper-code-frame": 1.9.0 + "@webassemblyjs/helper-fsm": 1.9.0 "@xtuc/long": 4.2.2 - checksum: ae411ac5091be49f86c59bafc4e4548c65815ae45b71a18234396de1f5074954b10c8c34b06b788c70fb430454ed7179d6a9272ec5aae911c47b3c6da208bd45 + checksum: 45a1089af61c2aef69d682c1e61b177bcf0863e27a7f847d106fed4e1da2931fb74c680bd4a7de0927f33317d53a99cf859f250e715e77030aff71a21b8b0104 languageName: node linkType: hard -"@webassemblyjs/wast-printer@npm:1.8.5": - version: 1.8.5 - resolution: "@webassemblyjs/wast-printer@npm:1.8.5" +"@webassemblyjs/wast-printer@npm:1.9.0": + version: 1.9.0 + resolution: "@webassemblyjs/wast-printer@npm:1.9.0" dependencies: - "@webassemblyjs/ast": 1.8.5 - "@webassemblyjs/wast-parser": 1.8.5 + "@webassemblyjs/ast": 1.9.0 + "@webassemblyjs/wast-parser": 1.9.0 "@xtuc/long": 4.2.2 - checksum: 801ec061bd41c9fef75a35e95b0b38804536e2c58184aa0acb04f3cc142c63afe0b20eb49220771b70ea523fb7a664a88dffc849ae91e263a682a7f8ee1e42fc + checksum: a0c35f68280eae46992711aba7b856187c8cf2b22a7e0d3281dcede50afb30648e84cd899b1c1c5901fdb77268d2ebb61fc2c3932596412ebaf5ff7021b3eab4 languageName: node linkType: hard @@ -1775,21 +1762,21 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^6.2.1": - version: 6.4.1 - resolution: "acorn@npm:6.4.1" +"acorn@npm:^7.1.1": + version: 7.1.1 + resolution: "acorn@npm:7.1.1" bin: acorn: bin/acorn - checksum: bb618ba2f47eaabe61be6cd1d4e006b016d6bc5117caeed9ba78859d1cb962ed2e8cda4995036b451691c56b1f4c503693eeb515586fcba652a71e2ade19c5e9 + checksum: ef1d00d82e8b71cf884aca1210a0444ca05ed2dfac42dc144b22d55f2ab84a36ac5e08ffefba9e64ca2109a08b7da5e07cf63e62fe21a3bf10a4c9ac6eb95106 languageName: node linkType: hard -"acorn@npm:^7.1.1": - version: 7.1.1 - resolution: "acorn@npm:7.1.1" +"acorn@npm:^8.0.3": + version: 8.0.4 + resolution: "acorn@npm:8.0.4" bin: acorn: bin/acorn - checksum: ef1d00d82e8b71cf884aca1210a0444ca05ed2dfac42dc144b22d55f2ab84a36ac5e08ffefba9e64ca2109a08b7da5e07cf63e62fe21a3bf10a4c9ac6eb95106 + checksum: a4a80d6237291a475d8b948143977cc28215bdaf2c7dab1a7395f956aebb5ac91a8340d2e36651e8a517ba316dddbee32bfe16f3ca539b8688fcb3a9c3d2f360 languageName: node linkType: hard @@ -1821,15 +1808,6 @@ __metadata: languageName: node linkType: hard -"ajv-errors@npm:^1.0.0": - version: 1.0.1 - resolution: "ajv-errors@npm:1.0.1" - peerDependencies: - ajv: ">=5.0.0" - checksum: 7b5186864835a358eec7b39e63ff5c5a4d28b543562903b3da882df8e06dcc9320aaf0974989ae11568660449ce5473d59b4f66a07e713d151789b5fa46b2527 - languageName: node - linkType: hard - "ajv-keywords@npm:^3.1.0, ajv-keywords@npm:^3.4.1": version: 3.4.1 resolution: "ajv-keywords@npm:3.4.1" @@ -1839,6 +1817,15 @@ __metadata: languageName: node linkType: hard +"ajv-keywords@npm:^3.5.2": + version: 3.5.2 + resolution: "ajv-keywords@npm:3.5.2" + peerDependencies: + ajv: ^6.9.1 + checksum: 1d62b6a4371f1a2f5dca7f81b4d02b1593148894ce2f5dbd2381dfe480cefd7608bdb10c9cf6cea7c3fa700f73d13fe4b1d2952f669f4ddf3178c6b2b040cda8 + languageName: node + linkType: hard + "ajv@npm:^4.9.1": version: 4.11.8 resolution: "ajv@npm:4.11.8" @@ -1861,6 +1848,18 @@ __metadata: languageName: node linkType: hard +"ajv@npm:^6.12.5": + version: 6.12.6 + resolution: "ajv@npm:6.12.6" + dependencies: + fast-deep-equal: ^3.1.1 + fast-json-stable-stringify: ^2.0.0 + json-schema-traverse: ^0.4.1 + uri-js: ^4.2.2 + checksum: 02473ee48dc1ddae9d60cf934b612733a03430da20df7ee4fd9249493ea040a8f1e215962fb8601e191c8d81d2758a38a8ca85724b6c19d0a7e4a4d95e389e86 + languageName: node + linkType: hard + "amdefine@npm:>=0.0.4": version: 1.0.1 resolution: "amdefine@npm:1.0.1" @@ -2169,17 +2168,6 @@ __metadata: languageName: node linkType: hard -"asn1.js@npm:^4.0.0": - version: 4.10.1 - resolution: "asn1.js@npm:4.10.1" - dependencies: - bn.js: ^4.0.0 - inherits: ^2.0.1 - minimalistic-assert: ^1.0.0 - checksum: 0db88a773be73e459acc47013dda82d73310307f9be841ed95c4375410d57117b9b709db792916fdab4017302597ea07b9b43bc9452e1c3bb79fb0140ba7f898 - languageName: node - linkType: hard - "asn1@npm:~0.2.3": version: 0.2.4 resolution: "asn1@npm:0.2.4" @@ -2203,16 +2191,6 @@ __metadata: languageName: node linkType: hard -"assert@npm:^1.1.1": - version: 1.5.0 - resolution: "assert@npm:1.5.0" - dependencies: - object-assign: ^4.1.1 - util: 0.10.3 - checksum: 43351bcb72b26894e2fb65b121f9b19ee24a0d313e81e51c8da62f8c2cf432550de25221f9d9ffa4c70e973556c79dc2fb657a34219e3fc4ea0dd3668b1f9495 - languageName: node - linkType: hard - "assertion-error@npm:^1.1.0": version: 1.1.0 resolution: "assertion-error@npm:1.1.0" @@ -2485,13 +2463,6 @@ __metadata: languageName: node linkType: hard -"base64-js@npm:^1.0.2": - version: 1.3.1 - resolution: "base64-js@npm:1.3.1" - checksum: 3df94336da06b822c61eca59e61323ac0ddea6d6768699ebd87a10928ff14c95c1f48ada19f4f38729d780776c533c4b759291d909642a93a5aaa7d1ad72fbc4 - languageName: node - linkType: hard - "base@npm:^0.11.1": version: 0.11.2 resolution: "base@npm:0.11.2" @@ -2588,20 +2559,13 @@ __metadata: languageName: node linkType: hard -"bluebird@npm:^3.5.0, bluebird@npm:^3.5.1, bluebird@npm:^3.5.5, bluebird@npm:~3.5.0": +"bluebird@npm:^3.5.0, bluebird@npm:^3.5.1, bluebird@npm:~3.5.0": version: 3.5.5 resolution: "bluebird@npm:3.5.5" checksum: 8935d9ad420b54fd4c57e781b68a69849f6851f853f5958252eb808fbf704580f0d9cbae728bcb9c2cd81e709320e92948b0b2ca1131edf43b0101f567f90ad3 languageName: node linkType: hard -"bn.js@npm:^4.0.0, bn.js@npm:^4.1.0, bn.js@npm:^4.1.1, bn.js@npm:^4.4.0": - version: 4.11.8 - resolution: "bn.js@npm:4.11.8" - checksum: 5ae07f2bed003305902ab134c51b2b45afcb7275c268bbf0b5eb5ab1a0194f44a2b2dfbc3bb8efe9f2c482f7501137a9d8885feb249f65efe3b637edfee4e344 - languageName: node - linkType: hard - "boolbase@npm:~1.0.0": version: 1.0.0 resolution: "boolbase@npm:1.0.0" @@ -2706,13 +2670,6 @@ __metadata: languageName: node linkType: hard -"brorand@npm:^1.0.1": - version: 1.1.0 - resolution: "brorand@npm:1.1.0" - checksum: 19bdae608690914ccb0e49b9e4c9bea513ac8c043fd1a6997a4e8c9d1e47b8a96defe266af139e4096522c63bdab765df5227db60859fc801370f25c032830f6 - languageName: node - linkType: hard - "browser-stdout@npm:1.3.1": version: 1.3.1 resolution: "browser-stdout@npm:1.3.1" @@ -2720,74 +2677,17 @@ __metadata: languageName: node linkType: hard -"browserify-aes@npm:^1.0.0, browserify-aes@npm:^1.0.4": - version: 1.2.0 - resolution: "browserify-aes@npm:1.2.0" - dependencies: - buffer-xor: ^1.0.3 - cipher-base: ^1.0.0 - create-hash: ^1.1.0 - evp_bytestokey: ^1.0.3 - inherits: ^2.0.1 - safe-buffer: ^5.0.1 - checksum: 8351db97b026bba2d811acecfdd954ad53c3c892fc4bdba0598723d10a9ffe8d7963a0569afcf0973b2b56bc9a453cb8b9a81b7e84feb047067d4b4d2211abd3 - languageName: node - linkType: hard - -"browserify-cipher@npm:^1.0.0": - version: 1.0.1 - resolution: "browserify-cipher@npm:1.0.1" - dependencies: - browserify-aes: ^1.0.4 - browserify-des: ^1.0.0 - evp_bytestokey: ^1.0.0 - checksum: 9a33bbdd89244fc9f9c55c9fa234e3c7ffe19e2aa50ad706f27e1b5f0401e93d4bf50f90a7d864f41123a770605f4a19a4d82f40523cb6bf0b7dee8428533e4d - languageName: node - linkType: hard - -"browserify-des@npm:^1.0.0": - version: 1.0.2 - resolution: "browserify-des@npm:1.0.2" - dependencies: - cipher-base: ^1.0.1 - des.js: ^1.0.0 - inherits: ^2.0.1 - safe-buffer: ^5.1.2 - checksum: 75d30392237cbc1b14c6b00fb149ac7e0c6d3db8455c9b95b8147a619c63c9ff4d11648401196bc15129e275a467e6606a6c1e85b835c1d7130e01bf86a66989 - languageName: node - linkType: hard - -"browserify-rsa@npm:^4.0.0": - version: 4.0.1 - resolution: "browserify-rsa@npm:4.0.1" - dependencies: - bn.js: ^4.1.0 - randombytes: ^2.0.1 - checksum: 89de48934de62a2ab3c6dde1353f92d8218475d944096264a348a0f85e213bf230d5965a2f45267dbb048386ba983f03294480f5295d395f8df0a43aabf18f54 - languageName: node - linkType: hard - -"browserify-sign@npm:^4.0.0": - version: 4.0.4 - resolution: "browserify-sign@npm:4.0.4" +"browserslist@npm:^4.14.3": + version: 4.14.5 + resolution: "browserslist@npm:4.14.5" dependencies: - bn.js: ^4.1.1 - browserify-rsa: ^4.0.0 - create-hash: ^1.1.0 - create-hmac: ^1.1.2 - elliptic: ^6.0.0 - inherits: ^2.0.1 - parse-asn1: ^5.0.0 - checksum: 974a04907f7dcbac7ff02fe4e7b6e10bde90d1791152fc1d98853039120dac35c900d4b2ee6cada6905b80d55c1dca523ccd6a29a662f8b658f191ddb3c9d2ee - languageName: node - linkType: hard - -"browserify-zlib@npm:^0.2.0": - version: 0.2.0 - resolution: "browserify-zlib@npm:0.2.0" - dependencies: - pako: ~1.0.5 - checksum: ad62de388ee15ff07c4c0331bbf44069f3d5daba8a282bb17a363a077c2a43b7093c31b94a65a60d0610d1d4a73aa85e90e70309de4769307961160fa8e15005 + caniuse-lite: ^1.0.30001135 + electron-to-chromium: ^1.3.571 + escalade: ^3.1.0 + node-releases: ^1.1.61 + bin: + browserslist: cli.js + checksum: a619caebac8bd9657a6ee24a22fa62d43fd9bfaa4813a8efe7dbee8c308be42490f8fecfe5335b58e348e783574e6167b6d0b3aef2d81b678cc0b2f9f2c6a7c4 languageName: node linkType: hard @@ -2843,24 +2743,6 @@ __metadata: languageName: node linkType: hard -"buffer-xor@npm:^1.0.3": - version: 1.0.3 - resolution: "buffer-xor@npm:1.0.3" - checksum: 52e3fd5dfa30be39539f3b7acd1533acb3c5d5b20f3da58e2b254e54906ff9e19b39b593508d8774bfd9338e5fbb318ddaf73d698ad0df37a06206b07ef19519 - languageName: node - linkType: hard - -"buffer@npm:^4.3.0": - version: 4.9.2 - resolution: "buffer@npm:4.9.2" - dependencies: - base64-js: ^1.0.2 - ieee754: ^1.1.4 - isarray: ^1.0.0 - checksum: 8bb1e8b332387d69a35f175a8b2fb7cb7035ec274b62f8808231e8538ff3b070e52a9b0d5df3f0daa4669295787c501e43ae74df20b98f332960f7a3d71a5f2a - languageName: node - linkType: hard - "builtin-modules@npm:^1.0.0": version: 1.1.1 resolution: "builtin-modules@npm:1.1.1" @@ -2868,13 +2750,6 @@ __metadata: languageName: node linkType: hard -"builtin-status-codes@npm:^3.0.0": - version: 3.0.0 - resolution: "builtin-status-codes@npm:3.0.0" - checksum: 4bfe0f1b64561a2384389f6103fa788656dbb03884665afb1c64b0bfd061d4e73fbd0b68531ddbbcb8c5820b620f22eaf090d16fcb1c3618fa0cfc95a1b7f1a1 - languageName: node - linkType: hard - "builtins@npm:0.0.7": version: 0.0.7 resolution: "builtins@npm:0.0.7" @@ -2910,26 +2785,28 @@ __metadata: languageName: node linkType: hard -"cacache@npm:^12.0.2": - version: 12.0.4 - resolution: "cacache@npm:12.0.4" +"cacache@npm:^15.0.5": + version: 15.0.5 + resolution: "cacache@npm:15.0.5" dependencies: - bluebird: ^3.5.5 - chownr: ^1.1.1 - figgy-pudding: ^3.5.1 + "@npmcli/move-file": ^1.0.1 + chownr: ^2.0.0 + fs-minipass: ^2.0.0 glob: ^7.1.4 - graceful-fs: ^4.1.15 - infer-owner: ^1.0.3 - lru-cache: ^5.1.1 - mississippi: ^3.0.0 - mkdirp: ^0.5.1 - move-concurrently: ^1.0.1 + infer-owner: ^1.0.4 + lru-cache: ^6.0.0 + minipass: ^3.1.1 + minipass-collect: ^1.0.2 + minipass-flush: ^1.0.5 + minipass-pipeline: ^1.2.2 + mkdirp: ^1.0.3 + p-map: ^4.0.0 promise-inflight: ^1.0.1 - rimraf: ^2.6.3 - ssri: ^6.0.1 + rimraf: ^3.0.2 + ssri: ^8.0.0 + tar: ^6.0.2 unique-filename: ^1.1.1 - y18n: ^4.0.0 - checksum: dbb4664a87bc5ea9cebea3ce295fcfec4ccedc7086e30700a0f5262b7abbe6fcc32cc0b94c9728122e009ab12583844716e136a7d03915edbfaa2fc16f08f9f8 + checksum: fc09ba6728e4e8b992bca0a8dcb49b707aac0d7fffa89f8abf6a76db6d800da110a1abdbb47e96f2d754c6f54b0ee61e9cfad8f625718158f0655a32901185e6 languageName: node linkType: hard @@ -3093,6 +2970,13 @@ __metadata: languageName: node linkType: hard +"caniuse-lite@npm:^1.0.30001135": + version: 1.0.30001147 + resolution: "caniuse-lite@npm:1.0.30001147" + checksum: 30fd868353848d24b1e0fca180f10e33121345069c891553121a77faafd415ae1b1dd4de1bbe529cb1f8552c05e0d46b326fcad615c86d6f79f1e6686771cf82 + languageName: node + linkType: hard + "capture-stack-trace@npm:^1.0.0": version: 1.0.1 resolution: "capture-stack-trace@npm:1.0.1" @@ -3277,6 +3161,13 @@ __metadata: languageName: node linkType: hard +"chownr@npm:^2.0.0": + version: 2.0.0 + resolution: "chownr@npm:2.0.0" + checksum: 7ec5eb9822d618ead1d27ae948f68f7d2e54eae3530caf37bfb1cafe94b99eed299b2c843aa08307f24915ce9b116fd4c13587606b6f9c21d668e84b296a5b1e + languageName: node + linkType: hard + "chrome-trace-event@npm:^1.0.2": version: 1.0.2 resolution: "chrome-trace-event@npm:1.0.2" @@ -3293,16 +3184,6 @@ __metadata: languageName: node linkType: hard -"cipher-base@npm:^1.0.0, cipher-base@npm:^1.0.1, cipher-base@npm:^1.0.3": - version: 1.0.4 - resolution: "cipher-base@npm:1.0.4" - dependencies: - inherits: ^2.0.1 - safe-buffer: ^5.0.1 - checksum: 2f1cbbef646a7340043d89ceb1ef037263c5b65805b54c165c1ee5d3c657ec33f18703e6ed09281dc218e92b4664a9750794d1cd9f830937dab009af6d19820f - languageName: node - linkType: hard - "class-utils@npm:^0.3.5": version: 0.3.6 resolution: "class-utils@npm:0.3.6" @@ -3626,13 +3507,6 @@ __metadata: languageName: node linkType: hard -"console-browserify@npm:^1.1.0": - version: 1.2.0 - resolution: "console-browserify@npm:1.2.0" - checksum: bfd2c71e704ea3df9e93562ae2645ae5669436cf708f7c6f02632f9e175925a93c34e531434b17fd5769a9a20ec8d3f25a4c6b23e6620de82718c47286a85676 - languageName: node - linkType: hard - "console-control-strings@npm:^1.0.0, console-control-strings@npm:~1.1.0": version: 1.1.0 resolution: "console-control-strings@npm:1.1.0" @@ -3640,13 +3514,6 @@ __metadata: languageName: node linkType: hard -"constants-browserify@npm:^1.0.0": - version: 1.0.0 - resolution: "constants-browserify@npm:1.0.0" - checksum: 478d331305721c994a93b06a1ac5bd23493e28cd6072932d3fe1b6e0d64aa988aca9ca698ffe8345b6cef2382598251995242dcdc933ca412e4cdb0153e90eb0 - languageName: node - linkType: hard - "contains-path@npm:^0.1.0": version: 0.1.0 resolution: "contains-path@npm:0.1.0" @@ -3733,16 +3600,6 @@ __metadata: languageName: node linkType: hard -"create-ecdh@npm:^4.0.0": - version: 4.0.3 - resolution: "create-ecdh@npm:4.0.3" - dependencies: - bn.js: ^4.1.0 - elliptic: ^6.0.0 - checksum: 04bef7052e561ba5a6115b2523899182f91e09cdadb381c6024a55e66041cbc544c0041521def0f73014899caa2a044210edf2c44c10a7d508b3fe957309c06f - languageName: node - linkType: hard - "create-error-class@npm:^3.0.0": version: 3.0.2 resolution: "create-error-class@npm:3.0.2" @@ -3752,33 +3609,6 @@ __metadata: languageName: node linkType: hard -"create-hash@npm:^1.1.0, create-hash@npm:^1.1.2": - version: 1.2.0 - resolution: "create-hash@npm:1.2.0" - dependencies: - cipher-base: ^1.0.1 - inherits: ^2.0.1 - md5.js: ^1.3.4 - ripemd160: ^2.0.1 - sha.js: ^2.4.0 - checksum: 8ff122bc15e9d4da6e7e12d833100743c75b80e90865e9370f2de0dd1edc5e6809a3ee676d770f7889d91ff82fe988cc009591879d5b869fce82c1771921f7ca - languageName: node - linkType: hard - -"create-hmac@npm:^1.1.0, create-hmac@npm:^1.1.2, create-hmac@npm:^1.1.4": - version: 1.1.7 - resolution: "create-hmac@npm:1.1.7" - dependencies: - cipher-base: ^1.0.3 - create-hash: ^1.1.0 - inherits: ^2.0.1 - ripemd160: ^2.0.0 - safe-buffer: ^5.0.1 - sha.js: ^2.4.8 - checksum: 3439c0a58f2801c687e0454fda398b9d2aaf3c086c36e936766170aedc98c97f71364ae4b28979ca8f788afa2e91114736c4521f438d8909ba66b1302e8c420b - languageName: node - linkType: hard - "cross-env@npm:6.0.3": version: 6.0.3 resolution: "cross-env@npm:6.0.3" @@ -3855,25 +3685,6 @@ __metadata: languageName: node linkType: hard -"crypto-browserify@npm:^3.11.0": - version: 3.12.0 - resolution: "crypto-browserify@npm:3.12.0" - dependencies: - browserify-cipher: ^1.0.0 - browserify-sign: ^4.0.0 - create-ecdh: ^4.0.0 - create-hash: ^1.1.0 - create-hmac: ^1.1.0 - diffie-hellman: ^5.0.0 - inherits: ^2.0.1 - pbkdf2: ^3.0.3 - public-encrypt: ^4.0.0 - randombytes: ^2.0.0 - randomfill: ^1.0.3 - checksum: 4a530883d1f57735da892f7ee8637cf6f8997e616742a8387531870cc68e2b15f70019c78fbac017c31b764c9dd29335055754f5b0cb3d814be68188ed22b741 - languageName: node - linkType: hard - "crypto-random-string@npm:^1.0.0": version: 1.0.0 resolution: "crypto-random-string@npm:1.0.0" @@ -4189,16 +4000,6 @@ __metadata: languageName: node linkType: hard -"des.js@npm:^1.0.0": - version: 1.0.1 - resolution: "des.js@npm:1.0.1" - dependencies: - inherits: ^2.0.1 - minimalistic-assert: ^1.0.0 - checksum: 0bca161509115fddf78b6d62e59d4eb3b7354e4696fb5714950f1acd9fcb1948fc482706671fc2859ca0238cf95f7f4b522fbab356153ecbf7867914dad08a96 - languageName: node - linkType: hard - "detect-indent@npm:^4.0.0": version: 4.0.0 resolution: "detect-indent@npm:4.0.0" @@ -4248,17 +4049,6 @@ __metadata: languageName: node linkType: hard -"diffie-hellman@npm:^5.0.0": - version: 5.0.3 - resolution: "diffie-hellman@npm:5.0.3" - dependencies: - bn.js: ^4.1.0 - miller-rabin: ^4.0.0 - randombytes: ^2.0.0 - checksum: 5542e4eacfe2da109545d940f73db1a69f880291331e076c8c079d6a0a35b1a2a504a1c99c0aa8ad8658f7dd06ba38f605fdd6f64e55703db41a65bf8d69665a - languageName: node - linkType: hard - "dir-glob@npm:^3.0.1": version: 3.0.1 resolution: "dir-glob@npm:3.0.1" @@ -4297,13 +4087,6 @@ __metadata: languageName: node linkType: hard -"domain-browser@npm:^1.1.1": - version: 1.2.0 - resolution: "domain-browser@npm:1.2.0" - checksum: c00043ad1a78b26610b8ff8d2fdf9e1a571edf0123fda6da28521fff6b11c7bb0adc3e29156cb2324389ef2c1909d61e8d522e49022e527e30866eef295799c8 - languageName: node - linkType: hard - "domelementtype@npm:1, domelementtype@npm:^1.3.0, domelementtype@npm:^1.3.1": version: 1.3.1 resolution: "domelementtype@npm:1.3.1" @@ -4392,6 +4175,13 @@ __metadata: languageName: node linkType: hard +"electron-to-chromium@npm:^1.3.571": + version: 1.3.578 + resolution: "electron-to-chromium@npm:1.3.578" + checksum: c233dab9b89232b057b3b7e8d6334abb1273f53a67faadfefd77f62d1e6d727136c323563f49c85edacc4e2e151cbfd2b4e6468050ba3d977d791914308ef54d + languageName: node + linkType: hard + "elegant-spinner@npm:^1.0.1": version: 1.0.1 resolution: "elegant-spinner@npm:1.0.1" @@ -4399,21 +4189,6 @@ __metadata: languageName: node linkType: hard -"elliptic@npm:^6.0.0": - version: 6.5.2 - resolution: "elliptic@npm:6.5.2" - dependencies: - bn.js: ^4.4.0 - brorand: ^1.0.1 - hash.js: ^1.0.0 - hmac-drbg: ^1.0.0 - inherits: ^2.0.1 - minimalistic-assert: ^1.0.0 - minimalistic-crypto-utils: ^1.0.0 - checksum: 34e8894f16a50eb4a8536a469170b9ea0a7463d4c616a3b9ab996ebc118f392391f7537a79e56049991b69a80947fe0fc47f0b961deb9830333dcc33a2eff61e - languageName: node - linkType: hard - "emoji-regex@npm:^7.0.1": version: 7.0.3 resolution: "emoji-regex@npm:7.0.3" @@ -4453,14 +4228,13 @@ __metadata: languageName: node linkType: hard -"enhanced-resolve@npm:^4.1.0": - version: 4.1.1 - resolution: "enhanced-resolve@npm:4.1.1" +"enhanced-resolve@npm:^5.2.0": + version: 5.2.0 + resolution: "enhanced-resolve@npm:5.2.0" dependencies: - graceful-fs: ^4.1.2 - memory-fs: ^0.5.0 - tapable: ^1.0.0 - checksum: c951d32be6a5e72a9f38e6defb64eaaf8bd9e6ed2a1776adba5d3cec7353462ca4c597a6b7a586e32c60b8c4f55c37e5d438cc3a8d0fcb7424e5e367959b44a7 + graceful-fs: ^4.2.4 + tapable: ^2.0.0 + checksum: bf6b8e6156b3b3db925a1804d54f7401ec486f90e5bd7198f7a32fbc5bd127c0384b3ebf76a2580a6de80e34c19089d9852084fbdd359ad6db3a4b109dba0294 languageName: node linkType: hard @@ -4485,7 +4259,7 @@ __metadata: languageName: node linkType: hard -"errno@npm:>=0.1.1 <0.2.0-0, errno@npm:^0.1.3, errno@npm:~0.1.7": +"errno@npm:>=0.1.1 <0.2.0-0, errno@npm:^0.1.3": version: 0.1.7 resolution: "errno@npm:0.1.7" dependencies: @@ -4558,6 +4332,13 @@ __metadata: languageName: node linkType: hard +"escalade@npm:^3.1.0": + version: 3.1.0 + resolution: "escalade@npm:3.1.0" + checksum: 7381fca871df55107c3b2efe55ce41fbe3fbda4a0c92b1984f12977411c8eb6c0aad9bca062418820a9b8cdaf739df2274874d80263f92c820e66d8e3bcc370d + languageName: node + linkType: hard + "escape-string-regexp@npm:1.0.5, escape-string-regexp@npm:^1.0.2, escape-string-regexp@npm:^1.0.5": version: 1.0.5 resolution: "escape-string-regexp@npm:1.0.5" @@ -4656,23 +4437,23 @@ __metadata: languageName: node linkType: hard -"eslint-scope@npm:^4.0.3": - version: 4.0.3 - resolution: "eslint-scope@npm:4.0.3" +"eslint-scope@npm:^5.0.0": + version: 5.0.0 + resolution: "eslint-scope@npm:5.0.0" dependencies: esrecurse: ^4.1.0 estraverse: ^4.1.1 - checksum: 23e80b6924dabd6993d8a4040d3f9bf5353c880bac1e632ddadfbef18dc553c8a292372f2f90b91d347daec3d32f1fbdbec5801eddcb572d041f9e5e5ecd7f1f + checksum: 473cff402203cf61dbb6459a07948621afe4eb93b259dd47848865124b4efcbd25936acf50ad03165955d96ce9560f1cc9961d6e09d35da9ca2137207685c01c languageName: node linkType: hard -"eslint-scope@npm:^5.0.0": - version: 5.0.0 - resolution: "eslint-scope@npm:5.0.0" +"eslint-scope@npm:^5.1.0": + version: 5.1.1 + resolution: "eslint-scope@npm:5.1.1" dependencies: - esrecurse: ^4.1.0 + esrecurse: ^4.3.0 estraverse: ^4.1.1 - checksum: 473cff402203cf61dbb6459a07948621afe4eb93b259dd47848865124b4efcbd25936acf50ad03165955d96ce9560f1cc9961d6e09d35da9ca2137207685c01c + checksum: 94a1dc20f19cfac7836423e1fb3ebfcfa3f157aa149c6e452c7c047a36d7216a865dbfd3d9e5363cf19f8eebc1a7ffe9c4ca5cdab6d330e267b11c0d6a9d8206 languageName: node linkType: hard @@ -4794,6 +4575,15 @@ __metadata: languageName: node linkType: hard +"esrecurse@npm:^4.3.0": + version: 4.3.0 + resolution: "esrecurse@npm:4.3.0" + dependencies: + estraverse: ^5.2.0 + checksum: 5734c00b24b98f05d0bec48c4ddc0979ad0d8c3a5f587ed1454777b080f2c0979e8fcc0be6bab124b78ebc1d9212eb1e45c0af939bbc8579bcde1f81fc686f99 + languageName: node + linkType: hard + "estraverse@npm:^4.1.0, estraverse@npm:^4.1.1": version: 4.3.0 resolution: "estraverse@npm:4.3.0" @@ -4808,6 +4598,13 @@ __metadata: languageName: node linkType: hard +"estraverse@npm:^5.2.0": + version: 5.2.0 + resolution: "estraverse@npm:5.2.0" + checksum: b0bba1b8ae2370c4b28e04e25883cb4fcc437a4962a77070ca2d735dab86bcc61b1a8a2d4049b79bb3440b614413fc7e595f52dd01764dee083d96a7b8254b69 + languageName: node + linkType: hard + "esutils@npm:^2.0.2": version: 2.0.3 resolution: "esutils@npm:2.0.3" @@ -4815,21 +4612,10 @@ __metadata: languageName: node linkType: hard -"events@npm:^3.0.0": - version: 3.1.0 - resolution: "events@npm:3.1.0" - checksum: 3c9e6bd23fad2a871ea1bf6ce1102e9564a34ec5741aea362cfbcf851eb559aab8d1a87225045708c6db7e50d51405e9e3d66e31667fe9c948ed87abaf88b744 - languageName: node - linkType: hard - -"evp_bytestokey@npm:^1.0.0, evp_bytestokey@npm:^1.0.3": - version: 1.0.3 - resolution: "evp_bytestokey@npm:1.0.3" - dependencies: - md5.js: ^1.3.4 - node-gyp: latest - safe-buffer: ^5.1.1 - checksum: d0deef99bac2d334c43eb400512e9bbb6c08616e8b597b9172bceb01d44a74ec3139bc453ba4e9108ad5e5765e9ff9e1afac0782ece072bef04851c40e7be7c9 +"events@npm:^3.2.0": + version: 3.2.0 + resolution: "events@npm:3.2.0" + checksum: e64cc9332aea196158bbf000a251b34d82694ccc1218744cfee833fff319378817f58102ced8b2b86df2478b99bacef5c165d774db7cf4b4be15c331cf2c4448 languageName: node linkType: hard @@ -5022,13 +4808,6 @@ __metadata: languageName: node linkType: hard -"figgy-pudding@npm:^3.5.1": - version: 3.5.2 - resolution: "figgy-pudding@npm:3.5.2" - checksum: 5421b5c4630852363cc94729824d6d148380d1ddd9760ae98f1b97390196d7fe13cb95ca41d480abc2c187870c6c8f74ad6ffcfdd75c79c7a84f1729f9773157 - languageName: node - linkType: hard - "figures@npm:^1.7.0": version: 1.7.0 resolution: "figures@npm:1.7.0" @@ -5160,6 +4939,17 @@ __metadata: languageName: node linkType: hard +"find-cache-dir@npm:^3.3.1": + version: 3.3.1 + resolution: "find-cache-dir@npm:3.3.1" + dependencies: + commondir: ^1.0.1 + make-dir: ^3.0.2 + pkg-dir: ^4.1.0 + checksum: 5c25755084c886ce17909349bf65923696a14550d20b0274618b15aaf15c9acc7409b93f3b1145daecacabdfbfd67d5c3a2a137dc725eb84e030a8790454fe11 + languageName: node + linkType: hard + "find-up@npm:3.0.0, find-up@npm:^3.0.0": version: 3.0.0 resolution: "find-up@npm:3.0.0" @@ -5386,6 +5176,15 @@ __metadata: languageName: node linkType: hard +"fs-minipass@npm:^2.0.0": + version: 2.1.0 + resolution: "fs-minipass@npm:2.1.0" + dependencies: + minipass: ^3.0.0 + checksum: 18e3ecebfe5e64b96459f226bfd14858d064b77beb5b190ca5774d8dc0723c8897a785ca09805bc0a0c9cf8b7ee1f3b5445c21bf5c11af9974a0581306c04d4c + languageName: node + linkType: hard + "fs-readdir-recursive@npm:^1.1.0": version: 1.1.0 resolution: "fs-readdir-recursive@npm:1.1.0" @@ -5808,6 +5607,13 @@ fsevents@~2.1.1: languageName: node linkType: hard +"glob-to-regexp@npm:^0.4.1": + version: 0.4.1 + resolution: "glob-to-regexp@npm:0.4.1" + checksum: f9f0dd8ff8ba2c7a992c6f6a4920dbb399b0805a9106b2e1a071b3bd861e8256b26b4f6949ace9afdae7c68765ae4b9a6ed88cf12de58f6ab6230019a40c78b1 + languageName: node + linkType: hard + "glob@npm:7.1.3": version: 7.1.3 resolution: "glob@npm:7.1.3" @@ -5997,6 +5803,13 @@ fsevents@~2.1.1: languageName: node linkType: hard +"graceful-fs@npm:^4.2.4": + version: 4.2.4 + resolution: "graceful-fs@npm:4.2.4" + checksum: d4b53e628f50d6639d92256a7b01a6f3206b9d8506b3139e2b353d3f1947780f36939cfe69d831b87de7ef189459ef0418acf7fa020be4826444b788cec8ebb7 + languageName: node + linkType: hard + "growl@npm:1.10.5": version: 1.10.5 resolution: "growl@npm:1.10.5" @@ -6144,26 +5957,6 @@ fsevents@~2.1.1: languageName: node linkType: hard -"hash-base@npm:^3.0.0": - version: 3.0.4 - resolution: "hash-base@npm:3.0.4" - dependencies: - inherits: ^2.0.1 - safe-buffer: ^5.0.1 - checksum: 0bc6b9ee9aaf16edd3863746991ec3c53df46ae172fbb6413abf2009e4e4e6c65102f7edfbddeeb69915804f2462bd31edd5f354c6adb11625f56d17d586ad70 - languageName: node - linkType: hard - -"hash.js@npm:^1.0.0, hash.js@npm:^1.0.3": - version: 1.1.7 - resolution: "hash.js@npm:1.1.7" - dependencies: - inherits: ^2.0.3 - minimalistic-assert: ^1.0.1 - checksum: 88fdda984accd8d4752d2040b3fb56cc81694cb70b66229b55b9fb761fbe227fad903c7ada0636ed8239bdcffc853b0a7bf4531f795391e04d116c07a6410994 - languageName: node - linkType: hard - "hasha@npm:^3.0.0": version: 3.0.0 resolution: "hasha@npm:3.0.0" @@ -6194,17 +5987,6 @@ fsevents@~2.1.1: languageName: node linkType: hard -"hmac-drbg@npm:^1.0.0": - version: 1.0.1 - resolution: "hmac-drbg@npm:1.0.1" - dependencies: - hash.js: ^1.0.3 - minimalistic-assert: ^1.0.0 - minimalistic-crypto-utils: ^1.0.1 - checksum: f339f56fc3e05fc7f52512fda201884f88b015ae9c8ca63d4264f8c59c8808cb5cd338d7ebac7661325d83c096357e257f4759805ed5f5097292b676487ca1ce - languageName: node - linkType: hard - "hoek@npm:^4.2.1": version: 4.2.1 resolution: "hoek@npm:4.2.1" @@ -6302,13 +6084,6 @@ fsevents@~2.1.1: languageName: node linkType: hard -"https-browserify@npm:^1.0.0": - version: 1.0.0 - resolution: "https-browserify@npm:1.0.0" - checksum: ed18c81936c87202b2baa51e7565b50ee18b175c39184dfb2267a81f80a9636b55d67a344da6258552aa7b6ff54e9ef42d518327123b39298b043529abf023e6 - languageName: node - linkType: hard - "https-proxy-agent@npm:^2.1.0": version: 2.2.4 resolution: "https-proxy-agent@npm:2.2.4" @@ -6356,13 +6131,6 @@ fsevents@~2.1.1: languageName: node linkType: hard -"ieee754@npm:^1.1.4": - version: 1.1.13 - resolution: "ieee754@npm:1.1.13" - checksum: 02282db30c55f8de010235d7f578f3324ab7b31ed98d8af06a2b6e721e63daf7ab856f576f7fdcf7acf2ac43a199cf61ab393302228e07b0d3032b02dfb12100 - languageName: node - linkType: hard - "iferr@npm:^0.1.5, iferr@npm:~0.1.5": version: 0.1.5 resolution: "iferr@npm:0.1.5" @@ -6469,7 +6237,7 @@ fsevents@~2.1.1: languageName: node linkType: hard -"infer-owner@npm:^1.0.3": +"infer-owner@npm:^1.0.4": version: 1.0.4 resolution: "infer-owner@npm:1.0.4" checksum: b074cddd4d6a0b9e172fc8e31953faeb1f4ed7bf2bdddcf7c9e76296bbb1a45900f7649364bb68e003bd92bc6335a90ab87a4f0e1d8019f38c42fbf0cd2523e5 @@ -6493,20 +6261,6 @@ fsevents@~2.1.1: languageName: node linkType: hard -"inherits@npm:2.0.1": - version: 2.0.1 - resolution: "inherits@npm:2.0.1" - checksum: 085cd33786d293b35438aa510ba6de0f9cc1461507b0f4f5bbd503e4a33781e293e7961c928f689c7e176c02216218f6c2640f11ccc68a8f41bbba58fd694348 - languageName: node - linkType: hard - -"inherits@npm:2.0.3": - version: 2.0.3 - resolution: "inherits@npm:2.0.3" - checksum: e511764d704247b23aa1ddc49e0f722a35465f33d6f91a5befa4e584464829bb962ec7fa9636e5c16826cd0c5526c569ed107bd40a63c37330ab47fe80f307f9 - languageName: node - linkType: hard - "ini@npm:^1.3.4, ini@npm:~1.3.0, ini@npm:~1.3.4": version: 1.3.5 resolution: "ini@npm:1.3.5" @@ -7297,6 +7051,17 @@ fsevents@~2.1.1: languageName: node linkType: hard +"jest-worker@npm:^26.5.0": + version: 26.5.0 + resolution: "jest-worker@npm:26.5.0" + dependencies: + "@types/node": "*" + merge-stream: ^2.0.0 + supports-color: ^7.0.0 + checksum: b97949ef49d5614782093c1e4361263ce42298b7c762746a2d7907a85dc08cf7067643a4b5df20733a757370e0704acb5f30cfe76057de184034a3e9c60dfb5c + languageName: node + linkType: hard + "js-base64@npm:^2.1.8": version: 2.5.2 resolution: "js-base64@npm:2.5.2" @@ -7711,10 +7476,10 @@ fsevents@~2.1.1: languageName: node linkType: hard -"loader-runner@npm:^2.4.0": - version: 2.4.0 - resolution: "loader-runner@npm:2.4.0" - checksum: 50262f950007814c71144cf3a75f47ec54207ccf374ebfb6f4c853af8e92db9f51c36df45bb5c9247c0e6207548205fe6296408f37c08546082a33bc121fd3e2 +"loader-runner@npm:^4.1.0": + version: 4.1.0 + resolution: "loader-runner@npm:4.1.0" + checksum: 12b5d127917659fb0e873788e05b82437c4dbf51a863e82a668c90c277f3065ca2ba40f29a5634bb861a2d2da17af221a2ffd793157fa17daff9e91f1ab171ec languageName: node linkType: hard @@ -8093,6 +7858,15 @@ fsevents@~2.1.1: languageName: node linkType: hard +"lru-cache@npm:^6.0.0": + version: 6.0.0 + resolution: "lru-cache@npm:6.0.0" + dependencies: + yallist: ^4.0.0 + checksum: 2bc397a95fb21e32ee063b7f4ab823409ae3250fd3905041a2ac2467d1da9eb8a8e0a7b65ccf589f4a114d9d3c6622278350e67ebcab7fb4363f82d59928b5bc + languageName: node + linkType: hard + "lru-cache@npm:~4.0.1": version: 4.0.2 resolution: "lru-cache@npm:4.0.2" @@ -8122,6 +7896,15 @@ fsevents@~2.1.1: languageName: node linkType: hard +"make-dir@npm:^3.0.2": + version: 3.1.0 + resolution: "make-dir@npm:3.1.0" + dependencies: + semver: ^6.0.0 + checksum: ac24555a969784def3a89478f96d4489a6b1f700e974d102d0d9c9454c35231d32a4d33113633e2a2deeb57f67f4b91d5eac1055f0f49ea1a211fb3c749ad55c + languageName: node + linkType: hard + "make-error@npm:^1.1.1": version: 1.3.6 resolution: "make-error@npm:1.3.6" @@ -8148,13 +7931,6 @@ fsevents@~2.1.1: languageName: node linkType: hard -"mamacro@npm:^0.0.3": - version: 0.0.3 - resolution: "mamacro@npm:0.0.3" - checksum: 95c3b88efa97cdc98ab917c6e01405943fd8910f38a465830fd338854d0cb7e6cbda54db9c1f3efd81156814bb74eb20140ff4317c33778801d0d99ba7da963e - languageName: node - linkType: hard - "map-age-cleaner@npm:^0.1.1": version: 0.1.3 resolution: "map-age-cleaner@npm:0.1.3" @@ -8201,17 +7977,6 @@ fsevents@~2.1.1: languageName: node linkType: hard -"md5.js@npm:^1.3.4": - version: 1.3.5 - resolution: "md5.js@npm:1.3.5" - dependencies: - hash-base: ^3.0.0 - inherits: ^2.0.1 - safe-buffer: ^5.1.2 - checksum: 483c3a1e89a52f049c0123ca84130a28b251d52471f26a97d6289deba6d7cc7181f000f9067822fe81f57aacdb35e7ac0df722bd0fb096dbe3f56334a3bd9aec - languageName: node - linkType: hard - "mem@npm:^4.3.0": version: 4.3.0 resolution: "mem@npm:4.3.0" @@ -8233,16 +7998,6 @@ fsevents@~2.1.1: languageName: node linkType: hard -"memory-fs@npm:^0.5.0": - version: 0.5.0 - resolution: "memory-fs@npm:0.5.0" - dependencies: - errno: ^0.1.3 - readable-stream: ^2.0.1 - checksum: 7a165df7e41c3cc9d3681b3e26f59b4b34fc956cc272ef8e49d2370014418c54aafda29c332698146c88448f203790993bf23f7e872ec0b3ecfe9600251b306f - languageName: node - linkType: hard - "meow@npm:^3.7.0": version: 3.7.0 resolution: "meow@npm:3.7.0" @@ -8353,18 +8108,6 @@ fsevents@~2.1.1: languageName: node linkType: hard -"miller-rabin@npm:^4.0.0": - version: 4.0.1 - resolution: "miller-rabin@npm:4.0.1" - dependencies: - bn.js: ^4.0.0 - brorand: ^1.0.1 - bin: - miller-rabin: bin/miller-rabin - checksum: 111750535c9e0e4e3543363b0605105fc260025e843e8468bd05e840dad8d6e39db0fa9ea3cbe786c75c952bcea76579fd5633f7d3139c3b478f911eca9ae182 - languageName: node - linkType: hard - "mime-db@npm:1.43.0": version: 1.43.0 resolution: "mime-db@npm:1.43.0" @@ -8372,12 +8115,28 @@ fsevents@~2.1.1: languageName: node linkType: hard +"mime-db@npm:1.44.0": + version: 1.44.0 + resolution: "mime-db@npm:1.44.0" + checksum: fa38db5b3d81b49e4ac876f709604f6cf740479390ca62acbbe7564d2a999c908352582858131a972a884b58b6cbfd60432202fa1e73755f8cdfff42ac157d72 + languageName: node + linkType: hard + "mime-types@npm:^2.1.11, mime-types@npm:^2.1.12, mime-types@npm:~2.1.19, mime-types@npm:~2.1.7": version: 2.1.26 resolution: "mime-types@npm:2.1.26" dependencies: - mime-db: 1.43.0 - checksum: 350d0746a1eaacef86e2deda0ca51e629cda14e1f1b5c0b836e1d5ba5902f41d5ca3c5c41b5bdfeed6dbb761620f1f6cafcbc31ca24dc1bcd534b1a69559fb33 + mime-db: 1.43.0 + checksum: 350d0746a1eaacef86e2deda0ca51e629cda14e1f1b5c0b836e1d5ba5902f41d5ca3c5c41b5bdfeed6dbb761620f1f6cafcbc31ca24dc1bcd534b1a69559fb33 + languageName: node + linkType: hard + +"mime-types@npm:^2.1.27": + version: 2.1.27 + resolution: "mime-types@npm:2.1.27" + dependencies: + mime-db: 1.44.0 + checksum: a2f9d12a770dba806a5a0916e0b577bc7f531842a08338fe59288fbccd5f5b829e3a0c58016856d3e378424e7b3715af97c6a21638492edb8f95fe3f4aedf004 languageName: node linkType: hard @@ -8402,20 +8161,6 @@ fsevents@~2.1.1: languageName: node linkType: hard -"minimalistic-assert@npm:^1.0.0, minimalistic-assert@npm:^1.0.1": - version: 1.0.1 - resolution: "minimalistic-assert@npm:1.0.1" - checksum: 62b45880d245132ee86db1df3af89111b1490fcbe2288e21e94037f089c69f39f0a763283bc9fe11596fee31cb7348448544fea3ff03a989940510cc92ce979d - languageName: node - linkType: hard - -"minimalistic-crypto-utils@npm:^1.0.0, minimalistic-crypto-utils@npm:^1.0.1": - version: 1.0.1 - resolution: "minimalistic-crypto-utils@npm:1.0.1" - checksum: 179ad46e32de95a4609c49ec7c9e338a84eefc10ab54f2502ee54ed37559fa65562b721adacaed7935115de1fe9267316b5de4aacd469cb0ba3299927aa7913b - languageName: node - linkType: hard - "minimatch@npm:3.0.4, minimatch@npm:^3.0.0, minimatch@npm:^3.0.2, minimatch@npm:^3.0.4, minimatch@npm:~3.0.2, minimatch@npm:~3.0.3": version: 3.0.4 resolution: "minimatch@npm:3.0.4" @@ -8456,6 +8201,33 @@ fsevents@~2.1.1: languageName: node linkType: hard +"minipass-collect@npm:^1.0.2": + version: 1.0.2 + resolution: "minipass-collect@npm:1.0.2" + dependencies: + minipass: ^3.0.0 + checksum: 9f042348c30cd6d53a7e629a357bf58ed32852ce381163ca18ec464936e581c110a3bc81a7becbcdcf797c95a0a994b8bfccd517c2c9c9c011c97f072413fa94 + languageName: node + linkType: hard + +"minipass-flush@npm:^1.0.5": + version: 1.0.5 + resolution: "minipass-flush@npm:1.0.5" + dependencies: + minipass: ^3.0.0 + checksum: a17515356b004f7827ac8ee42dee1a13cfe8218b009173c21be53f5b82ed2a3c7a54829824a115c2974456c9aaa24357101509a714453bbd2d6f8c5c21d2ae22 + languageName: node + linkType: hard + +"minipass-pipeline@npm:^1.2.2": + version: 1.2.4 + resolution: "minipass-pipeline@npm:1.2.4" + dependencies: + minipass: ^3.0.0 + checksum: 3b078f127ecab5686ec3dfe7327e42f127d291bc5305227ab60536537b89aa38cdcc459ea931d3a08be94cf01a9c5668edc937ab3c3d8e53546a7fc25e92e977 + languageName: node + linkType: hard + "minipass@npm:^2.6.0, minipass@npm:^2.8.6, minipass@npm:^2.9.0": version: 2.9.0 resolution: "minipass@npm:2.9.0" @@ -8466,6 +8238,15 @@ fsevents@~2.1.1: languageName: node linkType: hard +"minipass@npm:^3.0.0, minipass@npm:^3.1.1": + version: 3.1.3 + resolution: "minipass@npm:3.1.3" + dependencies: + yallist: ^4.0.0 + checksum: 136e481be70716371d9f781d819d92144edb7cf5db61f61b254da5f071cc61fd9a5dea7db0d13e2fd53b708fffc2841967d4880e7936122bd949960746897f5f + languageName: node + linkType: hard + "minizlib@npm:^1.2.1": version: 1.3.3 resolution: "minizlib@npm:1.3.3" @@ -8475,6 +8256,16 @@ fsevents@~2.1.1: languageName: node linkType: hard +"minizlib@npm:^2.1.1": + version: 2.1.2 + resolution: "minizlib@npm:2.1.2" + dependencies: + minipass: ^3.0.0 + yallist: ^4.0.0 + checksum: d80caa6befe99ec3e440f44215dfe7b81dd958db6810b34041b28c8b4a21670a36e1a6ba874d7b97d8278903223770411d51b9bb7aaf7bc61991a744aa2716c3 + languageName: node + linkType: hard + "mississippi@npm:^1.2.0, mississippi@npm:^1.3.0, mississippi@npm:~1.3.0": version: 1.3.1 resolution: "mississippi@npm:1.3.1" @@ -8511,24 +8302,6 @@ fsevents@~2.1.1: languageName: node linkType: hard -"mississippi@npm:^3.0.0": - version: 3.0.0 - resolution: "mississippi@npm:3.0.0" - dependencies: - concat-stream: ^1.5.0 - duplexify: ^3.4.2 - end-of-stream: ^1.1.0 - flush-write-stream: ^1.0.0 - from2: ^2.1.0 - parallel-transform: ^1.1.0 - pump: ^3.0.0 - pumpify: ^1.3.3 - stream-each: ^1.1.0 - through2: ^2.0.0 - checksum: 603bd755b71b1f9357e7a923312c4d87e298b541e42d9cd3e3b5c308a4022c548241f90318d9651e8aec4cb88440004a662ba10e1571a4ea50e0a2bc33ab5106 - languageName: node - linkType: hard - "mixin-deep@npm:^1.2.0": version: 1.3.2 resolution: "mixin-deep@npm:1.3.2" @@ -8582,6 +8355,15 @@ fsevents@~2.1.1: languageName: node linkType: hard +"mkdirp@npm:^1.0.3, mkdirp@npm:^1.0.4": + version: 1.0.4 + resolution: "mkdirp@npm:1.0.4" + bin: + mkdirp: bin/cmd.js + checksum: 61777e612bd60f0a08b9f1e0feae6ebcc15b424ed74f74636bf430b0cb11eb2f03ac3121fd8e80857ddb1321f512d53a1f2b1ad046a8157810e7769f546c7c9d + languageName: node + linkType: hard + "mocha@npm:7.1.1": version: 7.1.1 resolution: "mocha@npm:7.1.1" @@ -8638,7 +8420,6 @@ fsevents@~2.1.1: "@types/node": ^12.12.17 "@types/sinon": ^9.0.0 "@types/sinon-chai": ^3.2.4 - "@types/webpack": ^4.41.0 "@types/yargs": ^15.0.4 "@typescript-eslint/eslint-plugin": ^2.11.0 "@typescript-eslint/parser": ^2.11.0 @@ -8693,13 +8474,13 @@ fsevents@~2.1.1: toposort: ^2.0.2 ts-mocha: ^7.0.0 typescript: ^3.8.3 - webpack: 4.41.0 + webpack: 5.0.0 worker-loader: 2.0.0 write-file-webpack-plugin: ^4.2.0 yargs: 14.0.0 peerDependencies: mocha: ">=6 <=7" - webpack: ^4.0.0 + webpack: ^5.0.0 bin: mochapack: ./bin/mochapack languageName: unknown @@ -8802,13 +8583,20 @@ fsevents@~2.1.1: languageName: node linkType: hard -"neo-async@npm:^2.5.0, neo-async@npm:^2.6.1": +"neo-async@npm:^2.5.0": version: 2.6.1 resolution: "neo-async@npm:2.6.1" checksum: 59b42da2b8ac3e0223e9ffb01e7a97bfefe91f5cb00f35c5823141056d7f86be6cb9c01f6952d6fa0d8fbc8c20e546db9c5d6477a5d016c80df482bfb3b503a2 languageName: node linkType: hard +"neo-async@npm:^2.6.2": + version: 2.6.2 + resolution: "neo-async@npm:2.6.2" + checksum: c3cec189bc14b9658b5d22353467d1e5665a36baa960f3f6689ee2f8330d4da7c9ef4d9d8db1e5890d67cb93e6867109b558a2e4ea21f6f8b3db5f00b8f3fdb2 + languageName: node + linkType: hard + "nested-error-stacks@npm:^2.0.0": version: 2.1.0 resolution: "nested-error-stacks@npm:2.1.0" @@ -8923,37 +8711,6 @@ fsevents@~2.1.1: languageName: node linkType: hard -"node-libs-browser@npm:^2.2.1": - version: 2.2.1 - resolution: "node-libs-browser@npm:2.2.1" - dependencies: - assert: ^1.1.1 - browserify-zlib: ^0.2.0 - buffer: ^4.3.0 - console-browserify: ^1.1.0 - constants-browserify: ^1.0.0 - crypto-browserify: ^3.11.0 - domain-browser: ^1.1.1 - events: ^3.0.0 - https-browserify: ^1.0.0 - os-browserify: ^0.3.0 - path-browserify: 0.0.1 - process: ^0.11.10 - punycode: ^1.2.4 - querystring-es3: ^0.2.0 - readable-stream: ^2.3.3 - stream-browserify: ^2.0.1 - stream-http: ^2.7.2 - string_decoder: ^1.0.0 - timers-browserify: ^2.0.4 - tty-browserify: 0.0.0 - url: ^0.11.0 - util: ^0.11.0 - vm-browserify: ^1.0.1 - checksum: 0cde90b7a64a7fc17d8a0c8aaaaa912878debaacf2e0529a2575deebab6d9f5ac3da4db5e8d384c1cee7eaec48517987b06a8e45b3d8d1dd671148f2c9f841d2 - languageName: node - linkType: hard - "node-modules-regexp@npm:^1.0.0": version: 1.0.0 resolution: "node-modules-regexp@npm:1.0.0" @@ -8988,6 +8745,13 @@ fsevents@~2.1.1: languageName: node linkType: hard +"node-releases@npm:^1.1.61": + version: 1.1.61 + resolution: "node-releases@npm:1.1.61" + checksum: 5825d1e5a040642e907008e434779e66f2369cb704ab413f0fc665f5c03df0bd480857cf9343d632a3f187b00c3469a81539dbe607ff03827f706f1fe4ed5960 + languageName: node + linkType: hard + "node-sass@npm:^4.11.0": version: 4.13.1 resolution: "node-sass@npm:4.13.1" @@ -9635,7 +9399,7 @@ fsevents@~2.1.1: languageName: node linkType: hard -"object-assign@npm:^4.0.1, object-assign@npm:^4.1.0, object-assign@npm:^4.1.1": +"object-assign@npm:^4.0.1, object-assign@npm:^4.1.0": version: 4.1.1 resolution: "object-assign@npm:4.1.1" checksum: cedcdb373904074d3a4281118dbfb9368a48fc20dec974892d0df97bab72332ae807d69d34b2ac21b56a3b5188daf82f6f713faa3d401dd739986578392fc2b5 @@ -9798,13 +9562,6 @@ fsevents@~2.1.1: languageName: node linkType: hard -"os-browserify@npm:^0.3.0": - version: 0.3.0 - resolution: "os-browserify@npm:0.3.0" - checksum: e20595b82072cadbfcedd1d886b3a8eb5d4a6d78762202bcf73c747c2541882d27aada8e26a3c9a8eab4ae99c00e726f275f9d056bdabc09c528d0cdd93ebd9d - languageName: node - linkType: hard - "os-homedir@npm:^1.0.0, os-homedir@npm:^1.0.1": version: 1.0.2 resolution: "os-homedir@npm:1.0.2" @@ -9900,6 +9657,15 @@ fsevents@~2.1.1: languageName: node linkType: hard +"p-limit@npm:^3.0.2": + version: 3.0.2 + resolution: "p-limit@npm:3.0.2" + dependencies: + p-try: ^2.0.0 + checksum: 894d5abe7c419d379335e71335d165e06b3660f5fd84fd7de40815d872805abd7e6b118017e138d07b1c976e64de3e6d502b6b49f414a5f5b416ecca88cdba04 + languageName: node + linkType: hard + "p-locate@npm:^2.0.0": version: 2.0.0 resolution: "p-locate@npm:2.0.0" @@ -9943,6 +9709,15 @@ fsevents@~2.1.1: languageName: node linkType: hard +"p-map@npm:^4.0.0": + version: 4.0.0 + resolution: "p-map@npm:4.0.0" + dependencies: + aggregate-error: ^3.0.0 + checksum: a60ea3e05d90300a79ddf0de047cfd486d39dcb3195c2c3e89aee517f275c02816c71029991a8fcc882c2865b4c7069981e52b1ef76255d006c60871555a6ad7 + languageName: node + linkType: hard + "p-memoize@npm:^3.1.0": version: 3.1.0 resolution: "p-memoize@npm:3.1.0" @@ -10041,13 +9816,6 @@ fsevents@~2.1.1: languageName: node linkType: hard -"pako@npm:~1.0.5": - version: 1.0.11 - resolution: "pako@npm:1.0.11" - checksum: 2c714dee8963b93f5d160f572fd3cf96bad9bf6afacf86096de4010e134e92ab6be0963ddcb1203193c392f953cd3e31de86323c2f7e125020a8f27924c59633 - languageName: node - linkType: hard - "parallel-transform@npm:^1.1.0": version: 1.2.0 resolution: "parallel-transform@npm:1.2.0" @@ -10068,20 +9836,6 @@ fsevents@~2.1.1: languageName: node linkType: hard -"parse-asn1@npm:^5.0.0": - version: 5.1.5 - resolution: "parse-asn1@npm:5.1.5" - dependencies: - asn1.js: ^4.0.0 - browserify-aes: ^1.0.0 - create-hash: ^1.1.0 - evp_bytestokey: ^1.0.0 - pbkdf2: ^3.0.3 - safe-buffer: ^5.1.1 - checksum: ac4e6f8ef52d53258d8d1354c6ae56e7fae2d70ed7e86f3e6eb435c5e00b0c459d9d4dcde38500ab0e613e31cda350331eb12126a22dee476c3942d77a38b5b5 - languageName: node - linkType: hard - "parse-glob@npm:^3.0.4": version: 3.0.4 resolution: "parse-glob@npm:3.0.4" @@ -10132,13 +9886,6 @@ fsevents@~2.1.1: languageName: node linkType: hard -"path-browserify@npm:0.0.1": - version: 0.0.1 - resolution: "path-browserify@npm:0.0.1" - checksum: 409e2de15ad833f8b7a97bd14077f7d0227f38428e556a6b1ddd6ee74a83bd7f9bc3caa467295c910e6a77e0ab129607e3ed6a43ce2571a17f1877b593d29d67 - languageName: node - linkType: hard - "path-dirname@npm:^1.0.0": version: 1.0.2 resolution: "path-dirname@npm:1.0.2" @@ -10256,19 +10003,6 @@ fsevents@~2.1.1: languageName: node linkType: hard -"pbkdf2@npm:^3.0.3": - version: 3.0.17 - resolution: "pbkdf2@npm:3.0.17" - dependencies: - create-hash: ^1.1.2 - create-hmac: ^1.1.4 - ripemd160: ^2.0.1 - safe-buffer: ^5.0.1 - sha.js: ^2.4.8 - checksum: 386e53a2be24eb1d4eff9ed7efd52c5805f628f2c9033834393f66f5ea75fd3f78450e33a5e253c2b9168e84f7718ebbb9559d5278016a4ed24a95ba4b5323f9 - languageName: node - linkType: hard - "performance-now@npm:^0.2.0": version: 0.2.0 resolution: "performance-now@npm:0.2.0" @@ -10354,7 +10088,7 @@ fsevents@~2.1.1: languageName: node linkType: hard -"pkg-dir@npm:^4.1.0": +"pkg-dir@npm:^4.1.0, pkg-dir@npm:^4.2.0": version: 4.2.0 resolution: "pkg-dir@npm:4.2.0" dependencies: @@ -10519,13 +10253,6 @@ fsevents@~2.1.1: languageName: node linkType: hard -"process@npm:^0.11.10": - version: 0.11.10 - resolution: "process@npm:0.11.10" - checksum: 5d5606b27d3eb5a33d99db6db7ab7bc2b0911a30f92fba2270a26b93623fd1d0069ab063ff0f3af2dbb0302760dc4675297c118ed8549511eaf073ef6f2b5846 - languageName: node - linkType: hard - "progress@npm:^2.0.0, progress@npm:^2.0.3": version: 2.0.3 resolution: "progress@npm:2.0.3" @@ -10596,20 +10323,6 @@ fsevents@~2.1.1: languageName: node linkType: hard -"public-encrypt@npm:^4.0.0": - version: 4.0.3 - resolution: "public-encrypt@npm:4.0.3" - dependencies: - bn.js: ^4.1.0 - browserify-rsa: ^4.0.0 - create-hash: ^1.1.0 - parse-asn1: ^5.0.0 - randombytes: ^2.0.1 - safe-buffer: ^5.1.2 - checksum: a2ed0a21a4e34487c2c72c6e295aae6fd5946950ab09217b0d79c62b955034fab1d98e048564c0f6a23205d544e1c5a0ddcf5454dfd5b238076c6afdf2ec8f26 - languageName: node - linkType: hard - "pump@npm:^1.0.0": version: 1.0.3 resolution: "pump@npm:1.0.3" @@ -10651,14 +10364,7 @@ fsevents@~2.1.1: languageName: node linkType: hard -"punycode@npm:1.3.2": - version: 1.3.2 - resolution: "punycode@npm:1.3.2" - checksum: a2c56ccd7866a2f3bb4fa541ac840a3c433d86cb73340a9b71b05fa2dad814c3adeb214860dbc9a56cee485b5689f6f3fd0f67efb6efd984b577bc3e3dc4b74e - languageName: node - linkType: hard - -"punycode@npm:^1.2.4, punycode@npm:^1.4.1": +"punycode@npm:^1.4.1": version: 1.4.1 resolution: "punycode@npm:1.4.1" checksum: ef9610372881d15bb4894c74f6e4da918195835958e4627f24fd349d2bbc07c3b03fef4bddd74884e5c5e8bc8f6681b5c1253c39b394e1ecad8ed91fb8f87340 @@ -10710,20 +10416,6 @@ fsevents@~2.1.1: languageName: node linkType: hard -"querystring-es3@npm:^0.2.0": - version: 0.2.1 - resolution: "querystring-es3@npm:0.2.1" - checksum: 188f863c0180b73f34174d8cc1aec1d19149d7b762fdffbe79052713bca7854e184970cfca83fa3d3c86247cc980396ad85e597048d8fd14a173076de9bfa6d3 - languageName: node - linkType: hard - -"querystring@npm:0.2.0": - version: 0.2.0 - resolution: "querystring@npm:0.2.0" - checksum: 064a3c353f48e1c560b868d1edbf23d94cf4a72836c0713a59a614e3157d22a6414082d0deb02acdc26196daec8434258fd7d25f4f6f35e345a660d12d7f8ebd - languageName: node - linkType: hard - "quick-lru@npm:^1.0.0": version: 1.1.0 resolution: "quick-lru@npm:1.1.0" @@ -10742,7 +10434,7 @@ fsevents@~2.1.1: languageName: node linkType: hard -"randombytes@npm:^2.0.0, randombytes@npm:^2.0.1, randombytes@npm:^2.0.5": +"randombytes@npm:^2.1.0": version: 2.1.0 resolution: "randombytes@npm:2.1.0" dependencies: @@ -10751,16 +10443,6 @@ fsevents@~2.1.1: languageName: node linkType: hard -"randomfill@npm:^1.0.3": - version: 1.0.4 - resolution: "randomfill@npm:1.0.4" - dependencies: - randombytes: ^2.0.5 - safe-buffer: ^5.1.0 - checksum: 07454e8c7f2e546b5841034d3d69e92b213bf46c633a972c0819f39b71ac35f0041b8aa4b63bc8d8e2be75041342722febee0b025082f6641cb29346407fe95f - languageName: node - linkType: hard - "rc@npm:^1.0.1, rc@npm:^1.1.6, rc@npm:^1.2.7, rc@npm:^1.2.8": version: 1.2.8 resolution: "rc@npm:1.2.8" @@ -10936,7 +10618,7 @@ fsevents@~2.1.1: languageName: node linkType: hard -"readable-stream@npm:1 || 2, readable-stream@npm:^2.0.0, readable-stream@npm:^2.0.1, readable-stream@npm:^2.0.2, readable-stream@npm:^2.0.6, readable-stream@npm:^2.1.5, readable-stream@npm:^2.2.2, readable-stream@npm:^2.3.0, readable-stream@npm:^2.3.3, readable-stream@npm:^2.3.5, readable-stream@npm:^2.3.6, readable-stream@npm:~2.3.2, readable-stream@npm:~2.3.6": +"readable-stream@npm:1 || 2, readable-stream@npm:^2.0.0, readable-stream@npm:^2.0.1, readable-stream@npm:^2.0.2, readable-stream@npm:^2.0.6, readable-stream@npm:^2.1.5, readable-stream@npm:^2.2.2, readable-stream@npm:^2.3.0, readable-stream@npm:^2.3.5, readable-stream@npm:^2.3.6, readable-stream@npm:~2.3.2, readable-stream@npm:~2.3.6": version: 2.3.7 resolution: "readable-stream@npm:2.3.7" dependencies: @@ -11472,7 +11154,7 @@ fsevents@~2.1.1: languageName: node linkType: hard -"rimraf@npm:^3.0.0": +"rimraf@npm:^3.0.0, rimraf@npm:^3.0.2": version: 3.0.2 resolution: "rimraf@npm:3.0.2" dependencies: @@ -11494,16 +11176,6 @@ fsevents@~2.1.1: languageName: node linkType: hard -"ripemd160@npm:^2.0.0, ripemd160@npm:^2.0.1": - version: 2.0.2 - resolution: "ripemd160@npm:2.0.2" - dependencies: - hash-base: ^3.0.0 - inherits: ^2.0.1 - checksum: 05e38b0817d79919f9018d225ac07e401f4cc105f27a27aabb4056f050b4a41816e6ea1ff18b9db21980ea667df23e26ffd84d9e7248b29b18df840dd0035174 - languageName: node - linkType: hard - "run-async@npm:^2.2.0, run-async@npm:^2.4.0": version: 2.4.0 resolution: "run-async@npm:2.4.0" @@ -11640,17 +11312,6 @@ fsevents@~2.1.1: languageName: node linkType: hard -"schema-utils@npm:^1.0.0": - version: 1.0.0 - resolution: "schema-utils@npm:1.0.0" - dependencies: - ajv: ^6.1.0 - ajv-errors: ^1.0.0 - ajv-keywords: ^3.1.0 - checksum: b015a767db59a83b20420d1b34125551791f5488c4a670458befa79113c80dadf55255f3b01e0243547c6d28f2a59e7ce5191a448872d8a82d2e27075c470835 - languageName: node - linkType: hard - "schema-utils@npm:^2.0.0, schema-utils@npm:^2.6.5": version: 2.6.6 resolution: "schema-utils@npm:2.6.6" @@ -11661,6 +11322,17 @@ fsevents@~2.1.1: languageName: node linkType: hard +"schema-utils@npm:^3.0.0": + version: 3.0.0 + resolution: "schema-utils@npm:3.0.0" + dependencies: + "@types/json-schema": ^7.0.6 + ajv: ^6.12.5 + ajv-keywords: ^3.5.2 + checksum: 6bc3b66a1a374466f4c4f75b4070ac7a840214fa9b4d1c173b9bbdc4f152b189d6fbe3962bc0ffb5ea9033100ec3536dfba2fdf7aa8c6a5136d0aa6fd1bb6e00 + languageName: node + linkType: hard + "scoped-regex@npm:^2.0.0": version: 2.1.0 resolution: "scoped-regex@npm:2.1.0" @@ -11748,10 +11420,12 @@ fsevents@~2.1.1: languageName: node linkType: hard -"serialize-javascript@npm:^2.1.2": - version: 2.1.2 - resolution: "serialize-javascript@npm:2.1.2" - checksum: e781895f22e410945adea85e4e6197b1e44a1c59a1728468356071051b04b91bc6dab1837049265d10c3e44ebc2282c5611de4291f7bf3b83faabf154397d24c +"serialize-javascript@npm:^5.0.1": + version: 5.0.1 + resolution: "serialize-javascript@npm:5.0.1" + dependencies: + randombytes: ^2.1.0 + checksum: 2ba4cddac7f6669196746e55e6f06b97ae668d793fd0ae440f6c9f2ca9dd62e4609e04ebfe4cb4366f55f64f57440a4c074ee398ba31f886d92f3ef2fbd04910 languageName: node linkType: hard @@ -11774,25 +11448,6 @@ fsevents@~2.1.1: languageName: node linkType: hard -"setimmediate@npm:^1.0.4": - version: 1.0.5 - resolution: "setimmediate@npm:1.0.5" - checksum: 6919190e3a7099877f05bcfbf0267cc6b2d948a9cc79e48e5cd5de46e38414ed1388adca2f0ce16c84c2842fe2c30fc6a8577c9be7dfdf327c53e4ecdb08f105 - languageName: node - linkType: hard - -"sha.js@npm:^2.4.0, sha.js@npm:^2.4.8": - version: 2.4.11 - resolution: "sha.js@npm:2.4.11" - dependencies: - inherits: ^2.0.1 - safe-buffer: ^5.0.1 - bin: - sha.js: ./bin.js - checksum: 57e25508b343851064cf57832c60a06f1522347291b5670b999be05e2dfb930ac2e0739d8f19ad8e45cc091abc0abc857e48e8cc6c65a0aa4135e1ffb989d61d - languageName: node - linkType: hard - "sha@npm:~2.0.1": version: 2.0.1 resolution: "sha@npm:2.0.1" @@ -12022,7 +11677,7 @@ fsevents@~2.1.1: languageName: node linkType: hard -"source-list-map@npm:^2.0.0": +"source-list-map@npm:^2.0.0, source-list-map@npm:^2.0.1": version: 2.0.1 resolution: "source-list-map@npm:2.0.1" checksum: 1f98f2323e895ba7aabdfda2426105302d9c2b35e65a6cf2f6824589543847c3cc8b387d2099073985425162addb3baa0fd1ceb574b77cf15dd5120a9dde88c3 @@ -12042,7 +11697,7 @@ fsevents@~2.1.1: languageName: node linkType: hard -"source-map-support@npm:^0.5.13, source-map-support@npm:^0.5.16, source-map-support@npm:^0.5.6, source-map-support@npm:~0.5.12": +"source-map-support@npm:^0.5.13, source-map-support@npm:^0.5.16, source-map-support@npm:^0.5.6": version: 0.5.17 resolution: "source-map-support@npm:0.5.17" dependencies: @@ -12052,6 +11707,16 @@ fsevents@~2.1.1: languageName: node linkType: hard +"source-map-support@npm:~0.5.19": + version: 0.5.19 + resolution: "source-map-support@npm:0.5.19" + dependencies: + buffer-from: ^1.0.0 + source-map: ^0.6.0 + checksum: 0d319cb5f45e8647513b80a3fcaf1d6d5f720d9807cc7774001c62e8c173c8c038f30a629a96588b05ffc558bac821a7becbae3776eee08046a34d45f4c55a3a + languageName: node + linkType: hard + "source-map-url@npm:^0.4.0": version: 0.4.0 resolution: "source-map-url@npm:0.4.0" @@ -12082,6 +11747,13 @@ fsevents@~2.1.1: languageName: node linkType: hard +"source-map@npm:~0.7.2": + version: 0.7.3 + resolution: "source-map@npm:0.7.3" + checksum: faef4bd5c65441cdbdf0cdfff9321fd68214b306fd54416d433f54a5c8091cf45a3b47d608b86a2ce810771ccd01a5b94fdffff14b939413504e615b4ca88394 + languageName: node + linkType: hard + "spawn-wrap@npm:^1.4.2": version: 1.4.3 resolution: "spawn-wrap@npm:1.4.3" @@ -12201,12 +11873,12 @@ fsevents@~2.1.1: languageName: node linkType: hard -"ssri@npm:^6.0.1": - version: 6.0.1 - resolution: "ssri@npm:6.0.1" +"ssri@npm:^8.0.0": + version: 8.0.0 + resolution: "ssri@npm:8.0.0" dependencies: - figgy-pudding: ^3.5.1 - checksum: 02e754a0c2208c25d0d7a17d7654471e840ce25873966832c38528d6a3da0b75b1e2dca0e149cc7e2f1f25e356d060010db62b6baa781edad31e4c1664ee6034 + minipass: ^3.1.1 + checksum: e8b989620f5cf3ac80529adf0f0579e52b7caf650238d204f11c0d18009999b83ba24a8b4d8ee15e0f1c8aa2dc93efcf2b94dc71d61c173f31aef569874c28b8 languageName: node linkType: hard @@ -12229,16 +11901,6 @@ fsevents@~2.1.1: languageName: node linkType: hard -"stream-browserify@npm:^2.0.1": - version: 2.0.2 - resolution: "stream-browserify@npm:2.0.2" - dependencies: - inherits: ~2.0.1 - readable-stream: ^2.0.2 - checksum: 30421a9e1ce51f9e55d93d63f220b10744a639473bf1e6f71ca75ec6e30dd0c2ef73d269fe62513a19ffbd845fdcfc1e2245f47b39cd2914e7cca5e686b37516 - languageName: node - linkType: hard - "stream-each@npm:^1.1.0": version: 1.2.3 resolution: "stream-each@npm:1.2.3" @@ -12249,19 +11911,6 @@ fsevents@~2.1.1: languageName: node linkType: hard -"stream-http@npm:^2.7.2": - version: 2.8.3 - resolution: "stream-http@npm:2.8.3" - dependencies: - builtin-status-codes: ^3.0.0 - inherits: ^2.0.1 - readable-stream: ^2.3.6 - to-arraybuffer: ^1.0.0 - xtend: ^4.0.0 - checksum: d583f09ea5942c823db783332eaed23ea64a773afdd61cd83fc5077d7384e35ee19592ad90503072337e9adfaf3b2173b45a60fb0cce06217b172b81cfc170af - languageName: node - linkType: hard - "stream-iterate@npm:^1.1.0": version: 1.2.0 resolution: "stream-iterate@npm:1.2.0" @@ -12371,7 +12020,7 @@ fsevents@~2.1.1: languageName: node linkType: hard -"string_decoder@npm:^1.0.0, string_decoder@npm:^1.1.1": +"string_decoder@npm:^1.1.1": version: 1.3.0 resolution: "string_decoder@npm:1.3.0" dependencies: @@ -12596,10 +12245,10 @@ fsevents@~2.1.1: languageName: node linkType: hard -"tapable@npm:^1.0.0, tapable@npm:^1.1.3": - version: 1.1.3 - resolution: "tapable@npm:1.1.3" - checksum: 8ff69f15d5950954c4664b5a2f6d5b002318f116ea86100a0d5fe98ae586e2ece41e2d868e7b0231a38eb68b6816d6ad031b2778b25609bc1defc03d64f0029e +"tapable@npm:^2.0.0": + version: 2.0.0 + resolution: "tapable@npm:2.0.0" + checksum: 7070d6292908d964cd6441fc058540544c81d7cf50b18036b40296679c9491ce79ca4acfb15c3e4d18fb147564f7f12e45851f69c745c85240bc2e41a5a81d35 languageName: node linkType: hard @@ -12656,6 +12305,20 @@ fsevents@~2.1.1: languageName: node linkType: hard +"tar@npm:^6.0.2": + version: 6.0.5 + resolution: "tar@npm:6.0.5" + dependencies: + chownr: ^2.0.0 + fs-minipass: ^2.0.0 + minipass: ^3.0.0 + minizlib: ^2.1.1 + mkdirp: ^1.0.3 + yallist: ^4.0.0 + checksum: 548033db111f65cb28c2bd27da0f232a5bd4c1d692d4b720ca7ce266823949f841274e3f322770ae41b38713834b603abd9109f0e337e2f41b03230f614f4abc + languageName: node + linkType: hard + "term-size@npm:^1.2.0": version: 1.2.0 resolution: "term-size@npm:1.2.0" @@ -12675,35 +12338,35 @@ fsevents@~2.1.1: languageName: node linkType: hard -"terser-webpack-plugin@npm:^1.4.1": - version: 1.4.3 - resolution: "terser-webpack-plugin@npm:1.4.3" - dependencies: - cacache: ^12.0.2 - find-cache-dir: ^2.1.0 - is-wsl: ^1.1.0 - schema-utils: ^1.0.0 - serialize-javascript: ^2.1.2 +"terser-webpack-plugin@npm:^4.1.0": + version: 4.2.3 + resolution: "terser-webpack-plugin@npm:4.2.3" + dependencies: + cacache: ^15.0.5 + find-cache-dir: ^3.3.1 + jest-worker: ^26.5.0 + p-limit: ^3.0.2 + schema-utils: ^3.0.0 + serialize-javascript: ^5.0.1 source-map: ^0.6.1 - terser: ^4.1.2 - webpack-sources: ^1.4.0 - worker-farm: ^1.7.0 + terser: ^5.3.4 + webpack-sources: ^1.4.3 peerDependencies: - webpack: ^4.0.0 - checksum: da934d248b5cf68533744fb0b1b3800135cd34cc55a5959ea893db74c9e27845972d1ee5779c1c736a5341890b37ed280d219370574f72bda14d4d3128c6be4b + webpack: ^4.0.0 || ^5.0.0 + checksum: 9815d6b1a2aafb71f8868fff5ab41f3e0515902e25d322642c03182e46fb3698dcb86808f6fb42259adf0872935c9f6b3440ab1aecbff0c0235b57801f14b4c6 languageName: node linkType: hard -"terser@npm:^4.1.2": - version: 4.6.11 - resolution: "terser@npm:4.6.11" +"terser@npm:^5.3.4": + version: 5.3.4 + resolution: "terser@npm:5.3.4" dependencies: commander: ^2.20.0 - source-map: ~0.6.1 - source-map-support: ~0.5.12 + source-map: ~0.7.2 + source-map-support: ~0.5.19 bin: terser: bin/terser - checksum: b6ba5f1210355a4cc431e8ac6921cd41623a3166bfa00d331e85d0d7e72223c3094086a5478629e13b0011b95dc8d5d998d31707937e8c6ff8d8b9bfc967da82 + checksum: cdffa6b1f7f4ac69cf56d19b067782daf9abfae1e221cadff7bff0bd6598a7cffb6e475eecee8ffc80b58023ff453b0492015194149fc81d1e1ccbb9dde56691 languageName: node linkType: hard @@ -12763,15 +12426,6 @@ fsevents@~2.1.1: languageName: node linkType: hard -"timers-browserify@npm:^2.0.4": - version: 2.0.11 - resolution: "timers-browserify@npm:2.0.11" - dependencies: - setimmediate: ^1.0.4 - checksum: 38d712330cd193432c9a01b4b9a50fcbfb7173d9ca9948078c49a8e7ed9da0fcf2cdbb45c757325126def80611c43296de26fb2e2d88051b25e2e8a41a826aae - languageName: node - linkType: hard - "tiny-emitter@npm:^2.0.0": version: 2.1.0 resolution: "tiny-emitter@npm:2.1.0" @@ -12815,13 +12469,6 @@ fsevents@~2.1.1: languageName: node linkType: hard -"to-arraybuffer@npm:^1.0.0": - version: 1.0.1 - resolution: "to-arraybuffer@npm:1.0.1" - checksum: 6ccad32c20d482af7594fab291736d8244be7627d45d3c7c669a5124fffd3a3d1c5ef4a884f6d2c812fd10fd7b259f8d98a45e09f6cdd2b588d9c57e461aeaff - languageName: node - linkType: hard - "to-buffer@npm:^1.1.1": version: 1.1.1 resolution: "to-buffer@npm:1.1.1" @@ -13020,13 +12667,6 @@ fsevents@~2.1.1: languageName: node linkType: hard -"tty-browserify@npm:0.0.0": - version: 0.0.0 - resolution: "tty-browserify@npm:0.0.0" - checksum: 47ca278a0c2e8988acdc635a462dfe8a496997516c36a2ae4ea0c5767ab09a98919b3e6c67766c9bbbd35d395760a7f0e02efc6f5d16996ee12fca6763cfb57d - languageName: node - linkType: hard - "tunnel-agent@npm:>=0.6.0": version: 0.6.0 resolution: "tunnel-agent@npm:0.6.0" @@ -13330,16 +12970,6 @@ typescript@^3.8.3: languageName: node linkType: hard -"url@npm:^0.11.0": - version: 0.11.0 - resolution: "url@npm:0.11.0" - dependencies: - punycode: 1.3.2 - querystring: 0.2.0 - checksum: 01241465421a297b3165b28c837e8e0f7498777f92c597cdfb2f6cafab2661e410191545f44dfedcad543e9032e01bd1c050710e18435646e3e5d590ac8f13e7 - languageName: node - linkType: hard - "use@npm:^3.1.0": version: 3.1.1 resolution: "use@npm:3.1.1" @@ -13370,24 +13000,6 @@ typescript@^3.8.3: languageName: node linkType: hard -"util@npm:0.10.3": - version: 0.10.3 - resolution: "util@npm:0.10.3" - dependencies: - inherits: 2.0.1 - checksum: a88890744c327cd67c34c202b7961006deb6ce0277d8fd7249264f49213bbac79acecb2ad4966e7cb3682dc7e739708187df30e73339a3238241088e30f8a365 - languageName: node - linkType: hard - -"util@npm:^0.11.0": - version: 0.11.1 - resolution: "util@npm:0.11.1" - dependencies: - inherits: 2.0.3 - checksum: 3485358c8292a8d6655f9b08a3aa4c942ed00eca454c6ca5c29b4537f375e18852d0ac28c1f56c2c28d4d5fbf2ecd1c4160482626fb513f796aba8e9b2040ecf - languageName: node - linkType: hard - "uuid@npm:^3.0.0, uuid@npm:^3.3.2": version: 3.4.0 resolution: "uuid@npm:3.4.0" @@ -13452,21 +13064,13 @@ typescript@^3.8.3: languageName: node linkType: hard -"vm-browserify@npm:^1.0.1": - version: 1.1.2 - resolution: "vm-browserify@npm:1.1.2" - checksum: 8eb0dfbf2d2fe4df9ecc54fed0fd13150e66c833774f92d201b40933322b9c79d9c8cdb3cf1de44fad3d254e35c4ef1884e9a04722271c1499205b3e9473a57b - languageName: node - linkType: hard - -"watchpack@npm:^1.6.0": - version: 1.6.1 - resolution: "watchpack@npm:1.6.1" +"watchpack@npm:^2.0.0": + version: 2.0.0 + resolution: "watchpack@npm:2.0.0" dependencies: - chokidar: ^2.1.8 + glob-to-regexp: ^0.4.1 graceful-fs: ^4.1.2 - neo-async: ^2.5.0 - checksum: 7d3ed4cee9ee05c12bf30802581089bac98b299b6ae8d1c69d26f18fa720795f42b502d4ef402d321fc77fdf63a1115860d374ba99471949707705c2eceabb11 + checksum: 6c420c69a029553cf81d0251462e29999c7c3f032b8cf4bd28491cc5bc97832947cfa592f1edb677b8cb222e23e7de6e4966ec2a68c8f1999c2da654ffec284f languageName: node linkType: hard @@ -13479,7 +13083,7 @@ typescript@^3.8.3: languageName: node linkType: hard -"webpack-sources@npm:^1.4.0, webpack-sources@npm:^1.4.1": +"webpack-sources@npm:^1.4.3": version: 1.4.3 resolution: "webpack-sources@npm:1.4.3" dependencies: @@ -13489,36 +13093,52 @@ typescript@^3.8.3: languageName: node linkType: hard -"webpack@npm:4.41.0": - version: 4.41.0 - resolution: "webpack@npm:4.41.0" +"webpack-sources@npm:^2.0.1": + version: 2.0.1 + resolution: "webpack-sources@npm:2.0.1" dependencies: - "@webassemblyjs/ast": 1.8.5 - "@webassemblyjs/helper-module-context": 1.8.5 - "@webassemblyjs/wasm-edit": 1.8.5 - "@webassemblyjs/wasm-parser": 1.8.5 - acorn: ^6.2.1 - ajv: ^6.10.2 - ajv-keywords: ^3.4.1 + source-list-map: ^2.0.1 + source-map: ^0.6.1 + checksum: 44bf028b1efd6a6f8b082a7172e4f8dce972bd7a1414ee7f65391c71485c60d173a278fe27c2bfea78d1d2ec5d8cd34fa57b09ad2d71578b7b68b99ee17762e7 + languageName: node + linkType: hard + +"webpack@npm:5.0.0": + version: 5.0.0 + resolution: "webpack@npm:5.0.0" + dependencies: + "@types/eslint-scope": ^3.7.0 + "@types/estree": ^0.0.45 + "@webassemblyjs/ast": 1.9.0 + "@webassemblyjs/helper-module-context": 1.9.0 + "@webassemblyjs/wasm-edit": 1.9.0 + "@webassemblyjs/wasm-parser": 1.9.0 + acorn: ^8.0.3 + browserslist: ^4.14.3 chrome-trace-event: ^1.0.2 - enhanced-resolve: ^4.1.0 - eslint-scope: ^4.0.3 + enhanced-resolve: ^5.2.0 + eslint-scope: ^5.1.0 + events: ^3.2.0 + glob-to-regexp: ^0.4.1 + graceful-fs: ^4.2.4 json-parse-better-errors: ^1.0.2 - loader-runner: ^2.4.0 - loader-utils: ^1.2.3 - memory-fs: ^0.4.1 - micromatch: ^3.1.10 - mkdirp: ^0.5.1 - neo-async: ^2.6.1 - node-libs-browser: ^2.2.1 - schema-utils: ^1.0.0 - tapable: ^1.1.3 - terser-webpack-plugin: ^1.4.1 - watchpack: ^1.6.0 - webpack-sources: ^1.4.1 + loader-runner: ^4.1.0 + mime-types: ^2.1.27 + neo-async: ^2.6.2 + pkg-dir: ^4.2.0 + schema-utils: ^3.0.0 + tapable: ^2.0.0 + terser-webpack-plugin: ^4.1.0 + watchpack: ^2.0.0 + webpack-sources: ^2.0.1 + peerDependencies: + webpack-cli: "*" + peerDependenciesMeta: + webpack-cli: + optional: true bin: - webpack: ./bin/webpack.js - checksum: 382090cca9b0485e56d28779b5723a57669f0f9dfcb98c9616ef4397f21920b48d4faaceb0a0cd4331ad52c282cd26e327051685448e256b36effe8332010430 + webpack: bin/webpack.js + checksum: fd912fb17bda37e97907f444047a666d0c5bc74f367add219c0e25c60513c0905314453eb84903ffa392372422f660f0afa60eb1159d98aa5782a8c0ef2b1b6c languageName: node linkType: hard @@ -13601,15 +13221,6 @@ typescript@^3.8.3: languageName: node linkType: hard -"worker-farm@npm:^1.7.0": - version: 1.7.0 - resolution: "worker-farm@npm:1.7.0" - dependencies: - errno: ~0.1.7 - checksum: 19cba1a93cc8b2892c8fd6ff1db61d8c303dfdffeb6571e415adeef6413c678b2cef62fa54a9691b3cfa9eccc7953a49572755bd125c4a5a57317e7c51a80779 - languageName: node - linkType: hard - "worker-farm@npm:~1.3.1": version: 1.3.1 resolution: "worker-farm@npm:1.3.1" @@ -13769,6 +13380,13 @@ typescript@^3.8.3: languageName: node linkType: hard +"yallist@npm:^4.0.0": + version: 4.0.0 + resolution: "yallist@npm:4.0.0" + checksum: a38b1e2b6a3d8d0a02349b43aba0bf5bede676c2161acc1baefd04fd94415fae40e9a8c86019f579e6992fb960b272fd909ded277c0b8bd2ad3ade21e7445238 + languageName: node + linkType: hard + "yargs-parser@npm:13.1.2, yargs-parser@npm:^13.0.0, yargs-parser@npm:^13.1.1, yargs-parser@npm:^13.1.2": version: 13.1.2 resolution: "yargs-parser@npm:13.1.2" From 90b4b070c0e5c4e6397cf8572b0b910d64ccf755 Mon Sep 17 00:00:00 2001 From: James Addison Date: Mon, 19 Oct 2020 17:48:34 +0100 Subject: [PATCH 09/37] Revert "Typing: update exit promise resolution handler" This reverts commit ef3582ea97c5fa85bf2ba4d7eedfa3825b59f00d. --- src/cli/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cli/index.ts b/src/cli/index.ts index 00ab00f..3da77d1 100644 --- a/src/cli/index.ts +++ b/src/cli/index.ts @@ -43,8 +43,8 @@ async function cli() { } return mochaWebpack.run() }) - .then(() => { - exit(cliOptions.mocha.cli.exit, 0) + .then((failures: number) => { + exit(cliOptions.mocha.cli.exit, failures) }) .catch((e: Error) => { if (e) console.error(e.stack) // eslint-disable-line From 601a91988eb3e106ffcbd9705932638b8a3adf4c Mon Sep 17 00:00:00 2001 From: James Addison Date: Mon, 19 Oct 2020 19:16:18 +0100 Subject: [PATCH 10/37] Treat chunk.files as a Set As per https://github.com/webpack/webpack/pull/9277 --- src/webpack/util/getBuildStats.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/webpack/util/getBuildStats.ts b/src/webpack/util/getBuildStats.ts index 946a0b7..320f627 100644 --- a/src/webpack/util/getBuildStats.ts +++ b/src/webpack/util/getBuildStats.ts @@ -25,7 +25,7 @@ export default function getBuildStats( const pathHelper = f => path.join(outputPath, f) sortedChunks.forEach((chunk: Chunk) => { - const files = Array.isArray(chunk.files) ? chunk.files : [chunk.files] + const files = Array.from(chunk.files) if (chunk.isOnlyInitial()) { // only entry files @@ -38,7 +38,7 @@ export default function getBuildStats( .getChunkModules(chunk) .some((module: Module) => affectedModules.indexOf(chunkGraph.getModuleId(module)) !== -1) ) { - files.forEach(file => { + files.forEach((file: string) => { if (/\.js$/.test(file)) { js.push(file) } From 60f82a1ddde9529f57c3e68b02505b0e0c5b3920 Mon Sep 17 00:00:00 2001 From: James Addison Date: Mon, 19 Oct 2020 19:18:37 +0100 Subject: [PATCH 11/37] Remove Travis build env definitions for webpack v4 --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 11d0473..fb6234f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,8 +20,6 @@ install: - yarn install --immutable env: - - WEBPACK_VERSION=4 MOCHA_VERSION=6 - - WEBPACK_VERSION=4 MOCHA_VERSION=7 - WEBPACK_VERSION=5 MOCHA_VERSION=7 before_script: From 986535f96015b4896e528fa6a69d351ac20b0b64 Mon Sep 17 00:00:00 2001 From: James Addison Date: Thu, 29 Oct 2020 12:35:51 +0000 Subject: [PATCH 12/37] Revert "Revert "Typing: update exit promise resolution handler"" This reverts commit 90b4b070c0e5c4e6397cf8572b0b910d64ccf755. --- src/cli/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cli/index.ts b/src/cli/index.ts index 3da77d1..00ab00f 100644 --- a/src/cli/index.ts +++ b/src/cli/index.ts @@ -43,8 +43,8 @@ async function cli() { } return mochaWebpack.run() }) - .then((failures: number) => { - exit(cliOptions.mocha.cli.exit, failures) + .then(() => { + exit(cliOptions.mocha.cli.exit, 0) }) .catch((e: Error) => { if (e) console.error(e.stack) // eslint-disable-line From a82037953026a7c0ab70c31432e9f5daaede8898 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Sat, 14 Nov 2020 16:04:46 +0100 Subject: [PATCH 13/37] Bump required dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- package.json | 8 +- yarn.lock | 368 ++++++++++++++++++++++++++++----------------------- 2 files changed, 210 insertions(+), 166 deletions(-) diff --git a/package.json b/package.json index 9fc43d1..77fa6d9 100644 --- a/package.json +++ b/package.json @@ -78,11 +78,11 @@ "chai": "^4.1.0", "coffee-script": "^1.11.1", "cross-env": "6.0.3", - "css-loader": "3.2.0", + "css-loader": "^5.0.1", "del": "5.1.0", "del-cli": "3.0.0", "eslint": "^6.7.2", - "eslint-config-airbnb-base": "12.1.0", + "eslint-config-airbnb-base": "^14.2.1", "eslint-config-prettier": "^6.7.0", "eslint-plugin-import": "^2.9.0", "fs-extra": "5.0.0", @@ -98,7 +98,7 @@ "np": "5.1.0", "nyc": "14.1.1", "prettier": "^1.19.1", - "sass-loader": "6.0.7", + "sass-loader": "^10.1.0", "sinon": "^9.0.2", "sinon-chai": "^3.5.0", "strip-ansi": "^5.2.0", @@ -106,7 +106,7 @@ "ts-mocha": "^7.0.0", "typescript": "^3.8.3", "webpack": "5.0.0", - "worker-loader": "2.0.0", + "worker-loader": "^3.0.5", "write-file-webpack-plugin": "^4.2.0" }, "dependencies": { diff --git a/yarn.lock b/yarn.lock index 8e5c023..3f84c56 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1892,7 +1892,7 @@ __metadata: languageName: node linkType: hard -"ajv-keywords@npm:^3.1.0, ajv-keywords@npm:^3.5.2": +"ajv-keywords@npm:^3.5.2": version: 3.5.2 resolution: "ajv-keywords@npm:3.5.2" peerDependencies: @@ -1911,7 +1911,7 @@ __metadata: languageName: node linkType: hard -"ajv@npm:^6.1.0, ajv@npm:^6.10.0, ajv@npm:^6.10.2, ajv@npm:^6.12.3, ajv@npm:^6.12.4, ajv@npm:^6.12.5": +"ajv@npm:^6.10.0, ajv@npm:^6.10.2, ajv@npm:^6.12.3, ajv@npm:^6.12.4, ajv@npm:^6.12.5": version: 6.12.6 resolution: "ajv@npm:6.12.6" dependencies: @@ -2923,6 +2923,16 @@ __metadata: languageName: node linkType: hard +"call-bind@npm:^1.0.0": + version: 1.0.0 + resolution: "call-bind@npm:1.0.0" + dependencies: + function-bind: ^1.1.1 + get-intrinsic: ^1.0.0 + checksum: a19c6e9ab006a44c5245cbdbd0d1ec7d1f6380ee86645939fe634e8b60aadd5d621fa92f60e0faf19548b1426caa8ceea5af3e09365291a4786ede26c5d6b9af + languageName: node + linkType: hard + "call-limit@npm:~1.1.0": version: 1.1.1 resolution: "call-limit@npm:1.1.1" @@ -3004,6 +3014,13 @@ __metadata: languageName: node linkType: hard +"camelcase@npm:^6.2.0": + version: 6.2.0 + resolution: "camelcase@npm:6.2.0" + checksum: 97651cfd28a35527928f7b0c43dc19a5352dc7280927760bb03f7c6217793b9e30a587696cfc665b7b656c79375618486311531656642c0b466dec939d58ee75 + languageName: node + linkType: hard + "caniuse-lite@npm:^1.0.30001135": version: 1.0.30001153 resolution: "caniuse-lite@npm:1.0.30001153" @@ -3327,18 +3344,6 @@ __metadata: languageName: node linkType: hard -"clone-deep@npm:^2.0.1": - version: 2.0.2 - resolution: "clone-deep@npm:2.0.2" - dependencies: - for-own: ^1.0.0 - is-plain-object: ^2.0.4 - kind-of: ^6.0.0 - shallow-clone: ^1.0.0 - checksum: a7ae660395453b611a228dbaba657fb825ac3da985c48d587cd7d5b8a661b988a08e3e9ae45f8270bfb6c0202df1b8cbb2ca383551e01bab09cd99ba8a68962c - languageName: node - linkType: hard - "clone-response@npm:^1.0.2": version: 1.0.2 resolution: "clone-response@npm:1.0.2" @@ -3431,6 +3436,13 @@ __metadata: languageName: node linkType: hard +"colorette@npm:^1.2.1": + version: 1.2.1 + resolution: "colorette@npm:1.2.1" + checksum: 9dbdae1554af1213647e09345dfbcae7b2df6870ab4c3587e29bd78b3f6ced5cbf0382709c0ca83c4f7ee3e8b0bbf3ecab0403cd0be59d870bcca57dcaf002fb + languageName: node + linkType: hard + "columnify@npm:~1.5.4": version: 1.5.4 resolution: "columnify@npm:1.5.4" @@ -3549,6 +3561,13 @@ __metadata: languageName: node linkType: hard +"confusing-browser-globals@npm:^1.0.10": + version: 1.0.10 + resolution: "confusing-browser-globals@npm:1.0.10" + checksum: 84d95047cab96792a2449f7a985514ae91219eb7bf5b1437bcb6f789c071a746df75086cde53e2d52df68c22730d592b9fda0c09eb2a2c59dafc3ab0db00512b + languageName: node + linkType: hard + "console-control-strings@npm:^1.0.0, console-control-strings@npm:~1.1.0": version: 1.1.0 resolution: "console-control-strings@npm:1.1.0" @@ -3734,25 +3753,25 @@ __metadata: languageName: node linkType: hard -"css-loader@npm:3.2.0": - version: 3.2.0 - resolution: "css-loader@npm:3.2.0" +"css-loader@npm:^5.0.1": + version: 5.0.1 + resolution: "css-loader@npm:5.0.1" dependencies: - camelcase: ^5.3.1 + camelcase: ^6.2.0 cssesc: ^3.0.0 - icss-utils: ^4.1.1 - loader-utils: ^1.2.3 - normalize-path: ^3.0.0 - postcss: ^7.0.17 - postcss-modules-extract-imports: ^2.0.0 - postcss-modules-local-by-default: ^3.0.2 - postcss-modules-scope: ^2.1.0 - postcss-modules-values: ^3.0.0 - postcss-value-parser: ^4.0.0 - schema-utils: ^2.0.0 + icss-utils: ^5.0.0 + loader-utils: ^2.0.0 + postcss: ^8.1.4 + postcss-modules-extract-imports: ^3.0.0 + postcss-modules-local-by-default: ^4.0.0 + postcss-modules-scope: ^3.0.0 + postcss-modules-values: ^4.0.0 + postcss-value-parser: ^4.1.0 + schema-utils: ^3.0.0 + semver: ^7.3.2 peerDependencies: - webpack: ^4.0.0 - checksum: ff4e1d5018884948f0a777dcae1b967aebe24af102ed91cf08203d4afc942a0e6eebe34794e771a50f57175b7390f5430afd392120c0531abc7433d27ea4f72f + webpack: ^4.27.0 || ^5.0.0 + checksum: 235418687ae875ca3c3639e22d7039d3fd07401b6de38506b17952ebf960157f8554b6684f3ea4d68a0aa053ae7c5007162d6420edcb5af8964b44e1a1ed6446 languageName: node linkType: hard @@ -4308,7 +4327,7 @@ __metadata: languageName: node linkType: hard -"es-abstract@npm:^1.17.0, es-abstract@npm:^1.17.0-next.1": +"es-abstract@npm:^1.17.0, es-abstract@npm:^1.17.0-next.1, es-abstract@npm:^1.17.5": version: 1.17.7 resolution: "es-abstract@npm:1.17.7" dependencies: @@ -4402,15 +4421,17 @@ __metadata: languageName: node linkType: hard -"eslint-config-airbnb-base@npm:12.1.0": - version: 12.1.0 - resolution: "eslint-config-airbnb-base@npm:12.1.0" +"eslint-config-airbnb-base@npm:^14.2.1": + version: 14.2.1 + resolution: "eslint-config-airbnb-base@npm:14.2.1" dependencies: - eslint-restricted-globals: ^0.1.1 + confusing-browser-globals: ^1.0.10 + object.assign: ^4.1.2 + object.entries: ^1.1.2 peerDependencies: - eslint: ^4.9.0 - eslint-plugin-import: ^2.7.0 - checksum: 931362b22c97c5a1bbf3fa4fc3799d2c4aeba13318b661aaf531c1f7c4b444c186a9ae7e83abf2ea4396f5633f1bba7916a142e12a4cda797f051e1a2c643894 + eslint: ^5.16.0 || ^6.8.0 || ^7.2.0 + eslint-plugin-import: ^2.22.1 + checksum: 8b28cc18fe510b60da19969dfcac6541dac807d7fe2ac94a8068f8b8306fb76f5f24c7d7078b047d23056e6e134bb13f9064159e987e55715ff2594e69cc7426 languageName: node linkType: hard @@ -4470,13 +4491,6 @@ __metadata: languageName: node linkType: hard -"eslint-restricted-globals@npm:^0.1.1": - version: 0.1.1 - resolution: "eslint-restricted-globals@npm:0.1.1" - checksum: bfdbaeabb0a3681a55863e3d3efd148e1b55ed93f32f09388e36a39cfe6a16809a3bd3473a570b7bc686b68674ca1fa3015a45f76446a8a910ddd2e9ec95383a - languageName: node - linkType: hard - "eslint-scope@npm:3.7.1": version: 3.7.1 resolution: "eslint-scope@npm:3.7.1" @@ -5051,13 +5065,6 @@ __metadata: languageName: node linkType: hard -"for-in@npm:^0.1.3": - version: 0.1.8 - resolution: "for-in@npm:0.1.8" - checksum: 093828b0c0ca75f8ec9bea65e55358024aa7d8987ff8e56481586e70080d67c2be651760609a01310d0379b15371787569beb00cd865b690165844ef2e61a3e7 - languageName: node - linkType: hard - "for-in@npm:^1.0.1, for-in@npm:^1.0.2": version: 1.0.2 resolution: "for-in@npm:1.0.2" @@ -5074,15 +5081,6 @@ __metadata: languageName: node linkType: hard -"for-own@npm:^1.0.0": - version: 1.0.0 - resolution: "for-own@npm:1.0.0" - dependencies: - for-in: ^1.0.1 - checksum: 872817686d9bb31d3a8bb7d6db98b6ddc8cbc4185ae2992c2d8b5c8925d7a4f20e58573a2391569f0239e4e2c07eb50bb4b152f2eee1c67b1d1ab0de9674fddc - languageName: node - linkType: hard - "foreground-child@npm:^1.5.6": version: 1.5.6 resolution: "foreground-child@npm:1.5.6" @@ -5416,6 +5414,17 @@ fsevents@^1.2.7: languageName: node linkType: hard +"get-intrinsic@npm:^1.0.0": + version: 1.0.1 + resolution: "get-intrinsic@npm:1.0.1" + dependencies: + function-bind: ^1.1.1 + has: ^1.0.3 + has-symbols: ^1.0.1 + checksum: dadaaf93b1ee9640f5574e6b6b6402a10d96e39942ae77415ea8fe4e4786fb419cbac3353f1e1a95f6b55f9227dadd6ff6d0a81f74bc0aad132437d556ee2852 + languageName: node + linkType: hard + "get-stdin@npm:^4.0.1": version: 4.0.1 resolution: "get-stdin@npm:4.0.1" @@ -6121,12 +6130,12 @@ fsevents@^1.2.7: languageName: node linkType: hard -"icss-utils@npm:^4.0.0, icss-utils@npm:^4.1.1": - version: 4.1.1 - resolution: "icss-utils@npm:4.1.1" - dependencies: - postcss: ^7.0.14 - checksum: 37c11f6bcd941af554f20a44c1a44409fa7b740c2e3f04836e52c60c17d3e4f267e29ff419711c56cabe464ef6741a2d41b715335dec1355ef82fce9bd34056e +"icss-utils@npm:^5.0.0": + version: 5.0.0 + resolution: "icss-utils@npm:5.0.0" + peerDependencies: + postcss: ^8.1.0 + checksum: 99ef132af56501f1e4e0d30e86a113a54a3de1292439a3dc5d4bc70ce72d449db609629843e01f1ed1c1a158a928378952362efa5a8c8ba8211d015fdcea8eb3 languageName: node linkType: hard @@ -7313,6 +7322,13 @@ fsevents@^1.2.7: languageName: node linkType: hard +"klona@npm:^2.0.4": + version: 2.0.4 + resolution: "klona@npm:2.0.4" + checksum: c336f963f07ba44ee5797e5d151c3d19c4e7c0efedc3aa367ce871909e3b1d6b86b4a57f8eb50ad07f5481aaf12770f519071c8a318810632ca42691b7323d21 + languageName: node + linkType: hard + "latest-version@npm:^3.0.0": version: 3.1.0 resolution: "latest-version@npm:3.1.0" @@ -7348,6 +7364,16 @@ fsevents@^1.2.7: languageName: node linkType: hard +"line-column@npm:^1.0.2": + version: 1.0.2 + resolution: "line-column@npm:1.0.2" + dependencies: + isarray: ^1.0.0 + isobject: ^2.0.0 + checksum: da288a1a43434d3a945cc936509e1cf58b5311b3581e4aaf7ae8063a6c42f9b26c5aaa503fafdf6449454264ee5e6b9b95497d13249ccfd7bd2257997d1821a1 + languageName: node + linkType: hard + "lines-and-columns@npm:^1.1.6": version: 1.1.6 resolution: "lines-and-columns@npm:1.1.6" @@ -7464,7 +7490,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"loader-utils@npm:^1.0.0, loader-utils@npm:^1.0.1, loader-utils@npm:^1.2.3, loader-utils@npm:^1.4.0": +"loader-utils@npm:^1.2.3, loader-utils@npm:^1.4.0": version: 1.4.0 resolution: "loader-utils@npm:1.4.0" dependencies: @@ -7475,6 +7501,17 @@ fsevents@^1.2.7: languageName: node linkType: hard +"loader-utils@npm:^2.0.0": + version: 2.0.0 + resolution: "loader-utils@npm:2.0.0" + dependencies: + big.js: ^5.2.2 + emojis-list: ^3.0.0 + json5: ^2.1.2 + checksum: 0a8b5b78de2cff4dce9af0fe5664778fc7f0167c13942f19764e929b4c81cbd00dcc5a781abdea3d4e91d237d02d007c55e01a4ffefbbe9095c36f408af8d94f + languageName: node + linkType: hard + "locate-path@npm:^2.0.0": version: 2.0.0 resolution: "locate-path@npm:2.0.0" @@ -7707,13 +7744,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"lodash.tail@npm:^4.1.1": - version: 4.1.1 - resolution: "lodash.tail@npm:4.1.1" - checksum: 2e17b9fd377d37f78980d92ea505285d58ccf4b3898da7191a13daa2c2febf6624e2e76d102033a161e54c156b0e79922fe8abaed8020b90cd136d2c2947c1fc - languageName: node - linkType: hard - "lodash.union@npm:~4.6.0": version: 4.6.0 resolution: "lodash.union@npm:4.6.0" @@ -8249,16 +8279,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"mixin-object@npm:^2.0.1": - version: 2.0.1 - resolution: "mixin-object@npm:2.0.1" - dependencies: - for-in: ^0.1.3 - is-extendable: ^0.1.1 - checksum: b1e67b8ec72530d20b09a3329f062d1325ba9195794f7e6029b1a54ee3aa644018cac83c74760b25cba23926d3a98004a3eaac4cc0f0d521a83ce0e5511ec402 - languageName: node - linkType: hard - "mkdirp@npm:0.5.1": version: 0.5.1 resolution: "mkdirp@npm:0.5.1" @@ -8371,11 +8391,11 @@ fsevents@^1.2.7: chokidar: ^2.0.0 coffee-script: ^1.11.1 cross-env: 6.0.3 - css-loader: 3.2.0 + css-loader: ^5.0.1 del: 5.1.0 del-cli: 3.0.0 eslint: ^6.7.2 - eslint-config-airbnb-base: 12.1.0 + eslint-config-airbnb-base: ^14.2.1 eslint-config-prettier: ^6.7.0 eslint-plugin-import: ^2.9.0 fs-extra: 5.0.0 @@ -8402,7 +8422,7 @@ fsevents@^1.2.7: nyc: 14.1.1 prettier: ^1.19.1 progress: ^2.0.3 - sass-loader: 6.0.7 + sass-loader: ^10.1.0 sinon: ^9.0.2 sinon-chai: ^3.5.0 source-map-support: ^0.5.13 @@ -8412,7 +8432,7 @@ fsevents@^1.2.7: ts-mocha: ^7.0.0 typescript: ^3.8.3 webpack: 5.0.0 - worker-loader: 2.0.0 + worker-loader: ^3.0.5 write-file-webpack-plugin: ^4.2.0 yargs: 14.0.0 peerDependencies: @@ -8488,6 +8508,15 @@ fsevents@^1.2.7: languageName: node linkType: hard +"nanoid@npm:^3.1.16": + version: 3.1.16 + resolution: "nanoid@npm:3.1.16" + bin: + nanoid: bin/nanoid.cjs + checksum: 23508e538f07742fa4d4f9dc9d3e4ad9387a0346fb6b592dcf1c8c836ecdd85ae0d12fd7171e3d1e7df055e2bc16c5bbe7b4b00d241f076958166d92edfe4cfe + languageName: node + linkType: hard + "nanomatch@npm:^1.2.9": version: 1.2.13 resolution: "nanomatch@npm:1.2.13" @@ -8514,7 +8543,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"neo-async@npm:^2.5.0, neo-async@npm:^2.6.2": +"neo-async@npm:^2.6.2": version: 2.6.2 resolution: "neo-async@npm:2.6.2" checksum: c3cec189bc14b9658b5d22353467d1e5665a36baa960f3f6689ee2f8330d4da7c9ef4d9d8db1e5890d67cb93e6867109b558a2e4ea21f6f8b3db5f00b8f3fdb2 @@ -9344,6 +9373,29 @@ fsevents@^1.2.7: languageName: node linkType: hard +"object.assign@npm:^4.1.2": + version: 4.1.2 + resolution: "object.assign@npm:4.1.2" + dependencies: + call-bind: ^1.0.0 + define-properties: ^1.1.3 + has-symbols: ^1.0.1 + object-keys: ^1.1.1 + checksum: c5b8285575adfc76369badd0192d079ae3074828f4720a1530d69b2121a10984c6815463dd6966673cb0a2ea0f8e3a75f083440c0edebf1ea9d0f445fba14ca7 + languageName: node + linkType: hard + +"object.entries@npm:^1.1.2": + version: 1.1.2 + resolution: "object.entries@npm:1.1.2" + dependencies: + define-properties: ^1.1.3 + es-abstract: ^1.17.5 + has: ^1.0.3 + checksum: 8a1ad9bef5dd7c9d9f4b38ba1d29fd01bbb3f49e8e7cdec88346c42079066d049ff8ef47105bd896764db394e1e669714b524c99210c0942767fb32974663c8e + languageName: node + linkType: hard + "object.getownpropertydescriptors@npm:^2.0.3": version: 2.1.0 resolution: "object.getownpropertydescriptors@npm:2.1.0" @@ -9987,48 +10039,51 @@ fsevents@^1.2.7: languageName: node linkType: hard -"postcss-modules-extract-imports@npm:^2.0.0": - version: 2.0.0 - resolution: "postcss-modules-extract-imports@npm:2.0.0" - dependencies: - postcss: ^7.0.5 - checksum: be1423e82cc93b61dc5cc62c9c867f038fc95dafcb7862712f59bcd327df8e692ff1f27c9ab9cbd7c6d22851bf20632319b467a01a96833b35969cdae3c7fdd9 +"postcss-modules-extract-imports@npm:^3.0.0": + version: 3.0.0 + resolution: "postcss-modules-extract-imports@npm:3.0.0" + peerDependencies: + postcss: ^8.1.0 + checksum: e0539eb008c472b878ba2fbd452eb64c2ecabd6c517521046d26425444ba21572e08805c733e16881f4740520dafdd24f6d9e471b0e1c72bab0183b1980d7bdf languageName: node linkType: hard -"postcss-modules-local-by-default@npm:^3.0.2": - version: 3.0.3 - resolution: "postcss-modules-local-by-default@npm:3.0.3" +"postcss-modules-local-by-default@npm:^4.0.0": + version: 4.0.0 + resolution: "postcss-modules-local-by-default@npm:4.0.0" dependencies: - icss-utils: ^4.1.1 - postcss: ^7.0.32 + icss-utils: ^5.0.0 postcss-selector-parser: ^6.0.2 postcss-value-parser: ^4.1.0 - checksum: bde9a1176fa9f5e465ea95b38f3341722acdcd0a6b1d4fdefa469c4ba9412fe9c27f89f41b0aefaeca55f25984aff9f7322629dec01eb32f726afeb7f79541b5 + peerDependencies: + postcss: ^8.1.0 + checksum: e4a5096e2b6a0eafcf68272c6bd8d99a8bd1f13547d1446c3c2852db814c363c1f6a0d2aeae76722e25db8fe1a53a6f10865dff6aabb76211d7ed1862478274e languageName: node linkType: hard -"postcss-modules-scope@npm:^2.1.0": - version: 2.2.0 - resolution: "postcss-modules-scope@npm:2.2.0" +"postcss-modules-scope@npm:^3.0.0": + version: 3.0.0 + resolution: "postcss-modules-scope@npm:3.0.0" dependencies: - postcss: ^7.0.6 - postcss-selector-parser: ^6.0.0 - checksum: c1124c3595aaa3e17cd6b21a874f3ebc7ffbc46aba134fc016fed54b2d25b71c7871702482a3123d846f66505a74be6a65ddfb591b14c025de9d048d8a17e80d + postcss-selector-parser: ^6.0.4 + peerDependencies: + postcss: ^8.1.0 + checksum: da06af22d28bba905d275167cbcff2a3623027ae47d0d507ff9e490b8b1998331332c3de8ac4b29999827e2f25f8aaabb3c2c78e81e484cb57e248b82b6056f7 languageName: node linkType: hard -"postcss-modules-values@npm:^3.0.0": - version: 3.0.0 - resolution: "postcss-modules-values@npm:3.0.0" +"postcss-modules-values@npm:^4.0.0": + version: 4.0.0 + resolution: "postcss-modules-values@npm:4.0.0" dependencies: - icss-utils: ^4.0.0 - postcss: ^7.0.6 - checksum: 0811973ad35288c7e80439fb30231ea8a73e96a18cbdd1d83f5ac9f238119a2a0ed9a7498477f848886ee1f47e16306fc1f10dcc4ba2f08fb62d0da8d7a3f145 + icss-utils: ^5.0.0 + peerDependencies: + postcss: ^8.1.0 + checksum: 00d610a399795fbdbf540c3c08ddc5059295e39490786f9fa2384acc54666e592af90b4773b1d45cddbcbd9a85c31c35749314ce073658929f333834c63da184 languageName: node linkType: hard -"postcss-selector-parser@npm:^6.0.0, postcss-selector-parser@npm:^6.0.2": +"postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4": version: 6.0.4 resolution: "postcss-selector-parser@npm:6.0.4" dependencies: @@ -10040,21 +10095,22 @@ fsevents@^1.2.7: languageName: node linkType: hard -"postcss-value-parser@npm:^4.0.0, postcss-value-parser@npm:^4.1.0": +"postcss-value-parser@npm:^4.1.0": version: 4.1.0 resolution: "postcss-value-parser@npm:4.1.0" checksum: 5f4a82f068b9eb1db9fae9edb92a2f756b6ef904483cc7d5c938e4041817fd7e57f4d6009628c39fc6b03d56db0f23e53e94fb53246a147795202807853c956f languageName: node linkType: hard -"postcss@npm:^7.0.14, postcss@npm:^7.0.17, postcss@npm:^7.0.32, postcss@npm:^7.0.5, postcss@npm:^7.0.6": - version: 7.0.35 - resolution: "postcss@npm:7.0.35" +"postcss@npm:^8.1.4": + version: 8.1.7 + resolution: "postcss@npm:8.1.7" dependencies: - chalk: ^2.4.2 + colorette: ^1.2.1 + line-column: ^1.0.2 + nanoid: ^3.1.16 source-map: ^0.6.1 - supports-color: ^6.1.0 - checksum: 9a14642c9629457c6e706a36038fdb27c6d3f894d2f850f14d880f78a01acc20cd9c966fd16abe3a02c94173ad49b54bf8ba853e825f1d5d7ef40c2ce324e6e8 + checksum: 709ec2407a46bc51319198349c59cda8a773b7e6dcb160895c5cbabecae2366a4382e51f68466851db4a30b74760412e2191ade040e50052ac7649ccc370823c languageName: node linkType: hard @@ -11148,33 +11204,32 @@ fsevents@^1.2.7: languageName: node linkType: hard -"sass-loader@npm:6.0.7": - version: 6.0.7 - resolution: "sass-loader@npm:6.0.7" +"sass-loader@npm:^10.1.0": + version: 10.1.0 + resolution: "sass-loader@npm:10.1.0" dependencies: - clone-deep: ^2.0.1 - loader-utils: ^1.0.1 - lodash.tail: ^4.1.1 - neo-async: ^2.5.0 - pify: ^3.0.0 + klona: ^2.0.4 + loader-utils: ^2.0.0 + neo-async: ^2.6.2 + schema-utils: ^3.0.0 + semver: ^7.3.2 peerDependencies: - node-sass: ^4.0.0 - webpack: ^2.0.0 || ^3.0.0 || ^4.0.0 - checksum: 1373bcecd8afbb4dccba5427c34b831d361261ad083e7721e77921b0b98ab8713a602809107bcbd895f3a4dc84c1c4a870ed5c8408fa6dbeea29ba37bbf94c43 - languageName: node - linkType: hard - -"schema-utils@npm:^0.4.0": - version: 0.4.7 - resolution: "schema-utils@npm:0.4.7" - dependencies: - ajv: ^6.1.0 - ajv-keywords: ^3.1.0 - checksum: d681716b85d31c01e13fe73d32c76f638a8659b6e51a3570912d66a3f39cfe52ee9fe9b744b8f1a7e42a52754a7b8acb1b42a8d6dfe767dedeb4debe762887ff + fibers: ">= 3.1.0" + node-sass: ^4.0.0 || ^5.0.0 + sass: ^1.3.0 + webpack: ^4.36.0 || ^5.0.0 + peerDependenciesMeta: + fibers: + optional: true + node-sass: + optional: true + sass: + optional: true + checksum: 6fae22b45c439acfda731355e594709174a3b1e5353b32fcd04a7c26999cf28fa7402244cc56c604a711ff6ca111b2a84a02394348a38325e7ea60b7247b7573 languageName: node linkType: hard -"schema-utils@npm:^2.0.0, schema-utils@npm:^2.6.5": +"schema-utils@npm:^2.6.5": version: 2.7.1 resolution: "schema-utils@npm:2.7.1" dependencies: @@ -11330,17 +11385,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"shallow-clone@npm:^1.0.0": - version: 1.0.0 - resolution: "shallow-clone@npm:1.0.0" - dependencies: - is-extendable: ^0.1.1 - kind-of: ^5.0.0 - mixin-object: ^2.0.1 - checksum: fdc7f32c332eaab0b94c8e641e8a595a739250d254d49cdda7e70ac128f181c8626ec9bee46210ffe6b11f0de8e511f2de6986820250a57b54d61aa910b1b448 - languageName: node - linkType: hard - "shebang-command@npm:^1.2.0": version: 1.2.0 resolution: "shebang-command@npm:1.2.0" @@ -13038,15 +13082,15 @@ typescript@^3.8.3: languageName: node linkType: hard -"worker-loader@npm:2.0.0": - version: 2.0.0 - resolution: "worker-loader@npm:2.0.0" +"worker-loader@npm:^3.0.5": + version: 3.0.5 + resolution: "worker-loader@npm:3.0.5" dependencies: - loader-utils: ^1.0.0 - schema-utils: ^0.4.0 + loader-utils: ^2.0.0 + schema-utils: ^3.0.0 peerDependencies: - webpack: ^3.0.0 || ^4.0.0-alpha.0 || ^4.0.0 - checksum: faf5fb0d295a4802c60eae6752745ca9b44d0f4203dc4433f5cb2362508b9e6b7df9db340fe1c07820cf860a8b3028e15ce001da6a97945f2bf58bb6aaf2d787 + webpack: ^4.0.0 || ^5.0.0 + checksum: aabe7b9cb2924016b124bd65ffa3b6c039179f41b48037c8e201c7be8f4a20fdb5f6c63fb7b0fb2634e38f75dad25e99744ee6d29627d89877e67e9e9cfe2c1d languageName: node linkType: hard From 5d9914edb4bf710949d29d24e64b36e1809b96c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Sat, 14 Nov 2020 16:07:58 +0100 Subject: [PATCH 14/37] Remove unnecessary write-file-webpack-plugin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- package.json | 3 +- .../custom-output-path/webpack.config-test.js | 7 ++-- .../fixture/webworker/webpack.config-test.js | 11 +++--- yarn.lock | 36 ++----------------- 4 files changed, 12 insertions(+), 45 deletions(-) diff --git a/package.json b/package.json index 77fa6d9..98467d2 100644 --- a/package.json +++ b/package.json @@ -106,8 +106,7 @@ "ts-mocha": "^7.0.0", "typescript": "^3.8.3", "webpack": "5.0.0", - "worker-loader": "^3.0.5", - "write-file-webpack-plugin": "^4.2.0" + "worker-loader": "^3.0.5" }, "dependencies": { "@babel/runtime-corejs2": "^7.0.0", diff --git a/test/integration/cli/fixture/custom-output-path/webpack.config-test.js b/test/integration/cli/fixture/custom-output-path/webpack.config-test.js index 87447ec..db92400 100644 --- a/test/integration/cli/fixture/custom-output-path/webpack.config-test.js +++ b/test/integration/cli/fixture/custom-output-path/webpack.config-test.js @@ -1,6 +1,5 @@ /* eslint-disable */ const path = require('path'); -const WriteFilePlugin = require('write-file-webpack-plugin'); module.exports = { mode: 'development', @@ -10,7 +9,7 @@ module.exports = { path: path.join(__dirname, '../../fixtureTmp'), publicPath: '' }, - plugins: [ - new WriteFilePlugin(), - ], + devServer: { + writeToDisk: true, + } }; diff --git a/test/integration/cli/fixture/webworker/webpack.config-test.js b/test/integration/cli/fixture/webworker/webpack.config-test.js index 198f4f5..92a1b4a 100644 --- a/test/integration/cli/fixture/webworker/webpack.config-test.js +++ b/test/integration/cli/fixture/webworker/webpack.config-test.js @@ -1,13 +1,12 @@ /* eslint-disable */ global.Worker = require('tiny-worker'); // webworker polyfill for node -const WriteFilePlugin = require('write-file-webpack-plugin'); module.exports = { mode: 'development', target: 'node', - plugins: [ - new WriteFilePlugin({ - test: /\.worker\.js$/, - }), - ], + devServer: { + writeToDisk: (filePath) => { + return /\.worker\.js$/.test(filePath); + }, + } }; diff --git a/yarn.lock b/yarn.lock index 3f84c56..9561735 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3076,7 +3076,7 @@ __metadata: languageName: node linkType: hard -"chalk@npm:^2.0.0, chalk@npm:^2.0.1, chalk@npm:^2.1.0, chalk@npm:^2.3.0, chalk@npm:^2.4.0, chalk@npm:^2.4.1, chalk@npm:^2.4.2": +"chalk@npm:^2.0.0, chalk@npm:^2.0.1, chalk@npm:^2.1.0, chalk@npm:^2.3.0, chalk@npm:^2.4.1, chalk@npm:^2.4.2": version: 2.4.2 resolution: "chalk@npm:2.4.2" dependencies: @@ -4925,13 +4925,6 @@ __metadata: languageName: node linkType: hard -"filesize@npm:^3.6.1": - version: 3.6.1 - resolution: "filesize@npm:3.6.1" - checksum: 206390a572596fb3672acc6efafb7c8084997e129e9627e0e6088b5fbbdd74acbd08d5da5aa3ca4dbdd21646ff4da73424d5df0afe5e34c8f02640a4188f0960 - languageName: node - linkType: hard - "fill-range@npm:^2.1.0": version: 2.2.4 resolution: "fill-range@npm:2.2.4" @@ -7779,7 +7772,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"lodash@npm:^4.0.0, lodash@npm:^4.17.10, lodash@npm:^4.17.13, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.4, lodash@npm:^4.3.0, lodash@npm:~4.17.10": +"lodash@npm:^4.0.0, lodash@npm:^4.17.10, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.4, lodash@npm:^4.3.0, lodash@npm:~4.17.10": version: 4.17.20 resolution: "lodash@npm:4.17.20" checksum: 4448e0047c0026a0491bf49b3a6912356a87c5b0a63b3837389f7f9846ccd72f7acdce8829191c896e8ea97b1a756615d06f8ff9da1eda32d60f39cebece7e9f @@ -8433,7 +8426,6 @@ fsevents@^1.2.7: typescript: ^3.8.3 webpack: 5.0.0 worker-loader: ^3.0.5 - write-file-webpack-plugin: ^4.2.0 yargs: 14.0.0 peerDependencies: mocha: ">=6 <9" @@ -8443,13 +8435,6 @@ fsevents@^1.2.7: languageName: unknown linkType: soft -"moment@npm:^2.22.1": - version: 2.29.1 - resolution: "moment@npm:2.29.1" - checksum: fc85063af628f36cf0d51d22d11d44c0da116b2c9109d4a08656e4cdfafb4917729f3e688eac904fa222acb2347a6fa51cb5a159c0dc00af28892962c9640a5c - languageName: node - linkType: hard - "move-concurrently@npm:^1.0.1, move-concurrently@npm:~1.0.1": version: 1.0.1 resolution: "move-concurrently@npm:1.0.1" @@ -13122,7 +13107,7 @@ typescript@^3.8.3: languageName: node linkType: hard -"write-file-atomic@npm:^2.0.0, write-file-atomic@npm:^2.3.0, write-file-atomic@npm:^2.4.2": +"write-file-atomic@npm:^2.0.0, write-file-atomic@npm:^2.4.2": version: 2.4.3 resolution: "write-file-atomic@npm:2.4.3" dependencies: @@ -13155,21 +13140,6 @@ typescript@^3.8.3: languageName: node linkType: hard -"write-file-webpack-plugin@npm:^4.2.0": - version: 4.5.1 - resolution: "write-file-webpack-plugin@npm:4.5.1" - dependencies: - chalk: ^2.4.0 - debug: ^3.1.0 - filesize: ^3.6.1 - lodash: ^4.17.13 - mkdirp: ^0.5.1 - moment: ^2.22.1 - write-file-atomic: ^2.3.0 - checksum: 49ea6ea2715495d18277c1dab72279dc1fe31a1d10fbdfd214ead36170dd78a0d478fbd670fced65044e391410d8617d1a58e0b68ca65083cbc4a5479ef199e9 - languageName: node - linkType: hard - "write@npm:1.0.3": version: 1.0.3 resolution: "write@npm:1.0.3" From 80ed9a9400f019511c77dd90b7d4704c93ef9846 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Sat, 14 Nov 2020 16:35:06 +0100 Subject: [PATCH 15/37] Fix assert polyfill requirements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- package.json | 2 + yarn.lock | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 119 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 98467d2..a3b906a 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "format": "prettier '{src,test}/**/*' ./*.json --write --loglevel warn", "lint": "eslint src/**/*.ts test/**/*.ts --fix", "test": "yarn run clean-tmp && yarn run build && ts-mocha --timeout 10000 --recursive --require @babel/register --exit \"{test,src}/**/*.test.ts\"", + "test:file": "yarn run clean-tmp && yarn run build && ts-mocha --timeout 10000 --recursive --require @babel/register --exit", "cover": "cross-env BABEL_ENV=coverage nyc --reporter=lcov --reporter=text npm test", "posttest": "yarn run format && yarn run lint", "docs:clean": "del-cli _book", @@ -70,6 +71,7 @@ "@typescript-eslint/eslint-plugin": "^2.11.0", "@typescript-eslint/parser": "^2.11.0", "anymatch": "3.1.1", + "assert": "^2.0.0", "babel-eslint": "^9.0.0", "babel-loader": "^8.0.0", "babel-plugin-istanbul": "4.1.6", diff --git a/yarn.lock b/yarn.lock index 9561735..e9ea672 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2151,6 +2151,13 @@ __metadata: languageName: node linkType: hard +"array-filter@npm:^1.0.0": + version: 1.0.0 + resolution: "array-filter@npm:1.0.0" + checksum: 50f98e35166b7421dcb7bf50502374bb670bc2d94ae3610edf269fdc3b7468192a49fe591355caf8e5f20839246b5475ddbb3c9cd10b9374a27d10730d0eb9bc + languageName: node + linkType: hard + "array-find-index@npm:^1.0.1": version: 1.0.2 resolution: "array-find-index@npm:1.0.2" @@ -2253,6 +2260,18 @@ __metadata: languageName: node linkType: hard +"assert@npm:^2.0.0": + version: 2.0.0 + resolution: "assert@npm:2.0.0" + dependencies: + es6-object-assign: ^1.1.0 + is-nan: ^1.2.1 + object-is: ^1.0.1 + util: ^0.12.0 + checksum: ce8ae5a9e193f720f12523ac16010c8b9ce706bfbf70d3b66e3f8256fc241f065b2629245656b5e04283e789f928fd3868c1e54aaf7d5693c952b674a86ca088 + languageName: node + linkType: hard + "assertion-error@npm:^1.1.0": version: 1.1.0 resolution: "assertion-error@npm:1.1.0" @@ -2329,6 +2348,15 @@ __metadata: languageName: node linkType: hard +"available-typed-arrays@npm:^1.0.0, available-typed-arrays@npm:^1.0.2": + version: 1.0.2 + resolution: "available-typed-arrays@npm:1.0.2" + dependencies: + array-filter: ^1.0.0 + checksum: 25b8dcfd62baa027fd38512f3c8a573ae0cf75a948d7dc4dd0497dc74753871b7b5ad6228e5e4c35ee028e1c61ad6031205b7f9204e764929793f569a8f84305 + languageName: node + linkType: hard + "aws-sign2@npm:~0.6.0": version: 0.6.0 resolution: "aws-sign2@npm:0.6.0" @@ -4327,7 +4355,7 @@ __metadata: languageName: node linkType: hard -"es-abstract@npm:^1.17.0, es-abstract@npm:^1.17.0-next.1, es-abstract@npm:^1.17.5": +"es-abstract@npm:^1.17.0, es-abstract@npm:^1.17.0-next.1, es-abstract@npm:^1.17.4, es-abstract@npm:^1.17.5": version: 1.17.7 resolution: "es-abstract@npm:1.17.7" dependencies: @@ -4384,6 +4412,13 @@ __metadata: languageName: node linkType: hard +"es6-object-assign@npm:^1.1.0": + version: 1.1.0 + resolution: "es6-object-assign@npm:1.1.0" + checksum: 55ef44bdddb41f92c34f9ea4dcc64be819837df19c02eed9cc068f4ae5ed2425f358756d9dd1d562cb78e58bddb343d035e8a66bb35658a9b89239ca187e0c85 + languageName: node + linkType: hard + "es6-promise@npm:^4.0.3": version: 4.2.8 resolution: "es6-promise@npm:4.2.8" @@ -5074,6 +5109,13 @@ __metadata: languageName: node linkType: hard +"foreach@npm:^2.0.5": + version: 2.0.5 + resolution: "foreach@npm:2.0.5" + checksum: 511e32be15abbc65931d6e4346551c874a7560c2b5fbdb6e393a06149ab4f49b5acd8f3d32de023389730db8c61b32aba22564aa49344fe82da39053f8d5764c + languageName: node + linkType: hard + "foreground-child@npm:^1.5.6": version: 1.5.6 resolution: "foreground-child@npm:1.5.6" @@ -6383,6 +6425,13 @@ fsevents@^1.2.7: languageName: node linkType: hard +"is-arguments@npm:^1.0.4": + version: 1.0.4 + resolution: "is-arguments@npm:1.0.4" + checksum: 278eb20b45b74039bb9b60ae54e3aaccb5fdc09ccd984adaa4ea3fa87c6eeb840493e024bf350e73aba7eeabc9fd8b74a90351d614fd8511041303b8a30f80d5 + languageName: node + linkType: hard + "is-arrayish@npm:^0.2.1": version: 0.2.1 resolution: "is-arrayish@npm:0.2.1" @@ -6588,6 +6637,13 @@ fsevents@^1.2.7: languageName: node linkType: hard +"is-generator-function@npm:^1.0.7": + version: 1.0.7 + resolution: "is-generator-function@npm:1.0.7" + checksum: c14880c823e722ceef0a9a9894f34eaf196155b0adb6158d833b5da1b30d0ae0930bc1a220227d12543a84a6dad88e66215084255fd446b1069d2dc2cc24bbfb + languageName: node + linkType: hard + "is-glob@npm:^2.0.0, is-glob@npm:^2.0.1": version: 2.0.1 resolution: "is-glob@npm:2.0.1" @@ -6655,6 +6711,15 @@ fsevents@^1.2.7: languageName: node linkType: hard +"is-nan@npm:^1.2.1": + version: 1.3.0 + resolution: "is-nan@npm:1.3.0" + dependencies: + define-properties: ^1.1.3 + checksum: cc42db95709d6b1e4316219ed47bd0d479e4256b55a670b330bd94bf7109ac9c9129808fb083d25869ccc34c3d1a14a44c73f863a9b2b75dbf935ab1fdba86bd + languageName: node + linkType: hard + "is-negative-zero@npm:^2.0.0": version: 2.0.0 resolution: "is-negative-zero@npm:2.0.0" @@ -6871,6 +6936,18 @@ fsevents@^1.2.7: languageName: node linkType: hard +"is-typed-array@npm:^1.1.3": + version: 1.1.3 + resolution: "is-typed-array@npm:1.1.3" + dependencies: + available-typed-arrays: ^1.0.0 + es-abstract: ^1.17.4 + foreach: ^2.0.5 + has-symbols: ^1.0.1 + checksum: b426157993d2e75cb83d9caff4c8e0e32fff664cad3ce885e3334d7a52f5de2a87a91a11a9c73c9026d40dcfafad4a8f52808b7750b43866d4a5160768fa3c61 + languageName: node + linkType: hard + "is-typedarray@npm:~1.0.0": version: 1.0.0 resolution: "is-typedarray@npm:1.0.0" @@ -8374,6 +8451,7 @@ fsevents@^1.2.7: "@typescript-eslint/eslint-plugin": ^2.11.0 "@typescript-eslint/parser": ^2.11.0 anymatch: 3.1.1 + assert: ^2.0.0 babel-eslint: ^9.0.0 babel-loader: ^8.0.0 babel-plugin-istanbul: 4.1.6 @@ -9318,6 +9396,16 @@ fsevents@^1.2.7: languageName: node linkType: hard +"object-is@npm:^1.0.1": + version: 1.1.3 + resolution: "object-is@npm:1.1.3" + dependencies: + define-properties: ^1.1.3 + es-abstract: ^1.18.0-next.1 + checksum: f453856abb761679bd259e03cfdc9c415370015d5f0afb0dda2bb22008bc9409d782f2c3b168a6a4b28c12555debdba37a84dbdbe309c002a2a066416b34d20e + languageName: node + linkType: hard + "object-keys@npm:^1.0.11, object-keys@npm:^1.0.12, object-keys@npm:^1.1.1": version: 1.1.1 resolution: "object-keys@npm:1.1.1" @@ -12845,6 +12933,20 @@ typescript@^3.8.3: languageName: node linkType: hard +"util@npm:^0.12.0": + version: 0.12.3 + resolution: "util@npm:0.12.3" + dependencies: + inherits: ^2.0.3 + is-arguments: ^1.0.4 + is-generator-function: ^1.0.7 + is-typed-array: ^1.1.3 + safe-buffer: ^5.1.2 + which-typed-array: ^1.1.2 + checksum: 1e2d9f8f0997e9902e3260dd7533ff3d71ef1eec4c0f6c9fc16355f6228b7a35f0b64fee086298d55dcedf99d75dcc19fa02418c2403c2ab9c25212a1f3c3ffe + languageName: node + linkType: hard + "uuid@npm:^3.0.0, uuid@npm:^3.3.2": version: 3.4.0 resolution: "uuid@npm:3.4.0" @@ -12992,6 +13094,20 @@ typescript@^3.8.3: languageName: node linkType: hard +"which-typed-array@npm:^1.1.2": + version: 1.1.2 + resolution: "which-typed-array@npm:1.1.2" + dependencies: + available-typed-arrays: ^1.0.2 + es-abstract: ^1.17.5 + foreach: ^2.0.5 + function-bind: ^1.1.1 + has-symbols: ^1.0.1 + is-typed-array: ^1.1.3 + checksum: 398f304e538ab2678f57a4b46c1860f9262214f301b608b6b4faa80ffc85cf410c4572aaea479a1603343f8be2b624d5f63dc91b67f868dd0a55b6156b7ea629 + languageName: node + linkType: hard + "which@npm:1, which@npm:1.3.1, which@npm:^1.2.12, which@npm:^1.2.9, which@npm:^1.3.0": version: 1.3.1 resolution: "which@npm:1.3.1" From 10cfbcef2f87412279b69302830adad231b4aa4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Sat, 14 Nov 2020 16:40:58 +0100 Subject: [PATCH 16/37] Make sure we have a valid error message MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- src/webpack/util/createStatsFormatter.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/webpack/util/createStatsFormatter.ts b/src/webpack/util/createStatsFormatter.ts index b5fcd23..c237c43 100644 --- a/src/webpack/util/createStatsFormatter.ts +++ b/src/webpack/util/createStatsFormatter.ts @@ -58,7 +58,10 @@ export default function createStatsFormatter(rootPath: string) { lines.push('') } - lines.push(formatErrorMessage(err.message)) + // Make sure we have a valid error message + if (err.message && typeof err.message === 'string') { + lines.push(formatErrorMessage(err.message)) + } return lines.join(EOL) } From d57d9ef686498f3e40c5fa7e5897e099c4848f9c Mon Sep 17 00:00:00 2001 From: James Addison Date: Thu, 19 Nov 2020 13:09:03 +0000 Subject: [PATCH 17/37] Remove test:file script Ref: https://github.com/jayaddison/mochapack/pull/1/files#r525545996 --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index a3b906a..dea54d5 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,6 @@ "format": "prettier '{src,test}/**/*' ./*.json --write --loglevel warn", "lint": "eslint src/**/*.ts test/**/*.ts --fix", "test": "yarn run clean-tmp && yarn run build && ts-mocha --timeout 10000 --recursive --require @babel/register --exit \"{test,src}/**/*.test.ts\"", - "test:file": "yarn run clean-tmp && yarn run build && ts-mocha --timeout 10000 --recursive --require @babel/register --exit", "cover": "cross-env BABEL_ENV=coverage nyc --reporter=lcov --reporter=text npm test", "posttest": "yarn run format && yarn run lint", "docs:clean": "del-cli _book", From 59feadb4fae842ed752da3761f7cf79fb7b06460 Mon Sep 17 00:00:00 2001 From: James Addison Date: Tue, 1 Dec 2020 11:42:08 +0000 Subject: [PATCH 18/37] Fixup: determine moduleId on a per-module basis --- src/webpack/util/getAffectedModuleIds.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/webpack/util/getAffectedModuleIds.ts b/src/webpack/util/getAffectedModuleIds.ts index 46141bb..0aaa787 100644 --- a/src/webpack/util/getAffectedModuleIds.ts +++ b/src/webpack/util/getAffectedModuleIds.ts @@ -160,10 +160,10 @@ export default function getAffectedModuleIds( const builtModules = Array.from(modules).filter(isBuilt) const affectedMap: ModuleMap = {} - const moduleId: string = chunkGraph.getModuleId(module) - builtModules.forEach((module: Module) => + builtModules.forEach((module: Module) => { + const moduleId: string = chunkGraph.getModuleId(module) affectedModules(chunkGraph, moduleMap, moduleUsageMap, affectedMap, moduleId) - ) + }) return Object.values(affectedMap).map(chunkGraph.getModuleId) } From 3ff335ef12dd0de0a2bc9b1551d20066c3487182 Mon Sep 17 00:00:00 2001 From: James Addison Date: Mon, 14 Dec 2020 18:18:07 +0000 Subject: [PATCH 19/37] Adjust test runner callback handling --- src/runner/TestRunner.ts | 8 ++++---- src/webpack/compiler/registerReadyCallback.ts | 8 +++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/runner/TestRunner.ts b/src/runner/TestRunner.ts index 0346460..068cf81 100644 --- a/src/runner/TestRunner.ts +++ b/src/runner/TestRunner.ts @@ -106,8 +106,8 @@ export default class TestRunner extends EventEmitter { failures = await new Promise((resolve, reject) => { registerReadyCallback( compiler, - (err: (Error | string) | null, webpackStats: Stats | null) => { - this.emit(WEBPACK_READY_EVENT, err, webpackStats) + (err: Error, webpackStats: Stats) => { + this.emit(WEBPACK_READY_EVENT, err) if (err || !webpackStats) { reject() return @@ -216,8 +216,8 @@ export default class TestRunner extends EventEmitter { // register webpack ready callback registerReadyCallback( compiler, - (err: (Error | string) | null, webpackStats: Stats | null) => { - this.emit(WEBPACK_READY_EVENT, err, webpackStats) + (err: Error, webpackStats: Stats) => { + this.emit(WEBPACK_READY_EVENT, err, null) if (err) { // wait for fixed tests return diff --git a/src/webpack/compiler/registerReadyCallback.ts b/src/webpack/compiler/registerReadyCallback.ts index 921bbb9..a5960dc 100644 --- a/src/webpack/compiler/registerReadyCallback.ts +++ b/src/webpack/compiler/registerReadyCallback.ts @@ -3,11 +3,9 @@ import { MOCHAPACK_NAME } from '../../util/constants' export default function registerReadyCallback( compiler: Compiler, - cb: (err: Error, stats: Stats | null) => void -) { - compiler.hooks.failed.tap(MOCHAPACK_NAME, (err: Error) => { - cb(err, null) - }); + cb: (err: Error, stats: Stats) => void + ) { + compiler.hooks.failed.tap(MOCHAPACK_NAME, (error: Error) => cb(error, null)) compiler.hooks.done.tap(MOCHAPACK_NAME, (stats: Stats) => { if (stats.hasErrors()) { const jsonStats = stats.toJson() From 9255dba4d0d82e71a28ef7620d413068bc74487f Mon Sep 17 00:00:00 2001 From: James Addison Date: Mon, 14 Dec 2020 18:42:57 +0000 Subject: [PATCH 20/37] Revert "Make sure we have a valid error message" This reverts commit 10cfbcef2f87412279b69302830adad231b4aa4e. --- src/webpack/util/createStatsFormatter.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/webpack/util/createStatsFormatter.ts b/src/webpack/util/createStatsFormatter.ts index c237c43..b5fcd23 100644 --- a/src/webpack/util/createStatsFormatter.ts +++ b/src/webpack/util/createStatsFormatter.ts @@ -58,10 +58,7 @@ export default function createStatsFormatter(rootPath: string) { lines.push('') } - // Make sure we have a valid error message - if (err.message && typeof err.message === 'string') { - lines.push(formatErrorMessage(err.message)) - } + lines.push(formatErrorMessage(err.message)) return lines.join(EOL) } From 7932938135083575227f9f0097957d232e7cfe2c Mon Sep 17 00:00:00 2001 From: James Addison Date: Mon, 14 Dec 2020 18:46:32 +0000 Subject: [PATCH 21/37] Revert ensureWebpackErrors implementation changes --- src/webpack/util/createStatsFormatter.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/webpack/util/createStatsFormatter.ts b/src/webpack/util/createStatsFormatter.ts index b5fcd23..dbe57ec 100644 --- a/src/webpack/util/createStatsFormatter.ts +++ b/src/webpack/util/createStatsFormatter.ts @@ -29,7 +29,14 @@ const createGetFile = (requestShortener: RequestShortener) => ( const ensureWebpackErrors = ( errors: Array ): Array => - errors.map((e: WebpackError) => e.toString()) + errors.map((e: string | WebpackError) => { + /* istanbul ignore if */ + if (typeof e === 'string') { + // webpack does this also, so there must be case when this happens + return ({ message: e } as any) as WebpackError + } + return e + }) const prependWarning = (message: string) => `${chalk.yellow('Warning')} ${message}` From 712ebdb13905f1840f0385921102c12383e28980 Mon Sep 17 00:00:00 2001 From: James Addison Date: Mon, 14 Dec 2020 18:56:22 +0000 Subject: [PATCH 22/37] Restore webpackStats argument to WEBPACK_READY_EVENT emissions --- src/runner/TestRunner.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/runner/TestRunner.ts b/src/runner/TestRunner.ts index 068cf81..1fc8e9f 100644 --- a/src/runner/TestRunner.ts +++ b/src/runner/TestRunner.ts @@ -107,7 +107,7 @@ export default class TestRunner extends EventEmitter { registerReadyCallback( compiler, (err: Error, webpackStats: Stats) => { - this.emit(WEBPACK_READY_EVENT, err) + this.emit(WEBPACK_READY_EVENT, err, webpackStats) if (err || !webpackStats) { reject() return @@ -217,7 +217,7 @@ export default class TestRunner extends EventEmitter { registerReadyCallback( compiler, (err: Error, webpackStats: Stats) => { - this.emit(WEBPACK_READY_EVENT, err, null) + this.emit(WEBPACK_READY_EVENT, err, webpackStats) if (err) { // wait for fixed tests return From 29d77f245bb2d958a4c2ccc6646bc956bef6c827 Mon Sep 17 00:00:00 2001 From: verasztol Date: Sat, 6 Feb 2021 21:54:51 +0100 Subject: [PATCH 23/37] fix exit code build problem for watch return type --- src/cli/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cli/index.ts b/src/cli/index.ts index 00ab00f..46a4daf 100644 --- a/src/cli/index.ts +++ b/src/cli/index.ts @@ -43,8 +43,8 @@ async function cli() { } return mochaWebpack.run() }) - .then(() => { - exit(cliOptions.mocha.cli.exit, 0) + .then((failures: number | void) => { + exit(cliOptions.mocha.cli.exit, failures || 0) }) .catch((e: Error) => { if (e) console.error(e.stack) // eslint-disable-line From 743b0aaef3860dd22435fafb91b14a101c69fc0b Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Tue, 11 May 2021 21:03:00 +0800 Subject: [PATCH 24/37] fix: fix isBuilt for webpack 5 The `built` flag in webpack 5 is moved: https://github.com/webpack/webpack/commit/eb63cf80d6f2102270c2babfb620cfd78a2a33cb --- src/webpack/util/createEntry.ts | 1 - src/webpack/util/getAffectedModuleIds.ts | 14 ++++++++++---- src/webpack/util/getBuildStats.ts | 4 ++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/webpack/util/createEntry.ts b/src/webpack/util/createEntry.ts index 14ec00b..988aea8 100644 --- a/src/webpack/util/createEntry.ts +++ b/src/webpack/util/createEntry.ts @@ -8,7 +8,6 @@ export default function createEntry(filePaths: Array): string { 'var ids = [', filePaths.map(path => `require.resolve(${path})`).join(','), '];', - '', 'ids.filter(inManifest).forEach(run)' ].join('\n') } diff --git a/src/webpack/util/getAffectedModuleIds.ts b/src/webpack/util/getAffectedModuleIds.ts index 0aaa787..583f6cd 100644 --- a/src/webpack/util/getAffectedModuleIds.ts +++ b/src/webpack/util/getAffectedModuleIds.ts @@ -10,7 +10,12 @@ type ModuleUsageMap = { // child id [key: string]: ModuleMap } -const isBuilt = (module: Module): boolean => module.built +const isBuilt = (module: Module, webpackBuiltModules: WeakSet): boolean => { + if (webpackBuiltModules) { + return webpackBuiltModules.has(module) + } + return module.built +} const getId = (module: any): number | string => module.id const affectedModules = ( @@ -121,7 +126,7 @@ const buildModuleUsageMap = ( .filter(block => block.chunkGroup != null) .forEach(block => { // loop through all generated chunks by this module - block.chunkGroup.chunks.map(getId).forEach(chunkId => { + Array.from(block.chunkGroup.chunks).map(getId).forEach(chunkId => { // and mark all modules of this chunk as a direct dependency of the original module Object.values(chunkModuleMap[chunkId] as ModuleMap).forEach( (childModule: any) => { @@ -153,12 +158,13 @@ export default function getAffectedModuleIds( chunks: Set, chunkGraph: ChunkGraph, modules: Set, - moduleGraph: ModuleGraph + moduleGraph: ModuleGraph, + webpackBuiltModules?: WeakSet ): Array { const moduleMap: ModuleMap = buildModuleMap(chunkGraph, modules) const moduleUsageMap: ModuleUsageMap = buildModuleUsageMap(chunks, chunkGraph, modules, moduleGraph) - const builtModules = Array.from(modules).filter(isBuilt) + const builtModules = Array.from(modules).filter(m => isBuilt(m, webpackBuiltModules)) const affectedMap: ModuleMap = {} builtModules.forEach((module: Module) => { const moduleId: string = chunkGraph.getModuleId(module) diff --git a/src/webpack/util/getBuildStats.ts b/src/webpack/util/getBuildStats.ts index 320f627..c038d0c 100644 --- a/src/webpack/util/getBuildStats.ts +++ b/src/webpack/util/getBuildStats.ts @@ -15,10 +15,10 @@ export default function getBuildStats( stats: Stats, outputPath: string ): BuildStats { - const { chunks, chunkGraph, chunkGroups, modules, moduleGraph } = stats.compilation + const { chunks, chunkGraph, chunkGroups, modules, moduleGraph, builtModules } = stats.compilation const sortedChunks = sortChunks(chunks, chunkGroups) - const affectedModules = getAffectedModuleIds(chunks, chunkGraph, modules, moduleGraph) + const affectedModules = getAffectedModuleIds(chunks, chunkGraph, modules, moduleGraph, builtModules) const entries = [] const js = [] From 22bc90c10d1f081a4dc2a09bc197fd4095cf440f Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Tue, 11 May 2021 21:08:20 +0800 Subject: [PATCH 25/37] fix: fix .map usage --- src/webpack/util/getAffectedModuleIds.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/webpack/util/getAffectedModuleIds.ts b/src/webpack/util/getAffectedModuleIds.ts index 583f6cd..2202cfd 100644 --- a/src/webpack/util/getAffectedModuleIds.ts +++ b/src/webpack/util/getAffectedModuleIds.ts @@ -171,5 +171,5 @@ export default function getAffectedModuleIds( affectedModules(chunkGraph, moduleMap, moduleUsageMap, affectedMap, moduleId) }) - return Object.values(affectedMap).map(chunkGraph.getModuleId) + return Object.values(affectedMap).map(m => chunkGraph.getModuleId(m)) } From e03a33a5994119379e745d41015862fdb40a81f4 Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Tue, 11 May 2021 21:49:38 +0800 Subject: [PATCH 26/37] test: fix worker-loader test The `esModule` option is turned on by default in v3 --- test/integration/cli/fixture/webworker/test/worker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/cli/fixture/webworker/test/worker.js b/test/integration/cli/fixture/webworker/test/worker.js index 90df1d0..ef91b6b 100644 --- a/test/integration/cli/fixture/webworker/test/worker.js +++ b/test/integration/cli/fixture/webworker/test/worker.js @@ -1,5 +1,5 @@ const assert = require('assert'); -const MyWorker = require('worker-loader!../src/worker'); +const MyWorker = require('worker-loader!../src/worker').default; describe('worker', function () { From e67d6589407513d0357e26e8f7f719edd7c1553e Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Tue, 11 May 2021 23:49:08 +0800 Subject: [PATCH 27/37] chore: fix yarn lock --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index e9ea672..b437635 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5282,7 +5282,7 @@ fsevents@^1.2.7: "fsevents@patch:fsevents@^1.2.7#builtin": version: 1.2.13 - resolution: "fsevents@patch:fsevents@npm%3A1.2.13#builtin::version=1.2.13&hash=127e8e" + resolution: "fsevents@patch:fsevents@npm%3A1.2.13#builtin::version=1.2.13&hash=11e9ea" dependencies: bindings: ^1.5.0 nan: ^2.12.1 @@ -5292,7 +5292,7 @@ fsevents@^1.2.7: "fsevents@patch:fsevents@~2.1.1#builtin, fsevents@patch:fsevents@~2.1.2#builtin": version: 2.1.3 - resolution: "fsevents@patch:fsevents@npm%3A2.1.3#builtin::version=2.1.3&hash=127e8e" + resolution: "fsevents@patch:fsevents@npm%3A2.1.3#builtin::version=2.1.3&hash=11e9ea" dependencies: node-gyp: latest checksum: c389355408e0de9ebc24020bbc905c7dfac03dfdf619e9bb9773ed5b94651ab5cdac31957fad7fc7ad05a86f3a4c6b5698e24dc31625206cde6b3ccf5f1ab73f @@ -12686,7 +12686,7 @@ typescript@^3.8.3: "typescript@patch:typescript@^3.8.3#builtin": version: 3.9.7 - resolution: "typescript@patch:typescript@npm%3A3.9.7#builtin::version=3.9.7&hash=5bf698" + resolution: "typescript@patch:typescript@npm%3A3.9.7#builtin::version=3.9.7&hash=cc6730" bin: tsc: bin/tsc tsserver: bin/tsserver From ccd2434cc4e8312d86813b5f090599ee154fabce Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Wed, 12 May 2021 15:45:29 +0800 Subject: [PATCH 28/37] fix: fix type error --- src/webpack/compiler/registerReadyCallback.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/webpack/compiler/registerReadyCallback.ts b/src/webpack/compiler/registerReadyCallback.ts index a5960dc..1a489db 100644 --- a/src/webpack/compiler/registerReadyCallback.ts +++ b/src/webpack/compiler/registerReadyCallback.ts @@ -10,7 +10,7 @@ export default function registerReadyCallback( if (stats.hasErrors()) { const jsonStats = stats.toJson() const [err] = jsonStats.errors - cb(err, stats) + cb(err as Error, stats) } else { cb(null, stats) } From 1ce91e2f43765012a1fbb241a7bc715b8e321907 Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Wed, 12 May 2021 16:32:09 +0800 Subject: [PATCH 29/37] test: fix tests that requires on-disk files --- src/webpack/compiler/registerInMemoryCompiler.ts | 6 +++++- test/integration/cli/custom-output-path.test.ts | 2 ++ test/integration/cli/webworker.test.ts | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/webpack/compiler/registerInMemoryCompiler.ts b/src/webpack/compiler/registerInMemoryCompiler.ts index 8221eb0..c3cf2f8 100644 --- a/src/webpack/compiler/registerInMemoryCompiler.ts +++ b/src/webpack/compiler/registerInMemoryCompiler.ts @@ -1,3 +1,4 @@ +import fs from 'fs' import path from 'path' import sourceMapSupport from 'source-map-support' import MemoryFileSystem from 'memory-fs' @@ -13,7 +14,10 @@ export default function registerInMemoryCompiler( ): VoidFunction { // register memory fs to webpack const memoryFs = new MemoryFileSystem() - compiler.outputFileSystem = memoryFs // eslint-disable-line no-param-reassign + // the flag is used for integration tests that need to read compiled files + if (!process.env.MOCHAPACK_WRITE_TO_DISK) { + compiler.outputFileSystem = memoryFs // eslint-disable-line no-param-reassign + } // build asset map to allow fast checks for file existence const assetMap = new Map() diff --git a/test/integration/cli/custom-output-path.test.ts b/test/integration/cli/custom-output-path.test.ts index 7d0f608..58e5f4f 100644 --- a/test/integration/cli/custom-output-path.test.ts +++ b/test/integration/cli/custom-output-path.test.ts @@ -21,6 +21,7 @@ describe('custom output path', function() { }) beforeEach(function() { + process.env.MOCHAPACK_WRITE_TO_DISK = 'true' return del(this.webpackConfig.output.path) }) @@ -44,6 +45,7 @@ describe('custom output path', function() { }) afterEach(function() { + delete process.env.MOCHAPACK_WRITE_TO_DISK return del(this.webpackConfig.output.path) }) }) diff --git a/test/integration/cli/webworker.test.ts b/test/integration/cli/webworker.test.ts index ead6bd7..e185543 100644 --- a/test/integration/cli/webworker.test.ts +++ b/test/integration/cli/webworker.test.ts @@ -17,11 +17,13 @@ describe('webworker', function() { ) }) it('runs test successfully', function(done) { + process.env.MOCHAPACK_WRITE_TO_DISK = 'true' exec( `node ${binPath} --webpack-config "${this.webpackConfig}" "${this.passingTest}"`, (err, output) => { assert.isNull(err) assert.include(output, '1 passing') + delete process.env.MOCHAPACK_WRITE_TO_DISK done() } ) From 7b72058e32abeba3e4fbb1f593dd2a0663a08d3f Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Wed, 12 May 2021 16:32:29 +0800 Subject: [PATCH 30/37] fix: fix invalid dependencies module warning --- src/webpack/loader/entryLoader.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/webpack/loader/entryLoader.ts b/src/webpack/loader/entryLoader.ts index 74fd155..f8b726d 100644 --- a/src/webpack/loader/entryLoader.ts +++ b/src/webpack/loader/entryLoader.ts @@ -31,14 +31,15 @@ export const entryLoader = function entryLoader() { // Remove all dependencies of the loader result this.clearDependencies() - const dependencies: Array = config - .getFiles() - .map(file => loaderUtils.stringifyRequest(this, file)) + + const entries = config.getFiles() // add all entries as dependencies - dependencies.forEach(this.addDependency.bind(this)) + // note this.addDependency requires an absolute path + entries.forEach(e => this.addDependency(e)) // build source code + const dependencies = entries.map(file => loaderUtils.stringifyRequest(this, file)) const sourceCode: string = createEntry(dependencies) this.callback(null, sourceCode, null) From 0df4b003d67ba4cbb034c90d7357daa4a2e7f177 Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Wed, 12 May 2021 17:21:11 +0800 Subject: [PATCH 31/37] fix: add back webpack 4 implementation --- src/runner/TestRunner.ts | 10 +- .../util/webpack4GetAffectedModuleIds.ts | 154 ++++++++++++++++++ src/webpack/util/webpack4GetBuildStats.ts | 55 +++++++ 3 files changed, 218 insertions(+), 1 deletion(-) create mode 100644 src/webpack/util/webpack4GetAffectedModuleIds.ts create mode 100644 src/webpack/util/webpack4GetBuildStats.ts diff --git a/src/runner/TestRunner.ts b/src/runner/TestRunner.ts index 1fc8e9f..b33ef29 100644 --- a/src/runner/TestRunner.ts +++ b/src/runner/TestRunner.ts @@ -13,6 +13,8 @@ import createWatchCompiler, { import registerInMemoryCompiler from '../webpack/compiler/registerInMemoryCompiler' import registerReadyCallback from '../webpack/compiler/registerReadyCallback' import getBuildStats, { BuildStats } from '../webpack/util/getBuildStats' +import webpack4GetBuildStats from '../webpack/util/webpack4GetBuildStats' +import webpack from 'webpack' import createWebpackConfig from './runnerUtils/createWebpackConfig' import { @@ -73,7 +75,13 @@ export default class TestRunner extends EventEmitter { prepareMocha(webpackConfig: WebpackConfig, stats: Stats): Mocha { const mocha: Mocha = initMocha(this.options.mocha, this.cwd) const outputPath = webpackConfig.output.path - const buildStats: BuildStats = getBuildStats(stats, outputPath) + + let buildStats: BuildStats + if (webpack.version[0] === '4') { + buildStats = webpack4GetBuildStats(stats, outputPath) + } else { + buildStats = getBuildStats(stats, outputPath) + } // @ts-ignore global.__webpackManifest__ = buildStats.affectedModules // eslint-disable-line diff --git a/src/webpack/util/webpack4GetAffectedModuleIds.ts b/src/webpack/util/webpack4GetAffectedModuleIds.ts new file mode 100644 index 0000000..64f481b --- /dev/null +++ b/src/webpack/util/webpack4GetAffectedModuleIds.ts @@ -0,0 +1,154 @@ +import { Module, Chunk } from '../types' + +type ModuleMap = { + [key: string]: Module +} +type ModuleUsageMap = { + // child id + [key: string]: ModuleMap +} +const isBuilt = (module: Module): boolean => module.built +const getId = (module: any): number | string => module.id + +const affectedModules = ( + map: ModuleMap, + usageMap: ModuleUsageMap, + affected: ModuleMap, + moduleId: string | number +) => { + if (typeof affected[moduleId] !== 'undefined') { + // module was already inspected, stop here otherwise we get into endless recursion + return + } + // module is identified as affected by this function call + const module = map[moduleId] + affected[module.id] = module // eslint-disable-line no-param-reassign + + // next we need to mark all usages aka parents also as affected + const usages = usageMap[module.id] + if (typeof usages !== 'undefined') { + const ids = Object.keys(usages) + ids.forEach((id: string) => affectedModules(map, usageMap, affected, id)) + } +} + +/** + * Builds a map where all modules are indexed by it's id + * { + * [moduleId]: Module + * } + */ +const buildModuleMap = (modules: Array): ModuleMap => { + const moduleMap = modules.reduce( + (memo, module: Module) => ({ ...memo, [module.id]: module }), + {} + ) + return moduleMap +} + +/** + * Builds a map with all modules that are used in other modules (child -> parent relation) + * + * { + * [childModuleId]: { + * [parentModuleId]: ParentModule + * } + * } + * + * @param modules Array + * @return ModuleUsageMap + */ +const buildModuleUsageMap = ( + chunks: Array, + modules: Array +): ModuleUsageMap => { + // build a map of all modules with their parent + // { + // [childModuleId]: { + // [parentModuleId]: ParentModule + // } + // } + // + const moduleUsageMap: ModuleUsageMap = modules.reduce( + (memo, module: Module) => { + module.dependencies.forEach(dependency => { + const dependentModule = dependency.module + + if (!dependentModule) { + return + } + if (typeof memo[dependentModule.id] === 'undefined') { + memo[dependentModule.id] = {} // eslint-disable-line no-param-reassign + } + memo[dependentModule.id][module.id] = module // eslint-disable-line no-param-reassign + }) + return memo + }, + {} + ) + + // build a map of all chunks with their modules + // { + // [chunkId]: { + // [moduleId]: Module + // } + // } + const chunkModuleMap: ModuleUsageMap = chunks.reduce((memo, chunk: Chunk) => { + // build chunk map first to get also empty chunks (without modules) + memo[chunk.id] = {} // eslint-disable-line no-param-reassign + return memo + }, {}) + modules.reduce((memo, module: Module) => { + module.getChunks().forEach((chunk: Chunk) => { + memo[chunk.id][module.id] = module // eslint-disable-line no-param-reassign + }) + return memo + }, chunkModuleMap) + + // detect modules with code split points (e.g. require.ensure) and enhance moduleUsageMap with that information + modules.forEach((module: Module) => { + module.blocks // chunkGroup can be invalid in in some cases + .filter(block => block.chunkGroup != null) + .forEach(block => { + // loop through all generated chunks by this module + block.chunkGroup.chunks.map(getId).forEach(chunkId => { + // and mark all modules of this chunk as a direct dependency of the original module + Object.values(chunkModuleMap[chunkId] as ModuleMap).forEach( + (childModule: any) => { + if (typeof moduleUsageMap[childModule.id] === 'undefined') { + moduleUsageMap[childModule.id] = {} + } + moduleUsageMap[childModule.id][module.id] = module + } + ) + }) + }) + }) + + return moduleUsageMap +} + +/** + * Builds a list with ids of all affected modules in the following way: + * - affected directly by a file change + * - affected indirectly by a change of it's dependencies and so on + * + * @param chunks Array + * @param modules Array + * @return {Array.} + */ +export default function getAffectedModuleIds( + chunks: Array, + modules: Array +): Array { + const moduleMap: ModuleMap = buildModuleMap(modules) + const moduleUsageMap: ModuleUsageMap = buildModuleUsageMap(chunks, modules) + + const builtModules = modules.filter(isBuilt) + const affectedMap: ModuleMap = {} + builtModules.forEach((module: Module) => + affectedModules(moduleMap, moduleUsageMap, affectedMap, module.id) + ) + + return Object.values(affectedMap).map(getId) +} diff --git a/src/webpack/util/webpack4GetBuildStats.ts b/src/webpack/util/webpack4GetBuildStats.ts new file mode 100644 index 0000000..22d7d27 --- /dev/null +++ b/src/webpack/util/webpack4GetBuildStats.ts @@ -0,0 +1,55 @@ +import path from 'path' +import { Stats } from 'webpack' +import sortChunks from './sortChunks' +import getAffectedModuleIds from './webpack4GetAffectedModuleIds' +import { Chunk, Module } from '../types' + +export type BuildStats = { + affectedModules: Array + affectedFiles: Array + entries: Array +} + +export default function getBuildStats( + stats: Stats, + outputPath: string +): BuildStats { + const { chunks, chunkGroups, modules } = stats.compilation + + const sortedChunks = sortChunks(chunks, chunkGroups) + const affectedModules = getAffectedModuleIds(chunks, modules) + + const entries = [] + const js = [] + const pathHelper = f => path.join(outputPath, f) + + sortedChunks.forEach((chunk: Chunk) => { + const files = Array.isArray(chunk.files) ? chunk.files : [chunk.files] + + if (chunk.isOnlyInitial()) { + // only entry files + const entry = files[0] + entries.push(entry) + } + + if ( + chunk + .getModules() + .some((module: Module) => affectedModules.indexOf(module.id) !== -1) + ) { + files.forEach(file => { + if (/\.js$/.test(file)) { + js.push(file) + } + }) + } + }) + + const buildStats: BuildStats = { + affectedModules, + affectedFiles: js.map(pathHelper), + entries: entries.map(pathHelper) + } + + return buildStats +} From 6038a1aea72399c660a9d2987eb13c0c10a8360c Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Wed, 12 May 2021 17:22:11 +0800 Subject: [PATCH 32/37] ci: add webpack 4 tests --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 9768710..ef89e76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,12 +20,16 @@ install: - yarn install --immutable env: + - WEBPACK_VERSION=4 MOCHA_VERSION=7 + - WEBPACK_VERSION=4 MOCHA_VERSION=8 - WEBPACK_VERSION=5 MOCHA_VERSION=7 - WEBPACK_VERSION=5 MOCHA_VERSION=8 before_script: - "yarn add -D webpack@$WEBPACK_VERSION" - "yarn add -D mocha@$MOCHA_VERSION" + # Need to skip ts check for getAffectedModuleIds in webpack 4 + - test WEBPACK_VERSION = 4 && echo -e "// @ts-nocheck\n$(cat src/webpack/util/getAffectedModuleIds.ts)" > src/webpack/util/getAffectedModuleIds.ts script: - yarn run cover From a630b525d3e9d1ec2c32e15c05d6727200c9bd90 Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Wed, 12 May 2021 17:31:12 +0800 Subject: [PATCH 33/37] ci: fix travis config --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ef89e76..02a50d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,10 @@ before_script: - "yarn add -D webpack@$WEBPACK_VERSION" - "yarn add -D mocha@$MOCHA_VERSION" # Need to skip ts check for getAffectedModuleIds in webpack 4 - - test WEBPACK_VERSION = 4 && echo -e "// @ts-nocheck\n$(cat src/webpack/util/getAffectedModuleIds.ts)" > src/webpack/util/getAffectedModuleIds.ts + - | + if [ $WEBPACK_VERSION == 4 ]; then + echo -e "// @ts-nocheck\n$(cat src/webpack/util/getAffectedModuleIds.ts)" > src/webpack/util/getAffectedModuleIds.ts; + fi script: - yarn run cover From c5dd854ccdc521bfe3ab6f8c013dedf4f5301735 Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Wed, 12 May 2021 18:27:30 +0800 Subject: [PATCH 34/37] ci: fix eslint errors, etc. --- .travis.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 02a50d9..f31acd8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,10 +28,15 @@ env: before_script: - "yarn add -D webpack@$WEBPACK_VERSION" - "yarn add -D mocha@$MOCHA_VERSION" + # Need to skip ts check for getAffectedModuleIds in webpack 4 - | if [ $WEBPACK_VERSION == 4 ]; then - echo -e "// @ts-nocheck\n$(cat src/webpack/util/getAffectedModuleIds.ts)" > src/webpack/util/getAffectedModuleIds.ts; + echo -e "// @ts-nocheck\n/*eslint-disable*/\n$(cat src/webpack/util/getAffectedModuleIds.ts)" > src/webpack/util/getAffectedModuleIds.ts; + fi + - | + if [ $WEBPACK_VERSION == 5 ]; then + echo -e "// @ts-nocheck\n$(cat src/webpack/util/webpack4GetBuildStats.ts)" > src/webpack/util/webpack4GetBuildStats.ts; fi script: From 4ebefa1c56e137aca0e14b01a57ceaddc9de4897 Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Wed, 12 May 2021 18:42:43 +0800 Subject: [PATCH 35/37] chore: allow webpack 4 as peer dependency --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 90830f5..7de4d8a 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "license": "MIT", "peerDependencies": { "mocha": ">=6 <9", - "webpack": "^5.0.0" + "webpack": "^4.0.0 || ^5.0.0" }, "devDependencies": { "@babel/cli": "^7.0.0", From 1c66b127e3b7b76986d04ebd64425d66b37f8a62 Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Wed, 12 May 2021 18:43:37 +0800 Subject: [PATCH 36/37] ci: add mocha 6 test back --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index f31acd8..c080064 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,7 @@ install: - yarn install --immutable env: + - WEBPACK_VERSION=4 MOCHA_VERSION=6 - WEBPACK_VERSION=4 MOCHA_VERSION=7 - WEBPACK_VERSION=4 MOCHA_VERSION=8 - WEBPACK_VERSION=5 MOCHA_VERSION=7 From b30cc73e6df3ae7179566a641c9760093b3d22df Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Wed, 12 May 2021 19:03:27 +0800 Subject: [PATCH 37/37] chore: lockfile maintenance --- yarn.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index b437635..ef81f24 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8507,7 +8507,7 @@ fsevents@^1.2.7: yargs: 14.0.0 peerDependencies: mocha: ">=6 <9" - webpack: ^5.0.0 + webpack: ^4.0.0 || ^5.0.0 bin: mochapack: ./bin/mochapack languageName: unknown