@fullstacksjs/eslint-config 12.1.0 → 12.1.1

package/cjs/index.js

@@ -97,17 +97,17 @@ function defineConfig(initOptions = {}, ...extend) {
   if (enableSort) rules.push((0, _perfectionist.default)(options));
   if (enableImport) rules.push((0, _imports.default)(options));
   if (enableTailwind) rules.push((0, _tailwind.default)(options));
-  if (enableTest) rules.push((0, _tests.default)(options));
   if (enableNode) rules.push((0, _node.default)(options));
-  if (enableJest) rules.push((0, _jest.default)(options));
-  if (enableVitest) rules.push((0, _vitest.default)(options));
-  if (enableCypress) rules.push((0, _cypress.default)(options));
   if (enableReact) rules.push((0, _react.default)(options));
   if (enableStorybook) rules.push((0, _storybook.default)(options));
   if (enableTypescript) rules.push((0, _typescript.default)(options));
-  if (enablePlaywright) rules.push((0, _playwright.default)(options));
-  if (enableNext && enableNext) rules.push((0, _next.default)(options));
+  if (enableNext) rules.push((0, _next.default)(options));
   if (enablePrettier) rules.push((0, _prettier.default)(options));
+  if (enableJest) rules.push((0, _jest.default)(options));
+  if (enableVitest) rules.push((0, _vitest.default)(options));
+  if (enableTest) rules.push((0, _tests.default)(options));
+  if (enableCypress) rules.push((0, _cypress.default)(options));
+  if (enablePlaywright) rules.push((0, _playwright.default)(options));
   if (Object.keys(eslintOptions).length > 0) rules.push(eslintOptions);
   if (extend) Array.prototype.push.apply(rules, extend);
   return (0, _config.defineConfig)(rules);

package/cjs/modules/typescript.js

@@ -13,6 +13,7 @@ var _namingConvention = require("../utils/naming-convention.js");
  * @return { import('eslint').Linter.Config }
  */
 function typescript(options = {}) {
+  const projectService = options.typescript && options.typescript.tsconfigRootDir && options.typescript.projectService;
   return {
     files: [_globs.globs.ts, _globs.globs.tsx],
     plugins: {
@@ -55,7 +56,7 @@ function typescript(options = {}) {
       '@typescript-eslint/member-naming': 'off',
       '@typescript-eslint/member-ordering': 'off',
       '@typescript-eslint/method-signature-style': ['warn', 'property'],
-      '@typescript-eslint/naming-convention': ['warn', ..._namingConvention.namingConvention, ...(options.typescript && options.typescript.projects ? [{
+      '@typescript-eslint/naming-convention': ['warn', ..._namingConvention.namingConvention, ...(projectService ? [{
         selector: 'variable',
         types: ['boolean'],
         format: ['PascalCase'],
@@ -160,7 +161,7 @@ function typescript(options = {}) {
       }],
       '@typescript-eslint/unified-signatures': 'error',
       '@typescript-eslint/key-spacing': 'off',
-      ...(0, _conditions.predicate)(options.typescript && options.typescript.projects, {
+      ...(0, _conditions.predicate)(projectService, {
         '@typescript-eslint/await-thenable': 'error',
         '@typescript-eslint/consistent-return': 'off',
         '@typescript-eslint/consistent-type-exports': 'warn',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fullstacksjs/eslint-config",
-  "version": "12.1.0",
+  "version": "12.1.1",
   "license": "MIT",
   "author": "fullstacks <fullstacksjs@gmail.com>",
   "description": "fullstacks eslint config",

package/src/index.mjs

@@ -92,17 +92,17 @@ export function defineConfig(initOptions = {}, ...extend) {
   if (enableSort) rules.push(perfectionist(options));
   if (enableImport) rules.push(imports(options));
   if (enableTailwind) rules.push(tailwind(options));
-  if (enableTest) rules.push(tests(options));
   if (enableNode) rules.push(node(options));
-  if (enableJest) rules.push(jest(options));
-  if (enableVitest) rules.push(vitest(options));
-  if (enableCypress) rules.push(cypress(options));
   if (enableReact) rules.push(react(options));
   if (enableStorybook) rules.push(storybook(options));
   if (enableTypescript) rules.push(typescript(options));
-  if (enablePlaywright) rules.push(playwright(options));
-  if (enableNext && enableNext) rules.push(next(options));
+  if (enableNext) rules.push(next(options));
   if (enablePrettier) rules.push(prettier(options));
+  if (enableJest) rules.push(jest(options));
+  if (enableVitest) rules.push(vitest(options));
+  if (enableTest) rules.push(tests(options));
+  if (enableCypress) rules.push(cypress(options));
+  if (enablePlaywright) rules.push(playwright(options));
 
   if (Object.keys(eslintOptions).length > 0) rules.push(eslintOptions);
   if (extend) Array.prototype.push.apply(rules, extend);

package/src/modules/typescript.mjs

@@ -9,6 +9,8 @@ import { namingConvention } from '../utils/naming-convention.mjs';
  * @return { import('eslint').Linter.Config }
  */
 function typescript(options = {}) {
+  const projectService = options.typescript && options.typescript.tsconfigRootDir && options.typescript.projectService;
+
   return {
     files: [globs.ts, globs.tsx],
     plugins: { '@typescript-eslint': plugin },
@@ -54,7 +56,7 @@ function typescript(options = {}) {
       '@typescript-eslint/naming-convention': [
         'warn',
         ...namingConvention,
-        ...(options.typescript && options.typescript.projects
+        ...(projectService
           ? [
               {
                 selector: 'variable',
@@ -142,7 +144,7 @@ function typescript(options = {}) {
       '@typescript-eslint/unified-signatures': 'error',
       '@typescript-eslint/key-spacing': 'off',
 
-      ...predicate(options.typescript && options.typescript.projects, {
+      ...predicate(projectService, {
         '@typescript-eslint/await-thenable': 'error',
         '@typescript-eslint/consistent-return': 'off',
         '@typescript-eslint/consistent-type-exports': 'warn',