From 9eade9ec1287dbb51a54c664234c2a51fcef1b32 Mon Sep 17 00:00:00 2001 From: Justin Shih Date: Thu, 21 Sep 2023 17:08:33 -0700 Subject: [PATCH] fix: remove async map generic dataschema --- .../src/commands/generateComponents.ts | 2 +- .../commands/utils/syncAmplifyUiBuilderComponents.ts | 2 +- yarn.lock | 12 +----------- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/packages/amplify-util-uibuilder/src/commands/generateComponents.ts b/packages/amplify-util-uibuilder/src/commands/generateComponents.ts index 54092777601..387959db636 100644 --- a/packages/amplify-util-uibuilder/src/commands/generateComponents.ts +++ b/packages/amplify-util-uibuilder/src/commands/generateComponents.ts @@ -35,7 +35,7 @@ export const run = async (context: $TSContext, eventType: 'PostPush' | 'PostPull studioClient.isGraphQLSupported ? getAmplifyDataSchema(context) : Promise.resolve(undefined), ]); const genericDataSchema = dataSchema ? mapGenericDataSchemaToCodegen(dataSchema) : undefined; - + const canGenerateDataComponents = genericDataSchema && studioClient.isGraphQLSupported; const apiConfiguration: AmplifyUIBuilder.ApiConfiguration = canGenerateDataComponents diff --git a/packages/amplify-util-uibuilder/src/commands/utils/syncAmplifyUiBuilderComponents.ts b/packages/amplify-util-uibuilder/src/commands/utils/syncAmplifyUiBuilderComponents.ts index d34bf13d907..eeaeb408ed3 100644 --- a/packages/amplify-util-uibuilder/src/commands/utils/syncAmplifyUiBuilderComponents.ts +++ b/packages/amplify-util-uibuilder/src/commands/utils/syncAmplifyUiBuilderComponents.ts @@ -87,7 +87,7 @@ const mapDataFieldsToCodegen = (fields: { [fieldName: string]: GenericDataField return codegenFields; }; -export const mapGenericDataSchemaToCodegen = async (genericDataSchema: GenericDataSchema): CodegenJobGenericDataSchema | undefined => { +export const mapGenericDataSchemaToCodegen = (genericDataSchema: GenericDataSchema): CodegenJobGenericDataSchema => { const { models, nonModels, enums, dataSourceType } = genericDataSchema; const codegenModels: { [key: string]: CodegenGenericDataModel } = {}; const codegenNonModels: { [key: string]: CodegenGenericDataNonModel } = {}; diff --git a/yarn.lock b/yarn.lock index d49eead2020..4e674d70081 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12857,7 +12857,7 @@ __metadata: languageName: node linkType: hard -"@types/node-fetch@npm:2.6.4": +"@types/node-fetch@npm:2.6.4, @types/node-fetch@npm:^2.6.1": version: 2.6.4 resolution: "@types/node-fetch@npm:2.6.4" dependencies: @@ -12867,16 +12867,6 @@ __metadata: languageName: node linkType: hard -"@types/node-fetch@npm:^2.6.1": - version: 2.6.1 - resolution: "@types/node-fetch@npm:2.6.1" - dependencies: - "@types/node": "*" - form-data: ^3.0.0 - checksum: e43e4670ed8b7693dbf660ac1450b14fcfcdd8efca1eb0f501b6ad95af2d1fa06f8541db03e9511e82a5fee510a238fe0913330c9a58f8ac6892b985f6dd993e - languageName: node - linkType: hard - "@types/node@npm:*, @types/node@npm:^18.16.1": version: 18.16.1 resolution: "@types/node@npm:18.16.1"