Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
45 changes: 5 additions & 40 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions packages/code-analyzer-eslint-engine/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@salesforce/code-analyzer-eslint-engine",
"description": "Plugin package that adds 'eslint' as an engine into Salesforce Code Analyzer",
"version": "0.37.0",
"version": "0.37.1-SNAPSHOT",
"author": "The Salesforce Code Analyzer Team",
"license": "BSD-3-Clause",
"homepage": "https://developer.salesforce.com/docs/platform/salesforce-code-analyzer/overview",
Expand All @@ -13,11 +13,10 @@
"main": "dist/index.js",
"types": "dist/index.d.ts",
"dependencies": {
"@eslint/css": "^0.14.1",
"@eslint/js": "^9.39.1",
"@lwc/eslint-plugin-lwc": "^3.3.0",
"@lwc/eslint-plugin-lwc-platform": "^6.3.0",
"@salesforce-ux/eslint-plugin-slds": "^1.0.6",
"@salesforce-ux/eslint-plugin-slds": "^1.0.7",
"@salesforce/code-analyzer-engine-api": "0.32.0",
"@salesforce/code-analyzer-eslint8-engine": "0.9.0",
"@salesforce/eslint-config-lwc": "^4.1.1",
Expand Down
11 changes: 1 addition & 10 deletions packages/code-analyzer-eslint-engine/src/base-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import eslintTs from "typescript-eslint";
import lwcEslintPluginLwcPlatform from "@lwc/eslint-plugin-lwc-platform";
import salesforceEslintConfigLwc from "@salesforce/eslint-config-lwc";
import sldsEslintPlugin from "@salesforce-ux/eslint-plugin-slds";
import eslintCss from "@eslint/css";
import {ESLintEngineConfig} from "./config";
import globals from "globals";

Expand Down Expand Up @@ -133,15 +132,7 @@ export class BaseConfigFactory {
return sldsEslintPlugin.configs['flat/recommended-css'].map((cssConfig: Linter.Config) => {
return {
...cssConfig,
files: this.engineConfig.file_extensions.css.map(ext => `**/*${ext}`),
// TODO: Remove this workaround once @salesforce-ux/eslint-plugin-slds v1.0.7+ is released.
// The SLDS plugin's CSS config references `language: "css/css"` but doesn't register the
// CSS language plugin in their plugins object. We must add it ourselves to avoid the error:
// "Could not find 'css' in plugin 'css'". See: https://github.com/salesforce-ux/slds-linter/issues/314
plugins: {
...cssConfig.plugins,
css: eslintCss
}
files: this.engineConfig.file_extensions.css.map(ext => `**/*${ext}`)
};
});
}
Expand Down