fix(typo): fix typo in folder name (#6608)

Fix a small typo in a folder name (+ a conflict resolution)

**Manual Tests:**
I hereby swear that:

- [X] I opened a hydrogen project and it loaded
- [X] I could navigate to various routes in Play mode

Author: liady

editor/src/components/editor/action-types.ts

@@ -91,7 +91,7 @@ import type {
   ImportOperation,
   ImportOperationAction,
 } from '../../core/shared/import/import-operation-types'
-import type { ProjectRequirements } from '../../core/shared/import/proejct-health-check/utopia-requirements-types'
+import type { ProjectRequirements } from '../../core/shared/import/project-health-check/utopia-requirements-types'
 export { isLoggedIn, loggedInUser, notLoggedIn } from '../../common/user'
 export type { LoginState, UserDetails } from '../../common/user'
 

editor/src/components/editor/actions/action-creators.ts

@@ -275,7 +275,7 @@ import type {
   ImportOperation,
   ImportOperationAction,
 } from '../../../core/shared/import/import-operation-types'
-import type { ProjectRequirements } from '../../../core/shared/import/proejct-health-check/utopia-requirements-types'
+import type { ProjectRequirements } from '../../../core/shared/import/project-health-check/utopia-requirements-types'
 
 export function clearSelection(): EditorAction {
   return {

editor/src/components/editor/actions/actions.tsx

@@ -628,9 +628,9 @@ import { getNavigatorTargetsFromEditorState } from '../../navigator/navigator-ut
 import { getParseCacheOptions } from '../../../core/shared/parse-cache-utils'
 import { styleP } from '../../inspector/inspector-common'
 import { getUpdateOperationResult } from '../../../core/shared/import/import-operation-service'
-import { updateRequirements } from '../../../core/shared/import/proejct-health-check/utopia-requirements-service'
+import { updateRequirements } from '../../../core/shared/import/project-health-check/utopia-requirements-service'
 import { applyValuesAtPath, deleteValuesAtPath } from '../../canvas/commands/utils/property-utils'
-import { createStoryboardFileIfNecessary } from '../../../core/shared/import/proejct-health-check/requirements/requirement-storyboard'
+import { createStoryboardFileIfNecessary } from '../../../core/shared/import/project-health-check/requirements/requirement-storyboard'
 
 export const MIN_CODE_PANE_REOPEN_WIDTH = 100
 

editor/src/components/editor/import-wizard/components.tsx

@@ -11,7 +11,7 @@ import { ImportOperationResult } from '../../../core/shared/import/import-operat
 import { assertNever } from '../../../core/shared/utils'
 import { Icons } from '../../../uuiui'
 import { GithubSpinner } from '../../../components/navigator/left-pane/github-pane/github-spinner'
-import { RequirementResolutionResult } from '../../../core/shared/import/proejct-health-check/utopia-requirements-types'
+import { RequirementResolutionResult } from '../../../core/shared/import/project-health-check/utopia-requirements-types'
 
 export function OperationLine({ operation }: { operation: ImportOperation }) {
   const operationRunningStatus = React.useMemo(() => {

editor/src/components/editor/store/editor-state.ts

@@ -193,7 +193,7 @@ import type { ImportOperation } from '../../../core/shared/import/import-operati
 import {
   emptyProjectRequirements,
   type ProjectRequirements,
-} from '../../../core/shared/import/proejct-health-check/utopia-requirements-types'
+} from '../../../core/shared/import/project-health-check/utopia-requirements-types'
 
 const ObjectPathImmutable: any = OPI
 

editor/src/components/editor/store/store-deep-equality-instances.ts

@@ -647,11 +647,11 @@ import type { ImportOperation } from '../../../core/shared/import/import-operati
 import type {
   ProjectRequirements,
   RequirementResolution,
-} from '../../../core/shared/import/proejct-health-check/utopia-requirements-types'
+} from '../../../core/shared/import/project-health-check/utopia-requirements-types'
 import {
   newProjectRequirements,
   requirementResolution,
-} from '../../../core/shared/import/proejct-health-check/utopia-requirements-types'
+} from '../../../core/shared/import/project-health-check/utopia-requirements-types'
 
 export function ElementPropertyPathKeepDeepEquality(): KeepDeepEqualityCall<ElementPropertyPath> {
   return combine2EqualityCalls(

editor/src/components/editor/store/store-hook-substore-helpers.ts

@@ -1,5 +1,5 @@
 import { type EditorState } from './editor-state'
-import { emptyProjectRequirements } from '../../../core/shared/import/proejct-health-check/utopia-requirements-types'
+import { emptyProjectRequirements } from '../../../core/shared/import/project-health-check/utopia-requirements-types'
 
 export const EmptyEditorStateForKeysOnly: EditorState = {
   id: null,

editor/src/core/shared/github/operations/load-branch.ts

@@ -45,8 +45,8 @@ import {
 import {
   RequirementResolutionResult,
   resetRequirementsResolutions,
-} from '../../import/proejct-health-check/utopia-requirements-service'
-import { checkAndFixUtopiaRequirements } from '../../import/proejct-health-check/check-utopia-requirements'
+} from '../../import/project-health-check/utopia-requirements-service'
+import { checkAndFixUtopiaRequirements } from '../../import/project-health-check/check-utopia-requirements'
 import { ImportOperationResult } from '../../import/import-operation-types'
 
 export const saveAssetsToProject =

editor/src/core/shared/import/import-operation-types.ts

@@ -1,5 +1,5 @@
 import type { GithubRepo } from '../../../components/editor/store/editor-state'
-import type { RequirementResolutionResult } from './proejct-health-check/utopia-requirements-types'
+import type { RequirementResolutionResult } from './project-health-check/utopia-requirements-types'
 
 type ImportOperationData = {
   text?: string

editor/src/core/shared/import/proejct-health-check/check-utopia-requirements.ts editor/src/core/shared/import/project-health-check/check-utopia-requirements.ts

@@ -25,7 +25,7 @@ export function checkAndFixUtopiaRequirements(
     serverPackages: new CheckServerPackages(),
   }
   let projectContents = parsedProjectContents
-  let result: RequirementResolutionResult = RequirementResolutionResult.Found
+  let result: RequirementResolutionResult = RequirementResolutionResult.Passed
   // iterate over all checks, updating the project contents as we go
   for (const [name, check] of Object.entries(checks)) {
     const checkName = name as ProjectRequirement