Skip to content

Commit 72ab411

Browse files
cskiwicskiwi
committed
fix: updated to latest nx version
1 parent 345e578 commit 72ab411

File tree

250 files changed

+39172
-2685
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

250 files changed

+39172
-2685
lines changed

Diff for: ‎.editorconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ indent_size = 2
88
insert_final_newline = true
99
trim_trailing_whitespace = true
1010

11-
[*.md]
11+
[/*.md]
1212
max_line_length = off
1313
trim_trailing_whitespace = false

Diff for: ‎apps/api/project.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,27 @@
3030
"defaultConfiguration": "development",
3131
"configurations": {
3232
"development": {
33-
"cwd": "{projectRoot}",
33+
"cwd": "apps/api",
3434
"args": ["--node-env=development"]
3535
},
3636
"production": {
37-
"cwd": "{projectRoot}",
37+
"cwd": "apps/api",
3838
"args": ["--node-env=production"],
3939
"dependsOn": ["badman:build"]
4040
}
4141
}
4242
},
4343
"test": {
4444
"executor": "@nx/jest:jest",
45-
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
45+
"outputs": ["{workspaceRoot}/coverage/apps/api"],
4646
"options": {
47-
"jestConfig": "{projectRoot}/jest.config.ts"
47+
"jestConfig": "apps/api/jest.config.ts"
4848
}
4949
},
5050
"lint": {
5151
"executor": "@nx/eslint:lint",
5252
"options": {
53-
"eslintConfig": "{projectRoot}/eslint.config.js"
53+
"eslintConfig": "apps/api/eslint.config.js"
5454
}
5555
}
5656
}

Diff for: ‎apps/badman-e2e/project.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"lint": {
99
"executor": "@nx/eslint:lint",
1010
"options": {
11-
"eslintConfig": "{projectRoot}/eslint.config.js"
11+
"eslintConfig": "apps/badman-e2e/eslint.config.js"
1212
}
1313
}
1414
}

Diff for: ‎apps/badman/eslint.config.js

+6
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,10 @@ module.exports = [
4343
...config.rules,
4444
},
4545
})),
46+
{
47+
files: ['**/*.ts'],
48+
rules: {
49+
'@angular-eslint/prefer-standalone': 'off',
50+
},
51+
},
4652
];

Diff for: ‎apps/badman/project.json

+35-35
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@
1010
"executor": "@angular-devkit/build-angular:application",
1111
"outputs": ["{options.outputPath}"],
1212
"options": {
13-
"outputPath": "{workspaceRoot}/dist/{projectRoot}",
14-
"index": "{projectRoot}/src/index.html",
15-
"browser": "{projectRoot}/src/main.ts",
13+
"outputPath": "{workspaceRoot}/dist/apps/badman",
14+
"index": "apps/badman/src/index.html",
15+
"browser": "apps/badman/src/main.ts",
1616
"polyfills": ["zone.js"],
17-
"tsConfig": "{projectRoot}/tsconfig.app.json",
17+
"tsConfig": "apps/badman/tsconfig.app.json",
1818
"inlineStyleLanguage": "scss",
1919
"assets": [
20-
"{projectRoot}/src/favicon.ico",
21-
"{projectRoot}/src/assets",
22-
"{projectRoot}/src/manifest.json",
23-
"{projectRoot}/src/robots.txt",
24-
"{projectRoot}/src/sitemap.xml",
25-
"{projectRoot}/src/ads.txt"
20+
"apps/badman/src/favicon.ico",
21+
"apps/badman/src/assets",
22+
"apps/badman/src/manifest.json",
23+
"apps/badman/src/robots.txt",
24+
"apps/badman/src/sitemap.xml",
25+
"apps/badman/src/ads.txt"
2626
],
2727
"allowedCommonJsDependencies": [
2828
"moment",
@@ -33,7 +33,7 @@
3333
"apexcharts"
3434
],
3535
"styles": [
36-
"{projectRoot}/src/styles.scss",
36+
"apps/badman/src/styles.scss",
3737
"node_modules/quill/dist/quill.bubble.css",
3838
"node_modules/@fontsource/roboto/100.css",
3939
"node_modules/@fontsource/roboto/300.css",
@@ -42,7 +42,7 @@
4242
"node_modules/material-icons/iconfont/material-icons.css"
4343
],
4444
"scripts": ["node_modules/apexcharts/dist/apexcharts.js"],
45-
"serviceWorker": "{projectRoot}/ngsw-config.json"
45+
"serviceWorker": "apps/badman/ngsw-config.json"
4646
},
4747
"configurations": {
4848
"production": {
@@ -59,17 +59,17 @@
5959
}
6060
],
6161
"assets": [
62-
"{projectRoot}/src/favicon.ico",
63-
"{projectRoot}/src/assets",
64-
"{projectRoot}/src/manifest.json",
65-
"{projectRoot}/src/robots.txt",
66-
"{projectRoot}/src/sitemap.xml",
67-
"{projectRoot}/src/ads.txt"
62+
"apps/badman/src/favicon.ico",
63+
"apps/badman/src/assets",
64+
"apps/badman/src/manifest.json",
65+
"apps/badman/src/robots.txt",
66+
"apps/badman/src/sitemap.xml",
67+
"apps/badman/src/ads.txt"
6868
],
6969
"fileReplacements": [
7070
{
71-
"replace": "{projectRoot}/src/environments/environment.ts",
72-
"with": "{projectRoot}/src/environments/environment.prod.ts"
71+
"replace": "apps/badman/src/environments/environment.ts",
72+
"with": "apps/badman/src/environments/environment.prod.ts"
7373
}
7474
],
7575
"optimization": true,
@@ -92,22 +92,22 @@
9292
}
9393
],
9494
"assets": [
95-
"{projectRoot}/src/favicon.ico",
96-
"{projectRoot}/src/assets",
97-
"{projectRoot}/src/manifest.json",
98-
"{projectRoot}/src/robots.txt",
99-
"{projectRoot}/src/sitemap.xml",
100-
"{projectRoot}/src/ads.txt",
95+
"apps/badman/src/favicon.ico",
96+
"apps/badman/src/assets",
97+
"apps/badman/src/manifest.json",
98+
"apps/badman/src/robots.txt",
99+
"apps/badman/src/sitemap.xml",
100+
"apps/badman/src/ads.txt",
101101
{
102-
"input": "{projectRoot}/src/deployment/beta",
102+
"input": "apps/badman/src/deployment/beta",
103103
"output": "/",
104104
"glob": "*"
105105
}
106106
],
107107
"fileReplacements": [
108108
{
109-
"replace": "{projectRoot}/src/environments/environment.ts",
110-
"with": "{projectRoot}/src/environments/environment.beta.ts"
109+
"replace": "apps/badman/src/environments/environment.ts",
110+
"with": "apps/badman/src/environments/environment.beta.ts"
111111
}
112112
],
113113
"outputHashing": "all"
@@ -125,8 +125,8 @@
125125
"namedChunks": true,
126126
"fileReplacements": [
127127
{
128-
"replace": "{projectRoot}/src/environments/environment.ts",
129-
"with": "{projectRoot}/src/environments/environment.dev-beta.ts"
128+
"replace": "apps/badman/src/environments/environment.ts",
129+
"with": "apps/badman/src/environments/environment.dev-beta.ts"
130130
}
131131
]
132132
}
@@ -143,7 +143,7 @@
143143
"buildTarget": "badman:build:production"
144144
},
145145
"development": {
146-
"proxyConfig": "{projectRoot}/proxy.conf.json",
146+
"proxyConfig": "apps/badman/proxy.conf.json",
147147
"buildTarget": "badman:build:development"
148148
},
149149
"beta": {
@@ -163,15 +163,15 @@
163163
},
164164
"test": {
165165
"executor": "@nx/jest:jest",
166-
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
166+
"outputs": ["{workspaceRoot}/coverage/apps/badman"],
167167
"options": {
168-
"jestConfig": "{projectRoot}/jest.config.ts"
168+
"jestConfig": "apps/badman/jest.config.ts"
169169
}
170170
},
171171
"lint": {
172172
"executor": "@nx/eslint:lint",
173173
"options": {
174-
"eslintConfig": "{projectRoot}/eslint.config.js"
174+
"eslintConfig": "apps/badman/eslint.config.js"
175175
}
176176
}
177177
}

Diff for: ‎apps/badman/src/app/app.component.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import { ChangeDetectionStrategy, Component } from '@angular/core';
22

33
@Component({
4-
selector: 'badman-root',
5-
template: `<badman-shell>
4+
selector: 'badman-root',
5+
template: `<badman-shell>
66
<router-outlet></router-outlet>
77
</badman-shell>`,
8-
changeDetection: ChangeDetectionStrategy.OnPush,
8+
changeDetection: ChangeDetectionStrategy.OnPush,
9+
standalone: false
910
})
1011
export class AppComponent {}

Diff for: ‎apps/badman/src/styles.scss

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
// Include the common styles for Angular Material. We include this here so that you only
2424
// have to load a single css file for Angular Material in your app.
2525
// Be sure that you only ever include this mixin once!
26-
@include mat.core();
26+
@include mat.elevation-classes();
27+
@include mat.app-background();
2728

2829
$theme-warn: mat.m2-define-palette(mat.$m2-orange-palette);
2930
$theme-success: mat.m2-define-palette(mat.$m2-green-palette);

Diff for: ‎apps/scripts/project.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@
2525
},
2626
"test": {
2727
"executor": "@nx/jest:jest",
28-
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
28+
"outputs": ["{workspaceRoot}/coverage/apps/scripts"],
2929
"options": {
30-
"jestConfig": "{projectRoot}/jest.config.ts"
30+
"jestConfig": "apps/scripts/jest.config.ts"
3131
}
3232
},
3333
"lint": {
3434
"executor": "@nx/eslint:lint",
3535
"options": {
36-
"eslintConfig": "{projectRoot}/eslint.config.js"
36+
"eslintConfig": "apps/scripts/eslint.config.js"
3737
}
3838
}
3939
}

Diff for: ‎apps/worker/belgium/flanders/games/project.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,26 +27,26 @@
2727
"defaultConfiguration": "development",
2828
"configurations": {
2929
"development": {
30-
"cwd": "{projectRoot}",
30+
"cwd": "apps/worker/belgium/flanders/games",
3131
"args": ["--node-env=development"]
3232
},
3333
"production": {
34-
"cwd": "{projectRoot}",
34+
"cwd": "apps/worker/belgium/flanders/games",
3535
"args": ["--node-env=production"]
3636
}
3737
}
3838
},
3939
"test": {
4040
"executor": "@nx/jest:jest",
41-
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
41+
"outputs": ["{workspaceRoot}/coverage/apps/worker/belgium/flanders/games"],
4242
"options": {
43-
"jestConfig": "{projectRoot}/jest.config.ts"
43+
"jestConfig": "apps/worker/belgium/flanders/games/jest.config.ts"
4444
}
4545
},
4646
"lint": {
4747
"executor": "@nx/eslint:lint",
4848
"options": {
49-
"eslintConfig": "{projectRoot}/eslint.config.js"
49+
"eslintConfig": "apps/worker/belgium/flanders/games/eslint.config.js"
5050
}
5151
}
5252
}

Diff for: ‎apps/worker/belgium/flanders/places/project.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,26 +27,26 @@
2727
"defaultConfiguration": "development",
2828
"configurations": {
2929
"development": {
30-
"cwd": "{projectRoot}",
30+
"cwd": "apps/worker/belgium/flanders/places",
3131
"args": ["--node-env=development"]
3232
},
3333
"production": {
34-
"cwd": "{projectRoot}",
34+
"cwd": "apps/worker/belgium/flanders/places",
3535
"args": ["--node-env=production"]
3636
}
3737
}
3838
},
3939
"test": {
4040
"executor": "@nx/jest:jest",
41-
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
41+
"outputs": ["{workspaceRoot}/coverage/apps/worker/belgium/flanders/places"],
4242
"options": {
43-
"jestConfig": "{projectRoot}/jest.config.ts"
43+
"jestConfig": "apps/worker/belgium/flanders/places/jest.config.ts"
4444
}
4545
},
4646
"lint": {
4747
"executor": "@nx/eslint:lint",
4848
"options": {
49-
"eslintConfig": "{projectRoot}/eslint.config.js"
49+
"eslintConfig": "apps/worker/belgium/flanders/places/eslint.config.js"
5050
}
5151
}
5252
}

Diff for: ‎apps/worker/belgium/flanders/points/project.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,28 @@
2222
},
2323
"test": {
2424
"executor": "@nx/jest:jest",
25-
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
25+
"outputs": ["{workspaceRoot}/coverage/apps/worker/belgium/flanders/points"],
2626
"options": {
27-
"jestConfig": "{projectRoot}/jest.config.ts"
27+
"jestConfig": "apps/worker/belgium/flanders/points/jest.config.ts"
2828
}
2929
},
3030
"build": {
3131
"defaultConfiguration": "development",
3232
"configurations": {
3333
"development": {
34-
"cwd": "{projectRoot}",
34+
"cwd": "apps/worker/belgium/flanders/points",
3535
"args": ["--node-env=development"]
3636
},
3737
"production": {
38-
"cwd": "{projectRoot}",
38+
"cwd": "apps/worker/belgium/flanders/points",
3939
"args": ["--node-env=production"]
4040
}
4141
}
4242
},
4343
"lint": {
4444
"executor": "@nx/eslint:lint",
4545
"options": {
46-
"eslintConfig": "{projectRoot}/eslint.config.js"
46+
"eslintConfig": "apps/worker/belgium/flanders/points/eslint.config.js"
4747
}
4848
}
4949
}

Diff for: ‎apps/worker/ranking/project.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
"defaultConfiguration": "development",
2828
"configurations": {
2929
"development": {
30-
"cwd": "{projectRoot}",
30+
"cwd": "apps/worker/ranking",
3131
"args": ["--node-env=development"]
3232
},
3333
"production": {
34-
"cwd": "{projectRoot}",
34+
"cwd": "apps/worker/ranking",
3535
"args": ["--node-env=production"]
3636
}
3737
}
@@ -44,15 +44,15 @@
4444
},
4545
"test": {
4646
"executor": "@nx/jest:jest",
47-
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
47+
"outputs": ["{workspaceRoot}/coverage/apps/worker/ranking"],
4848
"options": {
49-
"jestConfig": "{projectRoot}/jest.config.ts"
49+
"jestConfig": "apps/worker/ranking/jest.config.ts"
5050
}
5151
},
5252
"lint": {
5353
"executor": "@nx/eslint:lint",
5454
"options": {
55-
"eslintConfig": "{projectRoot}/eslint.config.js"
55+
"eslintConfig": "apps/worker/ranking/eslint.config.js"
5656
}
5757
}
5858
}

0 commit comments

Comments
 (0)