diff --git a/packages/graphql-types-generator/package.json b/packages/graphql-types-generator/package.json index ec7ece23b..ad6887d73 100644 --- a/packages/graphql-types-generator/package.json +++ b/packages/graphql-types-generator/package.json @@ -27,18 +27,16 @@ }, "bin": "./lib/cli.js", "scripts": { - "clean": "rimraf lib", + "clean": "node -e \"require('fs-extra').removeSync('lib')\"", "build": "tsc", "watch": "tsc -w", "test": "jest", - "test:smoke": "npm install && npm run build && rimraf node_modules && npm install --prod && node ./lib/cli.js && echo 'Smoke Test Passed'", + "test:smoke": "npm install && npm run build && node -e \"require('fs-extra').removeSync('node_modules')\" && npm install --prod && node ./lib/cli.js && echo 'Smoke Test Passed'", "extract-api": "ts-node ../../scripts/extract-api.ts" }, "dependencies": { - "@babel/generator": "7.0.0-beta.4", - "@babel/types": "7.0.0-beta.4", - "babel-generator": "^6.26.1", - "babel-types": "^6.26.0", + "@babel/generator": "7.23.5", + "@babel/types": "7.23.5", "change-case": "^4.1.1", "common-tags": "^1.8.0", "core-js": "^3.6.4", @@ -47,18 +45,16 @@ "graphql": "^15.5.0", "inflected": "^2.0.4", "prettier": "^1.19.1", - "rimraf": "^3.0.0", "source-map-support": "^0.5.16", "yargs": "^15.1.0" }, "devDependencies": { - "@types/babel-generator": "^6.25.0", + "@types/babel__generator": "7.6.7", "@types/common-tags": "^1.8.0", "@types/fs-extra": "^8.1.0", "@types/inflected": "^1.1.29", "@types/node": "^10.17.13", "@types/prettier": "^1.19.0", - "@types/rimraf": "^3.0.0", "@types/yargs": "^15.0.1", "@types/zen-observable": "^0.8.4" }, diff --git a/packages/graphql-types-generator/src/flow-modern/__tests__/helpers.ts b/packages/graphql-types-generator/src/flow-modern/__tests__/helpers.ts index f524b9ba8..25c3a832a 100644 --- a/packages/graphql-types-generator/src/flow-modern/__tests__/helpers.ts +++ b/packages/graphql-types-generator/src/flow-modern/__tests__/helpers.ts @@ -9,7 +9,7 @@ import { GraphQLScalarType, } from 'graphql'; -import * as t from 'babel-types'; +import * as t from '@babel/types'; import { createTypeAnnotationFromGraphQLTypeFunction } from '../helpers'; diff --git a/packages/graphql-types-generator/src/flow-modern/codeGeneration.ts b/packages/graphql-types-generator/src/flow-modern/codeGeneration.ts index 3cabf0d53..52136a87c 100644 --- a/packages/graphql-types-generator/src/flow-modern/codeGeneration.ts +++ b/packages/graphql-types-generator/src/flow-modern/codeGeneration.ts @@ -154,17 +154,17 @@ export class FlowAPIGenerator extends FlowGenerator { if (variants.length === 1) { const properties = this.getPropertiesForVariant(variants[0]); - const name = this.annotationFromScopeStack(this.scopeStack).id.name; + const name = this.scopeName(this.scopeStack); const exportedTypeAlias = this.exportDeclaration(this.typeAliasObject(name, properties)); this.printer.enqueue(exportedTypeAlias); } else { - const unionMembers: t.FlowTypeAnnotation[] = []; + const unionMembers: t.FlowType[] = []; variants.forEach(variant => { this.scopeStackPush(variant.possibleTypes[0].toString()); const properties = this.getPropertiesForVariant(variant); - const name = this.annotationFromScopeStack(this.scopeStack).id.name; + const name = this.scopeName(this.scopeStack); const exportedTypeAlias = this.exportDeclaration(this.typeAliasObject(name, properties)); this.printer.enqueue(exportedTypeAlias); @@ -175,7 +175,7 @@ export class FlowAPIGenerator extends FlowGenerator { }); this.printer.enqueue( - this.exportDeclaration(this.typeAliasGenericUnion(this.annotationFromScopeStack(this.scopeStack).id.name, unionMembers)) + this.exportDeclaration(this.typeAliasGenericUnion(this.scopeName(this.scopeStack), unionMembers)) ); } @@ -199,14 +199,10 @@ export class FlowAPIGenerator extends FlowGenerator { let res; if (field.selectionSet) { - const genericAnnotation = this.annotationFromScopeStack(this.scopeStack); - if (field.type instanceof GraphQLNonNull) { - genericAnnotation.id.name = genericAnnotation.id.name; - } else { - genericAnnotation.id.name = '?' + genericAnnotation.id.name; - } - - res = this.handleFieldSelectionSetValue(genericAnnotation, field); + const annotationName = field.type instanceof GraphQLNonNull ? this.scopeName(this.scopeStack) : `?${this.scopeName(this.scopeStack)}`; + const genericAnnotation = this.annotationFromName(annotationName); + + res = this.handleFieldSelectionSetValue(annotationName, genericAnnotation, field); } else { res = this.handleFieldValue(field, variant); } @@ -216,7 +212,7 @@ export class FlowAPIGenerator extends FlowGenerator { }); } - private handleFieldSelectionSetValue(genericAnnotation: t.GenericTypeAnnotation, field: Field) { + private handleFieldSelectionSetValue(annotationName: string, genericAnnotation: t.GenericTypeAnnotation, field: Field) { const { selectionSet } = field; const typeCase = this.getTypeCasesForSelectionSet(selectionSet as SelectionSet); @@ -226,7 +222,7 @@ export class FlowAPIGenerator extends FlowGenerator { if (variants.length === 1) { const variant = variants[0]; const properties = this.getPropertiesForVariant(variant); - exportedTypeAlias = this.exportDeclaration(this.typeAliasObject(this.annotationFromScopeStack(this.scopeStack).id.name, properties)); + exportedTypeAlias = this.exportDeclaration(this.typeAliasObject(this.scopeName(this.scopeStack), properties)); } else { const propertySets = variants.map(variant => { this.scopeStackPush(variant.possibleTypes[0].toString()); @@ -235,7 +231,7 @@ export class FlowAPIGenerator extends FlowGenerator { return properties; }); - exportedTypeAlias = this.exportDeclaration(this.typeAliasObjectUnion(genericAnnotation.id.name, propertySets)); + exportedTypeAlias = this.exportDeclaration(this.typeAliasObjectUnion(annotationName, propertySets)); } this.printer.enqueue(exportedTypeAlias); @@ -251,9 +247,7 @@ export class FlowAPIGenerator extends FlowGenerator { let res; if (field.name === '__typename') { const annotations = variant.possibleTypes.map(type => { - const annotation = t.stringLiteralTypeAnnotation(); - annotation.value = type.toString(); - return annotation; + return t.stringLiteralTypeAnnotation(type.toString()); }); res = { diff --git a/packages/graphql-types-generator/src/flow-modern/helpers.ts b/packages/graphql-types-generator/src/flow-modern/helpers.ts index 12e5e8df0..f2d23162b 100644 --- a/packages/graphql-types-generator/src/flow-modern/helpers.ts +++ b/packages/graphql-types-generator/src/flow-modern/helpers.ts @@ -10,7 +10,7 @@ import { isListType, } from 'graphql'; -import * as t from 'babel-types'; +import * as t from '@babel/types'; import { CompilerOptions } from '../compiler'; @@ -28,7 +28,7 @@ export function createTypeAnnotationFromGraphQLTypeFunction(compilerOptions: Com { nullable }: { nullable: boolean } = { nullable: true, } - ): t.FlowTypeAnnotation { + ): t.FlowType { if (isNonNullType(type)) { return typeAnnotationFromGraphQLType(type.ofType, { nullable: false }); } diff --git a/packages/graphql-types-generator/src/flow-modern/language.ts b/packages/graphql-types-generator/src/flow-modern/language.ts index 1e031df29..bfc7ff01c 100644 --- a/packages/graphql-types-generator/src/flow-modern/language.ts +++ b/packages/graphql-types-generator/src/flow-modern/language.ts @@ -6,10 +6,15 @@ import { createTypeAnnotationFromGraphQLTypeFunction } from './helpers'; import * as t from '@babel/types'; +const commentLine = (value: string): t.CommentLine => ({ + type: 'CommentLine', + value, +}); + export type ObjectProperty = { name: string; description?: string | null | undefined; - annotation: t.FlowTypeAnnotation; + annotation: t.FlowType; }; export interface FlowCompilerOptions extends CompilerOptions { @@ -28,21 +33,15 @@ export class FlowGenerator { public enumerationDeclaration(type: GraphQLEnumType) { const { name, description } = type; - const unionValues = type.getValues().map(({ value }) => { - const type = t.stringLiteralTypeAnnotation(); - type.value = value; - - return type; - }); + const unionValues = type.getValues().map(({ value }) => + t.stringLiteralTypeAnnotation(value) + ); const typeAlias = t.exportNamedDeclaration(t.typeAlias(t.identifier(name), undefined, t.unionTypeAnnotation(unionValues)), []); - typeAlias.leadingComments = [ - { - type: 'CommentLine', - value: ` ${description}`, - } as t.CommentLine, - ]; + if (description) { + typeAlias.leadingComments = [commentLine(` ${description}`)]; + } return typeAlias; } @@ -61,12 +60,9 @@ export class FlowGenerator { const typeAlias = this.typeAliasObject(name, fields); - typeAlias.leadingComments = [ - { - type: 'CommentLine', - value: ` ${description}`, - } as t.CommentLine, - ]; + if (description) { + typeAlias.leadingComments = [commentLine(` ${description}`)]; + } return typeAlias; } @@ -74,10 +70,6 @@ export class FlowGenerator { public objectTypeAnnotation(fields: ObjectProperty[], isInputObject: boolean = false) { const objectTypeAnnotation = t.objectTypeAnnotation( fields.map(({ name, description, annotation }) => { - if (annotation.type === 'NullableTypeAnnotation') { - t.identifier(name + '?'); - } - const objectTypeProperty = t.objectTypeProperty( t.identifier( // Nullable fields on input objects do not have to be defined @@ -88,12 +80,7 @@ export class FlowGenerator { ); if (description) { - objectTypeProperty.trailingComments = [ - { - type: 'CommentLine', - value: ` ${description}`, - } as t.CommentLine, - ]; + objectTypeProperty.trailingComments = [commentLine(` ${description}`)]; } return objectTypeProperty; @@ -123,7 +110,7 @@ export class FlowGenerator { ); } - public typeAliasGenericUnion(name: string, members: t.FlowTypeAnnotation[]) { + public typeAliasGenericUnion(name: string, members: t.FlowType[]) { return t.typeAlias(t.identifier(name), undefined, t.unionTypeAnnotation(members)); } @@ -131,7 +118,15 @@ export class FlowGenerator { return t.exportNamedDeclaration(declaration, []); } - public annotationFromScopeStack(scope: string[]) { - return t.genericTypeAnnotation(t.identifier(scope.join('_'))); + public scopeName(scope: string[]): string { + return scope.join('_'); + } + + public annotationFromName(name: string): t.GenericTypeAnnotation { + return t.genericTypeAnnotation(t.identifier(name)); + } + + public annotationFromScopeStack(scope: string[]): t.GenericTypeAnnotation { + return this.annotationFromName(this.scopeName(scope)); } } diff --git a/packages/graphql-types-generator/src/flow-modern/types/augment-babel-types.ts b/packages/graphql-types-generator/src/flow-modern/types/augment-babel-types.ts deleted file mode 100644 index 6538cf8df..000000000 --- a/packages/graphql-types-generator/src/flow-modern/types/augment-babel-types.ts +++ /dev/null @@ -1,14 +0,0 @@ -/** - * Augment incomplete definitions in `@types/babel-types` - */ -import 'babel-types'; - -declare module 'babel-types' { - interface StringLiteralTypeAnnotation { - value: string; - } - - interface ObjectTypeAnnotation { - exact: boolean; - } -} diff --git a/packages/graphql-types-generator/src/flow-modern/types/babel7.ts b/packages/graphql-types-generator/src/flow-modern/types/babel7.ts deleted file mode 100644 index 7ebdde2b9..000000000 --- a/packages/graphql-types-generator/src/flow-modern/types/babel7.ts +++ /dev/null @@ -1,12 +0,0 @@ -// Suppress missing types for @babel/types and @babel/generator by -// creating an alias for them to babel-types and babel-generator respectively. - -declare module '@babel/types' { - export * from 'babel-types'; -} -declare module '@babel/generator' { - export * from 'babel-generator'; - - import Generator from 'babel-generator'; - export default Generator; -} diff --git a/packages/graphql-types-generator/src/generate.ts b/packages/graphql-types-generator/src/generate.ts index e05de2f69..7e9f156c2 100644 --- a/packages/graphql-types-generator/src/generate.ts +++ b/packages/graphql-types-generator/src/generate.ts @@ -1,7 +1,6 @@ import { GraphQLSchema, DocumentNode, Source } from 'graphql'; import * as fs from 'fs-extra'; import * as path from 'path'; -import * as rimraf from 'rimraf'; import { loadSchema, loadAndMergeQueryDocuments, parseSchema, parseAndMergeQueryDocuments } from './loading'; import { validateQueryDocument } from './validation'; @@ -178,9 +177,9 @@ function generateTypesFlowModern(schema: GraphQLSchema, document: DocumentNode, function writeGeneratedFiles(generatedFiles: BasicGeneratedFileMap, outputDirectory: string) { // Clear all generated stuff to make sure there isn't anything // unnecessary lying around. - rimraf.sync(outputDirectory); + fs.removeSync(outputDirectory); // Remake the output directory - fs.mkdirSync(outputDirectory); + fs.ensureDirSync(outputDirectory); for (const [fileName, generatedFile] of Object.entries(generatedFiles)) { fs.writeFileSync(path.join(outputDirectory, fileName), generatedFile.output); diff --git a/yarn.lock b/yarn.lock index 64e0f8cef..5f2442106 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5616,18 +5616,7 @@ json5 "^2.2.3" semver "^6.3.1" -"@babel/generator@7.0.0-beta.4": - version "7.0.0-beta.4" - resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.0.0-beta.4.tgz#99606c425fc6614e6386f9330efb48370f200fc3" - integrity sha512-aLpZzf79oGT1bxnsadapfUWErDTcxVKrhvR5F8G27JFgH37+/ATrODMJ0/1D2CgQ/WStDX5B5znnWRv0NzW2JQ== - dependencies: - "@babel/types" "7.0.0-beta.4" - jsesc "^2.5.1" - lodash "^4.2.0" - source-map "^0.5.0" - trim-right "^1.0.1" - -"@babel/generator@^7.14.0", "@babel/generator@^7.23.5", "@babel/generator@^7.7.2": +"@babel/generator@7.23.5", "@babel/generator@^7.14.0", "@babel/generator@^7.23.5", "@babel/generator@^7.7.2": version "7.23.5" resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.23.5.tgz#17d0a1ea6b62f351d281350a5f80b87a810c4755" integrity sha512-BPssCHrBD+0YrxviOa3QzpqwhNIXKEtOa2jQrm4FlmkC2apYgRnQcmPWiGZDlGxiNtltnUFolMe8497Esry+jA== @@ -6126,16 +6115,7 @@ debug "^4.1.0" globals "^11.1.0" -"@babel/types@7.0.0-beta.4": - version "7.0.0-beta.4" - resolved "https://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.4.tgz#988cc7683c448d7710e7d80bd88558183a102349" - integrity sha512-yLvBW5TTAgJwURAUAdZa1vrFTkwXXvk0Kw48LYvgxpyT/IaV8W4OIhxdVztAt5ruDQ/OFUwHpzWqk6TN3EfmWA== - dependencies: - esutils "^2.0.2" - lodash "^4.2.0" - to-fast-properties "^2.0.0" - -"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.4", "@babel/types@^7.23.5", "@babel/types@^7.3.3": +"@babel/types@7.23.5", "@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.4", "@babel/types@^7.23.5", "@babel/types@^7.3.3": version "7.23.5" resolved "https://registry.npmjs.org/@babel/types/-/types-7.23.5.tgz#48d730a00c95109fa4393352705954d74fb5b602" integrity sha512-ON5kSOJwVO6xXVRTvOI0eOnWe7VdUcIpsovGo9U/Br4Ie4UVFQTboO2cYnDhAGU6Fp+UxSiT+pMft0SMHfuq6w== @@ -9608,18 +9588,6 @@ resolved "https://registry.npmjs.org/@types/aws-lambda/-/aws-lambda-8.10.137.tgz#c9998a944541afdd6df0d159e9ec9c23dfe5fb40" integrity sha512-YNFwzVarXAOXkjuFxONyDw1vgRNzyH8AuyN19s0bM+ChSu/bzxb5XPxYFLXoqoM+tvgzwR3k7fXcEOW125yJxg== -"@types/babel-generator@^6.25.0": - version "6.25.8" - resolved "https://registry.npmjs.org/@types/babel-generator/-/babel-generator-6.25.8.tgz#44b37bcbcd4b1e24c4e5975fa6d7b72b8c9a456b" - integrity sha512-f5l89J0UpYhTE6TFCxy3X+8pJVru1eig1fcvF9qHmOk9h1VxZimd+++tu5GShntCOdhE/MoZZ0SlpGTyh4XrKg== - dependencies: - "@types/babel-types" "*" - -"@types/babel-types@*": - version "7.0.15" - resolved "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.15.tgz#11fb1ab5a4f984d00d1c80a768f6fb8d59f96966" - integrity sha512-JUgfZHUOMbtjopxiOQaaF+Uovk5wpDqpXR+XLWiOivCWSy1FccO30lvNNpCt8geFwq8VmGT2y9OMkOpA0g5O5g== - "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14": version "7.20.5" resolved "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz#3df15f27ba85319caa07ba08d0721889bb39c017" @@ -9631,7 +9599,7 @@ "@types/babel__template" "*" "@types/babel__traverse" "*" -"@types/babel__generator@*": +"@types/babel__generator@*", "@types/babel__generator@7.6.7": version "7.6.7" resolved "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.7.tgz#a7aebf15c7bc0eb9abd638bdb5c0b8700399c9d0" integrity sha512-6Sfsq+EaaLrw4RmdFWE9Onp63TOUue71AWb4Gpa6JxzgTYtimbM086WnYTy2U67AofR++QKCo08ZP6pwx8YFHQ== @@ -9677,14 +9645,6 @@ dependencies: "@types/node" "*" -"@types/glob@*": - version "8.1.0" - resolved "https://registry.npmjs.org/@types/glob/-/glob-8.1.0.tgz#b63e70155391b0584dce44e7ea25190bbc38f2fc" - integrity sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w== - dependencies: - "@types/minimatch" "^5.1.2" - "@types/node" "*" - "@types/glob@^7.2.0": version "7.2.0" resolved "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb" @@ -9752,7 +9712,7 @@ resolved "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ== -"@types/minimatch@*", "@types/minimatch@^5.1.2": +"@types/minimatch@*": version "5.1.2" resolved "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca" integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA== @@ -9834,14 +9794,6 @@ resolved "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.3.tgz#3e51a17e291d01d17d3fc61422015a933af7a08f" integrity sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA== -"@types/rimraf@^3.0.0": - version "3.0.2" - resolved "https://registry.npmjs.org/@types/rimraf/-/rimraf-3.0.2.tgz#a63d175b331748e5220ad48c901d7bbf1f44eef8" - integrity sha512-F3OznnSLAUxFrCEu/L5PY8+ny8DtcFRjx7fZZ9bycvXRi3KPTRS9HOitGZwvPg0juRhXFWIeKX58cnX5YqLohQ== - dependencies: - "@types/glob" "*" - "@types/node" "*" - "@types/semver@^7.3.12": version "7.5.6" resolved "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz#c65b2bfce1bec346582c07724e3f8c1017a20339" @@ -10660,20 +10612,6 @@ axobject-query@^3.2.1: dependencies: dequal "^2.0.3" -babel-generator@^6.26.1: - version "6.26.1" - resolved "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90" - integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA== - dependencies: - babel-messages "^6.23.0" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - detect-indent "^4.0.0" - jsesc "^1.3.0" - lodash "^4.17.4" - source-map "^0.5.7" - trim-right "^1.0.1" - babel-jest@^27.5.1: version "27.5.1" resolved "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz#a1bf8d61928edfefd21da27eb86a695bfd691444" @@ -10688,13 +10626,6 @@ babel-jest@^27.5.1: graceful-fs "^4.2.9" slash "^3.0.0" -babel-messages@^6.23.0: - version "6.23.0" - resolved "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" - integrity sha512-Bl3ZiA+LjqaMtNYopA9TYE9HP1tQ+E5dLxE0XrAzcIJeK2UqF0/EaqXwBn9esd4UmTfEab+P+UYQ1GnioFIb/w== - dependencies: - babel-runtime "^6.22.0" - babel-plugin-istanbul@^6.1.1: version "6.1.1" resolved "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73" @@ -10780,24 +10711,6 @@ babel-preset-jest@^27.5.1: babel-plugin-jest-hoist "^27.5.1" babel-preset-current-node-syntax "^1.0.0" -babel-runtime@^6.22.0, babel-runtime@^6.26.0: - version "6.26.0" - resolved "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" - integrity sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g== - dependencies: - core-js "^2.4.0" - regenerator-runtime "^0.11.0" - -babel-types@^6.26.0: - version "6.26.0" - resolved "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" - integrity sha512-zhe3V/26rCWsEZK8kZN+HaQj5yQ1CilTObixFzKW1UWjqG7618Twz6YEsCnjfg5gBcJh02DrpCkS9h98ZqDY+g== - dependencies: - babel-runtime "^6.26.0" - esutils "^2.0.2" - lodash "^4.17.4" - to-fast-properties "^1.0.3" - balanced-match@^1.0.0: version "1.0.2" resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" @@ -11622,11 +11535,6 @@ copyfiles@^2.2.0: untildify "^4.0.0" yargs "^16.1.0" -core-js@^2.4.0: - version "2.6.12" - resolved "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" - integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== - core-js@^3.6.4: version "3.33.0" resolved "https://registry.npmjs.org/core-js/-/core-js-3.33.0.tgz#70366dbf737134761edb017990cf5ce6c6369c40" @@ -11902,13 +11810,6 @@ detect-indent@6.1.0, detect-indent@^6.0.0: resolved "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6" integrity sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA== -detect-indent@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208" - integrity sha512-BDKtmHlOzwI7iRuEkhzsnPoi5ypEhWAJB5RvHWe1kMr06js3uK5B3734i3ui5Yd+wOJV1cpE4JnivPD283GU/A== - dependencies: - repeating "^2.0.0" - detect-indent@^5.0.0: version "5.0.0" resolved "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d" @@ -13931,11 +13832,6 @@ is-finalizationregistry@^1.0.2: dependencies: call-bind "^1.0.2" -is-finite@^1.0.0: - version "1.1.0" - resolved "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3" - integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w== - is-fullwidth-code-point@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" @@ -14792,11 +14688,6 @@ jsdom@^16.6.0: ws "^7.4.6" xml-name-validator "^3.0.0" -jsesc@^1.3.0: - version "1.3.0" - resolved "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" - integrity sha512-Mke0DA0QjUWuJlhsE0ZPPhYiJkRap642SmI/4ztCFaUs6V2AiH1sfecc+57NgaryfAA2VR3v6O+CSjC1jZJKOA== - jsesc@^2.5.1: version "2.5.2" resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" @@ -15159,7 +15050,7 @@ lodash.upperfirst@^4.3.1: resolved "https://registry.npmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce" integrity sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg== -lodash@4.17.21, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.7.0, lodash@~4.17.0, lodash@~4.17.15: +lodash@4.17.21, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.7.0, lodash@~4.17.0, lodash@~4.17.15: version "4.17.23" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.23.tgz#f113b0378386103be4f6893388c73d0bde7f2c5a" integrity sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w== @@ -16826,11 +16717,6 @@ reflect.getprototypeof@^1.0.4: globalthis "^1.0.3" which-builtin-type "^1.1.3" -regenerator-runtime@^0.11.0: - version "0.11.1" - resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" - integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== - regenerator-runtime@^0.14.0: version "0.14.0" resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz#5e19d68eb12d486f797e15a3c6a918f7cec5eb45" @@ -16859,13 +16745,6 @@ relay-runtime@12.0.0: fbjs "^3.0.0" invariant "^2.2.4" -repeating@^2.0.0: - version "2.0.1" - resolved "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" - integrity sha512-ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A== - dependencies: - is-finite "^1.0.0" - require-directory@^2.1.1: version "2.1.1" resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" @@ -17308,11 +17187,6 @@ source-map-support@^0.5.16, source-map-support@^0.5.17, source-map-support@^0.5. buffer-from "^1.0.0" source-map "^0.6.0" -source-map@^0.5.0, source-map@^0.5.7: - version "0.5.7" - resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== - source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: version "0.6.1" resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" @@ -17757,11 +17631,6 @@ tmpl@1.0.5: resolved "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw== -to-fast-properties@^1.0.3: - version "1.0.3" - resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" - integrity sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og== - to-fast-properties@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" @@ -17806,11 +17675,6 @@ trim-newlines@^3.0.0: resolved "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144" integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw== -trim-right@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" - integrity sha512-WZGXGstmCWgeevgTL54hrCuw1dyMQIzWy7ZfqRJfSmJZBwklI15egmQytFP6bPidmw3M8d5yEowl1niq4vmqZw== - triple-beam@^1.3.0: version "1.4.1" resolved "https://registry.npmjs.org/triple-beam/-/triple-beam-1.4.1.tgz#6fde70271dc6e5d73ca0c3b24e2d92afb7441984"