@averay/codeformat 0.1.5 → 0.1.6

package/eslint.config.js

@@ -1,64 +1,3 @@
-import typescriptPlugin from '@typescript-eslint/eslint-plugin';
-import typescriptParser from '@typescript-eslint/parser';
-import prettierConfig from 'eslint-config-prettier';
-import eslintCommentsPlugin from 'eslint-plugin-eslint-comments';
-import importPlugin from 'eslint-plugin-import';
-import promisePlugin from 'eslint-plugin-promise';
-import regexpPlugin from 'eslint-plugin-regexp';
-import sonarjsPlugin from 'eslint-plugin-sonarjs';
-import unicornPlugin from 'eslint-plugin-unicorn';
+import { makeEslintConfig } from './index.js';
 
-import convertWarnsToErrors from './lib/convertWarnsToErrors.js';
-import rulesetShared from './rulesets/ruleset-shared.js';
-import rulesetTypescript from './rulesets/ruleset-typescript.js';
-
-export const extensions = {
-  js: ['js', 'jsx', 'cjs', 'cjs', 'mjs', 'mjsx'],
-  ts: ['ts', 'tsx', 'cts', 'cts', 'mts', 'mtsx'],
-};
-
-export default [
-  // JavaScript & TypeScript
-  {
-    files: [`**/*.{${[...extensions.js, ...extensions.ts].join(',')}}`],
-    plugins: {
-      'eslint-comments': eslintCommentsPlugin,
-      import: importPlugin,
-      promise: promisePlugin,
-      regexp: regexpPlugin,
-      sonarjs: sonarjsPlugin,
-      unicorn: unicornPlugin,
-    },
-    languageOptions: {
-      parserOptions: {
-        ...importPlugin.configs.recommended.parserOptions,
-      },
-    },
-    settings: {
-      'import/parsers': {
-        espree: extensions.js.map((extension) => `.${extension}`),
-      },
-    },
-    rules: convertWarnsToErrors(rulesetShared),
-  },
-
-  // TypeScript
-  {
-    files: [`**/*.{${extensions.ts.join(',')}}`],
-    languageOptions: {
-      parser: typescriptParser,
-    },
-    plugins: {
-      '@typescript-eslint': typescriptPlugin,
-    },
-    settings: {
-      ...importPlugin.configs.typescript.settings,
-      'import/parsers': {
-        '@typescript-eslint/parser': extensions.ts.map((extension) => `.${extension}`),
-      },
-    },
-    rules: convertWarnsToErrors(rulesetTypescript),
-  },
-
-  prettierConfig,
-];
+export default makeEslintConfig();

package/index.js

@@ -1,15 +1,69 @@
-import eslintConfig, { extensions } from './eslint.config.js';
+import typescriptPlugin from '@typescript-eslint/eslint-plugin';
+import typescriptParser from '@typescript-eslint/parser';
+import prettierConfig from 'eslint-config-prettier';
+import eslintCommentsPlugin from 'eslint-plugin-eslint-comments';
+import importPlugin from 'eslint-plugin-import';
+import promisePlugin from 'eslint-plugin-promise';
+import regexpPlugin from 'eslint-plugin-regexp';
+import sonarjsPlugin from 'eslint-plugin-sonarjs';
+import unicornPlugin from 'eslint-plugin-unicorn';
 
-export { default as eslintConfig, extensions } from './eslint.config.js';
+import convertWarnsToErrors from './lib/convertWarnsToErrors.js';
+import rulesetShared from './rulesets/ruleset-shared.js';
+import rulesetTypescript from './rulesets/ruleset-typescript.js';
 
-export function makeEslintConfig(options) {
+export { default as globals } from 'globals';
+
+export const extensions = {
+  js: ['js', 'jsx', 'cjs', 'cjs', 'mjs', 'mjsx'],
+  ts: ['ts', 'tsx', 'cts', 'cts', 'mts', 'mtsx'],
+};
+
+export function makeEslintConfig(options = {}) {
   return [
-    ...eslintConfig,
+    // JavaScript & TypeScript
+    {
+      files: [`**/*.{${[...extensions.js, ...extensions.ts].join(',')}}`],
+      plugins: {
+        'eslint-comments': eslintCommentsPlugin,
+        import: importPlugin,
+        promise: promisePlugin,
+        regexp: regexpPlugin,
+        sonarjs: sonarjsPlugin,
+        unicorn: unicornPlugin,
+      },
+      languageOptions: {
+        parserOptions: {
+          ...importPlugin.configs.recommended.parserOptions,
+        },
+      },
+      settings: {
+        'import/parsers': {
+          espree: extensions.js.map((extension) => `.${extension}`),
+        },
+      },
+      rules: convertWarnsToErrors(rulesetShared),
+    },
+
+    // TypeScript
     {
       files: [`**/*.{${extensions.ts.join(',')}}`],
       languageOptions: {
+        parser: typescriptParser,
         parserOptions: { project: options.tsconfigPath },
       },
+      plugins: {
+        '@typescript-eslint': typescriptPlugin,
+      },
+      settings: {
+        ...importPlugin.configs.typescript.settings,
+        'import/parsers': {
+          '@typescript-eslint/parser': extensions.ts.map((extension) => `.${extension}`),
+        },
+      },
+      rules: convertWarnsToErrors(rulesetTypescript),
     },
+
+    prettierConfig,
   ];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@averay/codeformat",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "author": "Adam Averay (https://adamaveray.com.au/)",
   "homepage": "https://github.com/adamaveray/codeformat",
   "repository": {
@@ -43,6 +43,7 @@
     "eslint-plugin-regexp": "^1.12.0",
     "eslint-plugin-sonarjs": "^0.18.0",
     "eslint-plugin-unicorn": "^46.0.0",
+    "globals": "^13.20.0",
     "prettier": "^2.8.4"
   },
   "devDependencies": {

package/rulesets/ruleset-shared.js

@@ -238,7 +238,7 @@ export default {
   'import/no-self-import': 'error',
   'import/no-unresolved': ['error', { caseSensitiveStrict: true }],
   'import/no-unused-modules': 'error',
-  'import/no-useless-path-segments': ['error', { noUselessIndex: true }],
+  'import/no-useless-path-segments': 'error',
   'import/no-webpack-loader-syntax': 'error',
   'import/order': [
     'error',
@@ -250,7 +250,6 @@ export default {
     },
   ],
   'import/prefer-default-export': 'error',
-  'import/unambiguous': 'error',
 
   ...promisePlugin.configs.recommended.rules,
   'promise/no-multiple-resolved': 'error',
@@ -284,7 +283,9 @@ export default {
 
   ...unicornPlugin.configs.recommended.rules,
   'unicorn/filename-case': 'off',
+  'unicorn/no-null': 'off',
   'unicorn/no-unsafe-regex': 'error',
   'unicorn/prefer-event-target': 'error',
+  'unicorn/prevent-abbreviations': 'off',
   'unicorn/require-post-message-target-origin': 'error',
 };