From 4e5634b86a26819cecec5b10c18f9d231b5434e2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 16 Jun 2021 13:21:33 +1000 Subject: [PATCH] Update dependency typescript to ^4.3.2 (#5848) * Update dependency typescript to ^4.3.2 * Fix some things * Fix things Co-authored-by: Renovate Bot Co-authored-by: mitchellhamilton --- .changeset/ninety-gifts-impress.md | 7 +++++++ design-system/packages/fields/src/Select.tsx | 15 ++++----------- design-system/packages/options/src/index.tsx | 19 +++++++------------ design-system/website/package.json | 2 +- docs/package.json | 2 +- examples-staging/assets-cloud/package.json | 2 +- examples-staging/assets-local/package.json | 2 +- examples-staging/auth/package.json | 2 +- examples-staging/basic/package.json | 2 +- examples-staging/ecommerce/package.json | 2 +- examples-staging/embedded-nextjs/package.json | 2 +- examples-staging/roles/package.json | 2 +- examples/blog/package.json | 2 +- examples/default-values/package.json | 2 +- examples/extend-graphql-schema/package.json | 2 +- examples/json/package.json | 2 +- examples/task-manager/package.json | 2 +- examples/virtual-field/package.json | 2 +- examples/with-auth/package.json | 2 +- package.json | 2 +- packages-next/keystone/package.json | 2 +- .../src/admin-ui/system/getAdminMetaSchema.ts | 8 +++----- packages-next/keystone/src/session/index.ts | 8 +++----- yarn.lock | 8 ++++---- 24 files changed, 46 insertions(+), 55 deletions(-) create mode 100644 .changeset/ninety-gifts-impress.md diff --git a/.changeset/ninety-gifts-impress.md b/.changeset/ninety-gifts-impress.md new file mode 100644 index 00000000000..ca2747222e0 --- /dev/null +++ b/.changeset/ninety-gifts-impress.md @@ -0,0 +1,7 @@ +--- +'@keystone-ui/fields': patch +'@keystone-ui/options': patch +'@keystone-next/keystone': patch +--- + +Updated TypeScript to 4.3.2 diff --git a/design-system/packages/fields/src/Select.tsx b/design-system/packages/fields/src/Select.tsx index 352f48f5571..c476db54520 100644 --- a/design-system/packages/fields/src/Select.tsx +++ b/design-system/packages/fields/src/Select.tsx @@ -1,21 +1,14 @@ /** @jsx jsx */ import { jsx, useTheme } from '@keystone-ui/core'; -import ReactSelect, { Props, OptionsType, mergeStyles } from 'react-select'; +import ReactSelect, { OptionsType, mergeStyles, NamedProps } from 'react-select'; import { useInputTokens } from './hooks/inputs'; import { WidthType } from './types'; -type KnownKeys = { - [K in keyof T]: string extends K ? never : number extends K ? never : K; -} extends { [_ in keyof T]: infer U } - ? U - : never; - type Option = { label: string; value: string; isDisabled?: boolean }; -// this removes [key: string]: any from Props -type BaseSelectProps = Pick< - Props, - Exclude, 'value' | 'onChange' | 'isMulti' | 'isOptionDisabled'> +type BaseSelectProps = Omit< + NamedProps, + 'value' | 'onChange' | 'isMulti' | 'isOptionDisabled' > & { width?: WidthType }; export { components as selectComponents } from 'react-select'; diff --git a/design-system/packages/options/src/index.tsx b/design-system/packages/options/src/index.tsx index c4454d09604..ea5bb4accc9 100644 --- a/design-system/packages/options/src/index.tsx +++ b/design-system/packages/options/src/index.tsx @@ -3,7 +3,12 @@ import { jsx, useTheme } from '@keystone-ui/core'; import { useIndicatorTokens } from '@keystone-ui/fields'; import { CheckIcon } from '@keystone-ui/icons/icons/CheckIcon'; import { useMemo } from 'react'; -import ReactSelect, { OptionProps, components as reactSelectComponents, Props } from 'react-select'; +import ReactSelect, { + OptionProps, + components as reactSelectComponents, + Props, + NamedProps, +} from 'react-select'; export const CheckMark = ({ isDisabled, @@ -143,17 +148,7 @@ const defaultComponents = { IndicatorSeparator: null, }; -type KnownKeys = { - [K in keyof T]: string extends K ? never : number extends K ? never : K; -} extends { [_ in keyof T]: infer U } - ? U - : never; - -// this removes [key: string]: any from Props -type OptionsProps = Pick< - Props<{ label: string; value: string; isDisabled?: boolean }, boolean>, - KnownKeys ->; +type OptionsProps = NamedProps<{ label: string; value: string; isDisabled?: boolean }, boolean>; export const Options = ({ components: propComponents, ...props }: OptionsProps) => { const components = useMemo( diff --git a/design-system/website/package.json b/design-system/website/package.json index 9e8d0884680..b3642417370 100644 --- a/design-system/website/package.json +++ b/design-system/website/package.json @@ -31,7 +31,7 @@ "tinycolor2": "^1.4.2" }, "devDependencies": { - "typescript": "^4.2.4" + "typescript": "^4.3.2" }, "engines": { "node": "^12.20 || >= 14.13" diff --git a/docs/package.json b/docs/package.json index 72505c03550..587083d8b3c 100644 --- a/docs/package.json +++ b/docs/package.json @@ -46,7 +46,7 @@ }, "devDependencies": { "start-server-and-test": "^1.12.5", - "typescript": "^4.2.4" + "typescript": "^4.3.2" }, "engines": { "node": "^12.20 || >= 14.13" diff --git a/examples-staging/assets-cloud/package.json b/examples-staging/assets-cloud/package.json index 4981c05fb3b..bed0c778a92 100644 --- a/examples-staging/assets-cloud/package.json +++ b/examples-staging/assets-cloud/package.json @@ -14,7 +14,7 @@ "dotenv": "^10.0.0" }, "devDependencies": { - "typescript": "^4.2.4" + "typescript": "^4.3.2" }, "engines": { "node": "^12.20 || >= 14.13" diff --git a/examples-staging/assets-local/package.json b/examples-staging/assets-local/package.json index b721f51553f..472eb5643c0 100644 --- a/examples-staging/assets-local/package.json +++ b/examples-staging/assets-local/package.json @@ -13,7 +13,7 @@ "@keystone-next/keystone": "^20.0.0" }, "devDependencies": { - "typescript": "^4.2.4" + "typescript": "^4.3.2" }, "engines": { "node": "^12.20 || >= 14.13" diff --git a/examples-staging/auth/package.json b/examples-staging/auth/package.json index 6ff19a2e845..c1af2605060 100644 --- a/examples-staging/auth/package.json +++ b/examples-staging/auth/package.json @@ -17,7 +17,7 @@ "react-dom": "^17.0.2" }, "devDependencies": { - "typescript": "^4.2.4" + "typescript": "^4.3.2" }, "engines": { "node": "^12.20 || >= 14.13" diff --git a/examples-staging/basic/package.json b/examples-staging/basic/package.json index 570aa90064b..7f57aa15264 100644 --- a/examples-staging/basic/package.json +++ b/examples-staging/basic/package.json @@ -31,7 +31,7 @@ "react-dom": "^17.0.2" }, "devDependencies": { - "typescript": "^4.2.4" + "typescript": "^4.3.2" }, "engines": { "node": "^12.20 || >= 14.13" diff --git a/examples-staging/ecommerce/package.json b/examples-staging/ecommerce/package.json index 09db74f785b..85d1fa4b70a 100644 --- a/examples-staging/ecommerce/package.json +++ b/examples-staging/ecommerce/package.json @@ -31,7 +31,7 @@ }, "devDependencies": { "@keystone-next/test-utils-legacy": "^21.0.0", - "typescript": "^4.2.4" + "typescript": "^4.3.2" }, "engines": { "node": "^12.20 || >= 14.13" diff --git a/examples-staging/embedded-nextjs/package.json b/examples-staging/embedded-nextjs/package.json index b9189444c43..5634ef28b33 100644 --- a/examples-staging/embedded-nextjs/package.json +++ b/examples-staging/embedded-nextjs/package.json @@ -17,7 +17,7 @@ "react-dom": "^17.0.2" }, "devDependencies": { - "typescript": "^4.2.4" + "typescript": "^4.3.2" }, "engines": { "node": "^12.20 || >= 14.13" diff --git a/examples-staging/roles/package.json b/examples-staging/roles/package.json index 713fcdd284b..72fdf2fd2b5 100644 --- a/examples-staging/roles/package.json +++ b/examples-staging/roles/package.json @@ -18,7 +18,7 @@ "react-dom": "^17.0.2" }, "devDependencies": { - "typescript": "^4.2.4" + "typescript": "^4.3.2" }, "engines": { "node": "^12.20 || >= 14.13" diff --git a/examples/blog/package.json b/examples/blog/package.json index 0109470be11..d4905c24d85 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -13,7 +13,7 @@ "@keystone-next/keystone": "^20.0.0" }, "devDependencies": { - "typescript": "^4.2.4" + "typescript": "^4.3.2" }, "engines": { "node": "^12.20 || >= 14.13" diff --git a/examples/default-values/package.json b/examples/default-values/package.json index 65830b27556..57a52edeab0 100644 --- a/examples/default-values/package.json +++ b/examples/default-values/package.json @@ -13,7 +13,7 @@ "@keystone-next/keystone": "^20.0.0" }, "devDependencies": { - "typescript": "^4.2.4" + "typescript": "^4.3.2" }, "engines": { "node": "^12.20 || >= 14.13" diff --git a/examples/extend-graphql-schema/package.json b/examples/extend-graphql-schema/package.json index a616805af91..68c224be275 100644 --- a/examples/extend-graphql-schema/package.json +++ b/examples/extend-graphql-schema/package.json @@ -13,7 +13,7 @@ "@keystone-next/keystone": "^20.0.0" }, "devDependencies": { - "typescript": "^4.2.4" + "typescript": "^4.3.2" }, "engines": { "node": "^12.20 || >= 14.13" diff --git a/examples/json/package.json b/examples/json/package.json index a59e4943794..410c5ad7f10 100644 --- a/examples/json/package.json +++ b/examples/json/package.json @@ -13,7 +13,7 @@ "@keystone-next/keystone": "^20.0.0" }, "devDependencies": { - "typescript": "^4.2.4" + "typescript": "^4.3.2" }, "engines": { "node": "^12.20 || >= 14.13" diff --git a/examples/task-manager/package.json b/examples/task-manager/package.json index a0a3c5608ad..f839538c320 100644 --- a/examples/task-manager/package.json +++ b/examples/task-manager/package.json @@ -13,7 +13,7 @@ "@keystone-next/keystone": "^20.0.0" }, "devDependencies": { - "typescript": "^4.2.4" + "typescript": "^4.3.2" }, "engines": { "node": "^12.20 || >= 14.13" diff --git a/examples/virtual-field/package.json b/examples/virtual-field/package.json index 9eeea434055..7542e338b2e 100644 --- a/examples/virtual-field/package.json +++ b/examples/virtual-field/package.json @@ -14,7 +14,7 @@ "@keystone-next/types": "^20.0.0" }, "devDependencies": { - "typescript": "^4.2.4" + "typescript": "^4.3.2" }, "engines": { "node": "^12.20 || >= 14.13" diff --git a/examples/with-auth/package.json b/examples/with-auth/package.json index 33b2e6068df..d3dae39daf7 100644 --- a/examples/with-auth/package.json +++ b/examples/with-auth/package.json @@ -14,7 +14,7 @@ "@keystone-next/keystone": "^20.0.0" }, "devDependencies": { - "typescript": "^4.2.4" + "typescript": "^4.3.2" }, "engines": { "node": "^12.20 || >= 14.13" diff --git a/package.json b/package.json index 0b98500332a..0d4b02b9ea0 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "remark-toc": "^5.1.1", "rimraf": "^3.0.2", "terminal-link-cli": "^3.0.0", - "typescript": "^4.2.4" + "typescript": "^4.3.2" }, "prettier": { "proseWrap": "preserve", diff --git a/packages-next/keystone/package.json b/packages-next/keystone/package.json index 34d681689b2..c28de91826d 100644 --- a/packages-next/keystone/package.json +++ b/packages-next/keystone/package.json @@ -103,7 +103,7 @@ "serialize-error": "^8.1.0", "source-map-support": "^0.5.19", "stack-utils": "^2.0.3", - "typescript": "^4.2.4", + "typescript": "^4.3.2", "uid-safe": "^2.1.5", "uuid": "^8.3.2" }, diff --git a/packages-next/keystone/src/admin-ui/system/getAdminMetaSchema.ts b/packages-next/keystone/src/admin-ui/system/getAdminMetaSchema.ts index 3773efcbbac..58c367c04dc 100644 --- a/packages-next/keystone/src/admin-ui/system/getAdminMetaSchema.ts +++ b/packages-next/keystone/src/admin-ui/system/getAdminMetaSchema.ts @@ -289,17 +289,15 @@ export function getAdminMetaSchema({ types: schemaConfig.types.filter(x => x.name !== 'Query'), query: new GraphQLObjectType({ ...queryTypeConfig, - fields: () => ({ - ...(typeof queryTypeConfig.fields === 'function' - ? queryTypeConfig.fields() - : queryTypeConfig.fields), + fields: { + ...queryTypeConfig.fields, keystone: { type: KeystoneMeta.graphQLType, resolve() { return {}; }, }, - }), + }, }), }); } diff --git a/packages-next/keystone/src/session/index.ts b/packages-next/keystone/src/session/index.ts index f5527fbd1f5..3f16ecd60f2 100644 --- a/packages-next/keystone/src/session/index.ts +++ b/packages-next/keystone/src/session/index.ts @@ -203,15 +203,13 @@ export function sessionSchema(graphQLSchema: GraphQLSchema) { }); const mutationType = new GraphQLObjectType({ ...mutationTypeConfig, - fields: () => ({ - ...(typeof mutationTypeConfig.fields === 'function' - ? mutationTypeConfig.fields() - : mutationTypeConfig.fields), + fields: { + ...mutationTypeConfig.fields, endSession: { ...endSessionField, type: endSessionField.type.graphQLType, }, - }), + }, }); return new GraphQLSchema({ ...schemaConfig, diff --git a/yarn.lock b/yarn.lock index 24b2fdfe215..263dc89ba83 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12853,10 +12853,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@^4.2.4: - version "4.2.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961" - integrity sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg== +typescript@^4.3.2: + version "4.3.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.2.tgz#399ab18aac45802d6f2498de5054fcbbe716a805" + integrity sha512-zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw== uid-safe@^2.1.5: version "2.1.5"