From 20c31ed6ca3687e4367bc5db3228b54302687a1f Mon Sep 17 00:00:00 2001 From: madhur310 Date: Tue, 23 Sep 2025 15:28:28 -0700 Subject: [PATCH] fix: remove eslint.nodePath --- .../lightning-lsp-common/core.code-workspace | 1 - .../src/__tests__/context.test.ts | 1 - .../lightning-lsp-common/src/base-context.ts | 33 ++----------------- .../resources/core/core.code-workspace.json | 1 - .../src/resources/core/settings-core.json | 1 - .../lwc-language-server/core.code-workspace | 1 - .../ui-force-components/core.code-workspace | 1 - .../sfdx-workspace/core.code-workspace | 1 - 8 files changed, 2 insertions(+), 38 deletions(-) diff --git a/packages/lightning-lsp-common/core.code-workspace b/packages/lightning-lsp-common/core.code-workspace index f7b39c31..27b86d22 100644 --- a/packages/lightning-lsp-common/core.code-workspace +++ b/packages/lightning-lsp-common/core.code-workspace @@ -26,7 +26,6 @@ "**/target/**": true, "**/bin/**": true }, - "eslint.nodePath": "/Users/bbuchanan/tools/eslint-tool/1.0.11/node_modules", "perforce.maxBuffer": 10485760, "perforce.editOnFileSave": true, "perforce.editOnFileModified": true, diff --git a/packages/lightning-lsp-common/src/__tests__/context.test.ts b/packages/lightning-lsp-common/src/__tests__/context.test.ts index acd315d9..e481b078 100644 --- a/packages/lightning-lsp-common/src/__tests__/context.test.ts +++ b/packages/lightning-lsp-common/src/__tests__/context.test.ts @@ -186,7 +186,6 @@ describe('WorkspaceContext', () => { const verifyCoreSettings = (settings: any): void => { expect(settings['files.watcherExclude']).toBeDefined(); - expect(settings['eslint.nodePath']).toBeDefined(); expect(settings['perforce.client']).toBe('username-localhost-blt'); expect(settings['perforce.user']).toBe('username'); expect(settings['perforce.port']).toBe('ssl:host:port'); diff --git a/packages/lightning-lsp-common/src/base-context.ts b/packages/lightning-lsp-common/src/base-context.ts index e8de2c79..c5206e17 100644 --- a/packages/lightning-lsp-common/src/base-context.ts +++ b/packages/lightning-lsp-common/src/base-context.ts @@ -6,7 +6,6 @@ */ import * as fs from 'fs'; -import { homedir } from 'os'; import * as path from 'path'; import { TextDocument } from 'vscode-languageserver'; import ejs from 'ejs'; @@ -76,27 +75,6 @@ export const updateForceIgnoreFile = async (forceignorePath: string, addTsConfig await fs.promises.writeFile(forceignorePath, forceignoreContent.trim()); }; -const getESLintToolVersion = async (): Promise => { - const eslintToolDir = path.join(homedir(), 'tools', 'eslint-tool'); - const packageJsonPath = path.join(eslintToolDir, 'package.json'); - if (fs.existsSync(packageJsonPath)) { - const packageJson = JSON.parse(await fs.promises.readFile(packageJsonPath, 'utf8')); - return packageJson.version; - } - return '1.0.3'; -}; - -const findCoreESLint = async (): Promise => { - const eslintToolDir = path.join(homedir(), 'tools', 'eslint-tool'); - if (!fs.existsSync(eslintToolDir)) { - console.warn('core eslint-tool not installed: ' + eslintToolDir); - // default - return '~/tools/eslint-tool/1.0.3/node_modules'; - } - const eslintToolVersion = await getESLintToolVersion(); - return path.join(eslintToolDir, eslintToolVersion, 'node_modules'); -}; - // exported for testing export const processTemplate = (template: string, data: any): string => ejs.render(template, data); @@ -416,15 +394,11 @@ export abstract class BaseWorkspaceContext { folders: this.workspaceRoots.map((root) => ({ path: root })), settings: {}, }; - const eslintPath = await findCoreESLint(); - await this.updateCoreCodeWorkspace(workspace.settings, eslintPath); + await this.updateCoreCodeWorkspace(workspace.settings); return workspace; } private async updateCoreSettings(settings: any): Promise { - // Get eslint path once to avoid multiple warnings - const eslintPath = await findCoreESLint(); - try { // Load core settings template const coreSettingsTemplate = await fs.promises.readFile(utils.getCoreResource('settings-core.json'), 'utf8'); @@ -435,7 +409,6 @@ export abstract class BaseWorkspaceContext { // Update eslint settings settings['eslint.workingDirectories'] = this.workspaceRoots; - settings['eslint.nodePath'] = eslintPath; settings['eslint.validate'] = ['javascript', 'typescript']; settings['eslint.options'] = { overrideConfigFile: path.join(this.workspaceRoots[0], '.eslintrc.json'), @@ -449,7 +422,6 @@ export abstract class BaseWorkspaceContext { console.error('updateCoreSettings: Error loading core settings template:', error); // Fallback to basic settings settings['eslint.workingDirectories'] = this.workspaceRoots; - settings['eslint.nodePath'] = eslintPath; settings['eslint.validate'] = ['javascript', 'typescript']; settings['eslint.options'] = { overrideConfigFile: path.join(this.workspaceRoots[0], '.eslintrc.json'), @@ -457,9 +429,8 @@ export abstract class BaseWorkspaceContext { } } - private async updateCoreCodeWorkspace(settings: any, eslintPath: string): Promise { + private async updateCoreCodeWorkspace(settings: any): Promise { settings['eslint.workingDirectories'] = this.workspaceRoots; - settings['eslint.nodePath'] = eslintPath; settings['eslint.validate'] = ['javascript', 'typescript']; settings['eslint.options'] = { overrideConfigFile: path.join(this.workspaceRoots[0], '.eslintrc.json'), diff --git a/packages/lightning-lsp-common/src/resources/core/core.code-workspace.json b/packages/lightning-lsp-common/src/resources/core/core.code-workspace.json index 25e071f5..820b7eab 100644 --- a/packages/lightning-lsp-common/src/resources/core/core.code-workspace.json +++ b/packages/lightning-lsp-common/src/resources/core/core.code-workspace.json @@ -26,7 +26,6 @@ "**/target/**": true, "**/bin/**": true }, - "eslint.nodePath": "${eslint_node_path}", "perforce.maxBuffer": 10485760, "perforce.editOnFileSave": true, "perforce.editOnFileModified": true, diff --git a/packages/lightning-lsp-common/src/resources/core/settings-core.json b/packages/lightning-lsp-common/src/resources/core/settings-core.json index 505aabf4..0cea7db9 100644 --- a/packages/lightning-lsp-common/src/resources/core/settings-core.json +++ b/packages/lightning-lsp-common/src/resources/core/settings-core.json @@ -20,7 +20,6 @@ "**/target/**": true, "**/bin/**": true }, - "eslint.nodePath": "${eslint_node_path}", "perforce.maxBuffer": 10485760, "perforce.editOnFileSave": true, "perforce.editOnFileModified": true, diff --git a/packages/lwc-language-server/core.code-workspace b/packages/lwc-language-server/core.code-workspace index f7b39c31..27b86d22 100644 --- a/packages/lwc-language-server/core.code-workspace +++ b/packages/lwc-language-server/core.code-workspace @@ -26,7 +26,6 @@ "**/target/**": true, "**/bin/**": true }, - "eslint.nodePath": "/Users/bbuchanan/tools/eslint-tool/1.0.11/node_modules", "perforce.maxBuffer": 10485760, "perforce.editOnFileSave": true, "perforce.editOnFileModified": true, diff --git a/test-workspaces/core-like-workspace/app/main/core/ui-force-components/core.code-workspace b/test-workspaces/core-like-workspace/app/main/core/ui-force-components/core.code-workspace index e5a4c5e0..bff61fe7 100644 --- a/test-workspaces/core-like-workspace/app/main/core/ui-force-components/core.code-workspace +++ b/test-workspaces/core-like-workspace/app/main/core/ui-force-components/core.code-workspace @@ -12,7 +12,6 @@ "test-workspaces/core-like-workspace/app/main/core/ui-force-components", "test-workspaces/core-like-workspace/app/main/core/ui-global-components" ], - "eslint.nodePath": "~/tools/eslint-tool/1.0.3/node_modules", "eslint.validate": [ "javascript", "typescript" diff --git a/test-workspaces/sfdx-workspace/core.code-workspace b/test-workspaces/sfdx-workspace/core.code-workspace index 20596e4e..d6c81901 100644 --- a/test-workspaces/sfdx-workspace/core.code-workspace +++ b/test-workspaces/sfdx-workspace/core.code-workspace @@ -8,7 +8,6 @@ "eslint.workingDirectories": [ "/Users/madhur.shrivastava/lightning-language-server/test-workspaces/sfdx-workspace" ], - "eslint.nodePath": "~/tools/eslint-tool/1.0.3/node_modules", "eslint.validate": [ "javascript", "typescript"