From 0b0bc72677628e853cac994dc21f5572cc0083b8 Mon Sep 17 00:00:00 2001 From: ChristopherPHolder Date: Sun, 15 Sep 2024 16:45:36 +0200 Subject: [PATCH] fix(workspace): fix build, lint test --- nx.json | 20 --------- packages/aws-deploy/package.json | 3 +- packages/aws-deploy/project.json | 2 +- packages/conductor/is-online-ser/README.md | 11 ----- packages/conductor/is-online-ser/project.json | 14 +++--- packages/conductor/schedule-audit/README.md | 11 ----- .../conductor/schedule-audit/package.json | 5 ++- .../conductor/schedule-audit/project.json | 14 +++--- .../schedule-audit/src/lib/schedule-audit.ts | 2 +- packages/conductor/shared-util-lib/README.md | 11 ----- .../conductor/shared-util-lib/project.json | 15 +++---- packages/conductor/socket-io-ser/README.md | 11 ----- packages/conductor/socket-io-ser/project.json | 12 +++--- packages/portal/app/project.json | 2 +- packages/portal/app/src/app/app.routes.ts | 4 +- packages/portal/data-access/package.json | 8 +++- packages/portal/data-access/project.json | 10 ++--- .../src/lib/scheduler/scheduler.service.ts | 6 +-- packages/portal/data-access/tsconfig.json | 2 +- .../audit-builder/audit-builder.container.ts | 2 +- .../src/container/audit-viewer.container.ts | 2 +- .../audit-viewer/src/ui/table.component.ts | 2 +- .../audit-summary.component.ts | 4 +- .../view-step-details.adaptor.ts | 2 +- .../viewer-diagnostic-panel.component.ts | 2 +- .../viewer-file-strip.component.ts | 2 +- .../viewer-score.component.ts | 2 +- .../viewer-step-details.component.ts | 2 +- .../viewer-step-metric-summary.component.ts | 2 +- packages/portal/feature/ng-package.json | 4 +- packages/portal/feature/package.json | 6 +-- packages/portal/feature/project.json | 16 +++---- .../user-flow/src/lib/user-flow.component.ts | 6 +-- .../feature/viewer/src/viewer.component.ts | 4 +- packages/portal/ui/jest.config.ts | 2 +- packages/portal/ui/ng-package.json | 4 +- packages/portal/ui/package.json | 5 +-- packages/portal/ui/project.json | 12 +++--- packages/portal/ui/tsconfig.lib.json | 2 +- .../runner/data-access-queue/project.json | 5 +-- .../runner/data-access-store/project.json | 2 +- .../feature-user-flow-replay/project.json | 2 +- packages/runner/util-middleware/project.json | 7 ++- .../runner/util-middleware/src/lib/dialog.ts | 2 +- packages/shared/data-access/package.json | 4 +- packages/shared/data-access/project.json | 6 +-- .../websocket-message-util-lib/.eslintrc.json | 18 -------- .../websocket-message-util-lib/project.json | 25 ----------- .../websocket-message-util-lib/tsconfig.json | 10 ----- .../tsconfig.lib.json | 10 ----- .../shared/websocket-util-lib/.eslintrc.json | 43 +++++++++++++++++++ packages/shared/websocket-util-lib/README.md | 3 ++ .../shared/websocket-util-lib/ng-package.json | 7 +++ .../shared/websocket-util-lib/package.json | 6 +++ .../shared/websocket-util-lib/project.json | 29 +++++++++++++ .../src/index.ts | 0 .../src/lib/constants.ts | 0 .../src/lib/types.ts | 11 +---- .../src/lib/utils.ts | 0 .../shared/websocket-util-lib/tsconfig.json | 25 +++++++++++ .../websocket-util-lib/tsconfig.lib.json | 12 ++++++ .../websocket-util-lib/tsconfig.lib.prod.json | 7 +++ tsconfig.base.json | 22 +++++----- 63 files changed, 246 insertions(+), 256 deletions(-) delete mode 100644 packages/conductor/is-online-ser/README.md delete mode 100644 packages/conductor/schedule-audit/README.md delete mode 100644 packages/conductor/shared-util-lib/README.md delete mode 100644 packages/conductor/socket-io-ser/README.md delete mode 100644 packages/shared/websocket-message-util-lib/.eslintrc.json delete mode 100644 packages/shared/websocket-message-util-lib/project.json delete mode 100644 packages/shared/websocket-message-util-lib/tsconfig.json delete mode 100644 packages/shared/websocket-message-util-lib/tsconfig.lib.json create mode 100644 packages/shared/websocket-util-lib/.eslintrc.json create mode 100644 packages/shared/websocket-util-lib/README.md create mode 100644 packages/shared/websocket-util-lib/ng-package.json create mode 100644 packages/shared/websocket-util-lib/package.json create mode 100644 packages/shared/websocket-util-lib/project.json rename packages/shared/{websocket-message-util-lib => websocket-util-lib}/src/index.ts (100%) rename packages/shared/{websocket-message-util-lib => websocket-util-lib}/src/lib/constants.ts (100%) rename packages/shared/{websocket-message-util-lib => websocket-util-lib}/src/lib/types.ts (83%) rename packages/shared/{websocket-message-util-lib => websocket-util-lib}/src/lib/utils.ts (100%) create mode 100644 packages/shared/websocket-util-lib/tsconfig.json create mode 100644 packages/shared/websocket-util-lib/tsconfig.lib.json create mode 100644 packages/shared/websocket-util-lib/tsconfig.lib.prod.json diff --git a/nx.json b/nx.json index 80d213aa..5cc57f30 100644 --- a/nx.json +++ b/nx.json @@ -116,26 +116,6 @@ "options": { "targetName": "lint" } - }, - { - "plugin": "@nx/vite/plugin", - "options": { - "testTargetName": "test" - }, - "include": [ - "packages/runner-app/**/*", - "packages/audit-queue/**/*", - "packages/audit-store/**/*", - "packages/cli-middleware/**/*", - "packages/user-flow-replay/**/*" - ] - }, - { - "plugin": "@nx/vite/plugin", - "options": { - "testTargetName": "e2e" - }, - "include": ["packages/esbuild-meta/**/*", "packages/runner-e2e/**/*"] } ] } diff --git a/packages/aws-deploy/package.json b/packages/aws-deploy/package.json index 3c740b37..0f6edfa6 100644 --- a/packages/aws-deploy/package.json +++ b/packages/aws-deploy/package.json @@ -5,7 +5,8 @@ "@nx/devkit": "19.5.7", "@aws-sdk/client-lambda": "^3.609.0", "dotenv": "16.4.5", - "archiver": "^7.0.1" + "archiver": "^7.0.1", + "@app-speed/shared/data-access": "0.0.1" }, "type": "commonjs", "main": "./src/index.js", diff --git a/packages/aws-deploy/project.json b/packages/aws-deploy/project.json index cbe8d36b..cd0a7aae 100644 --- a/packages/aws-deploy/project.json +++ b/packages/aws-deploy/project.json @@ -1,5 +1,5 @@ { - "name": "aws-deploy", + "name": "aws-deploy-nx-plugin", "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "packages/aws-deploy/src", "projectType": "library", diff --git a/packages/conductor/is-online-ser/README.md b/packages/conductor/is-online-ser/README.md deleted file mode 100644 index 09bea0cc..00000000 --- a/packages/conductor/is-online-ser/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# is-online-ser - -This library was generated with [Nx](https://nx.dev). - -## Building - -Run `nx build is-online-ser` to build the library. - -## Running unit tests - -Run `nx test is-online-ser` to execute the unit tests via [Vitest](https://vitest.dev/). diff --git a/packages/conductor/is-online-ser/project.json b/packages/conductor/is-online-ser/project.json index dd3058d0..3c3adc84 100644 --- a/packages/conductor/is-online-ser/project.json +++ b/packages/conductor/is-online-ser/project.json @@ -1,7 +1,7 @@ { - "name": "conductor-is-online-ser", + "name": "conductor-is-online-service", "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "packages/userflow-conductor/is-online-ser/src", + "sourceRoot": "packages/conductor/is-online-ser/src", "projectType": "application", "tags": ["lambda"], "targets": { @@ -9,9 +9,9 @@ "executor": "@nx/esbuild:esbuild", "outputs": ["{options.outputPath}"], "options": { - "outputPath": "dist/packages/userflow-conductor/is-online-ser", - "main": "packages/userflow-conductor/is-online-ser/src/index.ts", - "tsConfig": "packages/userflow-conductor/is-online-ser/tsconfig.lib.json", + "outputPath": "dist/{projectRoot}", + "main": "{projectRoot}/src/index.ts", + "tsConfig": "{projectRoot}/tsconfig.lib.json", "declaration": false, "bundle": true, "minify": true, @@ -25,7 +25,7 @@ "deploy": { "executor": "@app-speed/aws-deploy:lambda-deploy", "options": { - "dist": "dist/packages/userflow-conductor/is-online-ser", + "dist": "dist/{projectRoot}", "functionName": "AppSpeed_IsOnline" }, "dependsOn": ["build"] @@ -34,7 +34,7 @@ "executor": "@nx/vite:test", "outputs": ["{options.reportsDirectory}"], "options": { - "reportsDirectory": "../../../coverage/packages/userflow-conductor/is-online-ser" + "reportsDirectory": "../../../coverage/{projectRoot}" } } } diff --git a/packages/conductor/schedule-audit/README.md b/packages/conductor/schedule-audit/README.md deleted file mode 100644 index 03a32ccd..00000000 --- a/packages/conductor/schedule-audit/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# schedule-audit - -This library was generated with [Nx](https://nx.dev). - -## Building - -Run `nx build schedule-audit` to build the library. - -## Running unit tests - -Run `nx test schedule-audit` to execute the unit tests via [Vitest](https://vitest.dev/). diff --git a/packages/conductor/schedule-audit/package.json b/packages/conductor/schedule-audit/package.json index a4f8e9dd..a8ca9f13 100644 --- a/packages/conductor/schedule-audit/package.json +++ b/packages/conductor/schedule-audit/package.json @@ -2,10 +2,11 @@ "name": "conductor-schedule-audit", "version": "0.0.1", "dependencies": { - "@app-speed/constructor/shared-util-lib": "0.0.1", "@aws-sdk/client-sqs": "^3.186.0", "@aws-sdk/client-ec2": "^3.226.0", - "@aws-sdk/client-ssm": "^3.226.0" + "@aws-sdk/client-ssm": "^3.226.0", + "@app-speed/shared/websocket-util-lib": "0.0.1", + "@app-speed/shared/data-access": "0.0.1" }, "type": "module", "private": true diff --git a/packages/conductor/schedule-audit/project.json b/packages/conductor/schedule-audit/project.json index 3b733f3f..8eb45ef4 100644 --- a/packages/conductor/schedule-audit/project.json +++ b/packages/conductor/schedule-audit/project.json @@ -1,17 +1,17 @@ { - "name": "schedule-audit", + "name": "conductor-schedule-audit-service", "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "packages/userflow-conductor/schedule-audit/src", - "projectType": "library", + "sourceRoot": "packages/conductor/schedule-audit/src", + "projectType": "application", "tags": ["lambda"], "targets": { "build": { "executor": "@nx/esbuild:esbuild", "outputs": ["{options.outputPath}"], "options": { - "outputPath": "dist/packages/userflow-conductor/schedule-audit", - "main": "packages/userflow-conductor/schedule-audit/src/index.ts", - "tsConfig": "packages/userflow-conductor/schedule-audit/tsconfig.lib.json", + "outputPath": "dist/{projectRoot}", + "main": "{projectRoot}/src/index.ts", + "tsConfig": "{projectRoot}/tsconfig.lib.json", "declaration": false, "bundle": true, "minify": false, @@ -25,7 +25,7 @@ "deploy": { "executor": "@app-speed/aws-deploy:lambda-deploy", "options": { - "dist": "dist/packages/userflow-conductor-svc", + "dist": "dist/{projectRoot}", "functionName": "AppSpeed_Userflow_Conductor" }, "dependsOn": ["build"] diff --git a/packages/conductor/schedule-audit/src/lib/schedule-audit.ts b/packages/conductor/schedule-audit/src/lib/schedule-audit.ts index 15248ce0..428f51d6 100644 --- a/packages/conductor/schedule-audit/src/lib/schedule-audit.ts +++ b/packages/conductor/schedule-audit/src/lib/schedule-audit.ts @@ -14,7 +14,7 @@ import { waitUntilInstanceRunning, } from '@aws-sdk/client-ec2'; import { SendCommandCommand, SendCommandCommandOutput, SSMClient } from '@aws-sdk/client-ssm'; -import { CONDUCTOR_STAGE, StageChangeMessage } from '@app-speed/shared/websocket-message-util-lib'; +import { CONDUCTOR_STAGE, StageChangeMessage } from '@app-speed/shared/websocket-util-lib'; import { DEFAULT_AWS_REGION } from '@app-speed/shared/data-access'; const INSTANCE_IDS = ['i-0781d8307e3c9e9f7']; diff --git a/packages/conductor/shared-util-lib/README.md b/packages/conductor/shared-util-lib/README.md deleted file mode 100644 index 753e32fc..00000000 --- a/packages/conductor/shared-util-lib/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# shared-util-lib - -This library was generated with [Nx](https://nx.dev). - -## Building - -Run `nx build shared-util-lib` to build the library. - -## Running unit tests - -Run `nx test shared-util-lib` to execute the unit tests via [Vitest](https://vitest.dev/). diff --git a/packages/conductor/shared-util-lib/project.json b/packages/conductor/shared-util-lib/project.json index ab7b39e1..a6e2ab9f 100644 --- a/packages/conductor/shared-util-lib/project.json +++ b/packages/conductor/shared-util-lib/project.json @@ -1,5 +1,5 @@ { - "name": "shared-util-lib", + "name": "conductor-shared-util-lib", "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "packages/conductor/shared-util-lib/src", "projectType": "library", @@ -9,19 +9,18 @@ "executor": "@nx/esbuild:esbuild", "outputs": ["{options.outputPath}"], "options": { - "outputPath": "dist/packages/userflow-conductor/shared-util-lib", - "main": "packages/userflow-conductor/shared-util-lib/src/index.ts", - "tsConfig": "packages/userflow-conductor/shared-util-lib/tsconfig.lib.json", - "assets": ["packages/userflow-conductor/shared-util-lib/*.md"], - "generatePackageJson": true, - "format": ["cjs"] + "outputPath": "dist/{projectRoot}", + "main": "{projectRoot}/src/index.ts", + "tsConfig": "{projectRoot}/tsconfig.lib.json", + "assets": [], + "format": ["esm"] } }, "test": { "executor": "@nx/vite:test", "outputs": ["{options.reportsDirectory}"], "options": { - "reportsDirectory": "../../../coverage/packages/userflow-conductor/shared-util-lib" + "reportsDirectory": "../../../coverage/{projectRoot}" } } } diff --git a/packages/conductor/socket-io-ser/README.md b/packages/conductor/socket-io-ser/README.md deleted file mode 100644 index 4703defc..00000000 --- a/packages/conductor/socket-io-ser/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# socket-io-ser - -This library was generated with [Nx](https://nx.dev). - -## Building - -Run `nx build socket-io-ser` to build the library. - -## Running unit tests - -Run `nx test socket-io-ser` to execute the unit tests via [Vitest](https://vitest.dev/). diff --git a/packages/conductor/socket-io-ser/project.json b/packages/conductor/socket-io-ser/project.json index 8a483958..37ef575c 100644 --- a/packages/conductor/socket-io-ser/project.json +++ b/packages/conductor/socket-io-ser/project.json @@ -1,5 +1,5 @@ { - "name": "conductor-socket-io-ser", + "name": "conductor-socket-io-service", "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "packages/conductor/socket-io-ser/src", "projectType": "application", @@ -9,9 +9,9 @@ "executor": "@nx/esbuild:esbuild", "outputs": ["{options.outputPath}"], "options": { - "outputPath": "dist/packages/conductor/socket-io-ser", - "main": "packages/conductor/socket-io-ser/src/index.ts", - "tsConfig": "packages/conductor/socket-io-ser/tsconfig.lib.json", + "outputPath": "dist/{projectRoot}", + "main": "{projectRoot}/src/index.ts", + "tsConfig": "{projectRoot}/tsconfig.lib.json", "declaration": false, "bundle": true, "minify": false, @@ -25,7 +25,7 @@ "deploy": { "executor": "@app-speed/aws-deploy:lambda-deploy", "options": { - "dist": "dist/packages/conductor/socket-io-ser", + "dist": "dist/{projectRoot}", "functionName": "AppSpeed_Socket-IO" }, "dependsOn": ["build"] @@ -34,7 +34,7 @@ "executor": "@nx/vite:test", "outputs": ["{options.reportsDirectory}"], "options": { - "reportsDirectory": "../../../coverage/packages/conductor/socket-io-ser" + "reportsDirectory": "../../../coverage/{projectRoot}" } } } diff --git a/packages/portal/app/project.json b/packages/portal/app/project.json index cf640526..90e9f811 100644 --- a/packages/portal/app/project.json +++ b/packages/portal/app/project.json @@ -14,7 +14,7 @@ "index": "{projectRoot}/src/index.html", "main": "{projectRoot}/src/main.ts", "polyfills": ["zone.js"], - "tsConfig": "packages/portal/app/tsconfig.app.json", + "tsConfig": "{projectRoot}/tsconfig.app.json", "assets": ["{projectRoot}/src/favicon.ico", "{projectRoot}/src/assets"], "styles": ["{projectRoot}/src/styles.scss"] }, diff --git a/packages/portal/app/src/app/app.routes.ts b/packages/portal/app/src/app/app.routes.ts index 0b3ad5d4..bf3c71b8 100644 --- a/packages/portal/app/src/app/app.routes.ts +++ b/packages/portal/app/src/app/app.routes.ts @@ -6,11 +6,11 @@ export const appRoutes: Route[] = [ children: [ { path: '', - loadComponent: () => import('@portal/feature/user-flow'), + loadComponent: () => import('@app-speed/portal-feature/user-flow'), }, { path: 'viewer', - loadComponent: () => import('@portal/feature/viewer'), + loadComponent: () => import('@app-speed/portal-feature/viewer'), }, ], }, diff --git a/packages/portal/data-access/package.json b/packages/portal/data-access/package.json index 5e44cb2e..6e39ee66 100644 --- a/packages/portal/data-access/package.json +++ b/packages/portal/data-access/package.json @@ -1,9 +1,13 @@ { - "name": "@portal/data-access", + "name": "@app-speed/portal-data-access", "version": "0.0.1", "peerDependencies": { "@angular/common": "^18.1.0", - "@angular/core": "^18.1.0" + "@angular/core": "^18.1.0", + "rxjs": "~7.5.0", + "@rx-angular/state": "18.0.0", + "@app-speed/shared/websocket-util-lib": "0.0.1", + "jest-preset-angular": "14.1.0" }, "sideEffects": false } diff --git a/packages/portal/data-access/project.json b/packages/portal/data-access/project.json index f5772510..fa50c260 100644 --- a/packages/portal/data-access/project.json +++ b/packages/portal/data-access/project.json @@ -1,23 +1,23 @@ { - "name": "portal-data-access", + "name": "portal-data-access-lib", "$schema": "../../../node_modules/nx/schemas/project-schema.json", + "projectType": "library", "sourceRoot": "packages/portal/data-access/src", "prefix": "lib", - "projectType": "library", "tags": [], "targets": { "build": { "executor": "@nx/angular:ng-packagr-lite", "outputs": ["{workspaceRoot}/dist/{projectRoot}"], "options": { - "project": "packages/portal/data-access/ng-package.json" + "project": "{projectRoot}/ng-package.json" }, "configurations": { "production": { - "tsConfig": "packages/portal/data-access/tsconfig.lib.prod.json" + "tsConfig": "{projectRoot}/tsconfig.lib.prod.json" }, "development": { - "tsConfig": "packages/portal/data-access/tsconfig.lib.json" + "tsConfig": "{projectRoot}/tsconfig.lib.json" } }, "defaultConfiguration": "production" diff --git a/packages/portal/data-access/src/lib/scheduler/scheduler.service.ts b/packages/portal/data-access/src/lib/scheduler/scheduler.service.ts index 1e2b08ab..a450f7e5 100644 --- a/packages/portal/data-access/src/lib/scheduler/scheduler.service.ts +++ b/packages/portal/data-access/src/lib/scheduler/scheduler.service.ts @@ -1,11 +1,7 @@ import { Injectable } from '@angular/core'; import { webSocket } from 'rxjs/webSocket'; import { BehaviorSubject, filter, map, merge } from 'rxjs'; -import { - CONDUCTOR_STAGE, - isDoneStageChangeMessage, - isStageChangeMessage, -} from '@app-speed/shared/websocket-message-util-lib'; +import { CONDUCTOR_STAGE, isDoneStageChangeMessage, isStageChangeMessage } from '@app-speed/shared/websocket-util-lib'; const STAGE = { BUILDING: 'building', diff --git a/packages/portal/data-access/tsconfig.json b/packages/portal/data-access/tsconfig.json index fde35eab..97793397 100644 --- a/packages/portal/data-access/tsconfig.json +++ b/packages/portal/data-access/tsconfig.json @@ -1,4 +1,5 @@ { + "extends": "../../../tsconfig.base.json", "compilerOptions": { "target": "es2022", "forceConsistentCasingInFileNames": true, @@ -18,7 +19,6 @@ "path": "./tsconfig.spec.json" } ], - "extends": "../../../tsconfig.base.json", "angularCompilerOptions": { "enableI18nLegacyMessageIdFormat": false, "strictInjectionParameters": true, diff --git a/packages/portal/feature/audit-builder/src/audit-builder/audit-builder.container.ts b/packages/portal/feature/audit-builder/src/audit-builder/audit-builder.container.ts index af41ffa4..be5c7072 100644 --- a/packages/portal/feature/audit-builder/src/audit-builder/audit-builder.container.ts +++ b/packages/portal/feature/audit-builder/src/audit-builder/audit-builder.container.ts @@ -27,7 +27,7 @@ import { DEFAULT_AUDIT_DETAILS } from '../schema/audit.constants'; import { AuditDetails } from '../schema/types'; import { rxEffects } from '@rx-angular/state/effects'; import { MatProgressSpinner } from '@angular/material/progress-spinner'; -import { SchedulerService } from '@portal/data-access'; +import { SchedulerService } from '@app-speed/portal-data-access'; @Component({ selector: 'builder-form', diff --git a/packages/portal/feature/audit-viewer/src/container/audit-viewer.container.ts b/packages/portal/feature/audit-viewer/src/container/audit-viewer.container.ts index fa64a971..a0d9fd29 100644 --- a/packages/portal/feature/audit-viewer/src/container/audit-viewer.container.ts +++ b/packages/portal/feature/audit-viewer/src/container/audit-viewer.container.ts @@ -12,7 +12,7 @@ import { toObservable, toSignal } from '@angular/core/rxjs-interop'; import { filter, map, switchMap } from 'rxjs'; import { HttpClient } from '@angular/common/http'; import { JsonPipe } from '@angular/common'; -import { S3_RESULTS_BUCKET_URL } from '@portal/data-access'; +import { S3_RESULTS_BUCKET_URL } from '@app-speed/portal-data-access'; @Component({ selector: 'viewer-container', diff --git a/packages/portal/feature/audit-viewer/src/ui/table.component.ts b/packages/portal/feature/audit-viewer/src/ui/table.component.ts index b8ee915e..ad2b0a78 100644 --- a/packages/portal/feature/audit-viewer/src/ui/table.component.ts +++ b/packages/portal/feature/audit-viewer/src/ui/table.component.ts @@ -13,7 +13,7 @@ import { MatTable, } from '@angular/material/table'; import { JsonPipe, NgFor } from '@angular/common'; -import { ScrollContainerComponent } from '@portal/ui/scroll-container'; +import { ScrollContainerComponent } from '@app-speed/portal-ui/scroll-container'; import { RoundPipe } from '../utils/round.pipe'; import { KibibytesPipe } from '../utils/kibibytes.pipe'; diff --git a/packages/portal/feature/audit-viewer/src/viewer-container/audit-summary.component.ts b/packages/portal/feature/audit-viewer/src/viewer-container/audit-summary.component.ts index 084fbc7e..dd81ac1b 100644 --- a/packages/portal/feature/audit-viewer/src/viewer-container/audit-summary.component.ts +++ b/packages/portal/feature/audit-viewer/src/viewer-container/audit-summary.component.ts @@ -15,8 +15,8 @@ import { } from '@angular/material/table'; import { MatIcon } from '@angular/material/icon'; import { MatCard, MatCardContent, MatCardHeader, MatCardTitle } from '@angular/material/card'; -import { ScrollContainerComponent } from '@portal/ui/scroll-container'; -import { RadialChartComponent } from '@portal/ui/radial-chart'; +import { ScrollContainerComponent } from '@app-speed/portal-ui/scroll-container'; +import { RadialChartComponent } from '@app-speed/portal-ui/radial-chart'; import { ViewerScoreComponent } from './viewer-score.component'; export type StepSummary = { diff --git a/packages/portal/feature/audit-viewer/src/viewer-container/view-step-details.adaptor.ts b/packages/portal/feature/audit-viewer/src/viewer-container/view-step-details.adaptor.ts index cfa98cdd..40c2c8e4 100644 --- a/packages/portal/feature/audit-viewer/src/viewer-container/view-step-details.adaptor.ts +++ b/packages/portal/feature/audit-viewer/src/viewer-container/view-step-details.adaptor.ts @@ -1,5 +1,5 @@ import { Result as AuditResult } from 'lighthouse/types/lhr/audit-result'; -import { STATUS, StatusOptions } from '@portal/ui/status-badge'; +import { STATUS, StatusOptions } from '@app-speed/portal-ui/status-badge'; import { FlowResult, Result } from 'lighthouse'; import { MetricSummary } from './viewer-step-metric-summary.component'; diff --git a/packages/portal/feature/audit-viewer/src/viewer-container/viewer-diagnostic-panel.component.ts b/packages/portal/feature/audit-viewer/src/viewer-container/viewer-diagnostic-panel.component.ts index 23af3cf8..91e13937 100644 --- a/packages/portal/feature/audit-viewer/src/viewer-container/viewer-diagnostic-panel.component.ts +++ b/packages/portal/feature/audit-viewer/src/viewer-container/viewer-diagnostic-panel.component.ts @@ -5,7 +5,7 @@ import { MatExpansionPanelHeader, MatExpansionPanelTitle, } from '@angular/material/expansion'; -import { StatusBadgeComponent, StatusOptions } from '@portal/ui/status-badge'; +import { StatusBadgeComponent, StatusOptions } from '@app-speed/portal-ui/status-badge'; import Details from 'lighthouse/types/lhr/audit-details'; import { MdToAnkerPipe } from '../utils/md-to-anker.pipe'; import { DetailsComponent } from '../ui/details.component'; diff --git a/packages/portal/feature/audit-viewer/src/viewer-container/viewer-file-strip.component.ts b/packages/portal/feature/audit-viewer/src/viewer-container/viewer-file-strip.component.ts index 194651c1..972daad9 100644 --- a/packages/portal/feature/audit-viewer/src/viewer-container/viewer-file-strip.component.ts +++ b/packages/portal/feature/audit-viewer/src/viewer-container/viewer-file-strip.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, Component, input } from '@angular/core'; -import { ScrollContainerComponent } from '@portal/ui/scroll-container'; +import { ScrollContainerComponent } from '@app-speed/portal-ui/scroll-container'; @Component({ selector: 'viewer-file-strip', diff --git a/packages/portal/feature/audit-viewer/src/viewer-container/viewer-score.component.ts b/packages/portal/feature/audit-viewer/src/viewer-container/viewer-score.component.ts index 7dac0859..0b970880 100644 --- a/packages/portal/feature/audit-viewer/src/viewer-container/viewer-score.component.ts +++ b/packages/portal/feature/audit-viewer/src/viewer-container/viewer-score.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, input } from '@angular/core'; import { MatIcon } from '@angular/material/icon'; -import { RadialChartComponent } from '@portal/ui/radial-chart'; +import { RadialChartComponent } from '@app-speed/portal-ui/radial-chart'; import { Result } from 'lighthouse'; @Component({ diff --git a/packages/portal/feature/audit-viewer/src/viewer-container/viewer-step-details.component.ts b/packages/portal/feature/audit-viewer/src/viewer-container/viewer-step-details.component.ts index a80ae554..80fd4eb5 100644 --- a/packages/portal/feature/audit-viewer/src/viewer-container/viewer-step-details.component.ts +++ b/packages/portal/feature/audit-viewer/src/viewer-container/viewer-step-details.component.ts @@ -5,7 +5,7 @@ import { Result as AuditResult } from 'lighthouse/types/lhr/audit-result'; import { MatCard, MatCardContent, MatCardHeader, MatCardTitle } from '@angular/material/card'; import { MatIcon } from '@angular/material/icon'; -import { StatusOptions, STATUS } from '@portal/ui/status-badge'; +import { StatusOptions, STATUS } from '@app-speed/portal-ui/status-badge'; import { MetricSummary, ViewerStepMetricSummaryComponent } from './viewer-step-metric-summary.component'; import { ViewerFileStripComponent } from './viewer-file-strip.component'; import { ViewerDiagnosticComponent } from './viewer-diagnostic.component'; diff --git a/packages/portal/feature/audit-viewer/src/viewer-container/viewer-step-metric-summary.component.ts b/packages/portal/feature/audit-viewer/src/viewer-container/viewer-step-metric-summary.component.ts index a58e31a0..b24d72ed 100644 --- a/packages/portal/feature/audit-viewer/src/viewer-container/viewer-step-metric-summary.component.ts +++ b/packages/portal/feature/audit-viewer/src/viewer-container/viewer-step-metric-summary.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, computed, input, signal } from '@angular/core'; import { MatIcon } from '@angular/material/icon'; -import { StatusBadgeComponent, StatusOptions, STATUS_COLOR } from '@portal/ui/status-badge'; +import { StatusBadgeComponent, StatusOptions, STATUS_COLOR } from '@app-speed/portal-ui/status-badge'; import { MdToAnkerPipe } from '../utils/md-to-anker.pipe'; export type MetricSummary = { diff --git a/packages/portal/feature/ng-package.json b/packages/portal/feature/ng-package.json index 0f2becb2..9514c386 100644 --- a/packages/portal/feature/ng-package.json +++ b/packages/portal/feature/ng-package.json @@ -1,6 +1,6 @@ { - "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../dist/libs/feature", + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/feature", "lib": { "entryFile": "public_api.ts" } diff --git a/packages/portal/feature/package.json b/packages/portal/feature/package.json index 6b20f804..4f9db51f 100644 --- a/packages/portal/feature/package.json +++ b/packages/portal/feature/package.json @@ -1,5 +1,5 @@ { - "name": "@app-speed/feature", + "name": "@app-speed/portal-feature", "version": "0.0.1", "peerDependencies": { "rxjs": "~7.5.0", @@ -11,9 +11,7 @@ "@angular/forms": "18.1.4", "@rx-angular/template": "18.0.0", "lighthouse": "^12.2.0", - "@app-speed/ui": "0.0.0", - "@angular/platform-browser": "18.1.4", - "@app-speed/data-access": "0.0.1" + "@angular/platform-browser": "18.1.4" }, "sideEffects": false } diff --git a/packages/portal/feature/project.json b/packages/portal/feature/project.json index f9a2595b..940bc369 100644 --- a/packages/portal/feature/project.json +++ b/packages/portal/feature/project.json @@ -1,24 +1,24 @@ { - "name": "feature", - "$schema": "../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "libs/feature/src", + "name": "portal-feature-lib", + "$schema": "../../../node_modules/nx/schemas/project-schema.json", + "sourceRoot": "packages/portal/feature", "prefix": "lib", "projectType": "library", "tags": [], "targets": { "build": { - "executor": "@nx/angular:package", + "executor": "@nx/angular:ng-packagr-lite", "outputs": ["{workspaceRoot}/dist/{projectRoot}"], "options": { - "project": "packages/feature/ng-package.json", - "tsConfig": "packages/feature/tsconfig.json" + "project": "{projectRoot}/ng-package.json", + "tsConfig": "{projectRoot}/tsconfig.json" }, "configurations": { "production": { - "tsConfig": "packages/feature/tsconfig.lib.prod.json" + "tsConfig": "{projectRoot}/tsconfig.lib.prod.json" }, "development": { - "tsConfig": "packages/feature/tsconfig.lib.json" + "tsConfig": "{projectRoot}/tsconfig.lib.json" } }, "defaultConfiguration": "production" diff --git a/packages/portal/feature/user-flow/src/lib/user-flow.component.ts b/packages/portal/feature/user-flow/src/lib/user-flow.component.ts index a6bb31c9..bff58ae1 100644 --- a/packages/portal/feature/user-flow/src/lib/user-flow.component.ts +++ b/packages/portal/feature/user-flow/src/lib/user-flow.component.ts @@ -1,11 +1,11 @@ import { Component, inject } from '@angular/core'; -import { AuditBuilderContainer } from '@portal/feature/audit-builder'; +import { AuditBuilderContainer } from '@app-speed/portal-feature/audit-builder'; import { MatCard, MatCardContent, MatCardHeader, MatCardSubtitle, MatCardTitle } from '@angular/material/card'; import { MatProgressSpinner } from '@angular/material/progress-spinner'; import { RxIf } from '@rx-angular/template/if'; import { RxPush } from '@rx-angular/template/push'; -import { SchedulerService } from '@portal/data-access'; -import { AuditViewerContainer } from '@portal/feature/audit-viewer'; +import { SchedulerService } from '@app-speed/portal-data-access'; +import { AuditViewerContainer } from '@app-speed/portal-feature/audit-viewer'; import { StageIndicatorComponent } from './stage-indicator.component'; @Component({ diff --git a/packages/portal/feature/viewer/src/viewer.component.ts b/packages/portal/feature/viewer/src/viewer.component.ts index f86d99bb..99db23cb 100644 --- a/packages/portal/feature/viewer/src/viewer.component.ts +++ b/packages/portal/feature/viewer/src/viewer.component.ts @@ -6,14 +6,14 @@ import { MatFabButton } from '@angular/material/button'; import { MatInput } from '@angular/material/input'; import { RxIf } from '@rx-angular/template/if'; import { Router } from '@angular/router'; -import { AuditViewerContainer, FlowResultComponent } from '@portal/feature/audit-viewer'; +import { AuditViewerContainer, FlowResultComponent } from '@app-speed/portal-feature/audit-viewer'; import { toObservable } from '@angular/core/rxjs-interop'; import { FlowResult } from 'lighthouse'; import { filter, map, Observable, switchMap } from 'rxjs'; import { HttpClient } from '@angular/common/http'; import { MatProgressSpinner } from '@angular/material/progress-spinner'; import { NgIf } from '@angular/common'; -import { S3_RESULTS_BUCKET_URL } from '@portal/data-access'; +import { S3_RESULTS_BUCKET_URL } from '@app-speed/portal-data-access'; @Component({ standalone: true, diff --git a/packages/portal/ui/jest.config.ts b/packages/portal/ui/jest.config.ts index 849aaa91..2206da7f 100644 --- a/packages/portal/ui/jest.config.ts +++ b/packages/portal/ui/jest.config.ts @@ -1,7 +1,7 @@ /* eslint-disable */ export default { displayName: 'ui', - preset: '../../jest.preset.js', + preset: '../../../jest.preset.js', setupFilesAfterEnv: ['/src/test-setup.ts'], globals: {}, coverageDirectory: '../../coverage/libs/ui', diff --git a/packages/portal/ui/ng-package.json b/packages/portal/ui/ng-package.json index d48751d1..8c287479 100644 --- a/packages/portal/ui/ng-package.json +++ b/packages/portal/ui/ng-package.json @@ -1,6 +1,6 @@ { - "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../dist/packages/ui", + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/packages/portal/ui", "lib": { "entryFile": "src/index.ts" } diff --git a/packages/portal/ui/package.json b/packages/portal/ui/package.json index 1c9c2bd3..eab81574 100644 --- a/packages/portal/ui/package.json +++ b/packages/portal/ui/package.json @@ -1,7 +1,6 @@ { - "name": "@app-speed/ui", + "name": "@app-speed/portal-ui", "version": "0.0.0", - "description": "App Speed UI library", "peerDependencies": { "@angular/common": "^15.0.0", "@angular/core": "^15.0.0", @@ -10,5 +9,5 @@ "dependencies": { "tslib": "^2.3.0" }, - "author": "Christopher Holder" + "sideEffects": false } diff --git a/packages/portal/ui/project.json b/packages/portal/ui/project.json index 5d7cfb0c..cf216466 100644 --- a/packages/portal/ui/project.json +++ b/packages/portal/ui/project.json @@ -1,23 +1,23 @@ { - "name": "ui-lib", + "name": "portal-ui-lib", "$schema": "../../../node_modules/nx/schemas/project-schema.json", "projectType": "library", - "sourceRoot": "packages/ui", + "sourceRoot": "packages/portal/ui/src", "prefix": "ui", "tags": ["frontend"], "targets": { "build": { - "executor": "@nx/angular:package", + "executor": "@nx/angular:ng-packagr-lite", "outputs": ["{workspaceRoot}/dist/{projectRoot}"], "options": { - "project": "{workspaceRoot}/{projectRoot}/ng-package.json" + "project": "{projectRoot}/ng-package.json" }, "configurations": { "production": { - "tsConfig": "{workspaceRoot}/{projectRoot}/tsconfig.lib.prod.json" + "tsConfig": "{projectRoot}/tsconfig.lib.prod.json" }, "development": { - "tsConfig": "{workspaceRoot}/{projectRoot}/tsconfig.lib.json" + "tsConfig": "{projectRoot}/tsconfig.lib.json" } }, "defaultConfiguration": "production" diff --git a/packages/portal/ui/tsconfig.lib.json b/packages/portal/ui/tsconfig.lib.json index 8597bfa0..9ccb9b71 100644 --- a/packages/portal/ui/tsconfig.lib.json +++ b/packages/portal/ui/tsconfig.lib.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../dist/out-tsc", + "outDir": "../../../dist/out-tsc", "declaration": true, "declarationMap": true, "inlineSources": true, diff --git a/packages/runner/data-access-queue/project.json b/packages/runner/data-access-queue/project.json index 22d01d4b..becf1b71 100644 --- a/packages/runner/data-access-queue/project.json +++ b/packages/runner/data-access-queue/project.json @@ -12,8 +12,7 @@ "outputPath": "dist/{projectRoot}", "main": "{projectRoot}/src/index.ts", "tsConfig": "{projectRoot}/tsconfig.lib.json", - "assets": ["{projectRoot}/*.md"], - "generatePackageJson": true + "assets": ["{projectRoot}/*.md"] } }, "lint": { @@ -30,7 +29,7 @@ ], "options": { "passWithNoTests": true, - "coverage.reportsDirectory": "../../../coverage/packages/audit-queue" + "coverage.reportsDirectory": "../../../coverage/{projectRoot}" } } } diff --git a/packages/runner/data-access-store/project.json b/packages/runner/data-access-store/project.json index 44bf04e7..2db68656 100644 --- a/packages/runner/data-access-store/project.json +++ b/packages/runner/data-access-store/project.json @@ -30,7 +30,7 @@ ], "options": { "passWithNoTests": true, - "coverage.reportsDirectory": "../../../coverage/packages/audit-store" + "coverage.reportsDirectory": "../../../coverage/{projectRoot}" } } } diff --git a/packages/runner/feature-user-flow-replay/project.json b/packages/runner/feature-user-flow-replay/project.json index baa36960..cf32b489 100644 --- a/packages/runner/feature-user-flow-replay/project.json +++ b/packages/runner/feature-user-flow-replay/project.json @@ -29,7 +29,7 @@ ], "options": { "passWithNoTests": true, - "coverage.reportsDirectory": "../../../coverage/packages/user-flow-replay" + "coverage.reportsDirectory": "../../../coverage/{projectRoot}" } } } diff --git a/packages/runner/util-middleware/project.json b/packages/runner/util-middleware/project.json index 9dabb465..b049136c 100644 --- a/packages/runner/util-middleware/project.json +++ b/packages/runner/util-middleware/project.json @@ -1,5 +1,5 @@ { - "name": "runner-middleware", + "name": "runner-middleware-lib", "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "packages/runner/util-middleware/src", "projectType": "library", @@ -12,8 +12,7 @@ "outputPath": "dist/{projectRoot}", "main": "{projectRoot}/src/index.ts", "tsConfig": "{projectRoot}/tsconfig.lib.json", - "assets": ["{projectRoot}/*.md"], - "generatePackageJson": true + "assets": ["{projectRoot}/*.md"] } }, "lint": { @@ -30,7 +29,7 @@ ], "options": { "passWithNoTests": true, - "coverage.reportsDirectory": "../../../coverage/packages/cli-middleware" + "coverage.reportsDirectory": "../../../coverage/{projectRoot}" } } } diff --git a/packages/runner/util-middleware/src/lib/dialog.ts b/packages/runner/util-middleware/src/lib/dialog.ts index 78c1a5f1..dc562295 100644 --- a/packages/runner/util-middleware/src/lib/dialog.ts +++ b/packages/runner/util-middleware/src/lib/dialog.ts @@ -1,5 +1,5 @@ import { ApiGatewayManagementApiClient, PostToConnectionCommand } from '@aws-sdk/client-apigatewaymanagementapi'; -import { StageChangeMessage, CONDUCTOR_STAGE } from '@app-speed/shared/websocket-message-util-lib'; +import { StageChangeMessage, CONDUCTOR_STAGE } from '@app-speed/shared/websocket-util-lib'; export async function sendAuditResults(connectionId: string, endpoint: string, resultsKey: string): Promise { const responseData: StageChangeMessage = { diff --git a/packages/shared/data-access/package.json b/packages/shared/data-access/package.json index e85bc14a..3e1c73d0 100644 --- a/packages/shared/data-access/package.json +++ b/packages/shared/data-access/package.json @@ -1,9 +1,7 @@ { "name": "@app-speed/shared/data-access", "version": "0.0.1", - "dependencies": { - "tslib": "^2.3.0" - }, + "dependencies": {}, "type": "commonjs", "main": "./src/index.js", "typings": "./src/index.d.ts", diff --git a/packages/shared/data-access/project.json b/packages/shared/data-access/project.json index 67a3429c..07586676 100644 --- a/packages/shared/data-access/project.json +++ b/packages/shared/data-access/project.json @@ -9,9 +9,9 @@ "executor": "@nx/js:tsc", "outputs": ["{options.outputPath}"], "options": { - "outputPath": "dist/packages/shared/data-access", - "main": "packages/shared/data-access/src/index.ts", - "tsConfig": "packages/shared/data-access/tsconfig.lib.json", + "outputPath": "dist/{projectRoot}", + "main": "{projectRoot}/src/index.ts", + "tsConfig": "{projectRoot}/tsconfig.lib.json", "assets": [] } } diff --git a/packages/shared/websocket-message-util-lib/.eslintrc.json b/packages/shared/websocket-message-util-lib/.eslintrc.json deleted file mode 100644 index 3456be9b..00000000 --- a/packages/shared/websocket-message-util-lib/.eslintrc.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "extends": ["../../../.eslintrc.json"], - "ignorePatterns": ["!**/*"], - "overrides": [ - { - "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], - "rules": {} - }, - { - "files": ["*.ts", "*.tsx"], - "rules": {} - }, - { - "files": ["*.js", "*.jsx"], - "rules": {} - } - ] -} diff --git a/packages/shared/websocket-message-util-lib/project.json b/packages/shared/websocket-message-util-lib/project.json deleted file mode 100644 index eb1f40fc..00000000 --- a/packages/shared/websocket-message-util-lib/project.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "shared-websocket-message-util-lib", - "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "projectType": "library", - "sourceRoot": "packages/shared/websocket-message-util-lib/src", - "target": { - "lint": { - "executor": "@nx/eslint:lint", - "outputs": ["{options.outputFile}"] - } - }, - "tags": [], - "targets": { - "build": { - "executor": "@nx/js:tsc", - "outputs": ["{options.outputPath}"], - "options": { - "outputPath": "dist/{projectRoot}", - "main": "{projectRoot}/src/index.ts", - "tsConfig": "{projectRoot}/tsconfig.lib.json", - "assets": [] - } - } - } -} diff --git a/packages/shared/websocket-message-util-lib/tsconfig.json b/packages/shared/websocket-message-util-lib/tsconfig.json deleted file mode 100644 index f6afef0e..00000000 --- a/packages/shared/websocket-message-util-lib/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "files": [], - "include": [], - "references": [ - { - "path": "./tsconfig.lib.json" - }, - ] -} diff --git a/packages/shared/websocket-message-util-lib/tsconfig.lib.json b/packages/shared/websocket-message-util-lib/tsconfig.lib.json deleted file mode 100644 index 8f9c818e..00000000 --- a/packages/shared/websocket-message-util-lib/tsconfig.lib.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "../../../dist/out-tsc", - "declaration": true, - "types": ["node"] - }, - "include": ["src/**/*.ts"], - "exclude": ["src/**/*.spec.ts", "src/**/*.test.ts"] -} diff --git a/packages/shared/websocket-util-lib/.eslintrc.json b/packages/shared/websocket-util-lib/.eslintrc.json new file mode 100644 index 00000000..222a84b5 --- /dev/null +++ b/packages/shared/websocket-util-lib/.eslintrc.json @@ -0,0 +1,43 @@ +{ + "extends": ["../../../.eslintrc.json"], + "ignorePatterns": ["!**/*"], + "overrides": [ + { + "files": ["*.ts"], + "parserOptions": { + "project": ["packages/shared/websocket-util-lib/tsconfig.*?.json"] + }, + "extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"], + "rules": { + "@angular-eslint/directive-selector": [ + "error", + { + "type": "attribute", + "prefix": "lib", + "style": "camelCase" + } + ], + "@angular-eslint/component-selector": [ + "error", + { + "type": "element", + "prefix": "lib", + "style": "kebab-case" + } + ] + } + }, + { + "files": ["*.html"], + "extends": ["plugin:@nx/angular-template"], + "rules": {} + }, + { + "files": ["*.json"], + "parser": "jsonc-eslint-parser", + "rules": { + "@nx/dependency-checks": "error" + } + } + ] +} diff --git a/packages/shared/websocket-util-lib/README.md b/packages/shared/websocket-util-lib/README.md new file mode 100644 index 00000000..c4499df6 --- /dev/null +++ b/packages/shared/websocket-util-lib/README.md @@ -0,0 +1,3 @@ +# websocket-util-lib + +This library was generated with [Nx](https://nx.dev). diff --git a/packages/shared/websocket-util-lib/ng-package.json b/packages/shared/websocket-util-lib/ng-package.json new file mode 100644 index 00000000..a46d9a74 --- /dev/null +++ b/packages/shared/websocket-util-lib/ng-package.json @@ -0,0 +1,7 @@ +{ + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/packages/shared/websocket-util-lib", + "lib": { + "entryFile": "src/index.ts" + } +} diff --git a/packages/shared/websocket-util-lib/package.json b/packages/shared/websocket-util-lib/package.json new file mode 100644 index 00000000..619a3993 --- /dev/null +++ b/packages/shared/websocket-util-lib/package.json @@ -0,0 +1,6 @@ +{ + "name": "@app-speed/shared/websocket-util-lib", + "version": "0.0.1", + "peerDependencies": {}, + "sideEffects": false +} diff --git a/packages/shared/websocket-util-lib/project.json b/packages/shared/websocket-util-lib/project.json new file mode 100644 index 00000000..e253a471 --- /dev/null +++ b/packages/shared/websocket-util-lib/project.json @@ -0,0 +1,29 @@ +{ + "name": "websocket-util-lib", + "$schema": "../../../node_modules/nx/schemas/project-schema.json", + "sourceRoot": "packages/shared/websocket-util-lib/src", + "prefix": "lib", + "projectType": "library", + "tags": [], + "targets": { + "build": { + "executor": "@nx/angular:ng-packagr-lite", + "outputs": ["{workspaceRoot}/dist/{projectRoot}"], + "options": { + "project": "packages/shared/websocket-util-lib/ng-package.json" + }, + "configurations": { + "production": { + "tsConfig": "packages/shared/websocket-util-lib/tsconfig.lib.prod.json" + }, + "development": { + "tsConfig": "packages/shared/websocket-util-lib/tsconfig.lib.json" + } + }, + "defaultConfiguration": "production" + }, + "lint": { + "executor": "@nx/eslint:lint" + } + } +} diff --git a/packages/shared/websocket-message-util-lib/src/index.ts b/packages/shared/websocket-util-lib/src/index.ts similarity index 100% rename from packages/shared/websocket-message-util-lib/src/index.ts rename to packages/shared/websocket-util-lib/src/index.ts diff --git a/packages/shared/websocket-message-util-lib/src/lib/constants.ts b/packages/shared/websocket-util-lib/src/lib/constants.ts similarity index 100% rename from packages/shared/websocket-message-util-lib/src/lib/constants.ts rename to packages/shared/websocket-util-lib/src/lib/constants.ts diff --git a/packages/shared/websocket-message-util-lib/src/lib/types.ts b/packages/shared/websocket-util-lib/src/lib/types.ts similarity index 83% rename from packages/shared/websocket-message-util-lib/src/lib/types.ts rename to packages/shared/websocket-util-lib/src/lib/types.ts index 44391324..3cb38328 100644 --- a/packages/shared/websocket-message-util-lib/src/lib/types.ts +++ b/packages/shared/websocket-util-lib/src/lib/types.ts @@ -24,7 +24,7 @@ export type { StageChangeMessage, ConductorStages }; // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error // eslint-disable-next-line @typescript-eslint/no-unused-vars -const invalidStageChangeMessage: StageChangeMessage = { +const invalidStageChangeMessageMissingStage: StageChangeMessage = { type: 'stage-change', }; @@ -46,15 +46,6 @@ const runningStageChangeMessage: StageChangeMessage stage: CONDUCTOR_STAGE.RUNNING, }; -// Should error because DoneStageChangeMessage requires a key property -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-expect-error -// eslint-disable-next-line @typescript-eslint/no-unused-vars -const invalidStageChangeMessage: StageChangeMessage = { - type: 'stage-change', - stage: CONDUCTOR_STAGE.DONE, -}; - // eslint-disable-next-line @typescript-eslint/no-unused-vars const doneStageChangeChangeMessage: StageChangeMessage = { type: 'stage-change', diff --git a/packages/shared/websocket-message-util-lib/src/lib/utils.ts b/packages/shared/websocket-util-lib/src/lib/utils.ts similarity index 100% rename from packages/shared/websocket-message-util-lib/src/lib/utils.ts rename to packages/shared/websocket-util-lib/src/lib/utils.ts diff --git a/packages/shared/websocket-util-lib/tsconfig.json b/packages/shared/websocket-util-lib/tsconfig.json new file mode 100644 index 00000000..0afd0cca --- /dev/null +++ b/packages/shared/websocket-util-lib/tsconfig.json @@ -0,0 +1,25 @@ +{ + "compilerOptions": { + "target": "es2022", + "forceConsistentCasingInFileNames": true, + "strict": true, + "noImplicitOverride": true, + "noPropertyAccessFromIndexSignature": true, + "noImplicitReturns": true, + "noFallthroughCasesInSwitch": true + }, + "files": [], + "include": [], + "references": [ + { + "path": "./tsconfig.lib.json" + } + ], + "extends": "../../../tsconfig.base.json", + "angularCompilerOptions": { + "enableI18nLegacyMessageIdFormat": false, + "strictInjectionParameters": true, + "strictInputAccessModifiers": true, + "strictTemplates": true + } +} diff --git a/packages/shared/websocket-util-lib/tsconfig.lib.json b/packages/shared/websocket-util-lib/tsconfig.lib.json new file mode 100644 index 00000000..f68063a5 --- /dev/null +++ b/packages/shared/websocket-util-lib/tsconfig.lib.json @@ -0,0 +1,12 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../dist/out-tsc", + "declaration": true, + "declarationMap": true, + "inlineSources": true, + "types": [] + }, + "exclude": ["src/**/*.spec.ts", "jest.config.ts", "src/**/*.test.ts"], + "include": ["src/**/*.ts"] +} diff --git a/packages/shared/websocket-util-lib/tsconfig.lib.prod.json b/packages/shared/websocket-util-lib/tsconfig.lib.prod.json new file mode 100644 index 00000000..61b52378 --- /dev/null +++ b/packages/shared/websocket-util-lib/tsconfig.lib.prod.json @@ -0,0 +1,7 @@ +{ + "extends": "./tsconfig.lib.json", + "compilerOptions": { + "declarationMap": false + }, + "angularCompilerOptions": {} +} diff --git a/tsconfig.base.json b/tsconfig.base.json index 1a5f289a..fd940e76 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -16,17 +16,17 @@ "@app-speed/conductor/shared-util-lib": ["packages/conductor/shared-util-lib/src/index.ts"], "@app-speed/conductor/socket-io-ser": ["packages/conductor/socket-io-ser/src/index.ts"], "@app-speed/shared/data-access": ["packages/shared/data-access/src/index.ts"], - "@app-speed/shared/websocket-message-util-lib": ["packages/shared/websocket-message-util-lib/src/index.ts"], - "@portal/data-access": ["packages/portal/data-access/src/index.ts"], - "@portal/feature/audit-builder": ["packages/portal/feature/audit-builder/src/index.ts"], - "@portal/feature/audit-viewer": ["packages/portal/feature/audit-viewer/src/index.ts"], - "@portal/feature/user-flow": ["packages/portal/feature/user-flow/src/index.ts"], - "@portal/feature/viewer": ["packages/portal/feature/viewer/src/index.ts"], - "@portal/ui/loading-spinner": ["packages/portal/ui/loading-spinner/public-api.ts"], - "@portal/ui/radial-chart": ["packages/portal/ui/radial-chart/public-api.ts"], - "@portal/ui/scroll-container": ["packages/portal/ui/scroll-container/public-api.ts"], - "@portal/ui/shell": ["packages/portal/ui/shell/public-api.ts"], - "@portal/ui/status-badge": ["packages/portal/ui/status-badge/public-api.ts"], + "@app-speed/shared/websocket-util-lib": ["packages/shared/websocket-util-lib/src/index.ts"], + "@app-speed/portal-data-access": ["packages/portal/data-access/src/index.ts"], + "@app-speed/portal-feature/audit-builder": ["packages/portal/feature/audit-builder/src/index.ts"], + "@app-speed/portal-feature/audit-viewer": ["packages/portal/feature/audit-viewer/src/index.ts"], + "@app-speed/portal-feature/user-flow": ["packages/portal/feature/user-flow/src/index.ts"], + "@app-speed/portal-feature/viewer": ["packages/portal/feature/viewer/src/index.ts"], + "@app-speed/portal-ui/loading-spinner": ["packages/portal/ui/loading-spinner/public-api.ts"], + "@app-speed/portal-ui/radial-chart": ["packages/portal/ui/radial-chart/public-api.ts"], + "@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/*"],