Skip to content

Commit 663a44f

Browse files
committed
Merge remote-tracking branch 'origin/angular-eos-upgrades-prerelease' into angular-eos-upgrades-trunk
2 parents 0bfa30e + 9c1107f commit 663a44f

211 files changed

Lines changed: 17781 additions & 20198 deletions

File tree

Some content is hidden

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

.eslintrc.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
4343
],
4444
"rxjs/no-ignored-observable": "warn",
4545

46+
// disable standalone preference rule — app uses ngmodule architecture
47+
"@angular-eslint/prefer-standalone": "off",
48+
4649
// General TypeScript best practices
4750
"prefer-const": "error",
4851
"no-console": [

angular.json

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"prefix": "app",
3232
"architect": {
3333
"build": {
34-
"builder": "@angular-devkit/build-angular:browser",
34+
"builder": "@angular-devkit/build-angular:application",
3535
"options": {
3636
"allowedCommonJsDependencies": [
3737
"pusher-js",
@@ -49,8 +49,8 @@
4949
"i18nDuplicateTranslation": "warning",
5050
"outputPath": "dist/v3",
5151
"index": "projects/v3/src/index.html",
52-
"main": "projects/v3/src/main.ts",
53-
"polyfills": "projects/v3/src/polyfills.ts",
52+
"browser": "projects/v3/src/main.ts",
53+
"polyfills": ["projects/v3/src/polyfills.ts"],
5454
"tsConfig": "projects/v3/tsconfig.app.json",
5555
"inlineStyleLanguage": "scss",
5656
"assets": [
@@ -73,11 +73,11 @@
7373
],
7474
"styles": [
7575
{
76-
"input": "projects/v3/src/theme/variables.scss",
76+
"input": "projects/v3/src/global.scss",
7777
"inject": true
7878
},
7979
{
80-
"input": "projects/v3/src/global.scss",
80+
"input": "projects/v3/src/theme/variables.scss",
8181
"inject": true
8282
},
8383
{
@@ -86,9 +86,6 @@
8686
}
8787
],
8888
"scripts": [],
89-
"vendorChunk": true,
90-
"extractLicenses": false,
91-
"buildOptimizer": false,
9289
"sourceMap": true,
9390
"optimization": false,
9491
"namedChunks": true
@@ -124,12 +121,10 @@
124121
"with": "projects/v3/src/environments/environment.custom.ts"
125122
}
126123
],
127-
"buildOptimizer": true,
128124
"outputHashing": "all",
129125
"sourceMap": false,
130126
"namedChunks": false,
131-
"extractLicenses": true,
132-
"vendorChunk": false
127+
"extractLicenses": true
133128
},
134129
"stage": {
135130
"budgets": [
@@ -148,9 +143,7 @@
148143
"with": "projects/v3/src/environments/environment.custom.ts"
149144
}
150145
],
151-
"buildOptimizer": false,
152146
"optimization": false,
153-
"vendorChunk": true,
154147
"extractLicenses": false,
155148
"sourceMap": true,
156149
"namedChunks": true
@@ -188,9 +181,7 @@
188181
"maximumWarning": "20kb"
189182
}
190183
],
191-
"buildOptimizer": false,
192184
"optimization": false,
193-
"vendorChunk": true,
194185
"extractLicenses": false,
195186
"sourceMap": true,
196187
"namedChunks": true
@@ -231,10 +222,12 @@
231222
"test": {
232223
"builder": "@angular-devkit/build-angular:karma",
233224
"options": {
225+
"builderMode": "application",
234226
"main": "projects/v3/src/test.ts",
235227
"karmaConfig": "projects/v3/karma.conf.js",
236228
"tsConfig": "projects/v3/tsconfig.spec.json",
237229
"inlineStyleLanguage": "scss",
230+
"include": ["projects/v3/src/**/*.spec.ts"],
238231
"assets": ["./projects/v3/src/assets/icon/favicon.ico", "projects/v3/src/assets"],
239232
"styles": ["projects/v3/src/styles.scss"],
240233
"scripts": []

docs/docs.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,25 @@
22
# Practera App Documentation
33
This is practera documentation with more informations.
44

5+
### Upgrades
6+
- [Angular 17 → 18 & Ionic 7 → 8](./upgrades/angular-17-to-18-ionic-7-to-8.md)
7+
58
### Services
69
- [Chat Service](./services/chatService.md)
710

811
### Components
912
- [Chat Room Component](./components/chatRoomComponent.md)
1013
- [Chat List Component](./components/chatListComponent.md)
14+
- [Topic Component](./components/topicComponent.md)
1115

1216
### Directives
13-
- [Toggle Label Directive](./directives/toggleLabelDirective.md)
17+
- [Toggle Label Directive](./directives/toggleLabelDirective.md)
18+
19+
### Features
20+
- [Assessment Pagination Feature Toggle](./features/assessment-pagination-feature-toggle.md)
21+
- [Slider Rating Implementation](./features/slider-rating-implementation.md)
22+
23+
### Fixes
24+
- [CORE-7942 Whitespace Fix](./fixes/CORE-7942-whitespace-fix.md)
25+
- [CORE-8002 Pulse Check Workflow](./fixes/CORE-8002-pulsecheck-workflow.md)
26+
- [CORE-8166/8167 Pagination Answer Persistence](./fixes/CORE-8166-8167-pagination-answer-persistence.md)

0 commit comments

Comments
 (0)