Merge pull request #2 from jhipster/main

Update fork

.editorconfig

@@ -3,7 +3,7 @@ root = true
 
 [*]
 indent_style = space
-indent_size = 4
+indent_size = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
@@ -12,10 +12,8 @@ insert_final_newline = true
 [*.md]
 trim_trailing_whitespace = false
 
-[package.json]
-indent_style = space
-indent_size = 2
+[{*.{java,java.ejs,xml.ejs,gradle.ejs,sh,sh.ejs,n1ql.ejs,cql.ejs,scala.ejs},USAGE}]
+indent_size = 4
 
-[*.ejs]
-indent_style = space
-indent_size = 2
+[generators/entity-server/templates/**/*_template.ejs]
+indent_size = 4

.eslintrc.json

@@ -1,35 +1,35 @@
 {
-    "env": {
-        "node": true,
-        "es6": true,
-        "mocha": true
-    },
-    "extends": ["airbnb-base", "plugin:prettier/recommended"],
-    "plugins": ["mocha", "prettier", "chai-friendly"],
-    "rules": {
-        "prettier/prettier": "error",
-        "linebreak-style": 0,
-        "eol-last": 2,
-        "quotes": [2, "single", { "avoidEscape": true }],
-        "semi": [2, "always"],
-        "eqeqeq": [2, "smart"],
-        "no-restricted-globals": ["off"],
-        "no-use-before-define": [2, "nofunc"],
-        "no-confusing-arrow": "off",
-        "no-unused-vars": [2, { "vars": "local", "args": "none" }],
-        "no-multi-str": 2,
-        "no-irregular-whitespace": 2,
-        "comma-dangle": "off",
-        "max-len": "off",
-        "func-names": "off",
-        "class-methods-use-this": "off",
-        "no-underscore-dangle": "off",
-        "no-plusplus": "off",
-        "no-unused-expressions": 0,
-        "chai-friendly/no-unused-expressions": [2, { "allowShortCircuit": true, "allowTernary": true }],
-        "prefer-destructuring": "off",
-        "no-multi-assign": "off",
-        "no-param-reassign": "off",
-        "no-shadow": "off"
-    }
+  "env": {
+    "node": true,
+    "es6": true,
+    "mocha": true
+  },
+  "extends": ["airbnb-base", "plugin:prettier/recommended"],
+  "plugins": ["mocha", "prettier", "chai-friendly"],
+  "rules": {
+    "prettier/prettier": "error",
+    "linebreak-style": 0,
+    "eol-last": 2,
+    "quotes": [2, "single", { "avoidEscape": true }],
+    "semi": [2, "always"],
+    "eqeqeq": [2, "smart"],
+    "no-restricted-globals": ["off"],
+    "no-use-before-define": [2, "nofunc"],
+    "no-confusing-arrow": "off",
+    "no-unused-vars": [2, { "vars": "local", "args": "none" }],
+    "no-multi-str": 2,
+    "no-irregular-whitespace": 2,
+    "comma-dangle": "off",
+    "max-len": "off",
+    "func-names": "off",
+    "class-methods-use-this": "off",
+    "no-underscore-dangle": "off",
+    "no-plusplus": "off",
+    "no-unused-expressions": 0,
+    "chai-friendly/no-unused-expressions": [2, { "allowShortCircuit": true, "allowTernary": true }],
+    "prefer-destructuring": "off",
+    "no-multi-assign": "off",
+    "no-param-reassign": "off",
+    "no-shadow": "off"
+  }
 }

.github/ISSUE_TEMPLATE.md

@@ -52,7 +52,7 @@ If you are using JDL, please share that configuration as well.
 
 <!-- What OS are you on? is this a problem with all browsers or only IE8? -->
 
--   [ ] Checking this box is mandatory (this is just to show you read everything)
+- [ ] Checking this box is mandatory (this is just to show you read everything)
 
 <!-- Love JHipster? Please consider supporting our collective:
 👉  https://opencollective.com/generator-jhipster/donate -->

.github/ISSUE_TEMPLATE/BUG_REPORT.md

@@ -65,7 +65,7 @@ If you are using JDL, please share that configuration as well.
 
 <!-- What OS are you on? is this a problem with all browsers or only IE8? -->
 
--   [ ] Checking this box is mandatory (this is just to show you read everything)
+- [ ] Checking this box is mandatory (this is just to show you read everything)
 
 <!-- Love JHipster? Please consider supporting our collective:
 👉  https://opencollective.com/generator-jhipster/donate -->

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md

@@ -15,7 +15,7 @@ about: Suggest an improvement.
 
 <!-- Has a similar feature request been asked for before? Please search both closed & open issues -->
 
