rebase and fix graphql types

Author: ZachJW34

packages/data-context/src/actions/ProjectActions.ts

@@ -2,10 +2,9 @@ import type { MutationAddProjectArgs, MutationAppCreateConfigFileArgs, SpecType
 import type { FindSpecs, FoundBrowser, FoundSpec, FullConfig, LaunchArgs, LaunchOpts, OpenProjectLaunchOptions } from '@packages/types'
 import path from 'path'
 import type { Maybe, ProjectShape } from '../data/coreDataShape'
-import fs from 'fs-extra'
 
 import type { DataContext } from '..'
-import { generateSpecFromStory } from '../data'
+import { generateSpecFromStory } from '../data/util/storybook'
 
 export interface ProjectApiShape {
   getConfig(projectRoot: string): Promise<FullConfig>
@@ -186,7 +185,7 @@ export class ProjectActions {
     if (this.ctx.activeProject?.isFirstTimeCT) {
       const indexHtmlPath = path.resolve(this.ctx.activeProject.projectRoot, 'cypress/component/support/index.html')
 
-      fs.outputFileSync(indexHtmlPath, template)
+      this.ctx.fs.outputFileSync(indexHtmlPath, template)
     }
   }
 

packages/frontend-shared/cypress/support/mock-graphql/stubgql-Mutation.ts

@@ -40,4 +40,7 @@ export const stubMutation: MaybeResolver<Mutation> = {
 
     return ctx.app
   },
+  generateSpecFromStory (source, args, ctx) {
+    return ctx.wizard
+  },
 }

packages/graphql/schemas/schema.graphql

@@ -506,6 +506,18 @@ enum SpecType {
   integration
 }
 
+"""Storybook"""
+type Storybook {
+  """Whether this is the selected framework bundler"""
+  configured: Boolean
+
+  """Most recent generated spec"""
+  generatedSpec: String
+
+  """List of all Storybook stories"""
+  stories: [String!]!
+}
+
 """The bundlers that we can use with Cypress"""
 enum SupportedBundlers {
   vite
@@ -563,7 +575,7 @@ type Wizard {
   """IndexHtml file based on bundler and framework of choice"""
   sampleTemplate: String
   step: WizardStep!
-  storybook: WizardStorybook
+  storybook: Storybook
 
   """
   The testing type we are setting in the wizard, null if this has not been chosen
@@ -641,15 +653,3 @@ enum WizardStep {
   setupComplete
   welcome
 }
-
-"""Wizard Storybook"""
-type WizardStorybook {
-  """Whether this is the selected framework bundler"""
-  configured: Boolean
-
-  """Most recent generated spec"""
-  generatedSpec: String
-
-  """List of all Storybook stories"""
-  stories: [String!]!
-}

packages/graphql/src/schemaTypes/objectTypes/gql-WizardStorybook.ts packages/graphql/src/schemaTypes/objectTypes/gql-Storybook.ts

@@ -1,8 +1,8 @@
 import { objectType } from 'nexus'
 
-export const WizardStorybook = objectType({
-  name: 'WizardStorybook',
-  description: 'Wizard Storybook',
+export const Storybook = objectType({
+  name: 'Storybook',
+  description: 'Storybook',
   definition (t) {
     t.boolean('configured', {
       description: 'Whether this is the selected framework bundler',

packages/graphql/src/schemaTypes/objectTypes/gql-Wizard.ts

@@ -5,7 +5,7 @@ import { WizardNpmPackage } from './gql-WizardNpmPackage'
 import { arg, nonNull, objectType } from 'nexus'
 import { BUNDLERS, FRONTEND_FRAMEWORKS, TESTING_TYPES } from '@packages/types'
 import { TestingTypeEnum, WizardCodeLanguageEnum, WizardStepEnum } from '../enumTypes/gql-WizardEnums'
-import { WizardStorybook } from './gql-WizardStorybook'
+import { Storybook } from './gql-Storybook'
 
 export const Wizard = objectType({
   name: 'Wizard',
@@ -99,7 +99,7 @@ export const Wizard = objectType({
     })
 
     t.field('storybook', {
-      type: WizardStorybook,
+      type: Storybook,
       resolve: (source, args, ctx) => ctx.wizard.storybook,
     })
   },

packages/graphql/src/schemaTypes/objectTypes/index.ts

@@ -10,9 +10,9 @@ export * from './gql-NavigationMenu'
 export * from './gql-Project'
 export * from './gql-Query'
 export * from './gql-Spec'
+export * from './gql-Storybook'
 export * from './gql-TestingTypeInfo'
 export * from './gql-Wizard'
 export * from './gql-WizardBundler'
 export * from './gql-WizardFrontendFramework'
 export * from './gql-WizardNpmPackage'
-export * from './gql-WizardStorybook'