Update to generator-jhipster v8

.blueprint/cli/commands.mjs

@@ -0,0 +1,27 @@
+/**
+ * Copyright 2013-2023 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+const defaultCommands = {
+  'generate-sample': {
+    desc: 'Generate a test sample',
+    blueprint: '@jhipster/jhipster-dev',
+  },
+};
+
+export default defaultCommands;

.blueprint/generate-sample/command.mjs

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2013-2023 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { GENERATOR_APP } from 'generator-jhipster/generators';
+/**
+ * @type {import('generator-jhipster').JHipsterCommandDefinition}
+ */
+const command = {
+  arguments: {
+    sampleName: {
+      type: String,
+    },
+  },
+  options: {},
+  import: [GENERATOR_APP, `ionic:${GENERATOR_APP}`],
+};
+
+export default command;

.blueprint/generate-sample/generator.mjs

@@ -0,0 +1,62 @@
+import { readdir } from 'node:fs/promises';
+import BaseGenerator from 'generator-jhipster/generators/base';
+import command from './command.mjs';
+
+export default class extends BaseGenerator {
+  sampleName;
+
+  get [BaseGenerator.INITIALIZING]() {
+    return this.asInitializingTaskGroup({
+      async initializeOptions() {
+        this.parseJHipsterArguments(command.arguments);
+        if (this.sampleName && !this.sampleName.endsWith('.jdl')) {
+          this.sampleName += '.jdl';
+        }
+        this.parseJHipsterOptions(command.options);
+      },
+    });
+  }
+
+  get [BaseGenerator.PROMPTING]() {
+    return this.asPromptingTaskGroup({
+      async askForSample() {
+        if (!this.sampleName) {
+          const answers = await this.prompt({
+            type: 'list',
+            name: 'sampleName',
+            message: 'which sample do you want to generate?',
+            choices: async () => readdir(this.templatePath('samples')),
+          });
+          this.sampleName = answers.sampleName;
+        }
+      },
+    });
+  }
+
+  get [BaseGenerator.WRITING]() {
+    return this.asWritingTaskGroup({
+      async copySample() {
+        this.copyTemplate(`samples/${this.sampleName}`, this.sampleName, { noGlob: true });
+      },
+    });
+  }
+
+  get [BaseGenerator.END]() {
+    return this.asEndTaskGroup({
+      async generateSample() {
+        await this.composeWithJHipster('jdl', {
+          generatorArgs: [this.sampleName],
+          generatorOptions: {
+            skipJhipsterDependencies: true,
+            insight: false,
+            skipChecks: true,
+            skipInstall: true,
+          },
+        });
+      },
+      async jhipsterInfo() {
+        await this.composeWithJHipster('info');
+      },
+    });
+  }
+}

.blueprint/generate-sample/index.mjs

@@ -0,0 +1,2 @@
+export { default } from './generator.mjs';
+export { default as command } from './command.mjs';

test-integration/jdl/21-points.jdl → .blueprint/generate-sample/templates/samples/21-points.jdl

@@ -45,12 +45,12 @@ enum Units {
 }
 
 relationship OneToOne {
-  Preferences{user(login)} to User
+  Preferences{user(login)} to User with builtInEntity
 }
 relationship ManyToOne {
-  BloodPressure{user(login)} to User
-  Weight{user(login)} to User
-  Points{user(login)} to User
+  BloodPressure{user(login)} to User with builtInEntity
+  Weight{user(login)} to User with builtInEntity
+  Points{user(login)} to User with builtInEntity
 }
 
 paginate BloodPressure, Weight with infinite-scroll

.blueprint/generate-sample/templates/samples/flickr2.jdl

@@ -0,0 +1,40 @@
+application {
+  config {
+    baseName Flickr2
+    packageName com.okta.developer
+    testFrameworks [cypress]
+  }
+  entities *
+}
+
+entity Album {
+  title String required
+  description TextBlob
+  created Instant
+}
+
+entity Photo {
+  title String required
+  description TextBlob
+  image ImageBlob required
+  height Integer
+  width Integer
+  taken Instant
+  uploaded Instant
+}
+
+entity Tag {
+  name String required minlength(2)
+}
+
+relationship ManyToOne {
+  Album{user(login)} to User with builtInEntity
+  Photo{album(title)} to Album
+}
+
+relationship ManyToMany {
+  Photo{tag(name)} to Tag{photo}
+}
+
+paginate Album with pagination
+paginate Photo, Tag with infinite-scroll

test-integration/jdl/gateway-oauth2.jdl → .blueprint/generate-sample/templates/samples/gateway-oauth2.jdl

@@ -29,7 +29,7 @@ entity Tag {
 }
 
 relationship ManyToOne {
-  Blog{user(login)} to User
+  Blog{user(login)} to User with builtInEntity
   Post{blog(name)} to Blog
 }
 

test-integration/jdl/monolith-jwt.jdl → .blueprint/generate-sample/templates/samples/monolith-jwt.jdl

@@ -6,7 +6,7 @@ application {
     packageName org.jhipster.demo.blog
     prodDatabaseType mysql
     buildTool maven
-    clientFramework angularX
+    clientFramework angular
     testFrameworks [cypress]
   }
   entities *
@@ -36,7 +36,7 @@ entity Tag {
 }
 
 relationship ManyToOne {
-  Blog{user(login)} to User
+  Blog{user(login)} to User with builtInEntity
   Post{blog(name)} to Blog
 }
 

test-integration/jdl/monolith-oauth2.jdl → .blueprint/generate-sample/templates/samples/monolith-oauth2.jdl

@@ -28,7 +28,7 @@ entity Tag {
 }
 
 relationship ManyToOne {
-  Blog{user(login)} to User
+  Blog{user(login)} to User with builtInEntity
   Post{blog(name)} to Blog
 }
 

