Skip to content

Commit e21e8d1

Browse files
authored
Update to JHipster main (jhipster#1526)
* Update .yo-resolve * Update .yo-resolve * Create cli-customizations.cjs * Update generator-jhipster to 8.7.3 * recreate package-lock * adjusts * lint fix * apply prettier * adjusts * adjusts * add workspaces * adjust * adjusts * adjusts * adjust .editorconfig * adjusts * adjusts * update generator-jhipster to git * update git snapshot * update git snapshot * adjusts * adjusts * lint fix * adjusts * adjusts * regenerate package-lock * update snapshot * update Dockerfile * update node version * update snapshot --------- Co-authored-by: mshima <[email protected]>
1 parent 4e3f08a commit e21e8d1

Some content is hidden

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

70 files changed

+6473
-10069
lines changed

.blueprint/generate-sample/generator.mjs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { readdir, stat } from 'node:fs/promises';
22
import BaseGenerator from 'generator-jhipster/generators/base';
33
import command from './command.mjs';
4-
import { statSync } from 'node:fs';
54

65
export default class extends BaseGenerator {
76
sampleName;

.eslintignore

Lines changed: 0 additions & 5 deletions
This file was deleted.

.eslintrc.json

Lines changed: 0 additions & 42 deletions
This file was deleted.

.github/workflows/test-integration-jwt.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,34 +38,26 @@ jobs:
3838
include:
3939
- app-type: jwt-with-angular-app
4040
arg: 'import-jdl'
41-
extra-args: '--with-entities'
4241
- app-type: jwt-with-angular-cqrs-app
4342
arg: 'import-jdl'
44-
extra-args: '--with-entities'
4543
- app-type: jwt-with-blazor-app
4644
arg: 'import-jdl blazor'
47-
extra-args: '--with-entities'
4845
- app-type: jwt-with-blazor-cqrs-app
4946
arg: 'import-jdl blazor'
50-
extra-args: '--with-entities'
5147
- app-type: jwt-with-mssql-app
5248
arg: 'no'
5349
- app-type: jwt-with-mysql-app
5450
arg: 'no'
5551
- app-type: jwt-with-mongo-app
5652
arg: 'import-jdl'
57-
extra-args: '--with-entities'
5853
- app-type: jwt-with-mongo-cqrs-app
5954
arg: 'import-jdl'
60-
extra-args: '--with-entities'
6155
- app-type: jwt-with-postgres-app
6256
arg: 'no'
6357
- app-type: jwt-with-react-app
6458
arg: 'import-jdl'
65-
extra-args: '--with-entities'
6659
- app-type: jwt-with-vue-app
6760
arg: 'import-jdl'
68-
extra-args: '--with-entities'
6961
env:
7062
JHI_APP: ${{ matrix.app-type }}
7163
JHI_ARG: ${{ matrix.arg }}

.github/workflows/test-integration-microservice.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Test Integration JWT
1+
name: Test Integration Microservice
22
concurrency:
33
# Group PRs by head_ref, push to main branch by commit id, and others branch by ref.
44
group: ${{ github.workflow }}-${{ github.head_ref || (github.ref == 'refs/heads/main' && github.sha) || github.ref }}

.prettierignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ package-lock.json
33
.git
44

55
# blueprint rules:
6-
**/templates/**/
6+
generators/**/templates/**/

.prettierrc.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
# Prettier configuration
2-
31
printWidth: 140
42
singleQuote: true
53
tabWidth: 2
64
useTabs: false
7-
8-
# js and ts rules:
95
arrowParens: avoid
6+
bracketSameLine: false
7+
plugins:
8+
- prettier-plugin-packagejson

.readthedocs.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ version: 2
55
build:
66
os: ubuntu-22.04
77
tools:
8-
python: "3.11"
8+
python: '3.11'
99

1010
# Build documentation in the docs/ directory with Sphinx
1111
sphinx:
@@ -14,5 +14,5 @@ sphinx:
1414
# We recommend specifying your dependencies to enable reproducible builds:
1515
# https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
1616
python:
17-
install:
18-
- requirements: docs/requirements.txt
17+
install:
18+
- requirements: docs/requirements.txt

.yo-rc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,10 @@
146146
},
147147
"githubRepository": "jhipster/jhipster-dotnetcore",
148148
"githubWorkflows": true,
149-
"jhipsterVersion": "8.0.0-beta.3",
149+
"jhipsterVersion": "8.7.3",
150150
"js": true,
151151
"localBlueprint": false,
152+
"packageJsonType": "module",
152153
"sampleWritten": true,
153154
"skipCommitHook": true,
154155
"subGenerators": ["bootstrap-application", "ci-cd", "client", "common", "cypress", "docker", "entity", "heroku", "server"]

.yo-resolve

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
cli/cli.cjs skip
2-
generators/** skip
31
.blueprint/** skip
4-
.eslintrc.json skip
2+
.gitattributes
3+
.github/** skip
54
README.md skip

0 commit comments

Comments
 (0)