From 0066f0c5176989149dd3a1535a57c56342495fff Mon Sep 17 00:00:00 2001 From: ChristopherPHolder Date: Sun, 15 Sep 2024 17:00:55 +0200 Subject: [PATCH] fix(workspace): fix paths --- packages/runner/app/src/commands/user-flow.ts | 4 ++-- packages/runner/data-access-queue/src/lib/aws-sqs.ts | 2 +- .../runner/data-access-queue/src/lib/local-queue.ts | 2 +- packages/runner/data-access-store/src/lib/local.ts | 2 +- packages/runner/data-access-store/src/lib/s3.ts | 2 +- .../feature-user-flow-replay/src/user-flow-replay.ts | 2 +- .../util-middleware/src/lib/commands/user-flow.ts | 4 ++-- .../src/lib/queue/queue.factory.spec.ts | 2 +- .../util-middleware/src/lib/queue/queue.factory.ts | 6 +++--- .../util-middleware/src/lib/store/store.factory.ts | 6 +++--- tsconfig.base.json | 10 +++++----- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/packages/runner/app/src/commands/user-flow.ts b/packages/runner/app/src/commands/user-flow.ts index cb36f570..e28561ae 100644 --- a/packages/runner/app/src/commands/user-flow.ts +++ b/packages/runner/app/src/commands/user-flow.ts @@ -1,6 +1,6 @@ import { ArgumentsCamelCase, CommandBuilder, CommandModule } from 'yargs'; -import { createAuditQueue, createAuditStore, UserFlowExecutor } from '@runner/middleware'; -import { AuditExecutor, AuditQueue, AuditStore } from '@runner/interface'; +import { createAuditQueue, createAuditStore, UserFlowExecutor } from '@app-speed/runner-middleware'; +import { AuditExecutor, AuditQueue, AuditStore } from '@app-speed/runner-interface'; import { GlobalOptions, queue, QueueOption, store, StoreOption } from '../args'; type UserFlowCommandOptions = GlobalOptions & QueueOption & StoreOption; diff --git a/packages/runner/data-access-queue/src/lib/aws-sqs.ts b/packages/runner/data-access-queue/src/lib/aws-sqs.ts index 994135e3..9147174f 100644 --- a/packages/runner/data-access-queue/src/lib/aws-sqs.ts +++ b/packages/runner/data-access-queue/src/lib/aws-sqs.ts @@ -9,7 +9,7 @@ import { } from '@aws-sdk/client-sqs'; import { Message } from '@aws-sdk/client-sqs/dist-types/models/models_0'; -import { AuditQueue, AuditRunParams } from '@runner/interface'; +import { AuditQueue, AuditRunParams } from '@app-speed/runner-interface'; import { DEFAULT_AWS_REGION } from '@app-speed/shared/data-access'; type SQSConfig = { diff --git a/packages/runner/data-access-queue/src/lib/local-queue.ts b/packages/runner/data-access-queue/src/lib/local-queue.ts index ff5a7f08..8be69012 100644 --- a/packages/runner/data-access-queue/src/lib/local-queue.ts +++ b/packages/runner/data-access-queue/src/lib/local-queue.ts @@ -2,7 +2,7 @@ import { join } from 'path'; import { cwd } from 'process'; import { readdirSync, readFileSync } from 'fs'; -import { AuditQueue, AuditRunParams } from '@runner/interface'; +import { AuditQueue, AuditRunParams } from '@app-speed/runner-interface'; export type LocalQueueConfig = { path: string; diff --git a/packages/runner/data-access-store/src/lib/local.ts b/packages/runner/data-access-store/src/lib/local.ts index fb5f58c3..3ddebaf0 100644 --- a/packages/runner/data-access-store/src/lib/local.ts +++ b/packages/runner/data-access-store/src/lib/local.ts @@ -1,4 +1,4 @@ -import { AuditStore, ResultReports } from '@runner/interface'; +import { AuditStore, ResultReports } from '@app-speed/runner-interface'; export type LocalStoreConfig = { storePath: string; diff --git a/packages/runner/data-access-store/src/lib/s3.ts b/packages/runner/data-access-store/src/lib/s3.ts index 3dca0f5b..0b653150 100644 --- a/packages/runner/data-access-store/src/lib/s3.ts +++ b/packages/runner/data-access-store/src/lib/s3.ts @@ -1,4 +1,4 @@ -import { AuditStore, ResultReports } from '@runner/interface'; +import { AuditStore, ResultReports } from '@app-speed/runner-interface'; import { PutObjectCommand, S3Client, S3ClientConfig } from '@aws-sdk/client-s3'; export class S3Store implements AuditStore { diff --git a/packages/runner/feature-user-flow-replay/src/user-flow-replay.ts b/packages/runner/feature-user-flow-replay/src/user-flow-replay.ts index 74926eff..410e9c46 100644 --- a/packages/runner/feature-user-flow-replay/src/user-flow-replay.ts +++ b/packages/runner/feature-user-flow-replay/src/user-flow-replay.ts @@ -4,7 +4,7 @@ import { parse } from './parse'; import { Browser, launch, Page } from 'puppeteer'; import { startFlow, UserFlow as LHUserFlow } from 'lighthouse'; import { AppSpeedUserFlow } from './types'; -import { AuditRunner, ResultReports } from '@runner/interface'; +import { AuditRunner, ResultReports } from '@app-speed/runner-interface'; export type UserFlowRunnerContext = { browser: Browser; diff --git a/packages/runner/util-middleware/src/lib/commands/user-flow.ts b/packages/runner/util-middleware/src/lib/commands/user-flow.ts index 585c1a34..ff3b6464 100644 --- a/packages/runner/util-middleware/src/lib/commands/user-flow.ts +++ b/packages/runner/util-middleware/src/lib/commands/user-flow.ts @@ -1,5 +1,5 @@ -import { AuditExecutor, AuditQueue, AuditStore, AuditRunParams } from '@runner/interface'; -import { UserFlowAudit } from '@runner/user-flow-replay'; +import { AuditExecutor, AuditQueue, AuditStore, AuditRunParams } from '@app-speed/runner-interface'; +import { UserFlowAudit } from '@app-speed/runner-user-flow-replay'; import { informAuditError, informAuditItRunning, sendAuditResults } from '../dialog'; export class UserFlowExecutor implements AuditExecutor { diff --git a/packages/runner/util-middleware/src/lib/queue/queue.factory.spec.ts b/packages/runner/util-middleware/src/lib/queue/queue.factory.spec.ts index 38aea11a..162434c0 100644 --- a/packages/runner/util-middleware/src/lib/queue/queue.factory.spec.ts +++ b/packages/runner/util-middleware/src/lib/queue/queue.factory.spec.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest'; -import { AuditQueue } from '@runner/interface'; +import { AuditQueue } from '@app-speed/runner-interface'; import { createAuditQueue } from './queue.factory'; describe.skip('queue factory', async () => { diff --git a/packages/runner/util-middleware/src/lib/queue/queue.factory.ts b/packages/runner/util-middleware/src/lib/queue/queue.factory.ts index ae3120ce..730c4197 100644 --- a/packages/runner/util-middleware/src/lib/queue/queue.factory.ts +++ b/packages/runner/util-middleware/src/lib/queue/queue.factory.ts @@ -1,8 +1,8 @@ -import { AuditQueue } from '@runner/interface'; +import { AuditQueue } from '@app-speed/runner-interface'; const queueMap = new Map>(); -queueMap.set('local', import('@runner/queue/local-queue')); -queueMap.set('sqs', import('@runner/queue/aws-sqs')); +queueMap.set('local', import('@app-speed/runner-queue/local-queue')); +queueMap.set('sqs', import('@app-speed/runner-queue/aws-sqs')); export async function createAuditQueue(path: string, config?: object): Promise { const queueImport = queueMap.get(path); diff --git a/packages/runner/util-middleware/src/lib/store/store.factory.ts b/packages/runner/util-middleware/src/lib/store/store.factory.ts index 9299e7d4..d12295e5 100644 --- a/packages/runner/util-middleware/src/lib/store/store.factory.ts +++ b/packages/runner/util-middleware/src/lib/store/store.factory.ts @@ -1,8 +1,8 @@ -import { AuditStore } from '@runner/interface'; +import { AuditStore } from '@app-speed/runner-interface'; const storeMap = { - local: import('@runner/store/local'), - s3: import('@runner/store/s3'), + local: import('@app-speed/runner-store/local'), + s3: import('@app-speed/runner-store/s3'), } as const; type StoreKeys = keyof typeof storeMap; diff --git a/tsconfig.base.json b/tsconfig.base.json index fd940e76..e299121e 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -27,11 +27,11 @@ "@app-speed/portal-ui/scroll-container": ["packages/portal/ui/scroll-container/public-api.ts"], "@app-speed/portal-ui/shell": ["packages/portal/ui/shell/public-api.ts"], "@app-speed/portal-ui/status-badge": ["packages/portal/ui/status-badge/public-api.ts"], - "@runner/interface": ["packages/runner/util-interface/src/index.ts"], - "@runner/middleware": ["packages/runner/util-middleware/src/index.ts"], - "@runner/queue/*": ["packages/runner/data-access-queue/src/lib/*"], - "@runner/store/*": ["packages/runner/data-access-store/src/lib/*"], - "@runner/user-flow-replay": ["packages/runner/feature-user-flow-replay/public-api.ts"] + "@app-speed/runner-interface": ["packages/runner/util-interface/src/index.ts"], + "@app-speed/runner-middleware": ["packages/runner/util-middleware/src/index.ts"], + "@app-speed/runner-queue/*": ["packages/runner/data-access-queue/src/lib/*"], + "@app-speed/runner-store/*": ["packages/runner/data-access-store/src/lib/*"], + "@app-speed/runner-user-flow-replay": ["packages/runner/feature-user-flow-replay/public-api.ts"] } } }