generator-jhipster 7.3.1 → 7.4.0

package/generators/client/templates/vue/tsconfig.spec.json.ejs

@@ -0,0 +1,37 @@
+<%#
+ 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.
+-%>
+{
+  "extends": "./tsconfig",
+  "compilerOptions": {
+    "outDir": "<%= BUILD_DIR %>out-tsc/spec",
+<%_ if (microfrontend && applicationTypeGateway) { _%>
+    "paths": {
+  <%_ for (const remote of remotes) { _%>
+      "@<%= remote.lowercaseBaseName %>/*": ["<%= CLIENT_TEST_SRC_DIR %>spec/app/microfrontends/*"],
+  <%_ } _%>
+      "@/*": ["*"]
+    },
+<%_ } _%>
+    "types": ["jest", "node"]
+  },
+  "include": [
+    "<%= CLIENT_MAIN_SRC_DIR %>app/**/*",
+    "<%= CLIENT_TEST_SRC_DIR %>spec/**/*"
+  ]
+}

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

@@ -16,6 +16,8 @@ module.exports = {
 <%_ } _%>
 
   dev: {
+    hotReload: <%= !microfrontend %>,
+
     // https://webpack.js.org/configuration/devtool/#development
     devtool: 'cheap-module-source-map',
 

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

@@ -6,7 +6,7 @@ const sass = require('sass');
 const packageConfig = require('../package.json');
 const config = require('./config');
 
-const sourceMapEnabled = production => production ? config.build.productionSourceMap : config.dev.cssSourceMap;
+const sourceMapEnabled = production => (production ? config.build.productionSourceMap : config.dev.cssSourceMap);
 
 const cssLoaders = options => {
   options = options || {};
@@ -16,14 +16,14 @@ const cssLoaders = options => {
     options: {
       sourceMap: options.sourceMap,
       esModule: false,
-    }
+    },
   };
 
   const postcssLoader = {
     loader: 'postcss-loader',
     options: {
-      sourceMap: options.sourceMap
-    }
+      sourceMap: options.sourceMap,
+    },
   };
 
   // generate loader string to be used with extract text plugin
@@ -34,8 +34,8 @@ const cssLoaders = options => {
       loaders.push({
         loader: loader + '-loader',
         options: Object.assign({}, loaderOptions, {
-          sourceMap: options.sourceMap
-        })
+          sourceMap: options.sourceMap,
+        }),
       });
     }
 
@@ -52,7 +52,7 @@ const cssLoaders = options => {
     sass: generateLoaders('sass', { indentedSyntax: true, implementation: sass }),
     scss: generateLoaders('sass', { implementation: sass }),
     stylus: generateLoaders('stylus'),
-    styl: generateLoaders('stylus')
+    styl: generateLoaders('stylus'),
   };
 };
 
@@ -65,7 +65,7 @@ const styleLoaders = options => {
     const loader = loaders[extension];
     output.push({
       test: new RegExp('\\.' + extension + '$'),
-      use: loader
+      use: loader,
     });
   }
 
@@ -75,7 +75,7 @@ const styleLoaders = options => {
 const vueLoaderConfig = production => ({
   loaders: cssLoaders({
     sourceMap: sourceMapEnabled(production),
-    extract: production
+    extract: production,
   }),
   cssSourceMap: sourceMapEnabled(production),
   cacheBusting: config.dev.cacheBusting,
@@ -83,12 +83,13 @@ const vueLoaderConfig = production => ({
     video: ['src', 'poster'],
     source: 'src',
     img: 'src',
-    image: 'xlink:href'
-  }
+    image: 'xlink:href',
+  },
+  hotReload: config.dev.hotReload,
 });
 
 module.exports = {
   cssLoaders,
   styleLoaders,
   vueLoaderConfig,
-}
+};

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

