generator-jhipster 7.1.0 → 7.4.0

package/generators/ci-cd/index.js

@@ -23,34 +23,15 @@ const { defaultConfig } = require('../generator-defaults');
 const prompts = require('./prompts');
 const BaseBlueprintGenerator = require('../generator-base-blueprint');
 const statistics = require('../statistics');
-const packagejs = require('../../package.json');
 const constants = require('../generator-constants');
-const { OptionNames } = require('../../jdl/jhipster/application-options');
 const { MAVEN, GRADLE } = require('../../jdl/jhipster/build-tool-types');
-const { GENERATOR_CICD } = require('../generator-list');
-
-const {
-  BASE_NAME,
-  APPLICATION_TYPE,
-  DATABASE_TYPE,
-  PROD_DATABASE_TYPE,
-  SKIP_CLIENT,
-  SKIP_SERVER,
-  CLIENT_PACKAGE_MANAGER,
-  BUILD_TOOL,
-  REACTIVE,
-  CLIENT_FRAMEWORK,
-  TEST_FRAMEWORKS,
-  CACHE_PROVIDER,
-} = OptionNames;
+const { GENERATOR_CI_CD } = require('../generator-list');
 
 const REACT = constants.SUPPORTED_CLIENT_FRAMEWORKS.REACT;
 
-let useBlueprints;
-
 module.exports = class extends BaseBlueprintGenerator {
-  constructor(args, opts) {
-    super(args, opts);
+  constructor(args, options, features) {
+    super(args, options, features);
 
     // Automatically configure Travis
     this.option('autoconfigure-travis', {
@@ -93,8 +74,12 @@ module.exports = class extends BaseBlueprintGenerator {
       defaults: false,
       description: 'Automatically configure CircleCI',
     });
+  }
 
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_CICD);
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_CI_CD);
+    }
   }
 
   // Public API method used by the getter and also by Blueprints
