fix: removed extra "}" from react version, fixed plugin loading check, now the dev-dep and dep checking is correct

Signed-off-by: prisis <d.bannert@anolilab.de>

Author: prisis

.prettierignore

@@ -4,7 +4,6 @@
 
 # Logs
 logs
-*.log
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
@@ -26,9 +25,6 @@ lib-cov
 coverage
 *.lcov
 
-# nyc test coverage
-.nyc_output
-
 # Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
 .grunt
 
@@ -45,12 +41,6 @@ build/Release
 node_modules/
 jspm_packages/
 
-# TypeScript v1 declaration files
-typings/
-
-# TypeScript cache
-*.tsbuildinfo
-
 # Optional npm cache directory
 .npm
 
@@ -69,18 +59,12 @@ typings/
 # Optional REPL history
 .node_repl_history
 
-# Output of 'npm pack'
-*.tgz
-
 # Yarn Integrity file
 .yarn-integrity
 
 # dotenv environment variables file
-.env
 .env.test
 
-# parcel-bundler cache (https://parceljs.org/)
-.cache
 
 # Next.js build output
 .next
@@ -89,12 +73,6 @@ typings/
 .nuxt
 dist
 
-# Gatsby files
-.cache/
-# Comment in the public line in if your project uses Gatsby and *not* Next.js
-# https://nextjs.org/blog/next-9-1#public-directory-support
-# public
-
 # vuepress build output
 .vuepress/dist
 
@@ -128,8 +106,6 @@ CHANGELOG.*
 
 # Package manager files
 pnpm-lock.yaml
-yarn.lock
-package-lock.json
 shrinkwrap.json
 
 # Build outputs

.prettierrc.cjs .prettierrc.js

@@ -60,7 +60,8 @@
         "postinstall": "is-ci || husky install",
         "lint:eslint": "cross-env NO_LOGS=true eslint -c ./.eslintrc.cjs --ext .js,.cjs,.mjs,.ts,.tsx ./packages --cache --cache-strategy content .",
         "lint:eslint:fix": "pnpm run lint:eslint --fix",
-        "lint:prettier": "prettier --config=.prettierrc.cjs --write '**/*.{js,jsx,cjs,tsx,ts,less,md,json}'",
+        "lint:prettier:root": "prettier --config=.prettierrc.js --check '*.{json,yml,yaml,js,ts}'",
+        "lint:prettier:root:fix": "prettier --config=.prettierrc.js --write '*.{json,yml,yaml,js,ts}'",
         "lint:staged": "lint-staged --verbose",
         "lint:styles": "stylelint",
         "lint:text": "textlint ./.github/ ./packages/** ./README.md ./UPGRADE.md --parallel --experimental --cache --dry-run",

package.json

@@ -1,6 +1,4 @@
-import {
- hasAnyDep, hasDependency, hasDevDependency, pkg,
-} from "@anolilab/package-json-utils";
+import { hasDependency, hasDevDependency, pkg } from "@anolilab/package-json-utils";
 
 import type { PackageRules } from "./types";
 
@@ -153,18 +151,21 @@ pluginConfig.forEach((plugin) => {
     const { dependencies, configName } = plugin;
 
     if (anolilabEslintConfig?.["plugin"]?.[configName] !== false) {
-        if (
-            hasAnyDep(dependencies, {
-                peerDeps: false,
-                strict: true,
-            })
-        ) {
+        const foundDependencies = [];
+
+        dependencies.forEach((dependency) => {
+            if (hasDependency(dependency) || hasDevDependency(dependency)) {
+                foundDependencies.push(dependency);
+            }
+        });
+
+        if (foundDependencies.length === dependencies.length) {
             loadedPlugins.push(configName);
         } else {
             possiblePlugins[configName] = {};
 
             dependencies.forEach((dependency) => {
-                (possiblePlugins[configName] as { [key: string]: boolean })[dependency] = hasDependency(dependency) ?? hasDevDependency(dependency);
+                (possiblePlugins[configName] as { [key: string]: boolean })[dependency] = hasDependency(dependency) || hasDevDependency(dependency);
             });
         }
     }

packages/eslint-config/src/config.ts

@@ -20,7 +20,7 @@ if (
         "@html-eslint/no-extra-spacing-attrs": "off",
         "@html-eslint/element-newline": "off",
         "@html-eslint/quotes": "off",
-    }
+    };
 }
 
 const config: Linter.Config = {
@@ -44,7 +44,7 @@ const config: Linter.Config = {
                 "@html-eslint/indent": hasPrettier ? "off" : ["error", (styleRules["indent"] as any[])[1]],
 
                 ...prettierRules,
-            }
+            },
         },
     ],
 };