@@ -3,6 +3,7 @@ const path = require('path');
 const { merge } = require('webpack-merge');
 const { VueLoaderPlugin } = require('vue-loader');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
 <%_ if (enableTranslation) { _%>
 const { hashElement } = require('folder-hash');
 const MergeJsonWebpackPlugin = require('merge-jsons-webpack-plugin');
@@ -30,8 +31,13 @@ module.exports = async (env, options) => {
     {
       mode: options.mode,
       context: resolve(),
+<%_ if (applicationTypeGateway && microfrontend) { _%>
+      experiments: {
+        topLevelAwait: true,
+      },
+<%_ } _%>
       entry: {
-        app: './<%= CLIENT_MAIN_SRC_DIR %>app/main.ts'
+        app: './<%= CLIENT_MAIN_SRC_DIR %>app/<%= microfrontend ? 'index' : 'main' %>.ts',
       },
       output: {
         path: resolve('<%= DIST_DIR %>'),
@@ -40,20 +46,47 @@ module.exports = async (env, options) => {
         extensions: ['.ts', '.js', '.vue', '.json'],
         alias: {
           vue$: 'vue/dist/vue.esm.js',
-          '@': resolve('<%= CLIENT_MAIN_SRC_DIR %>app')
+          '@': resolve('<%= CLIENT_MAIN_SRC_DIR %>app'),
         },
-        fallback: {
-          // prevent webpack from injecting useless setImmediate polyfill because Vue
-          // source contains it (although only uses it if it's native).
-          setImmediate: false,
-          // prevent webpack from injecting mocks to Node native modules
-          // that does not make sense for the client
-          dgram: 'empty',
-          fs: 'empty',
-          net: 'empty',
-          tls: 'empty',
-          child_process: 'empty',
+      },
+      devServer: {
+<%_ if (microfrontend) { _%>
+        hot: config.dev.hotReload,
+<%_ } _%>
+        static: {
+          directory: './<%= DIST_DIR %>',
         },
+        port: <%= devServerPort %>,
+        proxy: [
+          {
+            context: [
+              '/api',
+              '/services',
+              '/management',
+              '/swagger-resources',
+              '/v2/api-docs',
+              '/v3/api-docs',
+              '/h2-console',
+<%_ if (authenticationTypeOauth2) { _%>
+              '/oauth2',
+              '/login',
+<%_ } _%>
+              '/auth'
+            ],
+            target: 'http://localhost:<%= this.applicationTypeMicroservice ? gatewayServerPort : serverPort %>',
+            secure: false,
+          },
+<%_ if (communicationSpringWebsocket) { _%>
+          {
+            context: [
+              '/websocket'
+            ],
+            target: 'ws://localhost:<%= this.applicationTypeMicroservice ? gatewayServerPort : serverPort %>',
+            ws: true
+          }
+<%_ } _%>
+        ],
+        historyApiFallback: true
       },
       cache: {
         // 1. Set cache type to filesystem
@@ -67,7 +100,7 @@ module.exports = async (env, options) => {
             path.resolve(__dirname, 'vue.utils.js'),
             path.resolve(__dirname, `webpack.${development ? 'dev' : 'prod'}.js`),
             path.resolve(__dirname, '../.postcssrc.js'),
-            path.resolve(__dirname, '../tsconfig.json')
+            path.resolve(__dirname, '../tsconfig.json'),
           ],
         },
       },
@@ -76,7 +109,7 @@ module.exports = async (env, options) => {
           {
             test: /\.vue$/,
             loader: 'vue-loader',
-            options: vueLoaderConfig(!development)
+            options: vueLoaderConfig(!development),
           },
           {
             test: /\.ts$/,
@@ -86,40 +119,17 @@ module.exports = async (env, options) => {
                 options: {
                   appendTsSuffixTo: ['\\.vue$'],
                   happyPackMode: true,
-                  transpileOnly: true
-                }
-              }
+                  transpileOnly: true,
+                },
+              },
             ],
-            include: [resolve('src'), resolve('test')]
-          },
-          {
-            test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
-            loader: 'url-loader',
-            options: {
-              limit: 10000,
-              name: 'content/[hash].[ext]',
-              publicPath: "../"
-            }
+            include: [resolve('src'), resolve('test')],
           },
           {
-            test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/,
-            loader: 'url-loader',
-            options: {
-              limit: 10000,
-              name: 'content/[hash].[ext]',
-              publicPath: "../"
-            }
+            test: /\.(png|jpe?g|gif|svg|mp4|webm|ogg|mp3|wav|flac|aac|woff2?|eot|ttf|otf)/,
+            type: 'asset/resource',
           },
-          {
-            test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
-            loader: 'url-loader',
-            options: {
-              limit: 10000,
-              name: 'content/[hash].[ext]',
-              publicPath: "../"
-            }
-          }
-        ]
+        ],
       },
       plugins: [
         new EnvironmentPlugin({
@@ -133,6 +143,10 @@ module.exports = async (env, options) => {
           VERSION: JSON.stringify(config.version),
           SERVER_API_URL: JSON.stringify(config.serverApiUrl),
         }),
+        new HtmlWebpackPlugin({
+          base: '/',
+          template: './<%= MAIN_SRC_DIR %>index.html',
+        }),
         new VueLoaderPlugin(),
         new CopyWebpackPlugin({
           patterns: [
@@ -152,16 +166,16 @@ module.exports = async (env, options) => {
             },
             // jhipster-needle-add-assets-to-webpack - JHipster will add/remove third-party resources in this array
             { from: './<%= CLIENT_MAIN_SRC_DIR %>robots.txt', to: 'robots.txt' },
-          ]
+          ],
         })<% if (enableTranslation) { %>,
         new MergeJsonWebpackPlugin({
           output: {
             groupBy: [
               // jhipster-needle-i18n-language-webpack - JHipster will add/remove languages in this array
-            ]
-          }
-        })<% } %>
-      ]
+            ],
+          },
+        }),<% } %>
+      ],
     },
     await require(`./webpack.${development ? 'dev' : 'prod'}`)(env, options)
     // jhipster-needle-add-webpack-config - JHipster will add custom config

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

