diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 567c386d..6111dfa5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -58,5 +58,24 @@ jobs: pat: ${{ secrets.VS_MARKETPLACE_TOKEN }} registryUrl: https://marketplace.visualstudio.com extensionFile: ${{ steps.publishToOpenVSX.outputs.vsixPath }} - packagePath: '' yarn: true + + - name: Compute pre-release versions + id: pre-release-versions + run: | + echo MARKETPLACE=`node -e "console.log(JSON.parse(require('child_process').execFileSync(process.execPath, ['node_modules/vsce/vsce', 'show', 'gregoire.dance', '--json'], { encoding: 'utf8' })).versions[0].version)"` >> "$GITHUB_OUTPUT" + echo LOCAL=`node -e "console.log(/[0-9]+.[0-9]+.[0-9]+/.exec(require('./package.json').scripts['package:pre'])[0])"` >> "$GITHUB_OUTPUT" + + - name: Build pre-release .vsix + run: yarn run package:pre + if: ${{ steps.pre-release-versions.outputs.MARKETPLACE != steps.pre-release-versions.outputs.LOCAL }} + + - name: Publish pre-release to Visual Studio Marketplace + uses: HaaLeo/publish-vscode-extension@8dd35ed51f326dfb0a3e9cfc6baeca81781229fc + if: ${{ steps.pre-release-versions.outputs.MARKETPLACE != steps.pre-release-versions.outputs.LOCAL }} + with: + pat: ${{ secrets.VS_MARKETPLACE_TOKEN }} + registryUrl: https://marketplace.visualstudio.com + extensionFile: dance-${{ steps.pre-release-versions.outputs.LOCAL }}.vsix + yarn: true + preRelease: true diff --git a/.vscodeignore b/.vscodeignore index f9df9146..ca3414e6 100644 --- a/.vscodeignore +++ b/.vscodeignore @@ -1,13 +1,11 @@ -.github/** -.vscode/** -.vscode-test*/** -assets/dance.afdesign -src/** -test/** -.gitignore -**/tsconfig.json -**/tslint.json -**/*.map -**/*.ts -**/*.lock -out/**/*.build.js +* +*/ +assets/* +out/* + +!LICENSE +!README.md +!package.json +!assets/*.{svg,png} +!out/extension.js +!out/web-extension.js diff --git a/meta.ts b/meta.ts index 1ba8aae1..0a1723d6 100644 --- a/meta.ts +++ b/meta.ts @@ -1,7 +1,7 @@ -import * as assert from "assert"; -import * as fs from "fs/promises"; -import * as G from "glob"; -import * as path from "path"; +import assert from "assert"; +import G from "glob"; +import * as fs from "fs/promises"; +import * as path from "path"; const verbose = process.argv.includes("--verbose"); @@ -290,12 +290,6 @@ function parseDocComments(code: string, modulePath: string) { } as Builder.ParsedModule; } -/** - * Keys available for binding as the system clipboard register. - * These are available in addition to the default `"` and `null` - */ -export const availableClipboardRegisters = [..."befgijklmnopqrtvwxyz", "*", "+"]; - /** * Mapping from character to corresponding VS Code keybinding. */ diff --git a/package.build.ts b/package.build.ts index 802c7e5b..20e3f3c0 100644 --- a/package.build.ts +++ b/package.build.ts @@ -1,9 +1,13 @@ import type { Builder } from "./meta"; -import { availableClipboardRegisters } from "./meta"; +import { availableClipboardRegisters } from "./src/utils/constants"; // Shared values // ============================================================================ +const esbuildBase = "esbuild src/extension.ts --bundle --external:vscode --external:child_process --target=es2021 --format=cjs --minify --keep-names"; +const esbuildNode = `${esbuildBase} --outfile=out/extension.js`; +const esbuildWeb = `${esbuildBase} --outfile=out/web-extension.js --define:process.platform=\\"web\\" --define:process.env={}`; + const commandType = { type: "array", items: { @@ -18,8 +22,6 @@ const commandType = { }, }; - - const builtinModesAreDeprecatedMessage = "Built-in modes are deprecated. Use `#dance.modes#` instead."; @@ -80,7 +82,7 @@ const selectionDecorationType = { // ============================================================================ const version = "0.5.12", - preRelease = 2; + preRelease = 4; export const pkg = (modules: Builder.ParsedModule[]) => ({ @@ -102,26 +104,32 @@ export const pkg = (modules: Builder.ParsedModule[]) => ({ url: "https://github.com/71/dance.git", }, - main: "./out/src/extension.js", - browser: "./out/web/extension.js", + main: "./out/extension.js", + browser: "./out/web-extension.js", engines: { vscode: "^1.63.0", }, scripts: { - "check": "eslint . && depcruise -v .dependency-cruiser.js src", + "check": "tsc -p ./ && eslint . && depcruise -v .dependency-cruiser.js src", "format": "eslint . --fix", + "generate": "ts-node ./meta.ts", "generate:watch": "ts-node ./meta.ts --watch", + + "compile": esbuildNode, + "compile:watch": `${esbuildNode} --watch --sourcemap`, + "compile-web": esbuildWeb, + "compile-web:watch": `${esbuildWeb} --watch --sourcemap`, + "compile-tests": "glob-exec {src,test}/**/*.ts -- \"esbuild {{files.join(' ')}} --target=es2021 --format=cjs --outdir=out --outbase=. --sourcemap\"", + + "test": "yarn run compile --sourcemap && yarn run compile-tests && node ./out/test/run.js", + "vscode:prepublish": "yarn run generate && yarn run compile && yarn run compile-web", - "compile": "tsc -p ./", - "compile:watch": "tsc -watch -p ./", - "compile-web": "webpack --mode production --devtool hidden-source-map --config ./webpack.web.config.js", - "compile-web:watch": "webpack --watch --config ./webpack.web.config.js", - "test": "yarn run compile && node ./out/test/run.js", "package": "vsce package --allow-star-activation", "publish": "vsce publish --allow-star-activation", + "package:pre": `vsce package --allow-star-activation --pre-release --no-git-tag-version --no-update-package-json ${version.replace(/\d+$/, "$&" + preRelease.toString().padStart(3, "0"))}`, "publish:pre": `vsce publish --allow-star-activation --pre-release --no-git-tag-version --no-update-package-json ${version.replace(/\d+$/, "$&" + preRelease.toString().padStart(3, "0"))}`, }, @@ -135,8 +143,10 @@ export const pkg = (modules: Builder.ParsedModule[]) => ({ "@vscode/test-electron": "^2.1.3", "chokidar": "^3.5.3", "dependency-cruiser": "^11.7.0", + "esbuild": "^0.18.4", "eslint": "^8.15.0", "glob": "^8.0.3", + "glob-exec": "^0.1.1", "mocha": "^10.0.0", "source-map-support": "^0.5.21", "ts-loader": "^9.3.1", @@ -145,8 +155,6 @@ export const pkg = (modules: Builder.ParsedModule[]) => ({ "unexpected": "^13.0.0", "vsce": "^2.7.0", "web-tree-sitter": "^0.20.8", - "webpack": "^5.72.1", - "webpack-cli": "^4.9.2", "yaml": "^2.1.1", }, diff --git a/package.json b/package.json index 820fe46e..e5877e9f 100644 --- a/package.json +++ b/package.json @@ -11,25 +11,27 @@ "type": "git", "url": "https://github.com/71/dance.git" }, - "main": "./out/src/extension.js", - "browser": "./out/web/extension.js", + "main": "./out/extension.js", + "browser": "./out/web-extension.js", "engines": { "vscode": "^1.63.0" }, "scripts": { - "check": "eslint . && depcruise -v .dependency-cruiser.js src", + "check": "tsc -p ./ && eslint . && depcruise -v .dependency-cruiser.js src", "format": "eslint . --fix", "generate": "ts-node ./meta.ts", "generate:watch": "ts-node ./meta.ts --watch", + "compile": "esbuild src/extension.ts --bundle --external:vscode --external:child_process --target=es2021 --format=cjs --minify --keep-names --outfile=out/extension.js", + "compile:watch": "esbuild src/extension.ts --bundle --external:vscode --external:child_process --target=es2021 --format=cjs --minify --keep-names --outfile=out/extension.js --watch --sourcemap", + "compile-web": "esbuild src/extension.ts --bundle --external:vscode --external:child_process --target=es2021 --format=cjs --minify --keep-names --outfile=out/web-extension.js --define:process.platform=\\\"web\\\" --define:process.env={}", + "compile-web:watch": "esbuild src/extension.ts --bundle --external:vscode --external:child_process --target=es2021 --format=cjs --minify --keep-names --outfile=out/web-extension.js --define:process.platform=\\\"web\\\" --define:process.env={} --watch --sourcemap", + "compile-tests": "glob-exec {src,test}/**/*.ts -- \"esbuild {{files.join(' ')}} --target=es2021 --format=cjs --outdir=out --outbase=. --sourcemap\"", + "test": "yarn run compile --sourcemap && yarn run compile-tests && node ./out/test/run.js", "vscode:prepublish": "yarn run generate && yarn run compile && yarn run compile-web", - "compile": "tsc -p ./", - "compile:watch": "tsc -watch -p ./", - "compile-web": "webpack --mode production --devtool hidden-source-map --config ./webpack.web.config.js", - "compile-web:watch": "webpack --watch --config ./webpack.web.config.js", - "test": "yarn run compile && node ./out/test/run.js", "package": "vsce package --allow-star-activation", "publish": "vsce publish --allow-star-activation", - "publish:pre": "vsce publish --allow-star-activation --pre-release --no-git-tag-version --no-update-package-json 0.5.12002" + "package:pre": "vsce package --allow-star-activation --pre-release --no-git-tag-version --no-update-package-json 0.5.12004", + "publish:pre": "vsce publish --allow-star-activation --pre-release --no-git-tag-version --no-update-package-json 0.5.12004" }, "devDependencies": { "@types/glob": "^7.2.0", @@ -41,8 +43,10 @@ "@vscode/test-electron": "^2.1.3", "chokidar": "^3.5.3", "dependency-cruiser": "^11.7.0", + "esbuild": "^0.18.4", "eslint": "^8.15.0", "glob": "^8.0.3", + "glob-exec": "^0.1.1", "mocha": "^10.0.0", "source-map-support": "^0.5.21", "ts-loader": "^9.3.1", @@ -51,8 +55,6 @@ "unexpected": "^13.0.0", "vsce": "^2.7.0", "web-tree-sitter": "^0.20.8", - "webpack": "^5.72.1", - "webpack-cli": "^4.9.2", "yaml": "^2.1.1" }, "displayName": "Dance", diff --git a/src/api/edit/index.ts b/src/api/edit/index.ts index c6b3fdf5..61ed93c4 100644 --- a/src/api/edit/index.ts +++ b/src/api/edit/index.ts @@ -173,7 +173,7 @@ export function insert( ); } -export declare namespace insert { +export /* enum */ namespace insert { /** * Insertion flags for {@link insert}. */ @@ -218,7 +218,9 @@ export declare namespace insert { */ Extend = 0b10_00_1, } +} +export declare namespace insert { /** * The result of a callback passed to {@link insert} or * {@link insertByIndex}. diff --git a/src/commands/index.ts b/src/commands/index.ts index dabec9e3..c72d20de 100644 --- a/src/commands/index.ts +++ b/src/commands/index.ts @@ -155,7 +155,7 @@ export class CommandDescriptor ${call})`; } - return `(${inputParameters.join(", ")}) => _.runAsync((_) => ${call})`; + return `(${inputParameters.join(", ")}) => _.runAsync(async (_) => await ${call})`; } function determineFunctionFlags(f: Builder.ParsedFunction) { diff --git a/src/commands/load-all.ts b/src/commands/load-all.ts index bd3606a8..73d735d5 100644 --- a/src/commands/load-all.ts +++ b/src/commands/load-all.ts @@ -278,427 +278,427 @@ export const commands: Commands = function () { const commands = { "dance.cancel": new CommandDescriptor( "dance.cancel", - (_) => _.runAsync((_) => cancel(_.extension)), + (_) => _.runAsync(async (_) => await cancel(_.extension)), CommandDescriptor.Flags.None, ), "dance.changeInput": new CommandDescriptor( "dance.changeInput", - (_, argument) => _.runAsync((_) => changeInput(argument["action"])), + (_, argument) => _.runAsync(async (_) => await changeInput(argument["action"])), CommandDescriptor.Flags.DoNotReplay, ), "dance.dev.copyLastErrorMessage": new CommandDescriptor( "dance.dev.copyLastErrorMessage", - (_) => _.runAsync((_) => dev_copyLastErrorMessage(_.extension)), + (_) => _.runAsync(async (_) => await dev_copyLastErrorMessage(_.extension)), CommandDescriptor.Flags.None, ), "dance.dev.setSelectionBehavior": new CommandDescriptor( "dance.dev.setSelectionBehavior", - (_, argument) => _.runAsync((_) => dev_setSelectionBehavior(_, _.extension, argument["mode"], argument["value"])), + (_, argument) => _.runAsync(async (_) => await dev_setSelectionBehavior(_, _.extension, argument["mode"], argument["value"])), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.edit.align": new CommandDescriptor( "dance.edit.align", - (_, argument) => _.runAsync((_) => edit_align(_, argument["fill"])), + (_, argument) => _.runAsync(async (_) => await edit_align(_, argument["fill"])), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.edit.case.swap": new CommandDescriptor( "dance.edit.case.swap", - (_) => _.runAsync((_) => edit_case_swap(_)), + (_) => _.runAsync(async (_) => await edit_case_swap(_)), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.edit.case.toLower": new CommandDescriptor( "dance.edit.case.toLower", - (_) => _.runAsync((_) => edit_case_toLower(_)), + (_) => _.runAsync(async (_) => await edit_case_toLower(_)), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.edit.case.toUpper": new CommandDescriptor( "dance.edit.case.toUpper", - (_) => _.runAsync((_) => edit_case_toUpper(_)), + (_) => _.runAsync(async (_) => await edit_case_toUpper(_)), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.edit.copyIndentation": new CommandDescriptor( "dance.edit.copyIndentation", - (_, argument) => _.runAsync((_) => edit_copyIndentation(_, _.document, _.selections, getCount(_, argument))), + (_, argument) => _.runAsync(async (_) => await edit_copyIndentation(_, _.document, _.selections, getCount(_, argument))), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.edit.deindent": new CommandDescriptor( "dance.edit.deindent", - (_, argument) => _.runAsync((_) => edit_deindent(_, getRepetitions(_, argument))), + (_, argument) => _.runAsync(async (_) => await edit_deindent(_, getRepetitions(_, argument))), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.edit.deindent.withIncomplete": new CommandDescriptor( "dance.edit.deindent.withIncomplete", - (_, argument) => _.runAsync((_) => edit_deindent_withIncomplete(_, getRepetitions(_, argument))), + (_, argument) => _.runAsync(async (_) => await edit_deindent_withIncomplete(_, getRepetitions(_, argument))), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.edit.indent": new CommandDescriptor( "dance.edit.indent", - (_, argument) => _.runAsync((_) => edit_indent(_, getRepetitions(_, argument))), + (_, argument) => _.runAsync(async (_) => await edit_indent(_, getRepetitions(_, argument))), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.edit.indent.withEmpty": new CommandDescriptor( "dance.edit.indent.withEmpty", - (_, argument) => _.runAsync((_) => edit_indent_withEmpty(_, getRepetitions(_, argument))), + (_, argument) => _.runAsync(async (_) => await edit_indent_withEmpty(_, getRepetitions(_, argument))), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.edit.insert": new CommandDescriptor( "dance.edit.insert", - (_, argument) => _.runAsync((_) => edit_insert(_, _.selections, getRegister(_, argument, "dquote", Register.Flags.CanRead), argument["adjust"], argument["all"], argument["handleNewLine"], getRepetitions(_, argument), getShift(argument), argument["text"], argument["where"])), + (_, argument) => _.runAsync(async (_) => await edit_insert(_, _.selections, getRegister(_, argument, "dquote", Register.Flags.CanRead), argument["adjust"], argument["all"], argument["handleNewLine"], getRepetitions(_, argument), getShift(argument), argument["text"], argument["where"])), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.edit.join": new CommandDescriptor( "dance.edit.join", - (_, argument) => _.runAsync((_) => edit_join(_, argument["separator"])), + (_, argument) => _.runAsync(async (_) => await edit_join(_, argument["separator"])), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.edit.join.select": new CommandDescriptor( "dance.edit.join.select", - (_, argument) => _.runAsync((_) => edit_join_select(_, argument["separator"])), + (_, argument) => _.runAsync(async (_) => await edit_join_select(_, argument["separator"])), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.edit.newLine.above": new CommandDescriptor( "dance.edit.newLine.above", - (_, argument) => _.runAsync((_) => edit_newLine_above(_, getRepetitions(_, argument), getShift(argument))), + (_, argument) => _.runAsync(async (_) => await edit_newLine_above(_, getRepetitions(_, argument), getShift(argument))), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.edit.newLine.below": new CommandDescriptor( "dance.edit.newLine.below", - (_, argument) => _.runAsync((_) => edit_newLine_below(_, getRepetitions(_, argument), getShift(argument))), + (_, argument) => _.runAsync(async (_) => await edit_newLine_below(_, getRepetitions(_, argument), getShift(argument))), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.edit.replaceCharacters": new CommandDescriptor( "dance.edit.replaceCharacters", - (_, argument) => _.runAsync((_) => edit_replaceCharacters(_, getRepetitions(_, argument), getInputOr("input", argument))), + (_, argument) => _.runAsync(async (_) => await edit_replaceCharacters(_, getRepetitions(_, argument), getInputOr("input", argument))), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.history.recording.play": new CommandDescriptor( "dance.history.recording.play", - (_, argument) => _.runAsync((_) => history_recording_play(_, getRepetitions(_, argument), getRegister(_, argument, "arobase", Register.Flags.CanReadWriteMacros))), + (_, argument) => _.runAsync(async (_) => await history_recording_play(_, getRepetitions(_, argument), getRegister(_, argument, "arobase", Register.Flags.CanReadWriteMacros))), CommandDescriptor.Flags.DoNotReplay, ), "dance.history.recording.start": new CommandDescriptor( "dance.history.recording.start", - (_, argument) => _.runAsync((_) => history_recording_start(_, getRegister(_, argument, "arobase", Register.Flags.CanReadWriteMacros))), + (_, argument) => _.runAsync(async (_) => await history_recording_start(_, getRegister(_, argument, "arobase", Register.Flags.CanReadWriteMacros))), CommandDescriptor.Flags.RequiresActiveEditor | CommandDescriptor.Flags.DoNotReplay, ), "dance.history.recording.stop": new CommandDescriptor( "dance.history.recording.stop", - (_, argument) => _.runAsync((_) => history_recording_stop(_, getRegister(_, argument, "arobase", Register.Flags.CanReadWriteMacros))), + (_, argument) => _.runAsync(async (_) => await history_recording_stop(_, getRegister(_, argument, "arobase", Register.Flags.CanReadWriteMacros))), CommandDescriptor.Flags.RequiresActiveEditor | CommandDescriptor.Flags.DoNotReplay, ), "dance.history.redo": new CommandDescriptor( "dance.history.redo", - (_) => _.runAsync((_) => history_redo()), + (_) => _.runAsync(async (_) => await history_redo()), CommandDescriptor.Flags.None, ), "dance.history.redo.selections": new CommandDescriptor( "dance.history.redo.selections", - (_) => _.runAsync((_) => history_redo_selections()), + (_) => _.runAsync(async (_) => await history_redo_selections()), CommandDescriptor.Flags.None, ), "dance.history.repeat": new CommandDescriptor( "dance.history.repeat", - (_, argument) => _.runAsync((_) => history_repeat(_, getRepetitions(_, argument), argument["filter"])), + (_, argument) => _.runAsync(async (_) => await history_repeat(_, getRepetitions(_, argument), argument["filter"])), CommandDescriptor.Flags.RequiresActiveEditor | CommandDescriptor.Flags.DoNotReplay, ), "dance.history.repeat.edit": new CommandDescriptor( "dance.history.repeat.edit", - (_, argument) => _.runAsync((_) => history_repeat_edit(_, getRepetitions(_, argument))), + (_, argument) => _.runAsync(async (_) => await history_repeat_edit(_, getRepetitions(_, argument))), CommandDescriptor.Flags.RequiresActiveEditor | CommandDescriptor.Flags.DoNotReplay, ), "dance.history.undo": new CommandDescriptor( "dance.history.undo", - (_) => _.runAsync((_) => history_undo()), + (_) => _.runAsync(async (_) => await history_undo()), CommandDescriptor.Flags.None, ), "dance.history.undo.selections": new CommandDescriptor( "dance.history.undo.selections", - (_) => _.runAsync((_) => history_undo_selections()), + (_) => _.runAsync(async (_) => await history_undo_selections()), CommandDescriptor.Flags.None, ), "dance.ifEmpty": new CommandDescriptor( "dance.ifEmpty", - (_, argument) => _.runAsync((_) => ifEmpty(_, argument, _.selections, argument["then"], argument["otherwise"])), + (_, argument) => _.runAsync(async (_) => await ifEmpty(_, argument, _.selections, argument["then"], argument["otherwise"])), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.ignore": new CommandDescriptor( "dance.ignore", - (_) => _.runAsync((_) => ignore()), + (_) => _.runAsync(async (_) => await ignore()), CommandDescriptor.Flags.None, ), "dance.keybindings.setup": new CommandDescriptor( "dance.keybindings.setup", - (_, argument) => _.runAsync((_) => keybindings_setup(_, getRegister(_, argument, "dquote", Register.Flags.CanWrite))), + (_, argument) => _.runAsync(async (_) => await keybindings_setup(_, getRegister(_, argument, "dquote", Register.Flags.CanWrite))), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.modes.set": new CommandDescriptor( "dance.modes.set", - (_, argument) => _.runAsync((_) => modes_set(_, getInputOr("mode", argument))), + (_, argument) => _.runAsync(async (_) => await modes_set(_, getInputOr("mode", argument))), CommandDescriptor.Flags.RequiresActiveEditor | CommandDescriptor.Flags.DoNotReplay, ), "dance.modes.set.temporarily": new CommandDescriptor( "dance.modes.set.temporarily", - (_, argument) => _.runAsync((_) => modes_set_temporarily(_, getInputOr("mode", argument), getRepetitions(_, argument))), + (_, argument) => _.runAsync(async (_) => await modes_set_temporarily(_, getInputOr("mode", argument), getRepetitions(_, argument))), CommandDescriptor.Flags.RequiresActiveEditor | CommandDescriptor.Flags.DoNotReplay, ), "dance.openMenu": new CommandDescriptor( "dance.openMenu", - (_, argument) => _.runAsync((_) => openMenu(_, getInputOr("menu", argument), argument["prefix"], argument["pass"], argument["locked"], argument["delay"], argument["title"])), + (_, argument) => _.runAsync(async (_) => await openMenu(_, getInputOr("menu", argument), argument["prefix"], argument["pass"], argument["locked"], argument["delay"], argument["title"])), CommandDescriptor.Flags.DoNotReplay, ), "dance.run": new CommandDescriptor( "dance.run", - (_, argument) => _.runAsync((_) => run(_, argument, getInputOr("code", argument), getCount(_, argument), getRepetitions(_, argument), getRegister(_, argument, "null", Register.Flags.None), argument["commands"])), + (_, argument) => _.runAsync(async (_) => await run(_, argument, getInputOr("code", argument), getCount(_, argument), getRepetitions(_, argument), getRegister(_, argument, "null", Register.Flags.None), argument["commands"])), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.search": new CommandDescriptor( "dance.search", - (_, argument) => _.runAsync((_) => search(_, getRegister<[Register.Flags.CanRead, Register.Flags.CanWrite]>(_, argument, "slash", Register.Flags.CanRead | Register.Flags.CanWrite), getRepetitions(_, argument), argument["add"], getDirection(argument), argument["interactive"], getShift(argument), argument)), + (_, argument) => _.runAsync(async (_) => await search(_, getRegister<[Register.Flags.CanRead, Register.Flags.CanWrite]>(_, argument, "slash", Register.Flags.CanRead | Register.Flags.CanWrite), getRepetitions(_, argument), argument["add"], getDirection(argument), argument["interactive"], getShift(argument), argument)), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.search.next": new CommandDescriptor( "dance.search.next", - (_, argument) => _.runAsync((_) => search_next(_, _.document, getRegister(_, argument, "slash", Register.Flags.CanRead), getRepetitions(_, argument), argument["add"], getDirection(argument))), + (_, argument) => _.runAsync(async (_) => await search_next(_, _.document, getRegister(_, argument, "slash", Register.Flags.CanRead), getRepetitions(_, argument), argument["add"], getDirection(argument))), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.search.selection": new CommandDescriptor( "dance.search.selection", - (_, argument) => _.runAsync((_) => search_selection(_.document, _.selections, getRegister(_, argument, "slash", Register.Flags.CanWrite), argument["smart"])), + (_, argument) => _.runAsync(async (_) => await search_selection(_.document, _.selections, getRegister(_, argument, "slash", Register.Flags.CanWrite), argument["smart"])), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.seek": new CommandDescriptor( "dance.seek", - (_, argument) => _.runAsync((_) => seek(_, getInputOr("input", argument), getRepetitions(_, argument), getDirection(argument), getShift(argument), argument["include"])), + (_, argument) => _.runAsync(async (_) => await seek(_, getInputOr("input", argument), getRepetitions(_, argument), getDirection(argument), getShift(argument), argument["include"])), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.seek.enclosing": new CommandDescriptor( "dance.seek.enclosing", - (_, argument) => _.runAsync((_) => seek_enclosing(_, getDirection(argument), getShift(argument), argument["open"], argument["pairs"])), + (_, argument) => _.runAsync(async (_) => await seek_enclosing(_, getDirection(argument), getShift(argument), argument["open"], argument["pairs"])), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.seek.leap": new CommandDescriptor( "dance.seek.leap", - (_, argument) => _.runAsync((_) => seek_leap(_, getDirection(argument), argument["labels"])), + (_, argument) => _.runAsync(async (_) => await seek_leap(_, getDirection(argument), argument["labels"])), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.seek.object": new CommandDescriptor( "dance.seek.object", - (_, argument) => _.runAsync((_) => seek_object(_, getInputOr("input", argument), argument["inner"], argument["where"], getShift(argument))), + (_, argument) => _.runAsync(async (_) => await seek_object(_, getInputOr("input", argument), argument["inner"], argument["where"], getShift(argument))), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.seek.syntax.experimental": new CommandDescriptor( "dance.seek.syntax.experimental", - (_, argument) => _.runAsync((_) => _.extension.treeSitterOrThrow().withDocumentTree(_.document, (documentTree) => seek_syntax_experimental(_, _.extension.treeSitterOrThrow(), documentTree, argument["where"]))), + (_, argument) => _.runAsync(async (_) => await _.extension.treeSitterOrThrow().withDocumentTree(_.document, (documentTree) => seek_syntax_experimental(_, _.extension.treeSitterOrThrow(), documentTree, argument["where"]))), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.seek.word": new CommandDescriptor( "dance.seek.word", - (_, argument) => _.runAsync((_) => seek_word(_, getRepetitions(_, argument), argument["stopAtEnd"], argument["ws"], getDirection(argument), getShift(argument))), + (_, argument) => _.runAsync(async (_) => await seek_word(_, getRepetitions(_, argument), argument["stopAtEnd"], argument["ws"], getDirection(argument), getShift(argument))), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.select.buffer": new CommandDescriptor( "dance.select.buffer", - (_) => _.runAsync((_) => select_buffer(_)), + (_) => _.runAsync(async (_) => await select_buffer(_)), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.select.firstVisibleLine": new CommandDescriptor( "dance.select.firstVisibleLine", - (_, argument) => _.runAsync((_) => select_firstVisibleLine(_, getShift(argument))), + (_, argument) => _.runAsync(async (_) => await select_firstVisibleLine(_, getShift(argument))), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.select.horizontally": new CommandDescriptor( "dance.select.horizontally", - (_, argument) => _.runAsync((_) => select_horizontally(_, argument["avoidEol"], getRepetitions(_, argument), getDirection(argument), getShift(argument))), + (_, argument) => _.runAsync(async (_) => await select_horizontally(_, argument["avoidEol"], getRepetitions(_, argument), getDirection(argument), getShift(argument))), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.select.lastLine": new CommandDescriptor( "dance.select.lastLine", - (_, argument) => _.runAsync((_) => select_lastLine(_, _.document, getShift(argument))), + (_, argument) => _.runAsync(async (_) => await select_lastLine(_, _.document, getShift(argument))), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.select.lastVisibleLine": new CommandDescriptor( "dance.select.lastVisibleLine", - (_, argument) => _.runAsync((_) => select_lastVisibleLine(_, getShift(argument))), + (_, argument) => _.runAsync(async (_) => await select_lastVisibleLine(_, getShift(argument))), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.select.line.above": new CommandDescriptor( "dance.select.line.above", - (_, argument) => _.runAsync((_) => select_line_above(_, getCount(_, argument))), + (_, argument) => _.runAsync(async (_) => await select_line_above(_, getCount(_, argument))), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.select.line.above.extend": new CommandDescriptor( "dance.select.line.above.extend", - (_, argument) => _.runAsync((_) => select_line_above_extend(_, getCount(_, argument))), + (_, argument) => _.runAsync(async (_) => await select_line_above_extend(_, getCount(_, argument))), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.select.line.below": new CommandDescriptor( "dance.select.line.below", - (_, argument) => _.runAsync((_) => select_line_below(_, getCount(_, argument))), + (_, argument) => _.runAsync(async (_) => await select_line_below(_, getCount(_, argument))), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.select.line.below.extend": new CommandDescriptor( "dance.select.line.below.extend", - (_, argument) => _.runAsync((_) => select_line_below_extend(_, getCount(_, argument))), + (_, argument) => _.runAsync(async (_) => await select_line_below_extend(_, getCount(_, argument))), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.select.lineEnd": new CommandDescriptor( "dance.select.lineEnd", - (_, argument) => _.runAsync((_) => select_lineEnd(_, getCount(_, argument), getShift(argument), argument["lineBreak"])), + (_, argument) => _.runAsync(async (_) => await select_lineEnd(_, getCount(_, argument), getShift(argument), argument["lineBreak"])), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.select.lineStart": new CommandDescriptor( "dance.select.lineStart", - (_, argument) => _.runAsync((_) => select_lineStart(_, getCount(_, argument), getShift(argument), argument["skipBlank"])), + (_, argument) => _.runAsync(async (_) => await select_lineStart(_, getCount(_, argument), getShift(argument), argument["skipBlank"])), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.select.middleVisibleLine": new CommandDescriptor( "dance.select.middleVisibleLine", - (_, argument) => _.runAsync((_) => select_middleVisibleLine(_, getShift(argument))), + (_, argument) => _.runAsync(async (_) => await select_middleVisibleLine(_, getShift(argument))), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.select.to": new CommandDescriptor( "dance.select.to", - (_, argument) => _.runAsync((_) => select_to(_, getCount(_, argument), argument, getShift(argument))), + (_, argument) => _.runAsync(async (_) => await select_to(_, getCount(_, argument), argument, getShift(argument))), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.select.vertically": new CommandDescriptor( "dance.select.vertically", - (_, argument) => _.runAsync((_) => select_vertically(_, _.selections, argument["avoidEol"], getRepetitions(_, argument), getDirection(argument), getShift(argument), argument["by"])), + (_, argument) => _.runAsync(async (_) => await select_vertically(_, _.selections, argument["avoidEol"], getRepetitions(_, argument), getDirection(argument), getShift(argument), argument["by"])), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.selectRegister": new CommandDescriptor( "dance.selectRegister", - (_, argument) => _.runAsync((_) => selectRegister(_, getInputOr("register", argument))), + (_, argument) => _.runAsync(async (_) => await selectRegister(_, getInputOr("register", argument))), CommandDescriptor.Flags.RequiresActiveEditor | CommandDescriptor.Flags.DoNotReplay, ), "dance.selections.changeDirection": new CommandDescriptor( "dance.selections.changeDirection", - (_, argument) => _.runAsync((_) => selections_changeDirection(_, getDirection(argument))), + (_, argument) => _.runAsync(async (_) => await selections_changeDirection(_, getDirection(argument))), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.selections.changeOrder": new CommandDescriptor( "dance.selections.changeOrder", - (_, argument) => _.runAsync((_) => selections_changeOrder(_, _.selections.slice(), getDirection(argument))), + (_, argument) => _.runAsync(async (_) => await selections_changeOrder(_, _.selections.slice(), getDirection(argument))), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.selections.copy": new CommandDescriptor( "dance.selections.copy", - (_, argument) => _.runAsync((_) => selections_copy(_, _.document, _.selections, getRepetitions(_, argument), getDirection(argument))), + (_, argument) => _.runAsync(async (_) => await selections_copy(_, _.document, _.selections, getRepetitions(_, argument), getDirection(argument))), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.selections.expandToLines": new CommandDescriptor( "dance.selections.expandToLines", - (_) => _.runAsync((_) => selections_expandToLines(_)), + (_) => _.runAsync(async (_) => await selections_expandToLines(_)), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.selections.filter": new CommandDescriptor( "dance.selections.filter", - (_, argument) => _.runAsync((_) => selections_filter(_, argument, argument["defaultExpression"], argument["inverse"], argument["interactive"], getCount(_, argument))), + (_, argument) => _.runAsync(async (_) => await selections_filter(_, argument, argument["defaultExpression"], argument["inverse"], argument["interactive"], getCount(_, argument))), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.selections.merge": new CommandDescriptor( "dance.selections.merge", - (_) => _.runAsync((_) => selections_merge(_)), + (_) => _.runAsync(async (_) => await selections_merge(_)), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.selections.open": new CommandDescriptor( "dance.selections.open", - (_) => _.runAsync((_) => selections_open(_)), + (_) => _.runAsync(async (_) => await selections_open(_)), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.selections.pipe": new CommandDescriptor( "dance.selections.pipe", - (_, argument) => _.runAsync((_) => selections_pipe(_, getRegister(_, argument, "pipe", Register.Flags.CanWrite), getInputOr("expression", argument))), + (_, argument) => _.runAsync(async (_) => await selections_pipe(_, getRegister(_, argument, "pipe", Register.Flags.CanWrite), getInputOr("expression", argument))), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.selections.reduce": new CommandDescriptor( "dance.selections.reduce", - (_, argument) => _.runAsync((_) => selections_reduce(_, argument["where"], argument["empty"])), + (_, argument) => _.runAsync(async (_) => await selections_reduce(_, argument["where"], argument["empty"])), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.selections.restore": new CommandDescriptor( "dance.selections.restore", - (_, argument) => _.runAsync((_) => selections_restore(_, getRegister(_, argument, "caret", Register.Flags.CanReadSelections))), + (_, argument) => _.runAsync(async (_) => await selections_restore(_, getRegister(_, argument, "caret", Register.Flags.CanReadSelections))), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.selections.restore.withCurrent": new CommandDescriptor( "dance.selections.restore.withCurrent", - (_, argument) => _.runAsync((_) => selections_restore_withCurrent(_, _.document, getRegister(_, argument, "caret", Register.Flags.CanReadSelections), argument["reverse"], argument["action"])), + (_, argument) => _.runAsync(async (_) => await selections_restore_withCurrent(_, _.document, getRegister(_, argument, "caret", Register.Flags.CanReadSelections), argument["reverse"], argument["action"])), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.selections.rotate.both": new CommandDescriptor( "dance.selections.rotate.both", - (_, argument) => _.runAsync((_) => selections_rotate_both(_, getRepetitions(_, argument), argument["reverse"])), + (_, argument) => _.runAsync(async (_) => await selections_rotate_both(_, getRepetitions(_, argument), argument["reverse"])), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.selections.rotate.contents": new CommandDescriptor( "dance.selections.rotate.contents", - (_, argument) => _.runAsync((_) => selections_rotate_contents(_, getRepetitions(_, argument), argument["reverse"])), + (_, argument) => _.runAsync(async (_) => await selections_rotate_contents(_, getRepetitions(_, argument), argument["reverse"])), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.selections.rotate.selections": new CommandDescriptor( "dance.selections.rotate.selections", - (_, argument) => _.runAsync((_) => selections_rotate_selections(_, getRepetitions(_, argument), argument["reverse"])), + (_, argument) => _.runAsync(async (_) => await selections_rotate_selections(_, getRepetitions(_, argument), argument["reverse"])), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.selections.save": new CommandDescriptor( "dance.selections.save", - (_, argument) => _.runAsync((_) => selections_save(_, _.document, _.selections, getRegister(_, argument, "caret", Register.Flags.CanWriteSelections), argument["style"], argument["until"], argument["untilDelay"])), + (_, argument) => _.runAsync(async (_) => await selections_save(_, _.document, _.selections, getRegister(_, argument, "caret", Register.Flags.CanWriteSelections), argument["style"], argument["until"], argument["untilDelay"])), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.selections.saveText": new CommandDescriptor( "dance.selections.saveText", - (_, argument) => _.runAsync((_) => selections_saveText(_.document, _.selections, getRegister(_, argument, "dquote", Register.Flags.CanWrite))), + (_, argument) => _.runAsync(async (_) => await selections_saveText(_.document, _.selections, getRegister(_, argument, "dquote", Register.Flags.CanWrite))), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.selections.select": new CommandDescriptor( "dance.selections.select", - (_, argument) => _.runAsync((_) => selections_select(_, argument["interactive"], argument)), + (_, argument) => _.runAsync(async (_) => await selections_select(_, argument["interactive"], argument)), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.selections.sort": new CommandDescriptor( "dance.selections.sort", - (_, argument) => _.runAsync((_) => selections_sort(_, getInputOr("expression", argument), getDirection(argument))), + (_, argument) => _.runAsync(async (_) => await selections_sort(_, getInputOr("expression", argument), getDirection(argument))), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.selections.split": new CommandDescriptor( "dance.selections.split", - (_, argument) => _.runAsync((_) => selections_split(_, argument["excludeEmpty"], argument["interactive"], argument)), + (_, argument) => _.runAsync(async (_) => await selections_split(_, argument["excludeEmpty"], argument["interactive"], argument)), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.selections.splitLines": new CommandDescriptor( "dance.selections.splitLines", - (_, argument) => _.runAsync((_) => selections_splitLines(_, _.document, _.selections, getRepetitions(_, argument), argument["excludeEol"])), + (_, argument) => _.runAsync(async (_) => await selections_splitLines(_, _.document, _.selections, getRepetitions(_, argument), argument["excludeEol"])), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.selections.toggleIndices": new CommandDescriptor( "dance.selections.toggleIndices", - (_, argument) => _.runAsync((_) => selections_toggleIndices(_, argument["display"], argument["until"])), + (_, argument) => _.runAsync(async (_) => await selections_toggleIndices(_, argument["display"], argument["until"])), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.selections.trimLines": new CommandDescriptor( "dance.selections.trimLines", - (_) => _.runAsync((_) => selections_trimLines(_)), + (_) => _.runAsync(async (_) => await selections_trimLines(_)), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.selections.trimWhitespace": new CommandDescriptor( "dance.selections.trimWhitespace", - (_) => _.runAsync((_) => selections_trimWhitespace(_)), + (_) => _.runAsync(async (_) => await selections_trimWhitespace(_)), CommandDescriptor.Flags.RequiresActiveEditor, ), "dance.updateCount": new CommandDescriptor( "dance.updateCount", - (_, argument) => _.runAsync((_) => updateCount(_, getCount(_, argument), _.extension, getInputOr("count", argument), argument["addDigits"])), + (_, argument) => _.runAsync(async (_) => await updateCount(_, getCount(_, argument), _.extension, getInputOr("count", argument), argument["addDigits"])), CommandDescriptor.Flags.RequiresActiveEditor | CommandDescriptor.Flags.DoNotReplay, ), "dance.updateRegister": new CommandDescriptor( "dance.updateRegister", - (_, argument) => _.runAsync((_) => updateRegister(_, getRegister(_, argument, "dquote", Register.Flags.CanWrite), argument["copyFrom"], getInputOr("input", argument))), + (_, argument) => _.runAsync(async (_) => await updateRegister(_, getRegister(_, argument, "dquote", Register.Flags.CanWrite), argument["copyFrom"], getInputOr("input", argument))), CommandDescriptor.Flags.RequiresActiveEditor | CommandDescriptor.Flags.DoNotReplay, ), "dance.view.line": new CommandDescriptor( "dance.view.line", - (_, argument) => _.runAsync((_) => view_line(_, argument["at"])), + (_, argument) => _.runAsync(async (_) => await view_line(_, argument["at"])), CommandDescriptor.Flags.RequiresActiveEditor, ), }; diff --git a/src/state/modes.ts b/src/state/modes.ts index 101477a1..9943af98 100644 --- a/src/state/modes.ts +++ b/src/state/modes.ts @@ -509,7 +509,7 @@ export declare namespace Mode { readonly type: vscode.TextEditorDecorationType; } - export namespace Configuration { + export /* enum */ namespace Configuration { /** * A valid cursor style value in a `Mode.Configuration`. */ diff --git a/src/state/registers.ts b/src/state/registers.ts index 1322a73d..aede72e0 100644 --- a/src/state/registers.ts +++ b/src/state/registers.ts @@ -3,10 +3,10 @@ import * as vscode from "vscode"; import type { Extension } from "./extension"; import type { Recording } from "./recorder"; import { Context, prompt, SelectionBehavior, Selections } from "../api"; +import { availableClipboardRegisters } from "../utils/constants"; import { ArgumentError, assert, EditNotAppliedError, EditorRequiredError } from "../utils/errors"; import { noUndoStops } from "../utils/misc"; import type * as TrackedSelection from "../utils/tracked-selection"; -import { availableClipboardRegisters } from "../../meta"; /** * The base class for all registers. @@ -175,7 +175,7 @@ export abstract class Register { } } -export declare namespace Register { +export /* enum */ namespace Register { /** * Flags describing the capabilities of a `Register`. */ @@ -197,6 +197,14 @@ export declare namespace Register { CanReadWriteMacros = 16, } + export const enum ChangeKind { + Contents, + Selections, + Recording, + } +} + +export declare namespace Register { /** * Given an array of `Flags` types, returns what interfaces correspond to * these flags. @@ -237,12 +245,6 @@ export declare namespace Register { getRecording(): Recording | undefined; setRecording(recording: Recording): void; } - - export const enum ChangeKind { - Contents, - Selections, - Recording, - } } /** diff --git a/src/utils/constants.ts b/src/utils/constants.ts index e689c9fd..59912ec9 100644 --- a/src/utils/constants.ts +++ b/src/utils/constants.ts @@ -7,3 +7,9 @@ export const extensionName = "dance"; * Identifier of the extension, used in the VS Code marketplace. */ export const extensionId = `gregoire.${extensionName}`; + +/** + * Keys available for binding as the system clipboard register. + * These are available in addition to the default `"` and `null` + */ +export const availableClipboardRegisters = [..."befgijklmnopqrtvwxyz", "*", "+"]; diff --git a/src/utils/disposables.ts b/src/utils/disposables.ts index e6004d31..3fdf198e 100644 --- a/src/utils/disposables.ts +++ b/src/utils/disposables.ts @@ -229,13 +229,15 @@ export class AutoDisposable implements vscode.Disposable { } } -export declare namespace AutoDisposable { +export /* enum */ namespace AutoDisposable { export const enum EventType { OnEditorWasClosed = "editor-was-closed", OnModeDidChange = "mode-did-change", OnSelectionsDidChange = "selections-did-change", } +} +export declare namespace AutoDisposable { export type Event = EventType | readonly [EventType.OnModeDidChange, { except?: string | string[]; include?: string | string[] }]; diff --git a/src/utils/errors.ts b/src/utils/errors.ts index 9981f21a..6c0096dc 100644 --- a/src/utils/errors.ts +++ b/src/utils/errors.ts @@ -159,7 +159,7 @@ export class CancellationError extends Error { } } -export declare namespace CancellationError { +export /* enum */ namespace CancellationError { export const enum Reason { CancellationToken = "cancellation token was used", PressedEscape = "user pressed ", diff --git a/test/suite/api.test.build.ts b/test/suite/api.test.build.ts index f993cb84..50b1d1ab 100644 --- a/test/suite/api.test.build.ts +++ b/test/suite/api.test.build.ts @@ -1,4 +1,4 @@ -import * as assert from "assert"; +import assert from "assert"; import { Builder, unindent } from "../../meta"; import { stringifyExpectedDocument } from "./build-utils"; diff --git a/test/suite/api.test.ts b/test/suite/api.test.ts index 1c4ec21c..072edf20 100644 --- a/test/suite/api.test.ts +++ b/test/suite/api.test.ts @@ -1,5 +1,4 @@ /* eslint-disable require-await */ -import * as assert from "assert"; import * as vscode from "vscode"; import { expect, ExpectedDocument } from "./utils"; diff --git a/test/suite/build-utils.ts b/test/suite/build-utils.ts index cfe443ba..fb714605 100644 --- a/test/suite/build-utils.ts +++ b/test/suite/build-utils.ts @@ -1,4 +1,4 @@ -import * as assert from "assert"; +import assert from "assert"; export function stringifyExpectedDocument(code: string, codeIndent: number) { code = code.replace(/`/g, "\\`").replace(/^/gm, " ".repeat(codeIndent + 2)); diff --git a/test/suite/commands.build.ts b/test/suite/commands.build.ts index ad70e549..635c7099 100644 --- a/test/suite/commands.build.ts +++ b/test/suite/commands.build.ts @@ -1,6 +1,6 @@ -import * as assert from "assert"; -import * as fs from "fs/promises"; -import * as path from "path"; +import assert from "assert"; +import * as fs from "fs/promises"; +import path from "path"; import { unindent } from "../../meta"; import { execAll, stringifyExpectedDocument } from "./build-utils"; diff --git a/test/suite/index.ts b/test/suite/index.ts index cf1dcea9..886ed5eb 100644 --- a/test/suite/index.ts +++ b/test/suite/index.ts @@ -1,7 +1,7 @@ -import * as glob from "glob"; -import * as Mocha from "mocha"; -import * as path from "path"; -import { promises as fs } from "fs"; +import glob from "glob"; +import Mocha from "mocha"; +import * as path from "path"; +import * as fs from "fs/promises"; export async function run(testsRoot: string) { // Create the mocha test. diff --git a/test/suite/utils.ts b/test/suite/utils.ts index b7b62ebf..29bd28d6 100644 --- a/test/suite/utils.ts +++ b/test/suite/utils.ts @@ -3,7 +3,7 @@ import "source-map-support/register"; import * as assert from "assert"; -import * as Mocha from "mocha"; +import Mocha from "mocha"; import * as path from "path"; // @ts-expect-error import * as unexpected from "unexpected"; diff --git a/tsconfig.json b/tsconfig.json index 0a4aff32..966e3c30 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,9 +1,9 @@ { "compilerOptions": { "module": "CommonJS", - "target": "ES2018", - "outDir": "out", - "lib": ["ES2020", "ESNext.WeakRef"], + "target": "ES2021", + "lib": ["ESNext.WeakRef"], + "noEmit": true, "sourceMap": true, "strict": true, "noImplicitReturns": true, @@ -12,6 +12,7 @@ "preserveConstEnums": true, "strictNullChecks": true, "noImplicitAny": true, + "esModuleInterop": true, }, "exclude": ["node_modules", ".vscode-test"], } diff --git a/webpack.web.config.js b/webpack.web.config.js deleted file mode 100644 index 027ae4dc..00000000 --- a/webpack.web.config.js +++ /dev/null @@ -1,51 +0,0 @@ -const path = require("path"); -const webpack = require("webpack"); - -module.exports = { - mode: "none", - target: "webworker", - entry: { - extension: "./src/extension.ts", - }, - output: { - filename: "[name].js", - path: path.join(__dirname, "./out/web"), - libraryTarget: "commonjs", - }, - resolve: { - mainFields: ["browser", "module", "main"], - extensions: [".ts", ".js"], - alias: { - child_process: false, - }, - }, - module: { - rules: [ - { - test: /\.ts$/, - exclude: /node_modules/, - use: [ - { - loader: "ts-loader", - }, - ], - }, - ], - }, - plugins: [ - new webpack.DefinePlugin({ - "process.platform": '"web"', - "process.env.SHELL": "undefined", - }), - new webpack.ProvidePlugin({ - process: "process/browser", - }), - ], - externals: { - vscode: "commonjs vscode", - }, - performance: { - hints: false, - }, - devtool: "nosources-source-map", -}; diff --git a/yarn.lock b/yarn.lock index 6f9a66bd..63fcd986 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9,10 +9,115 @@ dependencies: "@jridgewell/trace-mapping" "0.3.9" -"@discoveryjs/json-ext@^0.5.0": - version "0.5.7" - resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" - integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== +"@esbuild/android-arm64@0.18.4": + version "0.18.4" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.18.4.tgz#9c4f95559cff6fac4b0957fb45e32b442706ba42" + integrity sha512-yQVgO+V307hA2XhzELQ6F91CBGX7gSnlVGAj5YIqjQOxThDpM7fOcHT2YLJbE6gNdPtgRSafQrsK8rJ9xHCaZg== + +"@esbuild/android-arm@0.18.4": + version "0.18.4" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.18.4.tgz#b8173173fa779b807e41146328f36324bf4513c1" + integrity sha512-yKmQC9IiuvHdsNEbPHSprnMHg6OhL1cSeQZLzPpgzJBJ9ppEg9GAZN8MKj1TcmB4tZZUrq5xjK7KCmhwZP8iDA== + +"@esbuild/android-x64@0.18.4": + version "0.18.4" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.18.4.tgz#2f79c625c4524a4310b1c96038dba7e3245789d6" + integrity sha512-yLKXMxQg6sk1ntftxQ5uwyVgG4/S2E7UoOCc5N4YZW7fdkfRiYEXqm7CMuIfY2Vs3FTrNyKmSfNevIuIvJnMww== + +"@esbuild/darwin-arm64@0.18.4": + version "0.18.4" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.18.4.tgz#2f1a73decc212987ad9d97b6c2638be66bd586ad" + integrity sha512-MVPEoZjZpk2xQ1zckZrb8eQuQib+QCzdmMs3YZAYEQPg+Rztk5pUxGyk8htZOC8Z38NMM29W+MqY9Sqo/sDGKw== + +"@esbuild/darwin-x64@0.18.4": + version "0.18.4" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.18.4.tgz#a0a3b2270ba201331e8056d7c896598d8a96a12f" + integrity sha512-uEsRtYRUDsz7i2tXg/t/SyF+5gU1cvi9B6B8i5ebJgtUUHJYWyIPIesmIOL4/+bywjxsDMA/XrNFMgMffLnh5A== + +"@esbuild/freebsd-arm64@0.18.4": + version "0.18.4" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.4.tgz#7966b77bfad31af17e82e21ecaf06e1392dcd3f3" + integrity sha512-I8EOigqWnOHRin6Zp5Y1cfH3oT54bd7Sdz/VnpUNksbOtfp8IWRTH4pgkgO5jWaRQPjCpJcOpdRjYAMjPt8wXg== + +"@esbuild/freebsd-x64@0.18.4": + version "0.18.4" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.18.4.tgz#7c942bc3ca10ed140764a58dcc04e60e5bdca11a" + integrity sha512-1bHfgMz/cNMjbpsYxjVgMJ1iwKq+NdDPlACBrWULD7ZdFmBQrhMicMaKb5CdmdVyvIwXmasOuF4r6Iq574kUTA== + +"@esbuild/linux-arm64@0.18.4": + version "0.18.4" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.18.4.tgz#5d9802d13fc33cc43efc647a56583525e6d40464" + integrity sha512-J42vLHaYREyiBwH0eQE4/7H1DTfZx8FuxyWSictx4d7ezzuKE3XOkIvOg+SQzRz7T9HLVKzq2tvbAov4UfufBw== + +"@esbuild/linux-arm@0.18.4": + version "0.18.4" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.18.4.tgz#7eb1af7227506dd7cb01ef4a400c53f52ea1c4f9" + integrity sha512-4XCGqM/Ay1LCXUBH59bL4JbSbbTK1K22dWHymWMGaEh2sQCDOUw+OQxozYV/YdBb91leK2NbuSrE2BRamwgaYw== + +"@esbuild/linux-ia32@0.18.4": + version "0.18.4" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.18.4.tgz#9d22fa5bb59d7dfbff7d981d933b434585d96dae" + integrity sha512-4ksIqFwhq7OExty7Sl1n0vqQSCqTG4sU6i99G2yuMr28CEOUZ/60N+IO9hwI8sIxBqmKmDgncE1n5CMu/3m0IA== + +"@esbuild/linux-loong64@0.18.4": + version "0.18.4" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.18.4.tgz#659f91aae2abdc93ace39bc4f8e965f2a7dbf6aa" + integrity sha512-bsWtoVHkGQgAsFXioDueXRiUIfSGrVkJjBBz4gcBJxXcD461cWFQFyu8Fxdj9TP+zEeqJ8C/O4LFFMBNi6Fscw== + +"@esbuild/linux-mips64el@0.18.4": + version "0.18.4" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.18.4.tgz#f57cef70de4147df9efb761ff0056509d8d1ba87" + integrity sha512-LRD9Fu8wJQgIOOV1o3nRyzrheFYjxA0C1IVWZ93eNRRWBKgarYFejd5WBtrp43cE4y4D4t3qWWyklm73Mrsd/g== + +"@esbuild/linux-ppc64@0.18.4": + version "0.18.4" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.18.4.tgz#7654e479378e4e9ec6ac96cabb471a6c1c819b42" + integrity sha512-jtQgoZjM92gauVRxNaaG/TpL3Pr4WcL3Pwqi9QgdrBGrEXzB+twohQiWNSTycs6lUygakos4mm2h0B9/SHveng== + +"@esbuild/linux-riscv64@0.18.4": + version "0.18.4" + resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.18.4.tgz#eb762cae575bb070627415921ca43e5f7e3ee3a1" + integrity sha512-7WaU/kRZG0VCV09Xdlkg6LNAsfU9SAxo6XEdaZ8ffO4lh+DZoAhGTx7+vTMOXKxa+r2w1LYDGxfJa2rcgagMRA== + +"@esbuild/linux-s390x@0.18.4": + version "0.18.4" + resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.18.4.tgz#d7d47a6cde5536e97b698d5e913f3e04662ff3da" + integrity sha512-D19ed0xreKQvC5t+ArE2njSnm18WPpE+1fhwaiJHf+Xwqsq+/SUaV8Mx0M27nszdU+Atq1HahrgCOZCNNEASUg== + +"@esbuild/linux-x64@0.18.4": + version "0.18.4" + resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.18.4.tgz#bcdc75f060fd1dd02f6fbd8183caa8362d6b3ab4" + integrity sha512-Rx3AY1sxyiO/gvCGP00nL69L60dfmWyjKWY06ugpB8Ydpdsfi3BHW58HWC24K3CAjAPSwxcajozC2PzA9JBS1g== + +"@esbuild/netbsd-x64@0.18.4": + version "0.18.4" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.18.4.tgz#fc511ecd4b46b1b38410f635dd3e0db500a8b325" + integrity sha512-AaShPmN9c6w1mKRpliKFlaWcSkpBT4KOlk93UfFgeI3F3cbjzdDKGsbKnOZozmYbE1izZKLmNJiW0sFM+A5JPA== + +"@esbuild/openbsd-x64@0.18.4": + version "0.18.4" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.18.4.tgz#b6db15ec5dfa6ac4b0088cd38ec5ceb8a57f48d4" + integrity sha512-tRGvGwou3BrvHVvF8HxTqEiC5VtPzySudS9fh2jBIKpLX7HCW8jIkW+LunkFDNwhslx4xMAgh0jAHsx/iCymaQ== + +"@esbuild/sunos-x64@0.18.4": + version "0.18.4" + resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.18.4.tgz#f0aa5f8c3929a49e721faca4e7491865324a6bb5" + integrity sha512-acORFDI95GKhmAnlH8EarBeuqoy/j3yxIU+FDB91H3+ZON+8HhTadtT450YkaMzX6lEWbhi+mjVUCj00M5yyOQ== + +"@esbuild/win32-arm64@0.18.4": + version "0.18.4" + resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.18.4.tgz#6e0518345d702012e68d9cdbbcf897367764eb9e" + integrity sha512-1NxP+iOk8KSvS1L9SSxEvBAJk39U0GiGZkiiJGbuDF9G4fG7DSDw6XLxZMecAgmvQrwwx7yVKdNN3GgNh0UfKg== + +"@esbuild/win32-ia32@0.18.4": + version "0.18.4" + resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.18.4.tgz#ddbc327a08b75280cbceb80ff6f29ab4035c9bad" + integrity sha512-OKr8jze93vbgqZ/r23woWciTixUwLa976C9W7yNBujtnVHyvsL/ocYG61tsktUfJOpyIz5TsohkBZ6Lo2+PCcQ== + +"@esbuild/win32-x64@0.18.4": + version "0.18.4" + resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.18.4.tgz#2562ce6dfd48c15a80b8daa2e38cce5b50573624" + integrity sha512-qJr3wVvcLjPFcV4AMDS3iquhBfTef2zo/jlm8RMxmiRp3Vy2HY8WMxrykJlcbCnqLXZPA0YZxZGND6eug85ogg== "@eslint/eslintrc@^1.2.3": version "1.2.3" @@ -107,27 +212,6 @@ resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.2.tgz#423c77877d0569db20e1fc80885ac4118314010e" integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA== -"@types/eslint-scope@^3.7.3": - version "3.7.3" - resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.3.tgz#125b88504b61e3c8bc6f870882003253005c3224" - integrity sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g== - dependencies: - "@types/eslint" "*" - "@types/estree" "*" - -"@types/eslint@*": - version "8.4.2" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.2.tgz#48f2ac58ab9c631cb68845c3d956b28f79fad575" - integrity sha512-Z1nseZON+GEnFjJc04sv4NSALGjhFwy6K0HXt7qsn5ArfAKtb63dXNJHf+1YW6IpOIYRBGUbu3GwJdj8DGnCjA== - dependencies: - "@types/estree" "*" - "@types/json-schema" "*" - -"@types/estree@*", "@types/estree@^0.0.51": - version "0.0.51" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40" - integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ== - "@types/glob@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb" @@ -136,7 +220,7 @@ "@types/minimatch" "*" "@types/node" "*" -"@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": +"@types/json-schema@^7.0.9": version "7.0.11" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== @@ -261,159 +345,6 @@ rimraf "^3.0.2" unzipper "^0.10.11" -"@webassemblyjs/ast@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" - integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw== - dependencies: - "@webassemblyjs/helper-numbers" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - -"@webassemblyjs/floating-point-hex-parser@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" - integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ== - -"@webassemblyjs/helper-api-error@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" - integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg== - -"@webassemblyjs/helper-buffer@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" - integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA== - -"@webassemblyjs/helper-numbers@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae" - integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ== - dependencies: - "@webassemblyjs/floating-point-hex-parser" "1.11.1" - "@webassemblyjs/helper-api-error" "1.11.1" - "@xtuc/long" "4.2.2" - -"@webassemblyjs/helper-wasm-bytecode@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" - integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q== - -"@webassemblyjs/helper-wasm-section@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a" - integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - -"@webassemblyjs/ieee754@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614" - integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ== - dependencies: - "@xtuc/ieee754" "^1.2.0" - -"@webassemblyjs/leb128@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5" - integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw== - dependencies: - "@xtuc/long" "4.2.2" - -"@webassemblyjs/utf8@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" - integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ== - -"@webassemblyjs/wasm-edit@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" - integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/helper-wasm-section" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - "@webassemblyjs/wasm-opt" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - "@webassemblyjs/wast-printer" "1.11.1" - -"@webassemblyjs/wasm-gen@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" - integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/ieee754" "1.11.1" - "@webassemblyjs/leb128" "1.11.1" - "@webassemblyjs/utf8" "1.11.1" - -"@webassemblyjs/wasm-opt@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2" - integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - -"@webassemblyjs/wasm-parser@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199" - integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-api-error" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/ieee754" "1.11.1" - "@webassemblyjs/leb128" "1.11.1" - "@webassemblyjs/utf8" "1.11.1" - -"@webassemblyjs/wast-printer@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0" - integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@xtuc/long" "4.2.2" - -"@webpack-cli/configtest@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.1.1.tgz#9f53b1b7946a6efc2a749095a4f450e2932e8356" - integrity sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg== - -"@webpack-cli/info@^1.4.1": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.4.1.tgz#2360ea1710cbbb97ff156a3f0f24556e0fc1ebea" - integrity sha512-PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA== - dependencies: - envinfo "^7.7.3" - -"@webpack-cli/serve@^1.6.1": - version "1.6.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.6.1.tgz#0de2875ac31b46b6c5bb1ae0a7d7f0ba5678dffe" - integrity sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw== - -"@xtuc/ieee754@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" - integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA== - -"@xtuc/long@4.2.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" - integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== - -acorn-import-assertions@^1.7.6: - version "1.8.0" - resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" - integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw== - acorn-jsx-walk@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/acorn-jsx-walk/-/acorn-jsx-walk-2.0.0.tgz#a5ed648264e68282d7c2aead80216bfdf232573a" @@ -448,11 +379,6 @@ agent-base@6: dependencies: debug "4" -ajv-keywords@^3.5.2: - version "3.5.2" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" - integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== - ajv@8.11.0: version "8.11.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f" @@ -463,7 +389,7 @@ ajv@8.11.0: require-from-string "^2.0.2" uri-js "^4.2.2" -ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5: +ajv@^6.10.0, ajv@^6.12.4: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== @@ -656,17 +582,6 @@ browser-stdout@1.3.1: resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== -browserslist@^4.14.5: - version "4.20.3" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.3.tgz#eb7572f49ec430e054f56d52ff0ebe9be915f8bf" - integrity sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg== - dependencies: - caniuse-lite "^1.0.30001332" - electron-to-chromium "^1.4.118" - escalade "^3.1.1" - node-releases "^2.0.3" - picocolors "^1.0.0" - buffer-crc32@~0.2.3: version "0.2.13" resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" @@ -713,11 +628,6 @@ camelcase@^6.0.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -caniuse-lite@^1.0.30001332: - version "1.0.30001341" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001341.tgz#59590c8ffa8b5939cf4161f00827b8873ad72498" - integrity sha512-2SodVrFFtvGENGCv0ChVJIDQ0KPaS1cg7/qtfMaICgeMolDdo/Z2OD32F0Aq9yl6F4YFwGPBS5AaPqNYiW4PoA== - chainsaw@~0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.1.0.tgz#5eab50b28afe58074d0d58291388828b5e5fbc98" @@ -791,11 +701,6 @@ chownr@^1.1.1: resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== -chrome-trace-event@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" - integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== - cli-cursor@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" @@ -822,15 +727,6 @@ cliui@^7.0.2: strip-ansi "^6.0.0" wrap-ansi "^7.0.0" -clone-deep@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" - integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ== - dependencies: - is-plain-object "^2.0.4" - kind-of "^6.0.2" - shallow-clone "^3.0.0" - clone@^1.0.2: version "1.0.4" resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" @@ -870,31 +766,16 @@ color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -colorette@^2.0.14: - version "2.0.16" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" - integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g== - commander@9.2.0: version "9.2.0" resolved "https://registry.yarnpkg.com/commander/-/commander-9.2.0.tgz#6e21014b2ed90d8b7c9647230d8b7a94a4a419a9" integrity sha512-e2i4wANQiSXgnrBlIatyHtP1odfUp0BbV5Y5nEGbxtIrStkEOAAzCUirvLBNXHLr7kwLvJl6V+4V3XV9x7Wd9w== -commander@^2.20.0: - version "2.20.3" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" - integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== - commander@^6.1.0: version "6.2.1" resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c" integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA== -commander@^7.0.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" - integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== - concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" @@ -915,7 +796,7 @@ create-require@^1.1.0: resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== -cross-spawn@^7.0.2, cross-spawn@^7.0.3: +cross-spawn@^7.0.2: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -1085,11 +966,6 @@ duplexer2@~0.1.4: dependencies: readable-stream "^2.0.2" -electron-to-chromium@^1.4.118: - version "1.4.137" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz#186180a45617283f1c012284458510cd99d6787f" - integrity sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA== - emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" @@ -1102,7 +978,7 @@ end-of-stream@^1.1.0, end-of-stream@^1.4.1: dependencies: once "^1.4.0" -enhanced-resolve@5.9.3, enhanced-resolve@^5.0.0, enhanced-resolve@^5.7.0, enhanced-resolve@^5.9.3: +enhanced-resolve@5.9.3, enhanced-resolve@^5.0.0, enhanced-resolve@^5.7.0: version "5.9.3" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz#44a342c012cbc473254af5cc6ae20ebd0aae5d88" integrity sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow== @@ -1120,15 +996,33 @@ entities@~2.1.0: resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5" integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w== -envinfo@^7.7.3: - version "7.8.1" - resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" - integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw== - -es-module-lexer@^0.9.0: - version "0.9.3" - resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" - integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ== +esbuild@^0.18.4: + version "0.18.4" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.18.4.tgz#8c047747baa0d8837a8aa8c84eed2ee8b06f43e4" + integrity sha512-9rxWV/Cb2DMUXfe9aUsYtqg0KTlw146ElFH22kYeK9KVV1qT082X4lpmiKsa12ePiCcIcB686TQJxaGAa9TFvA== + optionalDependencies: + "@esbuild/android-arm" "0.18.4" + "@esbuild/android-arm64" "0.18.4" + "@esbuild/android-x64" "0.18.4" + "@esbuild/darwin-arm64" "0.18.4" + "@esbuild/darwin-x64" "0.18.4" + "@esbuild/freebsd-arm64" "0.18.4" + "@esbuild/freebsd-x64" "0.18.4" + "@esbuild/linux-arm" "0.18.4" + "@esbuild/linux-arm64" "0.18.4" + "@esbuild/linux-ia32" "0.18.4" + "@esbuild/linux-loong64" "0.18.4" + "@esbuild/linux-mips64el" "0.18.4" + "@esbuild/linux-ppc64" "0.18.4" + "@esbuild/linux-riscv64" "0.18.4" + "@esbuild/linux-s390x" "0.18.4" + "@esbuild/linux-x64" "0.18.4" + "@esbuild/netbsd-x64" "0.18.4" + "@esbuild/openbsd-x64" "0.18.4" + "@esbuild/sunos-x64" "0.18.4" + "@esbuild/win32-arm64" "0.18.4" + "@esbuild/win32-ia32" "0.18.4" + "@esbuild/win32-x64" "0.18.4" escalade@^3.1.1: version "3.1.1" @@ -1145,7 +1039,7 @@ escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= -eslint-scope@5.1.1, eslint-scope@^5.1.1: +eslint-scope@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== @@ -1257,26 +1151,6 @@ esutils@^2.0.2: resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== -events@^3.2.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" - integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== - -execa@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" - integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== - dependencies: - cross-spawn "^7.0.3" - get-stream "^6.0.0" - human-signals "^2.1.0" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.1" - onetime "^5.1.2" - signal-exit "^3.0.3" - strip-final-newline "^2.0.0" - expand-template@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" @@ -1317,11 +1191,6 @@ fast-levenshtein@^2.0.6: resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= -fastest-levenshtein@^1.0.12: - version "1.0.12" - resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2" - integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow== - fastq@^1.6.0: version "1.13.0" resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" @@ -1365,14 +1234,6 @@ find-up@5.0.0: locate-path "^6.0.0" path-exists "^4.0.0" -find-up@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" - integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== - dependencies: - locate-path "^5.0.0" - path-exists "^4.0.0" - flat-cache@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" @@ -1459,7 +1320,7 @@ get-stdin@^4.0.1: resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4= -get-stream@^6.0.0, get-stream@^6.0.1: +get-stream@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== @@ -1469,6 +1330,14 @@ github-from-package@0.0.0: resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= +glob-exec@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/glob-exec/-/glob-exec-0.1.1.tgz#d7bd878e867d6b925ea056baecc56271ba5e6713" + integrity sha512-/ZbFcEUsNRPh6PExnQiM1oq80AzREcbHYJvvcqv10as0qiNlVe/Q+gdmsVcaguEclpt2m8EpQNqVpVVLU1UE1w== + dependencies: + glob "7.1.X" + subarg "1.0.X" + glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" @@ -1483,10 +1352,17 @@ glob-parent@^6.0.1: dependencies: is-glob "^4.0.3" -glob-to-regexp@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" - integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== +glob@7.1.X: + version "7.1.7" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" + integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" glob@7.2.0: version "7.2.0" @@ -1542,7 +1418,7 @@ globby@^11.0.4: merge2 "^1.4.1" slash "^3.0.0" -graceful-fs@^4.1.2, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.9: +graceful-fs@^4.1.2, graceful-fs@^4.2.2, graceful-fs@^4.2.4: version "4.2.10" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== @@ -1630,11 +1506,6 @@ https-proxy-agent@^5.0.0: agent-base "6" debug "4" -human-signals@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" - integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== - iconv-lite@^0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" @@ -1660,14 +1531,6 @@ import-fresh@^3.0.0, import-fresh@^3.2.1: parent-module "^1.0.0" resolve-from "^4.0.0" -import-local@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4" - integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg== - dependencies: - pkg-dir "^4.2.0" - resolve-cwd "^3.0.0" - imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" @@ -1717,11 +1580,6 @@ inquirer@8.2.4: through "^2.3.6" wrap-ansi "^7.0.0" -interpret@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" - integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw== - is-binary-path@~2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" @@ -1729,13 +1587,6 @@ is-binary-path@~2.1.0: dependencies: binary-extensions "^2.0.0" -is-core-module@^2.8.1: - version "2.9.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69" - integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A== - dependencies: - has "^1.0.3" - is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" @@ -1780,18 +1631,6 @@ is-plain-obj@^2.1.0: resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== -is-plain-object@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" - integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== - dependencies: - isobject "^3.0.1" - -is-stream@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" - integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== - is-unicode-supported@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" @@ -1807,20 +1646,6 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= -isobject@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= - -jest-worker@^27.4.5: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0" - integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg== - dependencies: - "@types/node" "*" - merge-stream "^2.0.0" - supports-color "^8.0.0" - js-yaml@4.1.0, js-yaml@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" @@ -1828,11 +1653,6 @@ js-yaml@4.1.0, js-yaml@^4.1.0: dependencies: argparse "^2.0.1" -json-parse-even-better-errors@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" - integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== - json-schema-traverse@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" @@ -1868,11 +1688,6 @@ keytar@^7.7.0: node-addon-api "^4.3.0" prebuild-install "^7.0.1" -kind-of@^6.0.2: - version "6.0.3" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" - integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== - leven@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" @@ -1898,18 +1713,6 @@ listenercount@~1.0.1: resolved "https://registry.yarnpkg.com/listenercount/-/listenercount-1.0.1.tgz#84c8a72ab59c4725321480c975e6508342e70937" integrity sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc= -loader-runner@^4.2.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" - integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg== - -locate-path@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" - integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== - dependencies: - p-locate "^4.1.0" - locate-path@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" @@ -1922,11 +1725,6 @@ lodash.merge@^4.6.2: resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== -lodash.sortby@^4.7.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" - integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= - lodash@4.17.21, lodash@^4.17.21: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" @@ -1976,11 +1774,6 @@ mdurl@^1.0.1: resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4= -merge-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" - integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== - merge2@^1.3.0, merge2@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" @@ -1994,18 +1787,6 @@ micromatch@^4.0.0, micromatch@^4.0.4: braces "^3.0.2" picomatch "^2.3.1" -mime-db@1.52.0: - version "1.52.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" - integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== - -mime-types@^2.1.27: - version "2.1.35" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" - integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== - dependencies: - mime-db "1.52.0" - mime@^1.3.4: version "1.6.0" resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" @@ -2110,7 +1891,7 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= -neo-async@^2.6.0, neo-async@^2.6.2: +neo-async@^2.6.0: version "2.6.2" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== @@ -2127,23 +1908,11 @@ node-addon-api@^4.3.0: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f" integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ== -node-releases@^2.0.3: - version "2.0.4" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.4.tgz#f38252370c43854dc48aa431c766c6c398f40476" - integrity sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ== - normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -npm-run-path@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" - integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== - dependencies: - path-key "^3.0.0" - npmlog@^4.0.1: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" @@ -2183,7 +1952,7 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" -onetime@^5.1.0, onetime@^5.1.2: +onetime@^5.1.0: version "5.1.2" resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== @@ -2222,13 +1991,6 @@ os-tmpdir@~1.0.2: resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= -p-limit@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" - integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== - dependencies: - p-try "^2.0.0" - p-limit@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" @@ -2236,13 +1998,6 @@ p-limit@^3.0.2: dependencies: yocto-queue "^0.1.0" -p-locate@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" - integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== - dependencies: - p-limit "^2.2.0" - p-locate@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" @@ -2250,11 +2005,6 @@ p-locate@^5.0.0: dependencies: p-limit "^3.0.2" -p-try@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" - integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== - parent-module@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" @@ -2291,16 +2041,11 @@ path-is-absolute@^1.0.0: resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= -path-key@^3.0.0, path-key@^3.1.0: +path-key@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== -path-parse@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" - integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== - path-type@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" @@ -2311,23 +2056,11 @@ pend@~1.2.0: resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= -picocolors@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" - integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== - picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== -pkg-dir@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" - integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== - dependencies: - find-up "^4.0.0" - prebuild-install@^7.0.1: version "7.1.0" resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.0.tgz#991b6ac16c81591ba40a6d5de93fb33673ac1370" @@ -2435,13 +2168,6 @@ readdirp@~3.6.0: dependencies: picomatch "^2.2.1" -rechoir@^0.7.0: - version "0.7.1" - resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686" - integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg== - dependencies: - resolve "^1.9.0" - regexp-tree@~0.1.1: version "0.1.24" resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.24.tgz#3d6fa238450a4d66e5bc9c4c14bb720e2196829d" @@ -2469,32 +2195,11 @@ require-from-string@^2.0.2: resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== -resolve-cwd@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" - integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg== - dependencies: - resolve-from "^5.0.0" - resolve-from@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== -resolve-from@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" - integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== - -resolve@^1.9.0: - version "1.22.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" - integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw== - dependencies: - is-core-module "^2.8.1" - path-parse "^1.0.7" - supports-preserve-symlinks-flag "^1.0.0" - restore-cursor@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" @@ -2568,15 +2273,6 @@ sax@>=0.6.0: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== -schema-utils@^3.1.0, schema-utils@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" - integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== - dependencies: - "@types/json-schema" "^7.0.8" - ajv "^6.12.5" - ajv-keywords "^3.5.2" - semver-try-require@^5.0.2: version "5.0.2" resolved "https://registry.yarnpkg.com/semver-try-require/-/semver-try-require-5.0.2.tgz#8b99e8de5b444d086703a9370dc1961b87a91698" @@ -2596,7 +2292,7 @@ semver@^7.3.4, semver@^7.3.5, semver@^7.3.7: dependencies: lru-cache "^6.0.0" -serialize-javascript@6.0.0, serialize-javascript@^6.0.0: +serialize-javascript@6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== @@ -2613,13 +2309,6 @@ setimmediate@~1.0.4: resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= -shallow-clone@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" - integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA== - dependencies: - kind-of "^6.0.2" - shebang-command@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" @@ -2641,7 +2330,7 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" -signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: +signal-exit@^3.0.0, signal-exit@^3.0.2: version "3.0.7" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== @@ -2665,7 +2354,7 @@ slash@^3.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== -source-map-support@^0.5.21, source-map-support@~0.5.20: +source-map-support@^0.5.21: version "0.5.21" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== @@ -2678,13 +2367,6 @@ source-map@^0.6.0, source-map@^0.6.1: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -source-map@~0.8.0-beta.0: - version "0.8.0-beta.0" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.8.0-beta.0.tgz#d4c1bb42c3f7ee925f005927ba10709e0d1d1f11" - integrity sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA== - dependencies: - whatwg-url "^7.0.0" - string-width@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" @@ -2736,11 +2418,6 @@ strip-bom@^3.0.0: resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= -strip-final-newline@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" - integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== - strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" @@ -2751,7 +2428,14 @@ strip-json-comments@~2.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= -supports-color@8.1.1, supports-color@^8.0.0: +subarg@1.0.X: + version "1.0.0" + resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2" + integrity sha512-RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg== + dependencies: + minimist "^1.1.0" + +supports-color@8.1.1: version "8.1.1" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== @@ -2772,12 +2456,7 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" -supports-preserve-symlinks-flag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" - integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== - -tapable@^2.1.1, tapable@^2.2.0: +tapable@^2.2.0: version "2.2.1" resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== @@ -2808,27 +2487,6 @@ teamcity-service-messages@0.1.14: resolved "https://registry.yarnpkg.com/teamcity-service-messages/-/teamcity-service-messages-0.1.14.tgz#193d420a5e4aef8e5e50b8c39e7865e08fbb5d8a" integrity sha512-29aQwaHqm8RMX74u2o/h1KbMLP89FjNiMxD9wbF2BbWOnbM+q+d1sCEC+MqCc4QW3NJykn77OMpTFw/xTHIc0w== -terser-webpack-plugin@^5.1.3: - version "5.3.1" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz#0320dcc270ad5372c1e8993fabbd927929773e54" - integrity sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g== - dependencies: - jest-worker "^27.4.5" - schema-utils "^3.1.1" - serialize-javascript "^6.0.0" - source-map "^0.6.1" - terser "^5.7.2" - -terser@^5.7.2: - version "5.13.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.13.1.tgz#66332cdc5a01b04a224c9fad449fc1a18eaa1799" - integrity sha512-hn4WKOfwnwbYfe48NgrQjqNOH9jzLqRcIfbYytOXCOv46LBfWr9bDS17MQqOi+BWGD0sJK3Sj5NC/gJjiojaoA== - dependencies: - acorn "^8.5.0" - commander "^2.20.0" - source-map "~0.8.0-beta.0" - source-map-support "~0.5.20" - text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" @@ -2860,13 +2518,6 @@ to-regex-range@^5.0.1: dependencies: is-number "^7.0.0" -tr46@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09" - integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk= - dependencies: - punycode "^2.1.0" - "traverse@>=0.3.0 <0.4": version "0.3.9" resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9" @@ -3088,14 +2739,6 @@ vsce@^2.7.0: yauzl "^2.3.1" yazl "^2.2.2" -watchpack@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.3.1.tgz#4200d9447b401156eeca7767ee610f8809bc9d25" - integrity sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA== - dependencies: - glob-to-regexp "^0.4.1" - graceful-fs "^4.1.2" - wcwidth@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8" @@ -3108,81 +2751,6 @@ web-tree-sitter@^0.20.8: resolved "https://registry.yarnpkg.com/web-tree-sitter/-/web-tree-sitter-0.20.8.tgz#1e371cb577584789cadd75cb49c7ddfbc99d04c8" integrity sha512-weOVgZ3aAARgdnb220GqYuh7+rZU0Ka9k9yfKtGAzEYMa6GgiCzW9JjQRJyCJakvibQW+dfjJdihjInKuuCAUQ== -webidl-conversions@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" - integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg== - -webpack-cli@^4.9.2: - version "4.9.2" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.9.2.tgz#77c1adaea020c3f9e2db8aad8ea78d235c83659d" - integrity sha512-m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ== - dependencies: - "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^1.1.1" - "@webpack-cli/info" "^1.4.1" - "@webpack-cli/serve" "^1.6.1" - colorette "^2.0.14" - commander "^7.0.0" - execa "^5.0.0" - fastest-levenshtein "^1.0.12" - import-local "^3.0.2" - interpret "^2.2.0" - rechoir "^0.7.0" - webpack-merge "^5.7.3" - -webpack-merge@^5.7.3: - version "5.8.0" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61" - integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q== - dependencies: - clone-deep "^4.0.1" - wildcard "^2.0.0" - -webpack-sources@^3.2.3: - version "3.2.3" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" - integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== - -webpack@^5.72.1: - version "5.72.1" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.72.1.tgz#3500fc834b4e9ba573b9f430b2c0a61e1bb57d13" - integrity sha512-dXG5zXCLspQR4krZVR6QgajnZOjW2K/djHvdcRaDQvsjV9z9vaW6+ja5dZOYbqBBjF6kGXka/2ZyxNdc+8Jung== - dependencies: - "@types/eslint-scope" "^3.7.3" - "@types/estree" "^0.0.51" - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/wasm-edit" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - acorn "^8.4.1" - acorn-import-assertions "^1.7.6" - browserslist "^4.14.5" - chrome-trace-event "^1.0.2" - enhanced-resolve "^5.9.3" - es-module-lexer "^0.9.0" - eslint-scope "5.1.1" - events "^3.2.0" - glob-to-regexp "^0.4.1" - graceful-fs "^4.2.9" - json-parse-even-better-errors "^2.3.1" - loader-runner "^4.2.0" - mime-types "^2.1.27" - neo-async "^2.6.2" - schema-utils "^3.1.0" - tapable "^2.1.1" - terser-webpack-plugin "^5.1.3" - watchpack "^2.3.1" - webpack-sources "^3.2.3" - -whatwg-url@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06" - integrity sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg== - dependencies: - lodash.sortby "^4.7.0" - tr46 "^1.0.1" - webidl-conversions "^4.0.2" - which@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" @@ -3197,11 +2765,6 @@ wide-align@^1.1.0: dependencies: string-width "^1.0.2 || 2 || 3 || 4" -wildcard@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" - integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== - word-wrap@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"