Merge pull request #2265 from vishal423/upgrade-jhipster-8.7.x

Bump JHipster dependency to v8.6
jhipster · Sep 21, 2024 · 38ef1db · 38ef1db
2 parents 965abb7 + fa89d12
commit 38ef1db
Show file tree

Hide file tree

Showing 10 changed files with 893 additions and 1,783 deletions.
diff --git a/generators/client/index.js b/generators/client/index.js
@@ -6,7 +6,6 @@ import { TEMPLATES_WEBAPP_SOURCES_DIR } from 'generator-jhipster';
 import { getEnumInfo } from 'generator-jhipster/generators/base-application/support';
 import { createNeedleCallback } from 'generator-jhipster/generators/base/support';
 import { getPackageJson } from '../util.js';
-import blueprintCommand from './command.js';
 import svelteFiles from './files.js';
 import entitySvelteFiles from './entity-files.js';
 
@@ -29,10 +28,8 @@ export default class extends ClientGenerator {
 
 	get [BaseApplicationGenerator.INITIALIZING]() {
 		return this.asInitializingTaskGroup({
-			...super.initializing,
-			async initializingTemplateTask() {
-				this.parseJHipsterArguments(blueprintCommand.arguments);
-				this.parseJHipsterOptions(blueprintCommand.options);
+			async parseCommand() {
+				await this.parseCurrentJHipsterCommand();
 			},
 		});
 	}

diff --git a/generators/client/templates/cypress/integration/account/register.spec.js.ejs b/generators/client/templates/cypress/integration/account/register.spec.js.ejs
@@ -96,7 +96,7 @@ describe('Register User', () => {
 		})
 	})
 
-	it.skip('should not allow user account creation with duplicate username', () => {
+	it('should not allow user account creation with duplicate username', () => {
 		cy.getByTestId('registerForm').within(() => {
 			cy.getByName('username')
 				.type('admin')

diff --git a/generators/client/templates/package.json b/generators/client/templates/package.json
@@ -21,9 +21,9 @@
 		"husky": "9.1.6",
 		"jhipster-svelte-library": "0.12.1",
 		"postcss": "8.4.47",
-		"prettier": "3.2.5",
-		"prettier-plugin-svelte": "3.2.3",
-		"prettier-plugin-organize-imports": "3.2.4",
+		"prettier": "3.3.2",
+		"prettier-plugin-svelte": "3.2.6",
+		"prettier-plugin-organize-imports": "4.1.0",
 		"lint-staged": "15.2.10",
 		"rimraf": "6.0.1",
 		"svelte": "4.2.19",

diff --git a/generators/common/command.js b/generators/common/command.js
@@ -0,0 +1,6 @@
+const command = {
+	configs: {},
+	options: {},
+};
+
+export default command;
diff --git a/generators/common/index.js b/generators/common/index.js
@@ -18,6 +18,7 @@
  */
 import CommonGenerator from 'generator-jhipster/generators/common';
 import BaseApplicationGenerator from 'generator-jhipster/generators/base-application';
+export { default as command } from './command.js';
 
 export default class extends CommonGenerator {
 	constructor(args, opts, features) {

diff --git a/generators/server/command.js b/generators/server/command.js
@@ -0,0 +1,6 @@
+const command = {
+	configs: {},
+	options: {},
+};
+
+export default command;
diff --git a/generators/server/index.js b/generators/server/index.js
@@ -1,5 +1,6 @@
 import ServerGenerator from 'generator-jhipster/generators/server';
 import BaseApplicationGenerator from 'generator-jhipster/generators/base-application';
+export { default as command } from './command.js';
 
 export default class extends ServerGenerator {
 	constructor(args, opts, features) {

diff --git a/generators/server/templates/package.json.ejs b/generators/server/templates/package.json.ejs
@@ -33,9 +33,9 @@
   },
   "devDependencies": {
 	"husky": "9.1.5",
-	"prettier": "3.2.5",
+	"prettier": "3.3.2",
 	"prettier-plugin-java": "2.6.0",
-	"lint-staged": "15.2.4"
+	"lint-staged": "15.2.10"
   },
   "scripts": {
     "prepare": "husky",