generator-jhipster 7.1.0 → 7.4.0

package/generators/{server/templates/src/main/java/package/repository/search/SearchCouchbaseRepository.java.ejs → client/templates/vue/tsconfig.spec.json.ejs}

@@ -16,26 +16,22 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.repository.search;
-
-<%_ if (!reactive) { _%>
-import org.springframework.data.domain.Page;
-<%_ } _%>
-import org.springframework.data.domain.Pageable;
-<%_ if (reactive) { _%>
-import reactor.core.publisher.Flux;
-<%_ } _%>
-
-<%_ if (!reactive) { _%>
-import java.util.List;
+{
+  "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/*"],
+  <%_ } _%>
+      "@/*": ["*"]
+    },
 <%_ } _%>
-
-/**
- * Full Text Search Couchbase repository.
- */
-public interface SearchCouchbaseRepository<T, ID> {
-
-    <% if (reactive) { %>Flux<% } else { %>Page<% } %><T> search(String indexName, String request, Pageable pageable);
-
-    <% if (reactive) { %>Flux<% } else { %>List<% } %><T> search(String indexName, String request);
+    "types": ["jest", "node"]
+  },
+  "include": [
+    "<%= CLIENT_MAIN_SRC_DIR %>app/**/*",
+    "<%= CLIENT_TEST_SRC_DIR %>spec/**/*"
+  ]
 }

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

@@ -0,0 +1,50 @@
+'use strict';
+
+const path = require('path');
+
+<%_ if (buildToolUnknown) { _%>
+const packageJson = require('./../package.json');
+<%_ } _%>
+
+module.exports = {
+  serverApiUrl: '',
+<%_ if (buildToolUnknown) { _%>
+  version: packageJson.version,
+<%_ } else { _%>
+  // APP_VERSION is passed as an environment variable from the Gradle / Maven build tasks.
+  version: process.env.hasOwnProperty('APP_VERSION') ? process.env.APP_VERSION : 'UNKNOWN',
+<%_ } _%>
+
+  dev: {
+    hotReload: <%= !microfrontend %>,
+
+    // https://webpack.js.org/configuration/devtool/#development
+    devtool: 'cheap-module-source-map',
+
+    // If you have problems debugging vue-files in devtools,
+    // set this to false - it *may* help
+    // https://vue-loader.vuejs.org/en/options.html#cachebusting
+    cacheBusting: true,
+
+    cssSourceMap: true
+  },
+
+  build: {
+    productionSourceMap: true,
+    // https://webpack.js.org/configuration/devtool/#production
+    devtool: 'source-map',
+
+    // Gzip off by default as many popular static hosts such as
+    // Surge or Netlify already gzip all static assets for you.
+    // Before setting to `true`, make sure to:
+    // npm install --save-dev compression-webpack-plugin
+    productionGzip: false,
+    productionGzipExtensions: ['js', 'css'],
+
+    // Run the build command with an extra argument to
+    // View the bundle analyzer report after build finishes:
+    // `npm run build --report`
+    // Set to `true` or `false` to always turn it on or off
+    bundleAnalyzerReport: process.env.npm_config_report
+  }
+};

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

@@ -1,17 +1,14 @@
 'use strict';
 const path = require('path');
-const config = require('./env');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const packageConfig = require('../package.json');
 const sass = require('sass');
 
-exports.assetsPath = function(_path) {
-  const assetsSubDirectory = process.env.NODE_ENV === 'production' ? config.build.assetsSubDirectory : config.dev.assetsSubDirectory;
+const packageConfig = require('../package.json');
+const config = require('./config');
 
-  return path.posix.join(assetsSubDirectory, _path);
-};
+const sourceMapEnabled = production => (production ? config.build.productionSourceMap : config.dev.cssSourceMap);
 
-exports.cssLoaders = function(options) {
+const cssLoaders = options => {
   options = options || {};
 
   const cssLoader = {
@@ -19,14 +16,14 @@ exports.cssLoaders = function(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
@@ -37,8 +34,8 @@ exports.cssLoaders = function(options) {
       loaders.push({
         loader: loader + '-loader',
         options: Object.assign({}, loaderOptions, {
-          sourceMap: options.sourceMap
-        })
+          sourceMap: options.sourceMap,
+        }),
       });
     }
 
@@ -55,40 +52,44 @@ exports.cssLoaders = function(options) {
     sass: generateLoaders('sass', { indentedSyntax: true, implementation: sass }),
     scss: generateLoaders('sass', { implementation: sass }),
     stylus: generateLoaders('stylus'),
-    styl: generateLoaders('stylus')
+    styl: generateLoaders('stylus'),
   };
 };
 
 // Generate loaders for standalone style files (outside of .vue)
-exports.styleLoaders = function(options) {
+const styleLoaders = options => {
   const output = [];
-  const loaders = exports.cssLoaders(options);
+  const loaders = cssLoaders(options);
 
   for (const extension in loaders) {
     const loader = loaders[extension];
     output.push({
       test: new RegExp('\\.' + extension + '$'),
-      use: loader
+      use: loader,
     });
   }
 
   return output;
 };
 
-exports.createNotifierCallback = () => {
-  const notifier = require('node-notifier');
-
-  return (severity, errors) => {
-    if (severity !== 'error') return;
-
-    const error = errors[0];
-    const filename = error.file && error.file.split('!').pop();
-
-    notifier.notify({
-      title: packageConfig.name,
-      message: severity + ': ' + error.name,
-      subtitle: filename || '',
-      icon: path.join(__dirname, 'logo.png')
-    });
-  };
+const vueLoaderConfig = production => ({
+  loaders: cssLoaders({
+    sourceMap: sourceMapEnabled(production),
+    extract: production,
+  }),
+  cssSourceMap: sourceMapEnabled(production),
+  cacheBusting: config.dev.cacheBusting,
+  transformToRequire: {
+    video: ['src', 'poster'],
+    source: 'src',
+    img: 'src',
+    image: 'xlink:href',
+  },
+  hotReload: config.dev.hotReload,
+});
+
+module.exports = {
+  cssLoaders,
+  styleLoaders,
+  vueLoaderConfig,
 };

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

@@ -3,136 +3,181 @@ 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');
 <%_ } _%>
-const vueLoaderConfig = require('./loader.conf');
 
-function resolve(dir) {
+const { DefinePlugin, EnvironmentPlugin } = require('webpack');
+const { vueLoaderConfig } = require('./vue.utils');
+const config = require('./config');
+
+function resolve(dir = '') {
   return path.join(__dirname, '..', dir);
 }
 
-module.exports = env => merge(
-{
-  mode: 'development',
-  context: path.resolve(__dirname, '../'),
-  entry: {
-    app: './<%= CLIENT_MAIN_SRC_DIR %>app/main.ts'
-  },
-  resolve: {
-    extensions: ['.ts', '.js', '.vue', '.json'],
-    alias: {
-      vue$: 'vue/dist/vue.esm.js',
-      '@': 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',
-    },
-  },
-  cache: {
-    // 1. Set cache type to filesystem
-    type: 'filesystem',
-    cacheDirectory: path.resolve(__dirname, '../<%= buildDir %>webpack'),
-    buildDependencies: {
-      // 2. Add your config as buildDependency to get cache invalidation on config change
-      config: [
-        __filename,
-        path.resolve(__dirname, `webpack.${env.env == 'development' ? 'dev' : 'prod'}.js`),
-        path.resolve(__dirname, 'utils.js'),
-        path.resolve(__dirname, '../.postcssrc.js'),
-        path.resolve(__dirname, '../tsconfig.json')
-      ],
-    },
-  },
-  module: {
-    rules: [
-      {
-        test: /\.vue$/,
-        loader: 'vue-loader',
-        options: vueLoaderConfig
+module.exports = async (env, options) => {
+  const development = options.mode === 'development';
+<%_ if (enableTranslation) { _%>
+  const languagesHash = await hashElement(resolve('<%= MAIN_SRC_DIR %>i18n'), {
+    algo: 'md5',
+    encoding: 'hex',
+    files: { include: ['*.json'] },
+  });
+
+<%_ } _%>
+  return merge(
+    {
+      mode: options.mode,
+      context: resolve(),
+<%_ if (applicationTypeGateway && microfrontend) { _%>
+      experiments: {
+        topLevelAwait: true,
       },
-      {
-        test: /\.ts$/,
-        use: [
+<%_ } _%>
+      entry: {
+        app: './<%= CLIENT_MAIN_SRC_DIR %>app/<%= microfrontend ? 'index' : 'main' %>.ts',
+      },
+      output: {
+        path: resolve('<%= DIST_DIR %>'),
+      },
+      resolve: {
+        extensions: ['.ts', '.js', '.vue', '.json'],
+        alias: {
+          vue$: 'vue/dist/vue.esm.js',
+          '@': resolve('<%= CLIENT_MAIN_SRC_DIR %>app'),
+        },
+      },
+      devServer: {
+<%_ if (microfrontend) { _%>
+        hot: config.dev.hotReload,
+<%_ } _%>
+        static: {
+          directory: './<%= DIST_DIR %>',
+        },
+        port: <%= devServerPort %>,
+        proxy: [
           {
-            loader: 'ts-loader',
-            options: {
-              appendTsSuffixTo: ['\\.vue$'],
-              happyPackMode: true,
-              transpileOnly: true
-            }
+            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
           }
+<%_ } _%>
         ],
-        include: [resolve('src'), resolve('test')]
+        historyApiFallback: true
       },
-      {
-        test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
-        loader: 'url-loader',
-        options: {
-          limit: 10000,
-          name: 'content/[hash].[ext]',
-          publicPath: "../"
-        }
+      cache: {
+        // 1. Set cache type to filesystem
+        type: 'filesystem',
+        cacheDirectory: resolve('<%= buildDir %>webpack'),
+        buildDependencies: {
+          // 2. Add your config as buildDependency to get cache invalidation on config change
+          config: [
+            __filename,
+            path.resolve(__dirname, 'config.js'),
+            path.resolve(__dirname, 'vue.utils.js'),
+            path.resolve(__dirname, `webpack.${development ? 'dev' : 'prod'}.js`),
+            path.resolve(__dirname, '../.postcssrc.js'),
+            path.resolve(__dirname, '../tsconfig.json'),
+          ],
+        },
       },
-      {
-        test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/,
-        loader: 'url-loader',
-        options: {
-          limit: 10000,
-          name: 'content/[hash].[ext]',
-          publicPath: "../"
-        }
+      module: {
+        rules: [
+          {
+            test: /\.vue$/,
+            loader: 'vue-loader',
+            options: vueLoaderConfig(!development),
+          },
+          {
+            test: /\.ts$/,
+            use: [
+              {
+                loader: 'ts-loader',
+                options: {
+                  appendTsSuffixTo: ['\\.vue$'],
+                  happyPackMode: true,
+                  transpileOnly: true,
+                },
+              },
+            ],
+            include: [resolve('src'), resolve('test')],
+          },
+          {
+            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 VueLoaderPlugin(),
-    new CopyWebpackPlugin({
-      patterns: [
-        {
-          context: './node_modules/swagger-ui-dist/',
-          from: '*.{js,css,html,png}',
-          to: 'swagger-ui/',
-          globOptions: { ignore: ['**/index.html'] },
-        },
-        { from: './node_modules/axios/dist/axios.min.js', to: 'swagger-ui/' },
-        { from: './<%= CLIENT_MAIN_SRC_DIR %>swagger-ui/', to: 'swagger-ui/' },
-        { from: './<%= CLIENT_MAIN_SRC_DIR %>content/', to: 'content/' },
-        { from: './<%= CLIENT_MAIN_SRC_DIR %>favicon.ico', to: 'favicon.ico' },
-        {
-          from: './<%= CLIENT_MAIN_SRC_DIR %>manifest.webapp',
-          to: 'manifest.webapp',
-        },
-        // 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
-        ]
-      }
-    })<% } %>
-  ]
-}
-// jhipster-needle-add-webpack-config - JHipster will add custom config
-);
+      plugins: [
+        new EnvironmentPlugin({
+          // Required by vuelidate https://github.com/vuelidate/vuelidate/issues/365
+          BUILD: 'web',
+        }),
+        new DefinePlugin({
+<%_ if (enableTranslation) { _%>
+          I18N_HASH: JSON.stringify(languagesHash.hash),
+<%_ } _%>
+          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: [
+            {
+              context: './node_modules/swagger-ui-dist/',
+              from: '*.{js,css,html,png}',
+              to: 'swagger-ui/',
+              globOptions: { ignore: ['**/index.html'] },
+            },
+            { from: './node_modules/axios/dist/axios.min.js', to: 'swagger-ui/' },
+            { from: './<%= CLIENT_MAIN_SRC_DIR %>swagger-ui/', to: 'swagger-ui/' },
+            { from: './<%= CLIENT_MAIN_SRC_DIR %>content/', to: 'content/' },
+            { from: './<%= CLIENT_MAIN_SRC_DIR %>favicon.ico', to: 'favicon.ico' },
+            {
+              from: './<%= CLIENT_MAIN_SRC_DIR %>manifest.webapp',
+              to: 'manifest.webapp',
+            },
+            // 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,93 +18,31 @@
 -%>
 'use strict';
 const BrowserSyncPlugin = require('browser-sync-webpack-plugin');
-const portfinder = require('portfinder');
 const webpack = require('webpack');
-const { merge: webpackMerge } = require('webpack-merge');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
 
-const utils = require('./vue.utils');
-const config = require('./env');
-const commonConfig = require('./webpack.common');
-const jhiUtils = require('./utils.js');
-const MODE = 'development';
+const { styleLoaders } = require('./vue.utils');
+const config = require('./config');
 
-module.exports = env => webpackMerge(commonConfig({ env: MODE }), {
-  mode: MODE,
-  module: {
-    rules: utils.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: {
-    path: jhiUtils.root('<%= DIST_DIR %>'),
-    filename: 'app/[contenthash].bundle.js',
-    chunkFilename: 'app/[id].chunk.js'
-  },
-  optimization: {
-    moduleIds: 'named',
-  },
-  devServer: {
-    contentBase: './<%= 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://127.0.0.1:<%= serverPort %>',
-        secure: false,
-        headers: { host: 'localhost:9000' }
-      },
-<%_ if (communicationSpringWebsocket) { _%>
-      {
-        context: [
-          '/websocket'
-        ],
-        target: 'ws://127.0.0.1:<%= serverPort %>',
-        ws: true
-      }
-<%_ } _%>
-    ],
-    watchOptions: {
-      ignored: /node_modules/
+module.exports = (env, options) => {
+  const devConfig = {
+    module: {
+      rules: styleLoaders({ sourceMap: config.dev.cssSourceMap, usePostCSS: true })
+    },
+    // cheap-module-eval-source-map is faster for development
+    devtool: config.dev.devtool,
+    optimization: {
+      moduleIds: 'named',
     },
-    historyApiFallback: true
-  },
-  plugins: [
-    new webpack.DefinePlugin({
-      'process.env': require('./dev.env')
-    }),
-    new webpack.HotModuleReplacementPlugin(),
-    new webpack.NoEmitOnErrorsPlugin(),
-    new HtmlWebpackPlugin({
-      base: '/',
-      template: './<%= MAIN_SRC_DIR %>index.html',
-      chunks: ['vendors', 'main', 'global'],
-      chunksSortMode: 'manual',
-      inject: true
-    }),
+    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,
 <%_ } _%>
@@ -126,5 +64,6 @@ module.exports = env => webpackMerge(commonConfig({ env: MODE }), {
         reload: true
       }
     )
-  ]
-});
+  );
+  return devConfig;
+};