@html-validate/eslint-config 5.27.0 → 5.28.0

package/index.mjs

@@ -0,0 +1,37 @@
+import { fileURLToPath } from "node:url";
+import path from "node:path";
+import { FlatCompat } from "@eslint/eslintrc";
+import js from "@eslint/js";
+import legacyConfig from "./legacy.cjs";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+const compat = new FlatCompat({
+	baseDirectory: __dirname,
+	resolvePluginsRelativeTo: __dirname,
+	recommendedConfig: js.configs.recommended,
+});
+
+const migrated = compat.config(legacyConfig);
+
+for (const ruleset of migrated) {
+	if (ruleset.languageOptions && typeof ruleset.languageOptions.ecmaVersion === "string") {
+		ruleset.languageOptions.ecmaVersion = parseInt(ruleset.languageOptions.ecmaVersion, 10);
+	}
+}
+
+export default [
+	...migrated,
+	{
+		/* ensure cjs and mjs files are linted too */
+		files: ["*.cjs", "*.mjs"],
+	},
+	{
+		/* mjs requires file extension */
+		files: ["*.mjs"],
+		rules: {
+			"import/extensions": ["error", "always"],
+		},
+	},
+];

package/{index.js → legacy.cjs}

@@ -62,14 +62,18 @@ module.exports = {
 		"security/detect-object-injection": "off", // produces more noise than useful errors
 		"security/detect-unsafe-regex": "error",
 
+		"sonarjs/cognitive-complexity": "off", // already covered by native complexity rule
 		"sonarjs/deprecation": "off", // already covered by @typescript-eslint/no-deprecated
+		"sonarjs/function-return-type": "off", // overly broad and opinionated, let typescript deal with this
 		"sonarjs/no-empty-test-file": "off", // could be useful but it does not handle it.each or similar constructs thus yields more false positives than its worth */
 		"sonarjs/no-small-switch": "off", // prefer to use small switches when the intention is to all more cases later
+		"sonarjs/no-unused-vars": "off", // already coveredby @typescript-eslint/no-unused-vars
 		"sonarjs/unused-import": "off", // already covered by @typescript-eslint/no-unused-vars
 		"sonarjs/prefer-nullish-coalescing": "off", // requires typescript and strictNullChecks, which is sane, but we also use @typescript-eslint/prefer-nullish-coalescing so this becomes redundant
 		"sonarjs/prefer-single-boolean-return": "off", // prefer to use multiple returns even for booleans (looks better and can yield performance increase
 		"sonarjs/no-control-regex": "off", // already covered by no-control-regexp
 		"sonarjs/prefer-regexp-exec": "off", // prefer @typescript-eslint/prefer-regexp-exec
+		"sonarjs/todo-tag": "off", // want to be able to leave todo tasks
 
 		"consistent-this": "off",
 		"no-console": "warn",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@html-validate/eslint-config",
-  "version": "5.27.0",
+  "version": "5.28.0",
   "description": "Eslint sharable config used by the various HTML-validate packages",
   "keywords": [
     "eslint"
@@ -16,7 +16,7 @@
   },
   "license": "MIT",
   "author": "David Sveningsson <ext@sidvind.com>",
-  "main": "index.js",
+  "main": "index.mjs",
   "bin": {
     "eslint": "eslint.js",
     "eslint-config": "cli.js"
@@ -26,6 +26,8 @@
     "patch",
     "template",
     "*.js",
+    "*.cjs",
+    "*.mjs",
     "!*.spec.js"
   ],
   "scripts": {
@@ -36,6 +38,8 @@
     "prepublishOnly": "release-prepublish --retain-scripts"
   },
   "dependencies": {
+    "@eslint/eslintrc": "3.3.0",
+    "@eslint/js": "9.21.0",
     "@rushstack/eslint-patch": "1.10.5",
     "eslint": "8.57.1",
     "eslint-config-prettier": "10.1.1",
@@ -61,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "25203ddadbb314ab3d584080fb8022af039ebafd"
+  "gitHead": "943b446e6793777ceb880c87aed74551789b2c4a"
 }

package/template/eslint.config.mjs.njk

@@ -0,0 +1,82 @@
+/* This file is managed by @html-validate/eslint-config */
+/* Changes may be overwritten */
+
+{% if typeinfo %}
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+{% endif %}
+import defaultConfig from "@html-validate/eslint-config";
+{% if typescript %}
+import typescriptConfig from "@html-validate/eslint-config-typescript";
+{% endif %}
+{% if typeinfo %}
+import typescriptTypeinfoConfig from "@html-validate/eslint-config-typescript-typeinfo";
+{% endif %}
+{% if angularjs %}
+import angularjsConfig from "@html-validate/eslint-config-angularjs";
+{% endif %}
+{% if vue %}
+import vueConfig from "@html-validate/eslint-config-vue";
+{% endif %}
+{% if jest %}
+import jestConfig from "@html-validate/eslint-config-jest";
+{% endif %}
+{% if cypress %}
+import cypressConfig from "@html-validate/eslint-config-cypress";
+{% endif %}
+{% if protractor %}
+import protractorConfig from "@html-validate/eslint-config-protractor";
+{% endif %}
+
+{% if typeinfo %}
+const rootDir = path.dirname(fileURLToPath(import.meta.url));
+{% endif %}
+
+export default [
+	{
+		name: "Ignored files",
+		ignores: ["**/coverage/**", "**/dist/**", "**/node_modules/**", "**/public/assets/**", "**/temp/**"],
+	},
+	...defaultConfig,
+{% if typescript %}
+	...typescriptConfig,
+{% endif %}
+{% if typeinfo %}
+	{
+		name: "Typescript typeinfo configuration",
+		files: ["src/**/*.ts"],
+		ignores: ["src/**/*.spec.ts"],
+		languageOptions: {
+			parserOptions: {
+				tsconfigRootDir: {% if typeinfo.rootDir == "." %}rootDir{% else %}path.join(rootDir, "{{ typeinfo.rootDir }}"){% endif %},
+				project: ["{{ typeinfo.tsconfig }}"],
+			},
+		},
+	},
+	...typescriptTypeinfoConfig,
+{% endif %}
+{% if angularjs %}
+	...angularjsConfig,
+{% endif %}
+{% if vue %}
+	...vueConfig,
+{% endif %}
+{% if jest %}
+	...jestConfig,
+{% endif %}
+{% if cypress %}
+	...cypressConfig,
+{% endif %}
+{% if protractor %}
+	...protractorConfig,
+{% endif %}
+	{
+		/* files which should lint even if project isn't build yet */
+		files: ["./*.d.ts", "bin/*.js"],
+		rules: {
+			"import/export": "off",
+			"import/extensions": "off",
+			"import/no-unresolved": "off",
+		},
+	},
+];

package/template/eslintrc.js.njk

@@ -9,7 +9,7 @@ require("@html-validate/eslint-config/patch/modern-module-resolution");
 
 module.exports = {
 	root: true,
-	extends: ["@html-validate"],
+	extends: [require.resolve("@html-validate/eslint-config/legacy.cjs")],
 
 	overrides: [
 		{
@@ -19,7 +19,7 @@ module.exports = {
 {% if typescript %}
 		{
 			files: "*.ts",
-			extends: ["@html-validate/typescript"],
+			extends: [require.resolve("@html-validate/eslint-config-typescript/legacy.cjs")],
 		},
 {% endif %}
 {% if typeinfo %}
@@ -30,19 +30,19 @@ module.exports = {
 				tsconfigRootDir: {% if typeinfo.rootDir == "." %}__dirname{% else %}path.join(__dirname, "{{ typeinfo.rootDir }}"){% endif %},
 				project: ["{{ typeinfo.tsconfig }}"],
 			},
-			extends: ["@html-validate/typescript-typeinfo"],
+			extends: [require.resolve("@html-validate/eslint-config-typescript-typeinfo/legacy.cjs")],
 		},
 {% endif %}
 {% if angularjs %}
 		{
 			files: ["app/**/*.[jt]s", "src/**/*.[jt]s"],
-			extends: ["@html-validate/angularjs"],
+			extends: [require.resolve("@html-validate/eslint-config-angularjs/legacy.cjs")],
 		},
 {% endif %}
 {% if vue %}
 		{
 			files: "*.vue",
-			extends: ["@html-validate/vue"],
+			extends: [require.resolve("@html-validate/eslint-config-vue/legacy.cjs")],
 		},
 {% endif %}
 {% if jest %}
@@ -54,19 +54,19 @@ module.exports = {
 			},
 			{%- endif %}
 			excludedFiles: ["cypress/**", "tests/e2e/**"],
-			extends: ["@html-validate/jest"],
+			extends: [require.resolve("@html-validate/eslint-config-jest/legacy.cjs")],
 		},
 {% endif %}
 {% if cypress %}
 		{
 			files: ["cypress/**/*.spec.[jt]s", "cypress/**/*.cy.[jt]s"],
-			extends: ["@html-validate/cypress"],
+			extends: [require.resolve("@html-validate/eslint-config-cypress/legacy.cjs")],
 		},
 {% endif %}
 {% if protractor %}
 		{
 			files: "tests/e2e/**/*.spec.[jt]s",
-			extends: ["@html-validate/protractor"],
+			extends: [require.resolve("@html-validate/eslint-config-protractor/legacy.cjs")],
 		},
 {% endif %}
 		{