Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions generators/angular/resources/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"dependencies": {
"@angular/common": "20.3.14",
"@fortawesome/angular-fontawesome": "3.0.0",
"@angular/common": "21.0.0",
"@fortawesome/angular-fontawesome": "4.0.0",
"@fortawesome/fontawesome-svg-core": "7.1.0",
"@fortawesome/free-solid-svg-icons": "7.1.0",
"@ng-bootstrap/ng-bootstrap": "19.0.1",
"@ng-bootstrap/ng-bootstrap": "20.0.0-rc.0",
"@ngx-translate/core": "17.0.0",
"@ngx-translate/http-loader": "17.0.0",
"@stomp/rx-stomp": "2.3.0",
Expand All @@ -15,16 +15,16 @@
"rxjs": "7.8.2",
"sockjs-client": "1.6.1",
"tslib": "2.8.1",
"zone.js": "0.15.1"
"zone.js": "0.16.0"
},
"devDependencies": {
"@angular-architects/module-federation": "20.0.0",
"@angular-architects/module-federation-runtime": "20.0.0",
"@angular-builders/custom-esbuild": "20.0.0",
"@angular-builders/custom-webpack": "20.0.0",
"@angular-builders/jest": "20.0.0",
"@angular/build": "20.3.10",
"@angular/cli": "20.3.10",
"@angular/build": "21.0.0",
"@angular/cli": "21.0.0",
"@eslint/js": "9.39.1",
"@types/folder-hash": "4.0.4",
"@types/jest": "29.5.14",
Expand Down Expand Up @@ -54,7 +54,7 @@
"ts-jest": "29.4.5",
"typescript": "5.9.3",
"typescript-eslint": "8.47.0",
"vitest": "3.2.4",
"vitest": "4.0.12",
"vitest-sonar-reporter": "3.0.0",
"webpack": "5.103.0",
"webpack-bundle-analyzer": "5.0.1",
Expand Down
6 changes: 6 additions & 0 deletions generators/angular/templates/package.json.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,12 @@
"config": {
"default_environment": "prod"
},
"overrides": {
"ngx-infinite-scroll": {
"@angular/core": "<%= nodeDependencies['@angular/common'] %>",
"@angular/common": "<%= nodeDependencies['@angular/common'] %>"
}
},
"scripts": {
"lint": "eslint .",
"lint:fix": "<%- nodePackageManager %> run lint -- --fix",
Expand Down
2 changes: 1 addition & 1 deletion generators/client/command.ts
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ const command = {
},
scope: 'storage',
choices: ['jest', 'vitest'],
default: ctx => (ctx?.clientFramework === 'vue' ? 'vitest' : 'jest'),
default: ctx => (ctx?.clientFramework !== 'react' ? 'vitest' : 'jest'),
},
clientTestFrameworks: {
description: 'Client test frameworks',
Expand Down
Loading