From 2d1482fc8bb45d7e58c9fae2f271bd8682a85c98 Mon Sep 17 00:00:00 2001 From: Dillon Raphael Date: Wed, 10 Aug 2022 15:40:17 -0400 Subject: [PATCH] Store error for cookiePrefix if undefined & show error at the end of codemod (#3704) * store error for cookiePrefix if undefined & show error at the end * rename to collectedErrors * fix type & update error message --- .changeset/sour-mails-lick.md | 5 + packages/codemod/src/upgrade-legacy.ts | 102 ++++++++------------ pnpm-lock.yaml | 123 +++++++++++++------------ 3 files changed, 104 insertions(+), 126 deletions(-) create mode 100644 .changeset/sour-mails-lick.md diff --git a/.changeset/sour-mails-lick.md b/.changeset/sour-mails-lick.md new file mode 100644 index 0000000000..14f74adf61 --- /dev/null +++ b/.changeset/sour-mails-lick.md @@ -0,0 +1,5 @@ +--- +"@blitzjs/codemod": patch +--- + +Allow codemod to finish if `cookiePrefix` is undefined. Then show error at the end of running the codemod. diff --git a/packages/codemod/src/upgrade-legacy.ts b/packages/codemod/src/upgrade-legacy.ts index c7836eba94..267eced1ba 100644 --- a/packages/codemod/src/upgrade-legacy.ts +++ b/packages/codemod/src/upgrade-legacy.ts @@ -30,7 +30,7 @@ class ExpectedError extends Error { const isInternalBlitzMonorepoDevelopment = fs.existsSync( path.join(__dirname, "../../../blitz-next"), ) - +type Step = {name: string; action: (stepIndex: number) => Promise} const upgradeLegacy = async () => { let isTypescript = fs.existsSync(path.resolve("tsconfig.json")) let blitzConfigFile = `blitz.config.${isTypescript ? "ts" : "js"}` @@ -38,11 +38,8 @@ const upgradeLegacy = async () => { const appDir = path.resolve("app") let failedAt = fs.existsSync(path.resolve(".migration.json")) && fs.readJSONSync("./.migration.json").failedAt - - let steps: { - name: string - action: () => Promise - }[] = [] + let collectedErrors: {message: string; step: number}[] = [] + let steps: Step[] = [] // Add steps in order @@ -61,8 +58,8 @@ const upgradeLegacy = async () => { withBlitz.shorthand = true /* Declare the variable using the object above that equals to a require expression, eg. - const {withBlitz} = require("@blitzjs/next") - */ + const {withBlitz} = require("@blitzjs/next") + */ let blitzDeclare = j.variableDeclaration("const", [ j.variableDeclarator( j.objectPattern([withBlitz]), @@ -411,7 +408,7 @@ const upgradeLegacy = async () => { steps.push({ name: "Add cookiePrefix to blitz server", - action: async () => { + action: async (stepIndex) => { const blitzConfigProgram = getCollectionFromSource(blitzConfigFile) const cookieIdentifier = blitzConfigProgram.find( j.Identifier, @@ -434,9 +431,12 @@ const upgradeLegacy = async () => { blitzClientProgram.toSource(), ) } else { - throw new ExpectedError( - "Cookie Prefix is undefined & not a string. Please set your cookie prefix manually in app/blitz-client", - ) + // Show error at end of codemod + collectedErrors.push({ + message: + "Detected cookiePrefix is undefined. Please set your cookie prefix manually in app/blitz-client", + step: stepIndex, + }) } } else { log.error("Cookie Prefix not found in blitz config file") @@ -1110,7 +1110,7 @@ const upgradeLegacy = async () => { steps.push({ name: "check for usages of invokeWithMiddleware", - action: async () => { + action: async (stepIndex) => { let errors = 0 getAllFiles(appDir, [], [], [".ts", ".tsx", ".js", ".jsx"]).forEach((file) => { @@ -1132,58 +1132,21 @@ const upgradeLegacy = async () => { }) if (errors > 0) { - throw new ExpectedError( - "\n invokeWithMiddleware is not supported. \n Use invokeWithCtx instead: https://canary.blitzjs.com/docs/resolver-server-utilities#invoke-with-ctx \n Fix the files above, then run the codemod again.", - ) + collectedErrors.push({ + message: + "\n invokeWithMiddleware is not supported. \n Use invokeWithCtx instead: https://canary.blitzjs.com/docs/resolver-server-utilities#invoke-with-ctx \n Fix the files above, then run the codemod again.", + step: stepIndex, + }) + + // Write to the migration file so the user can run the migration again from this point + failedAt = stepIndex + 1 + fs.writeJsonSync(".migration.json", { + failedAt, + }) } }, }) - // steps.push({ - // name: "Update invokeMiddleware to invoke", - // action: async () => { - // getAllFiles(appDir, [], [], [".css"]).forEach((file) => { - // const program = getCollectionFromSource(file) - // const importSpecifier = findImportSpecifier(program, "invokeWithMiddleware") - // importSpecifier?.paths().forEach((path) => { - // path.get().value.imported.name = "invoke" - // }) - - // const invokeWithMiddlewarePath = findCallExpression(program, "invokeWithMiddleware") - // if (invokeWithMiddlewarePath?.length) { - // invokeWithMiddlewarePath?.paths().forEach((path) => { - // path.get().value.callee.name = "invoke" - // if (path.get().value.arguments.length === 3) { - // delete path.get().value.arguments[2] - // } - // }) - // } - - // fs.writeFileSync(path.resolve(file), program.toSource()) - // }) - - // getAllFiles(path.resolve("pages"), [], [], [".css"]).forEach((file) => { - // const program = getCollectionFromSource(file) - // const importSpecifier = findImportSpecifier(program, "invokeWithMiddleware") - // importSpecifier?.paths().forEach((path) => { - // path.get().value.imported.name = "invoke" - // }) - - // const invokeWithMiddlewarePath = findCallExpression(program, "invokeWithMiddleware") - // if (invokeWithMiddlewarePath?.length) { - // invokeWithMiddlewarePath?.paths().forEach((path) => { - // path.get().value.callee.name = "invoke" - // if (path.get().value.arguments.length === 3) { - // delete path.get().value.arguments[2] - // } - // }) - // } - - // fs.writeFileSync(path.resolve(file), program.toSource()) - // }) - // }, - // }) - // Loop through steps and run the action if ((failedAt && failedAt < steps.length) || failedAt !== "SUCCESS" || isLegacyBlitz) { for (let [index, step] of steps.entries()) { @@ -1193,8 +1156,15 @@ const upgradeLegacy = async () => { } const spinner = log.spinner(log.withBrand(`Running ${step.name}...`)).start() try { - await step.action() + await step.action(index) + if (collectedErrors.filter((e) => e.step === index).length) { + // Soft stored error + spinner.fail(`${step.name}`) + } else { + spinner.succeed(`Successfully ran ${step.name}`) + } } catch (err) { + // Hard exit error const error = err as {code: string} | string spinner.fail(`${step.name}`) log.error(error as string) @@ -1218,10 +1188,12 @@ const upgradeLegacy = async () => { }) process.exit(1) } - - spinner.succeed(`Successfully ran ${step.name}`) } - + if (collectedErrors.length) { + for (const error of collectedErrors) { + log.error(`⚠️ ${error.message}`) + } + } fs.writeJsonSync(".migration.json", { failedAt: "SUCCESS", }) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 509be34287..072aac9bcd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1075,6 +1075,7 @@ packages: source-map: 0.5.7 transitivePeerDependencies: - supports-color + dev: false /@babel/core/7.18.2: resolution: @@ -1166,7 +1167,7 @@ packages: "@babel/core": ^7.0.0 dependencies: "@babel/compat-data": 7.17.10 - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-validator-option": 7.16.7 browserslist: 4.20.3 semver: 6.3.0 @@ -1181,7 +1182,7 @@ packages: "@babel/core": ^7.0.0 dependencies: "@babel/compat-data": 7.17.10 - "@babel/core": 7.18.2_supports-color@8.1.1 + "@babel/core": 7.18.2 "@babel/helper-validator-option": 7.16.7 browserslist: 4.20.3 semver: 6.3.0 @@ -1341,7 +1342,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-annotate-as-pure": 7.16.7 regexpu-core: 5.0.1 @@ -1732,7 +1733,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 "@babel/plugin-syntax-dynamic-import": 7.8.3_@babel+core@7.12.10 @@ -1745,7 +1746,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 "@babel/plugin-syntax-export-namespace-from": 7.8.3_@babel+core@7.12.10 @@ -1758,7 +1759,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 "@babel/plugin-syntax-json-strings": 7.8.3_@babel+core@7.12.10 @@ -1771,7 +1772,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 "@babel/plugin-syntax-logical-assignment-operators": 7.10.4_@babel+core@7.12.10 @@ -1784,7 +1785,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 "@babel/plugin-syntax-nullish-coalescing-operator": 7.8.3_@babel+core@7.12.10 @@ -1797,7 +1798,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.18.2_supports-color@8.1.1 + "@babel/core": 7.18.2 "@babel/helper-plugin-utils": 7.17.12 "@babel/plugin-syntax-nullish-coalescing-operator": 7.8.3_@babel+core@7.18.2 dev: false @@ -1811,7 +1812,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 "@babel/plugin-syntax-numeric-separator": 7.10.4_@babel+core@7.12.10 @@ -1825,7 +1826,7 @@ packages: "@babel/core": ^7.0.0-0 dependencies: "@babel/compat-data": 7.17.10 - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-compilation-targets": 7.18.2_@babel+core@7.12.10 "@babel/helper-plugin-utils": 7.17.12 "@babel/plugin-syntax-object-rest-spread": 7.8.3_@babel+core@7.12.10 @@ -1840,7 +1841,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 "@babel/plugin-syntax-optional-catch-binding": 7.8.3_@babel+core@7.12.10 @@ -1853,7 +1854,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 "@babel/helper-skip-transparent-expression-wrappers": 7.16.0 "@babel/plugin-syntax-optional-chaining": 7.8.3_@babel+core@7.12.10 @@ -1867,7 +1868,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.18.2_supports-color@8.1.1 + "@babel/core": 7.18.2 "@babel/helper-plugin-utils": 7.17.12 "@babel/helper-skip-transparent-expression-wrappers": 7.16.0 "@babel/plugin-syntax-optional-chaining": 7.8.3_@babel+core@7.18.2 @@ -1913,7 +1914,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-create-regexp-features-plugin": 7.17.12_@babel+core@7.12.10 "@babel/helper-plugin-utils": 7.17.12 @@ -1925,7 +1926,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.18.2: @@ -1958,7 +1959,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-syntax-class-properties/7.12.13_@babel+core@7.18.2: @@ -1980,7 +1981,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-syntax-export-namespace-from/7.8.3_@babel+core@7.12.10: @@ -1991,7 +1992,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-syntax-flow/7.17.12_@babel+core@7.18.2: @@ -2003,7 +2004,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.18.2_supports-color@8.1.1 + "@babel/core": 7.18.2 "@babel/helper-plugin-utils": 7.17.12 dev: false @@ -2026,7 +2027,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-syntax-json-strings/7.8.3_@babel+core@7.18.2: @@ -2074,7 +2075,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.18.2: @@ -2096,7 +2097,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-syntax-nullish-coalescing-operator/7.8.3_@babel+core@7.18.2: @@ -2107,7 +2108,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.18.2_supports-color@8.1.1 + "@babel/core": 7.18.2 "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-syntax-numeric-separator/7.10.4_@babel+core@7.12.10: @@ -2118,7 +2119,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-syntax-numeric-separator/7.10.4_@babel+core@7.18.2: @@ -2140,7 +2141,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.18.2: @@ -2162,7 +2163,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-syntax-optional-catch-binding/7.8.3_@babel+core@7.18.2: @@ -2184,7 +2185,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-syntax-optional-chaining/7.8.3_@babel+core@7.18.2: @@ -2195,7 +2196,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.18.2_supports-color@8.1.1 + "@babel/core": 7.18.2 "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-syntax-top-level-await/7.14.5_@babel+core@7.12.10: @@ -2207,7 +2208,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-syntax-top-level-await/7.14.5_@babel+core@7.18.2: @@ -2244,7 +2245,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.18.2_supports-color@8.1.1 + "@babel/core": 7.18.2 "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-transform-arrow-functions/7.17.12_@babel+core@7.12.10: @@ -2256,7 +2257,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-transform-async-to-generator/7.17.12_@babel+core@7.12.10: @@ -2301,7 +2302,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-transform-block-scoping/7.18.4_@babel+core@7.12.10: @@ -2313,7 +2314,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-transform-classes/7.18.4_@babel+core@7.12.10: @@ -2368,7 +2369,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-transform-destructuring/7.18.0_@babel+core@7.12.10: @@ -2380,7 +2381,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-transform-dotall-regex/7.16.7_@babel+core@7.12.10: @@ -2392,7 +2393,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-create-regexp-features-plugin": 7.17.12_@babel+core@7.12.10 "@babel/helper-plugin-utils": 7.17.12 @@ -2405,7 +2406,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-transform-exponentiation-operator/7.16.7_@babel+core@7.12.10: @@ -2417,7 +2418,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-builder-binary-assignment-operator-visitor": 7.16.7 "@babel/helper-plugin-utils": 7.17.12 @@ -2430,7 +2431,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.18.2_supports-color@8.1.1 + "@babel/core": 7.18.2 "@babel/helper-plugin-utils": 7.17.12 "@babel/plugin-syntax-flow": 7.17.12_@babel+core@7.18.2 dev: false @@ -2444,7 +2445,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-transform-function-name/7.16.7_@babel+core@7.12.10: @@ -2456,7 +2457,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-compilation-targets": 7.18.2_@babel+core@7.12.10 "@babel/helper-function-name": 7.17.9 "@babel/helper-plugin-utils": 7.17.12 @@ -2470,7 +2471,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-transform-member-expression-literals/7.16.7_@babel+core@7.12.10: @@ -2482,7 +2483,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-transform-modules-amd/7.18.0_@babel+core@7.12.10: @@ -2666,7 +2667,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-create-regexp-features-plugin": 7.17.12_@babel+core@7.12.10 "@babel/helper-plugin-utils": 7.17.12 @@ -2679,7 +2680,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-transform-object-super/7.16.7_@babel+core@7.12.10: @@ -2722,7 +2723,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-transform-property-literals/7.16.7_@babel+core@7.12.10: @@ -2734,7 +2735,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-transform-react-jsx-development/7.16.7_@babel+core@7.18.2: @@ -2802,7 +2803,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 regenerator-transform: 0.15.0 @@ -2815,7 +2816,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-transform-shorthand-properties/7.16.7_@babel+core@7.12.10: @@ -2827,7 +2828,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-transform-spread/7.17.12_@babel+core@7.12.10: @@ -2839,7 +2840,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 "@babel/helper-skip-transparent-expression-wrappers": 7.16.0 @@ -2852,7 +2853,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-transform-template-literals/7.18.2_@babel+core@7.12.10: @@ -2864,7 +2865,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-transform-typeof-symbol/7.17.12_@babel+core@7.12.10: @@ -2876,7 +2877,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-transform-typescript/7.12.1_ps3yxa7qdojvlda5ukda3zlwie: @@ -2938,7 +2939,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 /@babel/plugin-transform-unicode-regex/7.16.7_@babel+core@7.12.10: @@ -2950,7 +2951,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-create-regexp-features-plugin": 7.17.12_@babel+core@7.12.10 "@babel/helper-plugin-utils": 7.17.12 @@ -3120,7 +3121,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.18.2_supports-color@8.1.1 + "@babel/core": 7.18.2 "@babel/helper-plugin-utils": 7.17.12 "@babel/helper-validator-option": 7.16.7 "@babel/plugin-transform-flow-strip-types": 7.17.12_@babel+core@7.18.2 @@ -3134,7 +3135,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.12.10_supports-color@8.1.1 + "@babel/core": 7.12.10 "@babel/helper-plugin-utils": 7.17.12 "@babel/plugin-proposal-unicode-property-regex": 7.17.12_@babel+core@7.12.10 "@babel/plugin-transform-dotall-regex": 7.16.7_@babel+core@7.12.10 @@ -3184,7 +3185,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.18.2_supports-color@8.1.1 + "@babel/core": 7.18.2 clone-deep: 4.0.1 find-cache-dir: 2.1.0 make-dir: 2.1.0 @@ -6433,7 +6434,7 @@ packages: peerDependencies: "@babel/core": ^7.0.0-0 dependencies: - "@babel/core": 7.18.2_supports-color@8.1.1 + "@babel/core": 7.18.2 dev: false /babel-jest/27.5.1_@babel+core@7.18.2: