Skip to content

Commit d38dd71

Browse files
committed
chore: update to Nx 19.2.3
1 parent 169b8de commit d38dd71

File tree

38 files changed

+2369
-2660
lines changed

38 files changed

+2369
-2660
lines changed

.eslintrc.json

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -290,25 +290,21 @@
290290
"simple-import-sort/imports": [
291291
"error",
292292
{
293-
"groups": [
294-
// Side effects.
295-
["^\\u0000"],
296-
// 3rd party.
297-
["^@?\\w"],
298-
// Anything not fitting group above.
299-
["^"],
300-
// Relative imports.
301-
["^\\."]
302-
]
293+
"groups": [["^\\u0000"], ["^@?\\w"], ["^"], ["^\\."]]
303294
}
304295
],
305-
"simple-import-sort/exports": "error"
296+
"simple-import-sort/exports": "error",
297+
"@typescript-eslint/no-extra-semi": "error",
298+
"no-extra-semi": "off"
306299
}
307300
},
308301
{
309302
"files": ["*.js", "*.jsx", "*.cjs"],
310303
"extends": ["plugin:@nx/javascript"],
311-
"rules": {}
304+
"rules": {
305+
"@typescript-eslint/no-extra-semi": "error",
306+
"no-extra-semi": "off"
307+
}
312308
}
313309
]
314310
}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ keys/*
6666
!.yarn/versions
6767

6868
.nx/cache
69+
.nx/workspace-data
6970
.flaskenv*
7071
!.env.vault
7172

.prettierignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@
55

66
/.nx/cache
77
*-template.yaml
8+
9+
/.nx/workspace-data

apps/auth/project.json

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"$schema": "../../node_modules/nx/schemas/project-schema.json",
44
"sourceRoot": "apps/auth/src",
55
"projectType": "application",
6+
"tags": ["scope:auth", "type:app", "platform:server"],
67
"targets": {
78
"build": {
89
"executor": "@nx/webpack:webpack",
@@ -17,7 +18,6 @@
1718
"target": "node",
1819
"compiler": "tsc",
1920
"webpackConfig": "apps/auth/webpack.config.cjs",
20-
"isolatedConfig": true,
2121
"babelUpwardRootMode": true
2222
},
2323
"configurations": {
@@ -55,15 +55,7 @@
5555
"defaultConfiguration": "local"
5656
},
5757
"lint": {
58-
"executor": "@nx/eslint:lint",
59-
"outputs": ["{options.outputFile}"],
60-
"options": {
61-
"lintFilePatterns": [
62-
"apps/auth/**/*.ts",
63-
"apps/auth/**/package.json",
64-
"apps/auth/**/project.json"
65-
]
66-
}
58+
"executor": "@nx/eslint:lint"
6759
},
6860
"test": {
6961
"executor": "@nx/jest:jest",
@@ -147,6 +139,5 @@
147139
"cwd": ".",
148140
"parallel": false
149141
}
150-
},
151-
"tags": ["scope:auth", "type:app", "platform:server"]
142+
}
152143
}

apps/auth/src/app/users/models/ory-identity.dto.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'created_at';
22
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
3-
import { Identity, IdentityState } from '@ory/client';
3+
import { Identity, IdentityStateEnum } from '@ory/client';
44
import { Expose, Type } from 'class-transformer';
55
import {
66
IsArray,
@@ -52,7 +52,7 @@ export class OryIdentityDto implements Identity {
5252
@IsString()
5353
@IsIn(['active', 'inactive'])
5454
@ApiPropertyOptional()
55-
state?: IdentityState;
55+
state?: IdentityStateEnum;
5656

5757
@Expose()
5858
@IsArray()

apps/expiration/project.json

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"$schema": "../../node_modules/nx/schemas/project-schema.json",
44
"sourceRoot": "apps/expiration/src",
55
"projectType": "application",
6+
"tags": ["scope:expiration", "type:app", "platform:server"],
67
"targets": {
78
"build": {
89
"executor": "@nx/webpack:webpack",
@@ -17,7 +18,6 @@
1718
"target": "node",
1819
"compiler": "tsc",
1920
"webpackConfig": "apps/expiration/webpack.config.cjs",
20-
"isolatedConfig": true,
2121
"babelUpwardRootMode": true
2222
},
2323
"configurations": {
@@ -55,15 +55,7 @@
5555
"defaultConfiguration": "local"
5656
},
5757
"lint": {
58-
"executor": "@nx/eslint:lint",
59-
"outputs": ["{options.outputFile}"],
60-
"options": {
61-
"lintFilePatterns": [
62-
"apps/expiration/**/*.ts",
63-
"apps/expiration/**/package.json",
64-
"apps/expiration/**/project.json"
65-
]
66-
}
58+
"executor": "@nx/eslint:lint"
6759
},
6860
"test": {
6961
"executor": "@nx/jest:jest",
@@ -139,6 +131,5 @@
139131
"cwd": ".",
140132
"parallel": false
141133
}
142-
},
143-
"tags": ["scope:expiration", "type:app", "platform:server"]
134+
}
144135
}

apps/ng-client-e2e/project.json

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
"$schema": "../../node_modules/nx/schemas/project-schema.json",
44
"sourceRoot": "apps/ng-client-e2e/src",
55
"projectType": "application",
6+
"tags": [],
7+
"implicitDependencies": ["ng-client"],
68
"targets": {
79
"e2e": {
810
"executor": "@nx/cypress:cypress",
@@ -17,13 +19,7 @@
1719
}
1820
},
1921
"lint": {
20-
"executor": "@nx/eslint:lint",
21-
"outputs": ["{options.outputFile}"],
22-
"options": {
23-
"lintFilePatterns": ["apps/ng-client-e2e/**/*.{js,ts}"]
24-
}
22+
"executor": "@nx/eslint:lint"
2523
}
26-
},
27-
"tags": [],
28-
"implicitDependencies": ["ng-client"]
24+
}
2925
}

apps/ng-client/project.json

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"projectType": "application",
55
"sourceRoot": "apps/ng-client/src",
66
"prefix": "ticketing",
7+
"tags": ["scope:client", "type:app", "platform:web"],
78
"targets": {
89
"build": {
910
"executor": "@angular-devkit/build-angular:browser",
@@ -122,13 +123,7 @@
122123
}
123124
},
124125
"lint": {
125-
"executor": "@nx/eslint:lint",
126-
"options": {
127-
"lintFilePatterns": [
128-
"apps/ng-client/src/**/*.ts",
129-
"apps/ng-client/src/**/*.html"
130-
]
131-
}
126+
"executor": "@nx/eslint:lint"
132127
},
133128
"test": {
134129
"executor": "@nx/jest:jest",
@@ -160,6 +155,5 @@
160155
"command": "docker push ghcr.io/getlarge/ticketing-ng-client:{args.tag}"
161156
}
162157
}
163-
},
164-
"tags": ["scope:client", "type:app", "platform:web"]
158+
}
165159
}

apps/ng-client/src/app/app.module.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
1+
import {
2+
HTTP_INTERCEPTORS,
3+
provideHttpClient,
4+
withInterceptorsFromDi,
5+
} from '@angular/common/http';
26
import { NgModule } from '@angular/core';
37
import { BrowserModule } from '@angular/platform-browser';
48
import { RouterModule } from '@angular/router';
@@ -23,9 +27,9 @@ import { RootStoreModule } from './store/root-store.module';
2327

2428
@NgModule({
2529
declarations: [AppComponent, HomeComponent],
30+
bootstrap: [AppComponent],
2631
imports: [
2732
BrowserModule,
28-
HttpClientModule,
2933
NgbModule,
3034
RootStoreModule,
3135
AlertModule,
@@ -77,7 +81,7 @@ import { RootStoreModule } from './store/root-store.module';
7781
useFactory: () => new AddVersionHeaderInterceptor(environment),
7882
multi: true,
7983
},
84+
provideHttpClient(withInterceptorsFromDi()),
8085
],
81-
bootstrap: [AppComponent],
8286
})
8387
export class AppModule {}

apps/ng-client/src/app/helpers/error.interceptor.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export class ErrorInterceptor implements HttpInterceptor {
1717

1818
intercept(
1919
request: HttpRequest<unknown>,
20-
next: HttpHandler
20+
next: HttpHandler,
2121
): Observable<HttpEvent<unknown>> {
2222
return next.handle(request).pipe(
2323
catchError((err) => {
@@ -26,7 +26,7 @@ export class ErrorInterceptor implements HttpInterceptor {
2626
this.store.dispatch(new UserStoreActions.SignOutAction());
2727
}
2828
return throwError(() => err.error || err);
29-
})
29+
}),
3030
);
3131
}
3232
}

0 commit comments

Comments
 (0)