Skip to content

Commit 20c31ed

Browse files
committed
fix: remove eslint.nodePath
1 parent d27d8ea commit 20c31ed

File tree

8 files changed

+2
-38
lines changed

8 files changed

+2
-38
lines changed

packages/lightning-lsp-common/core.code-workspace

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
"**/target/**": true,
2727
"**/bin/**": true
2828
},
29-
"eslint.nodePath": "/Users/bbuchanan/tools/eslint-tool/1.0.11/node_modules",
3029
"perforce.maxBuffer": 10485760,
3130
"perforce.editOnFileSave": true,
3231
"perforce.editOnFileModified": true,

packages/lightning-lsp-common/src/__tests__/context.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ describe('WorkspaceContext', () => {
186186

187187
const verifyCoreSettings = (settings: any): void => {
188188
expect(settings['files.watcherExclude']).toBeDefined();
189-
expect(settings['eslint.nodePath']).toBeDefined();
190189
expect(settings['perforce.client']).toBe('username-localhost-blt');
191190
expect(settings['perforce.user']).toBe('username');
192191
expect(settings['perforce.port']).toBe('ssl:host:port');

packages/lightning-lsp-common/src/base-context.ts

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*/
77

88
import * as fs from 'fs';
9-
import { homedir } from 'os';
109
import * as path from 'path';
1110
import { TextDocument } from 'vscode-languageserver';
1211
import ejs from 'ejs';
@@ -76,27 +75,6 @@ export const updateForceIgnoreFile = async (forceignorePath: string, addTsConfig
7675
await fs.promises.writeFile(forceignorePath, forceignoreContent.trim());
7776
};
7877

79-
const getESLintToolVersion = async (): Promise<string> => {
80-
const eslintToolDir = path.join(homedir(), 'tools', 'eslint-tool');
81-
const packageJsonPath = path.join(eslintToolDir, 'package.json');
82-
if (fs.existsSync(packageJsonPath)) {
83-
const packageJson = JSON.parse(await fs.promises.readFile(packageJsonPath, 'utf8'));
84-
return packageJson.version;
85-
}
86-
return '1.0.3';
87-
};
88-
89-
const findCoreESLint = async (): Promise<string> => {
90-
const eslintToolDir = path.join(homedir(), 'tools', 'eslint-tool');
91-
if (!fs.existsSync(eslintToolDir)) {
92-
console.warn('core eslint-tool not installed: ' + eslintToolDir);
93-
// default
94-
return '~/tools/eslint-tool/1.0.3/node_modules';
95-
}
96-
const eslintToolVersion = await getESLintToolVersion();
97-
return path.join(eslintToolDir, eslintToolVersion, 'node_modules');
98-
};
99-
10078
// exported for testing
10179
export const processTemplate = (template: string, data: any): string => ejs.render(template, data);
10280

@@ -416,15 +394,11 @@ export abstract class BaseWorkspaceContext {
416394
folders: this.workspaceRoots.map((root) => ({ path: root })),
417395
settings: {},
418396
};
419-
const eslintPath = await findCoreESLint();
420-
await this.updateCoreCodeWorkspace(workspace.settings, eslintPath);
397+
await this.updateCoreCodeWorkspace(workspace.settings);
421398
return workspace;
422399
}
423400

424401
private async updateCoreSettings(settings: any): Promise<void> {
425-
// Get eslint path once to avoid multiple warnings
426-
const eslintPath = await findCoreESLint();
427-
428402
try {
429403
// Load core settings template
430404
const coreSettingsTemplate = await fs.promises.readFile(utils.getCoreResource('settings-core.json'), 'utf8');
@@ -435,7 +409,6 @@ export abstract class BaseWorkspaceContext {
435409

436410
// Update eslint settings
437411
settings['eslint.workingDirectories'] = this.workspaceRoots;
438-
settings['eslint.nodePath'] = eslintPath;
439412
settings['eslint.validate'] = ['javascript', 'typescript'];
440413
settings['eslint.options'] = {
441414
overrideConfigFile: path.join(this.workspaceRoots[0], '.eslintrc.json'),
@@ -449,17 +422,15 @@ export abstract class BaseWorkspaceContext {
449422
console.error('updateCoreSettings: Error loading core settings template:', error);
450423
// Fallback to basic settings
451424
settings['eslint.workingDirectories'] = this.workspaceRoots;
452-
settings['eslint.nodePath'] = eslintPath;
453425
settings['eslint.validate'] = ['javascript', 'typescript'];
454426
settings['eslint.options'] = {
455427
overrideConfigFile: path.join(this.workspaceRoots[0], '.eslintrc.json'),
456428
};
457429
}
458430
}
459431

460-
private async updateCoreCodeWorkspace(settings: any, eslintPath: string): Promise<void> {
432+
private async updateCoreCodeWorkspace(settings: any): Promise<void> {
461433
settings['eslint.workingDirectories'] = this.workspaceRoots;
462-
settings['eslint.nodePath'] = eslintPath;
463434
settings['eslint.validate'] = ['javascript', 'typescript'];
464435
settings['eslint.options'] = {
465436
overrideConfigFile: path.join(this.workspaceRoots[0], '.eslintrc.json'),

packages/lightning-lsp-common/src/resources/core/core.code-workspace.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
"**/target/**": true,
2727
"**/bin/**": true
2828
},
29-
"eslint.nodePath": "${eslint_node_path}",
3029
"perforce.maxBuffer": 10485760,
3130
"perforce.editOnFileSave": true,
3231
"perforce.editOnFileModified": true,

packages/lightning-lsp-common/src/resources/core/settings-core.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
"**/target/**": true,
2121
"**/bin/**": true
2222
},
23-
"eslint.nodePath": "${eslint_node_path}",
2423
"perforce.maxBuffer": 10485760,
2524
"perforce.editOnFileSave": true,
2625
"perforce.editOnFileModified": true,

packages/lwc-language-server/core.code-workspace

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
"**/target/**": true,
2727
"**/bin/**": true
2828
},
29-
"eslint.nodePath": "/Users/bbuchanan/tools/eslint-tool/1.0.11/node_modules",
3029
"perforce.maxBuffer": 10485760,
3130
"perforce.editOnFileSave": true,
3231
"perforce.editOnFileModified": true,

test-workspaces/core-like-workspace/app/main/core/ui-force-components/core.code-workspace

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
"test-workspaces/core-like-workspace/app/main/core/ui-force-components",
1313
"test-workspaces/core-like-workspace/app/main/core/ui-global-components"
1414
],
15-
"eslint.nodePath": "~/tools/eslint-tool/1.0.3/node_modules",
1615
"eslint.validate": [
1716
"javascript",
1817
"typescript"

test-workspaces/sfdx-workspace/core.code-workspace

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"eslint.workingDirectories": [
99
"/Users/madhur.shrivastava/lightning-language-server/test-workspaces/sfdx-workspace"
1010
],
11-
"eslint.nodePath": "~/tools/eslint-tool/1.0.3/node_modules",
1211
"eslint.validate": [
1312
"javascript",
1413
"typescript"

0 commit comments

Comments
 (0)