Skip to content

Commit

Permalink
Upgrade to JHipster 8.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
mraible committed Apr 4, 2024
2 parents dc1e976 + c2b680b commit bda4e04
Show file tree
Hide file tree
Showing 603 changed files with 24,459 additions and 39,990 deletions.
18 changes: 0 additions & 18 deletions .browserslistrc

This file was deleted.

4 changes: 2 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.209.6/containers/java/.devcontainer/base.Dockerfile

# [Choice] Java version (use -bullseye variants on local arm64/Apple Silicon): 11, 17, 11-bullseye, 17-bullseye, 11-buster, 17-buster
ARG VARIANT="11"
# [Choice] Java version (use -bullseye variants on local arm64/Apple Silicon): 17, 17-bullseye, 17-buster
ARG VARIANT="17"
FROM mcr.microsoft.com/vscode/devcontainers/java:0-${VARIANT}

# [Option] Install Maven
Expand Down
45 changes: 25 additions & 20 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,38 @@
"build": {
"dockerfile": "Dockerfile",
"args": {
// Update the VARIANT arg to pick a Java version: 11, 17
// Update the VARIANT arg to pick a Java version: 17, 19
// Append -bullseye or -buster to pin to an OS version.
// Use the -bullseye variants on local arm64/Apple Silicon.
"VARIANT": "11",
"VARIANT": "17-bullseye",
// Options
"INSTALL_MAVEN": "false",
"INSTALL_GRADLE": "true",
"NODE_VERSION": "lts/*"
// maven and gradle wrappers are used by default, we don't need them installed globally
// "INSTALL_MAVEN": "false",
// "INSTALL_GRADLE": "true",
"NODE_VERSION": "20.11.1"
}
},

// Set *default* container specific settings.json values on container create.
"settings": {
"java.home": "/docker-java-home"
},
"customizations": {
"vscode": {
// Set *default* container specific settings.json values on container create.
"settings": {
"java.jdt.ls.java.home": "/docker-java-home"
},

// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"angular.ng-template",
"christian-kohler.npm-intellisense",
"firsttris.vscode-jest-runner",
"ms-vscode.vscode-typescript-tslint-plugin",
"dbaeumer.vscode-eslint",
"vscjava.vscode-java-pack",
"pivotal.vscode-boot-dev-pack",
"esbenp.prettier-vscode"
],
// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"angular.ng-template",
"christian-kohler.npm-intellisense",
"firsttris.vscode-jest-runner",
"ms-vscode.vscode-typescript-tslint-plugin",
"dbaeumer.vscode-eslint",
"vscjava.vscode-java-pack",
"pivotal.vscode-boot-dev-pack",
"esbenp.prettier-vscode"
]
}
},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
"forwardPorts": [4200, 3001, 9000, 8080],
Expand Down
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@ webpack/
target/
build/
node/
coverage/
postcss.config.js
build/resources/main/static/
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-floating-promises": "off",
"@typescript-eslint/no-non-null-assertion": "off",
"@typescript-eslint/no-parameter-properties": ["warn", { "allows": ["public", "private", "protected"] }],
"@typescript-eslint/no-shadow": ["error"],
"@typescript-eslint/no-unnecessary-condition": "error",
"@typescript-eslint/no-unsafe-argument": "off",
"@typescript-eslint/no-unsafe-assignment": "off",
"@typescript-eslint/no-unsafe-call": "off",
"@typescript-eslint/no-unsafe-member-access": "off",
"@typescript-eslint/no-unused-vars": "off",
"@typescript-eslint/prefer-nullish-coalescing": "error",
"@typescript-eslint/prefer-optional-chain": "error",
"@typescript-eslint/unbound-method": "off",
Expand Down
11 changes: 2 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
######################
# Project Specific
######################
/src/main/webapp/content/css/main.css
/build/resources/main/static/**
/src/test/javascript/coverage/
/src/main/generated/

######################
# Node
######################
Expand Down Expand Up @@ -38,7 +30,6 @@ local.properties
.settings/
.loadpath
.factorypath
/src/main/resources/rebel.xml

# External tool builders
.externalToolBuilders/**
Expand Down Expand Up @@ -88,6 +79,8 @@ out/
######################
.gradle/
/build/
/buildSrc/.gradle/
/buildSrc/build/

######################
# Package Files
Expand Down
4 changes: 4 additions & 0 deletions .jhipster/BloodPressure.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"annotations": {
"changelogDate": "20221108001642"
},
"changelogDate": "20221108001642",
"fields": [
{
Expand Down Expand Up @@ -27,6 +30,7 @@
"otherEntityRelationshipName": "bloodPressure",
"ownerSide": true,
"relationshipName": "user",
"relationshipSide": "left",
"relationshipType": "many-to-one"
}
],
Expand Down
4 changes: 4 additions & 0 deletions .jhipster/Points.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"annotations": {
"changelogDate": "20221108000520"
},
"changelogDate": "20221108000520",
"fields": [
{
Expand Down Expand Up @@ -35,6 +38,7 @@
"otherEntityRelationshipName": "points",
"ownerSide": true,
"relationshipName": "user",
"relationshipSide": "left",
"relationshipType": "many-to-one"
}
],
Expand Down
4 changes: 4 additions & 0 deletions .jhipster/Preferences.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"annotations": {
"changelogDate": "20221108002021"
},
"changelogDate": "20221108002021",
"fields": [
{
Expand Down Expand Up @@ -26,6 +29,7 @@
"otherEntityRelationshipName": "preferences",
"ownerSide": true,
"relationshipName": "user",
"relationshipSide": "left",
"relationshipType": "one-to-one"
}
],
Expand Down
4 changes: 4 additions & 0 deletions .jhipster/Weight.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"annotations": {
"changelogDate": "20221108001452"
},
"changelogDate": "20221108001452",
"fields": [
{
Expand All @@ -22,6 +25,7 @@
"otherEntityRelationshipName": "weight",
"ownerSide": true,
"relationshipName": "user",
"relationshipSide": "left",
"relationshipType": "many-to-one"
}
],
Expand Down
3 changes: 3 additions & 0 deletions .lintstagedrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
'{,**/}*.{md,json,yml,html,cjs,mjs,js,ts,tsx,css,scss,java}': ['prettier --write'],
};
3 changes: 0 additions & 3 deletions .lintstagedrc.js

