generator-jhipster 7.2.0 → 7.4.1

package/generators/bootstrap/index.js

@@ -17,15 +17,15 @@
  * limitations under the License.
  */
 const { State } = require('mem-fs-editor');
-const filter = require('gulp-filter');
 const _ = require('lodash');
-const path = require('path');
 const {
-  createEachFileTransform,
+  createConflicterCheckTransform,
   createConflicterStatusTransform,
-  createYoRcTransform,
-  createYoResolveTransform,
-} = require('yeoman-environment/lib/util/transform');
+  createYoRcTransform: createForceYoRcTransform,
+  createYoResolveTransform: createApplyYoResolveTransform,
+  patternFilter,
+  patternSpy,
+} = require('yeoman-environment/transform');
 
 const { hasState, setModifiedFileState } = State;
 
@@ -101,17 +101,17 @@ module.exports = class extends BaseGenerator {
           this.debug('Skipping commit prettier');
           return;
         }
-        await this._commitSharedFs(this.env.sharedFs.stream().pipe(filter(['.prettierrc**', '.prettierignore'])), true);
+        await this._commitSharedFs(this.env.sharedFs.stream().pipe(patternFilter('**/{.prettierrc**,.prettierignore}')), true);
       },
       async commitFiles() {
         if (this.options.skipCommit) {
           this.debug('Skipping commit files');
           return;
         }
-        await this._commitSharedFs();
         this.env.sharedFs.once('change', () => {
           this._queueCommit();
         });
+        await this._commitSharedFs();
       },
     };
   }
