Skip to content

Commit 9640cae

Browse files
mshimamshima
authored
Merge branch 'main' into common-header
2 parents f331fcb + e955085 commit 9640cae

File tree

156 files changed

+2438
-1612
lines changed

Some content is hidden

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

156 files changed

+2438
-1612
lines changed

‎.blueprint/github-build-matrix/__snapshots__/generator.spec.ts.snap‎

Lines changed: 119 additions & 119 deletions
Large diffs are not rendered by default.

‎.blueprint/github-build-matrix/support/__snapshots__/git-chages.spec.ts.snap‎

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,7 @@ exports[`git-changes generators/spring-boot/generators/bootstrap/index.ts should
840840
}
841841
`;
842842

843-
exports[`git-changes generators/spring-boot/generators/cucumber/index.ts should match changes snapshot 1`] = `
843+
exports[`git-changes generators/spring-boot/generators/cache/index.ts should match changes snapshot 1`] = `
844844
{
845845
"angular": false,
846846
"angularWorkflow": false,
@@ -864,7 +864,7 @@ exports[`git-changes generators/spring-boot/generators/cucumber/index.ts should
864864
}
865865
`;
866866

867-
exports[`git-changes generators/spring-boot/generators/feign-client/index.ts should match changes snapshot 1`] = `
867+
exports[`git-changes generators/spring-boot/generators/cucumber/index.ts should match changes snapshot 1`] = `
868868
{
869869
"angular": false,
870870
"angularWorkflow": false,
@@ -984,30 +984,6 @@ exports[`git-changes generators/spring-boot/index.ts should match changes snapsh
984984
}
985985
`;
986986

987-
exports[`git-changes generators/spring-cache/index.ts should match changes snapshot 1`] = `
988-
{
989-
"angular": false,
990-
"angularWorkflow": false,
991-
"base": false,
992-
"ci": false,
993-
"client": false,
994-
"common": false,
995-
"devBlueprint": false,
996-
"devserverWorkflow": false,
997-
"e2e": false,
998-
"generateBlueprint": false,
999-
"graalvm": false,
1000-
"java": true,
1001-
"react": false,
1002-
"reactWorkflow": false,
1003-
"sonarPr": false,
1004-
"springBootDefaults": false,
1005-
"vue": false,
1006-
"vueWorkflow": false,
1007-
"workspaces": false,
1008-
}
1009-
`;
1010-
1011987
exports[`git-changes generators/spring-cloud/index.ts should match changes snapshot 1`] = `
1012988
{
1013989
"angular": false,

‎.blueprint/github-build-matrix/support/integration-test-constants.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { JHIPSTER_DEPENDENCIES_VERSION } from '../../../generators/generator-con
44
import { getPackageRoot } from '../../../lib/index.ts';
55

66
const FORCE_BUILD_JHIPSTER_BOM = true;
7-
export const JHIPSTER_BOM_BRANCH = 'spring-boot-v4';
7+
export const JHIPSTER_BOM_BRANCH = 'main';
88
export const JHIPSTER_BOM_CICD_VERSION = '0.0.0-CICD';
99
export const BUILD_JHIPSTER_BOM = FORCE_BUILD_JHIPSTER_BOM || JHIPSTER_DEPENDENCIES_VERSION.includes('-SNAPSHOT');
1010

‎.github/dependabot.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ updates:
254254
- 'skip-changelog'
255255

256256
- package-ecosystem: 'gradle'
257-
directory: '/generators/spring-cache/resources/'
257+
directory: '/generators/spring-boot/generators/cache/resources/'
258258
schedule:
259259
interval: 'daily'
260260
time: '08:30'

‎.github/workflows/auto-merge.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
steps:
3030
- name: Dependabot metadata
3131
id: dependabot-metadata
32-
uses: dependabot/fetch-metadata@v2.4.0
32+
uses: dependabot/fetch-metadata@v2.5.0
3333
- name: Enable auto-merge for Dependabot PRs
3434
if: steps.dependabot-metadata.outputs.update-type != 'version-update:semver-major'
3535
run: gh pr merge --auto --squash "$PR_URL"

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ We are honored by any contributions you may have small or large. Please refer to
1818

1919
The following Java and Node combinations are tested and verified by GitHub Actions:
2020

21-
| Java | Node | Status |
22-
| -------- | -------- | ------ |
23-
| 17/21/25 | 20/22/24 | ✅ |
21+
| Java | Node | Status |
22+
| ----- | ----- | ------ |
23+
| 21/25 | 22/24 | ✅ |
2424

2525
## Sponsors
2626

‎generators/angular/__snapshots__/generator.spec.ts.snap‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -371,18 +371,12 @@ exports[`generator - angular gateway-jwt-skipUserManagement(true)-withAdminUi(fa
371371
"clientRoot/src/app/app.ts": {
372372
"stateCleared": "modified",
373373
},
374-
"clientRoot/src/app/config/authority.constants.ts": {
375-
"stateCleared": "modified",
376-
},
377374
"clientRoot/src/app/config/datepicker-adapter.ts": {
378375
"stateCleared": "modified",
379376
},
380377
"clientRoot/src/app/config/dayjs.ts": {
381378
"stateCleared": "modified",
382379
},
383-
"clientRoot/src/app/config/error.constants.ts": {
384-
"stateCleared": "modified",
385-
},
386380
"clientRoot/src/app/config/font-awesome-icons.ts": {
387381
"stateCleared": "modified",
388382
},
@@ -809,6 +803,12 @@ exports[`generator - angular gateway-jwt-skipUserManagement(true)-withAdminUi(fa
809803
"clientRoot/src/app/shared/jhipster/constants.ts": {
810804
"stateCleared": "modified",
811805
},
806+
"clientRoot/src/app/shared/jhipster/data-utils.ts": {
807+
"stateCleared": "modified",
808+
},
809+
"clientRoot/src/app/shared/jhipster/error.constants.ts": {
810+
"stateCleared": "modified",
811+
},
812812
"clientRoot/src/app/shared/jhipster/headers.ts": {
813813
"stateCleared": "modified",
814814
},
@@ -1538,18 +1538,12 @@ exports[`generator - angular gateway-oauth2-withAdminUi(true)-skipJhipsterDepend
15381538
"clientRoot/src/app/app.ts": {
15391539
"stateCleared": "modified",
15401540
},
1541-
"clientRoot/src/app/config/authority.constants.ts": {
1542-
"stateCleared": "modified",
1543-
},
15441541
"clientRoot/src/app/config/datepicker-adapter.ts": {
15451542
"stateCleared": "modified",
15461543
},
15471544
"clientRoot/src/app/config/dayjs.ts": {
15481545
"stateCleared": "modified",
15491546
},
1550-
"clientRoot/src/app/config/error.constants.ts": {
1551-
"stateCleared": "modified",
1552-
},
15531547
"clientRoot/src/app/config/font-awesome-icons.ts": {
15541548
"stateCleared": "modified",
15551549
},
@@ -2045,6 +2039,12 @@ exports[`generator - angular gateway-oauth2-withAdminUi(true)-skipJhipsterDepend
20452039
"clientRoot/src/app/shared/jhipster/constants.ts": {
20462040
"stateCleared": "modified",
20472041
},
2042+
"clientRoot/src/app/shared/jhipster/data-utils.ts": {
2043+
"stateCleared": "modified",
2044+
},
2045+
"clientRoot/src/app/shared/jhipster/error.constants.ts": {
2046+
"stateCleared": "modified",
2047+
},
20482048
"clientRoot/src/app/shared/jhipster/headers.ts": {
20492049
"stateCleared": "modified",
20502050
},
@@ -2618,18 +2618,12 @@ exports[`generator - angular microservice-jwt-skipUserManagement(false)-withAdmi
26182618
"clientRoot/src/app/app.ts": {
26192619
"stateCleared": "modified",
26202620
},
2621-
"clientRoot/src/app/config/authority.constants.ts": {
2622-
"stateCleared": "modified",
2623-
},
26242621
"clientRoot/src/app/config/datepicker-adapter.ts": {
26252622
"stateCleared": "modified",
26262623
},
26272624
"clientRoot/src/app/config/dayjs.ts": {
26282625
"stateCleared": "modified",
26292626
},
2630-
"clientRoot/src/app/config/error.constants.ts": {
2631-
"stateCleared": "modified",
2632-
},
26332627
"clientRoot/src/app/config/font-awesome-icons.ts": {
26342628
"stateCleared": "modified",
26352629
},
@@ -3059,6 +3053,12 @@ exports[`generator - angular microservice-jwt-skipUserManagement(false)-withAdmi
30593053
"clientRoot/src/app/shared/jhipster/constants.ts": {
30603054
"stateCleared": "modified",
30613055
},
3056+
"clientRoot/src/app/shared/jhipster/data-utils.ts": {
3057+
"stateCleared": "modified",
3058+
},
3059+
"clientRoot/src/app/shared/jhipster/error.constants.ts": {
3060+
"stateCleared": "modified",
3061+
},
30623062
"clientRoot/src/app/shared/jhipster/headers.ts": {
30633063
"stateCleared": "modified",
30643064
},
@@ -3644,18 +3644,12 @@ exports[`generator - angular microservice-oauth2-withAdminUi(true)-skipJhipsterD
36443644
"src/main/webapp/app/app.ts": {
36453645
"stateCleared": "modified",
36463646
},
3647-
"src/main/webapp/app/config/authority.constants.ts": {
3648-
"stateCleared": "modified",
3649-
},
36503647
"src/main/webapp/app/config/datepicker-adapter.ts": {
36513648
"stateCleared": "modified",
36523649
},
36533650
"src/main/webapp/app/config/dayjs.ts": {
36543651
"stateCleared": "modified",
36553652
},
3656-
"src/main/webapp/app/config/error.constants.ts": {
3657-
"stateCleared": "modified",
3658-
},
36593653
"src/main/webapp/app/config/font-awesome-icons.ts": {
36603654
"stateCleared": "modified",
36613655
},
@@ -4079,6 +4073,12 @@ exports[`generator - angular microservice-oauth2-withAdminUi(true)-skipJhipsterD
40794073
"src/main/webapp/app/shared/jhipster/constants.ts": {
40804074
"stateCleared": "modified",
40814075
},
4076+
"src/main/webapp/app/shared/jhipster/data-utils.ts": {
4077+
"stateCleared": "modified",
4078+
},
4079+
"src/main/webapp/app/shared/jhipster/error.constants.ts": {
4080+
"stateCleared": "modified",
4081+
},
40824082
"src/main/webapp/app/shared/jhipster/headers.ts": {
40834083
"stateCleared": "modified",
40844084
},
@@ -5012,18 +5012,12 @@ exports[`generator - angular monolith-jwt-skipUserManagement(false)-withAdminUi(
50125012
"src/main/webapp/app/app.ts": {
50135013
"stateCleared": "modified",
50145014
},
5015-
"src/main/webapp/app/config/authority.constants.ts": {
5016-
"stateCleared": "modified",
5017-
},
50185015
"src/main/webapp/app/config/datepicker-adapter.ts": {
50195016
"stateCleared": "modified",
50205017
},
50215018
"src/main/webapp/app/config/dayjs.ts": {
50225019
"stateCleared": "modified",
50235020
},
5024-
"src/main/webapp/app/config/error.constants.ts": {
5025-
"stateCleared": "modified",
5026-
},
50275021
"src/main/webapp/app/config/font-awesome-icons.ts": {
50285022
"stateCleared": "modified",
50295023
},
@@ -5534,6 +5528,12 @@ exports[`generator - angular monolith-jwt-skipUserManagement(false)-withAdminUi(
55345528
"src/main/webapp/app/shared/jhipster/constants.ts": {
55355529
"stateCleared": "modified",
55365530
},
5531+
"src/main/webapp/app/shared/jhipster/data-utils.ts": {
5532+
"stateCleared": "modified",
5533+
},
5534+
"src/main/webapp/app/shared/jhipster/error.constants.ts": {
5535+
"stateCleared": "modified",
5536+
},
55375537
"src/main/webapp/app/shared/jhipster/headers.ts": {
55385538
"stateCleared": "modified",
55395539
},
@@ -6125,18 +6125,12 @@ exports[`generator - angular monolith-oauth2-withAdminUi(false)-skipJhipsterDepe
61256125
"src/main/webapp/app/app.ts": {
61266126
"stateCleared": "modified",
61276127
},
6128-
"src/main/webapp/app/config/authority.constants.ts": {
6129-
"stateCleared": "modified",
6130-
},
61316128
"src/main/webapp/app/config/datepicker-adapter.ts": {
61326129
"stateCleared": "modified",
61336130
},
61346131
"src/main/webapp/app/config/dayjs.ts": {
61356132
"stateCleared": "modified",
61366133
},
6137-
"src/main/webapp/app/config/error.constants.ts": {
6138-
"stateCleared": "modified",
6139-
},
61406134
"src/main/webapp/app/config/font-awesome-icons.ts": {
61416135
"stateCleared": "modified",
61426136
},
@@ -6548,6 +6542,12 @@ exports[`generator - angular monolith-oauth2-withAdminUi(false)-skipJhipsterDepe
65486542
"src/main/webapp/app/shared/jhipster/constants.ts": {
65496543
"stateCleared": "modified",
65506544
},
6545+
"src/main/webapp/app/shared/jhipster/data-utils.ts": {
6546+
"stateCleared": "modified",
6547+
},
6548+
"src/main/webapp/app/shared/jhipster/error.constants.ts": {
6549+
"stateCleared": "modified",
6550+
},
65516551
"src/main/webapp/app/shared/jhipster/headers.ts": {
65526552
"stateCleared": "modified",
65536553
},
@@ -7117,18 +7117,12 @@ exports[`generator - angular monolith-session-skipUserManagement(true)-withAdmin
71177117
"src/main/webapp/app/app.ts": {
71187118
"stateCleared": "modified",
71197119
},
7120-
"src/main/webapp/app/config/authority.constants.ts": {
7121-
"stateCleared": "modified",
7122-
},
71237120
"src/main/webapp/app/config/datepicker-adapter.ts": {
71247121
"stateCleared": "modified",
71257122
},
71267123
"src/main/webapp/app/config/dayjs.ts": {
71277124
"stateCleared": "modified",
71287125
},
7129-
"src/main/webapp/app/config/error.constants.ts": {
7130-
"stateCleared": "modified",
7131-
},
71327126
"src/main/webapp/app/config/font-awesome-icons.ts": {
71337127
"stateCleared": "modified",
71347128
},
@@ -7549,6 +7543,12 @@ exports[`generator - angular monolith-session-skipUserManagement(true)-withAdmin
75497543
"src/main/webapp/app/shared/jhipster/constants.ts": {
75507544
"stateCleared": "modified",
75517545
},
7546+
"src/main/webapp/app/shared/jhipster/data-utils.ts": {
7547+
"stateCleared": "modified",
7548+
},
7549+
"src/main/webapp/app/shared/jhipster/error.constants.ts": {
7550+
"stateCleared": "modified",
7551+
},
75527552
"src/main/webapp/app/shared/jhipster/headers.ts": {
75537553
"stateCleared": "modified",
75547554
},

‎generators/angular/files-angular.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,11 +305,9 @@ export const files = asWriteFilesSection({
305305
'config/dayjs.ts',
306306
'config/datepicker-adapter.ts',
307307
'config/font-awesome-icons.ts',
308-
'config/error.constants.ts',
309308
'config/input.constants.ts',
310309
'config/navigation.constants.ts',
311310
'config/pagination.constants.ts',
312-
'config/authority.constants.ts',
313311

314312
// interceptors
315313
'core/interceptor/error-handler.interceptor.ts',

‎generators/angular/generator.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,8 @@ export default class AngularGenerator extends AngularApplicationGenerator {
350350
`${application.clientSrcDir}app/shared/shared.module.ts.ejs`,
351351
`${application.clientSrcDir}app/core/interceptor/index.ts.ejs`,
352352
`${application.clientSrcDir}default-test-providers.ts.ejs`,
353+
`${application.clientSrcDir}app/config/error.constants.ts`,
354+
`${application.clientSrcDir}app/config/authority.constants.ts`,
353355
],
354356
});
355357
},

‎generators/angular/resources/package.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"dependencies": {
3-
"@angular/common": "21.0.6",
3+
"@angular/common": "21.1.0",
44
"@fortawesome/angular-fontawesome": "4.0.0",
55
"@fortawesome/free-solid-svg-icons": "7.1.0",
66
"@ng-bootstrap/ng-bootstrap": "20.0.0",
@@ -18,13 +18,13 @@
1818
"devDependencies": {
1919
"@angular-architects/module-federation": "20.0.0",
2020
"@angular-architects/module-federation-runtime": "20.0.0",
21-
"@angular-builders/custom-esbuild": "21.0.0-beta.1",
22-
"@angular-builders/custom-webpack": "21.0.0-beta.1",
23-
"@angular/build": "21.0.4",
24-
"@angular/cli": "21.0.4",
21+
"@angular-builders/custom-esbuild": "21.0.3",
22+
"@angular-builders/custom-webpack": "21.0.3",
23+
"@angular/build": "21.1.0",
24+
"@angular/cli": "21.1.0",
2525
"@eslint/js": "9.39.2",
2626
"@types/folder-hash": "4.0.4",
27-
"@types/node": "20.19.27",
27+
"@types/node": "20.19.30",
2828
"@types/sockjs-client": "1.5.4",
2929
"angular-eslint": "21.1.0",
3030
"browser-sync": "3.0.4",
@@ -34,7 +34,7 @@
3434
"deepmerge": "4.3.1",
3535
"eslint": "9.39.2",
3636
"eslint-config-prettier": "10.1.8",
37-
"eslint-plugin-prettier": "5.5.4",
37+
"eslint-plugin-prettier": "5.5.5",
3838
"folder-hash": "4.1.1",
3939
"globals": "17.0.0",
4040
"jiti": "2.6.1",
@@ -44,11 +44,11 @@
4444
"rimraf": "6.1.2",
4545
"tinyglobby": "0.2.15",
4646
"typescript": "5.9.3",
47-
"typescript-eslint": "8.51.0",
48-
"vitest": "4.0.16",
47+
"typescript-eslint": "8.53.0",
48+
"vitest": "4.0.17",
4949
"vitest-sonar-reporter": "3.0.0",
5050
"webpack": "5.104.1",
51-
"webpack-bundle-analyzer": "5.1.0",
51+
"webpack-bundle-analyzer": "5.1.1",
5252
"webpack-merge": "6.0.1",
5353
"webpack-notifier": "1.15.0"
5454
},

0 commit comments

Comments
 (0)