Adjusts to upgrade on files conflicts.

cli/import-jdl.js

@@ -158,6 +158,7 @@ function runGenerator(command, { cwd, fork, env }, generatorOptions = {}) {
     forceNoFiltering: undefined,
     unidirectionalRelationships: undefined,
     localConfigOnly: undefined,
+    commandName: undefined,
     fromJdl: true,
   };
 

cli/program.js

@@ -168,6 +168,7 @@ const buildCommands = ({ program, commands = {}, envBuilder, env, loadCommand })
         const options = {
           ...program.opts(),
           ...cmdOptions,
+          commandName: cmdName,
         };
         if (options.installPath) {
           // eslint-disable-next-line no-console

generators/bootstrap/index.js

@@ -188,7 +188,8 @@ module.exports = class extends BaseGenerator {
     if (!skipPrettier) {
       const prettierOptions = { packageJson: true, java: !this.skipServer && !this.jhipsterConfig.skipServer };
       // Prettier is clever, it uses correct rules and correct parser according to file extension.
-      transformStreams.push(prettierTransform(prettierOptions, this, this.options.ignoreErrors));
+      const ignoreErrors = this.options.commandName === 'upgrade' || this.options.ignoreErrors;
+      transformStreams.push(prettierTransform(prettierOptions, this, ignoreErrors));
     }
 
     transformStreams.push(createConflicterCheckTransform(this.env.conflicter, conflicterStatus), createConflicterStatusTransform());

generators/generator-transforms.js

@@ -36,6 +36,9 @@ const prettierTransform = function (options, generator, transformOptions = {}) {
       if (isFileStateDeleted(file)) {
         return file;
       }
+      if (!file.contents) {
+        throw new Error(`File content doesn't exist for ${file.relative}`);
+      }
       /* resolve from the projects config */
       let fileContent;
       try {
@@ -58,12 +61,17 @@ const prettierTransform = function (options, generator, transformOptions = {}) {
         file.contents = Buffer.from(data);
         return file;
       } catch (error) {
-        const errorMessage = `Error parsing file ${file.relative}: ${error}
+        let errorMessage;
+        if (fileContent) {
+          errorMessage = `Error parsing file ${file.relative}: ${error}
 
 At: ${fileContent
-          .split('\n')
-          .map((value, idx) => `${idx + 1}: ${value}`)
-          .join('\n')}`;
+            .split('\n')
+            .map((value, idx) => `${idx + 1}: ${value}`)
+            .join('\n')}`;
+        } else {
+          errorMessage = `Unknown prettier error: ${error}`;
+        }
         if (ignoreErrors) {
           generator.warning(errorMessage);
           return file;

generators/upgrade/index.js

@@ -164,7 +164,7 @@ module.exports = class extends BaseGenerator {
       generatorCommand = `"${generatorDir.replace('\n', '')}/jhipster"`;
     }
     const skipChecksOption = this.skipChecks ? '--skip-checks' : '';
-    const regenerateCmd = `${generatorCommand} --with-entities --force --skip-install --skip-git --no-insight ${skipChecksOption}`;
+    const regenerateCmd = `${generatorCommand} --with-entities --force --skip-install --skip-git --ignore-errors --no-insight ${skipChecksOption}`;
     this.info(regenerateCmd);
     try {
       childProcess.execSync(regenerateCmd, { stdio: 'inherit' });