@@ -128,11 +128,11 @@ module.exports = class extends BaseGenerator {
     this.queueTask(
       {
         method: async () => {
-          await this._commitSharedFs();
           this.debug('Adding queueCommit event listener');
           this.env.sharedFs.once('change', () => {
             this._queueCommit();
           });
+          await this._commitSharedFs();
         },
       },
       {
@@ -147,62 +147,57 @@ module.exports = class extends BaseGenerator {
    * @param {Stream} [stream] - files stream, defaults to this.sharedFs.stream().
    * @return {Promise}
    */
-  _commitSharedFs(stream = this.env.sharedFs.stream(), skipPrettier = this.options.skipPrettier) {
-    return new Promise((resolve, reject) => {
-      this.env.sharedFs.each(file => {
-        if (
-          file.contents &&
-          (path.basename(file.path) === '.yo-rc.json' ||
-            (path.extname(file.path) === '.json' && path.basename(path.dirname(file.path)) === '.jhipster'))
-        ) {
-          if (!hasState(file) && !this.options.reproducibleTests) {
-            setModifiedFileState(file);
-          }
+  async _commitSharedFs(stream = this.env.sharedFs.stream(), skipPrettier = this.options.skipPrettier) {
+    const { skipYoResolve } = this.options;
+    const { withGeneratedFlag } = this.jhipsterConfig;
+
+    // JDL writes directly to disk, set the file as modified so prettier will be applied
+    stream = stream.pipe(
+      patternSpy(file => {
+        if (file.contents && !hasState(file) && !this.options.reproducibleTests) {
+          setModifiedFileState(file);
         }
-      });
-      const transformStreams = [
-        // multi-step changes the file path, should be executed earlier in the pipeline
-        new MultiStepTransform(),
-        createYoResolveTransform(this.env.conflicter),
-        createYoRcTransform(),
-        createEachFileTransform(file => {
-          if (path.extname(file.path) === '.json' && path.basename(path.dirname(file.path)) === '.jhipster') {
-            file.conflicter = 'force';
-          }
-          return file;
-        }),
-      ];
-
-      if (this.jhipsterConfig.withGeneratedFlag) {
-        transformStreams.push(generatedAnnotationTransform(this));
-      }
-
-      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.
-        const filterPatternForPrettier = `{,.,**/,**/.,.jhipster/**/}*.{${this.getPrettierExtensions()}}`;
-        // docker-compose modifies .yo-rc.json from others folder, match them all.
-        const prettierFilter = filter(['**/.yo-rc.json', filterPatternForPrettier], { restore: true });
-        // this pipe will pass through (restore) anything that doesn't match typescriptFilter
-        transformStreams.push(prettierFilter, prettierTransform(prettierOptions, this, this.options.ignoreErrors), prettierFilter.restore);
-      }
+      }, '**/{.yo-rc.json,.jhipster/*.json}').name('jhipster:config-files:modify')
+    );
 
-      transformStreams.push(
-        createEachFileTransform(file => this.env.conflicter.checkForCollision(file), { ordered: false, maxParallel: 10 }),
-        createConflicterStatusTransform()
-      );
+    const conflicterStatus = {
+      fileActions: [
+        {
+          key: 'i',
+          name: 'ignore, do not overwrite and remember (experimental)',
+          value: ({ relativeFilePath }) => {
+            this.env.fs.append(`${this.env.cwd}/.yo-resolve`, `${relativeFilePath} skip`, { create: true });
+            return 'skip';
+          },
+        },
+      ],
+    };
 
-      this.env.fs.commit(transformStreams, stream, (error, value) => {
-        if (error) {
-          reject(error);
-          return;
-        }
+    const createApplyPrettierTransform = () => {
+      const prettierOptions = { packageJson: true, java: !this.skipServer && !this.jhipsterConfig.skipServer };
+      // Prettier is clever, it uses correct rules and correct parser according to file extension.
+      const ignoreErrors = this.options.commandName === 'upgrade' || this.options.ignoreErrors;
+      return prettierTransform(prettierOptions, this, ignoreErrors);
+    };
 
-        // Force to empty Conflicter queue.
-        this.env.conflicter.queue.once('end', () => resolve(value));
-        this.env.conflicter.queue.run();
-      });
-    });
+    const createForceWriteConfigFiles = () =>
+      patternSpy(file => {
+        file.conflicter = 'force';
+      }, '**/.jhipster/*.json').name('jhipster:config-files:force');
+
+    const transformStreams = [
+      // multi-step changes the file path, should be executed earlier in the pipeline
+      new MultiStepTransform(),
+      ...(skipYoResolve ? [] : [createApplyYoResolveTransform(this.env.conflicter)]),
+      createForceYoRcTransform(),
+      createForceWriteConfigFiles(),
+      ...(withGeneratedFlag ? [generatedAnnotationTransform(this)] : []),
+      ...(skipPrettier ? [] : [createApplyPrettierTransform()]),
+      createConflicterCheckTransform(this.env.conflicter, conflicterStatus),
+      createConflicterStatusTransform(),
+    ];
+
+    await this.env.fs.commit(transformStreams, stream);
   }
 
   _createUserManagementEntities() {
@@ -236,6 +231,7 @@ module.exports = class extends BaseGenerator {
       relationships: [],
       changelogDate,
       fields: userEntityDefinition ? userEntityDefinition.fields || [] : [],
+      dto: true,
     };
 
     loadRequiredConfigIntoEntity(user, this.jhipsterConfig);

package/generators/ci-cd/index.js

@@ -29,8 +29,6 @@ const { GENERATOR_CI_CD } = require('../generator-list');
 
 const REACT = constants.SUPPORTED_CLIENT_FRAMEWORKS.REACT;
 
-let useBlueprints;
-
 module.exports = class extends BaseBlueprintGenerator {
   constructor(args, options, features) {
     super(args, options, features);
@@ -76,8 +74,12 @@ module.exports = class extends BaseBlueprintGenerator {
       defaults: false,
       description: 'Automatically configure CircleCI',
     });
+  }
 
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_CI_CD);
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_CI_CD);
+    }
   }
 
   // Public API method used by the getter and also by Blueprints
@@ -124,12 +126,13 @@ module.exports = class extends BaseBlueprintGenerator {
         this.SERVER_MAIN_RES_DIR = constants.SERVER_MAIN_RES_DIR;
         this.DOCKER_JENKINS = constants.DOCKER_JENKINS;
         this.ANGULAR = constants.SUPPORTED_CLIENT_FRAMEWORKS.ANGULAR;
+        this.JAVA_VERSION = constants.JAVA_VERSION;
       },
     };
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -142,7 +145,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -171,7 +174,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
@@ -202,7 +205,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get loading() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._loading();
   }
 
@@ -254,7 +257,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 };

package/generators/ci-cd/templates/github-actions.yml.ejs

@@ -62,7 +62,7 @@ if (!skipServer) { _%>
             - uses: actions/setup-java@v2
               with:
                   distribution: 'temurin'
-                  java-version: '11.x'
+                  java-version: <%= JAVA_VERSION %>
 <%_ }
 if (!skipClient) { _%>
             - name: Install node.js packages

package/generators/ci-cd/templates/travis.yml.ejs

@@ -35,6 +35,7 @@ cache:
 env:
   global:
     - NODE_VERSION=<%= NODE_VERSION %>
+    - JHI_JDK=<%= JAVA_VERSION %>
     - SPRING_OUTPUT_ANSI_ENABLED=ALWAYS
     - SPRING_JPA_SHOW_SQL=false
     - JHI_DISABLE_WEBPACK_LOGS=true
@@ -47,13 +48,17 @@ env:
 <%_ } _%>
 before_install:
   - |