This file was deleted.

10 changes: 7 additions & 3 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
node_modules
target
build
package-lock.json
.git
.mvn
build/

# Generated by jhipster:client
build/resources/main/static/

# Generated by jhipster:gradle
build
gradle
.gradle
4 changes: 4 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ arrowParens: avoid
# jsx and tsx rules:
bracketSameLine: false

plugins:
- prettier-plugin-packagejson
- prettier-plugin-java

# java rules:
overrides:
- files: "*.java"
Expand Down
11 changes: 8 additions & 3 deletions .yo-rc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,15 @@
"applicationType": "monolith",
"authenticationType": "jwt",
"baseName": "TwentyOnePoints",
"blueprints": [],
"blueprints": [
{
"name": "generator-jhipster-migrate",
"version": "0.1.0"
}
],
"buildTool": "gradle",
"cacheProvider": "ehcache",
"clientFramework": "angularX",
"clientFramework": "angular",
"clientPackageManager": "npm",
"clientTheme": "none",
"clientThemeVariant": "",
Expand All @@ -27,7 +32,7 @@
"herokuDeployType": "git",
"herokuJavaVersion": "11",
"jhiPrefix": "jhi",
"jhipsterVersion": "7.9.4",
"jhipsterVersion": "8.2.1",
"jwtSecretKey": "YjAwZDU2ODI3NzNjZjk0NjVhY2UzNGViZmY0YjY1ZGY2MDI5MTc5Y2FlZWYxNzE5Yjg5ZjMxOGZhZTgwZjA5NTFkN2VmNDM3ZGMyZDNjZTViNDAwYTg4NmNlMmM2ZDkxZTMwMDk5YmUxNWNkZmE0YTNiNDlhMGNhZmM4OTk1NmQ=",
"languages": ["en", "fr"],
"lastLiquibaseTimestamp": 1667866821000,
Expand Down
Loading

0 comments on commit bda4e04

Please sign in to comment.