Skip to content

fix: remove eslint.nodePath - W-19687929 #623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: remove eslint.nodePath - W-19687929 #623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/lightning-lsp-common/core.code-workspace
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion packages/lightning-lsp-common/src/__tests__/context.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
33 changes: 2 additions & 31 deletions packages/lightning-lsp-common/src/base-context.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -76,27 +75,6 @@ export const updateForceIgnoreFile = async (forceignorePath: string, addTsConfig
await fs.promises.writeFile(forceignorePath, forceignoreContent.trim());
};

const getESLintToolVersion = async (): Promise<string> => {
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<string> => {
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);

Expand Down Expand Up @@ -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<void> {
// 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');
Expand All @@ -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'),
Expand All @@ -449,17 +422,15 @@ 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'),
};
}
}

private async updateCoreCodeWorkspace(settings: any, eslintPath: string): Promise<void> {
private async updateCoreCodeWorkspace(settings: any): Promise<void> {
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'),
Expand Down
1 change: 0 additions & 1 deletion packages/lightning-lsp-common/src/resources/core/core.code-workspace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"**/target/**": true,
"**/bin/**": true
},
"eslint.nodePath": "${eslint_node_path}",
"perforce.maxBuffer": 10485760,
"perforce.editOnFileSave": true,
"perforce.editOnFileModified": true,
Expand Down
1 change: 0 additions & 1 deletion packages/lightning-lsp-common/src/resources/core/settings-core.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"**/target/**": true,
"**/bin/**": true
},
"eslint.nodePath": "${eslint_node_path}",
"perforce.maxBuffer": 10485760,
"perforce.editOnFileSave": true,
"perforce.editOnFileModified": true,
Expand Down
1 change: 0 additions & 1 deletion packages/lwc-language-server/core.code-workspace
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion test-workspaces/core-like-workspace/app/main/core/ui-force-components/core.code-workspace
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion test-workspaces/sfdx-workspace/core.code-workspace
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading