Merge main

Author: nicolas63

.eslintrc.json

@@ -5,7 +5,9 @@
     },
     "extends": ["airbnb-base", "plugin:prettier/recommended"],
     "rules": {
+        "default-param-last": "off",
         "prettier/prettier": "error",
+        "prefer-regex-literals": "off",
         "linebreak-style": 0,
         "eol-last": 2,
         "quotes": [2, "single", { "avoidEscape": true }],
@@ -17,6 +19,7 @@
         "no-unused-vars": [2, { "vars": "local", "args": "none" }],
         "no-multi-str": 2,
         "no-irregular-whitespace": 2,
+        "no-restricted-exports": "off",
         "comma-dangle": "off",
         "max-len": "off",
         "func-names": "off",
@@ -28,7 +31,9 @@
         "no-console": "off",
         "no-multi-assign": "off",
         "no-param-reassign": "off",
-        "no-shadow": "off"
+        "no-shadow": "off",
+        "no-promise-executor-return": "off",
+        "import/extensions": [0, { "pattern": { "{c,m,}js": "always" } }]
     },
     "overrides": [
         {

.github/dependabot.yml

@@ -18,7 +18,7 @@ updates:
     - 14.6.0
   - dependency-name: generator-jhipster
     versions:
-    - 7.0.0
+    - 7.6.0
   - dependency-name: yeoman-environment
     versions:
     - 3.0.0

.github/workflows/build-docker-image.yml

@@ -6,7 +6,7 @@ jobs:
   build_docker_image:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - 
       name: Build docker image
       run: docker build -t jhipster/jhipster-dotnetcore:test-build ./docker/

.github/workflows/generator.yml

@@ -11,14 +11,15 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
     strategy:
       matrix:
-        node_version: [14.17.0]
+        node_version: [16.14.0]
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
       with:
-        node-version: ${{ matrix.node-version }}
+        node-version: ${{ matrix.node_version }}
+    - name: 'install required npm version'
+      run: npm install -g npm@$(node -e "console.log(require('./generators/generator-dotnetcore-constants').NPM_VERSION);")
     - run: git --no-pager log -n 10 --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue) <%an>%Creset' --abbrev-commit
       shell: bash
     - run: npm ci

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

@@ -9,7 +9,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                node_version: [14.17.0]
+                node_version: [16.14.0]
                 os: [ubuntu-latest]
                 app-type:
                     - jwt-with-angular-app
@@ -51,17 +51,19 @@ jobs:
             JHI_ARG: ${{ matrix.arg }}
 
         steps:
-            - uses: actions/checkout@v2
-            - uses: actions/setup-node@v1
+            - uses: actions/checkout@v3
+            - uses: actions/setup-node@v3
               with:
-                  node-version: ${{ matrix.node-version }}
+                node-version: ${{ matrix.node_version }}
+            - name: 'install required npm version'
+              run: npm install -g npm@$(node -e "console.log(require('./generators/generator-dotnetcore-constants').NPM_VERSION);")
             - uses: joschi/setup-jdk@v2
               with:
                 java-version: '11' # The OpenJDK version to make available on the path
                 architecture: 'x64' # defaults to 'x64'
             - uses: actions/setup-dotnet@v1
               with:
-                dotnet-version: '5.0.100'
+                dotnet-version: '6.0.x'
             - name: git history
               run: git --no-pager log -n 10 --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue) <%an>%Creset' --abbrev-commit
             - name: PREPARE jhipster env

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

@@ -9,7 +9,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                node_version: [14.17.0]
+                node_version: [16.14.0]
                 os: [ubuntu-latest]
                 app-type:
                     - microservice-app
@@ -24,13 +24,15 @@ jobs:
             JHI_ARG: ${{ matrix.arg }}
 
         steps:
-            - uses: actions/checkout@v2
-            - uses: actions/setup-node@v1
+            - uses: actions/checkout@v3
+            - uses: actions/setup-node@v3
               with:
-                  node-version: ${{ matrix.node-version }}
+                node-version: ${{ matrix.node_version }}
+            - name: 'install required npm version'
+              run: npm install -g npm@$(node -e "console.log(require('./generators/generator-dotnetcore-constants').NPM_VERSION);")
             - uses: actions/setup-dotnet@v1
               with:
-                dotnet-version: '5.0.100'
+                dotnet-version: '6.0.x'
             - name: git history
               run: git --no-pager log -n 10 --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue) <%an>%Creset' --abbrev-commit
             - name: PREPARE jhipster env

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

@@ -9,7 +9,7 @@ jobs:
         strategy:
           fail-fast: false
           matrix:
-              node_version: [14.17.0]
+              node_version: [16.14.0]
               os: [ubuntu-latest]
               app-type:
                   - oauth-with-angular-app
@@ -48,13 +48,15 @@ jobs:
             JHI_ARG: ${{ matrix.arg }}
 
         steps:
-            - uses: actions/checkout@v2
-            - uses: actions/setup-node@v1
+            - uses: actions/checkout@v3
+            - uses: actions/setup-node@v3
               with:
-                  node-version: ${{ matrix.node-version }}
+                node-version: ${{ matrix.node_version }}
+            - name: 'install required npm version'
+              run: npm install -g npm@$(node -e "console.log(require('./generators/generator-dotnetcore-constants').NPM_VERSION);")
             - uses: actions/setup-dotnet@v1
               with:
-                dotnet-version: '5.0.100'
+                dotnet-version: '6.0.x'
             - name: git history
               run: git --no-pager log -n 10 --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue) <%an>%Creset' --abbrev-commit
             - name: PREPARE jhipster env

.sonarcloud.properties

@@ -1,6 +1,6 @@
 # --- properties for sonar cloud ---
 sonar.projectKey=jhipster_jhipster-dotnetcore
-sonar.projectVersion=3.1.1
+sonar.projectVersion=3.6.0
 sonar.organization=jhipster 
 sonar.host.url=https://sonarcloud.io 
 sonar.sources=generators

docs/Features/fronts.md

@@ -139,7 +139,7 @@ Blazor can run your client-side C# code directly in the browser, using WebAssemb
 
 ### Prerequisites
 
-- [dotnet5.0](https://dotnet.microsoft.com/download/dotnet/5.0)
+- [dotnet 6.0](https://dotnet.microsoft.com/download/dotnet/6.0)
 
 ### Generate your application 
 

docs/Features/heroku.md

@@ -1,38 +1,58 @@
-# Heroku Deploy
-This sub-generator initializes a Heroku [.Net 5](https://docs.microsoft.com/pt-br/dotnet/core/dotnet-five) app that is ready to push to Heroku.
+# Deploying to Heroku
+
+This sub-generator allows the deployment of your JHipster .Net application to Heroku cloud.
+
+The Heroku sub-generator will always use free tiers/options. Nevertheless installing addons needs a properly verified Heroku account. 
+
+Therefore to avoid any unexpected build failures, we would recommend verifying your Heroku account before starting this sub-generator.
 
 ## Pre-requisites
+
 Before running the sub-generator, you must install the [Heroku CLI](https://cli.heroku.com/).
-You must also create a Heroku account and run:
+
+Make sure that you are logged into Heroku.
 ```bash
 heroku login
 ```
+
 [Git](https://git-scm.com/) is also required to deploy to Heroku.
 
+Also make sure you have a working [Docker](https://docs.docker.com) installation (eg. `docker ps`) if deploying to Heroku Container Registry.
+
 ## Deploying to Heroku
-To deploy your .Net 5 application to Heroku, run this command:
+
+To deploy your application to Heroku, run the following command:
 
 ```bash
 jhipster heroku
-git push heroku main
 ```
 
-This will initialize a new Heroku app and git push your application to Heroku.
-Free tier dynos and database addons are used by the generator. A verified Heroku account might be needed to add some of the resources.
+## Databases
+
+- Mysql ✔
+- Postgres ✔ 
+- MSSQL ✔ (requires a manual step described below)
 
-This Heroku sub-generator is similar to its Java counterpart. Access the documentation at (https://www.jhipster.tech/heroku/). It might provide helpful insight. But keep in mind that there are some differences between both implementations of the Heroku sub-generator.
+Currently MySql and PostgreSQL database addons are free and automatically added by this sub-generator when deploying to Heroku. Even though those resouces are free, an accound with verified credit card is required to add them.
 
-## Databases
+Heroku's [MSSQL addon](https://elements.heroku.com/addons/mssql) is not free of cost and to avoid unexpected costs It will not be provisioned automatically when deploying to Heroku.
+
+Please visit [the MSSQL addon page](https://elements.heroku.com/addons/mssql), review the pricing and add the MSSQL addon to your account with the following command:
+```bash
+heroku addons:create mssql:REPLACE_PLAN_NAME --as DATABASE --app REPLACE_YOUR_APP_NAME
+```
 
-Currently MySql and PostgreSQL are supported and automatically added by the sub-generator when deploying to Heroku. [JawsDB MySQL addon](https://elements.heroku.com/addons/jawsdb) and [Heroku Postgres addon](https://elements.heroku.com/addons/heroku-postgresql) are added to the Heroku app using the free tier.
+## Oauth2
 
-Since the [MSSQL addon](https://elements.heroku.com/addons/mssql) is not free it requires manual provisioning. This sub-generator provides instructions on how to manually install the MSSQL addon.
+For applications that use Oauth2 the following manual steps are required:
 
-Heroku creates an environment variable named `DATABASE_URL` when using database addons. It contains the following structure: `dbType://user:password@server-url:db-port/db-name`. If `DATABASE_URL` is present the database credentials are parsed at `DatabaseConfiguration.cs` to create a properly formed connection string. And it takes precedence over existing connection strings.
+    1. Deploy the application to Heroku using `jhipster heroku`.
+    2. Access your (Heroku Dashboard)[https://dashboard.heroku.com/] and select the app you have just created.
+    3. Under `Installed add-ons` okta should be already installed.
+    4. Click on `okta` to open the addon's Dashboard.
+    5. To configure it follow the documentation (here)[https://jhipsternet.readthedocs.io/en/latest/Features/security.html#okta]
 
-**Notes:**
-The [heroku/nodejs buildpack](https://elements.heroku.com/buildpacks/heroku/heroku-buildpack-nodejs) is also added to the Heroku app. It is a pre-requisite to build Angular/React client applications.
 
-A `package.json` is automatically added to the root folder as It's required by the heroku/nodejs buildpack, otherwise the application deploy will fail.
+## Limitations
 
-[Jincod's Heroku .NET Core buildpack](https://github.com/jincod/dotnetcore-buildpack) is used to deploy this .Net 5 application to Heroku.
+Only monolithic deploys are supported at the moment.