generator-jhipster 8.6.0 → 8.7.0

package/dist/generators/vue/templates/src/main/webapp/content/scss/global.scss.ejs

@@ -27,7 +27,7 @@ h1,
 h2,
 h3,
 h4 {
-    font-weight: 300;
+  font-weight: 300;
 }
 
 body {
@@ -45,14 +45,14 @@ body {
 }
 
 a {
-    color: #533f03;
-    font-weight: bold;
+  color: #533f03;
+  font-weight: bold;
 }
 
 a:hover {
-    color: #533f03;
-    /* make sure browsers use the pointer cursor for anchors, even with no href */
-    cursor: pointer;
+  color: #533f03;
+  /* make sure browsers use the pointer cursor for anchors, even with no href */
+  cursor: pointer;
 }
 .dropdown-item:hover,
 .dropdown-item:focus {
@@ -65,10 +65,10 @@ a:hover {
 Browser Upgrade Prompt
 ========================================================================== */
 .browserupgrade {
-    margin: 0.2em 0;
-    background: #ccc;
-    color: #000;
-    padding: 0.2em 0;
+  margin: 0.2em 0;
+  background: #ccc;
+  color: #000;
+  padding: 0.2em 0;
 }
 
 /* ==========================================================================
@@ -103,11 +103,11 @@ Generic styles
 /* Error highlight on input fields */
 .valid[required],
 .valid.required {
-    border-left: 5px solid green;
+  border-left: 5px solid green;
 }
 
 .invalid:not(form) {
-    border-left: 5px solid red;
+  border-left: 5px solid red;
 }
 
 /* other generic styles */
@@ -122,81 +122,81 @@ Generic styles
 }
 
 .error {
-    color: white;
-    background-color: red;
+  color: white;
+  background-color: red;
 }
 
 .pad {
-    padding: 10px;
+  padding: 10px;
 }
 
 .w-40 {
-    width: 40% !important;
+  width: 40% !important;
 }
 
 .w-60 {
-    width: 60% !important;
+  width: 60% !important;
 }
 
 .break {
-    white-space: normal;
-    word-break: break-all;
+  white-space: normal;
+  word-break: break-all;
 }
 
 .readonly {
-    background-color: #eee;
-    opacity: 1;
+  background-color: #eee;
+  opacity: 1;
 }
 
 .footer {
-    border-top: 1px solid rgba(0, 0, 0, 0.125);
+  border-top: 1px solid rgba(0, 0, 0, 0.125);
 }
 
 .hand,
 [jhisortby] {
-    cursor: pointer;
+  cursor: pointer;
 }
 
 /* ==========================================================================
 Custom alerts for notification
 ========================================================================== */
 .alerts {
-    .alert {
-        text-overflow: ellipsis;
-        pre {
-            background: none;
-            border: none;
-            font: inherit;
-            color: inherit;
-            padding: 0;
-            margin: 0;
-        }
-        .popover pre {
-            font-size: 10px;
-        }
+  .alert {
+    text-overflow: ellipsis;
+    pre {
+      background: none;
+      border: none;
+      font: inherit;
+      color: inherit;
+      padding: 0;
+      margin: 0;
+    }
+    .popover pre {
+      font-size: 10px;
+    }
+  }
+  .toast {
+    position: fixed;
+    width: 100%;
+    &.left {
+      left: 5px;
+    }
+    &.right {
+      right: 5px;
+    }
+    &.top {
+      top: 55px;
     }
-    .toast {
-        position: fixed;
-        width: 100%;
-        &.left {
-            left: 5px;
-        }
-        &.right {
-            right: 5px;
-        }
-        &.top {
-            top: 55px;
-        }
-        &.bottom {
-            bottom: 55px;
-        }
+    &.bottom {
+      bottom: 55px;
     }
+  }
 }
 
 @media screen and (min-width: 480px) {
-    .alerts .toast {
-        width: 50%;
-    }
+  .alerts .toast {
+    width: 50%;
+  }
 }
 
 /* ==========================================================================
@@ -206,55 +206,55 @@ entity tables helpers
 /* Remove Bootstrap padding from the element
 http://stackoverflow.com/questions/19562903/remove-padding-from-columns-in-bootstrap-3 */
 @mixin no-padding($side) {
-    @if $side == "all" {
-        .no-padding {
-            padding: 0 !important;
-        }
-    } @else {
-        .no-padding-#{$side} {
-            padding-#{$side}: 0 !important;
-        }
+  @if $side == 'all' {
+    .no-padding {
+      padding: 0 !important;
+    }
+  } @else {
+    .no-padding-#{$side} {
+      padding-#{$side}: 0 !important;
     }
+  }
 }
-@include no-padding("left");
-@include no-padding("right");
-@include no-padding("top");
-@include no-padding("bottom");
-@include no-padding("all");
+@include no-padding('left');
+@include no-padding('right');
+@include no-padding('top');
+@include no-padding('bottom');
+@include no-padding('all');
 
 /* bootstrap 3 input-group 100% width
 http://stackoverflow.com/questions/23436430/bootstrap-3-input-group-100-width */
 .width-min {
-    width: 1% !important;
+  width: 1% !important;
 }
 
 /* ==========================================================================
 entity detail page css
 ========================================================================== */
 .row.jh-entity-details {
-    display: grid;
-    grid-template-columns: auto 1fr;
-    column-gap: 10px;
-    line-height: 1.5;
+  display: grid;
+  grid-template-columns: auto 1fr;
+  column-gap: 10px;
+  line-height: 1.5;
 }
 
 @media screen and (min-width: 768px) {
-    .row.jh-entity-details > {
-        dt {
-            float: left;
-            overflow: hidden;
-            clear: left;
-            text-align: right;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            padding: 0.5em 0;
-        }
-        dd {
-            border-bottom: 1px solid #eee;
-            padding: 0.5em 0;
-            margin-left: 0;
-        }
+  .row.jh-entity-details > {
+    dt {
+      float: left;
+      overflow: hidden;
+      clear: left;
+      text-align: right;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      padding: 0.5em 0;
     }
+    dd {
+      border-bottom: 1px solid #eee;
+      padding: 0.5em 0;
+      margin-left: 0;
+    }
+  }
 }
 
 /* ==========================================================================
@@ -264,24 +264,24 @@ ui bootstrap tweaks
 .pagination,
 .carousel,
 .card-title a {
-    cursor: pointer;
+  cursor: pointer;
 }
 
 .datetime-picker-dropdown > li.date-picker-menu div > table .btn-secondary,
 .uib-datepicker-popup > li > div.uib-datepicker > table .btn-secondary {
-    border: 0;
+  border: 0;
 }
 
 .datetime-picker-dropdown > li.date-picker-menu div > table:focus,
 .uib-datepicker-popup > li > div.uib-datepicker > table:focus {
-    outline: none;
+  outline: none;
 }
 
 .thread-dump-modal-lock {
-    max-width: 450px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+  max-width: 450px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .svg-inline--fa {

package/dist/generators/vue/templates/vite.config.mts.ejs

@@ -31,7 +31,9 @@ import { viteStaticCopy } from 'vite-plugin-static-copy';
 <%_ if (microfrontend) { _%>
 import federation from "@originjs/vite-plugin-federation";
 
+  <%_ if (applicationTypeGateway) { _%>
 const sharedAppVersion = '0.0.0';
+  <%_ } _%>
 <%_ } _%>
 
 const getFileFromRepo = (file: string) =>
@@ -115,7 +117,7 @@ let config = defineConfig({
           ws: res === '/websocket',
 <%_ } _%>
         },
-      ])
+      ]),
     ),
   },
 });
@@ -125,7 +127,7 @@ config = mergeConfig(config, {
   build: {
     modulePreload: false,
     minify: false,
-    target: ["chrome89", "edge89", "firefox89", "safari15"],
+    target: ['chrome89', 'edge89', 'firefox89', 'safari15'],
   },
   plugins: [
     federation({

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

@@ -1,7 +1,5 @@
 'use strict';
 
-const path = require('path');
-
 <%_ if (buildToolUnknown) { _%>
 const packageJson = require('./../package.json');
 <%_ } _%>
@@ -12,7 +10,7 @@ module.exports = {
   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 : 'DEV',
+  version: process.env.APP_VERSION || 'DEV',
 <%_ } _%>
 
   dev: {
@@ -26,7 +24,7 @@ module.exports = {
     // https://vue-loader.vuejs.org/en/options.html#cachebusting
     cacheBusting: true,
 
-    cssSourceMap: true
+    cssSourceMap: true,
   },
 
   build: {
@@ -45,6 +43,6 @@ module.exports = {
     // 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
-  }
+    bundleAnalyzerReport: process.env.npm_config_report,
+  },
 };

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

@@ -1,9 +1,7 @@
 'use strict';
-const path = require('path');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const sass = require('sass');
 
-const packageConfig = require('../package.json');
 const config = require('./config');
 
 const sourceMapEnabled = production => (production ? config.build.productionSourceMap : config.dev.cssSourceMap);
@@ -33,10 +31,8 @@ const cssLoaders = options => {
 
     if (loader) {
       loaders.push({
-        loader: loader + '-loader',
-        options: Object.assign({}, loaderOptions, {
-          sourceMap: options.sourceMap,
-        }),
+        loader: `${loader}-loader`,
+        options: { ...loaderOptions, sourceMap: options.sourceMap },
       });
     }
 
@@ -65,7 +61,7 @@ const styleLoaders = options => {
   for (const extension in loaders) {
     const loader = loaders[extension];
     output.push({
-      test: new RegExp('\\.' + extension + '$'),
+      test: new RegExp(`\\.${extension}$`),
       use: loader,
     });
   }

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

@@ -84,7 +84,7 @@ module.exports = async (env, options) => {
           }
 <%_ } _%>
         ],
-        historyApiFallback: true
+        historyApiFallback: true,
       },
       cache: {
         // 1. Set cache type to filesystem

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

@@ -18,7 +18,6 @@
 -%>
 'use strict';
 const BrowserSyncPlugin = require('browser-sync-webpack-plugin');
-const webpack = require('webpack');
 
 const { styleLoaders } = require('./vue.utils');
 const config = require('./config');
@@ -26,13 +25,13 @@ const config = require('./config');
 module.exports = (env, options) => {
   const devConfig = {
     module: {
-      rules: styleLoaders({ sourceMap: config.dev.cssSourceMap, usePostCSS: true })
+      rules: styleLoaders({ sourceMap: config.dev.cssSourceMap, usePostCSS: true }),
     },
     // cheap-module-eval-source-map is faster for development
     devtool: config.dev.devtool,
     output: {
       filename: 'app/[name].[contenthash].bundle.js',
-      chunkFilename: 'app/[id].[chunkhash].chunk.js'
+      chunkFilename: 'app/[id].[chunkhash].chunk.js',
     },
     optimization: {
       moduleIds: 'named',
@@ -51,9 +50,9 @@ module.exports = (env, options) => {
         },
         socket: {
           clients: {
-            heartbeatTimeout: 60000
-          }
-        }
+            heartbeatTimeout: 60000,
+          },
+        },
         /*
         ,ghostMode: { // uncomment this part to disable BrowserSync ghostMode; https://github.com/jhipster/generator-jhipster/issues/11116
           clicks: false,
@@ -63,9 +62,9 @@ module.exports = (env, options) => {
         } */
       },
       {
-        reload: true
-      }
-    )
+        reload: true,
+      },
+    ),
   );
   return devConfig;
 };

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

@@ -16,12 +16,6 @@
  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.configSection) { -&>
 <%_ if (applicationTypeGateway && clientFrameworkVue) { _%>
     resolve: {

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

@@ -17,7 +17,6 @@
  limitations under the License.
 -%>
 'use strict';
-const webpack = require('webpack');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 const WorkboxPlugin = require('workbox-webpack-plugin');
@@ -31,13 +30,13 @@ const webpackConfig = {
     rules: styleLoaders({
       sourceMap: config.build.productionSourceMap,
       extract: true,
-      usePostCSS: true
-    })
+      usePostCSS: true,
+    }),
   },
   devtool: config.build.productionSourceMap ? config.build.devtool : false,
   output: {
     filename: 'app/[name].[contenthash].bundle.js',
-    chunkFilename: 'app/[id].[chunkhash].chunk.js'
+    chunkFilename: 'app/[id].[chunkhash].chunk.js',
   },
   optimization: {
     moduleIds: 'deterministic',
@@ -52,10 +51,10 @@ const webpackConfig = {
         commons: {
           test: /[\\/]node_modules[\\/]/,
           name: 'vendors',
-          chunks: 'all'
-        }
-      }
-    }
+          chunks: 'all',
+        },
+      },
+    },
   },
   plugins: [
     new TerserPlugin({
@@ -83,11 +82,11 @@ const webpackConfig = {
           unused: true,
           conditionals: true,
           dead_code: true,
-          evaluate: true
+          evaluate: true,
         },
         mangle: {
-          safari10: true
-        }
+          safari10: true,
+        },
       },
       parallel: true,
       extractComments: false,
@@ -95,14 +94,14 @@ const webpackConfig = {
     // extract css into its own file
     new MiniCssExtractPlugin({
       filename: 'content/[name].[contenthash].css',
-      chunkFilename: 'content/[id].css'
+      chunkFilename: 'content/[id].css',
     }),
     new WorkboxPlugin.GenerateSW({
       clientsClaim: true,
       skipWaiting: true,
-      exclude: [/swagger-ui/]
-    })
-  ]
+      exclude: [/swagger-ui/],
+    }),
+  ],
 };
 
 if (config.build.productionGzip) {
@@ -112,10 +111,10 @@ if (config.build.productionGzip) {
     new CompressionWebpackPlugin({
       asset: '[path].gz[query]',
       algorithm: 'gzip',
-      test: new RegExp('\\.(' + config.build.productionGzipExtensions.join('|') + ')$'),
+      test: new RegExp(`\\.(${config.build.productionGzipExtensions.join('|')})$`),
       threshold: 10240,
-      minRatio: 0.8
-    })
+      minRatio: 0.8,
+    }),
   );
 }
 

package/dist/generators/workspaces/generator.js

@@ -19,6 +19,7 @@
 import { existsSync } from 'fs';
 import { GENERATOR_ANGULAR, GENERATOR_BOOTSTRAP_WORKSPACES, GENERATOR_GIT } from '../generator-list.js';
 import BaseWorkspacesGenerator from '../base-workspaces/index.js';
+import { packageJson } from '../../lib/index.js';
 /**
  * Base class for a generator that can be extended through a blueprint.
  *
@@ -41,9 +42,6 @@ export default class WorkspacesGenerator extends BaseWorkspacesGenerator {
     }
     get initializing() {
         return this.asInitializingTaskGroup({
-            async parseCommand() {
-                await this.parseCurrentJHipsterCommand();
-            },
             loadConfig() {
                 // Generate workspaces file if workspace option is passed, or if workspace option is ommitted and monorepository is enabled, or if regenerating.
                 this.generateWorkspaces = (this.workspaces ?? this.jhipsterConfig.monorepository) || Boolean(this.packageJson?.get('workspaces'));
@@ -78,7 +76,9 @@ export default class WorkspacesGenerator extends BaseWorkspacesGenerator {
         return this.asComposingTaskGroup({
             async composeGit() {
                 if (this.options.monorepository || this.jhipsterConfig.monorepository) {
-                    await this.composeWithJHipster(GENERATOR_GIT);
+                    const generatorOptions = { monorepositoryRoot: true };
+                    await this.composeWithJHipster(GENERATOR_GIT, { generatorOptions });
+                    await this.composeWithJHipster('jhipster:javascript:prettier', { generatorOptions });
                 }
             },
             async generateApplications() {
@@ -132,6 +132,19 @@ export default class WorkspacesGenerator extends BaseWorkspacesGenerator {
     get [BaseWorkspacesGenerator.LOADING_WORKSPACES]() {
         return this.delegateTasksToBlueprint(() => this.loadingWorkspaces);
     }
+    get writing() {
+        return this.asWritingTaskGroup({
+            async writing({ application }) {
+                await this.writeFiles({
+                    blocks: [{ templates: ['.prettierignore.jhi.workspaces'] }],
+                    context: application,
+                });
+            },
+        });
+    }
+    get [BaseWorkspacesGenerator.WRITING]() {
+        return this.delegateTasksToBlueprint(() => this.writing);
+    }
     get postWriting() {
         return this.asPostWritingTaskGroup({
             generatePackageJson({ applications }) {
@@ -160,8 +173,15 @@ export default class WorkspacesGenerator extends BaseWorkspacesGenerator {
                             rxjs, // Set version to workaround https://github.com/npm/cli/issues/4437
                         },
                         overrides: {
-                            webpack: webpackVersion,
                             'browser-sync': browserSyncVersion,
+                            webpack: webpackVersion,
+                        },
+                    });
+                }
+                if (applications.some(app => app.backendTypeJavaAny)) {
+                    this.packageJson.merge({
+                        devDependencies: {
+                            'prettier-plugin-java': packageJson.dependencies['prettier-plugin-java'],
                         },
                     });
                 }

package/dist/generators/workspaces/support/applications-lookup.js

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2013-2024 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 { readFile } from 'node:fs/promises';
+import { dirname } from 'node:path';
+import { globby } from 'globby';
+const isApplication = async (cwd) => {
+    const content = await readFile(cwd, { encoding: 'utf-8' });
+    const jsonContent = JSON.parse(content);
+    return Boolean(jsonContent?.['generator-jhipster']?.baseName);
+};
+export const applicationsLookup = async (cwd) => {
+    const yoRcFiles = await globby('**/.yo-rc.json', { cwd });
+    const result = await Promise.all(yoRcFiles.map(async (file) => ({ file, isApp: await isApplication(file) })));
+    return result.filter(({ isApp }) => isApp).map(({ file }) => dirname(file));
+};

package/dist/generators/workspaces/support/index.js

@@ -0,0 +1,19 @@
+/**
+ * Copyright 2013-2024 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.
+ */
+export * from './applications-lookup.js';