From 11c88a6c97a8c79a4519999d7fd5182be40bc4e5 Mon Sep 17 00:00:00 2001
From: Ayush Pahwa <ayushpahwa96@gmail.com>
Date: Wed, 25 Sep 2024 21:34:59 +0530
Subject: [PATCH 1/8] create: feature flag for eslint migration

---
 app/client/src/ce/entities/FeatureFlag.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/client/src/ce/entities/FeatureFlag.ts b/app/client/src/ce/entities/FeatureFlag.ts
index 63d49c89f77f..cf4377d77516 100644
--- a/app/client/src/ce/entities/FeatureFlag.ts
+++ b/app/client/src/ce/entities/FeatureFlag.ts
@@ -30,6 +30,7 @@ export const FEATURE_FLAG = {
   release_actions_redesign_enabled: "release_actions_redesign_enabled",
   rollout_remove_feature_walkthrough_enabled:
     "rollout_remove_feature_walkthrough_enabled",
+  rollout_eslint_enabled: "rollout_eslint_enabled",
   release_drag_drop_building_blocks_enabled:
     "release_drag_drop_building_blocks_enabled",
   release_table_cell_label_value_enabled:
@@ -75,6 +76,7 @@ export const DEFAULT_FEATURE_FLAG_VALUE: FeatureFlags = {
   release_actions_redesign_enabled: false,
   rollout_remove_feature_walkthrough_enabled: true,
   rollout_js_enabled_one_click_binding_enabled: true,
+  rollout_eslint_enabled: false,
   rollout_side_by_side_enabled: false,
   ab_learnability_ease_of_initial_use_enabled: true,
   ab_learnability_discoverability_collapse_all_except_data_enabled: true,

From 8c4ad0f80e7a1ab97aee2c7f7d0bec085d0c58b8 Mon Sep 17 00:00:00 2001
From: Ayush Pahwa <ayushpahwa96@gmail.com>
Date: Wed, 25 Sep 2024 21:35:59 +0530
Subject: [PATCH 2/8] update: enum for linter engines

---
 app/client/src/plugins/Linting/constants.ts   |  5 +++++
 .../plugins/Linting/utils/getLintingErrors.ts | 19 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/app/client/src/plugins/Linting/constants.ts b/app/client/src/plugins/Linting/constants.ts
index 6ea64ce2633e..fe0bde300633 100644
--- a/app/client/src/plugins/Linting/constants.ts
+++ b/app/client/src/plugins/Linting/constants.ts
@@ -2,6 +2,11 @@ import { ECMA_VERSION } from "@shared/ast";
 import type { LintOptions } from "jshint";
 import isEntityFunction from "./utils/isEntityFunction";
 
+export const enum LINTER_VERSION {
+  "JSHINT" = "JSHint",
+  "ESLINT" = "ESLint",
+}
+
 export const lintOptions = (globalData: Record<string, boolean>) =>
   ({
     indent: 2,
diff --git a/app/client/src/plugins/Linting/utils/getLintingErrors.ts b/app/client/src/plugins/Linting/utils/getLintingErrors.ts
index eccbe7d0afc0..e8e6aaa48edc 100644
--- a/app/client/src/plugins/Linting/utils/getLintingErrors.ts
+++ b/app/client/src/plugins/Linting/utils/getLintingErrors.ts
@@ -25,6 +25,7 @@ import {
   IGNORED_LINT_ERRORS,
   lintOptions,
   SUPPORTED_WEB_APIS,
+  LINTER_VERSION,
 } from "../constants";
 import type { getLintingErrorsProps } from "../types";
 import { JSLibraries } from "workers/common/JSLibrary";
@@ -38,9 +39,24 @@ import { generate } from "astring";
 import getInvalidModuleInputsError from "ee/plugins/Linting/utils/getInvalidModuleInputsError";
 import { objectKeys } from "@appsmith/utils";
 import { profileFn } from "UITelemetry/generateWebWorkerTraces";
+import { WorkerEnv } from "workers/Evaluation/handlers/workerEnv";
+import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 
 const EvaluationScriptPositions: Record<string, Position> = {};
 
+function getLinterVersion() {
+  let linterVersion = LINTER_VERSION.JSHINT;
+
+  const flagValues = WorkerEnv.getFeatureFlags();
+  const flagName = FEATURE_FLAG.rollout_eslint_enabled;
+
+  if (!!flagValues && flagName in flagValues && flagValues[flagName]) {
+    linterVersion = LINTER_VERSION.ESLINT;
+  }
+
+  return linterVersion;
+}
+
 function getEvaluationScriptPosition(scriptType: EvaluationScriptType) {
   if (isEmpty(EvaluationScriptPositions)) {
     // We are computing position of <<script>> in our templates.
@@ -194,6 +210,7 @@ export default function getLintingErrors({
   scriptType,
   webworkerTelemetry,
 }: getLintingErrorsProps): LintError[] {
+  const linterVersion = getLinterVersion();
   const scriptPos = getEvaluationScriptPosition(scriptType);
   const lintingGlobalData = generateLintingGlobalData(data);
   const lintingOptions = lintOptions(lintingGlobalData);
@@ -202,7 +219,7 @@ export default function getLintingErrors({
     "Linter",
     // adding some metrics to compare the performance changes with eslint
     {
-      linter: "JSHint",
+      linter: linterVersion,
       linesOfCodeLinted: originalBinding.split("\n").length,
       codeSizeInChars: originalBinding.length,
     },

From 8cc1c3682e797b7bd43ced52d8bacde6cb7ef631 Mon Sep 17 00:00:00 2001
From: Ayush Pahwa <ayushpahwa96@gmail.com>
Date: Wed, 25 Sep 2024 21:55:37 +0530
Subject: [PATCH 3/8] update: refactored if check logic

---
 app/client/src/plugins/Linting/utils/getLintingErrors.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/client/src/plugins/Linting/utils/getLintingErrors.ts b/app/client/src/plugins/Linting/utils/getLintingErrors.ts
index e8e6aaa48edc..696ce46bb463 100644
--- a/app/client/src/plugins/Linting/utils/getLintingErrors.ts
+++ b/app/client/src/plugins/Linting/utils/getLintingErrors.ts
@@ -48,9 +48,8 @@ function getLinterVersion() {
   let linterVersion = LINTER_VERSION.JSHINT;
 
   const flagValues = WorkerEnv.getFeatureFlags();
-  const flagName = FEATURE_FLAG.rollout_eslint_enabled;
 
-  if (!!flagValues && flagName in flagValues && flagValues[flagName]) {
+  if (flagValues?.[FEATURE_FLAG.rollout_eslint_enabled]) {
     linterVersion = LINTER_VERSION.ESLINT;
   }
 

From 35c9441d8d941c200eb1f1324fd38571c66ce68b Mon Sep 17 00:00:00 2001
From: Ayush Pahwa <ayushpahwa96@gmail.com>
Date: Wed, 25 Sep 2024 22:18:16 +0530
Subject: [PATCH 4/8] update: remove const from enum declaration

---
 app/client/src/plugins/Linting/constants.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/client/src/plugins/Linting/constants.ts b/app/client/src/plugins/Linting/constants.ts
index fe0bde300633..fbdaabefa011 100644
--- a/app/client/src/plugins/Linting/constants.ts
+++ b/app/client/src/plugins/Linting/constants.ts
@@ -2,7 +2,7 @@ import { ECMA_VERSION } from "@shared/ast";
 import type { LintOptions } from "jshint";
 import isEntityFunction from "./utils/isEntityFunction";
 
-export const enum LINTER_VERSION {
+export enum LINTER_VERSION {
   "JSHINT" = "JSHint",
   "ESLINT" = "ESLint",
 }

From 18afebcb2395a57bf7670dc887a717bacd92015a Mon Sep 17 00:00:00 2001
From: Ayush Pahwa <ayushpahwa96@gmail.com>
Date: Mon, 11 Nov 2024 15:29:59 +0530
Subject: [PATCH 5/8] update: sync with release

---
 app/client/src/ce/entities/FeatureFlag.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/client/src/ce/entities/FeatureFlag.ts b/app/client/src/ce/entities/FeatureFlag.ts
index 624d7ef3dbb0..58365a9b5aeb 100644
--- a/app/client/src/ce/entities/FeatureFlag.ts
+++ b/app/client/src/ce/entities/FeatureFlag.ts
@@ -71,7 +71,6 @@ export const DEFAULT_FEATURE_FLAG_VALUE: FeatureFlags = {
   ab_appsmith_ai_query: false,
   release_actions_redesign_enabled: false,
   rollout_remove_feature_walkthrough_enabled: true,
-  rollout_js_enabled_one_click_binding_enabled: true,
   rollout_eslint_enabled: false,
   rollout_side_by_side_enabled: false,
   release_layout_conversion_enabled: false,

From a03edc20fc7fe8258045995f2d17a192e8617d5f Mon Sep 17 00:00:00 2001
From: Ayush Pahwa <ayushpahwa96@gmail.com>
Date: Mon, 11 Nov 2024 15:35:40 +0530
Subject: [PATCH 6/8] update: refactor var name

---
 app/client/src/plugins/Linting/constants.ts              | 2 +-
 app/client/src/plugins/Linting/utils/getLintingErrors.ts | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/client/src/plugins/Linting/constants.ts b/app/client/src/plugins/Linting/constants.ts
index fbdaabefa011..492f104f1725 100644
--- a/app/client/src/plugins/Linting/constants.ts
+++ b/app/client/src/plugins/Linting/constants.ts
@@ -2,7 +2,7 @@ import { ECMA_VERSION } from "@shared/ast";
 import type { LintOptions } from "jshint";
 import isEntityFunction from "./utils/isEntityFunction";
 
-export enum LINTER_VERSION {
+export enum LINTER_TYPE {
   "JSHINT" = "JSHint",
   "ESLINT" = "ESLint",
 }
diff --git a/app/client/src/plugins/Linting/utils/getLintingErrors.ts b/app/client/src/plugins/Linting/utils/getLintingErrors.ts
index 696ce46bb463..c172ce68c8e5 100644
--- a/app/client/src/plugins/Linting/utils/getLintingErrors.ts
+++ b/app/client/src/plugins/Linting/utils/getLintingErrors.ts
@@ -25,7 +25,7 @@ import {
   IGNORED_LINT_ERRORS,
   lintOptions,
   SUPPORTED_WEB_APIS,
-  LINTER_VERSION,
+  LINTER_TYPE,
 } from "../constants";
 import type { getLintingErrorsProps } from "../types";
 import { JSLibraries } from "workers/common/JSLibrary";
@@ -45,12 +45,12 @@ import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 const EvaluationScriptPositions: Record<string, Position> = {};
 
 function getLinterVersion() {
-  let linterVersion = LINTER_VERSION.JSHINT;
+  let linterVersion = LINTER_TYPE.JSHINT;
 
   const flagValues = WorkerEnv.getFeatureFlags();
 
   if (flagValues?.[FEATURE_FLAG.rollout_eslint_enabled]) {
-    linterVersion = LINTER_VERSION.ESLINT;
+    linterVersion = LINTER_TYPE.ESLINT;
   }
 
   return linterVersion;

From 00d851934435819a9ec116041327443ffba3a0f3 Mon Sep 17 00:00:00 2001
From: Ayush Pahwa <ayushpahwa96@gmail.com>
Date: Tue, 12 Nov 2024 15:58:02 +0530
Subject: [PATCH 7/8] update: refactored variable name

---
 app/client/src/plugins/Linting/utils/getLintingErrors.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/client/src/plugins/Linting/utils/getLintingErrors.ts b/app/client/src/plugins/Linting/utils/getLintingErrors.ts
index c172ce68c8e5..08a17a5a346a 100644
--- a/app/client/src/plugins/Linting/utils/getLintingErrors.ts
+++ b/app/client/src/plugins/Linting/utils/getLintingErrors.ts
@@ -44,7 +44,7 @@ import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 
 const EvaluationScriptPositions: Record<string, Position> = {};
 
-function getLinterVersion() {
+function getLinterType() {
   let linterVersion = LINTER_TYPE.JSHINT;
 
   const flagValues = WorkerEnv.getFeatureFlags();
@@ -209,7 +209,7 @@ export default function getLintingErrors({
   scriptType,
   webworkerTelemetry,
 }: getLintingErrorsProps): LintError[] {
-  const linterVersion = getLinterVersion();
+  const linterVersion = getLinterType();
   const scriptPos = getEvaluationScriptPosition(scriptType);
   const lintingGlobalData = generateLintingGlobalData(data);
   const lintingOptions = lintOptions(lintingGlobalData);

From ac773e1ccb4a3e67159ac21e4abc757f5f959693 Mon Sep 17 00:00:00 2001
From: Ayush Pahwa <ayushpahwa96@gmail.com>
Date: Tue, 12 Nov 2024 16:01:27 +0530
Subject: [PATCH 8/8] update: refactor var name

---
 .../src/plugins/Linting/utils/getLintingErrors.ts      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/client/src/plugins/Linting/utils/getLintingErrors.ts b/app/client/src/plugins/Linting/utils/getLintingErrors.ts
index 08a17a5a346a..9a01b0b8ded5 100644
--- a/app/client/src/plugins/Linting/utils/getLintingErrors.ts
+++ b/app/client/src/plugins/Linting/utils/getLintingErrors.ts
@@ -45,15 +45,15 @@ import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 const EvaluationScriptPositions: Record<string, Position> = {};
 
 function getLinterType() {
-  let linterVersion = LINTER_TYPE.JSHINT;
+  let linterType = LINTER_TYPE.JSHINT;
 
   const flagValues = WorkerEnv.getFeatureFlags();
 
   if (flagValues?.[FEATURE_FLAG.rollout_eslint_enabled]) {
-    linterVersion = LINTER_TYPE.ESLINT;
+    linterType = LINTER_TYPE.ESLINT;
   }
 
-  return linterVersion;
+  return linterType;
 }
 
 function getEvaluationScriptPosition(scriptType: EvaluationScriptType) {
@@ -209,7 +209,7 @@ export default function getLintingErrors({
   scriptType,
   webworkerTelemetry,
 }: getLintingErrorsProps): LintError[] {
-  const linterVersion = getLinterType();
+  const linterType = getLinterType();
   const scriptPos = getEvaluationScriptPosition(scriptType);
   const lintingGlobalData = generateLintingGlobalData(data);
   const lintingOptions = lintOptions(lintingGlobalData);
@@ -218,7 +218,7 @@ export default function getLintingErrors({
     "Linter",
     // adding some metrics to compare the performance changes with eslint
     {
-      linter: linterVersion,
+      linter: linterType,
       linesOfCodeLinted: originalBinding.split("\n").length,
       codeSizeInChars: originalBinding.length,
     },