packages/eslint-config/src/config/plugins/html.ts

@@ -97,7 +97,7 @@ const config: Linter.Config = {
                     // The default value is "detect". Automatic detection works by loading the entire React library
                     // into the linter's process, which is inefficient. It is recommended to specify the version
                     // explicity.
-                    version: reactDependency[0] ? `${reactDependency[0]}.${reactDependency[1] ?? "0"}}` : "detect",
+                    version: reactDependency[0] ? `${reactDependency[0]}.${reactDependency[1] ?? "0"}` : "detect",
                 },
                 propWrapperFunctions: [
                     "forbidExtraProps", // https://www.npmjs.com/package/airbnb-prop-types

packages/eslint-config/src/config/plugins/react.ts

@@ -37,7 +37,8 @@ const writeEslintRc = () => {
         if (tsConfig.compilerOptions?.target) {
             ecmaVersion = tsConfig.compilerOptions.target;
 
-            ecmaVersion = ecmaVersion.toLowerCase() === "es2022" || ecmaVersion.toLowerCase() === "esnext" ? "latest" : ecmaVersion.toLowerCase().replace("es", "");
+            ecmaVersion =
+                ecmaVersion.toLowerCase() === "es2022" || ecmaVersion.toLowerCase() === "esnext" ? "latest" : ecmaVersion.toLowerCase().replace("es", "");
 
             if (ecmaVersion !== "latest" && ecmaVersion !== "2022" && ecmaVersion !== "2021" && ecmaVersion !== "2021" && ecmaVersion !== "6") {
                 pluginExtends = `, "plugin:es/restrict-to-es${ecmaVersion}"`;

packages/eslint-config/src/postinstall.ts

@@ -1,6 +1,9 @@
 import type { Linter } from "eslint";
 
-const createConfig = (type: "all" | "javascript" | "js_and_ts" | "jsx_and_tsx" | "typescript", config: Omit<Linter.Config, "files|overrides">): Linter.Config => {
+const createConfig = (
+    type: "all" | "javascript" | "js_and_ts" | "jsx_and_tsx" | "typescript",
+    config: Omit<Linter.Config, "files|overrides">,
+): Linter.Config => {
     let files = ["*.js", "*.mjs", "*.cjs"];
 
     // eslint-disable-next-line default-case

packages/eslint-config/src/utils/create-config.ts

@@ -2,7 +2,7 @@ const noop = () => undefined;
 
 const consolePrefix = (prefix: string) =>
     // eslint-disable-next-line implicit-arrow-linebreak
-    (process.env["NO_LOGS"] ? noop : (message: string) => console.log(`${prefix}${message}`));
+    process.env["NO_LOGS"] ? noop : (message: string) => console.log(`${prefix}${message}`);
 
 export const consolePlugin = consolePrefix("  eslint-plugin-");
 export const consoleLog = consolePrefix("");

packages/eslint-config/src/utils/loggers.ts

@@ -15,7 +15,7 @@ const getPackageSources = (packageContent: NormalizedPackageJson): string[] => {
     }
 
     throw new TypeError("Please define a source or sources key in the package.json.");
-}
+};
 
 export const createConfig = (config?: Object & Options) =>
     baseDefineConfig((options: Options) => {
@@ -29,13 +29,7 @@ export const createConfig = (config?: Object & Options) =>
             entry: sources,
             treeshake: true,
             // react external https://github.com/vercel/turborepo/issues/360#issuecomment-1013885148
-            external: [
-                ...new Set([
-                    ...peerDependenciesKeys,
-                    ...Object.keys(packageJsonContent.optionalDependencies || {}),
-                    ...(config?.external || []),
-                ]),
-            ],
+            external: [...new Set([...peerDependenciesKeys, ...Object.keys(packageJsonContent.optionalDependencies || {}), ...(config?.external || [])])],
             format: ["esm", "cjs"],
             silent: !options.watch,
             minify: process.env["NODE_ENV"] === "production",
@@ -54,6 +48,10 @@ export const createConfig = (config?: Object & Options) =>
                 if (process.env["NODE_ENV"] !== "production" && peerDependenciesKeys.includes("react")) {
                     options.tsconfig = options.tsconfig?.replace("tsconfig.json", "tsconfig.dev.json");
                 }
+
+                options.logOverride = {
+                    "tsconfig.json": "silent",
+                }
             },
             ...config,
         };