add generate-sample2

mshima · Jan 28, 2025 · f90c810 · f90c810
1 parent cac8fbc
commit f90c810
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 35 deletions.
diff --git a/.blueprint/cli/commands.mjs b/.blueprint/cli/commands.mjs
@@ -18,7 +18,7 @@
  */
 
 const defaultCommands = {
-    'generate-sample': {
+    'generate-sample2': {
         desc: 'Generate a test sample',
         blueprint: '@jhipster/jhipster-dev',
     },

diff --git a/.blueprint/generate-sample/command.mjs → .blueprint/generate-sample2/command.mjs b/.blueprint/generate-sample/command.mjs → .blueprint/generate-sample2/command.mjs
@@ -17,14 +17,8 @@
  * limitations under the License.
  */
 import { existsSync, readdirSync } from 'node:fs';
+import { entitiesByType, workflowSamples } from '../generate-sample/support/index.mjs';
 import { getSamples } from './get-samples.mjs';
-import { entitiesByType, workflowSamples } from './support/index.mjs';
-
-const updateSampleName = sample =>
-    sample.replace('ngx', 'ng').replace('ms-ng-eureka-oauth2-mongodb-caffeine', 'ms-ng-oauth2-mongodb-caffeine');
-
-const revertSampleName = sample =>
-    sample.replace('ng-', 'ngx-').replace('ms-ng-oauth2-mongodb-caffeine', 'ms-ng-eureka-oauth2-mongodb-caffeine');
 
 /**
  * @type {import('generator-jhipster').JHipsterCommandDefinition}
@@ -81,11 +75,9 @@ const command = {
             },
             configure: gen => {
                 if (gen.appSample && gen.appSample !== 'jdl') {
-                    gen.appSample = revertSampleName(gen.appSample);
-
                     let { appSample } = gen;
                     appSample = workflowSamples[appSample]?.['app-sample'] ?? appSample;
-                    gen.samplesFolder = `json-samples/${updateSampleName(appSample)}`;
+                    gen.samplesFolder = `json-samples/${appSample}`;
                     gen.entrypointGenerator = 'app';
                 }
             },
@@ -100,7 +92,7 @@ const command = {
             configure: gen => {
                 if (gen.jdlSamples) {
                     const [app, ...entities] = gen.jdlSamples.split(',');
-                    gen.samplesFolder = `jdl-samples/${updateSampleName(app)}`;
+                    gen.samplesFolder = `jdl-samples/${app}`;
                     gen.generatorArgs = '*.jdl';
                     if (entities && entities.length > 0) {
                         gen.supportingSamples.push(...entities.map(entity => `${entity}.jdl`));

diff --git a/.blueprint/generate-sample/generator.mjs → .blueprint/generate-sample2/generator.mjs b/.blueprint/generate-sample/generator.mjs → .blueprint/generate-sample2/generator.mjs
@@ -15,6 +15,7 @@ export default class extends BaseGenerator {
 
     constructor(args, opts, features) {
         super(args, opts, { ...features, jhipsterBootstrap: false });
+        this.sourceRoot(this.templatePath('../../generate-sample/templates'));
     }
 
     get [BaseGenerator.INITIALIZING]() {

diff --git a/.blueprint/generate-sample/get-samples.mjs → .blueprint/generate-sample2/get-samples.mjs b/.blueprint/generate-sample/get-samples.mjs → .blueprint/generate-sample2/get-samples.mjs
diff --git a/.blueprint/generate-sample/index.mjs → .blueprint/generate-sample2/index.mjs b/.blueprint/generate-sample/index.mjs → .blueprint/generate-sample2/index.mjs
diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml
@@ -113,7 +113,7 @@ jobs:
             #----------------------------------------------------------------------
             # Install JHipster and generate project+entities
             #----------------------------------------------------------------------
-            - run: cli.cjs generate-sample --skip-jhipster-dependencies --skip-install --skip-ktlint-format ${{ matrix.extra-args }} ${{ matrix.new-extra-args }}
+            - run: cli.cjs generate-sample2 --skip-jhipster-dependencies --skip-install --skip-ktlint-format ${{ matrix.extra-args }} ${{ matrix.new-extra-args }}
             - run: cli.cjs info
             #----------------------------------------------------------------------
             # Detect changes against base commit

diff --git a/.github/workflows/react.yml b/.github/workflows/react.yml
@@ -113,7 +113,7 @@ jobs:
             #----------------------------------------------------------------------
             # Install JHipster and generate project+entities
             #----------------------------------------------------------------------
-            - run: cli.cjs generate-sample --skip-jhipster-dependencies --skip-install --skip-ktlint-format ${{ matrix.extra-args }} ${{ matrix.new-extra-args }}
+            - run: cli.cjs generate-sample2 --skip-jhipster-dependencies --skip-install --skip-ktlint-format ${{ matrix.extra-args }} ${{ matrix.new-extra-args }}
             - run: cli.cjs info
             #----------------------------------------------------------------------
             # Detect changes against base commit

diff --git a/test-integration/workflow-samples/angular.json b/test-integration/workflow-samples/angular.json
@@ -1,77 +1,77 @@
 {
     "include": [
         {
-            "name": "ngx-default",
-            "app-sample": "ngx-default",
+            "name": "ng-default",
+            "app-sample": "ng-default",
             "entity": "sqlfull",
             "sonar-analyse": "true"
         },
         {
-            "name": "ngx-default-additional",
+            "name": "ng-default-additional",
             "entity": "none",
-            "app-sample": "ngx-default",
+            "app-sample": "ng-default",
             "jdl-entity": "custom-id,entities"
         },
         {
-            "name": "ngx-mongodb-kafka-cucumber",
-            "app-sample": "ngx-mongodb-kafka-cucumber",
+            "name": "ng-mongodb-kafka-cucumber",
+            "app-sample": "ng-mongodb-kafka-cucumber",
             "entity": "mongodb",
             "environment": "dev"
         },
         {
-            "name": "ngx-gradle-fr",
-            "app-sample": "ngx-gradle-fr",
+            "name": "ng-gradle-fr",
+            "app-sample": "ng-gradle-fr",
             "entity": "sql"
         },
         {
-            "name": "ngx-gradle-h2disk-ws-nocache",
-            "app-sample": "ngx-gradle-h2disk-ws-nocache",
+            "name": "ng-gradle-h2disk-ws-nocache",
+            "app-sample": "ng-gradle-h2disk-ws-nocache",
             "entity": "sql",
             "environment": "dev",
             "war": 1,
             "testcontainers": "false"
         },
         {
-            "name": "ngx-webflux-mongodb",
+            "name": "ng-webflux-mongodb",
             "app-sample": "webflux-mongodb",
             "entity": "mongodb"
         },
         {
-            "name": "ngx-webflux-gradle-mongodb-oauth2",
+            "name": "ng-webflux-gradle-mongodb-oauth2",
             "app-sample": "webflux-mongodb-oauth2",
             "entity": "mongodb"
         },
         {
-            "name": "ngx-webflux-psql-default",
+            "name": "ng-webflux-psql-default",
             "app-sample": "webflux-psql",
             "entity": "sql"
         },
         {
-            "name": "ngx-webflux-psql-additional",
+            "name": "ng-webflux-psql-additional",
             "jdl-samples": "webflux-psql,custom-domain"
         },
         {
-            "name": "ngx-webflux-gradle-session-h2mem-es",
+            "name": "ng-webflux-gradle-session-h2mem-es",
             "app-sample": "webflux-gradle-session-h2mem-es",
             "environment": "dev",
             "entity": "sqllight"
         },
         {
-            "name": "ms-ngx-oauth2-mongodb-caffeine",
-            "jdl-samples": "ms-ngx-oauth2-mongodb-caffeine",
+            "name": "ms-ng-oauth2-mongodb-caffeine",
+            "jdl-samples": "ms-ng-oauth2-mongodb-caffeine",
             "extra-args": "--workspaces --monorepository",
             "disabled": "unstable",
             "workspaces": "true"
         },
         {
-            "name": "mf-ngx-eureka-jwt-psql-ehcache",
-            "jdl-samples": "mf-ngx-eureka-jwt-psql-ehcache",
+            "name": "mf-ng-eureka-jwt-psql-ehcache",
+            "jdl-samples": "mf-ng-eureka-jwt-psql-ehcache",
             "extra-args": "--workspaces --monorepository",
             "workspaces": "true"
         },
         {
-            "name": "ms-mf-ngx-consul-oauth2-neo4j",
-            "jdl-samples": "ms-mf-ngx-consul-oauth2-neo4j",
+            "name": "ms-mf-ng-consul-oauth2-neo4j",
+            "jdl-samples": "ms-mf-ng-consul-oauth2-neo4j",
             "extra-args": "--workspaces --monorepository",
             "disabled": "https://github.com/neo4j/neo4j/issues/13025",
             "workspaces": "true"