fix: Jest global vars

jhipster · Sep 16, 2024 · 8422e4c · 8422e4c
1 parent 05014f2
commit 8422e4c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/generators/client/index.js b/generators/client/index.js
@@ -206,6 +206,10 @@ export default class extends ClientGenerator {
 						);
 					}
 				}
+				if (oldSvelteBlueprintVersion && lt(oldSvelteBlueprintVersion, '1.2.0')) {
+					this.removeFile(`.eslintrc.json`);
+					this.removeFile(`.eslintignore`);
+				}
 			},
 			async writingTemplateTask({ application }) {
 				await this.writeFiles({

diff --git a/generators/client/templates/eslint.config.js.ejs b/generators/client/templates/eslint.config.js.ejs
@@ -43,16 +43,15 @@ export default [{
             ...globals.browser,
             ...globals.node,
             ...cypress.environments.globals.globals,
-		<%_ if (!this.blueprintConfig.jest) { _%>
+		<%_ if (this.blueprintConfig.jest) { _%>
+		"jest": true,
+		<%_ } else { _%>
             vi: true,
 		<%_ } _%>
         },
 
         ecmaVersion: 2020,
         sourceType: "module",
-		<%_ if (this.blueprintConfig.jest) { _%>
-		"jest": true,
-		<%_ } _%>
     },
 
     rules: {