adjusts

Author: mshima

generators/generate-blueprint/generator.ts

@@ -143,8 +143,6 @@ export default class extends GenerateBlueprintBaseGenerator {
         if (this.jhipsterConfig[LOCAL_BLUEPRINT_OPTION]) {
           await this.composeWithJHipster('jhipster:generate-blueprint:local');
         } else {
-          const initGenerator = await this.composeWithJHipster('init');
-          initGenerator.generateReadme = false;
           await this.composeWithJHipster('jhipster:generate-blueprint:standalone');
         }
       },

generators/generate-blueprint/generators/bootstrap/generator.ts

@@ -33,7 +33,7 @@ export default class BootstrapGenerator extends BlueprintGenerator {
   get loading() {
     return this.asLoadingTaskGroup({
       async loading({ applicationDefaults }) {
-        applicationDefaults({ commands: () => [], typescriptEslint: false });
+        applicationDefaults({ commands: () => [] });
       },
     });
   }

generators/generate-blueprint/generators/standalone/generator.ts

@@ -36,6 +36,8 @@ export default class StandaloneBlueprintGenerator extends GenerateBlueprintBaseG
     }
 
     await this.dependsOnBootstrap('generate-blueprint');
+    const initGenerator = await this.dependsOnJHipster('init');
+    initGenerator.generateReadme = false;
   }
 
   get preparing() {
@@ -153,7 +155,7 @@ export default class StandaloneBlueprintGenerator extends GenerateBlueprintBaseG
           files: defaultPublishedFiles,
           scripts: {
             ejslint: 'ejslint generators/**/*.ejs',
-            lint: 'eslint .',
+            lint: 'eslint',
             'lint-fix': 'npm run ejslint && npm run lint -- --fix',
             pretest: 'npm run prettier-check && npm run lint && tsc',
             test: 'vitest run',
@@ -177,6 +179,13 @@ export default class StandaloneBlueprintGenerator extends GenerateBlueprintBaseG
             node: jhipsterPackageJson.engines.node,
           },
         });
+        if (!application.javascriptBlueprint) {
+          this.packageJson.merge({
+            devDependencies: {
+              'typescript': mainDependencies['typescript'],
+            },
+          });
+        }
       },
       addCliToPackageJson({ application }) {
         const { cli, cliName } = application;

generators/generate-blueprint/generators/standalone/templates/generators/base-generator.ts.ejs

@@ -1,12 +1,12 @@
 import type { JHipsterCommandDefinition } from 'generator-jhipster';
-import BaseApplicationGenerator from 'generator-jhipster/generators/base-application';
 import type {
   Application as BaseApplication,
   Config as BaseConfig,
   Entity as BaseEntity,
   Options as BaseOptions,
   Source as BaseSource,
-} from 'generator-jhipster/generators/add';
+} from 'generator-jhipster/generators/app';
+import BaseApplicationGenerator from 'generator-jhipster/generators/base-application';
 
 type <%- upperFirstCamelCaseBaseName %>BlueprintConfig = any;