From 6317e6557ec2518bcec96d73536350363c158aa5 Mon Sep 17 00:00:00 2001 From: fisker Cheung Date: Sat, 18 Dec 2021 11:10:03 +0800 Subject: [PATCH 01/47] Test: Make `runPrettier` result "thenable" (#11979) --- tests/integration/__tests__/early-exit.js | 28 ++++++----- tests/integration/__tests__/loglevel.js | 6 +-- tests/integration/__tests__/piped-output.js | 56 +++++++++++---------- tests/integration/runPrettier.js | 3 ++ 4 files changed, 51 insertions(+), 42 deletions(-) diff --git a/tests/integration/__tests__/early-exit.js b/tests/integration/__tests__/early-exit.js index a23db751a..85277ba5a 100644 --- a/tests/integration/__tests__/early-exit.js +++ b/tests/integration/__tests__/early-exit.js @@ -93,25 +93,27 @@ describe("throw error and show usage with something unexpected", () => { test("node version error", async () => { const originalProcessVersion = process.version; + let result; + Object.defineProperty(process, "version", { + value: "v8.0.0", + writable: false, + }); try { - Object.defineProperty(process, "version", { - value: "v8.0.0", - writable: false, - }); - const result = runPrettier("cli", ["--help"]); - expect(await result.status).toBe(1); - expect(await result.stderr).toBe( - `prettier requires at least version ${ - isProduction ? "10.13.0" : "12.17.0" - } of Node, please upgrade\n` - ); - expect(await result.stdout).toBe(""); - expect(await result.write).toEqual([]); + result = await runPrettier("cli", ["--help"]); } finally { Object.defineProperty(process, "version", { value: originalProcessVersion, writable: false, }); } + + expect(result.status).toBe(1); + expect(result.stderr).toBe( + `prettier requires at least version ${ + isProduction ? "10.13.0" : "12.17.0" + } of Node, please upgrade\n` + ); + expect(result.stdout).toBe(""); + expect(result.write).toEqual([]); }); diff --git a/tests/integration/__tests__/loglevel.js b/tests/integration/__tests__/loglevel.js index 752d2530f..bb9bc3319 100644 --- a/tests/integration/__tests__/loglevel.js +++ b/tests/integration/__tests__/loglevel.js @@ -38,7 +38,7 @@ describe("Should use default level logger to log `--loglevel` error", () => { }); async function runPrettierWithLogLevel(logLevel, patterns) { - const result = runPrettier("cli/loglevel", [ + const result = await runPrettier("cli/loglevel", [ "--loglevel", logLevel, "--unknown-option", @@ -47,9 +47,9 @@ async function runPrettierWithLogLevel(logLevel, patterns) { "not-found.js", ]); - expect(await result.status).toBe(2); + expect(result.status).toBe(2); - const stderr = stripAnsi(await result.stderr); + const stderr = stripAnsi(result.stderr); if (patterns) { for (const pattern of patterns) { diff --git a/tests/integration/__tests__/piped-output.js b/tests/integration/__tests__/piped-output.js index ad0cc248d..004c5eb89 100644 --- a/tests/integration/__tests__/piped-output.js +++ b/tests/integration/__tests__/piped-output.js @@ -3,7 +3,7 @@ const runPrettier = require("../runPrettier.js"); describe("output with --check + unformatted differs when piped", () => { - const result0 = runPrettier( + const cli0 = runPrettier( "cli/write", ["--write", "--check", "--no-color", "unformatted.js"], { stdoutIsTTY: true } @@ -11,7 +11,7 @@ describe("output with --check + unformatted differs when piped", () => { status: 0, }); - const result1 = runPrettier( + const cli1 = runPrettier( "cli/write", ["--write", "--check", "--no-color", "unformatted.js"], { stdoutIsTTY: false } @@ -20,15 +20,16 @@ describe("output with --check + unformatted differs when piped", () => { }); test("Result", async () => { - expect((await result0.stdout).length).toBeGreaterThan( - (await result1.stdout).length - ); - expect(await result0.write).toEqual(await result1.write); + const result0 = await cli0; + const result1 = await cli1; + + expect(result0.stdout.length).toBeGreaterThan(result1.stdout.length); + expect(result0.write).toEqual(result1.write); }); }); describe("no file diffs with --check + formatted file", () => { - const result0 = runPrettier( + const cli0 = runPrettier( "cli/write", ["--write", "--check", "--no-color", "formatted.js"], { stdoutIsTTY: true } @@ -36,7 +37,7 @@ describe("no file diffs with --check + formatted file", () => { status: 0, }); - const result1 = runPrettier( + const cli1 = runPrettier( "cli/write", ["--write", "--check", "--no-color", "formatted.js"], { stdoutIsTTY: false } @@ -45,16 +46,17 @@ describe("no file diffs with --check + formatted file", () => { }); test("Result", async () => { - expect(await result0.stdout).not.toEqual(await result1.stdout); - expect((await result0.stdout).length).toBeGreaterThan( - (await result1.stdout).length - ); - expect(await result0.write).toEqual(await result1.write); + const result0 = await cli0; + const result1 = await cli1; + + expect(result0.stdout).not.toEqual(result1.stdout); + expect(result0.stdout.length).toBeGreaterThan(result1.stdout.length); + expect(result0.write).toEqual(result1.write); }); }); describe("output with --list-different + unformatted differs when piped", () => { - const result0 = runPrettier( + const cli0 = runPrettier( "cli/write", ["--write", "--list-different", "--no-color", "unformatted.js"], { stdoutIsTTY: true } @@ -62,7 +64,7 @@ describe("output with --list-different + unformatted differs when piped", () => status: 0, }); - const result1 = runPrettier( + const cli1 = runPrettier( "cli/write", ["--write", "--list-different", "--no-color", "unformatted.js"], { stdoutIsTTY: false } @@ -71,15 +73,16 @@ describe("output with --list-different + unformatted differs when piped", () => }); test("Result", async () => { - expect((await result0.stdout).length).toBeGreaterThan( - (await result1.stdout).length - ); - expect(await result0.write).toEqual(await result1.write); + const result0 = await cli0; + const result1 = await cli1; + + expect(result0.stdout.length).toBeGreaterThan(result1.stdout.length); + expect(result0.write).toEqual(result1.write); }); }); describe("no file diffs with --list-different + formatted file", () => { - const result0 = runPrettier( + const cli0 = runPrettier( "cli/write", ["--write", "--list-different", "--no-color", "formatted.js"], { stdoutIsTTY: true } @@ -87,7 +90,7 @@ describe("no file diffs with --list-different + formatted file", () => { status: 0, }); - const result1 = runPrettier( + const cli1 = runPrettier( "cli/write", ["--write", "--list-different", "--no-color", "formatted.js"], { stdoutIsTTY: false } @@ -96,10 +99,11 @@ describe("no file diffs with --list-different + formatted file", () => { }); test("Result", async () => { - expect(await result0.stdout).not.toEqual(await result1.stdout); - expect((await result0.stdout).length).toBeGreaterThan( - (await result1.stdout).length - ); - expect(await result0.write).toEqual(await result1.write); + const result0 = await cli0; + const result1 = await cli1; + + expect(result0.stdout).not.toEqual(result1.stdout); + expect(result0.stdout.length).toBeGreaterThan(result1.stdout.length); + expect(result0.write).toEqual(result1.write); }); }); diff --git a/tests/integration/runPrettier.js b/tests/integration/runPrettier.js index 4e9ad51f1..e2e813887 100644 --- a/tests/integration/runPrettier.js +++ b/tests/integration/runPrettier.js @@ -155,6 +155,9 @@ function runPrettier(dir, args = [], options = {}) { return runCli().then(({ write }) => write); }, test: testResult, + then(onFulfilled, onRejected) { + return runCli().then(onFulfilled, onRejected); + }, }; return getters; From 306d0099045860d82fe196321b71ed487c140bc3 Mon Sep 17 00:00:00 2001 From: fisker Cheung Date: Sat, 18 Dec 2021 11:11:49 +0800 Subject: [PATCH 02/47] Use camelCase cli arguments internally (#11976) --- src/cli/context.js | 10 ++-- src/cli/expand-patterns.js | 6 +- src/cli/file-info.js | 30 ++++++---- src/cli/find-config-path.js | 2 +- src/cli/format.js | 59 +++++++++---------- src/cli/index.js | 17 +++--- src/cli/options/get-options-for-file.js | 4 +- src/cli/options/parse-cli-arguments.js | 14 ++++- .../__snapshots__/arg-parsing.js.snap | 13 ++++ tests/integration/__tests__/arg-parsing.js | 13 ++++ 10 files changed, 103 insertions(+), 65 deletions(-) diff --git a/src/cli/context.js b/src/cli/context.js index 637c6e058..ba3b78e98 100644 --- a/src/cli/context.js +++ b/src/cli/context.js @@ -28,11 +28,11 @@ class Context { this.logger = logger; this.stack = []; - const { plugin: plugins, "plugin-search-dir": pluginSearchDirs } = - parseArgvWithoutPlugins(rawArguments, logger, [ - "plugin", - "plugin-search-dir", - ]); + const { plugins, pluginSearchDirs } = parseArgvWithoutPlugins( + rawArguments, + logger, + ["plugin", "plugin-search-dir"] + ); this.pushContextPlugins(plugins, pluginSearchDirs); diff --git a/src/cli/expand-patterns.js b/src/cli/expand-patterns.js index 5fb087a34..d62108f7e 100644 --- a/src/cli/expand-patterns.js +++ b/src/cli/expand-patterns.js @@ -32,7 +32,7 @@ async function* expandPatterns(context) { yield relativePath; } - if (noResults && context.argv["error-on-unmatched-pattern"] !== false) { + if (noResults && context.argv.errorOnUnmatchedPattern !== false) { // If there was no files and no other errors, let's yield a general error. yield { error: `No matching files. Patterns: ${context.filePatterns.join(" ")}`, @@ -46,7 +46,7 @@ async function* expandPatterns(context) { async function* expandPatternsInternal(context) { // Ignores files in version control systems directories and `node_modules` const silentlyIgnoredDirs = [".git", ".svn", ".hg"]; - if (context.argv["with-node-modules"] !== true) { + if (context.argv.withNodeModules !== true) { silentlyIgnoredDirs.push("node_modules"); } const globOptions = { @@ -116,7 +116,7 @@ async function* expandPatternsInternal(context) { } if (result.length === 0) { - if (context.argv["error-on-unmatched-pattern"] !== false) { + if (context.argv.errorOnUnmatchedPattern !== false) { yield { error: `${errorMessages.emptyResults[type]}: "${input}".` }; } } else { diff --git a/src/cli/file-info.js b/src/cli/file-info.js index 36a8dbc41..8dc0f2d9e 100644 --- a/src/cli/file-info.js +++ b/src/cli/file-info.js @@ -5,20 +5,24 @@ const stringify = require("fast-json-stable-stringify"); const prettier = require("../index.js"); async function logFileInfoOrDie(context) { - const options = { - ignorePath: context.argv["ignore-path"], - withNodeModules: context.argv["with-node-modules"], - plugins: context.argv.plugin, - pluginSearchDirs: context.argv["plugin-search-dir"], - resolveConfig: context.argv.config !== false, - }; + const { + fileInfo: file, + ignorePath, + withNodeModules, + plugins, + pluginSearchDirs, + config, + } = context.argv; - context.logger.log( - prettier.format( - stringify(await prettier.getFileInfo(context.argv["file-info"], options)), - { parser: "json" } - ) - ); + const fileInfo = await prettier.getFileInfo(file, { + ignorePath, + withNodeModules, + plugins, + pluginSearchDirs, + resolveConfig: config !== false, + }); + + context.logger.log(prettier.format(stringify(fileInfo), { parser: "json" })); } module.exports = logFileInfoOrDie; diff --git a/src/cli/find-config-path.js b/src/cli/find-config-path.js index b2a0e7d14..05283fe3b 100644 --- a/src/cli/find-config-path.js +++ b/src/cli/find-config-path.js @@ -6,7 +6,7 @@ const path = require("path"); const prettier = require("../index.js"); async function logResolvedConfigPathOrDie(context) { - const file = context.argv["find-config-path"]; + const file = context.argv.findConfigPath; const configFile = await prettier.resolveConfigFile(file); if (configFile) { context.logger.log(path.relative(process.cwd(), configFile)); diff --git a/src/cli/format.js b/src/cli/format.js index bf61bef46..13aeca6f8 100644 --- a/src/cli/format.js +++ b/src/cli/format.js @@ -25,16 +25,13 @@ function handleError(context, filename, error, printedFilename) { if (error instanceof errors.UndefinedParserError) { // Can't test on CI, `isTTY()` is always false, see ./is-tty.js /* istanbul ignore next */ - if ( - (context.argv.write || context.argv["ignore-unknown"]) && - printedFilename - ) { + if ((context.argv.write || context.argv.ignoreUnknown) && printedFilename) { printedFilename.clear(); } - if (context.argv["ignore-unknown"]) { + if (context.argv.ignoreUnknown) { return; } - if (!context.argv.check && !context.argv["list-different"]) { + if (!context.argv.check && !context.argv.listDifferent) { process.exitCode = 2; } context.logger.error(error.message); @@ -73,7 +70,7 @@ function handleError(context, filename, error, printedFilename) { function writeOutput(context, result, options) { // Don't use `console.log` here since it adds an extra newline at the end. process.stdout.write( - context.argv["debug-check"] ? result.filepath : result.formatted + context.argv.debugCheck ? result.filepath : result.formatted ); if (options && options.cursorOffset >= 0) { @@ -82,7 +79,7 @@ function writeOutput(context, result, options) { } function listDifferent(context, input, options, filename) { - if (!context.argv.check && !context.argv["list-different"]) { + if (!context.argv.check && !context.argv.listDifferent) { return; } @@ -112,12 +109,12 @@ function format(context, input, opt) { ); } - if (context.argv["debug-print-doc"]) { + if (context.argv.debugPrintDoc) { const doc = prettier.__debug.printToDoc(input, opt); return { formatted: prettier.__debug.formatDoc(doc) + "\n" }; } - if (context.argv["debug-print-comments"]) { + if (context.argv.debugPrintComments) { return { formatted: prettier.format( JSON.stringify(prettier.formatWithCursor(input, opt).comments || []), @@ -126,14 +123,14 @@ function format(context, input, opt) { }; } - if (context.argv["debug-print-ast"]) { + if (context.argv.debugPrintAst) { const { ast } = prettier.__debug.parse(input, opt); return { formatted: JSON.stringify(ast), }; } - if (context.argv["debug-check"]) { + if (context.argv.debugCheck) { const pp = prettier.format(input, opt); const pppp = prettier.format(pp, opt); if (pp !== pppp) { @@ -168,7 +165,7 @@ function format(context, input, opt) { } /* istanbul ignore next */ - if (context.argv["debug-benchmark"]) { + if (context.argv.debugBenchmark) { let benchmark; try { // eslint-disable-next-line import/no-extraneous-dependencies @@ -199,8 +196,8 @@ function format(context, input, opt) { ); }) .run({ async: false }); - } else if (context.argv["debug-repeat"] > 0) { - const repeat = context.argv["debug-repeat"]; + } else if (context.argv.debugRepeat > 0) { + const repeat = context.argv.debugRepeat; context.logger.debug( "'--debug-repeat' option found, running formatWithCursor " + repeat + @@ -231,8 +228,8 @@ function format(context, input, opt) { async function createIgnorerFromContextOrDie(context) { try { return await createIgnorer( - context.argv["ignore-path"], - context.argv["with-node-modules"] + context.argv.ignorePath, + context.argv.withNodeModules ); } catch (e) { context.logger.error(e.message); @@ -241,15 +238,15 @@ async function createIgnorerFromContextOrDie(context) { } async function formatStdin(context) { - const filepath = context.argv["stdin-filepath"] - ? path.resolve(process.cwd(), context.argv["stdin-filepath"]) + const filepath = context.argv.filepath + ? path.resolve(process.cwd(), context.argv.filepath) : process.cwd(); const ignorer = await createIgnorerFromContextOrDie(context); // If there's an ignore-path set, the filename must be relative to the // ignore path, not the current working directory. - const relativeFilepath = context.argv["ignore-path"] - ? path.relative(path.dirname(context.argv["ignore-path"]), filepath) + const relativeFilepath = context.argv.ignorePath + ? path.relative(path.dirname(context.argv.ignorePath), filepath) : path.relative(process.cwd(), filepath); try { @@ -297,17 +294,17 @@ async function formatFiles(context) { const filename = pathOrError; // If there's an ignore-path set, the filename must be relative to the // ignore path, not the current working directory. - const ignoreFilename = context.argv["ignore-path"] - ? path.relative(path.dirname(context.argv["ignore-path"]), filename) + const ignoreFilename = context.argv.ignorePath + ? path.relative(path.dirname(context.argv.ignorePath), filename) : filename; const fileIgnored = ignorer.ignores(fixWindowsSlashes(ignoreFilename)); if ( fileIgnored && - (context.argv["debug-check"] || + (context.argv.debugCheck || context.argv.write || context.argv.check || - context.argv["list-different"]) + context.argv.listDifferent) ) { continue; } @@ -375,7 +372,7 @@ async function formatFiles(context) { // Don't write the file if it won't change in order not to invalidate // mtime based caches. if (isDifferent) { - if (!context.argv.check && !context.argv["list-different"]) { + if (!context.argv.check && !context.argv.listDifferent) { context.logger.log(`${filename} ${Date.now() - start}ms`); } @@ -391,24 +388,24 @@ async function formatFiles(context) { /* istanbul ignore next */ process.exitCode = 2; } - } else if (!context.argv.check && !context.argv["list-different"]) { + } else if (!context.argv.check && !context.argv.listDifferent) { context.logger.log(`${chalk.grey(filename)} ${Date.now() - start}ms`); } - } else if (context.argv["debug-check"]) { + } else if (context.argv.debugCheck) { /* istanbul ignore else */ if (result.filepath) { context.logger.log(result.filepath); } else { process.exitCode = 2; } - } else if (!context.argv.check && !context.argv["list-different"]) { + } else if (!context.argv.check && !context.argv.listDifferent) { writeOutput(context, result, options); } if (isDifferent) { if (context.argv.check) { context.logger.warn(filename); - } else if (context.argv["list-different"]) { + } else if (context.argv.listDifferent) { context.logger.log(filename); } numberOfUnformattedFilesFound += 1; @@ -430,7 +427,7 @@ async function formatFiles(context) { // Ensure non-zero exitCode when using --check/list-different is not combined with --write if ( - (context.argv.check || context.argv["list-different"]) && + (context.argv.check || context.argv.listDifferent) && numberOfUnformattedFilesFound > 0 && !process.exitCode && !context.argv.write diff --git a/src/cli/index.js b/src/cli/index.js index ef33f8308..f43fb0b43 100644 --- a/src/cli/index.js +++ b/src/cli/index.js @@ -42,19 +42,19 @@ async function main(rawArguments, logger) { logger.debug(`normalized argv: ${JSON.stringify(context.argv)}`); - if (context.argv.check && context.argv["list-different"]) { + if (context.argv.check && context.argv.listDifferent) { throw new Error("Cannot use --check and --list-different together."); } - if (context.argv.write && context.argv["debug-check"]) { + if (context.argv.write && context.argv.debugCheck) { throw new Error("Cannot use --write and --debug-check together."); } - if (context.argv["find-config-path"] && context.filePatterns.length > 0) { + if (context.argv.findConfigPath && context.filePatterns.length > 0) { throw new Error("Cannot use --find-config-path with multiple files"); } - if (context.argv["file-info"] && context.filePatterns.length > 0) { + if (context.argv.fileInfo && context.filePatterns.length > 0) { throw new Error("Cannot use --file-info with multiple files"); } @@ -72,7 +72,7 @@ async function main(rawArguments, logger) { return; } - if (context.argv["support-info"]) { + if (context.argv.supportInfo) { logger.log( prettier.format(stringify(prettier.getSupportInfo()), { parser: "json", @@ -83,12 +83,11 @@ async function main(rawArguments, logger) { const hasFilePatterns = context.filePatterns.length > 0; const useStdin = - !hasFilePatterns && - (!process.stdin.isTTY || context.argv["stdin-filepath"]); + !hasFilePatterns && (!process.stdin.isTTY || context.argv.filePath); - if (context.argv["find-config-path"]) { + if (context.argv.findConfigPath) { await logResolvedConfigPathOrDie(context); - } else if (context.argv["file-info"]) { + } else if (context.argv.fileInfo) { await logFileInfoOrDie(context); } else if (useStdin) { await formatStdin(context); diff --git a/src/cli/options/get-options-for-file.js b/src/cli/options/get-options-for-file.js index 8efbdaa58..e91fab07a 100644 --- a/src/cli/options/get-options-for-file.js +++ b/src/cli/options/get-options-for-file.js @@ -87,7 +87,7 @@ async function getOptionsOrDie(context, filePath) { function applyConfigPrecedence(context, options) { try { - switch (context.argv["config-precedence"]) { + switch (context.argv.configPrecedence) { case "cli-override": return parseArgsToOptions(context, options); case "file-override": @@ -124,7 +124,7 @@ async function getOptionsForFile(context, filepath) { }; context.logger.debug( - `applied config-precedence (${context.argv["config-precedence"]}): ` + + `applied config-precedence (${context.argv.configPrecedence}): ` + `${JSON.stringify(appliedOptions)}` ); diff --git a/src/cli/options/parse-cli-arguments.js b/src/cli/options/parse-cli-arguments.js index 3cabe9bd1..1dc14b1bd 100644 --- a/src/cli/options/parse-cli-arguments.js +++ b/src/cli/options/parse-cli-arguments.js @@ -1,5 +1,6 @@ "use strict"; const pick = require("lodash/pick"); +const camelCase = require("camelcase"); const { optionsNormalizer: { normalizeCliOptions }, } = require("../prettier-internal.js"); @@ -18,7 +19,18 @@ function parseArgv(rawArguments, detailedOptions, logger, keys) { argv = pick(argv, keys); } - return normalizeCliOptions(argv, detailedOptions, { logger }); + const normalized = normalizeCliOptions(argv, detailedOptions, { logger }); + + return Object.fromEntries( + Object.entries(normalized).map(([key, value]) => { + const option = detailedOptions.find(({ name }) => name === key) || {}; + // If the flag is a prettier option, use the option name + // `--plugin-search-dir` -> `pluginSearchDirs` + // Otherwise use camel case for readability + // `--ignore-unknown` -> `ignoreUnknown` + return [option.forwardToApi || camelCase(key), value]; + }) + ); } const detailedOptionsWithoutPlugins = getContextOptions().detailedOptions; diff --git a/tests/integration/__tests__/__snapshots__/arg-parsing.js.snap b/tests/integration/__tests__/__snapshots__/arg-parsing.js.snap index 4ad38e029..f9685bf09 100644 --- a/tests/integration/__tests__/__snapshots__/arg-parsing.js.snap +++ b/tests/integration/__tests__/__snapshots__/arg-parsing.js.snap @@ -62,6 +62,19 @@ exports[`number file/dir (stdout) 5`] = ` " `; +exports[`options with \`cliName\` should not allow to pass directly (stderr) 1`] = ` +"[warn] Ignored unknown option --filepath=file.js. +[error] No parser and no file path given, couldn't infer a parser. +" +`; + +exports[`options with \`cliName\` should not allow to pass directly (stdout) 1`] = ` +"prettier(); +" +`; + +exports[`options with \`cliName\` should not allow to pass directly (stdout) 2`] = `""`; + exports[`unknown negated options are warned (stderr) 1`] = ` "[warn] Ignored unknown option --no-unknown. " diff --git a/tests/integration/__tests__/arg-parsing.js b/tests/integration/__tests__/arg-parsing.js index cf03ce754..d04a45f24 100644 --- a/tests/integration/__tests__/arg-parsing.js +++ b/tests/integration/__tests__/arg-parsing.js @@ -94,3 +94,16 @@ describe("deprecated option values are warned", () => { status: 0, }); }); + +describe("options with `cliName` should not allow to pass directly", () => { + // `filepath` can only pass through `--stdin-filepath` + // `plugins` and `pluginSearchDirs` works the same + runPrettier("cli/arg-parsing", ["--stdin-filepath", "file.js"], { + isTTY: false, + input: "prettier()", + }).test({ status: 0, stderr: "", write: [] }); + runPrettier("cli/arg-parsing", ["--filepath", "file.js"], { + isTTY: false, + input: "prettier()", + }).test({ status: 2, write: [] }); +}); From 07f7ad8c7982485443cfe47e1b0255b56e17faf1 Mon Sep 17 00:00:00 2001 From: fisker Cheung Date: Sat, 18 Dec 2021 11:16:18 +0800 Subject: [PATCH 03/47] Improve shorthand specifier detection (#11941) --- src/language-js/loc.js | 6 +- src/language-js/print/module.js | 50 ++++++++-- .../__snapshots__/format-ast.js.snap | 21 ++++ tests/integration/__tests__/format-ast.js | 97 +++++++++++++++++++ 4 files changed, 165 insertions(+), 9 deletions(-) create mode 100644 tests/integration/__tests__/__snapshots__/format-ast.js.snap create mode 100644 tests/integration/__tests__/format-ast.js diff --git a/src/language-js/loc.js b/src/language-js/loc.js index 969025b5a..7c94dab01 100644 --- a/src/language-js/loc.js +++ b/src/language-js/loc.js @@ -32,7 +32,8 @@ function locEnd(node) { * @returns {boolean} */ function hasSameLocStart(nodeA, nodeB) { - return locStart(nodeA) === locStart(nodeB); + const nodeAStart = locStart(nodeA); + return Number.isInteger(nodeAStart) && nodeAStart === locStart(nodeB); } /** @@ -41,7 +42,8 @@ function hasSameLocStart(nodeA, nodeB) { * @returns {boolean} */ function hasSameLocEnd(nodeA, nodeB) { - return locEnd(nodeA) === locEnd(nodeB); + const nodeAEnd = locEnd(nodeA); + return Number.isInteger(nodeAEnd) && nodeAEnd === locEnd(nodeB); } /** diff --git a/src/language-js/print/module.js b/src/language-js/print/module.js index 4c71a00e7..11282ada8 100644 --- a/src/language-js/print/module.js +++ b/src/language-js/print/module.js @@ -11,6 +11,8 @@ const { CommentCheckFlags, shouldPrintComma, needsHardlineAfterDanglingComment, + isStringLiteral, + rawText, } = require("../utils.js"); const { locStart, hasSameLoc } = require("../loc.js"); const { @@ -294,6 +296,8 @@ function printModuleSpecifier(path, options, print) { const isImport = type.startsWith("Import"); const leftSideProperty = isImport ? "imported" : "local"; const rightSideProperty = isImport ? "local" : "exported"; + const leftSideNode = node[leftSideProperty]; + const rightSideNode = node[rightSideProperty]; let left = ""; let right = ""; if ( @@ -301,16 +305,11 @@ function printModuleSpecifier(path, options, print) { type === "ImportNamespaceSpecifier" ) { left = "*"; - } else if (node[leftSideProperty]) { + } else if (leftSideNode) { left = print(leftSideProperty); } - if ( - node[rightSideProperty] && - (!node[leftSideProperty] || - // import {a as a} from '.' - !hasSameLoc(node[leftSideProperty], node[rightSideProperty])) - ) { + if (rightSideNode && !isShorthandSpecifier(node)) { right = print(rightSideProperty); } @@ -318,6 +317,43 @@ function printModuleSpecifier(path, options, print) { return parts; } +function isShorthandSpecifier(specifier) { + if ( + specifier.type !== "ImportSpecifier" && + specifier.type !== "ExportSpecifier" + ) { + return false; + } + + const { + local, + [specifier.type === "ImportSpecifier" ? "imported" : "exported"]: + importedOrExported, + } = specifier; + + if ( + local.type !== importedOrExported.type || + !hasSameLoc(local, importedOrExported) + ) { + return false; + } + + if (isStringLiteral(local)) { + return ( + local.value === importedOrExported.value && + rawText(local) === rawText(importedOrExported) + ); + } + + switch (local.type) { + case "Identifier": + return local.name === importedOrExported.name; + default: + /* istanbul ignore next */ + return false; + } +} + module.exports = { printImportDeclaration, printExportDeclaration, diff --git a/tests/integration/__tests__/__snapshots__/format-ast.js.snap b/tests/integration/__tests__/__snapshots__/format-ast.js.snap new file mode 100644 index 000000000..422eaeb0b --- /dev/null +++ b/tests/integration/__tests__/__snapshots__/format-ast.js.snap @@ -0,0 +1,21 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`formatAST Shorthand specifier 1`] = ` +"export { specifier1 as specifier2 }; +" +`; + +exports[`formatAST Shorthand specifier 2 1`] = ` +"export { specifier1 as specifier2 }; +" +`; + +exports[`formatAST Shorthand specifier 3 1`] = ` +"export { \\"specifier\\" as specifier }; +" +`; + +exports[`formatAST Shorthand specifier 4 1`] = ` +"export { \\"specifier\\" as \\"specifier\\" }; +" +`; diff --git a/tests/integration/__tests__/format-ast.js b/tests/integration/__tests__/format-ast.js new file mode 100644 index 000000000..4ca37ee2f --- /dev/null +++ b/tests/integration/__tests__/format-ast.js @@ -0,0 +1,97 @@ +"use strict"; + +const { + __debug: { formatAST }, +} = require("prettier-local"); + +describe("formatAST", () => { + const formatExportSpecifier = (specifier) => { + const { formatted } = formatAST( + { + type: "Program", + body: [ + { + type: "ExportNamedDeclaration", + specifiers: [specifier], + }, + ], + }, + { parser: "meriyah" } + ); + + return formatted; + }; + + test("Shorthand specifier", () => { + expect( + formatExportSpecifier({ + type: "ExportSpecifier", + local: { + type: "Identifier", + name: "specifier1", + }, + exported: { + type: "Identifier", + name: "specifier2", + }, + }) + ).toMatchSnapshot(); + }); + + test("Shorthand specifier 2", () => { + expect( + formatExportSpecifier({ + type: "ExportSpecifier", + local: { + type: "Identifier", + name: "specifier1", + range: [0, 0], + }, + exported: { + type: "Identifier", + name: "specifier2", + range: [0, 0], + }, + }) + ).toMatchSnapshot(); + }); + + test("Shorthand specifier 3", () => { + expect( + formatExportSpecifier({ + type: "ExportSpecifier", + local: { + type: "Literal", + value: "specifier", + raw: '"specifier"', + range: [0, 0], + }, + exported: { + type: "Identifier", + name: "specifier", + range: [0, 0], + }, + }) + ).toMatchSnapshot(); + }); + + test("Shorthand specifier 4", () => { + expect( + formatExportSpecifier({ + type: "ExportSpecifier", + local: { + type: "Literal", + value: "specifier", + raw: '"specifier"', + range: [0, 0], + }, + exported: { + type: "Literal", + value: "specifier", + raw: "'specifier'", + range: [0, 0], + }, + }) + ).toMatchSnapshot(); + }); +}); From 235328add946890d70020ddd12a1c72bc9c32688 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 18 Dec 2021 23:44:13 -0300 Subject: [PATCH 04/47] Build(deps-dev): Bump jest from 27.4.4 to 27.4.5 in /scripts/release (#11989) --- scripts/release/package.json | 2 +- scripts/release/yarn.lock | 228 +++++++++++++++++------------------ 2 files changed, 115 insertions(+), 115 deletions(-) diff --git a/scripts/release/package.json b/scripts/release/package.json index 0454b4e2e..9a5d1a735 100644 --- a/scripts/release/package.json +++ b/scripts/release/package.json @@ -15,6 +15,6 @@ }, "devDependencies": { "@jest/globals": "27.4.4", - "jest": "27.4.4" + "jest": "27.4.5" } } diff --git a/scripts/release/yarn.lock b/scripts/release/yarn.lock index 15ee8da30..100e12d43 100644 --- a/scripts/release/yarn.lock +++ b/scripts/release/yarn.lock @@ -330,15 +330,15 @@ jest-util "^27.4.2" slash "^3.0.0" -"@jest/core@^27.4.4": - version "27.4.4" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.4.4.tgz#f2ba293235ca23fb48b4b923ccfe67c17e791a92" - integrity sha512-xBNPVqYAdAiAMXnb4ugx9Cdmr0S52lBsLbQMR/sGBRO0810VSPKiuSDtuup6qdkK1e9vxbv3KK3IAP1QFAp8mw== +"@jest/core@^27.4.5": + version "27.4.5" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.4.5.tgz#cae2dc34259782f4866c6606c3b480cce920ed4c" + integrity sha512-3tm/Pevmi8bDsgvo73nX8p/WPng6KWlCyScW10FPEoN1HU4pwI83tJ3TsFvi1FfzsjwUlMNEPowgb/rPau/LTQ== dependencies: "@jest/console" "^27.4.2" - "@jest/reporters" "^27.4.4" + "@jest/reporters" "^27.4.5" "@jest/test-result" "^27.4.2" - "@jest/transform" "^27.4.4" + "@jest/transform" "^27.4.5" "@jest/types" "^27.4.2" "@types/node" "*" ansi-escapes "^4.2.1" @@ -347,15 +347,15 @@ exit "^0.1.2" graceful-fs "^4.2.4" jest-changed-files "^27.4.2" - jest-config "^27.4.4" - jest-haste-map "^27.4.4" + jest-config "^27.4.5" + jest-haste-map "^27.4.5" jest-message-util "^27.4.2" jest-regex-util "^27.4.0" - jest-resolve "^27.4.4" - jest-resolve-dependencies "^27.4.4" - jest-runner "^27.4.4" - jest-runtime "^27.4.4" - jest-snapshot "^27.4.4" + jest-resolve "^27.4.5" + jest-resolve-dependencies "^27.4.5" + jest-runner "^27.4.5" + jest-runtime "^27.4.5" + jest-snapshot "^27.4.5" jest-util "^27.4.2" jest-validate "^27.4.2" jest-watcher "^27.4.2" @@ -395,15 +395,15 @@ "@jest/types" "^27.4.2" expect "^27.4.2" -"@jest/reporters@^27.4.4": - version "27.4.4" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.4.4.tgz#9e809829f602cd6e68bd058d1ea528f4b7482365" - integrity sha512-ssyJSw9B9Awb1QaxDhIPSs4de1b7SE2kv7tqFehQL13xpn5HUkMYZK/ufTOXiCAnXFOZS+XDl1GaQ/LmJAzI1A== +"@jest/reporters@^27.4.5": + version "27.4.5" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.4.5.tgz#e229acca48d18ea39e805540c1c322b075ae63ad" + integrity sha512-3orsG4vi8zXuBqEoy2LbnC1kuvkg1KQUgqNxmxpQgIOQEPeV0onvZu+qDQnEoX8qTQErtqn/xzcnbpeTuOLSiA== dependencies: "@bcoe/v8-coverage" "^0.2.3" "@jest/console" "^27.4.2" "@jest/test-result" "^27.4.2" - "@jest/transform" "^27.4.4" + "@jest/transform" "^27.4.5" "@jest/types" "^27.4.2" "@types/node" "*" chalk "^4.0.0" @@ -416,10 +416,10 @@ istanbul-lib-report "^3.0.0" istanbul-lib-source-maps "^4.0.0" istanbul-reports "^3.0.2" - jest-haste-map "^27.4.4" - jest-resolve "^27.4.4" + jest-haste-map "^27.4.5" + jest-resolve "^27.4.5" jest-util "^27.4.2" - jest-worker "^27.4.4" + jest-worker "^27.4.5" slash "^3.0.0" source-map "^0.6.0" string-length "^4.0.1" @@ -445,20 +445,20 @@ "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" -"@jest/test-sequencer@^27.4.4": - version "27.4.4" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.4.4.tgz#60be14369b2702e42d6042e71b8ab3fc69f5ce68" - integrity sha512-mCh+d4JTGTtX7vr13d7q2GHJy33nAobEwtEJ8X3u7R8+0ImVO2eAsQzsLfX8lyvdYHBxYABhqbYuaUNo42/pQw== +"@jest/test-sequencer@^27.4.5": + version "27.4.5" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.4.5.tgz#1d7e026844d343b60d2ca7fd82c579a17b445d7d" + integrity sha512-n5woIn/1v+FT+9hniymHPARA9upYUmfi5Pw9ewVwXCDlK4F5/Gkees9v8vdjGdAIJ2MPHLHodiajLpZZanWzEQ== dependencies: "@jest/test-result" "^27.4.2" graceful-fs "^4.2.4" - jest-haste-map "^27.4.4" - jest-runtime "^27.4.4" + jest-haste-map "^27.4.5" + jest-runtime "^27.4.5" -"@jest/transform@^27.4.4": - version "27.4.4" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.4.4.tgz#347e39402730879ba88c6ea6982db0d88640aa78" - integrity sha512-7U/nDSrGsGzL7+X8ScNFV71w8u8knJQWSa9C2xsrrKLMOgb+rWuCG4VAyWke/53BU96GnT+Ka81xCAHA5gk6zA== +"@jest/transform@^27.4.5": + version "27.4.5" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.4.5.tgz#3dfe2e3680cd4aa27356172bf25617ab5b94f195" + integrity sha512-PuMet2UlZtlGzwc6L+aZmR3I7CEBpqadO03pU40l2RNY2fFJ191b9/ITB44LNOhVtsyykx0OZvj0PCyuLm7Eew== dependencies: "@babel/core" "^7.1.0" "@jest/types" "^27.4.2" @@ -467,7 +467,7 @@ convert-source-map "^1.4.0" fast-json-stable-stringify "^2.0.0" graceful-fs "^4.2.4" - jest-haste-map "^27.4.4" + jest-haste-map "^27.4.5" jest-regex-util "^27.4.0" jest-util "^27.4.2" micromatch "^4.0.4" @@ -688,12 +688,12 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= -babel-jest@^27.4.4: - version "27.4.4" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.4.4.tgz#a012441f8a155df909839543a09510ab3477aa11" - integrity sha512-+6RVutZxOQgJkt4svgTHPFtOQlVe9dUg3wrimIAM38pY6hL/nsL8glfFSUjD9jNVjaVjzkCzj6loFFecrjr9Qw== +babel-jest@^27.4.5: + version "27.4.5" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.4.5.tgz#d38bd0be8ea71d8b97853a5fc9f76deeb095c709" + integrity sha512-3uuUTjXbgtODmSv/DXO9nZfD52IyC2OYTFaXGRzL0kpykzroaquCrD5+lZNafTvZlnNqZHt5pb0M08qVBZnsnA== dependencies: - "@jest/transform" "^27.4.4" + "@jest/transform" "^27.4.5" "@jest/types" "^27.4.2" "@types/babel__core" "^7.1.14" babel-plugin-istanbul "^6.0.0" @@ -1417,10 +1417,10 @@ jest-changed-files@^27.4.2: execa "^5.0.0" throat "^6.0.1" -jest-circus@^27.4.4: - version "27.4.4" - resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.4.4.tgz#8bf89aa604b914ecc10e3d895aae283b529f965d" - integrity sha512-4DWhvQerDq5X4GaqhEUoZiBhuNdKDGr0geW0iJwarbDljAmGaGOErKQG+z2PBr0vgN05z7tsGSY51mdWr8E4xg== +jest-circus@^27.4.5: + version "27.4.5" + resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.4.5.tgz#70bfb78e0200cab9b84747bf274debacaa538467" + integrity sha512-eTNWa9wsvBwPykhMMShheafbwyakcdHZaEYh5iRrQ0PFJxkDP/e3U/FvzGuKWu2WpwUA3C3hPlfpuzvOdTVqnw== dependencies: "@jest/environment" "^27.4.4" "@jest/test-result" "^27.4.2" @@ -1434,54 +1434,54 @@ jest-circus@^27.4.4: jest-each "^27.4.2" jest-matcher-utils "^27.4.2" jest-message-util "^27.4.2" - jest-runtime "^27.4.4" - jest-snapshot "^27.4.4" + jest-runtime "^27.4.5" + jest-snapshot "^27.4.5" jest-util "^27.4.2" pretty-format "^27.4.2" slash "^3.0.0" stack-utils "^2.0.3" throat "^6.0.1" -jest-cli@^27.4.4: - version "27.4.4" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.4.4.tgz#7115ff01f605c2c848314141b1ac144099ddeed5" - integrity sha512-+MfsHnZPUOBigCBURuQFRpgYoPCgmIFkICkqt4SrramZCUp/UAuWcst4pMZb84O3VU8JyKJmnpGG4qH8ClQloA== +jest-cli@^27.4.5: + version "27.4.5" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.4.5.tgz#8708f54c28d13681f3255ec9026a2b15b03d41e8" + integrity sha512-hrky3DSgE0u7sQxaCL7bdebEPHx5QzYmrGuUjaPLmPE8jx5adtvGuOlRspvMoVLTTDOHRnZDoRLYJuA+VCI7Hg== dependencies: - "@jest/core" "^27.4.4" + "@jest/core" "^27.4.5" "@jest/test-result" "^27.4.2" "@jest/types" "^27.4.2" chalk "^4.0.0" exit "^0.1.2" graceful-fs "^4.2.4" import-local "^3.0.2" - jest-config "^27.4.4" + jest-config "^27.4.5" jest-util "^27.4.2" jest-validate "^27.4.2" prompts "^2.0.1" yargs "^16.2.0" -jest-config@^27.4.4: - version "27.4.4" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.4.4.tgz#0e3615392361baae0e29dbf64c296d5563d7e28b" - integrity sha512-6lxg0ugO6KS2zKEbpdDwBzu1IT0Xg4/VhxXMuBu+z/5FvBjLCEMTaWQm3bCaGCZUR9j9FK4DzUIxyhIgn6kVEg== +jest-config@^27.4.5: + version "27.4.5" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.4.5.tgz#77ed7f2ba7bcfd7d740ade711d0d13512e08a59e" + integrity sha512-t+STVJtPt+fpqQ8GBw850NtSQbnDOw/UzdPfzDaHQ48/AylQlW7LHj3dH+ndxhC1UxJ0Q3qkq7IH+nM1skwTwA== dependencies: "@babel/core" "^7.1.0" - "@jest/test-sequencer" "^27.4.4" + "@jest/test-sequencer" "^27.4.5" "@jest/types" "^27.4.2" - babel-jest "^27.4.4" + babel-jest "^27.4.5" chalk "^4.0.0" ci-info "^3.2.0" deepmerge "^4.2.2" glob "^7.1.1" graceful-fs "^4.2.4" - jest-circus "^27.4.4" + jest-circus "^27.4.5" jest-environment-jsdom "^27.4.4" jest-environment-node "^27.4.4" jest-get-type "^27.4.0" - jest-jasmine2 "^27.4.4" + jest-jasmine2 "^27.4.5" jest-regex-util "^27.4.0" - jest-resolve "^27.4.4" - jest-runner "^27.4.4" + jest-resolve "^27.4.5" + jest-runner "^27.4.5" jest-util "^27.4.2" jest-validate "^27.4.2" micromatch "^4.0.4" @@ -1546,10 +1546,10 @@ jest-get-type@^27.4.0: resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.4.0.tgz#7503d2663fffa431638337b3998d39c5e928e9b5" integrity sha512-tk9o+ld5TWq41DkK14L4wox4s2D9MtTpKaAVzXfr5CUKm5ZK2ExcaFE0qls2W71zE/6R2TxxrK9w2r6svAFDBQ== -jest-haste-map@^27.4.4: - version "27.4.4" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.4.4.tgz#ec6013845368a155372e25e42e2b77e6ecc5019f" - integrity sha512-kvspmHmgPIZoDaqUsvsJFTaspuxhATvdO6wsFNGNSi8kfdiOCEEvECNbht8xG+eE5Ol88JyJmp2D7RF4dYo85Q== +jest-haste-map@^27.4.5: + version "27.4.5" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.4.5.tgz#c2921224a59223f91e03ec15703905978ef0cc1a" + integrity sha512-oJm1b5qhhPs78K24EDGifWS0dELYxnoBiDhatT/FThgB9yxqUm5F6li3Pv+Q+apMBmmPNzOBnZ7ZxWMB1Leq1Q== dependencies: "@jest/types" "^27.4.2" "@types/graceful-fs" "^4.1.2" @@ -1560,16 +1560,16 @@ jest-haste-map@^27.4.4: jest-regex-util "^27.4.0" jest-serializer "^27.4.0" jest-util "^27.4.2" - jest-worker "^27.4.4" + jest-worker "^27.4.5" micromatch "^4.0.4" walker "^1.0.7" optionalDependencies: fsevents "^2.3.2" -jest-jasmine2@^27.4.4: - version "27.4.4" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.4.4.tgz#1fcdc64de932913366e7d5f2960c375e1145176e" - integrity sha512-ygk2tUgtLeN3ouj4KEYw9p81GLI1EKrnvourPULN5gdgB482PH5op9gqaRG0IenbJhBbbRwiSvh5NoBoQZSqdA== +jest-jasmine2@^27.4.5: + version "27.4.5" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.4.5.tgz#ff79d11561679ff6c89715b0cd6b1e8c0dfbc6dc" + integrity sha512-oUnvwhJDj2LhOiUB1kdnJjkx8C5PwgUZQb9urF77mELH9DGR4e2GqpWQKBOYXWs5+uTN9BGDqRz3Aeg5Wts7aw== dependencies: "@babel/traverse" "^7.1.0" "@jest/environment" "^27.4.4" @@ -1584,8 +1584,8 @@ jest-jasmine2@^27.4.4: jest-each "^27.4.2" jest-matcher-utils "^27.4.2" jest-message-util "^27.4.2" - jest-runtime "^27.4.4" - jest-snapshot "^27.4.4" + jest-runtime "^27.4.5" + jest-snapshot "^27.4.5" jest-util "^27.4.2" pretty-format "^27.4.2" throat "^6.0.1" @@ -1641,24 +1641,24 @@ jest-regex-util@^27.4.0: resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.4.0.tgz#e4c45b52653128843d07ad94aec34393ea14fbca" integrity sha512-WeCpMpNnqJYMQoOjm1nTtsgbR4XHAk1u00qDoNBQoykM280+/TmgA5Qh5giC1ecy6a5d4hbSsHzpBtu5yvlbEg== -jest-resolve-dependencies@^27.4.4: - version "27.4.4" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.4.4.tgz#dae11e067a6d6a9553f1386a0ea1efe5be0e2332" - integrity sha512-iAnpCXh81sd9nbyqySvm5/aV9X6JZKE0dQyFXTC8tptXcdrgS0vjPFy+mEgzPHxXw+tq4TQupuTa0n8OXwRIxw== +jest-resolve-dependencies@^27.4.5: + version "27.4.5" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.4.5.tgz#9398af854bdb12d6a9e5a8a536ee401f889a3ecf" + integrity sha512-elEVvkvRK51y037NshtEkEnukMBWvlPzZHiL847OrIljJ8yIsujD2GXRPqDXC4rEVKbcdsy7W0FxoZb4WmEs7w== dependencies: "@jest/types" "^27.4.2" jest-regex-util "^27.4.0" - jest-snapshot "^27.4.4" + jest-snapshot "^27.4.5" -jest-resolve@^27.4.4: - version "27.4.4" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.4.4.tgz#5b690662f54f38f7cfaffc0adcdb341ff7724408" - integrity sha512-Yh5jK3PBmDbm01Rc8pT0XqpBlTPEGwWp7cN61ijJuwony/tR2Taof3TLy6yfNiuRS8ucUOPO7NBYm3ei38kkcg== +jest-resolve@^27.4.5: + version "27.4.5" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.4.5.tgz#8dc44f5065fb8d58944c20f932cb7b9fe9760cca" + integrity sha512-xU3z1BuOz/hUhVUL+918KqUgK+skqOuUsAi7A+iwoUldK6/+PW+utK8l8cxIWT9AW7IAhGNXjSAh1UYmjULZZw== dependencies: "@jest/types" "^27.4.2" chalk "^4.0.0" graceful-fs "^4.2.4" - jest-haste-map "^27.4.4" + jest-haste-map "^27.4.5" jest-pnp-resolver "^1.2.2" jest-util "^27.4.2" jest-validate "^27.4.2" @@ -1666,15 +1666,15 @@ jest-resolve@^27.4.4: resolve.exports "^1.1.0" slash "^3.0.0" -jest-runner@^27.4.4: - version "27.4.4" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.4.4.tgz#0b40cdcbac293ebc4c19c2d7805d17ab1072f1fd" - integrity sha512-AXv/8Q0Xf1puWnDf52m7oLrK7sXcv6re0V/kItwTSVHJbX7Oebm07oGFQqGmq0R0mhO1zpmB3OpqRuaCN2elPA== +jest-runner@^27.4.5: + version "27.4.5" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.4.5.tgz#daba2ba71c8f34137dc7ac45616add35370a681e" + integrity sha512-/irauncTfmY1WkTaRQGRWcyQLzK1g98GYG/8QvIPviHgO1Fqz1JYeEIsSfF+9mc/UTA6S+IIHFgKyvUrtiBIZg== dependencies: "@jest/console" "^27.4.2" "@jest/environment" "^27.4.4" "@jest/test-result" "^27.4.2" - "@jest/transform" "^27.4.4" + "@jest/transform" "^27.4.5" "@jest/types" "^27.4.2" "@types/node" "*" chalk "^4.0.0" @@ -1684,27 +1684,27 @@ jest-runner@^27.4.4: jest-docblock "^27.4.0" jest-environment-jsdom "^27.4.4" jest-environment-node "^27.4.4" - jest-haste-map "^27.4.4" + jest-haste-map "^27.4.5" jest-leak-detector "^27.4.2" jest-message-util "^27.4.2" - jest-resolve "^27.4.4" - jest-runtime "^27.4.4" + jest-resolve "^27.4.5" + jest-runtime "^27.4.5" jest-util "^27.4.2" - jest-worker "^27.4.4" + jest-worker "^27.4.5" source-map-support "^0.5.6" throat "^6.0.1" -jest-runtime@^27.4.4: - version "27.4.4" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.4.4.tgz#0d486735e8a1c8bbcdbb9285b3155ed94c5e3670" - integrity sha512-tZGay6P6vXJq8t4jVFAUzYHx+lzIHXjz+rj1XBk6mAR1Lwtf5kz0Uun7qNuU+oqpZu4+hhuxpUfXb6j30bEPqA== +jest-runtime@^27.4.5: + version "27.4.5" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.4.5.tgz#97703ad2a1799d4f50ab59049bd21a9ceaed2813" + integrity sha512-CIYqwuJQXHQtPd/idgrx4zgJ6iCb6uBjQq1RSAGQrw2S8XifDmoM1Ot8NRd80ooAm+ZNdHVwsktIMGlA1F1FAQ== dependencies: "@jest/console" "^27.4.2" "@jest/environment" "^27.4.4" "@jest/globals" "^27.4.4" "@jest/source-map" "^27.4.0" "@jest/test-result" "^27.4.2" - "@jest/transform" "^27.4.4" + "@jest/transform" "^27.4.5" "@jest/types" "^27.4.2" "@types/yargs" "^16.0.0" chalk "^4.0.0" @@ -1714,12 +1714,12 @@ jest-runtime@^27.4.4: exit "^0.1.2" glob "^7.1.3" graceful-fs "^4.2.4" - jest-haste-map "^27.4.4" + jest-haste-map "^27.4.5" jest-message-util "^27.4.2" jest-mock "^27.4.2" jest-regex-util "^27.4.0" - jest-resolve "^27.4.4" - jest-snapshot "^27.4.4" + jest-resolve "^27.4.5" + jest-snapshot "^27.4.5" jest-util "^27.4.2" jest-validate "^27.4.2" slash "^3.0.0" @@ -1734,10 +1734,10 @@ jest-serializer@^27.4.0: "@types/node" "*" graceful-fs "^4.2.4" -jest-snapshot@^27.4.4: - version "27.4.4" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.4.4.tgz#fc0a2cd22f742fe66621c5359c9cd64f88260c6b" - integrity sha512-yy+rpCvYMOjTl7IMuaMI9OP9WT229zi8BhdNHm6e6mttAOIzvIiCxFoZ6yRxaV3HDPPgMryi+ReX2b8+IQJdPA== +jest-snapshot@^27.4.5: + version "27.4.5" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.4.5.tgz#2ea909b20aac0fe62504bc161331f730b8a7ecc7" + integrity sha512-eCi/iM1YJFrJWiT9de4+RpWWWBqsHiYxFG9V9o/n0WXs6GpW4lUt4FAHAgFPTLPqCUVzrMQmSmTZSgQzwqR7IQ== dependencies: "@babel/core" "^7.7.2" "@babel/generator" "^7.7.2" @@ -1745,7 +1745,7 @@ jest-snapshot@^27.4.4: "@babel/plugin-syntax-typescript" "^7.7.2" "@babel/traverse" "^7.7.2" "@babel/types" "^7.0.0" - "@jest/transform" "^27.4.4" + "@jest/transform" "^27.4.5" "@jest/types" "^27.4.2" "@types/babel__traverse" "^7.0.4" "@types/prettier" "^2.1.5" @@ -1755,10 +1755,10 @@ jest-snapshot@^27.4.4: graceful-fs "^4.2.4" jest-diff "^27.4.2" jest-get-type "^27.4.0" - jest-haste-map "^27.4.4" + jest-haste-map "^27.4.5" jest-matcher-utils "^27.4.2" jest-message-util "^27.4.2" - jest-resolve "^27.4.4" + jest-resolve "^27.4.5" jest-util "^27.4.2" natural-compare "^1.4.0" pretty-format "^27.4.2" @@ -1801,23 +1801,23 @@ jest-watcher@^27.4.2: jest-util "^27.4.2" string-length "^4.0.1" -jest-worker@^27.4.4: - version "27.4.4" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.4.4.tgz#9390a97c013a54d07f5c2ad2b5f6109f30c4966d" - integrity sha512-jfwxYJvfua1b1XkyuyPh01ATmgg4e5fPM/muLmhy9Qc6dmiwacQB0MLHaU6IjEsv/+nAixHGxTn8WllA27Pn0w== +jest-worker@^27.4.5: + version "27.4.5" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.4.5.tgz#d696e3e46ae0f24cff3fa7195ffba22889262242" + integrity sha512-f2s8kEdy15cv9r7q4KkzGXvlY0JTcmCbMHZBfSQDwW77REr45IDWwd0lksDFeVHH2jJ5pqb90T77XscrjeGzzg== dependencies: "@types/node" "*" merge-stream "^2.0.0" supports-color "^8.0.0" -jest@27.4.4: - version "27.4.4" - resolved "https://registry.yarnpkg.com/jest/-/jest-27.4.4.tgz#9b1aa1db25d0b13477a49d18e22ba7cdff97105b" - integrity sha512-AXwEIFa58Uf1Jno3/KSo5HZZ0/2Xwqvfrz0/3bmTwImkFlbOvz5vARAW9nTrxRLkojjkitaZ1KNKAtw3JRFAaA== +jest@27.4.5: + version "27.4.5" + resolved "https://registry.yarnpkg.com/jest/-/jest-27.4.5.tgz#66e45acba44137fac26be9d3cc5bb031e136dc0f" + integrity sha512-uT5MiVN3Jppt314kidCk47MYIRilJjA/l2mxwiuzzxGUeJIvA8/pDaJOAX5KWvjAo7SCydcW0/4WEtgbLMiJkg== dependencies: - "@jest/core" "^27.4.4" + "@jest/core" "^27.4.5" import-local "^3.0.2" - jest-cli "^27.4.4" + jest-cli "^27.4.5" js-tokens@^4.0.0: version "4.0.0" From ff9bc20b35d9b366692a6b7307fb978947342b76 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 18 Dec 2021 23:45:47 -0300 Subject: [PATCH 05/47] Build(deps-dev): Bump terser-webpack-plugin from 5.2.4 to 5.3.0 (#11988) --- package.json | 2 +- yarn.lock | 35 +++++++---------------------------- 2 files changed, 8 insertions(+), 29 deletions(-) diff --git a/package.json b/package.json index 20f72ba28..20c0b90b3 100644 --- a/package.json +++ b/package.json @@ -137,7 +137,7 @@ "snapshot-diff": "0.9.0", "string-replace-loader": "3.1.0", "tempy": "1.0.1", - "terser-webpack-plugin": "5.2.4", + "terser-webpack-plugin": "5.3.0", "webpack": "5.49.0" }, "scripts": { diff --git a/yarn.lock b/yarn.lock index 3f5ae5f95..4c8122a8e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4505,16 +4505,7 @@ jest-worker@^26.2.1: merge-stream "^2.0.0" supports-color "^7.0.0" -jest-worker@^27.0.6, jest-worker@^27.4.2: - version "27.4.2" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.4.2.tgz#0fb123d50955af1a450267787f340a1bf7e12bc4" - integrity sha512-0QMy/zPovLfUPyHuOuuU4E+kGACXXE84nRnq6lBVI9GJg5DCBiA97SATi+ZP8CpiJwEQy1oCPjRBf8AnLjN+Ag== - dependencies: - "@types/node" "*" - merge-stream "^2.0.0" - supports-color "^8.0.0" - -jest-worker@^27.4.5: +jest-worker@^27.4.1, jest-worker@^27.4.2, jest-worker@^27.4.5: version "27.4.5" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.4.5.tgz#d696e3e46ae0f24cff3fa7195ffba22889262242" integrity sha512-f2s8kEdy15cv9r7q4KkzGXvlY0JTcmCbMHZBfSQDwW77REr45IDWwd0lksDFeVHH2jJ5pqb90T77XscrjeGzzg== @@ -5139,7 +5130,7 @@ p-limit@^2.2.0: dependencies: p-try "^2.0.0" -p-limit@^3.0.2, p-limit@^3.1.0: +p-limit@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== @@ -6177,24 +6168,12 @@ terminal-link@^2.0.0: ansi-escapes "^4.2.1" supports-hyperlinks "^2.0.0" -terser-webpack-plugin@5.2.4: - version "5.2.4" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.2.4.tgz#ad1be7639b1cbe3ea49fab995cbe7224b31747a1" - integrity sha512-E2CkNMN+1cho04YpdANyRrn8CyN4yMy+WdFKZIySFZrGXZxJwJP6PMNGGc/Mcr6qygQHUUqRxnAPmi0M9f00XA== +terser-webpack-plugin@5.3.0, terser-webpack-plugin@^5.1.3: + version "5.3.0" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.0.tgz#21641326486ecf91d8054161c816e464435bae9f" + integrity sha512-LPIisi3Ol4chwAaPP8toUJ3L4qCM1G0wao7L3qNv57Drezxj6+VEyySpPw4B1HSO2Eg/hDY/MNF5XihCAoqnsQ== dependencies: - jest-worker "^27.0.6" - p-limit "^3.1.0" - schema-utils "^3.1.1" - serialize-javascript "^6.0.0" - source-map "^0.6.1" - terser "^5.7.2" - -terser-webpack-plugin@^5.1.3: - version "5.2.5" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.2.5.tgz#ce65b9880a0c36872555c4874f45bbdb02ee32c9" - integrity sha512-3luOVHku5l0QBeYS8r4CdHYWEGMmIj3H1U64jgkdZzECcSOJAyJ9TjuqcQZvw1Y+4AOBN9SeYJPJmFn2cM4/2g== - dependencies: - jest-worker "^27.0.6" + jest-worker "^27.4.1" schema-utils "^3.1.1" serialize-javascript "^6.0.0" source-map "^0.6.1" From 0f5204cc1efbe1c9bb0b028d26bedbd4f78ec84b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 18 Dec 2021 23:46:49 -0300 Subject: [PATCH 06/47] Build(deps-dev): Bump eslint from 8.4.1 to 8.5.0 (#11987) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 20c0b90b3..cd37d7cca 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,7 @@ "cross-env": "7.0.3", "cspell": "5.13.3", "enquirer": "2.3.6", - "eslint": "8.4.1", + "eslint": "8.5.0", "eslint-config-prettier": "8.3.0", "eslint-formatter-friendly": "7.0.0", "eslint-plugin-compat": "4.0.0", diff --git a/yarn.lock b/yarn.lock index 4c8122a8e..6530a3ca6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3136,10 +3136,10 @@ eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.1.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz#eee4acea891814cda67a7d8812d9647dd0179af2" integrity sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA== -eslint@8.4.1: - version "8.4.1" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.4.1.tgz#d6531bbf3e598dffd7c0c7d35ec52a0b30fdfa2d" - integrity sha512-TxU/p7LB1KxQ6+7aztTnO7K0i+h0tDi81YRY9VzB6Id71kNz+fFYnf5HD5UOQmxkzcoa0TlVZf9dpMtUv0GpWg== +eslint@8.5.0: + version "8.5.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.5.0.tgz#ddd2c1afd8f412036f87ae2a063d2aa296d3175f" + integrity sha512-tVGSkgNbOfiHyVte8bCM8OmX+xG9PzVG/B4UCF60zx7j61WIVY/AqJECDgpLD4DbbESD0e174gOg3ZlrX15GDg== dependencies: "@eslint/eslintrc" "^1.0.5" "@humanwhocodes/config-array" "^0.9.2" From f2ef4a3a13fee1a6b63824214095a12320f206ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 18 Dec 2021 23:47:19 -0300 Subject: [PATCH 07/47] Build(deps-dev): Bump concurrently from 6.4.0 to 6.5.0 in /website (#11985) --- website/package.json | 2 +- website/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/website/package.json b/website/package.json index edfb593e5..a0616dca1 100644 --- a/website/package.json +++ b/website/package.json @@ -17,7 +17,7 @@ "@babel/preset-react": "7.16.0", "@sandhose/prettier-animated-logo": "1.0.3", "babel-loader": "8.2.3", - "concurrently": "6.4.0", + "concurrently": "6.5.0", "docusaurus": "1.14.7", "js-yaml": "4.1.0", "webpack": "5.65.0", diff --git a/website/yarn.lock b/website/yarn.lock index dc3c795fb..4b28184a5 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -2421,10 +2421,10 @@ concat-with-sourcemaps@*: dependencies: source-map "^0.6.1" -concurrently@6.4.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-6.4.0.tgz#5387ee86be435a0eb51c292ade8a00acf479f170" - integrity sha512-HZ3D0RTQMH3oS4gvtYj1P+NBc6PzE2McEra6yEFcQKrUQ9HvtTGU4Dbne083F034p+LRb7kWU0tPRNvSGs1UCQ== +concurrently@6.5.0: + version "6.5.0" + resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-6.5.0.tgz#57082bfe797f93cf4a437ce54742c56823a8ea05" + integrity sha512-BjC0KYxXtO6EiWa46gfWYzcLULPBCb+5+VZFtzCemR/co0QSHU4mysEvmT6cnedPpQ9dtJzb+2G694o3V7TgLg== dependencies: chalk "^4.1.0" date-fns "^2.16.1" From cf2b7011964e5b8f831d1f33895dcb19c512328d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Dec 2021 04:42:42 +0000 Subject: [PATCH 08/47] Build(deps-dev): Bump cspell from 5.13.3 to 5.13.4 (#11984) --- package.json | 2 +- yarn.lock | 83 ++++++++++++++++++++++++++-------------------------- 2 files changed, 43 insertions(+), 42 deletions(-) diff --git a/package.json b/package.json index cd37d7cca..a1a7b3fb7 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "builtin-modules": "3.2.0", "core-js": "3.20.0", "cross-env": "7.0.3", - "cspell": "5.13.3", + "cspell": "5.13.4", "enquirer": "2.3.6", "eslint": "8.5.0", "eslint-config-prettier": "8.3.0", diff --git a/yarn.lock b/yarn.lock index 6530a3ca6..775bd0058 100644 --- a/yarn.lock +++ b/yarn.lock @@ -936,10 +936,10 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@cspell/cspell-bundled-dicts@^5.13.3": - version "5.13.3" - resolved "https://registry.yarnpkg.com/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-5.13.3.tgz#67a306ee50ecd6502cdc90d9416c3506e8c3d112" - integrity sha512-IfjMBNA0M9QsZQW68rGNfWGawAAw5gkjDstuvsEuJfFoOHBT6NB8T5asGmMPJcRdfLvLSaVSG5IYnYWxL0wu/A== +"@cspell/cspell-bundled-dicts@^5.13.4": + version "5.13.4" + resolved "https://registry.yarnpkg.com/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-5.13.4.tgz#468d008c79bceb9728071c5fd8710e082d7895c7" + integrity sha512-D88zFAcEbUJiM03cY1U4Fb1c9BcECi6RvSwwJG/Ayc4lLO9uZgFyKlzQwjSEgTzuCME9A0Nn2hXrD+aWol85Mg== dependencies: "@cspell/dict-ada" "^1.1.2" "@cspell/dict-aws" "^1.0.14" @@ -979,10 +979,10 @@ "@cspell/dict-typescript" "^1.0.19" "@cspell/dict-vue" "^2.0.1" -"@cspell/cspell-types@^5.13.3": - version "5.13.3" - resolved "https://registry.yarnpkg.com/@cspell/cspell-types/-/cspell-types-5.13.3.tgz#5104c6cbbd19a71528b94100b3689978260aee8b" - integrity sha512-T70PvJQ5GV8BW7U2Q5mnrIB5poPnF7bNk7Cp95piYUcv/jlrPdWanDvdp+2gJLM+h0GUDRXscoX3Air4BmAwng== +"@cspell/cspell-types@^5.13.4": + version "5.13.4" + resolved "https://registry.yarnpkg.com/@cspell/cspell-types/-/cspell-types-5.13.4.tgz#5712d82b784859220b15c074e0c726a5d667d26d" + integrity sha512-OH3aqFfmRNOSO0K0h5JNm84I5RLDgngp1Qa9YeEm9oj1U/qjrm2bOwOGGh9XU/ZjLl56JMbtbnfSpHpT7tLc+A== "@cspell/dict-ada@^1.1.2": version "1.1.2" @@ -2600,40 +2600,40 @@ crypto-random-string@^2.0.0: resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== -cspell-gitignore@^5.13.3: - version "5.13.3" - resolved "https://registry.yarnpkg.com/cspell-gitignore/-/cspell-gitignore-5.13.3.tgz#e5486b22d1b685dba4f7962913ec60ce57059d30" - integrity sha512-/x8C9v0WINmyD6rgyX3OByN7lVgk1EIt0AGfYZXcVgx6iCpvBNyz8It1l3kaCEw5OPWyHvCEGeL8cy53y2dZxQ== +cspell-gitignore@^5.13.4: + version "5.13.4" + resolved "https://registry.yarnpkg.com/cspell-gitignore/-/cspell-gitignore-5.13.4.tgz#b87281716977728a1dc9e13e14a6ae962b0abc65" + integrity sha512-Md2V+EyILAavxO6CJ/Y/l8/p2nBFA0p1sMrjCEBtBuF3BL7A/A2LGaK4Tb+trVONFAKQ5cZo84WbyvSYWUqvpw== dependencies: - cspell-glob "^5.13.3" + cspell-glob "^5.13.4" find-up "^5.0.0" -cspell-glob@^5.13.3: - version "5.13.3" - resolved "https://registry.yarnpkg.com/cspell-glob/-/cspell-glob-5.13.3.tgz#bd4472160dafb660313557b9ccab55168a956994" - integrity sha512-9g1/AJs7ws1tLDXFJwcePhmab3wxrWbxEZVfmJIHhawp9rWc+cU6BZFdxJJ52EHClKa+DuKJxYsyohE1ctD9rA== +cspell-glob@^5.13.4: + version "5.13.4" + resolved "https://registry.yarnpkg.com/cspell-glob/-/cspell-glob-5.13.4.tgz#23ff682d25376181881d16f27b99daa684ca733a" + integrity sha512-uKkibBe41Tr609mNBOairsyuNhPo+kqMVw2JeobfgN71GESQLjU7hr6VpKaUKGZyJpaicP606LB0gZBM38IOvw== dependencies: micromatch "^4.0.4" -cspell-io@^5.13.3: - version "5.13.3" - resolved "https://registry.yarnpkg.com/cspell-io/-/cspell-io-5.13.3.tgz#07ac34bb4708921272e700bc34a227bbf6545f31" - integrity sha512-4OwpSprgaUc8yZGWHUBiy5Uv528gmk7wMai6c2ZQOd8HEOkIoxWIjCVnOEYHsXBflhcrvSPxirwcsLOcGU2bkQ== +cspell-io@^5.13.4: + version "5.13.4" + resolved "https://registry.yarnpkg.com/cspell-io/-/cspell-io-5.13.4.tgz#f2e147b300e299c086f24194cc23cda5a3b480b2" + integrity sha512-THe0R5CAv2h5yvrF3dtvigY73mnfFlfTJFWoSgGsafKq5nmR8jgKpbjQgK93zL0JC//BgdK0extfrSLsW2D4mw== -cspell-lib@^5.13.3: - version "5.13.3" - resolved "https://registry.yarnpkg.com/cspell-lib/-/cspell-lib-5.13.3.tgz#2546637725a32e945c6f20341438aa86cce39afc" - integrity sha512-X4GkrxhMkNTH+H+irHHL2GluwQHhR3G0/5+bF/KOYtZ4Ypi2iVYkzcxB3xPmaeM82+NHyoNu/TU5I1jspt4GSg== +cspell-lib@^5.13.4: + version "5.13.4" + resolved "https://registry.yarnpkg.com/cspell-lib/-/cspell-lib-5.13.4.tgz#22fb45ebbae6d44af71972340d0b1f87d849254e" + integrity sha512-kKGqAMXKdj8l3sgjoJuuQKTuwLz/33c3YFM/d3lYzcP3mo7C4v/M04Dm4mlTdWA0l4WYlzuSqxDmj32SsHMbNA== dependencies: - "@cspell/cspell-bundled-dicts" "^5.13.3" - "@cspell/cspell-types" "^5.13.3" + "@cspell/cspell-bundled-dicts" "^5.13.4" + "@cspell/cspell-types" "^5.13.4" clear-module "^4.1.2" comment-json "^4.1.1" configstore "^5.0.1" cosmiconfig "^7.0.1" - cspell-glob "^5.13.3" - cspell-io "^5.13.3" - cspell-trie-lib "^5.13.3" + cspell-glob "^5.13.4" + cspell-io "^5.13.4" + cspell-trie-lib "^5.13.4" find-up "^5.0.0" fs-extra "^10.0.0" gensequence "^3.1.1" @@ -2642,31 +2642,32 @@ cspell-lib@^5.13.3: resolve-global "^1.0.0" vscode-uri "^3.0.2" -cspell-trie-lib@^5.13.3: - version "5.13.3" - resolved "https://registry.yarnpkg.com/cspell-trie-lib/-/cspell-trie-lib-5.13.3.tgz#599edfc2f935a407317dc08e18f70deb41e74bb5" - integrity sha512-CbydOTo7u/XxBn2tyWwIkl/KQ8ikLT4TSBM2M/3e7pZMtbAKGlV2L8P0M77mHbz5HrlL+pqrU/Ywk7TwoXmKNQ== +cspell-trie-lib@^5.13.4: + version "5.13.4" + resolved "https://registry.yarnpkg.com/cspell-trie-lib/-/cspell-trie-lib-5.13.4.tgz#ae8307bb0448bc7843273351a1b7ad13181bf9d1" + integrity sha512-e5fKOOioJlJJ+DcLVIkuy+7FI/YmUojhfzdUjTvLDn5EJFL3/oiP5AvDXGV3bMqYzlbRQKD6FpC61KVIkNMbEw== dependencies: fs-extra "^10.0.0" gensequence "^3.1.1" -cspell@5.13.3: - version "5.13.3" - resolved "https://registry.yarnpkg.com/cspell/-/cspell-5.13.3.tgz#5fdf2d7f22926d87daedf3c8ac04a492be845a60" - integrity sha512-14RzCLHadT2BFcTEhEJUiwW4m8vVNnBXGBPnnEYkFiF2MyJEtfyOoqqVxqDHOvwVmc0zKIiAU0ZrG98spWuNnA== +cspell@5.13.4: + version "5.13.4" + resolved "https://registry.yarnpkg.com/cspell/-/cspell-5.13.4.tgz#5b3890110177588f21d8d74955a989ebfd860ee8" + integrity sha512-T/AMylb/CY0af8Oc1/Nv79Mqe852ga4AOAY0m8eYG8A5zahDpL2EC6PN5yK8KFn0UPMWMB8B2atZf6/U5RWdaQ== dependencies: chalk "^4.1.2" commander "^8.3.0" comment-json "^4.1.1" - cspell-gitignore "^5.13.3" - cspell-glob "^5.13.3" - cspell-lib "^5.13.3" + cspell-gitignore "^5.13.4" + cspell-glob "^5.13.4" + cspell-lib "^5.13.4" fast-json-stable-stringify "^2.1.0" file-entry-cache "^6.0.1" fs-extra "^10.0.0" get-stdin "^8.0.0" glob "^7.2.0" imurmurhash "^0.1.4" + semver "^7.3.5" strip-ansi "^6.0.1" vscode-uri "^3.0.2" From c847de4e71a8a15a2d71c51907228674c5e50b4d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Dec 2021 04:43:03 +0000 Subject: [PATCH 09/47] Build(deps-dev): Bump @babel/preset-react in /website (#11986) --- website/package.json | 2 +- website/yarn.lock | 78 ++++++++++++++++++++++---------------------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/website/package.json b/website/package.json index a0616dca1..7ecf2f50e 100644 --- a/website/package.json +++ b/website/package.json @@ -14,7 +14,7 @@ "react-dom": "17.0.2" }, "devDependencies": { - "@babel/preset-react": "7.16.0", + "@babel/preset-react": "7.16.5", "@sandhose/prettier-animated-logo": "1.0.3", "babel-loader": "8.2.3", "concurrently": "6.5.0", diff --git a/website/yarn.lock b/website/yarn.lock index 4b28184a5..a1728d783 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -196,10 +196,10 @@ dependencies: "@babel/types" "^7.14.5" -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9" - integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ== +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": + version "7.16.5" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.5.tgz#afe37a45f39fce44a3d50a7958129ea5b1a5c074" + integrity sha512-59KHWHXxVA9K4HNF4sbHCf+eJeFe0Te/ZFGqBT4OjXhrwvA04sGfaEGsVTdsjoszq0YTP49RC9UKe5g8uN2RwQ== "@babel/helper-remap-async-to-generator@^7.14.5": version "7.14.5" @@ -477,12 +477,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-jsx@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.0.tgz#f9624394317365a9a88c82358d3f8471154698f1" - integrity sha512-8zv2+xiPHwly31RK4RmnEYY5zziuF3O7W2kIDW+07ewWDh6Oi0dRq8kwvulRkFgt6DB97RlKs5c1y068iPlCUg== +"@babel/plugin-syntax-jsx@^7.16.5": + version "7.16.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.5.tgz#bf255d252f78bc8b77a17cadc37d1aa5b8ed4394" + integrity sha512-42OGssv9NPk4QHKVgIHlzeLgPOW5rGgfV5jzG90AhcXXIv6hu/eqj63w4VgvRxdvZY3AlYeDgPiSJ3BqAd1Y6Q== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" "@babel/plugin-syntax-logical-assignment-operators@^7.10.4": version "7.10.4" @@ -723,38 +723,38 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-react-display-name@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.0.tgz#9a0ad8aa8e8790883a7bd2736f66229a58125676" - integrity sha512-FJFdJAqaCpndL+pIf0aeD/qlQwT7QXOvR6Cc8JPvNhKJBi2zc/DPc4g05Y3fbD/0iWAMQFGij4+Xw+4L/BMpTg== +"@babel/plugin-transform-react-display-name@^7.16.5": + version "7.16.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.5.tgz#d5e910327d7931fb9f8f9b6c6999473ceae5a286" + integrity sha512-dHYCOnzSsXFz8UcdNQIHGvg94qPL/teF7CCiCEMRxmA1G2p5Mq4JnKVowCDxYfiQ9D7RstaAp9kwaSI+sXbnhw== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" -"@babel/plugin-transform-react-jsx-development@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.0.tgz#1cb52874678d23ab11d0d16488d54730807303ef" - integrity sha512-qq65iSqBRq0Hr3wq57YG2AmW0H6wgTnIzpffTphrUWUgLCOK+zf1f7G0vuOiXrp7dU1qq+fQBoqZ3wCDAkhFzw== +"@babel/plugin-transform-react-jsx-development@^7.16.5": + version "7.16.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.5.tgz#87da9204c275ffb57f45d192a1120cf104bc1e86" + integrity sha512-uQSLacMZSGLCxOw20dzo1dmLlKkd+DsayoV54q3MHXhbqgPzoiGerZQgNPl/Ro8/OcXV2ugfnkx+rxdS0sN5Uw== dependencies: - "@babel/plugin-transform-react-jsx" "^7.16.0" + "@babel/plugin-transform-react-jsx" "^7.16.5" -"@babel/plugin-transform-react-jsx@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.16.0.tgz#55b797d4960c3de04e07ad1c0476e2bc6a4889f1" - integrity sha512-rqDgIbukZ44pqq7NIRPGPGNklshPkvlmvqjdx3OZcGPk4zGIenYkxDTvl3LsSL8gqcc3ZzGmXPE6hR/u/voNOw== +"@babel/plugin-transform-react-jsx@^7.16.5": + version "7.16.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.16.5.tgz#5298aedc5f81e02b1cb702e597e8d6a346675765" + integrity sha512-+arLIz1d7kmwX0fKxTxbnoeG85ONSnLpvdODa4P3pc1sS7CV1hfmtYWufkW/oYsPnkDrEeQFxhUWcFnrXW7jQQ== dependencies: "@babel/helper-annotate-as-pure" "^7.16.0" "@babel/helper-module-imports" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/plugin-syntax-jsx" "^7.16.0" + "@babel/helper-plugin-utils" "^7.16.5" + "@babel/plugin-syntax-jsx" "^7.16.5" "@babel/types" "^7.16.0" -"@babel/plugin-transform-react-pure-annotations@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.0.tgz#23db6ddf558d8abde41b8ad9d59f48ad5532ccab" - integrity sha512-NC/Bj2MG+t8Ef5Pdpo34Ay74X4Rt804h5y81PwOpfPtmAK3i6CizmQqwyBQzIepz1Yt8wNr2Z2L7Lu3qBMfZMA== +"@babel/plugin-transform-react-pure-annotations@^7.16.5": + version "7.16.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.5.tgz#6535d0fe67c7a3a26c5105f92c8cbcbe844cd94b" + integrity sha512-0nYU30hCxnCVCbRjSy9ahlhWZ2Sn6khbY4FqR91W+2RbSqkWEbVu2gXh45EqNy4Bq7sRU+H4i0/6YKwOSzh16A== dependencies: "@babel/helper-annotate-as-pure" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" "@babel/plugin-transform-regenerator@^7.14.5": version "7.14.5" @@ -919,17 +919,17 @@ "@babel/types" "^7.4.4" esutils "^2.0.2" -"@babel/preset-react@7.16.0", "@babel/preset-react@^7.12.5": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.16.0.tgz#f71d3e8dff5218478011df037fad52660ee6d82a" - integrity sha512-d31IFW2bLRB28uL1WoElyro8RH5l6531XfxMtCeCmp6RVAF1uTfxxUA0LH1tXl+psZdwfmIbwoG4U5VwgbhtLw== +"@babel/preset-react@7.16.5", "@babel/preset-react@^7.12.5": + version "7.16.5" + resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.16.5.tgz#09df3b7a6522cb3e6682dc89b4dfebb97d22031b" + integrity sha512-3kzUOQeaxY/2vhPDS7CX/KGEGu/1bOYGvdRDJ2U5yjEz5o5jmIeTPLoiQBPGjfhPascLuW5OlMiPzwOOuB6txg== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" "@babel/helper-validator-option" "^7.14.5" - "@babel/plugin-transform-react-display-name" "^7.16.0" - "@babel/plugin-transform-react-jsx" "^7.16.0" - "@babel/plugin-transform-react-jsx-development" "^7.16.0" - "@babel/plugin-transform-react-pure-annotations" "^7.16.0" + "@babel/plugin-transform-react-display-name" "^7.16.5" + "@babel/plugin-transform-react-jsx" "^7.16.5" + "@babel/plugin-transform-react-jsx-development" "^7.16.5" + "@babel/plugin-transform-react-pure-annotations" "^7.16.5" "@babel/register@^7.12.1": version "7.14.5" From a91465dfdef9e41995317756240c975c8acc8390 Mon Sep 17 00:00:00 2001 From: Wyatt Anderson Date: Sun, 19 Dec 2021 17:21:53 -0800 Subject: [PATCH 10/47] Update instructions for configuring Neoformat (#11946) Co-authored-by: fisker Cheung --- docs/vim.md | 6 ++++++ website/versioned_docs/version-stable/vim.md | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/docs/vim.md b/docs/vim.md index ed9edb6d7..3e3787f68 100644 --- a/docs/vim.md +++ b/docs/vim.md @@ -17,6 +17,12 @@ The best way to install Neoformat is with your favorite plugin manager for Vim, Plug 'sbdchd/neoformat' ``` +In order for Neoformat to use a project-local version of Prettier (i.e. to use `node_modules/.bin/prettier` instead of looking for `prettier` on `$PATH`), you must set the `neoformat_try_node_exe` option: + +```vim +let g:neoformat_try_node_exe = 1 +``` + Run `:Neoformat` or `:Neoformat prettier` in a supported file to run Prettier. To have Neoformat run Prettier on save: diff --git a/website/versioned_docs/version-stable/vim.md b/website/versioned_docs/version-stable/vim.md index acb611471..18dfb76e7 100644 --- a/website/versioned_docs/version-stable/vim.md +++ b/website/versioned_docs/version-stable/vim.md @@ -18,6 +18,12 @@ The best way to install Neoformat is with your favorite plugin manager for Vim, Plug 'sbdchd/neoformat' ``` +In order for Neoformat to use a project-local version of Prettier (i.e. to use `node_modules/.bin/prettier` instead of looking for `prettier` on `$PATH`), you must set the `neoformat_try_node_exe` option: + +```vim +let g:neoformat_try_node_exe = 1 +``` + Run `:Neoformat` or `:Neoformat prettier` in a supported file to run Prettier. To have Neoformat run Prettier on save: From 846069b6c7692bd7ee34ed0eece393fd72e8f804 Mon Sep 17 00:00:00 2001 From: Hendrik Nijmeijer <850404+HendrikN@users.noreply.github.com> Date: Mon, 20 Dec 2021 21:04:19 +0100 Subject: [PATCH 11/47] recognize waitForAsync as test-statement in Angular (#11992) * recognize waitForAsync as test-statement in Angular * Add changelog_unreleased entry Co-authored-by: Hendrik Nijmeijer --- changelog_unreleased/javascript/11992.md | 25 ++++ src/language-js/utils.js | 9 +- .../__snapshots__/jsfmt.spec.js.snap | 127 ++++++++++++++++++ .../test-declarations/angular_waitForAsync.js | 24 ++++ 4 files changed, 181 insertions(+), 4 deletions(-) create mode 100644 changelog_unreleased/javascript/11992.md create mode 100644 tests/format/js/test-declarations/angular_waitForAsync.js diff --git a/changelog_unreleased/javascript/11992.md b/changelog_unreleased/javascript/11992.md new file mode 100644 index 000000000..6a89711be --- /dev/null +++ b/changelog_unreleased/javascript/11992.md @@ -0,0 +1,25 @@ +#### Recognize waitForAsync as test-statement in Angular (#11992 by @HendrikN) + + +```js +// Input +test("foo bar", waitForAsync(() => { + const foo = "bar"; + expect(foo).toEqual("bar") +})); + +// Prettier stable +test( + "foo bar", + waitForAsync(() => { + const foo = "bar"; + expect(foo).toEqual("bar"); + }) +); + +// Prettier main +test("foo bar", waitForAsync(() => { + const foo = "bar"; + expect(foo).toEqual("bar"); +})); +``` diff --git a/src/language-js/utils.js b/src/language-js/utils.js index c7946bef7..75cd89dd0 100644 --- a/src/language-js/utils.js +++ b/src/language-js/utils.js @@ -308,7 +308,10 @@ function isTemplateLiteral(node) { } /** - * Note: `inject` is used in AngularJS 1.x, `async` in Angular 2+ + * Note: `inject` is used in AngularJS 1.x, `async` and `fakeAsync` in + * Angular 2+, although `async` is deprecated and replaced by `waitForAsync` + * since Angular 12. + * * example: https://docs.angularjs.org/guide/unit-testing#using-beforeall- * * @param {CallExpression} node @@ -318,9 +321,7 @@ function isAngularTestWrapper(node) { return ( isCallExpression(node) && node.callee.type === "Identifier" && - (node.callee.name === "async" || - node.callee.name === "inject" || - node.callee.name === "fakeAsync") + ["async", "inject", "fakeAsync", "waitForAsync"].includes(node.callee.name) ); } diff --git a/tests/format/js/test-declarations/__snapshots__/jsfmt.spec.js.snap b/tests/format/js/test-declarations/__snapshots__/jsfmt.spec.js.snap index eef73e20b..f94109f4c 100644 --- a/tests/format/js/test-declarations/__snapshots__/jsfmt.spec.js.snap +++ b/tests/format/js/test-declarations/__snapshots__/jsfmt.spec.js.snap @@ -276,6 +276,133 @@ function x() { ================================================================================ `; +exports[`angular_waitForAsync.js - {"arrowParens":"avoid"} format 1`] = ` +====================================options===================================== +arrowParens: "avoid" +parsers: ["babel", "flow", "typescript"] +printWidth: 80 + | printWidth +=====================================input====================================== +beforeEach(waitForAsync(() => { + // code +})); + +afterAll(waitForAsync(() => { + console.log('Hello'); +})); + +it('should create the app', waitForAsync(() => { + //code +})); + +it("does something really long and complicated so I have to write a very long name for the test", waitForAsync(() => { + // code +})); + +it("does something really long and complicated so I have to write a very long name for the test", waitForAsync(() => new SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS)); + +/* +* isTestCall(parent) should only be called when parent exists +* and parent.type is CallExpression. This test makes sure that +* no errors are thrown when calling isTestCall(parent) +*/ +function x() { waitForAsync(() => {}) } + +=====================================output===================================== +beforeEach(waitForAsync(() => { + // code +})); + +afterAll(waitForAsync(() => { + console.log("Hello"); +})); + +it("should create the app", waitForAsync(() => { + //code +})); + +it("does something really long and complicated so I have to write a very long name for the test", waitForAsync(() => { + // code +})); + +it("does something really long and complicated so I have to write a very long name for the test", waitForAsync(() => + new SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS())); + +/* + * isTestCall(parent) should only be called when parent exists + * and parent.type is CallExpression. This test makes sure that + * no errors are thrown when calling isTestCall(parent) + */ +function x() { + waitForAsync(() => {}); +} + +================================================================================ +`; + +exports[`angular_waitForAsync.js format 1`] = ` +====================================options===================================== +parsers: ["babel", "flow", "typescript"] +printWidth: 80 + | printWidth +=====================================input====================================== +beforeEach(waitForAsync(() => { + // code +})); + +afterAll(waitForAsync(() => { + console.log('Hello'); +})); + +it('should create the app', waitForAsync(() => { + //code +})); + +it("does something really long and complicated so I have to write a very long name for the test", waitForAsync(() => { + // code +})); + +it("does something really long and complicated so I have to write a very long name for the test", waitForAsync(() => new SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS)); + +/* +* isTestCall(parent) should only be called when parent exists +* and parent.type is CallExpression. This test makes sure that +* no errors are thrown when calling isTestCall(parent) +*/ +function x() { waitForAsync(() => {}) } + +=====================================output===================================== +beforeEach(waitForAsync(() => { + // code +})); + +afterAll(waitForAsync(() => { + console.log("Hello"); +})); + +it("should create the app", waitForAsync(() => { + //code +})); + +it("does something really long and complicated so I have to write a very long name for the test", waitForAsync(() => { + // code +})); + +it("does something really long and complicated so I have to write a very long name for the test", waitForAsync(() => + new SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS())); + +/* + * isTestCall(parent) should only be called when parent exists + * and parent.type is CallExpression. This test makes sure that + * no errors are thrown when calling isTestCall(parent) + */ +function x() { + waitForAsync(() => {}); +} + +================================================================================ +`; + exports[`angularjs_inject.js - {"arrowParens":"avoid"} format 1`] = ` ====================================options===================================== arrowParens: "avoid" diff --git a/tests/format/js/test-declarations/angular_waitForAsync.js b/tests/format/js/test-declarations/angular_waitForAsync.js new file mode 100644 index 000000000..4cad096e0 --- /dev/null +++ b/tests/format/js/test-declarations/angular_waitForAsync.js @@ -0,0 +1,24 @@ +beforeEach(waitForAsync(() => { + // code +})); + +afterAll(waitForAsync(() => { + console.log('Hello'); +})); + +it('should create the app', waitForAsync(() => { + //code +})); + +it("does something really long and complicated so I have to write a very long name for the test", waitForAsync(() => { + // code +})); + +it("does something really long and complicated so I have to write a very long name for the test", waitForAsync(() => new SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS)); + +/* +* isTestCall(parent) should only be called when parent exists +* and parent.type is CallExpression. This test makes sure that +* no errors are thrown when calling isTestCall(parent) +*/ +function x() { waitForAsync(() => {}) } From ae56136a6601b042761b546afee3e8ba6607cca6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Dec 2021 15:40:57 +0800 Subject: [PATCH 12/47] Build(deps): Bump ignore from 4.0.6 to 5.2.0 (#11990) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: fisker Cheung --- package.json | 2 +- src/common/create-ignorer.js | 2 +- yarn.lock | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index a1a7b3fb7..156a62331 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "html-styles": "1.0.0", "html-tag-names": "1.1.5", "html-void-elements": "1.0.5", - "ignore": "4.0.6", + "ignore": "5.2.0", "jest-docblock": "27.4.0", "json5": "2.2.0", "leven": "3.1.0", diff --git a/src/common/create-ignorer.js b/src/common/create-ignorer.js index 677ca876a..4ccfc4121 100644 --- a/src/common/create-ignorer.js +++ b/src/common/create-ignorer.js @@ -32,7 +32,7 @@ createIgnorer.sync = function (ignorePath, withNodeModules) { * @param {boolean?} withNodeModules */ function _createIgnorer(ignoreContent, withNodeModules) { - const ignorer = ignore().add(ignoreContent || ""); + const ignorer = ignore({ allowRelativePaths: true }).add(ignoreContent || ""); if (!withNodeModules) { ignorer.add("node_modules"); } diff --git a/yarn.lock b/yarn.lock index 775bd0058..34963f58e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3683,16 +3683,16 @@ iconv-lite@0.4.24: dependencies: safer-buffer ">= 2.1.2 < 3" -ignore@4.0.6, ignore@^4.0.6: +ignore@5.2.0, ignore@^5.1.4: + version "5.2.0" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" + integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== + +ignore@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== -ignore@^5.1.4: - version "5.1.9" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.9.tgz#9ec1a5cbe8e1446ec60d4420060d43aa6e7382fb" - integrity sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ== - import-fresh@^3.0.0, import-fresh@^3.2.1, import-fresh@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" From d704c2747b85bb6ea293198ca963ab72a0f6813d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Dec 2021 14:51:16 +0000 Subject: [PATCH 13/47] Build(deps): Bump @typescript-eslint/typescript-estree (#11993) --- package.json | 2 +- yarn.lock | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 156a62331..fd0333660 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "@babel/parser": "7.16.6", "@glimmer/syntax": "0.83.1", "@iarna/toml": "2.2.5", - "@typescript-eslint/typescript-estree": "5.7.0", + "@typescript-eslint/typescript-estree": "5.8.0", "angular-estree-parser": "2.5.0", "angular-html-parser": "1.8.0", "camelcase": "6.2.1", diff --git a/yarn.lock b/yarn.lock index 34963f58e..f921d43b3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1750,10 +1750,10 @@ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.5.0.tgz#fee61ae510e84ed950a53937a2b443e078107003" integrity sha512-OaYTqkW3GnuHxqsxxJ6KypIKd5Uw7bFiQJZRyNi1jbMJnK3Hc/DR4KwB6KJj6PBRkJJoaNwzMNv9vtTk87JhOg== -"@typescript-eslint/types@5.7.0": - version "5.7.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.7.0.tgz#2d4cae0105ba7d08bffa69698197a762483ebcbe" - integrity sha512-5AeYIF5p2kAneIpnLFve8g50VyAjq7udM7ApZZ9JYjdPjkz0LvODfuSHIDUVnIuUoxafoWzpFyU7Sqbxgi79mA== +"@typescript-eslint/types@5.8.0": + version "5.8.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.8.0.tgz#e7fa74ec35d9dbe3560d039d3d8734986c3971e0" + integrity sha512-LdCYOqeqZWqCMOmwFnum6YfW9F3nKuxJiR84CdIRN5nfHJ7gyvGpXWqL/AaW0k3Po0+wm93ARAsOdzlZDPCcXg== "@typescript-eslint/typescript-estree@5.5.0": version "5.5.0" @@ -1768,13 +1768,13 @@ semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/typescript-estree@5.7.0": - version "5.7.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.7.0.tgz#968fad899050ccce4f08a40cd5fabc0798525006" - integrity sha512-aO1Ql+izMrTnPj5aFFlEJkpD4jRqC4Gwhygu2oHK2wfVQpmOPbyDSveJ+r/NQo+PWV43M6uEAeLVbTi09dFLhg== +"@typescript-eslint/typescript-estree@5.8.0": + version "5.8.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.8.0.tgz#900469ba9d5a37f4482b014ecce4a5dbb86cb4dd" + integrity sha512-srfeZ3URdEcUsSLbkOFqS7WoxOqn8JNil2NSLO9O+I2/Uyc85+UlfpEvQHIpj5dVts7KKOZnftoJD/Fdv0L7nQ== dependencies: - "@typescript-eslint/types" "5.7.0" - "@typescript-eslint/visitor-keys" "5.7.0" + "@typescript-eslint/types" "5.8.0" + "@typescript-eslint/visitor-keys" "5.8.0" debug "^4.3.2" globby "^11.0.4" is-glob "^4.0.3" @@ -1789,12 +1789,12 @@ "@typescript-eslint/types" "5.5.0" eslint-visitor-keys "^3.0.0" -"@typescript-eslint/visitor-keys@5.7.0": - version "5.7.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.7.0.tgz#e05164239eb7cb8aa9fa06c516ede480ce260178" - integrity sha512-hdohahZ4lTFcglZSJ3DGdzxQHBSxsLVqHzkiOmKi7xVAWC4y2c1bIMKmPJSrA4aOEoRUPOKQ87Y/taC7yVHpFg== +"@typescript-eslint/visitor-keys@5.8.0": + version "5.8.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.8.0.tgz#22d4ed96fe2451135299239feedb9fe1dcec780c" + integrity sha512-+HDIGOEMnqbxdAHegxvnOqESUH6RWFRR2b8qxP1W9CZnnYh4Usz6MBL+2KMAgPk/P0o9c1HqnYtwzVH6GTIqug== dependencies: - "@typescript-eslint/types" "5.7.0" + "@typescript-eslint/types" "5.8.0" eslint-visitor-keys "^3.0.0" "@webassemblyjs/ast@1.11.1": From f8829d8c30d1fc77074068937863c7d080bd927c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Dec 2021 11:31:23 +0800 Subject: [PATCH 14/47] Build(deps): Bump flow-parser from 0.162.1 to 0.168.0 (#11845) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: sosukesuzuki Co-authored-by: fisker Cheung --- package.json | 2 +- src/language-js/print/flow.js | 1 + .../__snapshots__/jsfmt.spec.js.snap | 28 +++++++++++++++++-- tests/format/flow-repo/destructuring/rec.js | 14 +++++++++- .../__snapshots__/jsfmt.spec.js.snap | 4 +-- .../flow-repo/predicates-parsing/pass.js | 2 +- yarn.lock | 8 +++--- 7 files changed, 48 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index fd0333660..63638e8a1 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "fast-glob": "3.2.7", "fast-json-stable-stringify": "2.1.0", "find-parent-dir": "0.3.1", - "flow-parser": "0.162.1", + "flow-parser": "0.168.0", "get-stdin": "8.0.0", "globby": "11.0.4", "graphql": "15.6.1", diff --git a/src/language-js/print/flow.js b/src/language-js/print/flow.js index 090d9adf4..494a6fba0 100644 --- a/src/language-js/print/flow.js +++ b/src/language-js/print/flow.js @@ -273,6 +273,7 @@ function printFlow(path, options, print) { // Same as `RestElement` case "ObjectTypeSpreadProperty": return printRestSpread(path, options, print); + case "QualifiedTypeofIdentifier": case "QualifiedTypeIdentifier": return [print("qualification"), ".", print("id")]; case "StringLiteralTypeAnnotation": diff --git a/tests/format/flow-repo/destructuring/__snapshots__/jsfmt.spec.js.snap b/tests/format/flow-repo/destructuring/__snapshots__/jsfmt.spec.js.snap index 812313819..7fd93a983 100644 --- a/tests/format/flow-repo/destructuring/__snapshots__/jsfmt.spec.js.snap +++ b/tests/format/flow-repo/destructuring/__snapshots__/jsfmt.spec.js.snap @@ -518,9 +518,21 @@ foo = (i: number) => { // Also make sure that the following doesn't loop -declare var o; +declare var o: empty; var { x: o } = o; +// this also must not loop + +declare var _x: {}; + +let x = _x; + +function baz () { + const {...y} = x; + + x = y; +} + =====================================output===================================== // @flow @@ -540,9 +552,21 @@ foo = (i: number) => { // Also make sure that the following doesn't loop -declare var o; +declare var o: empty; var { x: o } = o; +// this also must not loop + +declare var _x: {}; + +let x = _x; + +function baz() { + const { ...y } = x; + + x = y; +} + ================================================================================ `; diff --git a/tests/format/flow-repo/destructuring/rec.js b/tests/format/flow-repo/destructuring/rec.js index 8dcd432df..c2a5fbffc 100644 --- a/tests/format/flow-repo/destructuring/rec.js +++ b/tests/format/flow-repo/destructuring/rec.js @@ -16,5 +16,17 @@ foo = (i: number) => { // Also make sure that the following doesn't loop -declare var o; +declare var o: empty; var { x: o } = o; + +// this also must not loop + +declare var _x: {}; + +let x = _x; + +function baz () { + const {...y} = x; + + x = y; +} diff --git a/tests/format/flow-repo/predicates-parsing/__snapshots__/jsfmt.spec.js.snap b/tests/format/flow-repo/predicates-parsing/__snapshots__/jsfmt.spec.js.snap index 4606c42d5..59b4fdcff 100644 --- a/tests/format/flow-repo/predicates-parsing/__snapshots__/jsfmt.spec.js.snap +++ b/tests/format/flow-repo/predicates-parsing/__snapshots__/jsfmt.spec.js.snap @@ -121,7 +121,7 @@ var a1 = (x: mixed): %checks => x !== null; const insert_a_really_big_predicated_arrow_function_name_here = (x) : %checks => x !== null; -declare var x; +declare var x: empty; (x) checks => 123; @@ -152,7 +152,7 @@ var a1 = (x: mixed): %checks => x !== null; const insert_a_really_big_predicated_arrow_function_name_here = (x): %checks => x !== null; -declare var x; +declare var x: empty; x; (checks) => 123; diff --git a/tests/format/flow-repo/predicates-parsing/pass.js b/tests/format/flow-repo/predicates-parsing/pass.js index 05e5c54ec..91c672693 100644 --- a/tests/format/flow-repo/predicates-parsing/pass.js +++ b/tests/format/flow-repo/predicates-parsing/pass.js @@ -17,7 +17,7 @@ var a1 = (x: mixed): %checks => x !== null; const insert_a_really_big_predicated_arrow_function_name_here = (x) : %checks => x !== null; -declare var x; +declare var x: empty; (x) checks => 123; diff --git a/yarn.lock b/yarn.lock index f921d43b3..141b3a2ea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3397,10 +3397,10 @@ flatten@^1.0.2: resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b" integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg== -flow-parser@0.162.1: - version "0.162.1" - resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.162.1.tgz#128150cd483c4899719fb5ceb06744282e51a10d" - integrity sha512-yp0oSVaawR8p39PGhOb/TtclByOxJirI+DVPR99GkeRY8xZ/4gLt+BeqcLgJsed1tE1YwMgdiAYKSfhoLTFVeg== +flow-parser@0.168.0: + version "0.168.0" + resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.168.0.tgz#e9c385499145828b42fd754d3528f4cb7d5c6edf" + integrity sha512-YMlc+6vvyDPqWKOpzmyifJXBbwlNdqznuy8YBHxX1/90F8d+NnhsxMe1u/ok5LNvNJVJ2TVMkWudu0BUKOSawA== form-data@^3.0.0: version "3.0.1" From b36f5ce9d10a72c814635a416233b93a1703943d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Dec 2021 17:27:08 +0000 Subject: [PATCH 15/47] Build(deps-dev): Bump eslint-plugin-react from 7.27.1 to 7.28.0 (#11996) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 63638e8a1..11f7a2408 100644 --- a/package.json +++ b/package.json @@ -115,7 +115,7 @@ "eslint-plugin-import": "2.25.3", "eslint-plugin-jest": "25.3.0", "eslint-plugin-prettier-internal-rules": "2.0.1", - "eslint-plugin-react": "7.27.1", + "eslint-plugin-react": "7.28.0", "eslint-plugin-regexp": "1.5.1", "eslint-plugin-unicorn": "39.0.0", "esm-utils": "2.0.0", diff --git a/yarn.lock b/yarn.lock index 141b3a2ea..049d65f87 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3038,10 +3038,10 @@ eslint-plugin-prettier-internal-rules@2.0.1: resolved "https://registry.yarnpkg.com/eslint-plugin-prettier-internal-rules/-/eslint-plugin-prettier-internal-rules-2.0.1.tgz#ee6f5b4d663fd16d406f66a0d52775d05be1bd6e" integrity sha512-6mLlbq4xl86c66Smulq2a/bIpTzXDL3LcoYQd/C+kSbjLl8L7G+3wNJs6lWsZZ5v8fyirundQBH6PP/PSAzDMw== -eslint-plugin-react@7.27.1: - version "7.27.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.27.1.tgz#469202442506616f77a854d91babaae1ec174b45" - integrity sha512-meyunDjMMYeWr/4EBLTV1op3iSG3mjT/pz5gti38UzfM4OPpNc2m0t2xvKCOMU5D6FSdd34BIMFOvQbW+i8GAA== +eslint-plugin-react@7.28.0: + version "7.28.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.28.0.tgz#8f3ff450677571a659ce76efc6d80b6a525adbdf" + integrity sha512-IOlFIRHzWfEQQKcAD4iyYDndHwTQiCMcJVJjxempf203jnNLUnW34AXLrV33+nEXoifJE2ZEGmcjKPL8957eSw== dependencies: array-includes "^3.1.4" array.prototype.flatmap "^1.2.5" From e90882a01633648d95ba43899e5196226dc196da Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Dec 2021 18:08:34 +0000 Subject: [PATCH 16/47] Build(deps-dev): Bump core-js from 3.20.0 to 3.20.1 (#11997) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 11f7a2408..c479cd532 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "babel-loader": "8.2.3", "benchmark": "2.1.4", "builtin-modules": "3.2.0", - "core-js": "3.20.0", + "core-js": "3.20.1", "cross-env": "7.0.3", "cspell": "5.13.4", "enquirer": "2.3.6", diff --git a/yarn.lock b/yarn.lock index 049d65f87..6987666df 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2547,10 +2547,10 @@ core-js-compat@^3.18.0, core-js-compat@^3.19.1: browserslist "^4.18.1" semver "7.0.0" -core-js@3.20.0, core-js@^3.16.2: - version "3.20.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.20.0.tgz#1c5ac07986b8d15473ab192e45a2e115a4a95b79" - integrity sha512-KjbKU7UEfg4YPpskMtMXPhUKn7m/1OdTHTVjy09ScR2LVaoUXe8Jh0UdvN2EKUR6iKTJph52SJP95mAB0MnVLQ== +core-js@3.20.1, core-js@^3.16.2: + version "3.20.1" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.20.1.tgz#eb1598047b7813572f1dc24b7c6a95528c99eef3" + integrity sha512-btdpStYFQScnNVQ5slVcr858KP0YWYjV16eGJQw8Gg7CWtu/2qNvIM3qVRIR3n1pK2R9NNOrTevbvAYxajwEjg== core-util-is@^1.0.2: version "1.0.3" From cf4bf1adc0572fe2b380fcad0cc91d6df1c047ed Mon Sep 17 00:00:00 2001 From: fisker Cheung Date: Fri, 24 Dec 2021 19:34:18 +0800 Subject: [PATCH 17/47] Simplify cli options stack (#11994) --- src/cli/context.js | 21 ++++++++------------- src/index.js | 1 + 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/cli/context.js b/src/cli/context.js index ba3b78e98..1009b6561 100644 --- a/src/cli/context.js +++ b/src/cli/context.js @@ -1,5 +1,7 @@ "use strict"; -const pick = require("lodash/pick"); +const { + utils: { getLast }, +} = require("./prettier-internal.js"); const getContextOptions = require("./options/get-context-options.js"); const { parseArgv, @@ -46,21 +48,14 @@ class Context { * @param {string[]=} pluginSearchDirs */ pushContextPlugins(plugins, pluginSearchDirs) { - this.stack.push( - pick(this, [ - "supportOptions", - "detailedOptions", - "detailedOptionMap", - "apiDefaultOptions", - "languages", - ]) - ); - - Object.assign(this, getContextOptions(plugins, pluginSearchDirs)); + const options = getContextOptions(plugins, pluginSearchDirs); + this.stack.push(options); + Object.assign(this, options); } popContextPlugins() { - Object.assign(this, this.stack.pop()); + this.stack.pop(); + Object.assign(this, getLast(this.stack)); } } diff --git a/src/index.js b/src/index.js index f6fc80c53..0312d18e7 100644 --- a/src/index.js +++ b/src/index.js @@ -74,6 +74,7 @@ module.exports = { optionsNormalizer: require("./main/options-normalizer.js"), utils: { arrayify: require("./utils/arrayify.js"), + getLast: require("./utils/get-last.js"), }, }, From 25c3e5b315655caa263f06c445dfabef5567df84 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 26 Dec 2021 00:12:08 -0300 Subject: [PATCH 18/47] Build(deps-dev): Bump rollup from 2.61.1 to 2.62.0 (#11998) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index c479cd532..5d34429c3 100644 --- a/package.json +++ b/package.json @@ -131,7 +131,7 @@ "prettier": "2.5.1", "pretty-bytes": "5.6.0", "rimraf": "3.0.2", - "rollup": "2.61.1", + "rollup": "2.62.0", "rollup-plugin-polyfill-node": "0.8.0", "rollup-plugin-terser": "7.0.2", "snapshot-diff": "0.9.0", diff --git a/yarn.lock b/yarn.lock index 6987666df..b2a0bb707 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5713,10 +5713,10 @@ rollup-plugin-terser@7.0.2: serialize-javascript "^4.0.0" terser "^5.0.0" -rollup@2.61.1: - version "2.61.1" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.61.1.tgz#1a5491f84543cf9e4caf6c61222d9a3f8f2ba454" - integrity sha512-BbTXlEvB8d+XFbK/7E5doIcRtxWPRiqr0eb5vQ0+2paMM04Ye4PZY5nHOQef2ix24l/L0SpLd5hwcH15QHPdvA== +rollup@2.62.0: + version "2.62.0" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.62.0.tgz#9e640b419fc5b9e0241844f6d55258bd79986ecc" + integrity sha512-cJEQq2gwB0GWMD3rYImefQTSjrPYaC6s4J9pYqnstVLJ1CHa/aZNVkD4Epuvg4iLeMA4KRiq7UM7awKK6j7jcw== optionalDependencies: fsevents "~2.3.2" From d394c8179b2d0edb6939cb3c2b3bf64e75a738bc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 26 Dec 2021 00:12:44 -0300 Subject: [PATCH 19/47] Build(deps): Bump prop-types from 15.7.2 to 15.8.0 in /website (#11999) --- website/package.json | 2 +- website/yarn.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/website/package.json b/website/package.json index 7ecf2f50e..ec00259bc 100644 --- a/website/package.json +++ b/website/package.json @@ -9,7 +9,7 @@ "clipboard": "2.0.8", "codemirror-graphql": "1.2.11", "lz-string": "1.4.4", - "prop-types": "15.7.2", + "prop-types": "15.8.0", "react": "17.0.2", "react-dom": "17.0.2" }, diff --git a/website/yarn.lock b/website/yarn.lock index a1728d783..306636f06 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -6561,14 +6561,14 @@ prop-types-exact@^1.2.0: object.assign "^4.1.0" reflect.ownkeys "^0.2.0" -prop-types@15.7.2, prop-types@^15.6.2, prop-types@^15.7.2: - version "15.7.2" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" - integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== +prop-types@15.8.0, prop-types@^15.6.2, prop-types@^15.7.2: + version "15.8.0" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.0.tgz#d237e624c45a9846e469f5f31117f970017ff588" + integrity sha512-fDGekdaHh65eI3lMi5OnErU6a8Ighg2KjcjQxO7m8VHyWjcPyj5kiOgV1LQDOOOgVy3+5FgjXvdSSX7B8/5/4g== dependencies: loose-envify "^1.4.0" object-assign "^4.1.1" - react-is "^16.8.1" + react-is "^16.13.1" proto-list@~1.2.1: version "1.2.4" @@ -6755,7 +6755,7 @@ react-error-overlay@^6.0.9: resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.9.tgz#3c743010c9359608c375ecd6bc76f35d93995b0a" integrity sha512-nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew== -react-is@^16.13.1, react-is@^16.8.1, react-is@^16.8.6: +react-is@^16.13.1, react-is@^16.8.6: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== From e72645886ee71d393a6c6361ddc25c64b29fd15b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 26 Dec 2021 00:13:08 -0300 Subject: [PATCH 20/47] Build(deps-dev): Bump concurrently from 6.5.0 to 6.5.1 in /website (#12000) --- website/package.json | 2 +- website/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/website/package.json b/website/package.json index ec00259bc..4f14b2e18 100644 --- a/website/package.json +++ b/website/package.json @@ -17,7 +17,7 @@ "@babel/preset-react": "7.16.5", "@sandhose/prettier-animated-logo": "1.0.3", "babel-loader": "8.2.3", - "concurrently": "6.5.0", + "concurrently": "6.5.1", "docusaurus": "1.14.7", "js-yaml": "4.1.0", "webpack": "5.65.0", diff --git a/website/yarn.lock b/website/yarn.lock index 306636f06..90f94335e 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -2421,10 +2421,10 @@ concat-with-sourcemaps@*: dependencies: source-map "^0.6.1" -concurrently@6.5.0: - version "6.5.0" - resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-6.5.0.tgz#57082bfe797f93cf4a437ce54742c56823a8ea05" - integrity sha512-BjC0KYxXtO6EiWa46gfWYzcLULPBCb+5+VZFtzCemR/co0QSHU4mysEvmT6cnedPpQ9dtJzb+2G694o3V7TgLg== +concurrently@6.5.1: + version "6.5.1" + resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-6.5.1.tgz#4518c67f7ac680cf5c34d5adf399a2a2047edc8c" + integrity sha512-FlSwNpGjWQfRwPLXvJ/OgysbBxPkWpiVjy1042b0U7on7S7qwwMIILRj7WTN1mTgqa582bG6NFuScOoh6Zgdag== dependencies: chalk "^4.1.0" date-fns "^2.16.1" From cd5e1aca2503eb3be8944bfda83c686e21a5c47a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 26 Dec 2021 11:25:59 +0800 Subject: [PATCH 21/47] Build(deps-dev): Bump node-actionlint from 1.2.1 to 1.2.2 (#12001) Bumps node-actionlint from 1.2.1 to 1.2.2. --- updated-dependencies: - dependency-name: node-actionlint dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 5d34429c3..0e49c8e89 100644 --- a/package.json +++ b/package.json @@ -124,7 +124,7 @@ "jest-snapshot-serializer-ansi": "1.0.0", "jest-snapshot-serializer-raw": "1.2.0", "jest-watch-typeahead": "1.0.0", - "node-actionlint": "1.2.1", + "node-actionlint": "1.2.2", "node-fetch": "3.1.0", "npm-run-all": "4.1.5", "path-browserify": "1.0.1", diff --git a/yarn.lock b/yarn.lock index b2a0bb707..5db3aa5b7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4934,10 +4934,10 @@ nice-try@^1.0.4: resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== -node-actionlint@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/node-actionlint/-/node-actionlint-1.2.1.tgz#bba9c13e10a7af97029b0dd19aa82337c116989a" - integrity sha512-X7fvwzx5dQx2/ElgLiAfdn+5f9UadpyeQt6Mwsct/UQ3Ysk4vQ91AVNXFQOu5c12ob7kD5VpZx8AM86xGsFHvg== +node-actionlint@1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/node-actionlint/-/node-actionlint-1.2.2.tgz#0bca592fd28274c368feed8da52a9e2e5db1587d" + integrity sha512-BUPYscLEoeKiLrWb7uFLsgDECtSgBMFOUTSL2N0EfMaVohty5DnubPDpQJnuVw7Rt11h2s+QIzg9rnNJSUCLmQ== dependencies: "@babel/code-frame" "^7.14.5" chalk "^4.1.1" From 75a02f9bde2d21f687930dcc9a7eda5d92eed64b Mon Sep 17 00:00:00 2001 From: George Zahariev <1222691+gkz@users.noreply.github.com> Date: Tue, 28 Dec 2021 19:35:54 -0800 Subject: [PATCH 22/47] Fix Flow's class declaration's indexer formatting (#12009) --- changelog_unreleased/flow/12009.md | 19 +++++++++++ src/language-js/print/flow.js | 1 + .../__snapshots__/jsfmt.spec.js.snap | 33 +++++++++++++++++++ tests/format/flow/declare-class/indexer.js | 10 ++++++ tests/format/flow/declare-class/jsfmt.spec.js | 1 + 5 files changed, 64 insertions(+) create mode 100644 changelog_unreleased/flow/12009.md create mode 100644 tests/format/flow/declare-class/__snapshots__/jsfmt.spec.js.snap create mode 100644 tests/format/flow/declare-class/indexer.js create mode 100644 tests/format/flow/declare-class/jsfmt.spec.js diff --git a/changelog_unreleased/flow/12009.md b/changelog_unreleased/flow/12009.md new file mode 100644 index 000000000..fedd4815e --- /dev/null +++ b/changelog_unreleased/flow/12009.md @@ -0,0 +1,19 @@ +#### Fix Flow's class declaration's `static` indexer formatting (#12009 by @gkz) + + +```jsx +// Input +declare class A { + static [string]: boolean; +} + +// Prettier stable +declare class A { + [string]: boolean; +} + +// Prettier main +declare class A { + static [string]: boolean; +} +``` diff --git a/src/language-js/print/flow.js b/src/language-js/print/flow.js index 494a6fba0..e80466530 100644 --- a/src/language-js/print/flow.js +++ b/src/language-js/print/flow.js @@ -230,6 +230,7 @@ function printFlow(path, options, print) { return parts; case "ObjectTypeIndexer": { return [ + node.static ? "static " : "", node.variance ? print("variance") : "", "[", print("id"), diff --git a/tests/format/flow/declare-class/__snapshots__/jsfmt.spec.js.snap b/tests/format/flow/declare-class/__snapshots__/jsfmt.spec.js.snap new file mode 100644 index 000000000..2ffe5f8d8 --- /dev/null +++ b/tests/format/flow/declare-class/__snapshots__/jsfmt.spec.js.snap @@ -0,0 +1,33 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`indexer.js format 1`] = ` +====================================options===================================== +parsers: ["flow", "babel"] +printWidth: 80 + | printWidth +=====================================input====================================== +declare class A { + [number]: boolean; + static [string]: boolean; +} + +// Read-only +declare class B { + +[number]: boolean; + static +[string]: boolean; +} + +=====================================output===================================== +declare class A { + [number]: boolean; + static [string]: boolean; +} + +// Read-only +declare class B { + +[number]: boolean; + static +[string]: boolean; +} + +================================================================================ +`; diff --git a/tests/format/flow/declare-class/indexer.js b/tests/format/flow/declare-class/indexer.js new file mode 100644 index 000000000..e468751e8 --- /dev/null +++ b/tests/format/flow/declare-class/indexer.js @@ -0,0 +1,10 @@ +declare class A { + [number]: boolean; + static [string]: boolean; +} + +// Read-only +declare class B { + +[number]: boolean; + static +[string]: boolean; +} diff --git a/tests/format/flow/declare-class/jsfmt.spec.js b/tests/format/flow/declare-class/jsfmt.spec.js new file mode 100644 index 000000000..fbfa6501a --- /dev/null +++ b/tests/format/flow/declare-class/jsfmt.spec.js @@ -0,0 +1 @@ +run_spec(__dirname, ["flow", "babel"]); From 22294fe9fb08eb3712a23041c17d7e21239d7a29 Mon Sep 17 00:00:00 2001 From: Bela VanderVoort Date: Wed, 29 Dec 2021 00:37:10 -0600 Subject: [PATCH 23/47] Add csharpier to "Related Projects" (#12002) --- docs/related-projects.md | 1 + website/versioned_docs/version-stable/related-projects.md | 1 + 2 files changed, 2 insertions(+) diff --git a/docs/related-projects.md b/docs/related-projects.md index 0f31a297f..b4041468b 100644 --- a/docs/related-projects.md +++ b/docs/related-projects.md @@ -35,3 +35,4 @@ title: Related Projects - [jest-runner-prettier](https://github.com/keplersj/jest-runner-prettier) is Prettier as a Jest runner - [prettier-chrome](https://github.com/u3u/prettier-chrome) is an extension that runs Prettier in the browser - [spotless](https://github.com/diffplug/spotless) lets you run prettier from [gradle](https://github.com/diffplug/spotless/tree/main/plugin-gradle#prettier) or [maven](https://github.com/diffplug/spotless/tree/main/plugin-maven#prettier). +- [csharpier](https://github.com/belav/csharpier) is a port of Prettier for C# diff --git a/website/versioned_docs/version-stable/related-projects.md b/website/versioned_docs/version-stable/related-projects.md index 30e7e663c..a628e85ae 100644 --- a/website/versioned_docs/version-stable/related-projects.md +++ b/website/versioned_docs/version-stable/related-projects.md @@ -36,3 +36,4 @@ original_id: related-projects - [jest-runner-prettier](https://github.com/keplersj/jest-runner-prettier) is Prettier as a Jest runner - [prettier-chrome](https://github.com/u3u/prettier-chrome) is an extension that runs Prettier in the browser - [spotless](https://github.com/diffplug/spotless) lets you run prettier from [gradle](https://github.com/diffplug/spotless/tree/main/plugin-gradle#prettier) or [maven](https://github.com/diffplug/spotless/tree/main/plugin-maven#prettier). +- [csharpier](https://github.com/belav/csharpier) is a port of Prettier for C# From c9c6d3364f8cf5140c3c16b44b92943464be7873 Mon Sep 17 00:00:00 2001 From: Lucas Duailibe Date: Wed, 29 Dec 2021 03:49:49 -0300 Subject: [PATCH 24/47] Fix lint Add 'csharpier' to cspell.json --- cspell.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cspell.json b/cspell.json index 29f9fe29f..3526c192c 100644 --- a/cspell.json +++ b/cspell.json @@ -64,6 +64,7 @@ "concating", "cond", "corejs", + "csharpier", "daleroy", "danez", "Dara", @@ -402,4 +403,4 @@ "website/static/lib/**", "website/static/playground.js" ] -} \ No newline at end of file +} From 66e4597c0e85b51c787b047a6a983f1dd5f50bb3 Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Mon, 3 Jan 2022 05:22:42 +0900 Subject: [PATCH 25/47] Update `acorn` (#12039) --- .../__snapshots__/jsfmt.spec.js.snap | 8 --- tests/format/js/babel-plugins/jsfmt.spec.js | 1 - .../__snapshots__/jsfmt.spec.js.snap | 66 +++++++------------ .../js/module-string-names/jsfmt.spec.js | 4 +- .../module-string-names-export.js | 12 ++-- .../module-string-names-import.js | 4 +- yarn.lock | 6 +- 7 files changed, 35 insertions(+), 66 deletions(-) diff --git a/tests/format/js/babel-plugins/__snapshots__/jsfmt.spec.js.snap b/tests/format/js/babel-plugins/__snapshots__/jsfmt.spec.js.snap index c9e348e3d..65b5d1388 100644 --- a/tests/format/js/babel-plugins/__snapshots__/jsfmt.spec.js.snap +++ b/tests/format/js/babel-plugins/__snapshots__/jsfmt.spec.js.snap @@ -1087,14 +1087,6 @@ let m = module { ================================================================================ `; -exports[`module-string-names.js [espree] format 1`] = ` -"Unexpected token \\"😄\\" (1:10) -> 1 | import { \\"😄\\" as smile } from \\"./emojis.js\\"; - | ^ - 2 | export { smile as \\"😄\\" } from \\"./emojis.js\\"; - 3 |" -`; - exports[`module-string-names.js [meriyah] format 1`] = ` "[1:13]: Expected '}' (1:13) > 1 | import { \\"😄\\" as smile } from \\"./emojis.js\\"; diff --git a/tests/format/js/babel-plugins/jsfmt.spec.js b/tests/format/js/babel-plugins/jsfmt.spec.js index 21241cb17..0a1e38f35 100644 --- a/tests/format/js/babel-plugins/jsfmt.spec.js +++ b/tests/format/js/babel-plugins/jsfmt.spec.js @@ -22,7 +22,6 @@ run_spec(__dirname, ["babel", "babel-ts", "babel-flow"], { "throw-expressions.js", "typescript.js", "v8intrinsic.js", - "module-string-names.js", "module-blocks.js", "async-do-expressions.js", ], diff --git a/tests/format/js/module-string-names/__snapshots__/jsfmt.spec.js.snap b/tests/format/js/module-string-names/__snapshots__/jsfmt.spec.js.snap index d1334de2d..06fdd576d 100644 --- a/tests/format/js/module-string-names/__snapshots__/jsfmt.spec.js.snap +++ b/tests/format/js/module-string-names/__snapshots__/jsfmt.spec.js.snap @@ -1,21 +1,12 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`module-string-names-export.js [espree] format 1`] = ` -"Unexpected token \\"smile\\" (1:19) -> 1 | export { smile as \\"smile\\" } from \\"./emojis.js\\"; - | ^ - 2 | export { \\"smile\\" as smile } from \\"./emojis.js\\"; - 3 | export { \\"smile\\" as \\"smile\\" } from \\"./emojis.js\\"; - 4 | export { foo, bar as \\"foo\\" } from \\"./emojis.js\\";" -`; - exports[`module-string-names-export.js [meriyah] format 1`] = ` -"[1:25]: Only a identifier can be used to indicate alias (1:25) -> 1 | export { smile as \\"smile\\" } from \\"./emojis.js\\"; - | ^ - 2 | export { \\"smile\\" as smile } from \\"./emojis.js\\"; - 3 | export { \\"smile\\" as \\"smile\\" } from \\"./emojis.js\\"; - 4 | export { foo, bar as \\"foo\\" } from \\"./emojis.js\\";" +"[1:26]: Only a identifier can be used to indicate alias (1:26) +> 1 | export { smile as \\"smile1\\" } from \\"./emojis.js\\"; + | ^ + 2 | export { \\"smile\\" as smile2 } from \\"./emojis.js\\"; + 3 | export { \\"smile\\" as \\"smile3\\" } from \\"./emojis.js\\"; + 4 | export { foo1, bar as \\"foo2\\" } from \\"./emojis.js\\";" `; exports[`module-string-names-export.js format 1`] = ` @@ -24,46 +15,33 @@ parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== -export { smile as "smile" } from "./emojis.js"; -export { "smile" as smile } from "./emojis.js"; -export { "smile" as "smile" } from "./emojis.js"; -export { foo, bar as "foo" } from "./emojis.js"; -export { foo, bar as "foo" }; +export { smile as "smile1" } from "./emojis.js"; +export { "smile" as smile2 } from "./emojis.js"; +export { "smile" as "smile3" } from "./emojis.js"; +export { foo1, bar as "foo2" } from "./emojis.js"; export { "學而時習之，不亦說乎？", "吾道一以貫之。" as "忠恕。" } from "Confucius"; -export * as "foo", { default as "quux" } from "module-b"; -export { "smile" } from "./emojis.js"; +export { "smile4" } from "./emojis.js"; =====================================output===================================== -export { smile as "smile" } from "./emojis.js"; -export { "smile" as smile } from "./emojis.js"; -export { "smile" as "smile" } from "./emojis.js"; -export { foo, bar as "foo" } from "./emojis.js"; -export { foo, bar as "foo" }; +export { smile as "smile1" } from "./emojis.js"; +export { "smile" as smile2 } from "./emojis.js"; +export { "smile" as "smile3" } from "./emojis.js"; +export { foo1, bar as "foo2" } from "./emojis.js"; export { "學而時習之，不亦說乎？", "吾道一以貫之。" as "忠恕。", } from "Confucius"; -export * as "foo", { default as "quux" } from "module-b"; -export { "smile" } from "./emojis.js"; +export { "smile4" } from "./emojis.js"; ================================================================================ `; -exports[`module-string-names-import.js [espree] format 1`] = ` -"Unexpected token \\"default\\" (1:10) -> 1 | import { \\"default\\" as quotation } from \\"Confucius\\"; - | ^ - 2 | import { \\"foo\\" as bar, \\"default\\" as qux } from \\"module-a\\"; - 3 | import { \\"學而時習之，不亦說乎？\\" as quotation } from \\"Confucius\\"; - 4 |" -`; - exports[`module-string-names-import.js [meriyah] format 1`] = ` "[1:18]: Expected '}' (1:18) -> 1 | import { \\"default\\" as quotation } from \\"Confucius\\"; +> 1 | import { \\"default\\" as quotation1 } from \\"Confucius\\"; | ^ 2 | import { \\"foo\\" as bar, \\"default\\" as qux } from \\"module-a\\"; - 3 | import { \\"學而時習之，不亦說乎？\\" as quotation } from \\"Confucius\\"; + 3 | import { \\"學而時習之，不亦說乎？\\" as quotation2 } from \\"Confucius\\"; 4 |" `; @@ -73,14 +51,14 @@ parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== -import { "default" as quotation } from "Confucius"; +import { "default" as quotation1 } from "Confucius"; import { "foo" as bar, "default" as qux } from "module-a"; -import { "學而時習之，不亦說乎？" as quotation } from "Confucius"; +import { "學而時習之，不亦說乎？" as quotation2 } from "Confucius"; =====================================output===================================== -import { "default" as quotation } from "Confucius"; +import { "default" as quotation1 } from "Confucius"; import { "foo" as bar, "default" as qux } from "module-a"; -import { "學而時習之，不亦說乎？" as quotation } from "Confucius"; +import { "學而時習之，不亦說乎？" as quotation2 } from "Confucius"; ================================================================================ `; diff --git a/tests/format/js/module-string-names/jsfmt.spec.js b/tests/format/js/module-string-names/jsfmt.spec.js index 0fab4456d..84c005b1f 100644 --- a/tests/format/js/module-string-names/jsfmt.spec.js +++ b/tests/format/js/module-string-names/jsfmt.spec.js @@ -1 +1,3 @@ -run_spec(__dirname, ["babel"], { errors: { espree: true, meriyah: true } }); +run_spec(__dirname, ["babel"], { + errors: { meriyah: true }, +}); diff --git a/tests/format/js/module-string-names/module-string-names-export.js b/tests/format/js/module-string-names/module-string-names-export.js index cab6023a1..74e6ef98f 100644 --- a/tests/format/js/module-string-names/module-string-names-export.js +++ b/tests/format/js/module-string-names/module-string-names-export.js @@ -1,8 +1,6 @@ -export { smile as "smile" } from "./emojis.js"; -export { "smile" as smile } from "./emojis.js"; -export { "smile" as "smile" } from "./emojis.js"; -export { foo, bar as "foo" } from "./emojis.js"; -export { foo, bar as "foo" }; +export { smile as "smile1" } from "./emojis.js"; +export { "smile" as smile2 } from "./emojis.js"; +export { "smile" as "smile3" } from "./emojis.js"; +export { foo1, bar as "foo2" } from "./emojis.js"; export { "學而時習之，不亦說乎？", "吾道一以貫之。" as "忠恕。" } from "Confucius"; -export * as "foo", { default as "quux" } from "module-b"; -export { "smile" } from "./emojis.js"; +export { "smile4" } from "./emojis.js"; diff --git a/tests/format/js/module-string-names/module-string-names-import.js b/tests/format/js/module-string-names/module-string-names-import.js index 84ca0d81b..284c7040f 100644 --- a/tests/format/js/module-string-names/module-string-names-import.js +++ b/tests/format/js/module-string-names/module-string-names-import.js @@ -1,3 +1,3 @@ -import { "default" as quotation } from "Confucius"; +import { "default" as quotation1 } from "Confucius"; import { "foo" as bar, "default" as qux } from "module-a"; -import { "學而時習之，不亦說乎？" as quotation } from "Confucius"; +import { "學而時習之，不亦說乎？" as quotation2 } from "Confucius"; diff --git a/yarn.lock b/yarn.lock index 5db3aa5b7..e2d34f6a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1962,9 +1962,9 @@ acorn@^7.1.1: integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== acorn@^8.2.4, acorn@^8.4.1, acorn@^8.6.0: - version "8.6.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.6.0.tgz#e3692ba0eb1a0c83eaa4f37f5fa7368dd7142895" - integrity sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw== + version "8.7.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf" + integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ== agent-base@6: version "6.0.2" From 88288232fbc7089a16b33228ff6d73414a28df9b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jan 2022 13:05:34 +0000 Subject: [PATCH 26/47] Build(deps): Bump camelcase from 6.2.1 to 6.3.0 (#12027) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 0e49c8e89..ccaee2be2 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "@typescript-eslint/typescript-estree": "5.8.0", "angular-estree-parser": "2.5.0", "angular-html-parser": "1.8.0", - "camelcase": "6.2.1", + "camelcase": "6.3.0", "chalk": "4.1.2", "ci-info": "3.3.0", "cjk-regex": "2.0.1", diff --git a/yarn.lock b/yarn.lock index e2d34f6a1..0af35a22c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2319,10 +2319,10 @@ callsites@^3.0.0, callsites@^3.1.0: resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== -camelcase@6.2.1, camelcase@^6.2.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.1.tgz#250fd350cfd555d0d2160b1d51510eaf8326e86e" - integrity sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA== +camelcase@6.3.0, camelcase@^6.2.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" + integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== camelcase@^5.3.1: version "5.3.1" From 765fce3c0bb6c679fd51eafecdeed06699a6d38b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jan 2022 22:11:37 +0800 Subject: [PATCH 27/47] Build(deps-dev): Bump eslint-plugin-import from 2.25.3 to 2.25.4 (#12041) Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.25.3 to 2.25.4. - [Release notes](https://github.com/import-js/eslint-plugin-import/releases) - [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md) - [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.25.3...v2.25.4) --- updated-dependencies: - dependency-name: eslint-plugin-import dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 30 +++++++++++------------------- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index ccaee2be2..1c1d2f376 100644 --- a/package.json +++ b/package.json @@ -112,7 +112,7 @@ "eslint-config-prettier": "8.3.0", "eslint-formatter-friendly": "7.0.0", "eslint-plugin-compat": "4.0.0", - "eslint-plugin-import": "2.25.3", + "eslint-plugin-import": "2.25.4", "eslint-plugin-jest": "25.3.0", "eslint-plugin-prettier-internal-rules": "2.0.1", "eslint-plugin-react": "7.28.0", diff --git a/yarn.lock b/yarn.lock index 0af35a22c..75e355279 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2984,14 +2984,13 @@ eslint-import-resolver-node@^0.3.6: debug "^3.2.7" resolve "^1.20.0" -eslint-module-utils@^2.7.1: - version "2.7.1" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.1.tgz#b435001c9f8dd4ab7f6d0efcae4b9696d4c24b7c" - integrity sha512-fjoetBXQZq2tSTWZ9yWVl2KuFrTZZH3V+9iD1V1RfpDgxzJR+mPd/KZmMiA8gbPqdBzpNiEHOuT7IYEWxrH0zQ== +eslint-module-utils@^2.7.2: + version "2.7.2" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.2.tgz#1d0aa455dcf41052339b63cada8ab5fd57577129" + integrity sha512-zquepFnWCY2ISMFwD/DqzaM++H+7PDzOpUvotJWm/y1BAFt5R4oeULgdrTejKqLkz7MA/tgstsUMNYc7wNdTrg== dependencies: debug "^3.2.7" find-up "^2.1.0" - pkg-dir "^2.0.0" eslint-plugin-compat@4.0.0: version "4.0.0" @@ -3007,24 +3006,24 @@ eslint-plugin-compat@4.0.0: lodash.memoize "4.1.2" semver "7.3.5" -eslint-plugin-import@2.25.3: - version "2.25.3" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.3.tgz#a554b5f66e08fb4f6dc99221866e57cfff824766" - integrity sha512-RzAVbby+72IB3iOEL8clzPLzL3wpDrlwjsTBAQXgyp5SeTqqY+0bFubwuo+y/HLhNZcXV4XqTBO4LGsfyHIDXg== +eslint-plugin-import@2.25.4: + version "2.25.4" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz#322f3f916a4e9e991ac7af32032c25ce313209f1" + integrity sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA== dependencies: array-includes "^3.1.4" array.prototype.flat "^1.2.5" debug "^2.6.9" doctrine "^2.1.0" eslint-import-resolver-node "^0.3.6" - eslint-module-utils "^2.7.1" + eslint-module-utils "^2.7.2" has "^1.0.3" is-core-module "^2.8.0" is-glob "^4.0.3" minimatch "^3.0.4" object.values "^1.1.5" resolve "^1.20.0" - tsconfig-paths "^3.11.0" + tsconfig-paths "^3.12.0" eslint-plugin-jest@25.3.0: version "25.3.0" @@ -5308,13 +5307,6 @@ pirates@^4.0.1: dependencies: node-modules-regexp "^1.0.0" -pkg-dir@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" - integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s= - dependencies: - find-up "^2.1.0" - pkg-dir@^4.1.0, pkg-dir@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" @@ -6256,7 +6248,7 @@ trough@^1.0.0: resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406" integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA== -tsconfig-paths@^3.11.0: +tsconfig-paths@^3.12.0: version "3.12.0" resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz#19769aca6ee8f6a1a341e38c8fa45dd9fb18899b" integrity sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg== From 1f1496f7d170d79a5f6144667d26aeb899ebfdce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jan 2022 14:12:21 +0000 Subject: [PATCH 28/47] Build(deps): Bump @typescript-eslint/typescript-estree (#12028) --- package.json | 2 +- yarn.lock | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 1c1d2f376..f1b29a796 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "@babel/parser": "7.16.6", "@glimmer/syntax": "0.83.1", "@iarna/toml": "2.2.5", - "@typescript-eslint/typescript-estree": "5.8.0", + "@typescript-eslint/typescript-estree": "5.8.1", "angular-estree-parser": "2.5.0", "angular-html-parser": "1.8.0", "camelcase": "6.3.0", diff --git a/yarn.lock b/yarn.lock index 75e355279..ba23d4cc8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1750,10 +1750,10 @@ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.5.0.tgz#fee61ae510e84ed950a53937a2b443e078107003" integrity sha512-OaYTqkW3GnuHxqsxxJ6KypIKd5Uw7bFiQJZRyNi1jbMJnK3Hc/DR4KwB6KJj6PBRkJJoaNwzMNv9vtTk87JhOg== -"@typescript-eslint/types@5.8.0": - version "5.8.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.8.0.tgz#e7fa74ec35d9dbe3560d039d3d8734986c3971e0" - integrity sha512-LdCYOqeqZWqCMOmwFnum6YfW9F3nKuxJiR84CdIRN5nfHJ7gyvGpXWqL/AaW0k3Po0+wm93ARAsOdzlZDPCcXg== +"@typescript-eslint/types@5.8.1": + version "5.8.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.8.1.tgz#04c6b49ebc8c99238238a6b8b43f2fc613983b5a" + integrity sha512-L/FlWCCgnjKOLefdok90/pqInkomLnAcF9UAzNr+DSqMC3IffzumHTQTrINXhP1gVp9zlHiYYjvozVZDPleLcA== "@typescript-eslint/typescript-estree@5.5.0": version "5.5.0" @@ -1768,13 +1768,13 @@ semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/typescript-estree@5.8.0": - version "5.8.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.8.0.tgz#900469ba9d5a37f4482b014ecce4a5dbb86cb4dd" - integrity sha512-srfeZ3URdEcUsSLbkOFqS7WoxOqn8JNil2NSLO9O+I2/Uyc85+UlfpEvQHIpj5dVts7KKOZnftoJD/Fdv0L7nQ== +"@typescript-eslint/typescript-estree@5.8.1": + version "5.8.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.8.1.tgz#a592855be688e7b729a1e9411d7d74ec992ed6ef" + integrity sha512-26lQ8l8tTbG7ri7xEcCFT9ijU5Fk+sx/KRRyyzCv7MQ+rZZlqiDPtMKWLC8P7o+dtCnby4c+OlxuX1tp8WfafQ== dependencies: - "@typescript-eslint/types" "5.8.0" - "@typescript-eslint/visitor-keys" "5.8.0" + "@typescript-eslint/types" "5.8.1" + "@typescript-eslint/visitor-keys" "5.8.1" debug "^4.3.2" globby "^11.0.4" is-glob "^4.0.3" @@ -1789,12 +1789,12 @@ "@typescript-eslint/types" "5.5.0" eslint-visitor-keys "^3.0.0" -"@typescript-eslint/visitor-keys@5.8.0": - version "5.8.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.8.0.tgz#22d4ed96fe2451135299239feedb9fe1dcec780c" - integrity sha512-+HDIGOEMnqbxdAHegxvnOqESUH6RWFRR2b8qxP1W9CZnnYh4Usz6MBL+2KMAgPk/P0o9c1HqnYtwzVH6GTIqug== +"@typescript-eslint/visitor-keys@5.8.1": + version "5.8.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.8.1.tgz#58a2c566265d5511224bc316149890451c1bbab0" + integrity sha512-SWgiWIwocK6NralrJarPZlWdr0hZnj5GXHIgfdm8hNkyKvpeQuFyLP6YjSIe9kf3YBIfU6OHSZLYkQ+smZwtNg== dependencies: - "@typescript-eslint/types" "5.8.0" + "@typescript-eslint/types" "5.8.1" eslint-visitor-keys "^3.0.0" "@webassemblyjs/ast@1.11.1": From 8c846bc86ca5e6886c9dd2463ed34cf1972a7a4e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jan 2022 14:13:00 +0000 Subject: [PATCH 29/47] Build(deps): Bump espree from 9.2.0 to 9.3.0 (#12021) --- package.json | 2 +- yarn.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index f1b29a796..38d7c6cb8 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "editorconfig": "0.15.3", "editorconfig-to-prettier": "0.2.0", "escape-string-regexp": "4.0.0", - "espree": "9.2.0", + "espree": "9.3.0", "esutils": "2.0.3", "fast-glob": "3.2.7", "fast-json-stable-stringify": "2.1.0", diff --git a/yarn.lock b/yarn.lock index ba23d4cc8..0f337ba8a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1961,7 +1961,7 @@ acorn@^7.1.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.2.4, acorn@^8.4.1, acorn@^8.6.0: +acorn@^8.2.4, acorn@^8.4.1, acorn@^8.7.0: version "8.7.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf" integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ== @@ -3185,12 +3185,12 @@ esm-utils@2.0.0: resolved "https://registry.yarnpkg.com/esm-utils/-/esm-utils-2.0.0.tgz#94c18662cb50ab52f8a8c87125c0e7c43c8ac28b" integrity sha512-FM1aYzy+6rfTR4XHE5CwGAEliEvKCpCgDpnjqtk2eYEcLuTHK5SzypGQrkyaFB21utY8EePOrZhQvk3ayZhQjQ== -espree@9.2.0, espree@^9.2.0: - version "9.2.0" - resolved "https://registry.yarnpkg.com/espree/-/espree-9.2.0.tgz#c50814e01611c2d0f8bd4daa83c369eabba80dbc" - integrity sha512-oP3utRkynpZWF/F2x/HZJ+AGtnIclaR7z1pYPxy7NYM2fSO6LgK/Rkny8anRSPK/VwEA1eqm2squui0T7ZMOBg== +espree@9.3.0, espree@^9.2.0: + version "9.3.0" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.0.tgz#c1240d79183b72aaee6ccfa5a90bc9111df085a8" + integrity sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ== dependencies: - acorn "^8.6.0" + acorn "^8.7.0" acorn-jsx "^5.3.1" eslint-visitor-keys "^3.1.0" From 5f453482bc98f7c10ba19d34586174ddee76b94e Mon Sep 17 00:00:00 2001 From: fisker Cheung Date: Mon, 3 Jan 2022 22:16:25 +0800 Subject: [PATCH 30/47] Add internal ESLint rule `await-cli-tests` (#12013) Co-authored-by: Sosuke Suzuki --- .eslintrc.js | 6 ++ .../await-cli-tests.js | 72 +++++++++++++++++++ .../index.js | 1 + .../test.js | 26 +++++++ 4 files changed, 105 insertions(+) create mode 100644 scripts/tools/eslint-plugin-prettier-internal-rules/await-cli-tests.js diff --git a/.eslintrc.js b/.eslintrc.js index dd11a9d1e..e06620c5f 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -179,6 +179,12 @@ module.exports = { "jest/prefer-to-be": "error", }, }, + { + files: ["tests/integration/**/*.js"], + rules: { + "prettier-internal-rules/await-cli-tests": "error", + }, + }, { files: ["tests/**/*.js"], rules: { diff --git a/scripts/tools/eslint-plugin-prettier-internal-rules/await-cli-tests.js b/scripts/tools/eslint-plugin-prettier-internal-rules/await-cli-tests.js new file mode 100644 index 000000000..b066f1a07 --- /dev/null +++ b/scripts/tools/eslint-plugin-prettier-internal-rules/await-cli-tests.js @@ -0,0 +1,72 @@ +"use strict"; + +const selector = [ + "CallExpression", + '[callee.type="Identifier"]', + '[callee.name="runPrettier"]', +].join(""); + +const MESSAGE_ID_CALL = "await-cli-tests/call"; +const MESSAGE_ID_GETTER = "await-cli-tests/getter"; + +module.exports = { + meta: { + type: "suggestion", + docs: { + url: "https://github.com/prettier/prettier/blob/main/scripts/tools/eslint-plugin-prettier-internal-rules/await-cli-tests.js", + }, + messages: { + [MESSAGE_ID_CALL]: + "'runPrettier()' should be awaited or calling `.test()`.", + [MESSAGE_ID_GETTER]: "'runPrettier().{{property}}' should be awaited.", + }, + }, + create(context) { + return { + [selector](callExpression) { + const { parent } = callExpression; + if ( + parent.type === "AwaitExpression" && + parent.argument === callExpression + ) { + return; + } + + if ( + parent.type === "MemberExpression" && + parent.object === callExpression && + parent.property.type === "Identifier" && + parent.property.name === "test" && + parent.parent.type === "CallExpression" && + parent.parent.callee === parent + ) { + return; + } + + if ( + parent.type === "MemberExpression" && + parent.object === callExpression && + parent.property.type === "Identifier" && + ["status", "write", "stdout", "stderr"].includes(parent.property.name) + ) { + const memberExpression = callExpression.parent; + if ( + memberExpression.parent.type === "AwaitExpression" && + memberExpression.parent.argument === memberExpression + ) { + return; + } + + context.report({ + node: memberExpression.property, + messageId: MESSAGE_ID_GETTER, + data: { property: memberExpression.property.name }, + }); + return; + } + + context.report({ node: callExpression, messageId: MESSAGE_ID_CALL }); + }, + }; + }, +}; diff --git a/scripts/tools/eslint-plugin-prettier-internal-rules/index.js b/scripts/tools/eslint-plugin-prettier-internal-rules/index.js index 114c4cfa0..b58a79e97 100644 --- a/scripts/tools/eslint-plugin-prettier-internal-rules/index.js +++ b/scripts/tools/eslint-plugin-prettier-internal-rules/index.js @@ -2,6 +2,7 @@ module.exports = { rules: { + "await-cli-tests": require("./await-cli-tests.js"), "better-parent-property-check-in-needs-parens": require("./better-parent-property-check-in-needs-parens.js"), "consistent-negative-index-access": require("./consistent-negative-index-access.js"), "directly-loc-start-end": require("./directly-loc-start-end.js"), diff --git a/scripts/tools/eslint-plugin-prettier-internal-rules/test.js b/scripts/tools/eslint-plugin-prettier-internal-rules/test.js index e9afa6c1d..f89175aac 100644 --- a/scripts/tools/eslint-plugin-prettier-internal-rules/test.js +++ b/scripts/tools/eslint-plugin-prettier-internal-rules/test.js @@ -14,6 +14,32 @@ const test = (ruleId, tests) => { ); }; +test("await-cli-tests", { + valid: [ + "async () => await runPrettier()", + "runPrettier().test()", + "notRunPrettier()", + "async () => await runPrettier().stderr", + outdent` + async () => { + const originalStdout = await runPrettier("plugins/options", ["--help"]).stdout; + } + `, + ], + invalid: [ + { + code: "runPrettier()", + errors: [ + { message: "'runPrettier()' should be awaited or calling `.test()`." }, + ], + }, + { + code: "runPrettier().stderr", + errors: [{ message: "'runPrettier().stderr' should be awaited." }], + }, + ], +}); + test("better-parent-property-check-in-needs-parens", { valid: ["function needsParens() {return parent.test === node;}"], invalid: [ From 3a1de5cb4fba4af3194f0f66833e3b4ef09797dc Mon Sep 17 00:00:00 2001 From: fisker Cheung Date: Mon, 3 Jan 2022 22:17:14 +0800 Subject: [PATCH 31/47] Simplify `clean-cspell` script (#12015) --- cspell.json | 15 +------------ scripts/clean-cspell.mjs | 47 ++++++++++++++++++++-------------------- 2 files changed, 25 insertions(+), 37 deletions(-) diff --git a/cspell.json b/cspell.json index 3526c192c..b6d708a89 100644 --- a/cspell.json +++ b/cspell.json @@ -3,7 +3,6 @@ "$schema": "https://raw.githubusercontent.com/streetsidesoftware/cspell/master/cspell.schema.json", "words": [ "ACMR", - "actionlint", "Alexa", "Amjad", "Andrey", @@ -22,7 +21,6 @@ "autocrlf", "autodetects", "autofix", - "autogenerated", "autolinks", "autoload", "autoloaded", @@ -58,7 +56,6 @@ "codemirror", "codemod", "codemods", - "combinator", "commonmark", "compat", "concating", @@ -79,7 +76,6 @@ "desugared", "devcontainer", "devs", - "docblock", "docblocks", "doctag", "Dodds", @@ -103,14 +99,12 @@ "esproposal", "estree", "esutils", - "eval", "execa", "fbglyph", "Ficarra", "Filipe", "Fiorini", "Fisker", - "fnames", "foldgutter", "formatprg", "Friedly", @@ -125,7 +119,6 @@ "globby", "gofmt", "Gregor", - "gtag", "Hampus", "hardline", "hardlines", @@ -183,9 +176,7 @@ "linearize", "linebreak", "linebreaks", - "linenumbers", "literalline", - "Literallines", "loglevel", "lowercased", "lowercasing", @@ -212,7 +203,6 @@ "mousedown", "mouseup", "mprettier", - "msapplication", "multiparser", "Muntean", "nargs", @@ -285,7 +275,6 @@ "Sapegin", "sbdchd", "scandir", - "schemastore", "Serializers", "setlocal", "setq", @@ -357,10 +346,8 @@ "Weixin", "whitespaces", "wxss", - "xargs", "yamafaktory", "Yatharth", - "youtube", "Zatorski", "Zosel" ], @@ -403,4 +390,4 @@ "website/static/lib/**", "website/static/playground.js" ] -} +} \ No newline at end of file diff --git a/scripts/clean-cspell.mjs b/scripts/clean-cspell.mjs index eaa4ea01a..05c3979c6 100644 --- a/scripts/clean-cspell.mjs +++ b/scripts/clean-cspell.mjs @@ -6,37 +6,40 @@ import execa from "execa"; const CSPELL_CONFIG_FILE = new URL("../cspell.json", import.meta.url); const updateConfig = (config) => fs.writeFile(CSPELL_CONFIG_FILE, JSON.stringify(config, undefined, 4)); -const runSpellcheck = () => execa("yarn", ["lint:spellcheck"]); +const runSpellcheck = (options) => { + const { yarnArgs, args, execaOptions } = { + yarnArgs: [], + args: [], + ...options, + }; + return execa("yarn", [...yarnArgs, "lint:spellcheck", ...args], execaOptions); +}; (async () => { console.log("Empty words ..."); const config = JSON.parse(await fs.readFile(CSPELL_CONFIG_FILE, "utf8")); - const oldWords = config.words; + const original = config.words; await updateConfig({ ...config, words: [] }); console.log("Running spellcheck with empty words ..."); - try { - await runSpellcheck(); - } catch ({ stdout }) { - let words = [...stdout.matchAll(/ - Unknown word \((.*?)\)/g)].map( - ([, word]) => word - ); - // Unique - words = [...new Set(words)]; + const { stdout } = await runSpellcheck({ + yarnArgs: ["--silent"], + args: ["--words-only", "--unique"], + execaOptions: { reject: false }, + }); + + const words = stdout + .split("\n") // Remove upper case word, if lower case one already exists - words = words.filter((word) => { + .filter((word, _, words) => { const lowerCased = word.toLowerCase(); return lowerCased === word || !words.includes(lowerCased); - }); + }) // Compare function from https://github.com/streetsidesoftware/vscode-spell-checker/blob/2fde3bc5c658ee51da5a56580aa1370bf8174070/packages/client/src/settings/CSpellSettings.ts#L78 - words = words.sort((a, b) => - a.toLowerCase().localeCompare(b.toLowerCase()) - ); - config.words = words; - } + .sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase())); + config.words = words; - const newWords = config.words; - const removed = oldWords.filter((word) => !newWords.includes(word)); + const removed = original.filter((word) => !words.includes(word)); if (removed.length > 0) { console.log( `${removed.length} words removed: \n${removed @@ -44,7 +47,7 @@ const runSpellcheck = () => execa("yarn", ["lint:spellcheck"]); .join("\n")}` ); } - const added = newWords.filter((word) => !oldWords.includes(word)); + const added = words.filter((word) => !original.includes(word)); if (added.length > 0) { console.log( `${added.length} words added: \n${added @@ -57,9 +60,7 @@ const runSpellcheck = () => execa("yarn", ["lint:spellcheck"]); await updateConfig(config); console.log("Running spellcheck with new words ..."); - const subprocess = runSpellcheck(); - subprocess.stdout.pipe(process.stdout); - await subprocess; + await runSpellcheck({ execaOptions: { stdout: "inherit" } }); console.log("CSpell config file updated."); })().catch((error) => { From 9200d4f8a23aac384f15ded0560a1923978d92c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jan 2022 16:53:52 +0000 Subject: [PATCH 32/47] Build(deps-dev): Bump @rollup/plugin-alias from 3.1.8 to 3.1.9 (#12042) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 38d7c6cb8..132396956 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "@babel/preset-env": "7.16.5", "@babel/types": "7.16.0", "@glimmer/reference": "0.83.1", - "@rollup/plugin-alias": "3.1.8", + "@rollup/plugin-alias": "3.1.9", "@rollup/plugin-babel": "5.3.0", "@rollup/plugin-commonjs": "21.0.1", "@rollup/plugin-json": "4.1.0", diff --git a/yarn.lock b/yarn.lock index 0f337ba8a..c7bf41d7a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1476,10 +1476,10 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@rollup/plugin-alias@3.1.8": - version "3.1.8" - resolved "https://registry.yarnpkg.com/@rollup/plugin-alias/-/plugin-alias-3.1.8.tgz#645fd84659e08d3d1b059408fcdf69c1dd435a6b" - integrity sha512-tf7HeSs/06wO2LPqKNY3Ckbvy0JRe7Jyn98bXnt/gfrxbe+AJucoNJlsEVi9sdgbQtXemjbakCpO/76JVgnHpA== +"@rollup/plugin-alias@3.1.9": + version "3.1.9" + resolved "https://registry.yarnpkg.com/@rollup/plugin-alias/-/plugin-alias-3.1.9.tgz#a5d267548fe48441f34be8323fb64d1d4a1b3fdf" + integrity sha512-QI5fsEvm9bDzt32k39wpOwZhVzRcL5ydcffUHMyLVaVaLeC70I8TJZ17F1z1eMoLu4E/UOcH9BWVkKpIKdrfiw== dependencies: slash "^3.0.0" From 90eaa1c162fa316d89dda23083ffc8f308d2320f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jan 2022 17:11:41 +0000 Subject: [PATCH 33/47] Build(deps-dev): Bump eslint-plugin-jest from 25.3.0 to 25.3.4 (#12034) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 132396956..c4957ee2b 100644 --- a/package.json +++ b/package.json @@ -113,7 +113,7 @@ "eslint-formatter-friendly": "7.0.0", "eslint-plugin-compat": "4.0.0", "eslint-plugin-import": "2.25.4", - "eslint-plugin-jest": "25.3.0", + "eslint-plugin-jest": "25.3.4", "eslint-plugin-prettier-internal-rules": "2.0.1", "eslint-plugin-react": "7.28.0", "eslint-plugin-regexp": "1.5.1", diff --git a/yarn.lock b/yarn.lock index c7bf41d7a..144289a59 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3025,10 +3025,10 @@ eslint-plugin-import@2.25.4: resolve "^1.20.0" tsconfig-paths "^3.12.0" -eslint-plugin-jest@25.3.0: - version "25.3.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-25.3.0.tgz#6c04bbf13624a75684a05391a825b58e2e291950" - integrity sha512-79WQtuBsTN1S8Y9+7euBYwxIOia/k7ykkl9OCBHL3xuww5ecursHy/D8GCIlvzHVWv85gOkS5Kv6Sh7RxOgK1Q== +eslint-plugin-jest@25.3.4: + version "25.3.4" + resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-25.3.4.tgz#2031dfe495be1463330f8b80096ddc91f8e6387f" + integrity sha512-CCnwG71wvabmwq/qkz0HWIqBHQxw6pXB1uqt24dxqJ9WB34pVg49bL1sjXphlJHgTMWGhBjN1PicdyxDxrfP5A== dependencies: "@typescript-eslint/experimental-utils" "^5.0.0" From a10614f45482a22bef47b8a81561e5517c54eb5f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jan 2022 17:25:06 +0000 Subject: [PATCH 34/47] Build(deps-dev): Bump esm-utils from 2.0.0 to 2.0.1 (#12031) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index c4957ee2b..97803a10c 100644 --- a/package.json +++ b/package.json @@ -118,7 +118,7 @@ "eslint-plugin-react": "7.28.0", "eslint-plugin-regexp": "1.5.1", "eslint-plugin-unicorn": "39.0.0", - "esm-utils": "2.0.0", + "esm-utils": "2.0.1", "execa": "5.1.1", "jest": "27.4.5", "jest-snapshot-serializer-ansi": "1.0.0", diff --git a/yarn.lock b/yarn.lock index 144289a59..498d6adc4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3180,10 +3180,10 @@ eslint@8.5.0: text-table "^0.2.0" v8-compile-cache "^2.0.3" -esm-utils@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/esm-utils/-/esm-utils-2.0.0.tgz#94c18662cb50ab52f8a8c87125c0e7c43c8ac28b" - integrity sha512-FM1aYzy+6rfTR4XHE5CwGAEliEvKCpCgDpnjqtk2eYEcLuTHK5SzypGQrkyaFB21utY8EePOrZhQvk3ayZhQjQ== +esm-utils@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/esm-utils/-/esm-utils-2.0.1.tgz#233b691b5542cafdc3a6f4b24bd4af083ea21bd0" + integrity sha512-eoz4dzSzykeh9mfRlCDTkNezD2zlPdFftiTH/5OZpE08hGpUPljh5rHDZqucIhX1Wl4cO6FDUUBp3tobvV7dWA== espree@9.3.0, espree@^9.2.0: version "9.3.0" From abfd67dfe0ad5f461bfefd2f1890f4cf599eb29f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jan 2022 17:43:04 +0000 Subject: [PATCH 35/47] Build(deps): Bump actions/setup-node from 2.5.0 to 2.5.1 (#12018) --- .github/workflows/dev-package-test.yml | 2 +- .github/workflows/dev-test.yml | 2 +- .github/workflows/eslint-rules.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/prod-test.yml | 6 +++--- .github/workflows/release-script-test.yml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/dev-package-test.yml b/.github/workflows/dev-package-test.yml index d4619c30b..b32473aae 100644 --- a/.github/workflows/dev-package-test.yml +++ b/.github/workflows/dev-package-test.yml @@ -34,7 +34,7 @@ jobs: uses: actions/checkout@v2.4.0 - name: Setup Node.js - uses: actions/setup-node@v2.5.0 + uses: actions/setup-node@v2.5.1 with: node-version: ${{ matrix.node }} cache: "yarn" diff --git a/.github/workflows/dev-test.yml b/.github/workflows/dev-test.yml index dfc70fc39..b0617bfc4 100644 --- a/.github/workflows/dev-test.yml +++ b/.github/workflows/dev-test.yml @@ -47,7 +47,7 @@ jobs: fetch-depth: 2 - name: Setup Node.js - uses: actions/setup-node@v2.5.0 + uses: actions/setup-node@v2.5.1 with: node-version: ${{ matrix.node }} cache: "yarn" diff --git a/.github/workflows/eslint-rules.yml b/.github/workflows/eslint-rules.yml index 439a010d4..bd982bd73 100644 --- a/.github/workflows/eslint-rules.yml +++ b/.github/workflows/eslint-rules.yml @@ -19,7 +19,7 @@ jobs: uses: actions/checkout@v2.4.0 - name: Setup Node.js - uses: actions/setup-node@v2.5.0 + uses: actions/setup-node@v2.5.1 with: cache: "yarn" diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 89d030e6d..39f9bfa6d 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -16,7 +16,7 @@ jobs: uses: actions/checkout@v2.4.0 - name: Setup Node.js - uses: actions/setup-node@v2.5.0 + uses: actions/setup-node@v2.5.1 with: cache: "yarn" diff --git a/.github/workflows/prod-test.yml b/.github/workflows/prod-test.yml index 1d158d583..4585a2da3 100644 --- a/.github/workflows/prod-test.yml +++ b/.github/workflows/prod-test.yml @@ -16,7 +16,7 @@ jobs: uses: actions/checkout@v2.4.0 - name: Setup Node.js - uses: actions/setup-node@v2.5.0 + uses: actions/setup-node@v2.5.1 with: cache: "yarn" @@ -62,7 +62,7 @@ jobs: uses: actions/checkout@v2.4.0 - name: Setup Node.js - uses: actions/setup-node@v2.5.0 + uses: actions/setup-node@v2.5.1 with: cache: "yarn" @@ -115,7 +115,7 @@ jobs: uses: actions/checkout@v2.4.0 - name: Setup Node.js - uses: actions/setup-node@v2.5.0 + uses: actions/setup-node@v2.5.1 with: node-version: ${{ matrix.node }} cache: "yarn" diff --git a/.github/workflows/release-script-test.yml b/.github/workflows/release-script-test.yml index 8a58963b2..3f12b5a1b 100644 --- a/.github/workflows/release-script-test.yml +++ b/.github/workflows/release-script-test.yml @@ -23,7 +23,7 @@ jobs: uses: actions/checkout@v2.4.0 - name: Setup Node.js - uses: actions/setup-node@v2.5.0 + uses: actions/setup-node@v2.5.1 with: version: "14" cache: "yarn" From 28b087581975b9a781545979fd8e32a010316424 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jan 2022 18:00:33 +0000 Subject: [PATCH 36/47] Build(deps-dev): Bump cspell from 5.13.4 to 5.14.0 (#12035) --- package.json | 2 +- yarn.lock | 104 +++++++++++++++++++++++++-------------------------- 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/package.json b/package.json index 97803a10c..44c483984 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "builtin-modules": "3.2.0", "core-js": "3.20.1", "cross-env": "7.0.3", - "cspell": "5.13.4", + "cspell": "5.14.0", "enquirer": "2.3.6", "eslint": "8.5.0", "eslint-config-prettier": "8.3.0", diff --git a/yarn.lock b/yarn.lock index 498d6adc4..500ba4917 100644 --- a/yarn.lock +++ b/yarn.lock @@ -936,10 +936,10 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@cspell/cspell-bundled-dicts@^5.13.4": - version "5.13.4" - resolved "https://registry.yarnpkg.com/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-5.13.4.tgz#468d008c79bceb9728071c5fd8710e082d7895c7" - integrity sha512-D88zFAcEbUJiM03cY1U4Fb1c9BcECi6RvSwwJG/Ayc4lLO9uZgFyKlzQwjSEgTzuCME9A0Nn2hXrD+aWol85Mg== +"@cspell/cspell-bundled-dicts@^5.14.0": + version "5.14.0" + resolved "https://registry.yarnpkg.com/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-5.14.0.tgz#9ad881de6cd6362fbbb383bcb52b3f4d1a474454" + integrity sha512-H9vrn+DUuZ8yrpL6Ljv5Q4WQG9FbEFmS2RpsQ+jPu1gZ/JLnHYRLL1S62Gzgwsky2QeXvHbNJVct7s9A0FXj8A== dependencies: "@cspell/dict-ada" "^1.1.2" "@cspell/dict-aws" "^1.0.14" @@ -959,7 +959,7 @@ "@cspell/dict-fullstack" "^2.0.4" "@cspell/dict-golang" "^1.1.24" "@cspell/dict-haskell" "^1.0.13" - "@cspell/dict-html" "^1.1.9" + "@cspell/dict-html" "^2.0.2" "@cspell/dict-html-symbol-entities" "^1.0.23" "@cspell/dict-java" "^1.0.23" "@cspell/dict-latex" "^1.0.25" @@ -979,10 +979,10 @@ "@cspell/dict-typescript" "^1.0.19" "@cspell/dict-vue" "^2.0.1" -"@cspell/cspell-types@^5.13.4": - version "5.13.4" - resolved "https://registry.yarnpkg.com/@cspell/cspell-types/-/cspell-types-5.13.4.tgz#5712d82b784859220b15c074e0c726a5d667d26d" - integrity sha512-OH3aqFfmRNOSO0K0h5JNm84I5RLDgngp1Qa9YeEm9oj1U/qjrm2bOwOGGh9XU/ZjLl56JMbtbnfSpHpT7tLc+A== +"@cspell/cspell-types@^5.14.0": + version "5.14.0" + resolved "https://registry.yarnpkg.com/@cspell/cspell-types/-/cspell-types-5.14.0.tgz#bb37706f2a3249ab14011a0cbcc61d8879a0cb3c" + integrity sha512-yTKxE+h+4LjzASHWrIuFpLK9L4oX3Em8Ea8aU4ccV1YCHcIqsuriTXnVtaqqaFEw9zz0PeU9ugwDROFwzfAejg== "@cspell/dict-ada@^1.1.2": version "1.1.2" @@ -1079,10 +1079,10 @@ resolved "https://registry.yarnpkg.com/@cspell/dict-html-symbol-entities/-/dict-html-symbol-entities-1.0.23.tgz#0efbdbc7712c9fbe545e14acac637226ac948f2d" integrity sha512-PV0UBgcBFbBLf/m1wfkVMM8w96kvfHoiCGLWO6BR3Q9v70IXoE4ae0+T+f0CkxcEkacMqEQk/I7vuE9MzrjaNw== -"@cspell/dict-html@^1.1.9": - version "1.1.9" - resolved "https://registry.yarnpkg.com/@cspell/dict-html/-/dict-html-1.1.9.tgz#e506ca550ffcdad820ba0aa157a48be869f23bf2" - integrity sha512-vvnYia0tyIS5Fdoz+gEQm77MGZZE66kOJjuNpIYyRHCXFAhWdYz3SmkRm6YKJSWSvuO+WBJYTKDvkOxSh3Fx/w== +"@cspell/dict-html@^2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@cspell/dict-html/-/dict-html-2.0.2.tgz#f180c8c4d2d45659ead5d79a85c687c6e35a0ea9" + integrity sha512-5zIZGBGyHfxnRPt8JyL3I8co2Rs+64phiap9sMA0D7lNnoT4MZXu1NYz7Z8F6/XCDFuu8Bw5X5CoPrL6pJ3F7Q== "@cspell/dict-java@^1.0.23": version "1.0.23" @@ -2600,67 +2600,67 @@ crypto-random-string@^2.0.0: resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== -cspell-gitignore@^5.13.4: - version "5.13.4" - resolved "https://registry.yarnpkg.com/cspell-gitignore/-/cspell-gitignore-5.13.4.tgz#b87281716977728a1dc9e13e14a6ae962b0abc65" - integrity sha512-Md2V+EyILAavxO6CJ/Y/l8/p2nBFA0p1sMrjCEBtBuF3BL7A/A2LGaK4Tb+trVONFAKQ5cZo84WbyvSYWUqvpw== +cspell-gitignore@^5.14.0: + version "5.14.0" + resolved "https://registry.yarnpkg.com/cspell-gitignore/-/cspell-gitignore-5.14.0.tgz#15f9d9669a31b11f7acf57f67daa353386acd146" + integrity sha512-eK3bjQV4MJtKi1DuNACyKuV3OlMsN8o+IQphBu4D7rF+zCU3rkVtE+nD2x2MMOi3YlIRxdvXxqVr5k8m5X5T4A== dependencies: - cspell-glob "^5.13.4" + cspell-glob "^5.14.0" find-up "^5.0.0" -cspell-glob@^5.13.4: - version "5.13.4" - resolved "https://registry.yarnpkg.com/cspell-glob/-/cspell-glob-5.13.4.tgz#23ff682d25376181881d16f27b99daa684ca733a" - integrity sha512-uKkibBe41Tr609mNBOairsyuNhPo+kqMVw2JeobfgN71GESQLjU7hr6VpKaUKGZyJpaicP606LB0gZBM38IOvw== +cspell-glob@^5.14.0: + version "5.14.0" + resolved "https://registry.yarnpkg.com/cspell-glob/-/cspell-glob-5.14.0.tgz#af33aca3c3bda906e5ca0c43df343eaebe50cdc7" + integrity sha512-qWPrdKwyl400ukYmBxEaPA6029pctkBXb+A8MmY8Ku4+pv/X0XkIGSYsxjt/32odIWws2Hoi7MGyHF9YF0K4TA== dependencies: micromatch "^4.0.4" -cspell-io@^5.13.4: - version "5.13.4" - resolved "https://registry.yarnpkg.com/cspell-io/-/cspell-io-5.13.4.tgz#f2e147b300e299c086f24194cc23cda5a3b480b2" - integrity sha512-THe0R5CAv2h5yvrF3dtvigY73mnfFlfTJFWoSgGsafKq5nmR8jgKpbjQgK93zL0JC//BgdK0extfrSLsW2D4mw== +cspell-io@^5.14.0: + version "5.14.0" + resolved "https://registry.yarnpkg.com/cspell-io/-/cspell-io-5.14.0.tgz#07d4f376a98dc4c92724c3b0ee90946b924d06e3" + integrity sha512-MPi6Dgu+bZvxg9I3iZ+e2G1tIODIZ062O+75URZX3xCdv235aGdGtCY0AH2RNOQ+R9/jbkZMKlM0gIuGOIz0Ug== -cspell-lib@^5.13.4: - version "5.13.4" - resolved "https://registry.yarnpkg.com/cspell-lib/-/cspell-lib-5.13.4.tgz#22fb45ebbae6d44af71972340d0b1f87d849254e" - integrity sha512-kKGqAMXKdj8l3sgjoJuuQKTuwLz/33c3YFM/d3lYzcP3mo7C4v/M04Dm4mlTdWA0l4WYlzuSqxDmj32SsHMbNA== +cspell-lib@^5.14.0: + version "5.14.0" + resolved "https://registry.yarnpkg.com/cspell-lib/-/cspell-lib-5.14.0.tgz#a05111db153d941a0eaa89888ebc86796e7061bc" + integrity sha512-qnkXdQA3R/Z5HtjRJmWsTnqS7RTFeAiWyY7ozA+O7cY1OYTxShIB39uGHPQH0/ZUa3gNNh+kscif4KVE9nBb8Q== dependencies: - "@cspell/cspell-bundled-dicts" "^5.13.4" - "@cspell/cspell-types" "^5.13.4" + "@cspell/cspell-bundled-dicts" "^5.14.0" + "@cspell/cspell-types" "^5.14.0" clear-module "^4.1.2" comment-json "^4.1.1" configstore "^5.0.1" cosmiconfig "^7.0.1" - cspell-glob "^5.13.4" - cspell-io "^5.13.4" - cspell-trie-lib "^5.13.4" + cspell-glob "^5.14.0" + cspell-io "^5.14.0" + cspell-trie-lib "^5.14.0" find-up "^5.0.0" fs-extra "^10.0.0" gensequence "^3.1.1" import-fresh "^3.3.0" resolve-from "^5.0.0" resolve-global "^1.0.0" - vscode-uri "^3.0.2" + vscode-uri "^3.0.3" -cspell-trie-lib@^5.13.4: - version "5.13.4" - resolved "https://registry.yarnpkg.com/cspell-trie-lib/-/cspell-trie-lib-5.13.4.tgz#ae8307bb0448bc7843273351a1b7ad13181bf9d1" - integrity sha512-e5fKOOioJlJJ+DcLVIkuy+7FI/YmUojhfzdUjTvLDn5EJFL3/oiP5AvDXGV3bMqYzlbRQKD6FpC61KVIkNMbEw== +cspell-trie-lib@^5.14.0: + version "5.14.0" + resolved "https://registry.yarnpkg.com/cspell-trie-lib/-/cspell-trie-lib-5.14.0.tgz#a42154fcfd3f3e07eaa49e9a26e4acbfeacee425" + integrity sha512-PA9G4FZislIZ7YScR1fBToBDnPjU7HsFRNsgSkmhlI3ekxUugRaJTJW/XnDH1DDXoKqSoB/mCCN5kV8vwBBYuw== dependencies: fs-extra "^10.0.0" gensequence "^3.1.1" -cspell@5.13.4: - version "5.13.4" - resolved "https://registry.yarnpkg.com/cspell/-/cspell-5.13.4.tgz#5b3890110177588f21d8d74955a989ebfd860ee8" - integrity sha512-T/AMylb/CY0af8Oc1/Nv79Mqe852ga4AOAY0m8eYG8A5zahDpL2EC6PN5yK8KFn0UPMWMB8B2atZf6/U5RWdaQ== +cspell@5.14.0: + version "5.14.0" + resolved "https://registry.yarnpkg.com/cspell/-/cspell-5.14.0.tgz#05feb62cd345d5568c638bafd6eb10b7e3adeec4" + integrity sha512-WR3WlXIU/WKN4CMfVbRQoo/IscmInYLJoNUe0vx6mVb/T+FbOGzIB1oG2+YqpoN2wG94DS6qdJ01LjPyz+rkXw== dependencies: chalk "^4.1.2" commander "^8.3.0" comment-json "^4.1.1" - cspell-gitignore "^5.13.4" - cspell-glob "^5.13.4" - cspell-lib "^5.13.4" + cspell-gitignore "^5.14.0" + cspell-glob "^5.14.0" + cspell-lib "^5.14.0" fast-json-stable-stringify "^2.1.0" file-entry-cache "^6.0.1" fs-extra "^10.0.0" @@ -2669,7 +2669,7 @@ cspell@5.13.4: imurmurhash "^0.1.4" semver "^7.3.5" strip-ansi "^6.0.1" - vscode-uri "^3.0.2" + vscode-uri "^3.0.3" cssom@^0.4.4: version "0.4.4" @@ -6517,10 +6517,10 @@ vnopts@1.0.2: leven "^2.1.0" tslib "^1.9.3" -vscode-uri@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.2.tgz#ecfd1d066cb8ef4c3a208decdbab9a8c23d055d0" - integrity sha512-jkjy6pjU1fxUvI51P+gCsxg1u2n8LSt0W6KrCNQceaziKzff74GoWmjVG46KieVzybO1sttPQmYfrwSHey7GUA== +vscode-uri@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.3.tgz#a95c1ce2e6f41b7549f86279d19f47951e4f4d84" + integrity sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA== w3c-hr-time@^1.0.2: version "1.0.2" From c8353c747207c6863c14950cd92bd5c7fc5a1973 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jan 2022 19:51:59 +0000 Subject: [PATCH 37/47] Build(deps-dev): Bump eslint-plugin-unicorn from 39.0.0 to 40.0.0 (#12033) --- package.json | 2 +- yarn.lock | 56 ++++++++++++++-------------------------------------- 2 files changed, 16 insertions(+), 42 deletions(-) diff --git a/package.json b/package.json index 44c483984..8f375ce91 100644 --- a/package.json +++ b/package.json @@ -117,7 +117,7 @@ "eslint-plugin-prettier-internal-rules": "2.0.1", "eslint-plugin-react": "7.28.0", "eslint-plugin-regexp": "1.5.1", - "eslint-plugin-unicorn": "39.0.0", + "eslint-plugin-unicorn": "40.0.0", "esm-utils": "2.0.1", "execa": "5.1.1", "jest": "27.4.5", diff --git a/yarn.lock b/yarn.lock index 500ba4917..15bd4fcc6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -28,7 +28,7 @@ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.4.tgz#081d6bbc336ec5c2435c6346b2ae1fb98b5ac68e" integrity sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q== -"@babel/core@7.16.5", "@babel/core@^7.1.0", "@babel/core@^7.12.16", "@babel/core@^7.12.3", "@babel/core@^7.7.2", "@babel/core@^7.7.5": +"@babel/core@7.16.5", "@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.7.2", "@babel/core@^7.7.5": version "7.16.5" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.5.tgz#924aa9e1ae56e1e55f7184c8bf073a50d8677f5c" integrity sha512-wUcenlLzuWMZ9Zt8S0KmFwGlH6QKRh3vsm/dhDA3CHkiTA45YuG1XkHRcNRl73EFPXDp/d5kVOU0/y7x2w6OaQ== @@ -49,15 +49,6 @@ semver "^6.3.0" source-map "^0.5.0" -"@babel/eslint-parser@^7.12.16": - version "7.16.3" - resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.16.3.tgz#2a6b1702f3f5aea48e00cea5a5bcc241c437e459" - integrity sha512-iB4ElZT0jAt7PKVaeVulOECdGe6UnmA/O0P9jlF5g5GBOwDVbna8AXhHRu4s27xQf6OkveyA8iTDv1jHdDejgQ== - dependencies: - eslint-scope "^5.1.1" - eslint-visitor-keys "^2.1.0" - semver "^6.3.0" - "@babel/generator@^7.16.5", "@babel/generator@^7.7.2": version "7.16.5" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.5.tgz#26e1192eb8f78e0a3acaf3eede3c6fc96d22bedf" @@ -245,7 +236,7 @@ dependencies: "@babel/types" "^7.16.0" -"@babel/helper-validator-identifier@^7.14.9", "@babel/helper-validator-identifier@^7.15.7": +"@babel/helper-validator-identifier@^7.15.7": version "7.15.7" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389" integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w== @@ -2386,7 +2377,7 @@ chrome-trace-event@^1.0.2: resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== -ci-info@3.3.0, ci-info@^3.2.0: +ci-info@3.3.0, ci-info@^3.2.0, ci-info@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz#b4ed1fb6818dea4803a55c623041f9165d2066b2" integrity sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw== @@ -3071,23 +3062,22 @@ eslint-plugin-regexp@1.5.1: regexpp "^3.2.0" scslre "^0.1.6" -eslint-plugin-unicorn@39.0.0: - version "39.0.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-39.0.0.tgz#ee76d4f3bf37c605d89fa449d5e7c0c44c54b0cc" - integrity sha512-fd5RK2FtYjGcIx3wra7csIE/wkkmBo22T1gZtRTsLr1Mb+KsFKJ+JOdSqhHXQUrI/JTs/Mon64cEYzTgSCbltw== +eslint-plugin-unicorn@40.0.0: + version "40.0.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-40.0.0.tgz#a8226cab9c62b303e44fc41b1333a146e5676b86" + integrity sha512-5GRXISfBk8jMmYk1eeNDw8zSRnWTxBjWkzx2Prre6E2/yLu2twozZ3EomLWCBu9nWms/ZE361BItyMQwfnG1qA== dependencies: - "@babel/helper-validator-identifier" "^7.14.9" - ci-info "^3.2.0" + "@babel/helper-validator-identifier" "^7.15.7" + ci-info "^3.3.0" clean-regexp "^1.0.0" - eslint-template-visitor "^2.3.2" eslint-utils "^3.0.0" esquery "^1.4.0" - indent-string "4" + indent-string "^4.0.0" is-builtin-module "^3.1.0" lodash "^4.17.21" pluralize "^8.0.0" read-pkg-up "^7.0.1" - regexp-tree "^0.1.23" + regexp-tree "^0.1.24" safe-regex "^2.1.1" semver "^7.3.5" strip-indent "^3.0.0" @@ -3108,17 +3098,6 @@ eslint-scope@^7.1.0: esrecurse "^4.3.0" estraverse "^5.2.0" -eslint-template-visitor@^2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/eslint-template-visitor/-/eslint-template-visitor-2.3.2.tgz#b52f96ff311e773a345d79053ccc78275bbc463d" - integrity sha512-3ydhqFpuV7x1M9EK52BPNj6V0Kwu0KKkcIAfpUhwHbR8ocRln/oUHgfxQupY8O1h4Qv/POHDumb/BwwNfxbtnA== - dependencies: - "@babel/core" "^7.12.16" - "@babel/eslint-parser" "^7.12.16" - eslint-visitor-keys "^2.0.0" - esquery "^1.3.1" - multimap "^1.1.0" - eslint-utils@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672" @@ -3126,7 +3105,7 @@ eslint-utils@^3.0.0: dependencies: eslint-visitor-keys "^2.0.0" -eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0: +eslint-visitor-keys@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== @@ -3199,7 +3178,7 @@ esprima@^4.0.0, esprima@^4.0.1: resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esquery@^1.3.1, esquery@^1.4.0: +esquery@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== @@ -3713,7 +3692,7 @@ imurmurhash@^0.1.4: resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= -indent-string@4, indent-string@^4.0.0: +indent-string@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== @@ -4908,11 +4887,6 @@ ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== -multimap@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/multimap/-/multimap-1.1.0.tgz#5263febc085a1791c33b59bb3afc6a76a2a10ca8" - integrity sha512-0ZIR9PasPxGXmRsEF8jsDzndzHDj7tIav+JUmvIFB/WHswliFnquxECT/De7GR4yg99ky/NlRKJT82G1y271bw== - n-readlines@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/n-readlines/-/n-readlines-1.0.1.tgz#bbb7364d38bc31a170a199f986fcacfa76b95f6e" @@ -5540,7 +5514,7 @@ regexp-ast-analysis@^0.3.0: refa "^0.9.0" regexpp "^3.2.0" -regexp-tree@^0.1.23, regexp-tree@~0.1.1: +regexp-tree@^0.1.24, regexp-tree@~0.1.1: version "0.1.24" resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.24.tgz#3d6fa238450a4d66e5bc9c4c14bb720e2196829d" integrity sha512-s2aEVuLhvnVJW6s/iPgEGK6R+/xngd2jNQ+xy4bXNDKxZKJH6jpPHY6kVeVv1IeLCHgswRj+Kl3ELaDjG6V1iw== From 21b7e1164a3149eac2a7b9eb7037f51a4bf5d0a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jan 2022 20:10:29 +0000 Subject: [PATCH 38/47] Build(deps-dev): Bump core-js from 3.20.1 to 3.20.2 (#12023) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 8f375ce91..9a245086c 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "babel-loader": "8.2.3", "benchmark": "2.1.4", "builtin-modules": "3.2.0", - "core-js": "3.20.1", + "core-js": "3.20.2", "cross-env": "7.0.3", "cspell": "5.14.0", "enquirer": "2.3.6", diff --git a/yarn.lock b/yarn.lock index 15bd4fcc6..18c3b0e53 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2538,10 +2538,10 @@ core-js-compat@^3.18.0, core-js-compat@^3.19.1: browserslist "^4.18.1" semver "7.0.0" -core-js@3.20.1, core-js@^3.16.2: - version "3.20.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.20.1.tgz#eb1598047b7813572f1dc24b7c6a95528c99eef3" - integrity sha512-btdpStYFQScnNVQ5slVcr858KP0YWYjV16eGJQw8Gg7CWtu/2qNvIM3qVRIR3n1pK2R9NNOrTevbvAYxajwEjg== +core-js@3.20.2, core-js@^3.16.2: + version "3.20.2" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.20.2.tgz#46468d8601eafc8b266bd2dd6bf9dee622779581" + integrity sha512-nuqhq11DcOAbFBV4zCbKeGbKQsUDRqTX0oqx7AttUBuqe3h20ixsE039QHelbL6P4h+9kytVqyEtyZ6gsiwEYw== core-util-is@^1.0.2: version "1.0.3" From 5af51a81c4c7c7d886f2de9bb4e28f500a108f64 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Jan 2022 08:15:23 +0800 Subject: [PATCH 39/47] Build(deps-dev): Bump eslint from 8.5.0 to 8.6.0 (#12024) Bumps [eslint](https://github.com/eslint/eslint) from 8.5.0 to 8.6.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.5.0...v8.6.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 9a245086c..f8c72cffc 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,7 @@ "cross-env": "7.0.3", "cspell": "5.14.0", "enquirer": "2.3.6", - "eslint": "8.5.0", + "eslint": "8.6.0", "eslint-config-prettier": "8.3.0", "eslint-formatter-friendly": "7.0.0", "eslint-plugin-compat": "4.0.0", diff --git a/yarn.lock b/yarn.lock index 18c3b0e53..9128258b1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3115,10 +3115,10 @@ eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.1.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz#eee4acea891814cda67a7d8812d9647dd0179af2" integrity sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA== -eslint@8.5.0: - version "8.5.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.5.0.tgz#ddd2c1afd8f412036f87ae2a063d2aa296d3175f" - integrity sha512-tVGSkgNbOfiHyVte8bCM8OmX+xG9PzVG/B4UCF60zx7j61WIVY/AqJECDgpLD4DbbESD0e174gOg3ZlrX15GDg== +eslint@8.6.0: + version "8.6.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.6.0.tgz#4318c6a31c5584838c1a2e940c478190f58d558e" + integrity sha512-UvxdOJ7mXFlw7iuHZA4jmzPaUqIw54mZrv+XPYKNbKdLR0et4rf60lIZUU9kiNtnzzMzGWxMV+tQ7uG7JG8DPw== dependencies: "@eslint/eslintrc" "^1.0.5" "@humanwhocodes/config-array" "^0.9.2" @@ -3132,7 +3132,7 @@ eslint@8.5.0: eslint-scope "^7.1.0" eslint-utils "^3.0.0" eslint-visitor-keys "^3.1.0" - espree "^9.2.0" + espree "^9.3.0" esquery "^1.4.0" esutils "^2.0.2" fast-deep-equal "^3.1.3" @@ -3164,7 +3164,7 @@ esm-utils@2.0.1: resolved "https://registry.yarnpkg.com/esm-utils/-/esm-utils-2.0.1.tgz#233b691b5542cafdc3a6f4b24bd4af083ea21bd0" integrity sha512-eoz4dzSzykeh9mfRlCDTkNezD2zlPdFftiTH/5OZpE08hGpUPljh5rHDZqucIhX1Wl4cO6FDUUBp3tobvV7dWA== -espree@9.3.0, espree@^9.2.0: +espree@9.3.0, espree@^9.2.0, espree@^9.3.0: version "9.3.0" resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.0.tgz#c1240d79183b72aaee6ccfa5a90bc9111df085a8" integrity sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ== From bec4020a48a78c13f2b60c735d0511f3602e8e4d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Jan 2022 08:16:13 +0800 Subject: [PATCH 40/47] Build(deps-dev): Bump @babel/types from 7.16.0 to 7.16.7 (#12029) Bumps [@babel/types](https://github.com/babel/babel/tree/HEAD/packages/babel-types) from 7.16.0 to 7.16.7. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.16.7/packages/babel-types) --- updated-dependencies: - dependency-name: "@babel/types" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index f8c72cffc..aa49adc2c 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "devDependencies": { "@babel/core": "7.16.5", "@babel/preset-env": "7.16.5", - "@babel/types": "7.16.0", + "@babel/types": "7.16.7", "@glimmer/reference": "0.83.1", "@rollup/plugin-alias": "3.1.9", "@rollup/plugin-babel": "5.3.0", diff --git a/yarn.lock b/yarn.lock index 9128258b1..15752280d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -236,10 +236,10 @@ dependencies: "@babel/types" "^7.16.0" -"@babel/helper-validator-identifier@^7.15.7": - version "7.15.7" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389" - integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w== +"@babel/helper-validator-identifier@^7.15.7", "@babel/helper-validator-identifier@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad" + integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw== "@babel/helper-validator-option@^7.14.5": version "7.14.5" @@ -914,12 +914,12 @@ debug "^4.1.0" globals "^11.1.0" -"@babel/types@7.16.0", "@babel/types@^7.0.0", "@babel/types@^7.16.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.0.tgz#db3b313804f96aadd0b776c4823e127ad67289ba" - integrity sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg== +"@babel/types@7.16.7", "@babel/types@^7.0.0", "@babel/types@^7.16.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.7.tgz#4ed19d51f840ed4bd5645be6ce40775fecf03159" + integrity sha512-E8HuV7FO9qLpx6OtoGfUQ2cjIYnbFwvZWYBS+87EwtdMvmUPJSwykpovFB+8insbpF0uJcpr8KMUi64XZntZcg== dependencies: - "@babel/helper-validator-identifier" "^7.15.7" + "@babel/helper-validator-identifier" "^7.16.7" to-fast-properties "^2.0.0" "@bcoe/v8-coverage@^0.2.3": From a3f8340a6c0b0419e2db301034559b96b31c204c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Jan 2022 01:15:08 +0000 Subject: [PATCH 41/47] Build(deps-dev): Bump @babel/core from 7.16.5 to 7.16.7 (#12036) --- package.json | 2 +- yarn.lock | 209 +++++++++++++++++++++++++++++++++++---------------- 2 files changed, 144 insertions(+), 67 deletions(-) diff --git a/package.json b/package.json index aa49adc2c..605af6b9b 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "yaml-unist-parser": "1.3.1" }, "devDependencies": { - "@babel/core": "7.16.5", + "@babel/core": "7.16.7", "@babel/preset-env": "7.16.5", "@babel/types": "7.16.7", "@glimmer/reference": "0.83.1", diff --git a/yarn.lock b/yarn.lock index 15752280d..b484b83e3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16,32 +16,39 @@ dependencies: "@babel/highlight" "^7.0.0" -"@babel/code-frame@7.16.0", "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.16.0": +"@babel/code-frame@7.16.0": version "7.16.0" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431" integrity sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA== dependencies: "@babel/highlight" "^7.16.0" -"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.0", "@babel/compat-data@^7.16.4": +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789" + integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg== + dependencies: + "@babel/highlight" "^7.16.7" + +"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.4": version "7.16.4" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.4.tgz#081d6bbc336ec5c2435c6346b2ae1fb98b5ac68e" integrity sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q== -"@babel/core@7.16.5", "@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.7.2", "@babel/core@^7.7.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.5.tgz#924aa9e1ae56e1e55f7184c8bf073a50d8677f5c" - integrity sha512-wUcenlLzuWMZ9Zt8S0KmFwGlH6QKRh3vsm/dhDA3CHkiTA45YuG1XkHRcNRl73EFPXDp/d5kVOU0/y7x2w6OaQ== +"@babel/core@7.16.7", "@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.7.2", "@babel/core@^7.7.5": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.7.tgz#db990f931f6d40cb9b87a0dc7d2adc749f1dcbcf" + integrity sha512-aeLaqcqThRNZYmbMqtulsetOQZ/5gbR/dWruUCJcpas4Qoyy+QeagfDsPdMrqwsPRDNxJvBlRiZxxX7THO7qtA== dependencies: - "@babel/code-frame" "^7.16.0" - "@babel/generator" "^7.16.5" - "@babel/helper-compilation-targets" "^7.16.3" - "@babel/helper-module-transforms" "^7.16.5" - "@babel/helpers" "^7.16.5" - "@babel/parser" "^7.16.5" - "@babel/template" "^7.16.0" - "@babel/traverse" "^7.16.5" - "@babel/types" "^7.16.0" + "@babel/code-frame" "^7.16.7" + "@babel/generator" "^7.16.7" + "@babel/helper-compilation-targets" "^7.16.7" + "@babel/helper-module-transforms" "^7.16.7" + "@babel/helpers" "^7.16.7" + "@babel/parser" "^7.16.7" + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.16.7" + "@babel/types" "^7.16.7" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" @@ -49,12 +56,12 @@ semver "^6.3.0" source-map "^0.5.0" -"@babel/generator@^7.16.5", "@babel/generator@^7.7.2": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.5.tgz#26e1192eb8f78e0a3acaf3eede3c6fc96d22bedf" - integrity sha512-kIvCdjZqcdKqoDbVVdt5R99icaRtrtYhYK/xux5qiWCBmfdvEYMFZ68QCrpE5cbFM1JsuArUNs1ZkuKtTtUcZA== +"@babel/generator@^7.16.7", "@babel/generator@^7.7.2": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.7.tgz#b42bf46a3079fa65e1544135f32e7958f048adbb" + integrity sha512-/ST3Sg8MLGY5HVYmrjOgL60ENux/HfO/CsUh7y4MalThufhE/Ff/6EibFDHi4jiDCaWfJKoqbE6oTh21c5hrRg== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" jsesc "^2.5.1" source-map "^0.5.0" @@ -73,13 +80,13 @@ "@babel/helper-explode-assignable-expression" "^7.16.0" "@babel/types" "^7.16.0" -"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.3": - version "7.16.3" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.3.tgz#5b480cd13f68363df6ec4dc8ac8e2da11363cbf0" - integrity sha512-vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA== +"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.3", "@babel/helper-compilation-targets@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz#06e66c5f299601e6c7da350049315e83209d551b" + integrity sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA== dependencies: - "@babel/compat-data" "^7.16.0" - "@babel/helper-validator-option" "^7.14.5" + "@babel/compat-data" "^7.16.4" + "@babel/helper-validator-option" "^7.16.7" browserslist "^4.17.5" semver "^6.3.0" @@ -125,6 +132,13 @@ dependencies: "@babel/types" "^7.16.0" +"@babel/helper-environment-visitor@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7" + integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag== + dependencies: + "@babel/types" "^7.16.7" + "@babel/helper-explode-assignable-expression@^7.16.0": version "7.16.0" resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.0.tgz#753017337a15f46f9c09f674cff10cee9b9d7778" @@ -141,6 +155,15 @@ "@babel/template" "^7.16.0" "@babel/types" "^7.16.0" +"@babel/helper-function-name@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f" + integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA== + dependencies: + "@babel/helper-get-function-arity" "^7.16.7" + "@babel/template" "^7.16.7" + "@babel/types" "^7.16.7" + "@babel/helper-get-function-arity@^7.16.0": version "7.16.0" resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz#0088c7486b29a9cb5d948b1a1de46db66e089cfa" @@ -148,6 +171,13 @@ dependencies: "@babel/types" "^7.16.0" +"@babel/helper-get-function-arity@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419" + integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw== + dependencies: + "@babel/types" "^7.16.7" + "@babel/helper-hoist-variables@^7.16.0": version "7.16.0" resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz#4c9023c2f1def7e28ff46fc1dbcd36a39beaa81a" @@ -155,6 +185,13 @@ dependencies: "@babel/types" "^7.16.0" +"@babel/helper-hoist-variables@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246" + integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg== + dependencies: + "@babel/types" "^7.16.7" + "@babel/helper-member-expression-to-functions@^7.16.5": version "7.16.5" resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.5.tgz#1bc9f7e87354e86f8879c67b316cb03d3dc2caab" @@ -169,19 +206,26 @@ dependencies: "@babel/types" "^7.16.0" -"@babel/helper-module-transforms@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.5.tgz#530ebf6ea87b500f60840578515adda2af470a29" - integrity sha512-CkvMxgV4ZyyioElFwcuWnDCcNIeyqTkCm9BxXZi73RR1ozqlpboqsbGUNvRTflgZtFbbJ1v5Emvm+lkjMYY/LQ== +"@babel/helper-module-imports@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437" + integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg== dependencies: - "@babel/helper-environment-visitor" "^7.16.5" - "@babel/helper-module-imports" "^7.16.0" - "@babel/helper-simple-access" "^7.16.0" - "@babel/helper-split-export-declaration" "^7.16.0" - "@babel/helper-validator-identifier" "^7.15.7" - "@babel/template" "^7.16.0" - "@babel/traverse" "^7.16.5" - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" + +"@babel/helper-module-transforms@^7.16.5", "@babel/helper-module-transforms@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz#7665faeb721a01ca5327ddc6bba15a5cb34b6a41" + integrity sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng== + dependencies: + "@babel/helper-environment-visitor" "^7.16.7" + "@babel/helper-module-imports" "^7.16.7" + "@babel/helper-simple-access" "^7.16.7" + "@babel/helper-split-export-declaration" "^7.16.7" + "@babel/helper-validator-identifier" "^7.16.7" + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.16.7" + "@babel/types" "^7.16.7" "@babel/helper-optimise-call-expression@^7.16.0": version "7.16.0" @@ -222,6 +266,13 @@ dependencies: "@babel/types" "^7.16.0" +"@babel/helper-simple-access@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz#d656654b9ea08dbb9659b69d61063ccd343ff0f7" + integrity sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g== + dependencies: + "@babel/types" "^7.16.7" + "@babel/helper-skip-transparent-expression-wrappers@^7.16.0": version "7.16.0" resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09" @@ -236,6 +287,13 @@ dependencies: "@babel/types" "^7.16.0" +"@babel/helper-split-export-declaration@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b" + integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw== + dependencies: + "@babel/types" "^7.16.7" + "@babel/helper-validator-identifier@^7.15.7", "@babel/helper-validator-identifier@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad" @@ -246,6 +304,11 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3" integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow== +"@babel/helper-validator-option@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23" + integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ== + "@babel/helper-wrap-function@^7.16.5": version "7.16.5" resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.5.tgz#0158fca6f6d0889c3fee8a6ed6e5e07b9b54e41f" @@ -256,14 +319,14 @@ "@babel/traverse" "^7.16.5" "@babel/types" "^7.16.0" -"@babel/helpers@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.16.5.tgz#29a052d4b827846dd76ece16f565b9634c554ebd" - integrity sha512-TLgi6Lh71vvMZGEkFuIxzaPsyeYCHQ5jJOOX1f0xXn0uciFuE8cEk0wyBquMcCxBXZ5BJhE2aUB7pnWTD150Tw== +"@babel/helpers@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.16.7.tgz#7e3504d708d50344112767c3542fc5e357fffefc" + integrity sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw== dependencies: - "@babel/template" "^7.16.0" - "@babel/traverse" "^7.16.5" - "@babel/types" "^7.16.0" + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.16.7" + "@babel/types" "^7.16.7" "@babel/highlight@^7.0.0", "@babel/highlight@^7.16.0": version "7.16.0" @@ -274,11 +337,25 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@7.16.6", "@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.0", "@babel/parser@^7.16.5", "@babel/parser@^7.7.2": +"@babel/highlight@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.7.tgz#81a01d7d675046f0d96f82450d9d9578bdfd6b0b" + integrity sha512-aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw== + dependencies: + "@babel/helper-validator-identifier" "^7.16.7" + chalk "^2.0.0" + js-tokens "^4.0.0" + +"@babel/parser@7.16.6": version "7.16.6" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.6.tgz#8f194828193e8fa79166f34a4b4e52f3e769a314" integrity sha512-Gr86ujcNuPDnNOY8mi383Hvi8IYrJVJYuf3XcuBM/Dgd+bINn/7tHqsj+tKkoreMbmGsFLsltI/JJd8fOFWGDQ== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.7.2": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.7.tgz#d372dda9c89fcec340a82630a9f533f2fe15877e" + integrity sha512-sR4eaSrnM7BV7QPzGfEX5paG/6wrZM3I0HDzfIAK06ESvo9oy3xBuVBxE3MbQaKNhvg8g/ixjMWo2CGpzpHsDA== + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.2": version "7.16.2" resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2.tgz#2977fca9b212db153c195674e57cfab807733183" @@ -889,32 +966,32 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/template@^7.16.0", "@babel/template@^7.3.3": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.0.tgz#d16a35ebf4cd74e202083356fab21dd89363ddd6" - integrity sha512-MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A== +"@babel/template@^7.16.0", "@babel/template@^7.16.7", "@babel/template@^7.3.3": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155" + integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w== dependencies: - "@babel/code-frame" "^7.16.0" - "@babel/parser" "^7.16.0" - "@babel/types" "^7.16.0" + "@babel/code-frame" "^7.16.7" + "@babel/parser" "^7.16.7" + "@babel/types" "^7.16.7" -"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.5", "@babel/traverse@^7.7.2": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.5.tgz#d7d400a8229c714a59b87624fc67b0f1fbd4b2b3" - integrity sha512-FOCODAzqUMROikDYLYxl4nmwiLlu85rNqBML/A5hKRVXG2LV8d0iMqgPzdYTcIpjZEBB7D6UDU9vxRZiriASdQ== +"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.5", "@babel/traverse@^7.16.7", "@babel/traverse@^7.7.2": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.7.tgz#dac01236a72c2560073658dd1a285fe4e0865d76" + integrity sha512-8KWJPIb8c2VvY8AJrydh6+fVRo2ODx1wYBU2398xJVq0JomuLBZmVQzLPBblJgHIGYG4znCpUZUZ0Pt2vdmVYQ== dependencies: - "@babel/code-frame" "^7.16.0" - "@babel/generator" "^7.16.5" - "@babel/helper-environment-visitor" "^7.16.5" - "@babel/helper-function-name" "^7.16.0" - "@babel/helper-hoist-variables" "^7.16.0" - "@babel/helper-split-export-declaration" "^7.16.0" - "@babel/parser" "^7.16.5" - "@babel/types" "^7.16.0" + "@babel/code-frame" "^7.16.7" + "@babel/generator" "^7.16.7" + "@babel/helper-environment-visitor" "^7.16.7" + "@babel/helper-function-name" "^7.16.7" + "@babel/helper-hoist-variables" "^7.16.7" + "@babel/helper-split-export-declaration" "^7.16.7" + "@babel/parser" "^7.16.7" + "@babel/types" "^7.16.7" debug "^4.1.0" globals "^11.1.0" -"@babel/types@7.16.7", "@babel/types@^7.0.0", "@babel/types@^7.16.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": +"@babel/types@7.16.7", "@babel/types@^7.0.0", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.7.tgz#4ed19d51f840ed4bd5645be6ce40775fecf03159" integrity sha512-E8HuV7FO9qLpx6OtoGfUQ2cjIYnbFwvZWYBS+87EwtdMvmUPJSwykpovFB+8insbpF0uJcpr8KMUi64XZntZcg== From fd78199e256b32b971c03502bb1f7a1a8bf8b6ee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Jan 2022 02:19:56 +0000 Subject: [PATCH 42/47] Build(deps-dev): Bump @types/jest from 27.0.3 to 27.4.0 (#12025) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 605af6b9b..6df9c2b5e 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,7 @@ "@rollup/plugin-node-resolve": "13.1.1", "@rollup/plugin-replace": "3.0.0", "@types/estree": "0.0.50", - "@types/jest": "27.0.3", + "@types/jest": "27.4.0", "babel-jest": "27.4.5", "babel-loader": "8.2.3", "benchmark": "2.1.4", diff --git a/yarn.lock b/yarn.lock index b484b83e3..6216f0e0d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1726,10 +1726,10 @@ dependencies: "@types/istanbul-lib-report" "*" -"@types/jest@27.0.3": - version "27.0.3" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-27.0.3.tgz#0cf9dfe9009e467f70a342f0f94ead19842a783a" - integrity sha512-cmmwv9t7gBYt7hNKH5Spu7Kuu/DotGa+Ff+JGRKZ4db5eh8PnKS4LuebJ3YLUoyOyIHraTGyULn23YtEAm0VSg== +"@types/jest@27.4.0": + version "27.4.0" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-27.4.0.tgz#037ab8b872067cae842a320841693080f9cb84ed" + integrity sha512-gHl8XuC1RZ8H2j5sHv/JqsaxXkDDM9iDOgu0Wp8sjs4u/snb2PVehyWXJPr+ORA0RPpgw231mnutWI1+0hgjIQ== dependencies: jest-diff "^27.0.0" pretty-format "^27.0.0" From 976efc94e425683f824283de9e5e5faf0a86e683 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Jan 2022 03:12:15 +0000 Subject: [PATCH 43/47] Build(deps-dev): Bump @rollup/plugin-node-resolve from 13.1.1 to 13.1.2 (#12032) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 6df9c2b5e..33b05d83b 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "@rollup/plugin-babel": "5.3.0", "@rollup/plugin-commonjs": "21.0.1", "@rollup/plugin-json": "4.1.0", - "@rollup/plugin-node-resolve": "13.1.1", + "@rollup/plugin-node-resolve": "13.1.2", "@rollup/plugin-replace": "3.0.0", "@types/estree": "0.0.50", "@types/jest": "27.4.0", diff --git a/yarn.lock b/yarn.lock index 6216f0e0d..a4ed9d0b1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1588,10 +1588,10 @@ dependencies: "@rollup/pluginutils" "^3.0.8" -"@rollup/plugin-node-resolve@13.1.1": - version "13.1.1" - resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.1.1.tgz#d38ba06e7b181ab4df64c75409b43d9bdc95ae34" - integrity sha512-6QKtRevXLrmEig9UiMYt2fSvee9TyltGRfw+qSs6xjUnxwjOzTOqy+/Lpxsgjb8mJn1EQNbCDAvt89O4uzL5kw== +"@rollup/plugin-node-resolve@13.1.2": + version "13.1.2" + resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.1.2.tgz#f05cbdce79e6d5fe1c4249a33ea961ea21cec258" + integrity sha512-xyqbuf1vyOPC60jEKhx3DBHunymnCJswzjNTKfX4Jz7zCPar1UqbRZCNY1u5QaXh97beaFTWdoUUWiV4qX8o/g== dependencies: "@rollup/pluginutils" "^3.1.0" "@types/resolve" "1.17.1" From ba0f21423d3e7b9af485c13806e3a10b4b8fdd4c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Jan 2022 04:13:07 +0000 Subject: [PATCH 44/47] Build(deps-dev): Bump @rollup/plugin-replace from 3.0.0 to 3.0.1 (#12019) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 33b05d83b..91acb6d82 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,7 @@ "@rollup/plugin-commonjs": "21.0.1", "@rollup/plugin-json": "4.1.0", "@rollup/plugin-node-resolve": "13.1.2", - "@rollup/plugin-replace": "3.0.0", + "@rollup/plugin-replace": "3.0.1", "@types/estree": "0.0.50", "@types/jest": "27.4.0", "babel-jest": "27.4.5", diff --git a/yarn.lock b/yarn.lock index a4ed9d0b1..13db708b8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1600,10 +1600,10 @@ is-module "^1.0.0" resolve "^1.19.0" -"@rollup/plugin-replace@3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-3.0.0.tgz#3a4c9665d4e7a4ce2c360cf021232784892f3fac" - integrity sha512-3c7JCbMuYXM4PbPWT4+m/4Y6U60SgsnDT/cCyAyUKwFHg7pTSfsSQzIpETha3a3ig6OdOKzZz87D9ZXIK3qsDg== +"@rollup/plugin-replace@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-3.0.1.tgz#f774550f482091719e52e9f14f67ffc0046a883d" + integrity sha512-989J5oRzf3mm0pO/0djTijdfEh9U3n63BIXN5X7T4U9BP+fN4oxQ6DvDuBvFaHA6scaHQRclqmKQEkBhB7k7Hg== dependencies: "@rollup/pluginutils" "^3.1.0" magic-string "^0.25.7" From 624c51101c15fceb148a9f71358504aa3a5279ff Mon Sep 17 00:00:00 2001 From: fisker Cheung Date: Tue, 4 Jan 2022 13:56:10 +0800 Subject: [PATCH 45/47] Enable `unicorn/prefer-json-parse-buffer` and `unicorn/no-useless-promise-resolve-reject` rule (#12043) --- .eslintrc.js | 2 ++ scripts/clean-cspell.mjs | 2 +- scripts/release/utils.js | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index e06620c5f..e9a7832d5 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -122,6 +122,7 @@ module.exports = { "unicorn/no-array-push-push": "error", "unicorn/no-new-array": "error", "unicorn/no-useless-length-check": "error", + "unicorn/no-useless-promise-resolve-reject": "error", "unicorn/no-useless-undefined": "error", "unicorn/prefer-array-flat": [ "error", @@ -132,6 +133,7 @@ module.exports = { "unicorn/prefer-array-flat-map": "error", "unicorn/prefer-array-some": "error", "unicorn/prefer-includes": "error", + "unicorn/prefer-json-parse-buffer": "error", "unicorn/prefer-number-properties": "error", "unicorn/prefer-optional-catch-binding": "error", "unicorn/prefer-regexp-test": "error", diff --git a/scripts/clean-cspell.mjs b/scripts/clean-cspell.mjs index 05c3979c6..818949653 100644 --- a/scripts/clean-cspell.mjs +++ b/scripts/clean-cspell.mjs @@ -17,7 +17,7 @@ const runSpellcheck = (options) => { (async () => { console.log("Empty words ..."); - const config = JSON.parse(await fs.readFile(CSPELL_CONFIG_FILE, "utf8")); + const config = JSON.parse(await fs.readFile(CSPELL_CONFIG_FILE)); const original = config.words; await updateConfig({ ...config, words: [] }); diff --git a/scripts/release/utils.js b/scripts/release/utils.js index dfff55a51..27910ab3a 100644 --- a/scripts/release/utils.js +++ b/scripts/release/utils.js @@ -75,7 +75,7 @@ function waitForEnter() { } function readJson(filename) { - return JSON.parse(fs.readFileSync(filename, "utf-8")); + return JSON.parse(fs.readFileSync(filename)); } function writeJson(filename, content) { From fe42a1409d4bf20e00aa9c634f2ac8c3c1f85831 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Jan 2022 05:57:52 +0000 Subject: [PATCH 46/47] Build(deps): Bump @babel/code-frame from 7.16.0 to 7.16.7 (#12030) --- package.json | 2 +- yarn.lock | 20 ++------------------ 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index 91acb6d82..debb909b1 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ ], "dependencies": { "@angular/compiler": "12.2.15", - "@babel/code-frame": "7.16.0", + "@babel/code-frame": "7.16.7", "@babel/parser": "7.16.6", "@glimmer/syntax": "0.83.1", "@iarna/toml": "2.2.5", diff --git a/yarn.lock b/yarn.lock index 13db708b8..af4905af4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16,14 +16,7 @@ dependencies: "@babel/highlight" "^7.0.0" -"@babel/code-frame@7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431" - integrity sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA== - dependencies: - "@babel/highlight" "^7.16.0" - -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.16.7": +"@babel/code-frame@7.16.7", "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789" integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg== @@ -328,16 +321,7 @@ "@babel/traverse" "^7.16.7" "@babel/types" "^7.16.7" -"@babel/highlight@^7.0.0", "@babel/highlight@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a" - integrity sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g== - dependencies: - "@babel/helper-validator-identifier" "^7.15.7" - chalk "^2.0.0" - js-tokens "^4.0.0" - -"@babel/highlight@^7.16.7": +"@babel/highlight@^7.0.0", "@babel/highlight@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.7.tgz#81a01d7d675046f0d96f82450d9d9578bdfd6b0b" integrity sha512-aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw== From bd5ce9712ee0074603464f41b1044f52cf252166 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Jan 2022 05:57:56 +0000 Subject: [PATCH 47/47] Build(deps-dev): Bump @babel/preset-env from 7.16.5 to 7.16.7 (#12026) --- package.json | 2 +- yarn.lock | 862 ++++++++++++++++++++++++--------------------------- 2 files changed, 408 insertions(+), 456 deletions(-) diff --git a/package.json b/package.json index debb909b1..c9db78f7e 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ }, "devDependencies": { "@babel/core": "7.16.7", - "@babel/preset-env": "7.16.5", + "@babel/preset-env": "7.16.7", "@babel/types": "7.16.7", "@glimmer/reference": "0.83.1", "@rollup/plugin-alias": "3.1.9", diff --git a/yarn.lock b/yarn.lock index af4905af4..c55477531 100644 --- a/yarn.lock +++ b/yarn.lock @@ -58,22 +58,22 @@ jsesc "^2.5.1" source-map "^0.5.0" -"@babel/helper-annotate-as-pure@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.0.tgz#9a1f0ebcda53d9a2d00108c4ceace6a5d5f1f08d" - integrity sha512-ItmYF9vR4zA8cByDocY05o0LGUkp1zhbTQOH1NFyl5xXEqlTJQCEJjieriw+aFpxo16swMxUnUiKS7a/r4vtHg== +"@babel/helper-annotate-as-pure@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862" + integrity sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" -"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.5.tgz#a8429d064dce8207194b8bf05a70a9ea828746af" - integrity sha512-3JEA9G5dmmnIWdzaT9d0NmFRgYnWUThLsDaL7982H0XqqWr56lRrsmwheXFMjR+TMl7QMBb6mzy9kvgr1lRLUA== +"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz#38d138561ea207f0f69eb1626a418e4f7e6a580b" + integrity sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA== dependencies: - "@babel/helper-explode-assignable-expression" "^7.16.0" - "@babel/types" "^7.16.0" + "@babel/helper-explode-assignable-expression" "^7.16.7" + "@babel/types" "^7.16.7" -"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.3", "@babel/helper-compilation-targets@^7.16.7": +"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz#06e66c5f299601e6c7da350049315e83209d551b" integrity sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA== @@ -83,25 +83,25 @@ browserslist "^4.17.5" semver "^6.3.0" -"@babel/helper-create-class-features-plugin@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.5.tgz#5d1bcd096792c1ebec6249eebc6358eec55d0cad" - integrity sha512-NEohnYA7mkB8L5JhU7BLwcBdU3j83IziR9aseMueWGeAjblbul3zzb8UvJ3a1zuBiqCMObzCJHFqKIQE6hTVmg== +"@babel/helper-create-class-features-plugin@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.7.tgz#9c5b34b53a01f2097daf10678d65135c1b9f84ba" + integrity sha512-kIFozAvVfK05DM4EVQYKK+zteWvY85BFdGBRQBytRyY3y+6PX0DkDOn/CZ3lEuczCfrCxEzwt0YtP/87YPTWSw== dependencies: - "@babel/helper-annotate-as-pure" "^7.16.0" - "@babel/helper-environment-visitor" "^7.16.5" - "@babel/helper-function-name" "^7.16.0" - "@babel/helper-member-expression-to-functions" "^7.16.5" - "@babel/helper-optimise-call-expression" "^7.16.0" - "@babel/helper-replace-supers" "^7.16.5" - "@babel/helper-split-export-declaration" "^7.16.0" + "@babel/helper-annotate-as-pure" "^7.16.7" + "@babel/helper-environment-visitor" "^7.16.7" + "@babel/helper-function-name" "^7.16.7" + "@babel/helper-member-expression-to-functions" "^7.16.7" + "@babel/helper-optimise-call-expression" "^7.16.7" + "@babel/helper-replace-supers" "^7.16.7" + "@babel/helper-split-export-declaration" "^7.16.7" -"@babel/helper-create-regexp-features-plugin@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.0.tgz#06b2348ce37fccc4f5e18dcd8d75053f2a7c44ff" - integrity sha512-3DyG0zAFAZKcOp7aVr33ddwkxJ0Z0Jr5V99y3I690eYLpukJsJvAbzTy1ewoCqsML8SbIrjH14Jc/nSQ4TvNPA== +"@babel/helper-create-regexp-features-plugin@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.7.tgz#0cb82b9bac358eb73bfbd73985a776bfa6b14d48" + integrity sha512-fk5A6ymfp+O5+p2yCkXAu5Kyj6v0xh0RBeNcAkYUMDvvAAoxvSKXn+Jb37t/yWFiQVDFK1ELpUTD8/aLhCPu+g== dependencies: - "@babel/helper-annotate-as-pure" "^7.16.0" + "@babel/helper-annotate-as-pure" "^7.16.7" regexpu-core "^4.7.1" "@babel/helper-define-polyfill-provider@^0.3.0": @@ -118,13 +118,6 @@ resolve "^1.14.2" semver "^6.1.2" -"@babel/helper-environment-visitor@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.5.tgz#f6a7f38b3c6d8b07c88faea083c46c09ef5451b8" - integrity sha512-ODQyc5AnxmZWm/R2W7fzhamOk1ey8gSguo5SGvF0zcB3uUzRpTRmM/jmLSm9bDMyPlvbyJ+PwPEK0BWIoZ9wjg== - dependencies: - "@babel/types" "^7.16.0" - "@babel/helper-environment-visitor@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7" @@ -132,21 +125,12 @@ dependencies: "@babel/types" "^7.16.7" -"@babel/helper-explode-assignable-expression@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.0.tgz#753017337a15f46f9c09f674cff10cee9b9d7778" - integrity sha512-Hk2SLxC9ZbcOhLpg/yMznzJ11W++lg5GMbxt1ev6TXUiJB0N42KPC+7w8a+eWGuqDnUYuwStJoZHM7RgmIOaGQ== +"@babel/helper-explode-assignable-expression@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz#12a6d8522fdd834f194e868af6354e8650242b7a" + integrity sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ== dependencies: - "@babel/types" "^7.16.0" - -"@babel/helper-function-name@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz#b7dd0797d00bbfee4f07e9c4ea5b0e30c8bb1481" - integrity sha512-BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog== - dependencies: - "@babel/helper-get-function-arity" "^7.16.0" - "@babel/template" "^7.16.0" - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" "@babel/helper-function-name@^7.16.7": version "7.16.7" @@ -157,13 +141,6 @@ "@babel/template" "^7.16.7" "@babel/types" "^7.16.7" -"@babel/helper-get-function-arity@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz#0088c7486b29a9cb5d948b1a1de46db66e089cfa" - integrity sha512-ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ== - dependencies: - "@babel/types" "^7.16.0" - "@babel/helper-get-function-arity@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419" @@ -171,13 +148,6 @@ dependencies: "@babel/types" "^7.16.7" -"@babel/helper-hoist-variables@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz#4c9023c2f1def7e28ff46fc1dbcd36a39beaa81a" - integrity sha512-1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg== - dependencies: - "@babel/types" "^7.16.0" - "@babel/helper-hoist-variables@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246" @@ -185,14 +155,14 @@ dependencies: "@babel/types" "^7.16.7" -"@babel/helper-member-expression-to-functions@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.5.tgz#1bc9f7e87354e86f8879c67b316cb03d3dc2caab" - integrity sha512-7fecSXq7ZrLE+TWshbGT+HyCLkxloWNhTbU2QM1NTI/tDqyf0oZiMcEfYtDuUDCo528EOlt39G1rftea4bRZIw== +"@babel/helper-member-expression-to-functions@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz#42b9ca4b2b200123c3b7e726b0ae5153924905b0" + integrity sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" -"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.0": +"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13": version "7.16.0" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz#90538e60b672ecf1b448f5f4f5433d37e79a3ec3" integrity sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg== @@ -206,7 +176,7 @@ dependencies: "@babel/types" "^7.16.7" -"@babel/helper-module-transforms@^7.16.5", "@babel/helper-module-transforms@^7.16.7": +"@babel/helper-module-transforms@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz#7665faeb721a01ca5327ddc6bba15a5cb34b6a41" integrity sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng== @@ -220,44 +190,37 @@ "@babel/traverse" "^7.16.7" "@babel/types" "^7.16.7" -"@babel/helper-optimise-call-expression@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.0.tgz#cecdb145d70c54096b1564f8e9f10cd7d193b338" - integrity sha512-SuI467Gi2V8fkofm2JPnZzB/SUuXoJA5zXe/xzyPP2M04686RzFKFHPK6HDVN6JvWBIEW8tt9hPR7fXdn2Lgpw== +"@babel/helper-optimise-call-expression@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2" + integrity sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.5.tgz#afe37a45f39fce44a3d50a7958129ea5b1a5c074" - integrity sha512-59KHWHXxVA9K4HNF4sbHCf+eJeFe0Te/ZFGqBT4OjXhrwvA04sGfaEGsVTdsjoszq0YTP49RC9UKe5g8uN2RwQ== +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5" + integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA== -"@babel/helper-remap-async-to-generator@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.5.tgz#e706646dc4018942acb4b29f7e185bc246d65ac3" - integrity sha512-X+aAJldyxrOmN9v3FKp+Hu1NO69VWgYgDGq6YDykwRPzxs5f2N+X988CBXS7EQahDU+Vpet5QYMqLk+nsp+Qxw== +"@babel/helper-remap-async-to-generator@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.7.tgz#5ce2416990d55eb6e099128338848ae8ffa58a9a" + integrity sha512-C3o117GnP/j/N2OWo+oepeWbFEKRfNaay+F1Eo5Mj3A1SRjyx+qaFhm23nlipub7Cjv2azdUUiDH+VlpdwUFRg== dependencies: - "@babel/helper-annotate-as-pure" "^7.16.0" - "@babel/helper-wrap-function" "^7.16.5" - "@babel/types" "^7.16.0" + "@babel/helper-annotate-as-pure" "^7.16.7" + "@babel/helper-wrap-function" "^7.16.7" + "@babel/types" "^7.16.7" -"@babel/helper-replace-supers@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.5.tgz#96d3988bd0ab0a2d22c88c6198c3d3234ca25326" - integrity sha512-ao3seGVa/FZCMCCNDuBcqnBFSbdr8N2EW35mzojx3TwfIbdPmNK+JV6+2d5bR0Z71W5ocLnQp9en/cTF7pBJiQ== +"@babel/helper-replace-supers@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1" + integrity sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw== dependencies: - "@babel/helper-environment-visitor" "^7.16.5" - "@babel/helper-member-expression-to-functions" "^7.16.5" - "@babel/helper-optimise-call-expression" "^7.16.0" - "@babel/traverse" "^7.16.5" - "@babel/types" "^7.16.0" - -"@babel/helper-simple-access@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz#21d6a27620e383e37534cf6c10bba019a6f90517" - integrity sha512-o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw== - dependencies: - "@babel/types" "^7.16.0" + "@babel/helper-environment-visitor" "^7.16.7" + "@babel/helper-member-expression-to-functions" "^7.16.7" + "@babel/helper-optimise-call-expression" "^7.16.7" + "@babel/traverse" "^7.16.7" + "@babel/types" "^7.16.7" "@babel/helper-simple-access@^7.16.7": version "7.16.7" @@ -273,13 +236,6 @@ dependencies: "@babel/types" "^7.16.0" -"@babel/helper-split-export-declaration@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz#29672f43663e936df370aaeb22beddb3baec7438" - integrity sha512-0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw== - dependencies: - "@babel/types" "^7.16.0" - "@babel/helper-split-export-declaration@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b" @@ -292,25 +248,20 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad" integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw== -"@babel/helper-validator-option@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3" - integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow== - "@babel/helper-validator-option@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23" integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ== -"@babel/helper-wrap-function@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.5.tgz#0158fca6f6d0889c3fee8a6ed6e5e07b9b54e41f" - integrity sha512-2J2pmLBqUqVdJw78U0KPNdeE2qeuIyKoG4mKV7wAq3mc4jJG282UgjZw4ZYDnqiWQuS3Y3IYdF/AQ6CpyBV3VA== +"@babel/helper-wrap-function@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.7.tgz#8ddf9eaa770ed43de4bc3687f3f3b0d6d5ecf014" + integrity sha512-7a9sABeVwcunnztZZ7WTgSw6jVYLzM1wua0Z4HIXm9S3/HC96WKQTkFgGEaj5W06SHHihPJ6Le6HzS5cGOQMNw== dependencies: - "@babel/helper-function-name" "^7.16.0" - "@babel/template" "^7.16.0" - "@babel/traverse" "^7.16.5" - "@babel/types" "^7.16.0" + "@babel/helper-function-name" "^7.16.7" + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.16.7" + "@babel/types" "^7.16.7" "@babel/helpers@^7.16.7": version "7.16.7" @@ -340,149 +291,149 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.7.tgz#d372dda9c89fcec340a82630a9f533f2fe15877e" integrity sha512-sR4eaSrnM7BV7QPzGfEX5paG/6wrZM3I0HDzfIAK06ESvo9oy3xBuVBxE3MbQaKNhvg8g/ixjMWo2CGpzpHsDA== -"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.2": - version "7.16.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2.tgz#2977fca9b212db153c195674e57cfab807733183" - integrity sha512-h37CvpLSf8gb2lIJ2CgC3t+EjFbi0t8qS7LCS1xcJIlEXE4czlofwaW7W1HA8zpgOCzI9C1nmoqNR1zWkk0pQg== +"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050" + integrity sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0.tgz#358972eaab006f5eb0826183b0c93cbcaf13e1e2" - integrity sha512-4tcFwwicpWTrpl9qjf7UsoosaArgImF85AxqCRZlgc3IQDvkUHjJpruXAL58Wmj+T6fypWTC/BakfEkwIL/pwA== +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz#cc001234dfc139ac45f6bcf801866198c8c72ff9" + integrity sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" - "@babel/plugin-proposal-optional-chaining" "^7.16.0" + "@babel/plugin-proposal-optional-chaining" "^7.16.7" -"@babel/plugin-proposal-async-generator-functions@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.5.tgz#fd3bd7e0d98404a3d4cbca15a72d533f8c9a2f67" - integrity sha512-C/FX+3HNLV6sz7AqbTQqEo1L9/kfrKjxcVtgyBCmvIgOjvuBVUWooDoi7trsLxOzCEo5FccjRvKHkfDsJFZlfA== +"@babel/plugin-proposal-async-generator-functions@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.7.tgz#739adc1212a9e4892de440cd7dfffb06172df78d" + integrity sha512-TTXBT3A5c11eqRzaC6beO6rlFT3Mo9C2e8eB44tTr52ESXSK2CIc2fOp1ynpAwQA8HhBMho+WXhMHWlAe3xkpw== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" - "@babel/helper-remap-async-to-generator" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-remap-async-to-generator" "^7.16.7" "@babel/plugin-syntax-async-generators" "^7.8.4" -"@babel/plugin-proposal-class-properties@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.5.tgz#3269f44b89122110f6339806e05d43d84106468a" - integrity sha512-pJD3HjgRv83s5dv1sTnDbZOaTjghKEz8KUn1Kbh2eAIRhGuyQ1XSeI4xVXU3UlIEVA3DAyIdxqT1eRn7Wcn55A== +"@babel/plugin-proposal-class-properties@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0" + integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww== dependencies: - "@babel/helper-create-class-features-plugin" "^7.16.5" - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-create-class-features-plugin" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-proposal-class-static-block@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.5.tgz#df58ab015a7d3b0963aafc8f20792dcd834952a9" - integrity sha512-EEFzuLZcm/rNJ8Q5krK+FRKdVkd6FjfzT9tuSZql9sQn64K0hHA2KLJ0DqVot9/iV6+SsuadC5yI39zWnm+nmQ== +"@babel/plugin-proposal-class-static-block@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.7.tgz#712357570b612106ef5426d13dc433ce0f200c2a" + integrity sha512-dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw== dependencies: - "@babel/helper-create-class-features-plugin" "^7.16.5" - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-create-class-features-plugin" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-class-static-block" "^7.14.5" -"@babel/plugin-proposal-dynamic-import@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.5.tgz#2e0d19d5702db4dcb9bc846200ca02f2e9d60e9e" - integrity sha512-P05/SJZTTvHz79LNYTF8ff5xXge0kk5sIIWAypcWgX4BTRUgyHc8wRxJ/Hk+mU0KXldgOOslKaeqnhthcDJCJQ== +"@babel/plugin-proposal-dynamic-import@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz#c19c897eaa46b27634a00fee9fb7d829158704b2" + integrity sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-dynamic-import" "^7.8.3" -"@babel/plugin-proposal-export-namespace-from@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.5.tgz#3b4dd28378d1da2fea33e97b9f25d1c2f5bf1ac9" - integrity sha512-i+sltzEShH1vsVydvNaTRsgvq2vZsfyrd7K7vPLUU/KgS0D5yZMe6uipM0+izminnkKrEfdUnz7CxMRb6oHZWw== +"@babel/plugin-proposal-export-namespace-from@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz#09de09df18445a5786a305681423ae63507a6163" + integrity sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" -"@babel/plugin-proposal-json-strings@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.5.tgz#1e726930fca139caab6b084d232a9270d9d16f9c" - integrity sha512-QQJueTFa0y9E4qHANqIvMsuxM/qcLQmKttBACtPCQzGUEizsXDACGonlPiSwynHfOa3vNw0FPMVvQzbuXwh4SQ== +"@babel/plugin-proposal-json-strings@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz#9732cb1d17d9a2626a08c5be25186c195b6fa6e8" + integrity sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-json-strings" "^7.8.3" -"@babel/plugin-proposal-logical-assignment-operators@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.5.tgz#df1f2e4b5a0ec07abf061d2c18e53abc237d3ef5" - integrity sha512-xqibl7ISO2vjuQM+MzR3rkd0zfNWltk7n9QhaD8ghMmMceVguYrNDt7MikRyj4J4v3QehpnrU8RYLnC7z/gZLA== +"@babel/plugin-proposal-logical-assignment-operators@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz#be23c0ba74deec1922e639832904be0bea73cdea" + integrity sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" -"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.5.tgz#652555bfeeeee2d2104058c6225dc6f75e2d0f07" - integrity sha512-YwMsTp/oOviSBhrjwi0vzCUycseCYwoXnLiXIL3YNjHSMBHicGTz7GjVU/IGgz4DtOEXBdCNG72pvCX22ehfqg== +"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz#141fc20b6857e59459d430c850a0011e36561d99" + integrity sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" -"@babel/plugin-proposal-numeric-separator@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.5.tgz#edcb6379b6cf4570be64c45965d8da7a2debf039" - integrity sha512-DvB9l/TcsCRvsIV9v4jxR/jVP45cslTVC0PMVHvaJhhNuhn2Y1SOhCSFlPK777qLB5wb8rVDaNoqMTyOqtY5Iw== +"@babel/plugin-proposal-numeric-separator@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz#d6b69f4af63fb38b6ca2558442a7fb191236eba9" + integrity sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-proposal-object-rest-spread@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.5.tgz#f30f80dacf7bc1404bf67f99c8d9c01665e830ad" - integrity sha512-UEd6KpChoyPhCoE840KRHOlGhEZFutdPDMGj+0I56yuTTOaT51GzmnEl/0uT41fB/vD2nT+Pci2KjezyE3HmUw== +"@babel/plugin-proposal-object-rest-spread@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.7.tgz#94593ef1ddf37021a25bdcb5754c4a8d534b01d8" + integrity sha512-3O0Y4+dw94HA86qSg9IHfyPktgR7q3gpNVAeiKQd+8jBKFaU5NQS1Yatgo4wY+UFNuLjvxcSmzcsHqrhgTyBUA== dependencies: "@babel/compat-data" "^7.16.4" - "@babel/helper-compilation-targets" "^7.16.3" - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-compilation-targets" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.16.5" + "@babel/plugin-transform-parameters" "^7.16.7" -"@babel/plugin-proposal-optional-catch-binding@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.5.tgz#1a5405765cf589a11a33a1fd75b2baef7d48b74e" - integrity sha512-ihCMxY1Iljmx4bWy/PIMJGXN4NS4oUj1MKynwO07kiKms23pNvIn1DMB92DNB2R0EA882sw0VXIelYGdtF7xEQ== +"@babel/plugin-proposal-optional-catch-binding@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz#c623a430674ffc4ab732fd0a0ae7722b67cb74cf" + integrity sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" -"@babel/plugin-proposal-optional-chaining@^7.16.0", "@babel/plugin-proposal-optional-chaining@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.5.tgz#a5fa61056194d5059366c0009cb9a9e66ed75c1f" - integrity sha512-kzdHgnaXRonttiTfKYnSVafbWngPPr2qKw9BWYBESl91W54e+9R5pP70LtWxV56g0f05f/SQrwHYkfvbwcdQ/A== +"@babel/plugin-proposal-optional-chaining@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz#7cd629564724816c0e8a969535551f943c64c39a" + integrity sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" "@babel/plugin-syntax-optional-chaining" "^7.8.3" -"@babel/plugin-proposal-private-methods@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.5.tgz#2086f7d78c1b0c712d49b5c3fbc2d1ca21a7ee12" - integrity sha512-+yFMO4BGT3sgzXo+lrq7orX5mAZt57DwUK6seqII6AcJnJOIhBJ8pzKH47/ql/d426uQ7YhN8DpUFirQzqYSUA== +"@babel/plugin-proposal-private-methods@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.7.tgz#e418e3aa6f86edd6d327ce84eff188e479f571e0" + integrity sha512-7twV3pzhrRxSwHeIvFE6coPgvo+exNDOiGUMg39o2LiLo1Y+4aKpfkcLGcg1UHonzorCt7SNXnoMyCnnIOA8Sw== dependencies: - "@babel/helper-create-class-features-plugin" "^7.16.5" - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-create-class-features-plugin" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-proposal-private-property-in-object@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.5.tgz#a42d4b56005db3d405b12841309dbca647e7a21b" - integrity sha512-+YGh5Wbw0NH3y/E5YMu6ci5qTDmAEVNoZ3I54aB6nVEOZ5BQ7QJlwKq5pYVucQilMByGn/bvX0af+uNaPRCabA== +"@babel/plugin-proposal-private-property-in-object@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz#b0b8cef543c2c3d57e59e2c611994861d46a3fce" + integrity sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ== dependencies: - "@babel/helper-annotate-as-pure" "^7.16.0" - "@babel/helper-create-class-features-plugin" "^7.16.5" - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-annotate-as-pure" "^7.16.7" + "@babel/helper-create-class-features-plugin" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-private-property-in-object" "^7.14.5" -"@babel/plugin-proposal-unicode-property-regex@^7.16.5", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.5.tgz#35fe753afa7c572f322bd068ff3377bde0f37080" - integrity sha512-s5sKtlKQyFSatt781HQwv1hoM5BQ9qRH30r+dK56OLDsHmV74mzwJNX7R1yMuE7VZKG5O6q/gmOGSAO6ikTudg== +"@babel/plugin-proposal-unicode-property-regex@^7.16.7", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz#635d18eb10c6214210ffc5ff4932552de08188a2" + integrity sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.16.0" - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-create-regexp-features-plugin" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -603,281 +554,282 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-arrow-functions@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.5.tgz#04c18944dd55397b521d9d7511e791acea7acf2d" - integrity sha512-8bTHiiZyMOyfZFULjsCnYOWG059FVMes0iljEHSfARhNgFfpsqE92OrCffv3veSw9rwMkYcFe9bj0ZoXU2IGtQ== +"@babel/plugin-transform-arrow-functions@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz#44125e653d94b98db76369de9c396dc14bef4154" + integrity sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-async-to-generator@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.5.tgz#89c9b501e65bb14c4579a6ce9563f859de9b34e4" - integrity sha512-TMXgfioJnkXU+XRoj7P2ED7rUm5jbnDWwlCuFVTpQboMfbSya5WrmubNBAMlk7KXvywpo8rd8WuYZkis1o2H8w== +"@babel/plugin-transform-async-to-generator@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.7.tgz#646e1262ac341b587ff5449844d4492dbb10ac4b" + integrity sha512-pFEfjnK4DfXCfAlA5I98BYdDJD8NltMzx19gt6DAmfE+2lXRfPUoa0/5SUjT4+TDE1W/rcxU/1lgN55vpAjjdg== dependencies: - "@babel/helper-module-imports" "^7.16.0" - "@babel/helper-plugin-utils" "^7.16.5" - "@babel/helper-remap-async-to-generator" "^7.16.5" + "@babel/helper-module-imports" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-remap-async-to-generator" "^7.16.7" -"@babel/plugin-transform-block-scoped-functions@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.5.tgz#af087494e1c387574260b7ee9b58cdb5a4e9b0b0" - integrity sha512-BxmIyKLjUGksJ99+hJyL/HIxLIGnLKtw772zYDER7UuycDZ+Xvzs98ZQw6NGgM2ss4/hlFAaGiZmMNKvValEjw== +"@babel/plugin-transform-block-scoped-functions@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz#4d0d57d9632ef6062cdf354bb717102ee042a620" + integrity sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-block-scoping@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.5.tgz#b91f254fe53e210eabe4dd0c40f71c0ed253c5e7" - integrity sha512-JxjSPNZSiOtmxjX7PBRBeRJTUKTyJ607YUYeT0QJCNdsedOe+/rXITjP08eG8xUpsLfPirgzdCFN+h0w6RI+pQ== +"@babel/plugin-transform-block-scoping@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz#f50664ab99ddeaee5bc681b8f3a6ea9d72ab4f87" + integrity sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-classes@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.5.tgz#6acf2ec7adb50fb2f3194dcd2909dbd056dcf216" - integrity sha512-DzJ1vYf/7TaCYy57J3SJ9rV+JEuvmlnvvyvYKFbk5u46oQbBvuB9/0w+YsVsxkOv8zVWKpDmUoj4T5ILHoXevA== +"@babel/plugin-transform-classes@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz#8f4b9562850cd973de3b498f1218796eb181ce00" + integrity sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ== dependencies: - "@babel/helper-annotate-as-pure" "^7.16.0" - "@babel/helper-environment-visitor" "^7.16.5" - "@babel/helper-function-name" "^7.16.0" - "@babel/helper-optimise-call-expression" "^7.16.0" - "@babel/helper-plugin-utils" "^7.16.5" - "@babel/helper-replace-supers" "^7.16.5" - "@babel/helper-split-export-declaration" "^7.16.0" + "@babel/helper-annotate-as-pure" "^7.16.7" + "@babel/helper-environment-visitor" "^7.16.7" + "@babel/helper-function-name" "^7.16.7" + "@babel/helper-optimise-call-expression" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-replace-supers" "^7.16.7" + "@babel/helper-split-export-declaration" "^7.16.7" globals "^11.1.0" -"@babel/plugin-transform-computed-properties@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.5.tgz#2af91ebf0cceccfcc701281ada7cfba40a9b322a" - integrity sha512-n1+O7xtU5lSLraRzX88CNcpl7vtGdPakKzww74bVwpAIRgz9JVLJJpOLb0uYqcOaXVM0TL6X0RVeIJGD2CnCkg== +"@babel/plugin-transform-computed-properties@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz#66dee12e46f61d2aae7a73710f591eb3df616470" + integrity sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-destructuring@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.5.tgz#89ebc87499ac4a81b897af53bb5d3eed261bd568" - integrity sha512-GuRVAsjq+c9YPK6NeTkRLWyQskDC099XkBSVO+6QzbnOnH2d/4mBVXYStaPrZD3dFRfg00I6BFJ9Atsjfs8mlg== +"@babel/plugin-transform-destructuring@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.7.tgz#ca9588ae2d63978a4c29d3f33282d8603f618e23" + integrity sha512-VqAwhTHBnu5xBVDCvrvqJbtLUa++qZaWC0Fgr2mqokBlulZARGyIvZDoqbPlPaKImQ9dKAcCzbv+ul//uqu70A== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-dotall-regex@^7.16.5", "@babel/plugin-transform-dotall-regex@^7.4.4": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.5.tgz#b40739c00b6686820653536d6d143e311de67936" - integrity sha512-iQiEMt8Q4/5aRGHpGVK2Zc7a6mx7qEAO7qehgSug3SDImnuMzgmm/wtJALXaz25zUj1PmnNHtShjFgk4PDx4nw== +"@babel/plugin-transform-dotall-regex@^7.16.7", "@babel/plugin-transform-dotall-regex@^7.4.4": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz#6b2d67686fab15fb6a7fd4bd895d5982cfc81241" + integrity sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.16.0" - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-create-regexp-features-plugin" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-duplicate-keys@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.5.tgz#2450f2742325412b746d7d005227f5e8973b512a" - integrity sha512-81tijpDg2a6I1Yhj4aWY1l3O1J4Cg/Pd7LfvuaH2VVInAkXtzibz9+zSPdUM1WvuUi128ksstAP0hM5w48vQgg== +"@babel/plugin-transform-duplicate-keys@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz#2207e9ca8f82a0d36a5a67b6536e7ef8b08823c9" + integrity sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-exponentiation-operator@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.5.tgz#36e261fa1ab643cfaf30eeab38e00ed1a76081e2" - integrity sha512-12rba2HwemQPa7BLIKCzm1pT2/RuQHtSFHdNl41cFiC6oi4tcrp7gjB07pxQvFpcADojQywSjblQth6gJyE6CA== +"@babel/plugin-transform-exponentiation-operator@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz#efa9862ef97e9e9e5f653f6ddc7b665e8536fe9b" + integrity sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA== dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.5" - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-for-of@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.5.tgz#9b544059c6ca11d565457c0ff1f08e13ce225261" - integrity sha512-+DpCAJFPAvViR17PIMi9x2AE34dll5wNlXO43wagAX2YcRGgEVHCNFC4azG85b4YyyFarvkc/iD5NPrz4Oneqw== +"@babel/plugin-transform-for-of@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz#649d639d4617dff502a9a158c479b3b556728d8c" + integrity sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-function-name@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.5.tgz#6896ebb6a5538a75d6a4086a277752f655a7bd15" - integrity sha512-Fuec/KPSpVLbGo6z1RPw4EE1X+z9gZk1uQmnYy7v4xr4TO9p41v1AoUuXEtyqAI7H+xNJYSICzRqZBhDEkd3kQ== +"@babel/plugin-transform-function-name@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz#5ab34375c64d61d083d7d2f05c38d90b97ec65cf" + integrity sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA== dependencies: - "@babel/helper-function-name" "^7.16.0" - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-compilation-targets" "^7.16.7" + "@babel/helper-function-name" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-literals@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.5.tgz#af392b90e3edb2bd6dc316844cbfd6b9e009d320" - integrity sha512-B1j9C/IfvshnPcklsc93AVLTrNVa69iSqztylZH6qnmiAsDDOmmjEYqOm3Ts2lGSgTSywnBNiqC949VdD0/gfw== +"@babel/plugin-transform-literals@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz#254c9618c5ff749e87cb0c0cef1a0a050c0bdab1" + integrity sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-member-expression-literals@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.5.tgz#4bd6ecdc11932361631097b779ca5c7570146dd5" - integrity sha512-d57i3vPHWgIde/9Y8W/xSFUndhvhZN5Wu2TjRrN1MVz5KzdUihKnfDVlfP1U7mS5DNj/WHHhaE4/tTi4hIyHwQ== +"@babel/plugin-transform-member-expression-literals@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz#6e5dcf906ef8a098e630149d14c867dd28f92384" + integrity sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-modules-amd@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.5.tgz#92c0a3e83f642cb7e75fada9ab497c12c2616527" - integrity sha512-oHI15S/hdJuSCfnwIz+4lm6wu/wBn7oJ8+QrkzPPwSFGXk8kgdI/AIKcbR/XnD1nQVMg/i6eNaXpszbGuwYDRQ== +"@babel/plugin-transform-modules-amd@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz#b28d323016a7daaae8609781d1f8c9da42b13186" + integrity sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g== dependencies: - "@babel/helper-module-transforms" "^7.16.5" - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-module-transforms" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-commonjs@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.5.tgz#4ee03b089536f076b2773196529d27c32b9d7bde" - integrity sha512-ABhUkxvoQyqhCWyb8xXtfwqNMJD7tx+irIRnUh6lmyFud7Jln1WzONXKlax1fg/ey178EXbs4bSGNd6PngO+SQ== +"@babel/plugin-transform-modules-commonjs@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.7.tgz#fd119e6a433c527d368425b45df361e1e95d3c1a" + integrity sha512-h2RP2kE7He1ZWKyAlanMZrAbdv+Acw1pA8dQZhE025WJZE2z0xzFADAinXA9fxd5bn7JnM+SdOGcndGx1ARs9w== dependencies: - "@babel/helper-module-transforms" "^7.16.5" - "@babel/helper-plugin-utils" "^7.16.5" - "@babel/helper-simple-access" "^7.16.0" + "@babel/helper-module-transforms" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-simple-access" "^7.16.7" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-systemjs@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.5.tgz#07078ba2e3cc94fbdd06836e355c246e98ad006b" - integrity sha512-53gmLdScNN28XpjEVIm7LbWnD/b/TpbwKbLk6KV4KqC9WyU6rq1jnNmVG6UgAdQZVVGZVoik3DqHNxk4/EvrjA== +"@babel/plugin-transform-modules-systemjs@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz#887cefaef88e684d29558c2b13ee0563e287c2d7" + integrity sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw== dependencies: - "@babel/helper-hoist-variables" "^7.16.0" - "@babel/helper-module-transforms" "^7.16.5" - "@babel/helper-plugin-utils" "^7.16.5" - "@babel/helper-validator-identifier" "^7.15.7" + "@babel/helper-hoist-variables" "^7.16.7" + "@babel/helper-module-transforms" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-validator-identifier" "^7.16.7" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-umd@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.5.tgz#caa9c53d636fb4e3c99fd35a4c9ba5e5cd7e002e" - integrity sha512-qTFnpxHMoenNHkS3VoWRdwrcJ3FhX567GvDA3hRZKF0Dj8Fmg0UzySZp3AP2mShl/bzcywb/UWAMQIjA1bhXvw== +"@babel/plugin-transform-modules-umd@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz#23dad479fa585283dbd22215bff12719171e7618" + integrity sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ== dependencies: - "@babel/helper-module-transforms" "^7.16.5" - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-module-transforms" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-named-capturing-groups-regex@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.5.tgz#4afd8cdee377ce3568f4e8a9ee67539b69886a3c" - integrity sha512-/wqGDgvFUeKELW6ex6QB7dLVRkd5ehjw34tpXu1nhKC0sFfmaLabIswnpf8JgDyV2NeDmZiwoOb0rAmxciNfjA== +"@babel/plugin-transform-named-capturing-groups-regex@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.7.tgz#749d90d94e73cf62c60a0cc8d6b94d29305a81f2" + integrity sha512-kFy35VwmwIQwCjwrAQhl3+c/kr292i4KdLPKp5lPH03Ltc51qnFlIADoyPxc/6Naz3ok3WdYKg+KK6AH+D4utg== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.16.0" + "@babel/helper-create-regexp-features-plugin" "^7.16.7" -"@babel/plugin-transform-new-target@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.5.tgz#759ea9d6fbbc20796056a5d89d13977626384416" - integrity sha512-ZaIrnXF08ZC8jnKR4/5g7YakGVL6go6V9ql6Jl3ecO8PQaQqFE74CuM384kezju7Z9nGCCA20BqZaR1tJ/WvHg== +"@babel/plugin-transform-new-target@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz#9967d89a5c243818e0800fdad89db22c5f514244" + integrity sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-object-super@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.5.tgz#8ccd9a1bcd3e7732ff8aa1702d067d8cd70ce380" - integrity sha512-tded+yZEXuxt9Jdtkc1RraW1zMF/GalVxaVVxh41IYwirdRgyAxxxCKZ9XB7LxZqmsjfjALxupNE1MIz9KH+Zg== +"@babel/plugin-transform-object-super@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz#ac359cf8d32cf4354d27a46867999490b6c32a94" + integrity sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" - "@babel/helper-replace-supers" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-replace-supers" "^7.16.7" -"@babel/plugin-transform-parameters@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.5.tgz#4fc74b18a89638bd90aeec44a11793ecbe031dde" - integrity sha512-B3O6AL5oPop1jAVg8CV+haeUte9oFuY85zu0jwnRNZZi3tVAbJriu5tag/oaO2kGaQM/7q7aGPBlTI5/sr9enA== +"@babel/plugin-transform-parameters@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz#a1721f55b99b736511cb7e0152f61f17688f331f" + integrity sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-property-literals@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.5.tgz#58f1465a7202a2bb2e6b003905212dd7a79abe3f" - integrity sha512-+IRcVW71VdF9pEH/2R/Apab4a19LVvdVsr/gEeotH00vSDVlKD+XgfSIw+cgGWsjDB/ziqGv/pGoQZBIiQVXHg== +"@babel/plugin-transform-property-literals@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz#2dadac85155436f22c696c4827730e0fe1057a55" + integrity sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-regenerator@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.5.tgz#704cc6d8dd3dd4758267621ab7b36375238cef13" - integrity sha512-2z+it2eVWU8TtQQRauvGUqZwLy4+7rTfo6wO4npr+fvvN1SW30ZF3O/ZRCNmTuu4F5MIP8OJhXAhRV5QMJOuYg== +"@babel/plugin-transform-regenerator@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz#9e7576dc476cb89ccc5096fff7af659243b4adeb" + integrity sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q== dependencies: regenerator-transform "^0.14.2" -"@babel/plugin-transform-reserved-words@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.5.tgz#db95e98799675e193dc2b47d3e72a7c0651d0c30" - integrity sha512-aIB16u8lNcf7drkhXJRoggOxSTUAuihTSTfAcpynowGJOZiGf+Yvi7RuTwFzVYSYPmWyARsPqUGoZWWWxLiknw== +"@babel/plugin-transform-reserved-words@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz#1d798e078f7c5958eec952059c460b220a63f586" + integrity sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-shorthand-properties@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.5.tgz#ccb60b1a23b799f5b9a14d97c5bc81025ffd96d7" - integrity sha512-ZbuWVcY+MAXJuuW7qDoCwoxDUNClfZxoo7/4swVbOW1s/qYLOMHlm9YRWMsxMFuLs44eXsv4op1vAaBaBaDMVg== +"@babel/plugin-transform-shorthand-properties@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz#e8549ae4afcf8382f711794c0c7b6b934c5fbd2a" + integrity sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-spread@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.5.tgz#912b06cff482c233025d3e69cf56d3e8fa166c29" - integrity sha512-5d6l/cnG7Lw4tGHEoga4xSkYp1euP7LAtrah1h1PgJ3JY7yNsjybsxQAnVK4JbtReZ/8z6ASVmd3QhYYKLaKZw== +"@babel/plugin-transform-spread@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz#a303e2122f9f12e0105daeedd0f30fb197d8ff44" + integrity sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" -"@babel/plugin-transform-sticky-regex@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.5.tgz#593579bb2b5a8adfbe02cb43823275d9098f75f9" - integrity sha512-usYsuO1ID2LXxzuUxifgWtJemP7wL2uZtyrTVM4PKqsmJycdS4U4mGovL5xXkfUheds10Dd2PjoQLXw6zCsCbg== +"@babel/plugin-transform-sticky-regex@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz#c84741d4f4a38072b9a1e2e3fd56d359552e8660" + integrity sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-template-literals@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.5.tgz#343651385fd9923f5aa2275ca352c5d9183e1773" - integrity sha512-gnyKy9RyFhkovex4BjKWL3BVYzUDG6zC0gba7VMLbQoDuqMfJ1SDXs8k/XK41Mmt1Hyp4qNAvGFb9hKzdCqBRQ== +"@babel/plugin-transform-template-literals@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz#f3d1c45d28967c8e80f53666fc9c3e50618217ab" + integrity sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-typeof-symbol@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.5.tgz#a1d1bf2c71573fe30965d0e4cd6a3291202e20ed" - integrity sha512-ldxCkW180qbrvyCVDzAUZqB0TAeF8W/vGJoRcaf75awm6By+PxfJKvuqVAnq8N9wz5Xa6mSpM19OfVKKVmGHSQ== +"@babel/plugin-transform-typeof-symbol@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz#9cdbe622582c21368bd482b660ba87d5545d4f7e" + integrity sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-unicode-escapes@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.5.tgz#80507c225af49b4f4ee647e2a0ce53d2eeff9e85" - integrity sha512-shiCBHTIIChGLdyojsKQjoAyB8MBwat25lKM7MJjbe1hE0bgIppD+LX9afr41lLHOhqceqeWl4FkLp+Bgn9o1Q== +"@babel/plugin-transform-unicode-escapes@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz#da8717de7b3287a2c6d659750c964f302b31ece3" + integrity sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-unicode-regex@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.5.tgz#ac84d6a1def947d71ffb832426aa53b83d7ed49e" - integrity sha512-GTJ4IW012tiPEMMubd7sD07iU9O/LOo8Q/oU4xNhcaq0Xn8+6TcUQaHtC8YxySo1T+ErQ8RaWogIEeFhKGNPzw== +"@babel/plugin-transform-unicode-regex@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz#0f7aa4a501198976e25e82702574c34cfebe9ef2" + integrity sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.16.0" - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-create-regexp-features-plugin" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/preset-env@7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.5.tgz#2e94d922f4a890979af04ffeb6a6b4e44ba90847" - integrity sha512-MiJJW5pwsktG61NDxpZ4oJ1CKxM1ncam9bzRtx9g40/WkLRkxFP6mhpkYV0/DxcciqoiHicx291+eUQrXb/SfQ== +"@babel/preset-env@7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.7.tgz#c491088856d0b3177822a2bf06cb74d76327aa56" + integrity sha512-urX3Cee4aOZbRWOSa3mKPk0aqDikfILuo+C7qq7HY0InylGNZ1fekq9jmlr3pLWwZHF4yD7heQooc2Pow2KMyQ== dependencies: "@babel/compat-data" "^7.16.4" - "@babel/helper-compilation-targets" "^7.16.3" - "@babel/helper-plugin-utils" "^7.16.5" - "@babel/helper-validator-option" "^7.14.5" - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.16.2" - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.16.0" - "@babel/plugin-proposal-async-generator-functions" "^7.16.5" - "@babel/plugin-proposal-class-properties" "^7.16.5" - "@babel/plugin-proposal-class-static-block" "^7.16.5" - "@babel/plugin-proposal-dynamic-import" "^7.16.5" - "@babel/plugin-proposal-export-namespace-from" "^7.16.5" - "@babel/plugin-proposal-json-strings" "^7.16.5" - "@babel/plugin-proposal-logical-assignment-operators" "^7.16.5" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.16.5" - "@babel/plugin-proposal-numeric-separator" "^7.16.5" - "@babel/plugin-proposal-object-rest-spread" "^7.16.5" - "@babel/plugin-proposal-optional-catch-binding" "^7.16.5" - "@babel/plugin-proposal-optional-chaining" "^7.16.5" - "@babel/plugin-proposal-private-methods" "^7.16.5" - "@babel/plugin-proposal-private-property-in-object" "^7.16.5" - "@babel/plugin-proposal-unicode-property-regex" "^7.16.5" + "@babel/helper-compilation-targets" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-validator-option" "^7.16.7" + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.16.7" + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.16.7" + "@babel/plugin-proposal-async-generator-functions" "^7.16.7" + "@babel/plugin-proposal-class-properties" "^7.16.7" + "@babel/plugin-proposal-class-static-block" "^7.16.7" + "@babel/plugin-proposal-dynamic-import" "^7.16.7" + "@babel/plugin-proposal-export-namespace-from" "^7.16.7" + "@babel/plugin-proposal-json-strings" "^7.16.7" + "@babel/plugin-proposal-logical-assignment-operators" "^7.16.7" + "@babel/plugin-proposal-nullish-coalescing-operator" "^7.16.7" + "@babel/plugin-proposal-numeric-separator" "^7.16.7" + "@babel/plugin-proposal-object-rest-spread" "^7.16.7" + "@babel/plugin-proposal-optional-catch-binding" "^7.16.7" + "@babel/plugin-proposal-optional-chaining" "^7.16.7" + "@babel/plugin-proposal-private-methods" "^7.16.7" + "@babel/plugin-proposal-private-property-in-object" "^7.16.7" + "@babel/plugin-proposal-unicode-property-regex" "^7.16.7" "@babel/plugin-syntax-async-generators" "^7.8.4" "@babel/plugin-syntax-class-properties" "^7.12.13" "@babel/plugin-syntax-class-static-block" "^7.14.5" @@ -892,40 +844,40 @@ "@babel/plugin-syntax-optional-chaining" "^7.8.3" "@babel/plugin-syntax-private-property-in-object" "^7.14.5" "@babel/plugin-syntax-top-level-await" "^7.14.5" - "@babel/plugin-transform-arrow-functions" "^7.16.5" - "@babel/plugin-transform-async-to-generator" "^7.16.5" - "@babel/plugin-transform-block-scoped-functions" "^7.16.5" - "@babel/plugin-transform-block-scoping" "^7.16.5" - "@babel/plugin-transform-classes" "^7.16.5" - "@babel/plugin-transform-computed-properties" "^7.16.5" - "@babel/plugin-transform-destructuring" "^7.16.5" - "@babel/plugin-transform-dotall-regex" "^7.16.5" - "@babel/plugin-transform-duplicate-keys" "^7.16.5" - "@babel/plugin-transform-exponentiation-operator" "^7.16.5" - "@babel/plugin-transform-for-of" "^7.16.5" - "@babel/plugin-transform-function-name" "^7.16.5" - "@babel/plugin-transform-literals" "^7.16.5" - "@babel/plugin-transform-member-expression-literals" "^7.16.5" - "@babel/plugin-transform-modules-amd" "^7.16.5" - "@babel/plugin-transform-modules-commonjs" "^7.16.5" - "@babel/plugin-transform-modules-systemjs" "^7.16.5" - "@babel/plugin-transform-modules-umd" "^7.16.5" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.16.5" - "@babel/plugin-transform-new-target" "^7.16.5" - "@babel/plugin-transform-object-super" "^7.16.5" - "@babel/plugin-transform-parameters" "^7.16.5" - "@babel/plugin-transform-property-literals" "^7.16.5" - "@babel/plugin-transform-regenerator" "^7.16.5" - "@babel/plugin-transform-reserved-words" "^7.16.5" - "@babel/plugin-transform-shorthand-properties" "^7.16.5" - "@babel/plugin-transform-spread" "^7.16.5" - "@babel/plugin-transform-sticky-regex" "^7.16.5" - "@babel/plugin-transform-template-literals" "^7.16.5" - "@babel/plugin-transform-typeof-symbol" "^7.16.5" - "@babel/plugin-transform-unicode-escapes" "^7.16.5" - "@babel/plugin-transform-unicode-regex" "^7.16.5" + "@babel/plugin-transform-arrow-functions" "^7.16.7" + "@babel/plugin-transform-async-to-generator" "^7.16.7" + "@babel/plugin-transform-block-scoped-functions" "^7.16.7" + "@babel/plugin-transform-block-scoping" "^7.16.7" + "@babel/plugin-transform-classes" "^7.16.7" + "@babel/plugin-transform-computed-properties" "^7.16.7" + "@babel/plugin-transform-destructuring" "^7.16.7" + "@babel/plugin-transform-dotall-regex" "^7.16.7" + "@babel/plugin-transform-duplicate-keys" "^7.16.7" + "@babel/plugin-transform-exponentiation-operator" "^7.16.7" + "@babel/plugin-transform-for-of" "^7.16.7" + "@babel/plugin-transform-function-name" "^7.16.7" + "@babel/plugin-transform-literals" "^7.16.7" + "@babel/plugin-transform-member-expression-literals" "^7.16.7" + "@babel/plugin-transform-modules-amd" "^7.16.7" + "@babel/plugin-transform-modules-commonjs" "^7.16.7" + "@babel/plugin-transform-modules-systemjs" "^7.16.7" + "@babel/plugin-transform-modules-umd" "^7.16.7" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.16.7" + "@babel/plugin-transform-new-target" "^7.16.7" + "@babel/plugin-transform-object-super" "^7.16.7" + "@babel/plugin-transform-parameters" "^7.16.7" + "@babel/plugin-transform-property-literals" "^7.16.7" + "@babel/plugin-transform-regenerator" "^7.16.7" + "@babel/plugin-transform-reserved-words" "^7.16.7" + "@babel/plugin-transform-shorthand-properties" "^7.16.7" + "@babel/plugin-transform-spread" "^7.16.7" + "@babel/plugin-transform-sticky-regex" "^7.16.7" + "@babel/plugin-transform-template-literals" "^7.16.7" + "@babel/plugin-transform-typeof-symbol" "^7.16.7" + "@babel/plugin-transform-unicode-escapes" "^7.16.7" + "@babel/plugin-transform-unicode-regex" "^7.16.7" "@babel/preset-modules" "^0.1.5" - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" babel-plugin-polyfill-corejs2 "^0.3.0" babel-plugin-polyfill-corejs3 "^0.4.0" babel-plugin-polyfill-regenerator "^0.3.0" @@ -950,7 +902,7 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/template@^7.16.0", "@babel/template@^7.16.7", "@babel/template@^7.3.3": +"@babel/template@^7.16.7", "@babel/template@^7.3.3": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155" integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w== @@ -959,7 +911,7 @@ "@babel/parser" "^7.16.7" "@babel/types" "^7.16.7" -"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.5", "@babel/traverse@^7.16.7", "@babel/traverse@^7.7.2": +"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.7.2": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.7.tgz#dac01236a72c2560073658dd1a285fe4e0865d76" integrity sha512-8KWJPIb8c2VvY8AJrydh6+fVRo2ODx1wYBU2398xJVq0JomuLBZmVQzLPBblJgHIGYG4znCpUZUZ0Pt2vdmVYQ==