test-integration/jdl/reactive-oauth2.jdl → .blueprint/generate-sample/templates/samples/reactive-oauth2.jdl

@@ -5,10 +5,7 @@ application {
     applicationType monolith
     authenticationType oauth2
     packageName org.jhipster.demo.blog
-    devDatabaseType mongodb
     databaseType mongodb,
-    devDatabaseType mongodb,
-    prodDatabaseType mongodb,
     buildTool maven
     clientFramework angular
     testFrameworks [cypress]

.eslintrc.json

@@ -3,22 +3,17 @@
     "node": true,
     "es2020": true
   },
-  "extends": ["airbnb-base", "plugin:mocha/recommended", "plugin:prettier/recommended"],
+  "extends": ["airbnb-base", "plugin:prettier/recommended"],
   "parserOptions": {
     "ecmaVersion": 11,
     "sourceType": "module"
   },
   "overrides": [
     {
-      "files": ["**/*.spec.{c,m,}js", "test/**/*.{c,m,}js"],
-      "env": {
-        "mocha": true
-      }
+      "files": ["**/*.spec.{c,m,}js", "test/**/*.{c,m,}js"]
     }
   ],
   "rules": {
-    "class-methods-use-this": "off",
-    "mocha/no-mocha-arrows": "off",
     "func-names": "off",
     "import/no-extraneous-dependencies": ["error", { "devDependencies": true }],
     "import/no-unresolved": "off",

.github/dependabot.yml

@@ -13,16 +13,23 @@ updates:
     groups:
       angular:
         patterns:
-          - "@angular/*"
-          - "zone.js"
-          - "@angular-devkit/*"
-          - "@angular-builders/*"
+          - '@angular/*'
+          - '@angular-devkit/*'
+          - '@fortawesome/angular-fontawesome'
+          - 'ngx-webstorage'
+          - 'typescript'
+          - 'zone.js'
+          - '@angular-builders/jest'
+          - 'jest'
+          - 'jest-preset-angular'
+          - '@types/jest'
       angular-eslint:
         patterns:
-          - "@angular-eslint/*"
+          - '@angular-eslint/*'
       capacitor:
         patterns:
           - '@capacitor/*'
+          - 'capacitor-secure-storage-plugin'
       typescript-eslint:
         patterns:
-          - "@typescript-eslint/*"
+          - '@typescript-eslint/*'

.github/workflows/generator.yml

@@ -1,5 +1,7 @@
 name: Generator
 on: [push, pull_request]
+permissions:
+  contents: read
 jobs:
   ionic:
     name: npm-test
@@ -9,6 +11,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: 18
+          cache: 'npm'
       - run: npm ci
       - run: npm run test

.github/workflows/ionic.yml

@@ -5,7 +5,7 @@ on:
       - 'dependabot/**'
   pull_request:
     branches:
-      - "*"
+      - '*'
 env:
   JHIPSTER_INSTALL: ${{ github.workspace }}/generator-jhipster-ionic/test-integration/install
   JHIPSTER_SAMPLES: ${{ github.workspace }}/generator-jhipster-ionic/test-integration/jdl
@@ -15,6 +15,8 @@ env:
   SPRING_OUTPUT_ANSI_ENABLED: ALWAYS
   SPRING_JPA_SHOW_SQL: false
   NG_CLI_ANALYTICS: false
+  # https://github.com/cypress-io/cypress/issues/27962#issuecomment-1746294247
+  NODE_OPTIONS: --dns-result-order=ipv4first
 jobs:
   build:
     name: ${{ matrix.jdl }}
@@ -27,15 +29,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node_version: [16]
-        java_version: [11]
         os: [ubuntu-latest]
         jdl:
           - monolith-jwt
           - monolith-oauth2
           - gateway-oauth2
           - reactive-oauth2
           - 21-points
+          - flickr2
         include:
           - jdl: monolith-jwt
             e2e: 1
@@ -47,6 +48,8 @@ jobs:
             e2e: 1
           - jdl: 21-points
             e2e: 1
+          - jdl: flickr2
+            e2e: 1
 
     steps:
       #----------------------------------------------------------------------
@@ -65,23 +68,18 @@ jobs:
         working-directory: ${{ github.workspace }}/generator-jhipster-ionic
       - uses: actions/setup-node@v3
         with:
-          node-version: ${{ matrix.node_version }}
+          node-version: 18
       - uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: ${{ matrix.java_version }}
-      - name: Install latest Chrome
-        run: |
-          sudo apt update
-          sudo apt --only-upgrade install google-chrome-stable
-          google-chrome --version
+          java-version: 17
       - name: Check Version
         run: $JHIPSTER_INSTALL/02-checkVersion.sh
       #----------------------------------------------------------------------
       # Script
       #----------------------------------------------------------------------
       - name: Generate Project
-        run: 'jhipster-ionic jdl "$JHIPSTER_SAMPLES"/"${{ matrix.jdl }}".jdl --force --no-insight --skip-checks --skip-git --skip-commit-hook --skip-install --blueprints ionic --skip-jhipster-dependencies'
+        run: 'jhipster-ionic generate-sample ${{ matrix.jdl }} --force --no-insight --skip-checks --skip-git --skip-commit-hook --skip-install --skip-jhipster-dependencies'
       - name: Ionic tests
         run: cat package.json; npm install; npm test
         working-directory: ${{ github.workspace }}/ionic4j
@@ -92,7 +90,7 @@ jobs:
           echo '127.0.0.1       keycloak' | sudo tee -a /etc/hosts
           cat /etc/hosts
       - name: Launch backend application
-        run: npm run docker:app:up
+        run: npm run app:up
       - name: Wait for backend to start
         run: npm run ci:server:await
       - name: Launch ionic e2e test