test: normalize @e2e imports and drop merge churn

browser_tests/fixtures/assetApiFixture.ts

@@ -1,7 +1,7 @@
 import { test as base } from '@playwright/test'
 
-import type { AssetHelper } from './helpers/AssetHelper'
-import { createAssetHelper } from './helpers/AssetHelper'
+import type { AssetHelper } from '@e2e/fixtures/helpers/AssetHelper'
+import { createAssetHelper } from '@e2e/fixtures/helpers/AssetHelper'
 
 export const assetApiFixture = base.extend<{
   assetApi: AssetHelper

browser_tests/fixtures/assetScenarioFixture.ts

@@ -1,6 +1,6 @@
 import { test as base } from '@playwright/test'
 
-import { AssetScenarioHelper } from './helpers/AssetScenarioHelper'
+import { AssetScenarioHelper } from '@e2e/fixtures/helpers/AssetScenarioHelper'
 
 export const assetScenarioFixture = base.extend<{
   assetScenario: AssetScenarioHelper

browser_tests/fixtures/helpers/AssetScenarioHelper.ts

@@ -3,20 +3,20 @@ import { readFile } from 'node:fs/promises'
 import type { Page, Route } from '@playwright/test'
 import type { JobDetailResponse, JobEntry } from '@comfyorg/ingest-types'
 
-import { buildMockJobOutputs } from './buildMockJobOutputs'
+import { buildMockJobOutputs } from '@e2e/fixtures/helpers/buildMockJobOutputs'
 import type {
   GeneratedJobFixture,
   GeneratedOutputFixture,
   ImportedAssetFixture
-} from './assetScenarioTypes'
-import { InMemoryJobsBackend } from './InMemoryJobsBackend'
-import { getMimeType } from './mimeTypeUtil'
+} from '@e2e/fixtures/helpers/assetScenarioTypes'
+import { InMemoryJobsBackend } from '@e2e/fixtures/helpers/InMemoryJobsBackend'
+import { getMimeType } from '@e2e/fixtures/helpers/mimeTypeUtil'
 import {
   buildSeededFileKey,
   buildSeededFiles,
   defaultFileFor
-} from './seededAssetFiles'
-import type { SeededAssetFile } from './seededAssetFiles'
+} from '@e2e/fixtures/helpers/seededAssetFiles'
+import type { SeededAssetFile } from '@e2e/fixtures/helpers/seededAssetFiles'
 
 const inputFilesRoutePattern = /\/internal\/files\/input(?:\?.*)?$/
 const viewRoutePattern = /\/api\/view(?:\?.*)?$/

browser_tests/fixtures/helpers/assetScenarioTypes.ts

@@ -1,6 +1,6 @@
 import type { JobDetailResponse, JobEntry } from '@comfyorg/ingest-types'
 
-import type { ResultItemType } from '../../../src/schemas/apiSchema'
+import type { ResultItemType } from '@/schemas/apiSchema'
 
 export type ImportedAssetFixture = {
   name: string

browser_tests/fixtures/helpers/buildMockJobOutputs.ts

@@ -1,11 +1,11 @@
 import type { JobDetailResponse } from '@comfyorg/ingest-types'
 
-import type { TaskOutput } from '../../../src/schemas/apiSchema'
+import type { TaskOutput } from '@/schemas/apiSchema'
 
 import type {
   GeneratedJobFixture,
   GeneratedOutputFixture
-} from './assetScenarioTypes'
+} from '@e2e/fixtures/helpers/assetScenarioTypes'
 
 export function buildMockJobOutputs(
   job: GeneratedJobFixture,

browser_tests/fixtures/helpers/seededAssetFiles.ts

@@ -5,8 +5,8 @@ import type {
   GeneratedJobFixture,
   GeneratedOutputFixture,
   ImportedAssetFixture
-} from './assetScenarioTypes'
-import { getMimeType } from './mimeTypeUtil'
+} from '@e2e/fixtures/helpers/assetScenarioTypes'
+import { getMimeType } from '@e2e/fixtures/helpers/mimeTypeUtil'
 
 const helperDir = path.dirname(fileURLToPath(import.meta.url))
 

scripts/browser_tests/AssetScenarioHelper.test.ts

@@ -1,8 +1,8 @@
 import type { Page, Route } from '@playwright/test'
 import { describe, expect, it, vi } from 'vitest'
 
-import { AssetScenarioHelper } from '../../browser_tests/fixtures/helpers/AssetScenarioHelper'
-import { createMockJob } from '../../browser_tests/fixtures/helpers/jobFixtures'
+import { AssetScenarioHelper } from '@e2e/fixtures/helpers/AssetScenarioHelper'
+import { createMockJob } from '@e2e/fixtures/helpers/jobFixtures'
 
 type RouteHandler = (route: Route) => Promise<void>
 

scripts/browser_tests/InMemoryJobsBackend.test.ts

@@ -6,8 +6,8 @@ import type {
 } from '@comfyorg/ingest-types'
 import { describe, expect, it, vi } from 'vitest'
 
-import { InMemoryJobsBackend } from '../../browser_tests/fixtures/helpers/InMemoryJobsBackend'
-import type { SeededJob } from '../../browser_tests/fixtures/helpers/InMemoryJobsBackend'
+import { InMemoryJobsBackend } from '@e2e/fixtures/helpers/InMemoryJobsBackend'
+import type { SeededJob } from '@e2e/fixtures/helpers/InMemoryJobsBackend'
 
 type RouteHandler = (route: Route) => Promise<void>
 

scripts/browser_tests/buildMockJobOutputs.test.ts

@@ -1,10 +1,10 @@
 import { describe, expect, it } from 'vitest'
 
-import { buildMockJobOutputs } from '../../browser_tests/fixtures/helpers/buildMockJobOutputs'
+import { buildMockJobOutputs } from '@e2e/fixtures/helpers/buildMockJobOutputs'
 import type {
   GeneratedJobFixture,
   GeneratedOutputFixture
-} from '../../browser_tests/fixtures/helpers/assetScenarioTypes'
+} from '@e2e/fixtures/helpers/assetScenarioTypes'
 
 describe('buildMockJobOutputs', () => {
   it('defaults nodeId, mediaType, subfolder, and type for a single output', () => {

scripts/browser_tests/seededAssetFiles.test.ts

@@ -3,7 +3,7 @@ import { describe, expect, it } from 'vitest'
 import {
   buildSeededFileKey,
   buildSeededFiles
-} from '../../browser_tests/fixtures/helpers/seededAssetFiles'
+} from '@e2e/fixtures/helpers/seededAssetFiles'
 
 describe('buildSeededFiles', () => {
   it('keys seeded files by filename, type, and subfolder', () => {

vite.config.mts

@@ -631,6 +631,7 @@ export default defineConfig({
       '@/utils/formatUtil': '/packages/shared-frontend-utils/src/formatUtil.ts',
       '@/utils/networkUtil':
         '/packages/shared-frontend-utils/src/networkUtil.ts',
+      '@e2e': '/browser_tests',
       '@': '/src'
     }
   },