@@ -103,29 +88,25 @@ module.exports = class extends BaseBlueprintGenerator {
       validateFromCli() {
         this.checkInvocationFromCLI();
       },
+
       sayHello() {
         this.log(chalk.white('🚀 Welcome to the JHipster CI/CD Sub-Generator 🚀'));
       },
+
+      getSharedConfig() {
+        this.loadAppConfig();
+        this.loadClientConfig();
+        this.loadServerConfig();
+        this.loadPlatformConfig();
+      },
+
       getConfig() {
-        this.jhipsterVersion = packagejs.version;
         const configuration = this.config;
-        this.baseName = configuration.get(BASE_NAME);
         this.dasherizedBaseName = _.kebabCase(this.baseName);
-        this.applicationType = configuration.get(APPLICATION_TYPE);
-        this.databaseType = configuration.get(DATABASE_TYPE);
-        this.prodDatabaseType = configuration.get(PROD_DATABASE_TYPE);
-        this.skipClient = configuration.get(SKIP_CLIENT);
-        this.skipServer = configuration.get(SKIP_SERVER);
-        this.clientPackageManager = configuration.get(CLIENT_PACKAGE_MANAGER);
-        this.buildTool = configuration.get(BUILD_TOOL);
-        this.reactive = configuration.get(REACTIVE);
         this.herokuAppName = configuration.get('herokuAppName');
         if (this.herokuAppName === undefined) {
           this.herokuAppName = _.kebabCase(this.baseName);
         }
-        this.clientFramework = configuration.get(CLIENT_FRAMEWORK);
-        this.testFrameworks = configuration.get(TEST_FRAMEWORKS);
-        this.cacheProvider = configuration.get(CACHE_PROVIDER);
         this.autoconfigureTravis = this.options.autoconfigureTravis;
         this.autoconfigureJenkins = this.options.autoconfigureJenkins;
         this.autoconfigureGitlab = this.options.autoconfigureGitlab;
@@ -134,21 +115,24 @@ module.exports = class extends BaseBlueprintGenerator {
         this.autoconfigureCircleCI = this.options.autoconfigureCircle;
         this.abort = false;
       },
+
       initConstants() {
         this.NODE_VERSION = constants.NODE_VERSION;
         this.NPM_VERSION = constants.NPM_VERSION;
       },
+
       getConstants() {
         this.DOCKER_DIR = constants.DOCKER_DIR;
         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();
   }
 
@@ -161,7 +145,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -170,7 +154,7 @@ module.exports = class extends BaseBlueprintGenerator {
     return {
       insight() {
         if (this.abort) return;
-        statistics.sendSubGenEvent('generator', GENERATOR_CICD);
+        statistics.sendSubGenEvent('generator', GENERATOR_CI_CD);
       },
       setTemplateConstants() {
         if (this.abort) return;
@@ -190,13 +174,12 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
-  _loadPlatformConfig(config = _.defaults({}, this.jhipsterConfig, defaultConfig), dest = this) {
-    super.loadPlatformConfig(config, dest);
-    dest.cicdIntegrationsSnyk = config.cicdIntegrations || [];
+  _loadCiCdConfig(config = _.defaults({}, this.jhipsterConfig, defaultConfig), dest = this) {
+    dest.cicdIntegrations = dest.cicdIntegrations || config.cicdIntegrations || [];
     dest.cicdIntegrationsSnyk = dest.cicdIntegrations.includes('snyk');
     dest.cicdIntegrationsSonar = dest.cicdIntegrations.includes('sonar');
     dest.cicdIntegrationsHeroku = dest.cicdIntegrations.includes('heroku');
@@ -214,15 +197,15 @@ module.exports = class extends BaseBlueprintGenerator {
         this.loadClientConfig();
         this.loadDerivedClientConfig();
         this.loadServerConfig();
-        this.loadDerivedServerConfig();
         this.loadTranslationConfig();
-        this._loadPlatformConfig();
+        this._loadCiCdConfig();
+        this.loadPlatformConfig();
       },
     };
   }
 
   get loading() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._loading();
   }
 
@@ -274,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

@@ -47,6 +47,9 @@ if (!databaseTypeNo && !skipServer ) { _%>
 <%_ } _%>
 <%_ if (clientFrameworkAngular) { _%>
             NG_CLI_ANALYTICS: false
+<%_ } _%>
+<%_ if (enableGradleEnterprise) { _%>
+            GRADLE_ENTERPRISE_ACCESS_KEY: ${{secrets.GRADLE_ENTERPRISE_ACCESS_KEY}}
 <%_ } _%>
         steps:
             - uses: actions/checkout@v2
@@ -58,8 +61,8 @@ if (!databaseTypeNo && !skipServer ) { _%>
 if (!skipServer) { _%>
             - uses: actions/setup-java@v2
               with:
-                  distribution: 'adopt'
-                  java-version: '11.x'
+                  distribution: 'temurin'
+                  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/cleanup.js

@@ -317,6 +317,11 @@ function cleanupOldFiles(generator) {
       generator.removeFile(`${REACT_DIR}config/devtools.tsx`);
     }
   }
+  if (generator.isJhipsterVersionLessThan('7.1.1') && generator.jhipsterConfig) {
+    if (generator.jhipsterConfig.clientFramework === ANGULAR) {
+      generator.removeFile('.npmrc');
+    }
+  }
 }
 
 /**

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

@@ -0,0 +1,13 @@
+{
+  "include": [
+    {
+      "app-sample": "ngx-default",
+      "cache": "angular",
+      "entity": "sqllight",
+      "environment": "prod",
+      "war": 0,
+      "e2e": 1,
+      "testcontainers": 0
+    }
+  ]
+}

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

@@ -0,0 +1,13 @@
+{
+  "include": [
+    {
+      "app-sample": "react-default",
+      "cache": "react",
+      "entity": "sqllight",
+      "environment": "prod",
+      "war": 0,
+      "e2e": 1,
+      "testcontainers": 0
+    }
+  ]
+}

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

@@ -0,0 +1,13 @@
+{
+  "include": [
+    {
+      "app-sample": "vue-default",
+      "cache": "vue",
+      "entity": "sqllight",
+      "environment": "prod",
+      "war": 0,
+      "e2e": 1,
+      "testcontainers": 0
+    }
+  ]
+}

package/generators/client/esm.mjs

@@ -0,0 +1,21 @@
+/**
+ * Copyright 2013-2021 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import generator from './index.js';
+
+export default generator;

package/generators/client/files-angular.js

@@ -38,12 +38,12 @@ const files = {
         '.eslintrc.json',
         'angular.json',
         'ngsw-config.json',
+        'README.md.jhi.client.angular',
         'webpack/environment.js',
         'webpack/proxy.conf.js',
         'webpack/webpack.custom.js',
         '.browserslistrc',
         { file: 'webpack/logo-jhipster.png', method: 'copy' },
-        '.npmrc',
       ],
     },
   ],
@@ -56,7 +56,7 @@ const files = {
   angularApp: [
     {
       path: CLIENT_MAIN_SRC_DIR,
-      templates: ['main.ts', 'bootstrap.ts', 'polyfills.ts'],
+      templates: ['main.ts', 'bootstrap.ts', 'polyfills.ts', 'declarations.d.ts'],
     },
     {
       path: ANGULAR_DIR,
@@ -69,13 +69,6 @@ const files = {
       templates: ['webpack/webpack.microfrontend.js'],
     },
   ],
-  microfrontendGateway: [
-    {
-      condition: generator => generator.applicationTypeGateway && generator.microfrontend,
-      path: CLIENT_MAIN_SRC_DIR,
-      templates: ['declarations.d.ts'],
-    },
-  ],
   angularMain: [
     {
       path: ANGULAR_DIR,
@@ -429,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',
@@ -466,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

@@ -27,7 +27,7 @@ module.exports = {
 const commonFiles = {
   common: [
     {
-      templates: ['.eslintignore', `${CLIENT_MAIN_SRC_DIR}manifest.webapp`],
+      templates: ['.eslintignore', 'README.md.jhi.client', `${CLIENT_MAIN_SRC_DIR}manifest.webapp`],
     },
     {
       path: CLIENT_MAIN_SRC_DIR,
@@ -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,
+      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.
@@ -37,6 +37,7 @@ const files = {
         'tsconfig.json',
         'tsconfig.test.json',
         'jest.conf.js',
+        'webpack/environment.js',
         'webpack/webpack.common.js',
         'webpack/webpack.dev.js',
         'webpack/webpack.prod.js',
@@ -337,8 +338,17 @@ 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`);
+  }
+}
+
 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, [

package/generators/client/generator.spec.mjs

@@ -0,0 +1,47 @@
+/**
+ * Copyright 2013-2021 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import expect from 'expect';
+import lodash from 'lodash';
+import { basename, dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+import testSupport from '../../test/support/index.cjs';
+import Generator from './index.js';
+
+const { snakeCase } = lodash;
+const { testBlueprintSupport } = testSupport;
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const generator = basename(__dirname);
+
+describe(`JHipster ${generator} generator`, () => {
+  it('generator-list constant matches folder name', async () => {
+    await expect((await import('../generator-list.js')).default[`GENERATOR_${snakeCase(generator).toUpperCase()}`]).toBe(generator);
+  });
+  it('should be exported at package.json', async () => {
+    await expect((await import(`generator-jhipster/esm/generators/${generator}`)).default).toBe(Generator);
+  });
+  it('should support features parameter', () => {
+    const instance = new Generator([], { help: true }, { bar: true });
+    expect(instance.features.bar).toBe(true);
+  });
+  describe('blueprint support', () => testBlueprintSupport(generator));
+});