generator-jhipster 7.1.0 → 7.4.0

package/generators/client/templates/vue/webpack/webpack.microfrontend.js.jhi.vue.ejs

@@ -0,0 +1,77 @@
+<%#
+ 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.
+-%>
+<&_ if (fragment.importsSection) { -&>
+<%_ if (applicationTypeMicroservice) { _%>
+const { DefinePlugin } = require('webpack');
+<%_ } _%>
+<&_ } -&>
+<&_ if (fragment.moduleFederationSection) { -&>
+<%_ if (applicationTypeGateway) { _%>
+        remotes: {
+  <%_ for (const remote of remotes) { _%>
+          '@<%= remote.lowercaseBaseName %>': `<%= remote.lowercaseBaseName %>@/<%= remote.endpointPrefix %>/remoteEntry.js`,
+  <%_ } _%>
+        },
+<%_ } _%>
+<%_ if (applicationTypeMicroservice) { _%>
+        exposes: {
+          './entities-router': './<%= CLIENT_MAIN_SRC_DIR %>app/router/entities',
+          './entities-menu': './<%= CLIENT_MAIN_SRC_DIR %>app/entities/entities-menu',
+        },
+<%_ } _%>
+        shared: {
+          axios: { singleton: true, shareScope: 'default' },
+          'vue-loader': { eager: true, singleton: false, shareScope: 'default' },
+          'bootstrap-vue': { singleton: true, shareScope: 'default' },
+          vue: { singleton: true, shareScope: 'default' },
+          vuelidate: { singleton: true, shareScope: 'default' },
+          'vue-class-component': { singleton: true, shareScope: 'default' },
+          'vue-i18n': { singleton: true, shareScope: 'default' },
+          'vue-router': { singleton: true, shareScope: 'default' },
+          'vue2-filters': { singleton: true, shareScope: 'default' },
+          vuex: { singleton: true, shareScope: 'default' },
+          'vue-property-decorator': { singleton: true, shareScope: 'default' },
+          '@/shared/security/authority': {
+            singleton: true,
+            shareScope: 'default',
+            import: '@/shared/security/authority',
+            requiredVersion: appVersion,
+          },
+          '@/shared/alert/alert.service': {
+            singleton: true,
+            shareScope: 'default',
+            import: '@/shared/alert/alert.service',
+            requiredVersion: appVersion,
+          },
+          '@/locale/translation.service': {
+            singleton: true,
+            shareScope: 'default',
+            import: '@/locale/translation.service',
+            requiredVersion: appVersion,
+          },
+        },
+<&_ } -&>
+<&_ if (fragment.pluginsSection) { -&>
+<%_ if (applicationTypeMicroservice) { _%>
+      new DefinePlugin({
+        <%= _.upperCase(baseName) %>_I18N_RESOURCES_PREFIX: JSON.stringify(''),
+      }),
+<%_ } _%>
+<&_ } -&>
+

package/generators/client/templates/vue/webpack/webpack.prod.js.ejs

@@ -18,41 +18,24 @@
 -%>
 'use strict';
 const webpack = require('webpack');