--   [ ] Checking this box is mandatory (this is just to show you read everything)
+- [ ] Checking this box is mandatory (this is just to show you read everything)
 
 <!-- Love JHipster? Please consider supporting our collective:
 👉  https://opencollective.com/generator-jhipster/donate -->

.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md

@@ -8,6 +8,6 @@ about: If you have a question, please use StackOverflow!
 We primarily use GitHub as an issue tracker, if your issue is not a **bug** or **feature request** then sorry you are not in the right place :wink:.
 **If you have a question** please use Stack Overflow, and tag the question with [jhipster](http://stackoverflow.com/questions/tagged/jhipster). This will help the project to keep a clean issue tracker. Also, Stack Overflow will give your question a larger audience:
 
--   This will increase your chances to get an answer
--   Answers will be of higher quality, as there is a voting system
--   This will also help other users who might have the same issue, as questions are tagged and easily searchable
+- This will increase your chances to get an answer
+- Answers will be of higher quality, as there is a voting system
+- This will also help other users who might have the same issue, as questions are tagged and easily searchable

.github/MAINTAINERS_REPLY_TEMPLATES/DONT_COMMENT_ON_OLD_ISSUE.md

@@ -3,8 +3,8 @@ If you think this issue still applies, please [create a new ticket](https://gith
 
 **If you have a question** please use Stack Overflow, and tag the question with [jhipster](http://stackoverflow.com/questions/tagged/jhipster). This helps the project to keep the issue tracker clean. Also, Stack Overflow will give your question a larger audience:
 
--   This will increase your chances to get an answer
--   Answers will be of higher quality, as there is a voting system
--   This will also help other users who might have the same issue, as questions are tagged and easily searchable
+- This will increase your chances to get an answer
+- Answers will be of higher quality, as there is a voting system
+- This will also help other users who might have the same issue, as questions are tagged and easily searchable
 
 Finally, you can also use [our chat room on gitter](https://gitter.im/jhipster/generator-jhipster).

.github/MAINTAINERS_REPLY_TEMPLATES/GUIDELINES_NOT_FOLLOWED.md

@@ -13,8 +13,8 @@ Issues opened without proper details will be closed without explanation.
 
 **If you have a question** please use Stack Overflow, and tag the question with [jhipster](http://stackoverflow.com/questions/tagged/jhipster). This helps the project to keep the issue tracker clean. Also, Stack Overflow will give your question a larger audience:
 
--   This will increase your chances to get an answer
--   Answers will be of higher quality, as there is a voting system
--   This will also help other users who might have the same issue, as questions are tagged and easily searchable
+- This will increase your chances to get an answer
+- Answers will be of higher quality, as there is a voting system
+- This will also help other users who might have the same issue, as questions are tagged and easily searchable
 
 Finally, you can also use [our chat room on gitter](https://gitter.im/jhipster/generator-jhipster).

.github/MAINTAINERS_REPLY_TEMPLATES/README.md

@@ -4,7 +4,7 @@ Here is a list of common **reply messages** shared by core team members to help
 
 You can add those to your [GitHub saved replies settings](https://github.com/settings/replies).
 
--   [Guidelines are not followed](GUIDELINES_NOT_FOLLOWED.md)
--   [Use Stack Overflow](USE_STACK_OVERFLOW.md)
--   [Don't comment on an old issue](DONT_COMMENT_ON_OLD_ISSUE.md)
--   [Build as a module](BUILD_AS_MODULE.md)
+- [Guidelines are not followed](GUIDELINES_NOT_FOLLOWED.md)
+- [Use Stack Overflow](USE_STACK_OVERFLOW.md)
+- [Don't comment on an old issue](DONT_COMMENT_ON_OLD_ISSUE.md)
+- [Build as a module](BUILD_AS_MODULE.md)

.github/MAINTAINERS_REPLY_TEMPLATES/USE_STACK_OVERFLOW.md

@@ -1,8 +1,8 @@
 This is not a **bug** or **feature request** and hence this is not the correct forum for this.
 **If you have a question** please use Stack Overflow, and tag the question with [jhipster](http://stackoverflow.com/questions/tagged/jhipster). This will help the project to keep a clean issue tracker. Also, Stack Overflow will give your question a larger audience:
 
--   This will increase your chances to get an answer
--   Answers will be of higher quality, as there is a voting system
--   This will also help other users who might have the same issue, as questions are tagged and easily searchable
+- This will increase your chances to get an answer
+- Answers will be of higher quality, as there is a voting system
+- This will also help other users who might have the same issue, as questions are tagged and easily searchable
 
 Finally, you can also use [our chat room on gitter](https://gitter.im/jhipster/generator-jhipster).

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,11 +6,11 @@ PR description.
 
 Please make sure the below checklist is followed for Pull Requests.
 
--   [ ] [All continuous integration tests](https://github.com/jhipster/generator-jhipster/actions) are green
--   [ ] Tests are added where necessary
--   [ ] [jhipster-online](https://github.com/jhipster/jhipster-online) was updated if necessary
--   [ ] Documentation is added/updated where necessary
--   [ ] Coding Rules & Commit Guidelines as per our [CONTRIBUTING.md document](https://github.com/jhipster/generator-jhipster/blob/main/CONTRIBUTING.md) are followed
+- [ ] [All continuous integration tests](https://github.com/jhipster/generator-jhipster/actions) are green
+- [ ] Tests are added where necessary
+- [ ] [jhipster-online](https://github.com/jhipster/jhipster-online) was updated if necessary
+- [ ] Documentation is added/updated where necessary
+- [ ] Coding Rules & Commit Guidelines as per our [CONTRIBUTING.md document](https://github.com/jhipster/generator-jhipster/blob/main/CONTRIBUTING.md) are followed
 
 When you are still working on the PR, consider converting it to Draft (bellow reviewers) and adding `skip-ci` label, you can still see CI build result at your branch.
 

.github/dependabot.yml

@@ -1,41 +1,73 @@
 version: 2
 updates:
-    - package-ecosystem: 'npm'
-      directory: '/'
-      schedule:
-          interval: 'weekly'
-      open-pull-requests-limit: 10
+  - package-ecosystem: 'npm'
+    directory: '/'
+    schedule:
+      interval: 'weekly'
+    open-pull-requests-limit: 10
+    labels:
+      - 'theme: jhipster-internals'
+      - 'theme: dependencies'
 
-    - package-ecosystem: 'npm'
-      directory: '/generators/client/templates/angular/'
-      schedule:
-          interval: 'daily'
-      open-pull-requests-limit: 5
-      versioning-strategy: increase
+  - package-ecosystem: 'npm'
+    directory: '/generators/client/templates/angular/'
+    schedule:
+      interval: 'daily'
+    open-pull-requests-limit: 5
+    versioning-strategy: increase
+    labels:
+      - 'theme: angular'
+      - 'theme: dependencies'
 
-    - package-ecosystem: 'npm'
-      directory: '/generators/client/templates/common/'
-      schedule:
-          interval: 'daily'
-      open-pull-requests-limit: 5
-      versioning-strategy: increase
+  - package-ecosystem: 'npm'
+    directory: '/generators/common/templates/'
+    schedule:
+      interval: 'daily'
+    open-pull-requests-limit: 5
+    versioning-strategy: increase
+    labels:
+      - 'theme: dependencies'
+    ignore:
+      # Ignore updates to husky due to the license change
+      # See https://github.com/jhipster/generator-jhipster/issues/13940
+      - dependency-name: 'husky'
+        versions: ['5.x']
 
-    - package-ecosystem: 'npm'
-      directory: '/generators/client/templates/react/'
-      schedule:
-          interval: 'daily'
-      open-pull-requests-limit: 5
-      versioning-strategy: increase
+  - package-ecosystem: 'npm'
+    directory: '/generators/client/templates/common/'
+    schedule:
+      interval: 'daily'
+    open-pull-requests-limit: 5
+    versioning-strategy: increase
+    labels:
+      - 'theme: front'
+      - 'theme: dependencies'
 
-    - package-ecosystem: 'npm'
-      directory: '/generators/client/templates/vue/'
-      schedule:
-          interval: 'daily'
-      open-pull-requests-limit: 5
-      versioning-strategy: increase
+  - package-ecosystem: 'npm'
+    directory: '/generators/client/templates/react/'
+    schedule:
+      interval: 'daily'
+    open-pull-requests-limit: 5
+    versioning-strategy: increase
+    labels:
+      - 'theme: react'
+      - 'theme: dependencies'
 
-    - package-ecosystem: 'github-actions'
-      directory: '/'
-      schedule:
-          interval: 'weekly'
-      open-pull-requests-limit: 10
+  - package-ecosystem: 'npm'
+    directory: '/generators/client/templates/vue/'
+    schedule:
+      interval: 'daily'
+    open-pull-requests-limit: 5
+    versioning-strategy: increase
+    labels:
+      - 'theme: vue'
+      - 'theme: dependencies'
+
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'weekly'
+    open-pull-requests-limit: 10
+    labels:
+      - 'theme: github_actions'
+      - 'theme: CI builds'

.github/release-drafter.yml

@@ -1,4 +1,4 @@
 template: |
-    ## What’s Changed
+  ## What’s Changed
 
-    $CHANGES
+  $CHANGES