generator-jhipster 8.0.0-beta.1 → 8.0.0-beta.3

package/dist/generators/upgrade/generator.mjs

@@ -16,13 +16,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import process from 'node:process';
+import fs from 'fs';
+import path from 'path';
 import chalk from 'chalk';
 import shelljs from 'shelljs';
 import semver from 'semver';
-import fs from 'fs';
 import gitignore from 'parse-gitignore';
-import path from 'path';
-import childProcess from 'child_process';
+import latestVersion from 'latest-version';
 import BaseGenerator from '../base/index.mjs';
 import { upgradeFilesTask as upgradeLanguagesFilesTask } from '../languages/index.mjs';
 import { SERVER_MAIN_RES_DIR } from '../generator-constants.mjs';
@@ -66,6 +67,8 @@ function gitExec(logger, args, options = {}, callback) {
     return shelljs.exec(command, options);
 }
 export default class UpgradeGenerator extends BaseGenerator {
+    fromV7;
+    fromV7_9_3App;
     constructor(args, options, features) {
         super(args, options, features);
         // This adds support for a `--target-version` flag
@@ -78,24 +81,12 @@ export default class UpgradeGenerator extends BaseGenerator {
             description: 'Upgrade to specific blueprint versions instead of the latest, e.g. --target-blueprint-versions foo@0.0.1,bar@1.0.2',
             type: String,
         });
-        // This adds support for a `--skip-install` flag
-        this.option('skip-install', {
-            description: 'Skips installing dependencies during the upgrade process',
-            type: Boolean,
-            default: false,
-        });
         // This adds support for a `--silent` flag
         this.option('silent', {
             description: 'Hides output of the generation process',
             type: Boolean,
             default: false,
         });
-        // This adds support for a `--skip-checks` flag
-        this.option('skip-checks', {
-            description: 'Disable checks during project regeneration',
-            type: Boolean,
-            default: false,
-        });
         if (this.options.help) {
             return;
         }
@@ -107,9 +98,20 @@ export default class UpgradeGenerator extends BaseGenerator {
         if (!this.config.existed) {
             throw new Error("Could not find a valid JHipster application configuration, check if the '.yo-rc.json' file exists and if the 'generator-jhipster' key exists inside it.");
         }
+        this.fromV7 = this.jhipsterConfig.jhipsterVersion && semver.satisfies(this.jhipsterConfig.jhipsterVersion, '^7.0.0');
+        const currentNodeVersion = process.versions.node;
+        if (this.jhipsterConfig.jhipsterVersion === '7.9.3') {
+            if (!semver.satisfies(currentNodeVersion, '^16.0.0')) {
+                throw new Error('Upgrading a v7.9.3 generated application requires node 16 to upgrade');
+            }
+            this.fromV7_9_3App = true;
+        }
+        else if (!semver.satisfies(currentNodeVersion, packageJson.engines.node)) {
+            this.log.fatal(`You are running Node version ${currentNodeVersion}\nJHipster requires Node version ${packageJson.engines.node}\nPlease update your version of Node.`);
+        }
     }
     get [BaseGenerator.INITIALIZING]() {
-        return {
+        return this.asInitializingTaskGroup({
             displayLogo() {
                 this.log.log(chalk.green('Welcome to the JHipster Upgrade Sub-Generator'));
                 this.log.log(chalk.green('This will upgrade your current application codebase to the latest JHipster version'));
@@ -121,7 +123,7 @@ export default class UpgradeGenerator extends BaseGenerator {
                 this.currentJhipsterVersion = this.config.get('jhipsterVersion');
                 this.clientPackageManager = this.config.get('clientPackageManager');
             },
-        };
+        });
     }
     _rmRf(file) {
         const absolutePath = path.resolve(file);
@@ -136,14 +138,14 @@ export default class UpgradeGenerator extends BaseGenerator {
         const gitCheckout = this.gitExec(args, { silent: this.silent });
         if (gitCheckout.code !== 0)
             throw new Error(`Unable to checkout branch ${branch}:\n${gitCheckout.stderr}`);
-        this.success(`Checked out branch "${branch}"`);
+        this.log.ok(`Checked out branch "${branch}"`);
     }
     _upgradeFiles() {
         if (upgradeLanguagesFilesTask.call(this)) {
             const gitCommit = this.gitExec(['commit', '-q', '-m', '"Upgrade preparation."', '--no-verify'], { silent: this.silent });
             if (gitCommit.code !== 0)
                 throw new Error(`Unable to prepare upgrade:\n${gitCommit.stderr}`);
-            this.success('Upgrade preparation');
+            this.log.ok('Upgrade preparation');
         }
     }
     _cleanUp() {
@@ -154,9 +156,9 @@ export default class UpgradeGenerator extends BaseGenerator {
                 this._rmRf(file);
             }
         });
-        this.success('Cleaned up project directory');
+        this.log.ok('Cleaned up project directory');
     }
-    _generate(jhipsterVersion, blueprintInfo) {
+    _generate(jhipsterVersion, blueprintInfo, { target }) {
         this.log.verboseInfo(`Regenerating application with JHipster ${jhipsterVersion}${blueprintInfo}...`);
         let generatorCommand = 'yo jhipster';
         if (this.options.regenerateExecutable) {
@@ -175,16 +177,14 @@ export default class UpgradeGenerator extends BaseGenerator {
                 generatorCommand = 'npm exec --no jhipster --';
             }
         }
-        const skipChecksOption = this.skipChecks ? '--skip-checks' : '';
-        const regenerateCmd = `${generatorCommand} --with-entities --force --skip-install --skip-git --ignore-errors --no-insight ${skipChecksOption}`;
+        const skipChecksOption = this.skipChecks || (!target && this.fromV7_9_3App) ? '--skip-checks' : '';
+        const regenerateCmd = `${generatorCommand} ${this.fromV7 ? '--with-entities ' : ''}--force --skip-install --skip-git --ignore-errors --no-insight ${skipChecksOption}`;
         this.log.verboseInfo(regenerateCmd);
-        try {
-            childProcess.execSync(regenerateCmd, { stdio: 'inherit' });
-            this.success(`Successfully regenerated application with JHipster ${jhipsterVersion}${blueprintInfo}`);
-        }
-        catch (err) {
-            throw new Error(`Something went wrong while generating project! ${err}`);
+        const result = this.spawnCommandSync(regenerateCmd);
+        if (result.exitCode !== 0) {
+            throw new Error(`Something went wrong while generating project! ${result.exitCode}`);
         }
+        this.log.ok(`Successfully regenerated application with JHipster ${jhipsterVersion}${blueprintInfo}`);
     }
     _gitCommitAll(commitMsg) {
         const gitAdd = this.gitExec(['add', '-A'], { maxBuffer: 1024 * 10000, silent: this.silent });
@@ -195,36 +195,25 @@ export default class UpgradeGenerator extends BaseGenerator {
         });
         if (gitCommit.code !== 0)
             throw new Error(`Unable to commit in git:\n${gitCommit.stderr}`);
-        this.success(`Committed with message "${commitMsg}"`);
+        this.log.ok(`Committed with message "${commitMsg}"`);
     }
-    _regenerate(jhipsterVersion, blueprintInfo) {
-        this._generate(jhipsterVersion, blueprintInfo);
+    _regenerate(jhipsterVersion, blueprintInfo, { target }) {
+        this._generate(jhipsterVersion, blueprintInfo, { target });
         const keystore = `${SERVER_MAIN_RES_DIR}config/tls/keystore.p12`;
         this.log.verboseInfo(`Removing ${keystore}`);
         this._rmRf(keystore);
         this._gitCommitAll(`Generated with JHipster ${jhipsterVersion}${blueprintInfo}`);
     }
-    _retrieveLatestVersion(packageName) {
-        this.log.verboseInfo(`Looking for latest ${packageName} version...`);
-        const commandPrefix = 'npm show';
-        const pkgInfo = shelljs.exec(`${commandPrefix} ${packageName} version`, { silent: this.silent });
-        if (pkgInfo.stderr) {
-            this.log.warn(pkgInfo.stderr);
-            throw new Error(`Something went wrong fetching the latest ${packageName} version number...\n${pkgInfo.stderr}`);
-        }
-        const msg = pkgInfo.stdout;
-        return msg.replace('\n', '');
-    }
     _installNpmPackageLocally(npmPackage, version) {
         this.log.verboseInfo(`Installing ${npmPackage} ${version} locally`);
         const commandPrefix = 'npm install';
         const devDependencyParam = '--save-dev';
         const noPackageLockParam = '--no-package-lock';
-        const generatorCommand = `${commandPrefix} ${npmPackage}@${version} ${devDependencyParam} ${noPackageLockParam} --ignore-scripts --legacy-peer-deps`;
+        const generatorCommand = `${commandPrefix} ${npmPackage}@${version} ${devDependencyParam} ${noPackageLockParam} --ignore-scripts --force`;
         this.log.verboseInfo(generatorCommand);
         const npmIntall = shelljs.exec(generatorCommand, { silent: this.silent });
         if (npmIntall.code === 0)
-            this.success(`Installed ${npmPackage}@${version}`);
+            this.log.ok(`Installed ${npmPackage}@${version}`);
         else
             throw new Error(`Something went wrong while installing ${npmPackage}! ${npmIntall.stdout} ${npmIntall.stderr}`);
     }
@@ -246,7 +235,7 @@ export default class UpgradeGenerator extends BaseGenerator {
                     this.log.warn('No blueprints detected, skipping check of last blueprint version');
                     return undefined;
                 }
-                this.success('Checking for new blueprint versions');
+                this.log.ok('Checking for new blueprint versions');
                 return Promise.all(this.blueprints
                     .filter(blueprint => {
                     if (this.targetBlueprintVersions && this.targetBlueprintVersions.length > 0) {
@@ -261,32 +250,28 @@ export default class UpgradeGenerator extends BaseGenerator {
                     }
                     return true;
                 })
-                    .map(blueprint => {
-                    return new Promise(resolve => {
-                        const latestVersion = this._retrieveLatestVersion(blueprint.name);
-                        blueprint.latestBlueprintVersion = latestVersion;
-                        if (semver.lt(blueprint.version, blueprint.latestBlueprintVersion)) {
-                            this.newBlueprintVersionFound = true;
-                            this.success(`New ${blueprint.name} version found: ${blueprint.latestBlueprintVersion}`);
-                        }
-                        else if (this.force) {
-                            this.newBlueprintVersionFound = true;
-                            this.log.log(chalk.yellow('Forced re-generation'));
-                        }
-                        else {
-                            if (this.newBlueprintVersionFound === undefined) {
-                                this.newBlueprintVersionFound = false;
-                            }
-                            this.log.warn(`${chalk.green('No update available.')} Application has already been generated with latest version for blueprint: ${blueprint.name}`);
+                    .map(async (blueprint) => {
+                    blueprint.latestBlueprintVersion = await latestVersion(blueprint.name);
+                    if (semver.lt(blueprint.version, blueprint.latestBlueprintVersion)) {
+                        this.newBlueprintVersionFound = true;
+                        this.log.ok(`New ${blueprint.name} version found: ${blueprint.latestBlueprintVersion}`);
+                    }
+                    else if (this.force) {
+                        this.newBlueprintVersionFound = true;
+                        this.log.log(chalk.yellow('Forced re-generation'));
+                    }
+                    else {
+                        if (this.newBlueprintVersionFound === undefined) {
+                            this.newBlueprintVersionFound = false;
                         }
-                        this.success(`Done checking for new version for blueprint ${blueprint.name}`);
-                        resolve();
-                    });
+                        this.log.warn(`${chalk.green('No update available.')} Application has already been generated with latest version for blueprint: ${blueprint.name}`);
+                    }
+                    this.log.ok(`Done checking for new version for blueprint ${blueprint.name}`);
                 })).then(() => {
-                    this.success('Done checking for new version of blueprints');
+                    this.log.ok('Done checking for new version of blueprints');
                 });
             },
-            checkLatestJhipsterVersion() {
+            async checkLatestJhipsterVersion() {
                 if (this.targetJhipsterVersion) {
                     if (this.targetJhipsterVersion === GLOBAL_VERSION) {
                         this.originalTargetJhipsterVersion = this.targetJhipsterVersion;
@@ -296,10 +281,9 @@ export default class UpgradeGenerator extends BaseGenerator {
                     return;
                 }
                 this.log.verboseInfo(`Looking for latest ${GENERATOR_JHIPSTER} version...`);
-                const latestVersion = this._retrieveLatestVersion(GENERATOR_JHIPSTER);
-                this.targetJhipsterVersion = latestVersion;
+                this.targetJhipsterVersion = await latestVersion(GENERATOR_JHIPSTER);
                 if (semver.lt(this.currentJhipsterVersion, this.targetJhipsterVersion)) {
-                    this.success(`New ${GENERATOR_JHIPSTER} version found: ${this.targetJhipsterVersion}`);
+                    this.log.ok(`New ${GENERATOR_JHIPSTER} version found: ${this.targetJhipsterVersion}`);
                 }
                 else if (this.force) {
                     this.log.log(chalk.yellow('Forced re-generation'));
@@ -313,14 +297,14 @@ export default class UpgradeGenerator extends BaseGenerator {
                     const gitInit = this.gitExec('init', { silent: this.silent });
                     if (gitInit.code !== 0)
                         throw new Error(`Unable to initialize a new Git repository:\n${gitInit.stdout} ${gitInit.stderr}`);
-                    this.success('Initialized a new Git repository');
+                    this.log.ok('Initialized a new Git repository');
                     this._gitCommitAll('Initial');
                 };
                 const gitRevParse = this.gitExec(['rev-parse', '-q', '--is-inside-work-tree'], { silent: this.silent });
                 if (gitRevParse.code !== 0)
                     gitInit();
                 else
-                    this.success('Git repository detected');
+                    this.log.ok('Git repository detected');
             },
             assertNoLocalChanges() {
                 const gitStatus = this.gitExec(['status', '--porcelain'], { silent: this.silent });
@@ -355,7 +339,7 @@ export default class UpgradeGenerator extends BaseGenerator {
                     if (gitMerge.code !== 0) {
                         throw new Error(`Unable to record current code has been generated with version ${this.currentJhipsterVersion}:\n${gitMerge.stdout} ${gitMerge.stderr}`);
                     }
-                    this.success(`Current code has been generated with version ${this.currentJhipsterVersion}`);
+                    this.log.ok(`Current code has been generated with version ${this.currentJhipsterVersion}`);
                 };
                 const installJhipsterLocally = version => {
                     this._installNpmPackageLocally(GENERATOR_JHIPSTER, version);
@@ -365,15 +349,15 @@ export default class UpgradeGenerator extends BaseGenerator {
                         this.log.verboseInfo('Skipping local blueprint installation since no blueprint has been detected');
                         return Promise.resolve(false);
                     }
-                    this.success('Installing blueprints locally...');
+                    this.log.ok('Installing blueprints locally...');
                     return Promise.all(this.blueprints.map(blueprint => {
                         return new Promise(resolve => {
                             this._installNpmPackageLocally(blueprint.name, blueprint.version);
-                            this.success(`Done installing blueprint: ${blueprint.name}@${blueprint.version}`);
+                            this.log.ok(`Done installing blueprint: ${blueprint.name}@${blueprint.version}`);
                             resolve();
                         });
                     })).then(() => {
-                        this.success('Done installing blueprints locally');
+                        this.log.ok('Done installing blueprints locally');
                         return true;
                     });
                 };
@@ -381,7 +365,7 @@ export default class UpgradeGenerator extends BaseGenerator {
                     const gitCheckout = this.gitExec(['checkout', '--orphan', UPGRADE_BRANCH], { silent: this.silent });
                     if (gitCheckout.code !== 0)
                         throw new Error(`Unable to create ${UPGRADE_BRANCH} branch:\n${gitCheckout.stdout} ${gitCheckout.stderr}`);
-                    this.success(`Created branch ${UPGRADE_BRANCH}`);
+                    this.log.ok(`Created branch ${UPGRADE_BRANCH}`);
                 };
                 const gitRevParse = this.gitExec(['rev-parse', '-q', '--verify', UPGRADE_BRANCH], { silent: this.silent });
                 if (gitRevParse.code !== 0) {
@@ -397,7 +381,7 @@ export default class UpgradeGenerator extends BaseGenerator {
                     await installBlueprintsLocally();
                     const blueprintInfo = this.blueprints && this.blueprints.length > 0 ? ` and ${this.blueprints.map(bp => bp.name + bp.version).join(', ')} ` : '';
                     // Regenerate the project
-                    this._regenerate(this.currentJhipsterVersion, blueprintInfo);
+                    this._regenerate(this.currentJhipsterVersion, blueprintInfo, { target: false });
                     // Checkout original branch
                     this._gitCheckout(this.sourceBranch);
                     // Register reference for merging
@@ -425,15 +409,15 @@ export default class UpgradeGenerator extends BaseGenerator {
                     this.log.verboseInfo('Skipping blueprint update since no blueprint has been detected');
                     return undefined;
                 }
-                this.success('Upgrading blueprints...');
+                this.log.ok('Upgrading blueprints...');
                 return Promise.all(this.blueprints.map(blueprint => {
                     return new Promise(resolve => {
                         this._installNpmPackageLocally(blueprint.name, blueprint.latestBlueprintVersion);
-                        this.success(`Done upgrading blueprint ${blueprint.name} to version ${blueprint.latestBlueprintVersion}`);
+                        this.log.ok(`Done upgrading blueprint ${blueprint.name} to version ${blueprint.latestBlueprintVersion}`);
                         resolve();
                     });
                 })).then(() => {
-                    this.success('Done upgrading blueprints');
+                    this.log.ok('Done upgrading blueprints');
                 });
             },
             upgradeFiles() {
@@ -447,7 +431,7 @@ export default class UpgradeGenerator extends BaseGenerator {
                 const targetJhipsterVersion = this.originalTargetJhipsterVersion
                     ? `${this.originalTargetJhipsterVersion} ${this.targetJhipsterVersion}`
                     : this.targetJhipsterVersion;
-                this._regenerate(targetJhipsterVersion, blueprintInfo);
+                this._regenerate(targetJhipsterVersion, blueprintInfo, { target: true });
             },
             checkoutSourceBranch() {
                 this._gitCheckout(this.sourceBranch, { force: true });
@@ -455,7 +439,7 @@ export default class UpgradeGenerator extends BaseGenerator {
             mergeChangesBack() {
                 this.log.verboseInfo(`Merging changes back to ${this.sourceBranch}...`);
                 this.gitExec(['merge', '-q', UPGRADE_BRANCH], { silent: this.silent });
-                this.success('Merge done!');
+                this.log.ok('Merge done!');
             },
             checkConflictsInPackageJson() {
                 const gitDiff = this.gitExec(['diff', '--name-only', '--diff-filter=U', 'package.json'], { silent: this.silent });
@@ -485,7 +469,7 @@ export default class UpgradeGenerator extends BaseGenerator {
                 }
                 else {
                     const logMsg = `Start your Webpack development server with:\n${chalk.yellow.bold(`${this.clientPackageManager} start`)}\n`;
-                    this.success(logMsg);
+                    this.log.ok(logMsg);
                 }
             },
         };
@@ -496,7 +480,7 @@ export default class UpgradeGenerator extends BaseGenerator {
                 const gitDiff = this.gitExec(['diff', '--name-only', '--diff-filter=U'], { silent: this.silent });
                 if (gitDiff.code !== 0)
                     throw new Error(`Unable to check for conflicts:\n${gitDiff.stdout} ${gitDiff.stderr}`);
-                this.success(chalk.bold('Upgraded successfully.'));
+                this.log.ok(chalk.bold('Upgraded successfully.'));
                 if (gitDiff.stdout) {
                     this.log.warn(`Please fix conflicts listed below and commit!\n${gitDiff.stdout}`);
                 }

package/dist/generators/vue/cleanup.mjs

@@ -53,4 +53,41 @@ export default function cleanupOldFilesTask({ application } = {}) {
         this.removeFile(`${application.clientTestDir}jest.conf.js`);
         this.removeFile(`${application.clientTestDir}spec/setup.js`);
     }
+    if (this.isJhipsterVersionLessThan('8.0.0-beta.3')) {
+        this.removeFile(`${application.clientTestDir}spec/setup.ts`);
+        this.removeFile(`${application.clientTestDir}spec/tsconfig.json`);
+        this.removeFile(`${application.clientTestDir}spec/app/account/account.service.spec.ts`);
+        this.removeFile(`${application.clientTestDir}spec/app/core/home/home.component.spec.ts`);
+        this.removeFile(`${application.clientTestDir}spec/app/core/error/error.component.spec.ts`);
+        this.removeFile(`${application.clientTestDir}spec/app/core/jhi-navbar/jhi-navbar.component.spec.ts`);
+        this.removeFile(`${application.clientTestDir}spec/app/core/ribbon/ribbon.component.spec.ts`);
+        this.removeFile(`${application.clientTestDir}spec/app/shared/alert/alert.service.spec.ts`);
+        this.removeFile(`${application.clientTestDir}spec/app/shared/config/axios-interceptor.spec.ts`);
+        this.removeFile(`${application.clientTestDir}spec/app/shared/data/data-utils.service.spec.ts`);
+        this.removeFile(`${application.clientTestDir}spec/app/shared/sort/sorts.spec.ts`);
+        this.removeFile(`${application.clientTestDir}spec/app/admin/configuration/configuration.component.spec.ts`);
+        this.removeFile(`${application.clientTestDir}spec/app/admin/health/health.component.spec.ts`);
+        this.removeFile(`${application.clientTestDir}spec/app/admin/health/health-modal.component.spec.ts`);
+        this.removeFile(`${application.clientTestDir}spec/app/admin/health/health.service.spec.ts`);
+        this.removeFile(`${application.clientTestDir}spec/app/admin/logs/logs.component.spec.ts`);
+        this.removeFile(`${application.clientTestDir}spec/app/admin/metrics/metrics.component.spec.ts`);
+        this.removeFile(`${application.clientTestDir}spec/app/admin/metrics/metrics-modal.component.spec.ts`);
+        this.removeFile(`${application.clientTestDir}spec/app/account/login.service.spec.ts`);
+        this.removeFile(`${application.clientTestDir}spec/app/account/login-form/login-form.component.spec.ts`);
+        this.removeFile(`${application.clientTestDir}spec/app/account/sessions/sessions.component.spec.ts`);
+        this.removeFile(`${application.clientTestDir}spec/app/account/login.service.spec.ts`);
+        this.removeFile(`${application.clientTestDir}spec/app/account/change-password/change-password.component.spec.ts`);
+        this.removeFile(`${application.clientTestDir}spec/app/account/register/register.component.spec.ts`);
+        this.removeFile(`${application.clientTestDir}spec/app/account/reset-password/init/reset-password-init.component.spec.ts`);
+        this.removeFile(`${application.clientTestDir}spec/app/account/reset-password/finish/reset-password-finish.component.spec.ts`);
+        this.removeFile(`${application.clientTestDir}spec/app/account/settings/settings.component.spec.ts`);
+        this.removeFile(`${application.clientTestDir}spec/app/account/activate/activate.component.spec.ts`);
+        this.removeFile(`${application.clientTestDir}spec/app/admin/tracker/tracker.component.spec.ts`);
+        this.removeFile(`${application.clientTestDir}spec/app/admin/tracker/tracker.service.spec.ts`);
+        this.removeFile(`${application.clientTestDir}spec/app/admin/user-management/user-management.component.spec.ts`);
+        this.removeFile(`${application.clientTestDir}spec/app/admin/user-management/user-management-view.component.spec.ts`);
+        this.removeFile(`${application.clientTestDir}spec/app/admin/user-management/user-management-edit.component.spec.ts`);
+        this.removeFile(`${application.clientTestDir}spec/app/admin/gateway/gateway.component.spec.ts`);
+        this.removeFile(`${application.clientTestDir}spec/app/entities/entities-menu.spec.ts`);
+    }
 }

package/dist/generators/vue/entity-files-vue.mjs

@@ -16,46 +16,38 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { clientApplicationBlock, replaceEntityFilePath, CLIENT_TEMPLATES_APP_DIR, clientAppTestBlock } from '../client/utils.mjs';
+import { clientApplicationTemplatesBlock } from '../client/support/files.mjs';
+import { CLIENT_MAIN_SRC_DIR } from '../generator-constants.mjs';
 export const entityFiles = {
     client: [
         {
-            path: `${CLIENT_TEMPLATES_APP_DIR}entities/_entityFolder/`,
-            renameTo: (data, filepath) => `${data.clientSrcDir}app/shared/model/${replaceEntityFilePath(data, filepath)}`,
+            ...clientApplicationTemplatesBlock('shared/model/'),
+            path: `${CLIENT_MAIN_SRC_DIR}app/entities/_entityFolder/`,
             templates: ['_entityModel.model.ts'],
         },
         {
             condition: generator => !generator.embedded,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 'entities/_entityFolder/_entityFile-details.vue',
                 'entities/_entityFolder/_entityFile-details.component.ts',
+                'entities/_entityFolder/_entityFile-details.component.spec.ts',
                 'entities/_entityFolder/_entityFile.vue',
                 'entities/_entityFolder/_entityFile.component.ts',
+                'entities/_entityFolder/_entityFile.component.spec.ts',
                 'entities/_entityFolder/_entityFile.service.ts',
+                'entities/_entityFolder/_entityFile.service.spec.ts',
             ],
         },
         {
             condition: generator => !generator.readOnly && !generator.embedded,
-            ...clientApplicationBlock,
-            templates: ['entities/_entityFolder/_entityFile-update.vue', 'entities/_entityFolder/_entityFile-update.component.ts'],
-        },
-    ],
-    test: [
-        {
-            condition: generator => !generator.embedded,
-            ...clientAppTestBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
-                'entities/_entityFolder/_entityFile.component.spec.ts',
-                'entities/_entityFolder/_entityFile-details.component.spec.ts',
-                'entities/_entityFolder/_entityFile.service.spec.ts',
+                'entities/_entityFolder/_entityFile-update.vue',
+                'entities/_entityFolder/_entityFile-update.component.ts',
+                'entities/_entityFolder/_entityFile-update.component.spec.ts',
             ],
         },
-        {
-            condition: generator => !generator.readOnly && !generator.embedded,
-            ...clientAppTestBlock,
-            templates: ['entities/_entityFolder/_entityFile-update.component.spec.ts'],
-        },
     ],
 };
 export async function writeEntityFiles({ application, entities }) {
@@ -76,3 +68,14 @@ export async function postWriteEntityFiles({ application, entities }) {
         }
     }
 }
+export function cleanupEntitiesFiles({ application, entities }) {
+    for (const entity of entities.filter(entity => !entity.skipClient && !entity.builtIn)) {
+        const { entityFolderName, entityFileName } = entity;
+        if (this.isJhipsterVersionLessThan('8.0.0-beta.3')) {
+            this.removeFile(`${application.clientTestDir}/spec/app/entities/${entityFolderName}/${entityFileName}.component.spec.ts`);
+            this.removeFile(`${application.clientTestDir}/spec/app/entities/${entityFolderName}/${entityFileName}-detail.component.spec.ts`);
+            this.removeFile(`${application.clientTestDir}/spec/app/entities/${entityFolderName}/${entityFileName}-update.component.spec.ts`);
+            this.removeFile(`${application.clientTestDir}/spec/app/entities/${entityFolderName}/${entityFileName}.service.spec.ts`);
+        }
+    }
+}