Merge pull request #1981 from mshima/eslintv9

update to eslint v9
jhipster · Nov 15, 2024 · d3c97ae · d3c97ae
2 parents ac9479f + de71062
commit d3c97ae
Show file tree

Hide file tree

Showing 36 changed files with 221 additions and 118 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -9,9 +9,6 @@ updates:
     open-pull-requests-limit: 30
     versioning-strategy: increase
     groups:
-      typescript-eslint:
-        patterns:
-          - '@typescript-eslint/*'
       redux:
         patterns:
           - '@reduxjs/*'

diff --git a/.gitignore b/.gitignore
@@ -152,4 +152,5 @@ Desktop.ini
 /coverage/
 /.nyc_output/
 
+# added by generate-blueprint:
 generators/**/package-lock.json
diff --git a/generators/app/__snapshots__/generator.spec.mjs.snap b/generators/app/__snapshots__/generator.spec.mjs.snap
@@ -8,9 +8,6 @@ exports[`SubGenerator app of reactNative JHipster blueprint > run > should succe
   "../client/.editorconfig": {
     "stateCleared": "modified",
   },
-  "../client/.eslintrc.js": {
-    "stateCleared": "modified",
-  },
   "../client/.gitattributes": {
     "stateCleared": "modified",
   },
@@ -377,6 +374,9 @@ exports[`SubGenerator app of reactNative JHipster blueprint > run > should succe
   "../client/e2e/utils.js": {
     "stateCleared": "modified",
   },
+  "../client/eslint.config.mjs": {
+    "stateCleared": "modified",
+  },
   "../client/metro.config.js": {
     "stateCleared": "modified",
   },
@@ -505,9 +505,6 @@ exports[`SubGenerator app of reactNative JHipster blueprint > with custom reactN
   "../reactNative-app/.editorconfig": {
     "stateCleared": "modified",
   },
-  "../reactNative-app/.eslintrc.js": {
-    "stateCleared": "modified",
-  },
   "../reactNative-app/.gitattributes": {
     "stateCleared": "modified",
   },
@@ -874,6 +871,9 @@ exports[`SubGenerator app of reactNative JHipster blueprint > with custom reactN
   "../reactNative-app/e2e/utils.js": {
     "stateCleared": "modified",
   },
+  "../reactNative-app/eslint.config.mjs": {
+    "stateCleared": "modified",
+  },
   "../reactNative-app/metro.config.js": {
     "stateCleared": "modified",
   },

diff --git a/generators/react-native/__snapshots__/generator-entity.spec.mjs.snap b/generators/react-native/__snapshots__/generator-entity.spec.mjs.snap
@@ -8,9 +8,6 @@ exports[`SubGenerator reactNative of reactNative JHipster blueprint > Entity Tes
   ".editorconfig": {
     "stateCleared": "modified",
   },
-  ".eslintrc.js": {
-    "stateCleared": "modified",
-  },
   ".gitattributes": {
     "stateCleared": "modified",
   },
@@ -413,6 +410,9 @@ exports[`SubGenerator reactNative of reactNative JHipster blueprint > Entity Tes
   "e2e/utils.js": {
     "stateCleared": "modified",
   },
+  "eslint.config.mjs": {
+    "stateCleared": "modified",
+  },
   "metro.config.js": {
     "stateCleared": "modified",
   },
@@ -511,9 +511,6 @@ exports[`SubGenerator reactNative of reactNative JHipster blueprint > Entity Tes
   ".editorconfig": {
     "stateCleared": "modified",
   },
-  ".eslintrc.js": {
-    "stateCleared": "modified",
-  },
   ".gitattributes": {
     "stateCleared": "modified",
   },
@@ -889,6 +886,9 @@ exports[`SubGenerator reactNative of reactNative JHipster blueprint > Entity Tes
   "babel.config.js": {
     "stateCleared": "modified",
   },
+  "eslint.config.mjs": {
+    "stateCleared": "modified",
+  },
   "metro.config.js": {
     "stateCleared": "modified",
   },
@@ -990,9 +990,6 @@ exports[`SubGenerator reactNative of reactNative JHipster blueprint > Entity Tes
   ".editorconfig": {
     "stateCleared": "modified",
   },
-  ".eslintrc.js": {
-    "stateCleared": "modified",
-  },
   ".gitattributes": {
     "stateCleared": "modified",
   },
@@ -1398,6 +1395,9 @@ exports[`SubGenerator reactNative of reactNative JHipster blueprint > Entity Tes
   "e2e/utils.js": {
     "stateCleared": "modified",
   },
+  "eslint.config.mjs": {
+    "stateCleared": "modified",
+  },
   "metro.config.js": {
     "stateCleared": "modified",
   },

diff --git a/generators/react-native/__snapshots__/generator.spec.mjs.snap b/generators/react-native/__snapshots__/generator.spec.mjs.snap
@@ -5,9 +5,6 @@ exports[`SubGenerator reactNative of reactNative JHipster blueprint > WebSocket
   ".editorconfig": {
     "stateCleared": "modified",
   },
-  ".eslintrc.js": {
-    "stateCleared": "modified",
-  },
   ".gitattributes": {
     "stateCleared": "modified",
   },
@@ -350,6 +347,9 @@ exports[`SubGenerator reactNative of reactNative JHipster blueprint > WebSocket
   "babel.config.js": {
     "stateCleared": "modified",
   },
+  "eslint.config.mjs": {
+    "stateCleared": "modified",
+  },
   "metro.config.js": {
     "stateCleared": "modified",
   },
@@ -445,9 +445,6 @@ exports[`SubGenerator reactNative of reactNative JHipster blueprint > WebSocket
   ".editorconfig": {
     "stateCleared": "modified",
   },
-  ".eslintrc.js": {
-    "stateCleared": "modified",
-  },
   ".gitattributes": {
     "stateCleared": "modified",
   },
@@ -814,6 +811,9 @@ exports[`SubGenerator reactNative of reactNative JHipster blueprint > WebSocket
   "e2e/utils.js": {
     "stateCleared": "modified",
   },
+  "eslint.config.mjs": {
+    "stateCleared": "modified",
+  },
   "metro.config.js": {
     "stateCleared": "modified",
   },
@@ -906,9 +906,6 @@ exports[`SubGenerator reactNative of reactNative JHipster blueprint > WebSocket
   ".editorconfig": {
     "stateCleared": "modified",
   },
-  ".eslintrc.js": {
-    "stateCleared": "modified",
-  },
   ".gitattributes": {
     "stateCleared": "modified",
   },
@@ -1266,6 +1263,9 @@ exports[`SubGenerator reactNative of reactNative JHipster blueprint > WebSocket
   "babel.config.js": {
     "stateCleared": "modified",
   },
+  "eslint.config.mjs": {
+    "stateCleared": "modified",
+  },
   "metro.config.js": {
     "stateCleared": "modified",
   },
@@ -1370,9 +1370,6 @@ exports[`SubGenerator reactNative of reactNative JHipster blueprint > WebSocket
   ".editorconfig": {
     "stateCleared": "modified",
   },
-  ".eslintrc.js": {
-    "stateCleared": "modified",
-  },
   ".gitattributes": {
     "stateCleared": "modified",
   },
@@ -1757,6 +1754,9 @@ exports[`SubGenerator reactNative of reactNative JHipster blueprint > WebSocket
   "e2e/websockets/chat-screen.spec.js": {
     "stateCleared": "modified",
   },
+  "eslint.config.mjs": {
+    "stateCleared": "modified",
+  },
   "metro.config.js": {
     "stateCleared": "modified",
   },
@@ -1858,9 +1858,6 @@ exports[`SubGenerator reactNative of reactNative JHipster blueprint > WebSocket
   ".editorconfig": {
     "stateCleared": "modified",
   },
-  ".eslintrc.js": {
-    "stateCleared": "modified",
-  },
   ".gitattributes": {
     "stateCleared": "modified",
   },
@@ -2191,6 +2188,9 @@ exports[`SubGenerator reactNative of reactNative JHipster blueprint > WebSocket
   "babel.config.js": {
     "stateCleared": "modified",
   },
+  "eslint.config.mjs": {
+    "stateCleared": "modified",
+  },
   "metro.config.js": {
     "stateCleared": "modified",
   },
@@ -2277,9 +2277,6 @@ exports[`SubGenerator reactNative of reactNative JHipster blueprint > WebSocket
   ".editorconfig": {
     "stateCleared": "modified",
   },
-  ".eslintrc.js": {
-    "stateCleared": "modified",
-  },
   ".gitattributes": {
     "stateCleared": "modified",
   },
@@ -2628,6 +2625,9 @@ exports[`SubGenerator reactNative of reactNative JHipster blueprint > WebSocket
   "e2e/websockets/chat-screen.spec.js": {
     "stateCleared": "modified",
   },
+  "eslint.config.mjs": {
+    "stateCleared": "modified",
+  },
   "metro.config.js": {
     "stateCleared": "modified",
   },

diff --git a/generators/react-native/files.mjs b/generators/react-native/files.mjs
@@ -1,11 +1,16 @@
+const eslintConfigTemplate = sourceFile => ({
+  sourceFile,
+  destinationFile: ctx => sourceFile.replace('eslint.config.js', ctx.eslintConfigFile),
+});
+
 const files = {
   common: [
     {
       templates: [
         '.prettierignore.jhi.react-native',
-        '.eslintrc.js',
         '.gitattributes.jhi.react-native',
         '.gitignore.jhi.react-native',
+        eslintConfigTemplate('eslint.config.js.jhi.react-native'),
         'App.js',
         'app.json',
         'README.md',

diff --git a/generators/react-native/generator.mjs b/generators/react-native/generator.mjs
@@ -1,4 +1,5 @@
 import { relative } from 'node:path';
+import { readFile } from 'node:fs/promises';
 import chalk from 'chalk';
 import BaseApplicationGenerator from 'generator-jhipster/generators/base-application';
 import { generateTestEntity } from 'generator-jhipster/generators/client/support';
@@ -20,6 +21,11 @@ import {
 } from './support/index.js';
 
 export default class extends BaseApplicationGenerator {
+  /** @type {string | undefined} */
+  oldReactNativeBlueprintVersion;
+  /** @type { any } */
+  reactNativeBlueprintPackageJson;
+
   constructor(args, opts, features) {
     super(args, opts, { ...features, queueCommandTasks: true, sbsBlueprint: true, jhipster7Migration: true });
 
@@ -81,6 +87,17 @@ export default class extends BaseApplicationGenerator {
     await this.dependsOnJHipster('init');
   }
 
+  get [BaseApplicationGenerator.INITIALIZING]() {
+    return this.asInitializingTaskGroup({
+      async initializing({ control }) {
+        this.oldReactNativeBlueprintVersion =
+          (this.blueprintConfig.reactNativeBlueprintVersion ?? control.existingProject) ? '5.1.0' : undefined;
+        this.reactNativeBlueprintPackageJson = JSON.parse((await readFile(this.templatePath('../../../package.json'), 'utf-8')).toString());
+        this.blueprintConfig.reactNativeBlueprintVersion = this.reactNativeBlueprintPackageJson.version;
+      },
+    });
+  }
+
   get [BaseApplicationGenerator.CONFIGURING]() {
     return this.asConfiguringTaskGroup({
       loadConfigFromBackend() {
@@ -140,6 +157,13 @@ export default class extends BaseApplicationGenerator {
       },
     });
   }
+  get [BaseApplicationGenerator.LOADING]() {
+    return this.asLoadingTaskGroup({
+      loading({ application }) {
+        application.typescriptEslint = true;
+      },
+    });
+  }
 
   get [BaseApplicationGenerator.PREPARING]() {
     return this.asPreparingTaskGroup({
@@ -159,6 +183,18 @@ export default class extends BaseApplicationGenerator {
 
   get [BaseApplicationGenerator.WRITING]() {
     return this.asWritingTaskGroup({
+      async cleanup({ control }) {
+        if (control.existingProject) {
+          if (this.isVersionLessThan(this.oldReactNativeBlueprintVersion, '5.1.1')) {
+            this.removeFile('.eslintrc.js');
+          }
+        }
+        /*
+        control.cleanupFiles(this.oldReactNativeBlueprintVersion, {
+          '5.1.1': ['.eslintrc.js'],
+        })
+        */
+      },
       async writingTemplateTask({ application }) {
         await this.writeFiles({
           sections: files,
@@ -225,12 +261,6 @@ export default class extends BaseApplicationGenerator {
 
   get [BaseApplicationGenerator.POST_WRITING]() {
     return this.asPostWritingTaskGroup({
-      ignoreEslint9ConfigFile({ application }) {
-        const eslintConfigFile = this.env.sharedFs.get(this.destinationPath(application.eslintConfigFile));
-        if (eslintConfigFile) {
-          delete eslintConfigFile.state;
-        }
-      },
       async patchUriScheme({ application }) {
         this.editFile('app.json', content => {
           const appConfig = JSON.parse(content);

diff --git a/generators/react-native/support/patch-entity-api.js b/generators/react-native/support/patch-entity-api.js
@@ -18,7 +18,7 @@ function patchEntityApi(application, entity) {
   ${updateMethod}
   const delete${entity.entityNameCapitalized} = (${entity.entityInstance}Id) => api.delete('${microservicePath}api/${entity.entityApiUrl}/' + ${entity.entityInstance}Id);`;
 
-  let fixtureApiMethods = `  update${entity.entityNameCapitalized}: (${entity.entityInstance}) => {
+  let fixtureApiMethods = `  update${entity.entityNameCapitalized}: (_${entity.entityInstance}) => {
     return {
       ok: true,
       data: require('../../shared/fixtures/update-${entity.entityFileName}.json'),
@@ -30,13 +30,13 @@ function patchEntityApi(application, entity) {
       data: require('../../shared/fixtures/get-all-${entity.entityNamePluralizedAndSpinalCased}.json'),
     };
   },
-  get${entity.entityNameCapitalized}: (${entity.entityInstance}Id) => {
+  get${entity.entityNameCapitalized}: (_${entity.entityInstance}Id) => {
     return {
       ok: true,
       data: require('../../shared/fixtures/get-${entity.entityFileName}.json'),
     };
   },
-  delete${entity.entityNameCapitalized}: (${entity.entityInstance}Id) => {
+  delete${entity.entityNameCapitalized}: (_${entity.entityInstance}Id) => {
     return {
       ok: true,
     };

diff --git a/generators/react-native/templates/.eslintrc.js.ejs b/generators/react-native/templates/.eslintrc.js.ejs
diff --git a/generators/react-native/templates/app/modules/chat/chat.reducer.js.ejs b/generators/react-native/templates/app/modules/chat/chat.reducer.js.ejs
@@ -24,7 +24,7 @@ export const chatSuccess = (state, { chat }) => {
   return state.merge({ chat })
 }
 
-export const reset = state => {
+export const reset = _state => {
   return INITIAL_STATE
 }