@@ -18,83 +18,31 @@
 -%>
 'use strict';
 const BrowserSyncPlugin = require('browser-sync-webpack-plugin');
-const path = require('path');
 const webpack = require('webpack');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
 
 const { styleLoaders } = require('./vue.utils');
 const config = require('./config');
 
-module.exports = (env, options) => ({
-  module: {
-    rules: styleLoaders({ sourceMap: config.dev.cssSourceMap, usePostCSS: true })
-  },
-  // cheap-module-eval-source-map is faster for development
-  devtool: config.dev.devtool,
-  entry: {
-    global: './<%= MAIN_SRC_DIR %>content/scss/global.scss',
-    main: './<%= MAIN_SRC_DIR %>app/main'
-  },
-  output: {
-    filename: 'app/[contenthash].bundle.js',
-    chunkFilename: 'app/[id].chunk.js'
-  },
-  optimization: {
-    moduleIds: 'named',
-  },
-  devServer: {
-    static: {
-      directory: './<%= DIST_DIR %>',
+module.exports = (env, options) => {
+  const devConfig = {
+    module: {
+      rules: styleLoaders({ sourceMap: config.dev.cssSourceMap, usePostCSS: true })
     },
-    port: <%= devServerPort %>,
-    proxy: [
-      {
-        context: [
-          '/api',
-          '/services',
-          '/management',
-          '/swagger-resources',
-          '/v2/api-docs',
-          '/v3/api-docs',
-          '/h2-console',
-<%_ if (authenticationTypeOauth2) { _%>
-          '/oauth2',
-          '/login',
-<%_ } _%>
-          '/auth'
-        ],
-        target: 'http://127.0.0.1:<%= serverPort %>',
-        secure: false,
-        headers: { host: 'localhost:9000' }
-      },
-<%_ if (communicationSpringWebsocket) { _%>
-      {
-        context: [
-          '/websocket'
-        ],
-        target: 'ws://127.0.0.1:<%= serverPort %>',
-        ws: true
-      }
-<%_ } _%>
-    ],
-    historyApiFallback: true
-  },
-  plugins: [
-    new webpack.HotModuleReplacementPlugin(),
-    new webpack.NoEmitOnErrorsPlugin(),
-    new HtmlWebpackPlugin({
-      base: '/',
-      template: './<%= MAIN_SRC_DIR %>index.html',
-      chunks: ['vendors', 'main', 'global'],
-      chunksSortMode: 'manual',
-      inject: true
-    }),
+    // cheap-module-eval-source-map is faster for development
+    devtool: config.dev.devtool,
+    optimization: {
+      moduleIds: 'named',
+    },
+    plugins: [],
+  };
+  if (!options.env.WEBPACK_SERVE) return devConfig;
+  devConfig.plugins.push(
     new BrowserSyncPlugin(
       {
         host: 'localhost',
         port: 9000,
         proxy: {
-          target: 'http://localhost:<%= devServerPort %>',
+          target: `http://localhost:${options.watch ? '<%= this.applicationTypeMicroservice ? gatewayServerPort : serverPort %>' : '<%= devServerPort %>'}`,
 <%_ if (communicationSpringWebsocket) { _%>
           ws: true,
 <%_ } _%>
@@ -116,5 +64,6 @@ module.exports = (env, options) => ({
         reload: true
       }
     )
-  ]
-});
+  );
+  return devConfig;
+};

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,7 +18,6 @@
 -%>
 'use strict';
 const webpack = require('webpack');
-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');
@@ -37,14 +36,6 @@ const webpackConfig = {
     })
   },
   devtool: config.build.productionSourceMap ? config.build.devtool : false,
-  entry: {
-    global: './<%= MAIN_SRC_DIR %>content/scss/global.scss',
-    main: './<%= MAIN_SRC_DIR %>app/main'
-  },
-  output: {
-    filename: 'app/[name].[contenthash].bundle.js',
-    chunkFilename: 'app/[id].[chunkhash].chunk.js'
-  },
   optimization: {
     moduleIds: 'deterministic',
     minimizer: [
@@ -99,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(
       {

package/generators/cloudfoundry/index.js

@@ -35,12 +35,12 @@ const NO_DATABASE_TYPE = databaseTypes.NO;
 
 const exec = childProcess.exec;
 
-let useBlueprints;
 /* eslint-disable consistent-return */
 module.exports = class extends BaseBlueprintGenerator {
-  constructor(args, options, features) {
-    super(args, options, features);
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_CLOUDFOUNDRY);
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_CLOUDFOUNDRY);
+    }
   }
 
   _initializing() {
@@ -66,7 +66,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -75,7 +75,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -115,7 +115,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
@@ -182,7 +182,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get default() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._default();
   }
 
@@ -232,7 +232,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get end() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._end();
   }
 };

package/generators/common/index.js

@@ -25,8 +25,6 @@ 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, options, features) {
     super(args, options, { unique: 'namespace', ...features });
@@ -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,7 +66,7 @@ module.exports = class JHipsterCommonGenerator extends BaseBlueprintGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -88,7 +90,7 @@ module.exports = class JHipsterCommonGenerator extends BaseBlueprintGenerator {
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
@@ -122,7 +124,7 @@ module.exports = class JHipsterCommonGenerator extends BaseBlueprintGenerator {
   }
 
   get loading() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._loading();
   }
 
@@ -137,7 +139,7 @@ module.exports = class JHipsterCommonGenerator extends BaseBlueprintGenerator {
   }
 
   get preparing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._preparing();
   }
 
@@ -149,7 +151,7 @@ module.exports = class JHipsterCommonGenerator extends BaseBlueprintGenerator {
   }
 
   get default() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._default();
   }
 
@@ -173,7 +175,7 @@ module.exports = class JHipsterCommonGenerator extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 
@@ -195,7 +197,7 @@ module.exports = class JHipsterCommonGenerator extends BaseBlueprintGenerator {
   }
 
   get postWriting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._postWriting();
   }
 };