diff --git a/.github/workflows/generator-generate-blueprint.yml b/.github/workflows/generator-generate-blueprint.yml index fa2a6dcdd6db..464bc1643b86 100644 --- a/.github/workflows/generator-generate-blueprint.yml +++ b/.github/workflows/generator-generate-blueprint.yml @@ -68,8 +68,7 @@ jobs: mkdir generator-jhipster-foo cd generator-jhipster-foo cp $JHI_INTEG/generate-blueprint-samples/default/.yo-rc.json . - jhipster generate-blueprint --force --link-jhipster-dependency --generate-snapshots --skip-install - npm link generator-jhipster + jhipster generate-blueprint --force --install-jhipster-dependency-folder --generate-snapshots --skip-install npm link - name: 'GENERATION: config' run: $JHI_SCRIPTS/11-generate-config.sh diff --git a/generators/generate-blueprint/command.ts b/generators/generate-blueprint/command.ts index bfed7cb39f1b..4f02905fef6e 100644 --- a/generators/generate-blueprint/command.ts +++ b/generators/generate-blueprint/command.ts @@ -75,6 +75,13 @@ const command = { }, scope: 'storage', }, + installJhipsterDependencyFolder: { + cli: { + description: 'Install JHipster dependency folder', + type: Boolean, + }, + scope: 'generator', + }, }, options: { [GENERATE_SNAPSHOTS]: { diff --git a/generators/generate-blueprint/generator.ts b/generators/generate-blueprint/generator.ts index 148cae668d2a..a8c41832df3f 100644 --- a/generators/generate-blueprint/generator.ts +++ b/generators/generate-blueprint/generator.ts @@ -25,7 +25,7 @@ import BaseGenerator from '../base-application/index.js'; import { PRIORITY_NAMES_LIST as BASE_PRIORITY_NAMES_LIST } from '../base/priorities.js'; import * as GENERATOR_LIST from '../generator-list.js'; -import { packageJson } from '../../lib/index.js'; +import { getPackageRoot, packageJson } from '../../lib/index.js'; import { BLUEPRINT_API_VERSION, NODE_VERSION } from '../generator-constants.js'; import { files, generatorFiles } from './files.js'; import { @@ -57,6 +57,7 @@ export default class extends BaseGenerator { recreatePackageLock!: boolean; skipWorkflows!: boolean; ignoreExistingGenerators!: boolean; + installJhipsterDependencyFolder!: boolean; async _beforeQueue() { if (!this.fromBlueprint) { @@ -402,6 +403,8 @@ export default class extends BaseGenerator { if (this.options[LINK_JHIPSTER_DEPENDENCY]) { this.log.verboseInfo('Linking generator-jhipster'); await this.spawnCommand('npm', ['link', 'generator-jhipster'], { stdio: 'inherit' }); + } else if (this.installJhipsterDependencyFolder) { + await this.spawnCommand('npm', ['install', getPackageRoot()], { stdio: 'inherit' }); } // Generate snapshots to add to git.