-const webpackMerge = require('webpack-merge').merge;
-const HtmlWebpackPlugin = require('html-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 const WorkboxPlugin = require('workbox-webpack-plugin');
 const TerserPlugin = require('terser-webpack-plugin');
 const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
 
-const utils = require('./vue.utils');
-const config = require('./env');
-const baseWebpackConfig = require('./webpack.common');
-const jhiUtils = require('./utils.js');
-
-const env = require('./prod.env');
-const MODE = 'production';
+const { styleLoaders } = require('./vue.utils');
+const config = require('./config');
 
 const webpackConfig = {
-  mode: MODE,
   module: {
-    rules: utils.styleLoaders({
+    rules: styleLoaders({
       sourceMap: config.build.productionSourceMap,
       extract: true,
       usePostCSS: true
     })
   },
   devtool: config.build.productionSourceMap ? config.build.devtool : false,
-  entry: {
-    global: './<%= MAIN_SRC_DIR %>content/scss/global.scss',
-    main: './<%= MAIN_SRC_DIR %>app/main'
-  },
-  output: {
-    path: jhiUtils.root('<%= DIST_DIR %>'),
-    filename: 'app/[name].[contenthash].bundle.js',
-    chunkFilename: 'app/[id].[chunkhash].chunk.js'
-  },
   optimization: {
     moduleIds: 'deterministic',
     minimizer: [
@@ -72,10 +55,6 @@ const webpackConfig = {
     }
   },
   plugins: [
-    // http://vuejs.github.io/vue-loader/en/workflow/production.html
-    new webpack.DefinePlugin({
-      'process.env': env
-    }),
     new TerserPlugin({
       terserOptions: {
         compress: {
@@ -111,27 +90,7 @@ const webpackConfig = {
       extractComments: false,
     }),
     // extract css into its own file
-    new MiniCssExtractPlugin({
-      filename: 'content/[name].[contenthash].css',
-      chunkFilename: 'content/[id].css'
-    }),
-    // generate dist index.html with correct asset hash for caching.
-    // you can customize output by editing /index.html
-    // see https://github.com/ampedandwired/html-webpack-plugin
-    new HtmlWebpackPlugin({
-      base: '/',
-      template: './<%= MAIN_SRC_DIR %>index.html',
-      chunks: ['vendors', 'main', 'global'],
-      chunksSortMode: 'manual',
-      inject: true,
-      minify: {
-        removeComments: true,
-        collapseWhitespace: true,
-        removeAttributeQuotes: true
-        // more options:
-        // https://github.com/kangax/html-minifier#options-quick-reference
-      },
-    }),
+    new MiniCssExtractPlugin(),
     // keep module.id stable when vendor modules does not change
     new ForkTsCheckerWebpackPlugin(
       {
@@ -175,4 +134,4 @@ if (config.build.bundleAnalyzerReport) {
   webpackConfig.plugins.push(new BundleAnalyzerPlugin());
 }
 
-module.exports = webpackMerge(baseWebpackConfig({ env: MODE }), webpackConfig);
+module.exports = async () => webpackConfig;

package/generators/cloudfoundry/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/cloudfoundry/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));
+});

package/generators/cloudfoundry/index.js

@@ -23,8 +23,8 @@ const glob = require('glob');
 const prompts = require('./prompts');
 const BaseBlueprintGenerator = require('../generator-base-blueprint');
 const statistics = require('../statistics');
-const { OptionNames } = require('../../jdl/jhipster/application-options');
 const { MEMCACHED } = require('../../jdl/jhipster/cache-types');
+const { GRADLE, MAVEN } = require('../../jdl/jhipster/build-tool-types');
 const cacheProviders = require('../../jdl/jhipster/cache-types');
 const databaseTypes = require('../../jdl/jhipster/database-types');
 const constants = require('../generator-constants');
@@ -35,25 +35,39 @@ const NO_DATABASE_TYPE = databaseTypes.NO;
 
 const exec = childProcess.exec;
 
-let useBlueprints;
 /* eslint-disable consistent-return */
 module.exports = class extends BaseBlueprintGenerator {
-  initializing() {
-    this.log(chalk.bold('CloudFoundry configuration is starting'));
-    const configuration = this.config;
-    this.env.options.appPath = configuration.get('appPath') || constants.CLIENT_MAIN_SRC_DIR;
-    this.baseName = configuration.get(OptionNames.BASE_NAME);
-    this.buildTool = configuration.get(OptionNames.BUILD_TOOL);
-    this.packageName = configuration.get(OptionNames.PACKAGE_NAME);
-    this.packageFolder = configuration.get(OptionNames.PACKAGE_FOLDER);
-    this.cacheProvider = configuration.get(OptionNames.CACHE_PROVIDER) || NO_CACHE_PROVIDER;
-    this.enableHibernateCache =
-      configuration.get(OptionNames.ENABLE_HIBERNATE_CACHE) && ![NO_CACHE_PROVIDER, MEMCACHED].includes(this.cacheProvider);
-    this.databaseType = configuration.get(OptionNames.DATABASE_TYPE);
-    this.devDatabaseType = configuration.get(OptionNames.DEV_DATABASE_TYPE);
-    this.prodDatabaseType = configuration.get(OptionNames.PROD_DATABASE_TYPE);
-    this.frontendAppName = this.getFrontendAppName();
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_CLOUDFOUNDRY);
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_CLOUDFOUNDRY);
+    }
+  }
+
+  _initializing() {
+    return {
+      sayHello() {
+        this.log(chalk.bold('CloudFoundry configuration is starting'));
+      },
+
+      getSharedConfig() {
+        this.loadAppConfig();
+        this.loadClientConfig();
+        this.loadServerConfig();
+        this.loadPlatformConfig();
+      },
+      getConfig() {
+        const configuration = this.config;
+        this.env.options.appPath = configuration.get('appPath') || constants.CLIENT_MAIN_SRC_DIR;
+        this.cacheProvider = this.cacheProvider || NO_CACHE_PROVIDER;
+        this.enableHibernateCache = this.enableHibernateCache && ![NO_CACHE_PROVIDER, MEMCACHED].includes(this.cacheProvider);
+        this.frontendAppName = this.getFrontendAppName();
+      },
+    };
+  }
+
+  get initializing() {
+    if (this.delegateToBlueprint) return {};
+    return this._initializing();
   }
 
   _prompting() {
@@ -61,7 +75,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -101,7 +115,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
@@ -168,7 +182,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get default() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._default();
   }
 
@@ -179,9 +193,9 @@ module.exports = class extends BaseBlueprintGenerator {
         const done = this.async();
         let cloudfoundryDeployCommand = 'cf push -f ./deploy/cloudfoundry/manifest.yml -t 120 -p';
         let jarFolder = '';
-        if (this.buildTool === 'maven') {
+        if (this.buildTool === MAVEN) {
           jarFolder = ' target/';
-        } else if (this.buildTool === 'gradle') {
+        } else if (this.buildTool === GRADLE) {
           jarFolder = ' build/libs/';
         }
         if (os.platform() === 'win32') {
@@ -218,7 +232,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get end() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._end();
   }
 };

package/generators/common/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/common/files.js

@@ -33,7 +33,7 @@ const commonFiles = {
   global: [
     {
       templates: [
-        'README.md',
+        'README.md.jhi',
         {
           file: 'gitignore',
           renameTo: () => '.gitignore',
@@ -58,7 +58,14 @@ const commonFiles = {
   commitHooks: [
     {
       condition: generator => !generator.skipCommitHook,
-      templates: ['.huskyrc', '.lintstagedrc.js'],
+      templates: [
+        '.lintstagedrc.js',
+        {
+          file: '.husky/pre-commit',
+          method: 'copy',
+          noEjs: true,
+        },
+      ],
     },
   ],
 };

package/generators/common/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));
+});

package/generators/common/index.js

@@ -25,11 +25,9 @@ const prettierConfigFiles = require('./files').prettierConfigFiles;
 const constants = require('../generator-constants');
 const packageJson = require('../../package.json');
 
-let useBlueprints;
-
 module.exports = class JHipsterCommonGenerator extends BaseBlueprintGenerator {
-  constructor(args, opts) {
-    super(args, opts, { unique: 'namespace' });
+  constructor(args, options, features) {
+    super(args, options, { unique: 'namespace', ...features });
 
     if (this.options.help) {
       return;
@@ -37,8 +35,12 @@ module.exports = class JHipsterCommonGenerator extends BaseBlueprintGenerator {
 
     this.loadStoredAppOptions();
     this.loadRuntimeOptions();
+  }
 
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints('common');
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints('common');
+    }
   }
 
   // Public API method used by the getter and also by Blueprints
@@ -64,10 +66,34 @@ module.exports = class JHipsterCommonGenerator extends BaseBlueprintGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
+  // Public API method used by the getter and also by Blueprints
+  _configuring() {
+    return {
+      async configureMonorepository() {
+        if (this.jhipsterConfig.monorepository) return;
+
+        const git = this.createGit();
+        if ((await git.checkIsRepo()) && !(await git.checkIsRepo('root'))) {
+          this.jhipsterConfig.monorepository = true;
+        }
+      },
+      configureCommitHook() {
+        if (this.jhipsterConfig.monorepository) {
+          this.jhipsterConfig.skipCommitHook = true;
+        }
+      },
+    };
+  }
+
+  get configuring() {
+    if (this.delegateToBlueprint) return {};
+    return this._configuring();
+  }
+
   // Public API method used by the getter and also by Blueprints
   _loading() {
     return {
@@ -77,8 +103,8 @@ module.exports = class JHipsterCommonGenerator extends BaseBlueprintGenerator {
         this.loadClientConfig();
         this.loadDerivedClientConfig();
         this.loadServerConfig();
-        this.loadDerivedServerConfig();
         this.loadTranslationConfig();
+        this.loadPlatformConfig();
       },
 
       loadPackageJson() {
@@ -98,7 +124,7 @@ module.exports = class JHipsterCommonGenerator extends BaseBlueprintGenerator {
   }
 
   get loading() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._loading();
   }
 
@@ -113,7 +139,7 @@ module.exports = class JHipsterCommonGenerator extends BaseBlueprintGenerator {
   }
 
   get preparing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._preparing();
   }
 
@@ -125,13 +151,20 @@ module.exports = class JHipsterCommonGenerator extends BaseBlueprintGenerator {
   }
 
   get default() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._default();
   }
 
   // Public API method used by the getter and also by Blueprints
   _writing() {
     return {
+      cleanup() {
+        if (this.isJhipsterVersionLessThan('7.1.1')) {
+          if (!this.skipCommitHook) {
+            this.removeFile('.huskyrc');
+          }
+        }
+      },
       writePrettierConfig() {
         // Prettier configuration needs to be the first written files - all subgenerators considered - for prettier transform to work
         return this.writeFilesToDisk(prettierConfigFiles);
@@ -142,7 +175,29 @@ module.exports = class JHipsterCommonGenerator extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
+
+  _postWriting() {
+    return {
+      addCommitHookDependencies() {
+        if (this.skipCommitHook) return;
+        this.packageJson.merge({
+          scripts: {
+            prepare: 'husky install',
+          },
+          devDependencies: {
+            husky: this.dependabotPackageJson.devDependencies.husky,
+            'lint-staged': this.dependabotPackageJson.devDependencies['lint-staged'],
+          },
+        });
+      },
+    };
+  }
+
+  get postWriting() {
+    if (this.delegateToBlueprint) return {};
+    return this._postWriting();
+  }
 };

package/generators/common/templates/.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx --no-install lint-staged

package/generators/common/templates/.prettierrc.ejs

@@ -9,7 +9,7 @@ useTabs: false
 arrowParens: avoid
 
 # jsx and tsx rules:
-jsxBracketSameLine: false
+bracketSameLine: false
 <%_ if (!skipServer) { _%>
 
 # java rules: