generator-jhipster 8.0.0-rc.1 → 8.0.0

package/dist/generators/client/resources/package.json

@@ -3,14 +3,14 @@
     "dayjs": "1.11.10"
   },
   "devDependencies": {
-    "@cypress/code-coverage": "3.12.3",
+    "@cypress/code-coverage": "3.12.7",
     "babel-loader": "9.1.3",
     "babel-plugin-istanbul": "6.1.1",
-    "cypress": "13.3.1",
+    "cypress": "13.4.0",
     "cypress-audit": "1.1.0",
     "eslint-plugin-cypress": "2.15.1",
     "lighthouse": "11.2.0",
     "nyc": "15.1.0",
-    "swagger-ui-dist": "5.9.0"
+    "swagger-ui-dist": "5.9.1"
   }
 }

package/dist/generators/client/templates/src/main/webapp/content/css/loading.css.ejs

@@ -151,7 +151,7 @@
   left: -8px;
   width: 24px;
   height: 10px;
-  background-image: url('../images/logo-jhipster.png');
+  background-image: url('/content/images/logo-jhipster.png');
   background-size: contain;
   -webkit-animation: lds-pacman-3 1s linear infinite;
   animation: lds-pacman-3 1.5s linear infinite;

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

@@ -20,6 +20,7 @@
  // Register sections and max allowed fragments, 0 for unlimited.
  fragments.registerSections({
    importsSection:0,
+   configSection: 0,
    moduleFederationSection: 0,
    pluginsSection: 0,
  });
@@ -28,7 +29,18 @@ _&>
 const ModuleFederationPlugin = require('webpack/lib/container/ModuleFederationPlugin');
 <&- fragments.importsSection() &>
 const packageJson = require('../package.json');
-const appVersion = packageJson.version;
+// Microfrontend api, should match across gateway and microservices.
+const apiVersion = '0.0.1';
+
+const sharedDefaults = { singleton: true, strictVersion: true, requiredVersion: apiVersion };
+const shareMappings = (...mappings) => Object.fromEntries(mappings.map(map => [map, { ...sharedDefaults, version: apiVersion }]));
+
+const shareDependencies = ({ skipList = [] } = {}) =>
+  Object.fromEntries(
+    Object.entries(packageJson.dependencies)
+      .filter(([dependency]) => !skipList.includes(dependency))
+      .map(([dependency, version]) => [dependency, { ...sharedDefaults, version, requiredVersion: version }]),
+  );
 
 module.exports = ({ serve }) => {
   return {
@@ -37,6 +49,7 @@ module.exports = ({ serve }) => {
       chunkIds: 'named',
       runtimeChunk: false,
     },
+<&- fragments.configSection() &>
     plugins: [
       new ModuleFederationPlugin({
 <%_ if (applicationTypeMicroservice) { _%>

package/dist/generators/common/files.mjs

@@ -41,7 +41,7 @@ export const commonFiles = {
     commitHooks: [
         {
             condition: generator => !generator.skipCommitHook,
-            templates: ['.lintstagedrc.js', '.husky/pre-commit'],
+            templates: ['.lintstagedrc.cjs', '.husky/pre-commit'],
         },
     ],
 };

package/dist/generators/common/generator.mjs

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 /* eslint-disable consistent-return */
-import { isFilePending } from 'mem-fs-editor/state';
+import { isFileStateModified } from 'mem-fs-editor/state';
 import BaseApplicationGenerator from '../base-application/index.mjs';
 import { writeFiles, prettierConfigFiles } from './files.mjs';
 import { MAIN_DIR, TEST_DIR, SERVER_MAIN_RES_DIR, JHIPSTER_DOCUMENTATION_URL, JHIPSTER_DOCUMENTATION_ARCHIVE_PATH, } from '../generator-constants.mjs';
@@ -149,6 +149,20 @@ export default class CommonGenerator extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.PREPARING]() {
         return this.delegateTasksToBlueprint(() => this.preparing);
     }
+    get default() {
+        return this.asDefaultTaskGroup({
+            async formatSonarProperties() {
+                this.queueTransformStream({
+                    name: 'prettifying sonar-project.properties',
+                    filter: file => isFileStateModified(file) && file.path.startsWith(this.destinationPath()) && file.path.endsWith('sonar-project.properties'),
+                    refresh: false,
+                }, await createPrettierTransform.call(this, { extensions: 'properties', prettierProperties: true }));
+            },
+        });
+    }
+    get [BaseApplicationGenerator.DEFAULT]() {
+        return this.asDefaultTaskGroup(this.delegateTasksToBlueprint(() => this.default));
+    }
     // Public API method used by the getter and also by Blueprints
     get writing() {
         return {
@@ -164,6 +178,11 @@ export default class CommonGenerator extends BaseApplicationGenerator {
                         this.removeFile('npmw.cmd');
                     }
                 }
+                if (this.isJhipsterVersionLessThan('8.0.0-rc.2')) {
+                    if (!application.skipCommitHook) {
+                        this.removeFile('.lintstagedrc.js');
+                    }
+                }
             },
             writePrettierConfig({ application }) {
                 return this.writeFiles({
@@ -189,12 +208,6 @@ export default class CommonGenerator extends BaseApplicationGenerator {
                     },
                 });
             },
-            async formatSonarProperties() {
-                this.queueTransformStream(await createPrettierTransform.call(this, { extensions: 'properties', prettierProperties: true }), {
-                    name: 'prettifying sonar-project.properties',
-                    streamOptions: { filter: file => isFilePending(file) && file.path.endsWith('sonar-project.properties') },
-                });
-            },
             addCommitHookDependencies({ application }) {
                 if (application.skipCommitHook)
                     return;
@@ -205,8 +218,17 @@ export default class CommonGenerator extends BaseApplicationGenerator {
                     devDependencies: {
                         husky: application.nodeDependencies.husky,
                         'lint-staged': application.nodeDependencies['lint-staged'],
+                        prettier: application.nodeDependencies.prettier,
+                        'prettier-plugin-packagejson': application.nodeDependencies['prettier-plugin-packagejson'],
                     },
                 });
+                if (application.backendTypeJavaAny) {
+                    this.packageJson.merge({
+                        devDependencies: {
+                            'prettier-plugin-java': application.nodeDependencies['prettier-plugin-java'],
+                        },
+                    });
+                }
             },
         });
     }

package/dist/generators/common/resources/package.json

@@ -1,9 +1,9 @@
 {
   "devDependencies": {
-    "concurrently": "8.2.1",
+    "concurrently": "8.2.2",
     "husky": "8.0.3",
-    "lint-staged": "14.0.1",
-    "npm": "10.2.0",
+    "lint-staged": "15.0.2",
+    "npm": "10.2.2",
     "wait-on": "7.0.1"
   }
 }

package/dist/generators/common/templates/.lintstagedrc.cjs.ejs

@@ -0,0 +1,21 @@
+<%#
+ Copyright 2013-2023 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.
+-%>
+module.exports = {
+  '{,**/}*.{<%= prettierExtensions %>}': ['prettier --write'],
+};

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

@@ -13,7 +13,7 @@ bracketSameLine: false
 
 plugins:
   - prettier-plugin-packagejson
-<%_ if (!skipServer) { _%>
+<%_ if (backendTypeJavaAny) { _%>
   - prettier-plugin-java
   
 # java rules:

package/dist/generators/common/templates/README.md.jhi.ejs

@@ -34,6 +34,8 @@
 _&>
 # <%= baseName %>
 
+This application was generated using JHipster <%= jhipsterVersion %>, you can find documentation and help at [<%= documentationArchiveUrl %>](<%= documentationArchiveUrl %>).
+
 <&- fragments.introSection() &>
 ## Project Structure
 

package/dist/generators/cypress/templates/src/test/javascript/cypress/e2e/account/settings-page.cy.ts.ejs

@@ -79,6 +79,7 @@ describe('/account/settings', () => {
 
   it("should be able to change 'user' lastname settings", () => {
     cy.get(lastNameSettingsSelector).clear();
+    cy.get(firstNameSettingsSelector).type('jhipster');
     cy.get(lastNameSettingsSelector).type('retspihj');
     cy.get(submitSettingsSelector).click();
     cy.wait('@settingsSave').then(({ response }) => expect(response?.statusCode).to.equal(200));
@@ -86,6 +87,7 @@ describe('/account/settings', () => {
 
   it("should be able to change 'user' email settings", () => {
     cy.get(emailSettingsSelector).clear();
+    cy.get(firstNameSettingsSelector).type('jhipster');
     cy.get(emailSettingsSelector).type('user@localhost.fr');
     cy.get(submitSettingsSelector).click();
     cy.wait('@settingsSave').then(({ response }) => expect(response?.statusCode).to.equal(200));
@@ -114,6 +116,7 @@ describe('/account/settings', () => {
 
     it("should not be able to change 'user' email to same value", () => {
       cy.get(emailSettingsSelector).clear();
+      cy.get(firstNameSettingsSelector).type('jhipster');
       cy.get(emailSettingsSelector).type(testAdminEmail);
       cy.get(submitSettingsSelector).click();
       cy.wait('@settingsSave').then(({ response }) => expect(response?.statusCode).to.equal(400));