From da79817103fdb1955147d890f71c28f87aa0ff08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Mino?= Date: Sun, 9 Feb 2025 14:54:34 +0100 Subject: [PATCH] chore(deps): upgrade to prettier 3.5 on jhipster-lite engine and enable experimentalOperatorPosition at start of line --- .prettierrc | 1 + package-lock.json | 8 ++++---- package.json | 2 +- .../app/module/domain/landscape/Landscape.ts | 6 +++--- .../primary/landscape/Landscape.component.ts | 16 ++++++++-------- .../modules-patch/ModulesPatch.component.ts | 6 +++--- src/test/resources/projects/react-app/index.css | 5 +++-- 7 files changed, 23 insertions(+), 21 deletions(-) diff --git a/.prettierrc b/.prettierrc index 9fe754c8769..d03407fbb76 100644 --- a/.prettierrc +++ b/.prettierrc @@ -4,6 +4,7 @@ printWidth: 140 singleQuote: true tabWidth: 2 useTabs: false +experimentalOperatorPosition: start plugins: - '@prettier/plugin-xml' diff --git a/package-lock.json b/package-lock.json index 330467866b8..49832e59b83 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,7 @@ "lint-staged": "15.4.3", "npm-run-all2": "7.0.2", "postcss-scss": "4.0.9", - "prettier": "3.4.2", + "prettier": "3.5.0", "prettier-plugin-gherkin": "3.1.1", "prettier-plugin-java": "2.6.7", "prettier-plugin-organize-imports": "4.1.0", @@ -12544,9 +12544,9 @@ } }, "node_modules/prettier": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz", - "integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.0.tgz", + "integrity": "sha512-quyMrVt6svPS7CjQ9gKb3GLEX/rl3BCL2oa/QkNcXv4YNVBC9olt3s+H7ukto06q7B1Qz46PbrKLO34PR6vXcA==", "dev": true, "license": "MIT", "bin": { diff --git a/package.json b/package.json index 57c933ced19..272f7d20dbe 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "lint-staged": "15.4.3", "npm-run-all2": "7.0.2", "postcss-scss": "4.0.9", - "prettier": "3.4.2", + "prettier": "3.5.0", "prettier-plugin-gherkin": "3.1.1", "prettier-plugin-java": "2.6.7", "prettier-plugin-organize-imports": "4.1.0", diff --git a/src/main/webapp/app/module/domain/landscape/Landscape.ts b/src/main/webapp/app/module/domain/landscape/Landscape.ts index 5cc2ce51088..f06d90a2a9b 100644 --- a/src/main/webapp/app/module/domain/landscape/Landscape.ts +++ b/src/main/webapp/app/module/domain/landscape/Landscape.ts @@ -78,9 +78,9 @@ export class Landscape { private isModuleSelectable(dependenciesSelection: LandscapeSelectionTree, module: LandscapeModule): boolean { return ( - dependenciesSelection.isSelectable() && - this.hasNoIncompatibleSelectedModuleInFeature(module.slug()) && - this.hasNoIncompatibleDependency(module) + dependenciesSelection.isSelectable() + && this.hasNoIncompatibleSelectedModuleInFeature(module.slug()) + && this.hasNoIncompatibleDependency(module) ); } diff --git a/src/main/webapp/app/module/primary/landscape/Landscape.component.ts b/src/main/webapp/app/module/primary/landscape/Landscape.component.ts index 5864cb8b7bb..48b13eaa701 100644 --- a/src/main/webapp/app/module/primary/landscape/Landscape.component.ts +++ b/src/main/webapp/app/module/primary/landscape/Landscape.component.ts @@ -303,14 +303,14 @@ export default defineComponent({ const elementFlavor = (module: LandscapeElementId): string => { return ( - operationInProgressClass() + - selectionHighlightClass(module) + - unselectionHighlightClass(module) + - selectionClass(module) + - applicationClass(module) + - flavorClass() + - anchorPointClass(module) + - searchHighlightClass(module) + operationInProgressClass() + + selectionHighlightClass(module) + + unselectionHighlightClass(module) + + selectionClass(module) + + applicationClass(module) + + flavorClass() + + anchorPointClass(module) + + searchHighlightClass(module) ); }; diff --git a/src/main/webapp/app/module/primary/modules-patch/ModulesPatch.component.ts b/src/main/webapp/app/module/primary/modules-patch/ModulesPatch.component.ts index 6859c2a0d4b..09e4ec4cf5a 100644 --- a/src/main/webapp/app/module/primary/modules-patch/ModulesPatch.component.ts +++ b/src/main/webapp/app/module/primary/modules-patch/ModulesPatch.component.ts @@ -110,9 +110,9 @@ export default defineComponent({ const disabledApplication = (slug: string): boolean => { return ( - operationInProgress.value || - empty(folderPath.value) || - getModule(slug).properties.some(property => property.mandatory && isNotSet(property.key) && empty(property.defaultValue)) + operationInProgress.value + || empty(folderPath.value) + || getModule(slug).properties.some(property => property.mandatory && isNotSet(property.key) && empty(property.defaultValue)) ); }; diff --git a/src/test/resources/projects/react-app/index.css b/src/test/resources/projects/react-app/index.css index e69792553f0..ea7a848f468 100644 --- a/src/test/resources/projects/react-app/index.css +++ b/src/test/resources/projects/react-app/index.css @@ -1,7 +1,8 @@ body { margin: 0; - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', - 'Helvetica Neue', sans-serif; + font-family: + -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', + sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; }