chore(deps-dev): bump eslint-config-brightspace from 1.3.2 to 2.0.0 (#…

…5173) * chore(deps-dev): bump eslint-config-brightspace from 1.3.2 to 2.0.0 Bumps [eslint-config-brightspace](https://github.com/Brightspace/eslint-config-brightspace) from 1.3.2 to 2.0.0. - [Release notes](https://github.com/Brightspace/eslint-config-brightspace/releases) - [Commits](Brightspace/eslint-config-brightspace@v1.3.2...v2.0.0) --- updated-dependencies: - dependency-name: eslint-config-brightspace dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Use new shared configs * Appease Linter * Add package-lock.json --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: GZolla <[email protected]>
BrightspaceUI · Dec 6, 2024 · cf2eb06 · cf2eb06
1 parent 849e8b7
commit cf2eb06
Show file tree

Hide file tree

Showing 6 changed files with 650 additions and 418 deletions.
diff --git a/cli/empty-state-illustration-generator.js b/cli/empty-state-illustration-generator.js
@@ -49,7 +49,6 @@ function createSvgs(svgs) {
 		const destPath = path.join(outputPath, `${name}.js`);
 
 		const data = readFileSync(sourcePath);
-		/* eslint-disable-next-line prefer-template */
 		const output = '// auto-generated\n' + 'export const val = `' + data + '`;\n';
 
 		writeFileSync(destPath, output);

diff --git a/cli/icon-generator.js b/cli/icon-generator.js
@@ -53,7 +53,6 @@ function createSvg(category, name) {
 	}
 
 	const data = readFileSync(sourcePath);
-	/* eslint-disable-next-line prefer-template */
 	const output = '// auto-generated\n' + 'export const val = `' + data + '`;\n';
 
 	writeFileSync(destPath, output);
@@ -101,7 +100,6 @@ function createCatalogue(categories) {
 		} else if (category.name === 'tier3') {
 			size = 30;
 		}
-		/* eslint-disable-next-line prefer-template */
 		output += `## ${category.name}\n\n` + 'Size: `' + size + 'px` x `' + size + '`px\n\n';
 
 		const numCols = 3;

diff --git a/components/popover/test/popover.js b/components/popover/test/popover.js
@@ -163,6 +163,7 @@ class Popover extends PopoverMixin(LitElement) {
 	}
 
 	#handleContentScroll() {
+		// eslint-disable-next-line
 		console.log('handle content scroll');
 	}
 

diff --git a/eslint.config.js b/eslint.config.js
@@ -1,38 +1,21 @@
-import { fileURLToPath } from 'node:url';
-import { FlatCompat } from '@eslint/eslintrc';
-import { includeIgnoreFile } from '@eslint/compat';
-import js from '@eslint/js';
-import path from 'node:path';
+import { addExtensions, litConfig, nodeConfig, setDirectoryConfigs, testingConfig } from 'eslint-config-brightspace';
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-const compat = new FlatCompat({
-	baseDirectory: __dirname,
-	recommendedConfig: js.configs.recommended,
-	allConfig: js.configs.all
-});
-const gitignorePath = path.resolve(__dirname, '.gitignore');
-const files = ['**/*.js', '**/*.html'];
 export default [
-	includeIgnoreFile(gitignorePath),
-	...compat.extends('brightspace/lit-config').map(c => ({
-		...c,
-		files: c.files ?? files
-	})),
+	{
+		ignores: ['.vdiff']
+	},
+	...setDirectoryConfigs(
+		addExtensions(litConfig, ['.js', '.html']),
+		{
+			'**/test':testingConfig,
+			cli: nodeConfig
+		}
+	),
 	{
 		languageOptions: {
 			globals: {
 				Prism: false,
 			},
 		},
 	},
-	...compat.extends('brightspace/testing-config').map(config => ({
-		...config,
-		files: ['**/test/*'],
-	})),
-	...compat.extends('brightspace/node-config').map(config => ({
-		...config,
-		files: ['cli/*'],
-		rules: { 'no-console':0 }
-	})),
 ];
-Original file line number
+Diff line change
@@ Expand Up / @@ -163,6 +163,7 @@ class Popover extends PopoverMixin(LitElement) { @@
     	}
     	#handleContentScroll() {
+    		// eslint-disable-next-line
     		console.log('handle content scroll');
     	}
@@ Expand Down @@