update generator-jhipster to 8.7.3 (#416)

* Update configuration.component.spec.ts.ejs * Update configuration.service.spec.ts.ejs * update generator-jhipster to 8.7.3 * customize printLogo * add mysql sleep in docker * mysql customization * Update generator.js * lint fix --------- Co-authored-by: JHipster Bot <[email protected]>
jhipster · Oct 30, 2024 · 6d45c59 · 6d45c59
1 parent 257e749
commit 6d45c59
Show file tree

Hide file tree

Showing 19 changed files with 1,076 additions and 2,963 deletions.
diff --git a/.blueprint/generate-sample/command.mjs b/.blueprint/generate-sample/command.mjs
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import { GENERATOR_APP } from 'generator-jhipster/generators';
-import { getSamples } from './get-samples.mjs';
+import { getGithubSamplesGroup } from 'generator-jhipster/testing';
 
 /**
  * @type {import('generator-jhipster').JHipsterCommandDefinition}
@@ -29,12 +29,20 @@ const command = {
     },
   },
   configs: {
+    samplesFolder: {
+      description: 'Path to the samples folder',
+      cli: {
+        type: String,
+      },
+      default: 'samples',
+      scope: 'generator',
+    },
     sampleName: {
       prompt: gen => ({
         when: !gen.all,
         type: 'list',
         message: 'which sample do you want to generate?',
-        choices: async () => getSamples(gen.templatePath(gen.samplesFolder)),
+        choices: async () => getGithubSamplesGroup(gen.templatePath(gen.samplesFolder)),
       }),
       scope: 'generator',
     },
@@ -45,14 +53,6 @@ const command = {
       },
       scope: 'generator',
     },
-    samplesFolder: {
-      description: 'Path to the samples folder',
-      cli: {
-        type: String,
-      },
-      default: 'samples',
-      scope: 'generator',
-    },
   },
   options: {},
   import: [GENERATOR_APP],

diff --git a/.blueprint/generate-sample/generator.mjs b/.blueprint/generate-sample/generator.mjs
@@ -1,6 +1,8 @@
 import { readdir } from 'node:fs/promises';
 import { readFileSync } from 'node:fs';
+import { extname, join } from 'node:path';
 import BaseGenerator from 'generator-jhipster/generators/base';
+import { getGithubSamplesGroup } from 'generator-jhipster/testing';
 
 export default class extends BaseGenerator {
   sampleName;
@@ -14,11 +16,22 @@ export default class extends BaseGenerator {
   get [BaseGenerator.WRITING]() {
     return this.asWritingTaskGroup({
       async copySample() {
-        const samplesFolder = `${this.samplesFolder ?? 'samples'}/`;
-        if (this.all) {
-          this.copyTemplate(`${samplesFolder}*.jdl`, '');
+        const { samplesFolder, all, sampleName } = this;
+        if (all) {
+          this.copyTemplate(`${samplesFolder}/*.jdl`, '');
+        } else if (extname(sampleName) === '.jdl') {
+          this.copyTemplate(join(samplesFolder, sampleName), sampleName, { noGlob: true });
         } else {
-          this.copyTemplate(`${samplesFolder}${this.sampleName}`, this.sampleName, { noGlob: true });
+          const { samples } = await getGithubSamplesGroup(this.templatePath(), samplesFolder);
+          const { 'sample-type': sampleType } = samples[sampleName];
+          if (sampleType === 'jdl') {
+            const jdlFile = `${sampleName}.jdl`;
+            this.copyTemplate(join(samplesFolder, jdlFile), jdlFile, { noGlob: true });
+          } else if (sampleType === 'yo-rc') {
+            this.copyTemplate(join(samplesFolder, sampleName, '**'), '', {
+              fromBasePath: this.templatesPath(samplesFolder, sampleName),
+            });
+          }
         }
       },
     });

diff --git a/.blueprint/generate-sample/get-samples.mjs b/.blueprint/generate-sample/get-samples.mjs
diff --git a/.blueprint/github-build-matrix/build-matrix.mjs b/.blueprint/github-build-matrix/build-matrix.mjs
diff --git a/.blueprint/github-build-matrix/generator.mjs b/.blueprint/github-build-matrix/generator.mjs
@@ -1,10 +1,8 @@
-import { appendFileSync, existsSync } from 'node:fs';
-import os from 'node:os';
 import BaseGenerator from 'generator-jhipster/generators/base';
-import { getSamples } from '../generate-sample/get-samples.mjs';
-import { buildMatrix } from './build-matrix.mjs';
+import { convertToGitHubMatrix, getGithubOutputFile, getGithubSamplesGroup, setGithubTaskOutput } from 'generator-jhipster/testing';
 
 export default class extends BaseGenerator {
+  /** @type {string} */
   samplesFolder;
 
   constructor(args, opts, features) {
@@ -14,14 +12,16 @@ export default class extends BaseGenerator {
   get [BaseGenerator.WRITING]() {
     return this.asWritingTaskGroup({
       async buildMatrix() {
-        const samplesFolder = this.samplesFolder ?? 'samples';
-        const samples = await getSamples(this.templatePath(`../../generate-sample/templates/${samplesFolder}`));
-        const matrix = buildMatrix({ samples, samplesFolder });
-        const matrixoutput = `matrix<<EOF${os.EOL}${JSON.stringify(matrix)}${os.EOL}EOF${os.EOL}`;
-        const filePath = process.env.GITHUB_OUTPUT;
-        console.log(matrixoutput);
-        if (filePath && existsSync(filePath)) {
-          appendFileSync(filePath, matrixoutput, { encoding: 'utf8' });
+        const { samplesFolder } = this;
+        const { samples, warnings } = await getGithubSamplesGroup(this.templatePath('../../generate-sample/templates/'), samplesFolder);
+        if (warnings.length > 0) {
+          this.info(warnings.join('\n'));
+        }
+        const matrix = JSON.stringify(convertToGitHubMatrix(samples));
+        const githubOutputFile = getGithubOutputFile(matrix);
+        this.log.info('matrix', matrix);
+        if (githubOutputFile) {
+          setGithubTaskOutput('matrix', matrix);
         }
       },
     });

diff --git a/.github/workflows/generator.yml b/.github/workflows/generator.yml
@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
           cache: 'npm'
       - run: npm ci
       - run: npm run test
diff --git a/.github/workflows/samples.yml b/.github/workflows/samples.yml
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
       - id: build
         run: |
           npm install
@@ -50,24 +50,23 @@ jobs:
           binary-dir: ${{ github.workspace }}/generator-jhipster-micronaut/cli/
       - run: npm install
         working-directory: ${{ github.workspace }}/generator-jhipster-micronaut
-      - run: cli.cjs generate-sample ${{ matrix.sample-name }} --skip-jhipster-dependencies --skip-install ${{ matrix.extra-args }}
+      - run: cli.cjs generate-sample ${{ matrix.sample }}.jdl --skip-jhipster-dependencies --skip-install ${{ matrix.extra-args }}
       - uses: jhipster/actions/compare-sample@v0
         id: compare
         if: >-
           github.event.pull_request &&
           !contains(github.event.pull_request.labels.*.name, 'pr: disable-compare')
         with:
           generator-path: generator-jhipster-micronaut
-          cmd: cli.cjs generate-sample ${{ matrix.sample-name }} --skip-jhipster-dependencies --skip-install ${{ matrix.extra-args }}
-      - run: npm run ci:e2e:prepare
-        if: steps.compare.outputs.equals != 'true'
+          cmd: cli.cjs generate-sample ${{ matrix.sample }}.jdl --skip-jhipster-dependencies --skip-install ${{ matrix.extra-args }}
       - run: npm run ci:backend:test
         if: steps.compare.outputs.equals != 'true'
         id: backend
-      - run: npm install
+      - run: npm run ci:e2e:package
+        if: steps.compare.outputs.equals != 'true'
       - run: npm run ci:frontend:test --if-present
         if: steps.compare.outputs.equals != 'true'
-      - run: npm run ci:e2e:package
+      - run: npm run ci:e2e:prepare
         if: steps.compare.outputs.equals != 'true'
       - run: npm run ci:e2e:run --if-present
         if: steps.compare.outputs.equals != 'true'

diff --git a/.yo-rc.json b/.yo-rc.json
@@ -74,7 +74,7 @@
       }
     },
     "githubWorkflows": true,
-    "jhipsterVersion": "8.7.1",
+    "jhipsterVersion": "8.7.3",
     "js": true,
     "localBlueprint": false,
     "packageJsonType": "module",

diff --git a/cli/cli-customizations.cjs b/cli/cli-customizations.cjs
@@ -1,4 +1,8 @@
 // This file will not be overwritten by generate-blueprint
 module.exports = {
   printBlueprintLogo: undefined,
+  printLogo: async () => {
+    const { getLogo } = await import('./logo.js');
+    console.log(getLogo());
+  },
 };
diff --git a/cli/cli.cjs b/cli/cli.cjs
@@ -12,7 +12,6 @@ const blueprint = packageFolderName.startsWith('jhipster-') ? `generator-${packa
 
 (async () => {
   const { runJHipster, done, logger } = await import('generator-jhipster/cli');
-  const { getLogo } = await import('./logo.js');
   const executableName = Object.keys(bin)[0];
 
   runJHipster({
@@ -27,9 +26,6 @@ const blueprint = packageFolderName.startsWith('jhipster-') ? `generator-${packa
       console.log('===================== JHipster Micronaut =====================');
       console.log('');
     },
-    printLogo: () => {
-      console.log(getLogo());
-    },
     lookups: [{ packagePaths: [packagePath] }],
     ...require('./cli-customizations.cjs'),
   }).catch(done);

diff --git a/eslint.config.js b/eslint.config.js
@@ -1,9 +1,6 @@
 import globals from 'globals';
 import prettier from 'eslint-plugin-prettier/recommended';
-import jhipster from 'generator-jhipster/eslint/recommended';
-
-// Workaround for jhipster export issue.
-delete jhipster.recommended.recommended;
+import jhipster from 'generator-jhipster/eslint';
 // jhipster-needle-eslint-add-import - JHipster will add additional import here
 
 export default [

diff --git a/...lar/templates/src/main/webapp/app/admin/configuration/configuration.component.spec.ts.ejs b/...lar/templates/src/main/webapp/app/admin/configuration/configuration.component.spec.ts.ejs
@@ -17,7 +17,8 @@ distributed under the License is distributed on an "AS IS" BASIS,
 limitations under the License.
 -%>
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 import { of } from 'rxjs';
 
 import ConfigurationComponent from './configuration.component';
@@ -31,8 +32,8 @@ describe('ConfigurationComponent', () => {
   beforeEach(
     waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [HttpClientTestingModule, ConfigurationComponent],
-        providers: [ConfigurationService],
+        imports: [ConfigurationComponent],
+        providers: [ConfigurationService, provideHttpClient(), provideHttpClientTesting()],
       })
         .overrideTemplate(ConfigurationComponent, '')
         .compileComponents();

diff --git a/...gular/templates/src/main/webapp/app/admin/configuration/configuration.service.spec.ts.ejs b/...gular/templates/src/main/webapp/app/admin/configuration/configuration.service.spec.ts.ejs
@@ -17,7 +17,8 @@ distributed under the License is distributed on an "AS IS" BASIS,
 limitations under the License.
 -%>
 import { TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 
 import { ConfigurationService } from 'app/admin/configuration/configuration.service';
 
@@ -29,7 +30,7 @@ describe('Service Tests', () => {
 
         beforeEach(() => {
             TestBed.configureTestingModule({
-                imports: [HttpClientTestingModule]
+                providers: [provideHttpClient(), provideHttpClientTesting()]
             });
 
             expectedResult = null;

diff --git a/generators/cypress/__snapshots__/generator.spec.js.snap b/generators/cypress/__snapshots__/generator.spec.js.snap
@@ -17,6 +17,9 @@ exports[`SubGenerator cypress of micronaut JHipster blueprint > run > should suc
   "src/test/javascript/cypress/e2e/account/login-page.cy.ts": {
     "stateCleared": "modified",
   },
+  "src/test/javascript/cypress/e2e/account/logout.cy.ts": {
+    "stateCleared": "modified",
+  },
   "src/test/javascript/cypress/e2e/account/password-page.cy.ts": {
     "stateCleared": "modified",
   },