diff --git a/.eslintrc.json b/.eslintrc.json index b83a165a..22c9556b 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -33,6 +33,12 @@ "jest": true }, "rules": {} + }, + { + "files": ["*.ts"], + "rules": { + "@angular-eslint/prefer-standalone": "off" + } } ], "extends": ["./.eslintrc.base.json"] diff --git a/.gitignore b/.gitignore index 5dda4dbb..f52a366b 100644 --- a/.gitignore +++ b/.gitignore @@ -39,5 +39,6 @@ testem.log Thumbs.db .nx/cache +.nx/workspace-data .angular .dev.env diff --git a/.prettierignore b/.prettierignore index 103bd516..3cde4798 100644 --- a/.prettierignore +++ b/.prettierignore @@ -3,3 +3,5 @@ /coverage /.nx/cache .angular + +/.nx/workspace-data diff --git a/README.md b/README.md index 9bdbabaf..219146a1 100644 --- a/README.md +++ b/README.md @@ -23,24 +23,10 @@ $ npm run seed:run ## Running the example app ```bash -# build plugin -$ npm run json-api-nestjs:build - # dev server -$ npm run example:serve +$ npm run demo:json-api ``` - -## Test - -```bash -# unit tests -$ nx test json-api-nestjs - -# test coverage -$ nx test json-api-nestjs --coverage -``` - ## License The plugin is [MIT licensed](LICENSE). diff --git a/apps/json-api-front/.eslintrc.json b/apps/json-api-front/.eslintrc.json index 28ba63f8..4fe44a0f 100644 --- a/apps/json-api-front/.eslintrc.json +++ b/apps/json-api-front/.eslintrc.json @@ -24,7 +24,8 @@ "prefix": "nestjs-json-api", "style": "kebab-case" } - ] + ], + "@angular-eslint/prefer-standalone": "off" } }, { diff --git a/apps/json-api-front/src/app/app.component.ts b/apps/json-api-front/src/app/app.component.ts index 43a3508d..52b76743 100644 --- a/apps/json-api-front/src/app/app.component.ts +++ b/apps/json-api-front/src/app/app.component.ts @@ -1,12 +1,12 @@ import { Component, inject, OnInit } from '@angular/core'; import { NxWelcomeComponent } from './nx-welcome.component'; import { JsonApiSdkService } from 'json-api-nestjs-sdk'; -import { AtomicFactory } from 'json-api-nestjs-sdk/json-api-nestjs-sdk.module'; +import { AtomicFactory } from 'json-api-nestjs-sdk/ngModule'; import { JSON_RPC, RPC_BATCH, Rpc, -} from '@klerick/nestjs-json-rpc-sdk/json-rpc-sdk.module'; +} from '@klerick/nestjs-json-rpc-sdk/ngModule'; import { RpcService as IRpcService } from '@nestjs-json-api/type-for-rpc'; import { switchMap } from 'rxjs'; @@ -16,11 +16,11 @@ type RpcMap = { }; @Component({ - standalone: true, imports: [NxWelcomeComponent], selector: 'nestjs-json-api-root', templateUrl: './app.component.html', styleUrl: './app.component.css', + standalone: true, }) export class AppComponent implements OnInit { private JsonApiSdkService = inject(JsonApiSdkService); diff --git a/apps/json-api-front/src/app/app.config.ts b/apps/json-api-front/src/app/app.config.ts index e6d0f358..528da1b9 100644 --- a/apps/json-api-front/src/app/app.config.ts +++ b/apps/json-api-front/src/app/app.config.ts @@ -1,17 +1,14 @@ +import { ApplicationConfig, InjectionToken } from '@angular/core'; +import { provideJsonApi } from 'json-api-nestjs-sdk/ngModule'; import { - ApplicationConfig, - importProvidersFrom, - InjectionToken, -} from '@angular/core'; -import { JsonApiAngular } from 'json-api-nestjs-sdk/json-api-nestjs-sdk.module'; -import { - JsonRpcAngular, JsonRpcAngularConfig, TransportType, -} from '@klerick/nestjs-json-rpc-sdk/json-rpc-sdk.module'; + provideJsonRpc, +} from '@klerick/nestjs-json-rpc-sdk/ngModule'; import { Subject } from 'rxjs'; import { webSocket } from 'rxjs/webSocket'; import { io } from 'socket.io-client'; +import { provideHttpClient, withFetch } from '@angular/common/http'; const destroySubject = new Subject(); setTimeout(() => { @@ -58,21 +55,18 @@ const ioConfig: JsonRpcAngularConfig = { export const appConfig: ApplicationConfig = { providers: [ - importProvidersFrom( - JsonApiAngular.forRoot({ - apiHost: 'http://localhost:4200', - idKey: 'id', - apiPrefix: 'api', - operationUrl: 'operation', - }) - ), - importProvidersFrom( - JsonRpcAngular.forRoot( - // httpConfig - // wsConfig - // wsConfigWithToken, - ioConfig - ) + provideHttpClient(withFetch()), + provideJsonApi({ + apiHost: 'http://localhost:4200', + idKey: 'id', + apiPrefix: 'api', + operationUrl: 'operation', + }), + provideJsonRpc( + // httpConfig + // wsConfig + // wsConfigWithToken, + ioConfig ), ], }; diff --git a/apps/json-api-front/src/app/nx-welcome.component.ts b/apps/json-api-front/src/app/nx-welcome.component.ts index baac83a5..72dd1495 100644 --- a/apps/json-api-front/src/app/nx-welcome.component.ts +++ b/apps/json-api-front/src/app/nx-welcome.component.ts @@ -3,8 +3,8 @@ import { CommonModule } from '@angular/common'; @Component({ selector: 'nestjs-json-api-nx-welcome', - standalone: true, imports: [CommonModule], + standalone: true, template: `