-    if [[ $JHI_JDK = '8' ]]; then
-      echo '*** Using OpenJDK 8'
+    if [[ $JHI_JDK = '17' ]]; then
+      echo '*** Using OpenJDK 17'
+      sudo add-apt-repository ppa:openjdk-r/ppa -y
+      sudo apt-get update -q
+      sudo apt-get install -y openjdk-17-jdk -y
+      sudo update-java-alternatives -s java-1.17.0-openjdk-amd64
+      java -version
     else
       echo '*** Using OpenJDK 11 by default'
-      sudo add-apt-repository ppa:openjdk-r/ppa -y
       sudo apt-get update -q
-      sudo apt-get install -y openjdk-11-jdk -y
+      sudo apt-get install -y openjdk-11-jdk
       sudo update-java-alternatives -s java-1.11.0-openjdk-amd64
       java -version
     fi

package/generators/client/__workflow/devserver-angular.json

@@ -3,7 +3,7 @@
     {
       "app-sample": "ngx-default",
       "cache": "angular",
-      "entity": "sqlfull",
+      "entity": "sqllight",
       "environment": "prod",
       "war": 0,
       "e2e": 1,

package/generators/client/__workflow/devserver-react.json

@@ -3,7 +3,7 @@
     {
       "app-sample": "react-default",
       "cache": "react",
-      "entity": "sqlfull",
+      "entity": "sqllight",
       "environment": "prod",
       "war": 0,
       "e2e": 1,

package/generators/client/__workflow/devserver-vue.json

@@ -3,7 +3,7 @@
     {
       "app-sample": "vue-default",
       "cache": "vue",
-      "entity": "sqlfull",
+      "entity": "sqllight",
       "environment": "prod",
       "war": 0,
       "e2e": 1,

package/generators/client/files-angular.js

@@ -422,6 +422,7 @@ const files = {
         'admin/configuration/configuration.service.spec.ts',
         'admin/health/modal/health-modal.component.spec.ts',
         'admin/health/health.component.spec.ts',
+        'admin/health/health.service.spec.ts',
         'admin/logs/logs.component.spec.ts',
         'admin/logs/logs.service.spec.ts',
         'admin/metrics/metrics.component.spec.ts',
@@ -459,11 +460,16 @@ const files = {
       path: ANGULAR_DIR,
       templates: [
         'account/activate/activate.component.spec.ts',
+        'account/activate/activate.service.spec.ts',
         'account/password/password.component.spec.ts',
+        'account/password/password.service.spec.ts',
         'account/password/password-strength-bar/password-strength-bar.component.spec.ts',
         'account/password-reset/init/password-reset-init.component.spec.ts',
+        'account/password-reset/init/password-reset-init.service.spec.ts',
         'account/password-reset/finish/password-reset-finish.component.spec.ts',
+        'account/password-reset/finish/password-reset-finish.service.spec.ts',
         'account/register/register.component.spec.ts',
+        'account/register/register.service.spec.ts',
         'account/settings/settings.component.spec.ts',
       ],
     },

package/generators/client/files-common.js

@@ -62,14 +62,18 @@ const commonFiles = {
       ],
     },
     {
-      condition: generator => generator.enableI18nRTL,
+      condition: generator => generator.enableI18nRTL && !generator.clientFrameworkReact,
       path: CLIENT_MAIN_SRC_DIR,
       templates: ['content/scss/rtl.scss'],
     },
+    {
+      condition: generator => generator.microfrontend && generator.clientFrameworkVue,
+      templates: ['webpack/webpack.microfrontend.js.jhi'],
+    },
   ],
   swagger: [
     {
-      condition: generator => !generator.applicationTypeMicroservice,
+      condition: generator => !generator.applicationTypeMicroservice || generator.microfrontend,
       path: CLIENT_MAIN_SRC_DIR,
       templates: ['swagger-ui/index.html', { file: 'swagger-ui/dist/images/throbber.gif', method: 'copy' }],
     },

package/generators/client/files-react.js

@@ -21,7 +21,7 @@ const { OAUTH2, SESSION } = require('../../jdl/jhipster/authentication-types');
 const { GATEWAY } = require('../../jdl/jhipster/application-types');
 const constants = require('../generator-constants');
 
-const { CLIENT_TEST_SRC_DIR, REACT_DIR } = constants;
+const { CLIENT_MAIN_SRC_DIR, CLIENT_TEST_SRC_DIR, REACT_DIR } = constants;
 
 /**
  * The default is to use a file path string. It implies use of the template method.
@@ -31,7 +31,6 @@ const files = {
   common: [
     {
       templates: [
-        '.npmrc',
         'package.json',
         '.eslintrc.json',
         'tsconfig.json',
@@ -338,8 +337,20 @@ const files = {
 module.exports = {
   writeFiles,
   files,
+  cleanup,
 };
 
+function cleanup() {
+  if (!this.clientFrameworkReact) return;
+
+  if (this.isJhipsterVersionLessThan('7.4.0') && this.enableI18nRTL) {
+    this.removeFile(`${CLIENT_MAIN_SRC_DIR}content/scss/rtl.scss`);
+  }
+  if (this.isJhipsterVersionLessThan('7.4.1')) {
+    this.removeFile('.npmrc');
+  }
+}
+
 function writeFiles() {
   // write React files
   return this.writeFilesToDisk(files, 'react');

package/generators/client/files-vue.js

@@ -25,6 +25,7 @@ const { GATEWAY } = require('../../jdl/jhipster/application-types');
 const { CLIENT_MAIN_SRC_DIR, CLIENT_TEST_SRC_DIR, VUE_DIR } = constants;
 
 module.exports = {
+  cleanup,
   writeFiles,
   customizeFiles,
 };
@@ -35,17 +36,14 @@ const vueFiles = {
       templates: [
         'package.json',
         'tsconfig.json',
+        'tsconfig.spec.json',
         '.postcssrc.js',
         '.eslintrc.js',
-        'webpack/env.js',
-        'webpack/dev.env.js',
-        'webpack/prod.env.js',
+        'webpack/config.js',
         'webpack/webpack.common.js',
         'webpack/webpack.dev.js',
         'webpack/webpack.prod.js',
         'webpack/vue.utils.js',
-        'webpack/loader.conf.js',
-        'webpack/utils.js',
       ],
     },
     {
@@ -53,6 +51,43 @@ const vueFiles = {
       templates: ['tsconfig.e2e.json'],
     },
   ],
+  entities: [
+    {
+      path: VUE_DIR,
+      templates: [
+        'entities/entities.component.ts',
+        'entities/entities.vue',
+        'entities/entities-menu.component.ts',
+        'entities/entities-menu.vue',
+        'router/entities.ts',
+      ],
+    },
+  ],
+  microfrontend: [
+    {
+      condition: generator => generator.microfrontend,
+      templates: ['webpack/webpack.microfrontend.js.jhi.vue'],
+    },
+    {
+      condition: generator => generator.microfrontend,
+      path: VUE_DIR,
+      templates: ['index.ts'],
+    },
+    {
+      condition: generator => generator.microfrontend,
+      path: CLIENT_TEST_SRC_DIR,
+      templates: [
+        'spec/app/microfrontends/entities-menu.component.ts',
+        'spec/app/microfrontends/entities-menu.vue',
+        'spec/app/microfrontends/entities-router.ts',
+      ],
+    },
+    {
+      condition: generator => generator.applicationTypeMicroservice,
+      path: CLIENT_TEST_SRC_DIR,
+      templates: ['spec/app/entities/entities-menu.spec.ts'],
+    },
+  ],
   sass: [
     {
       path: CLIENT_MAIN_SRC_DIR,
@@ -67,7 +102,9 @@ const vueFiles = {
         'app.component.ts',
         'shims-vue.d.ts',
         'constants.ts',
+        'declarations.d.ts',
         'main.ts',
+        'shared/alert/alert.service.ts',
         'shared/config/axios-interceptor.ts',
         'shared/config/config.ts',
         'shared/config/config-bootstrap-vue.ts',
@@ -76,7 +113,6 @@ const vueFiles = {
         'shared/security/authority.ts',
         'router/index.ts',
         'router/admin.ts',
-        'router/entities.ts',
         'router/pages.ts',
       ],
     },
@@ -231,6 +267,7 @@ const vueFiles = {
         'spec/app/core/error/error.component.spec.ts',
         'spec/app/core/jhi-navbar/jhi-navbar.component.spec.ts',
         'spec/app/core/ribbon/ribbon.component.spec.ts',
+        'spec/app/shared/alert/alert.service.spec.ts',
         'spec/app/shared/config/axios-interceptor.spec.ts',
         'spec/app/shared/data/data-utils.service.spec.ts',
       ],
@@ -321,6 +358,18 @@ const vueFiles = {
   ],
 };
 
+function cleanup() {
+  if (!this.clientFrameworkVue) return;
+
+  if (this.isJhipsterVersionLessThan('7.3.1')) {
+    this.removeFile('webpack/env.js');
+    this.removeFile('webpack/dev.env.js');
+    this.removeFile('webpack/prod.env.js');
+    this.removeFile('webpack/utils.js');
+    this.removeFile('webpack/loader.conf.js');
+  }
+}
+
 function writeFiles() {
   // write Vue files
   return this.writeFilesToDisk(vueFiles, 'vue');
@@ -336,6 +385,7 @@ function customizeFiles() {
       'app/core/jhi-navbar/jhi-navbar.vue',
       'app/core/ribbon/ribbon.vue',
       'app/shared/jhi-item-count.vue',
+      'app/entities/entities-menu.vue',
     ]);
     if (this.withAdminUi) {
       utils.vueReplaceTranslation(this, [