npm - @ofk/eslint-config - Versions diffs - 0.2.7 → 0.3.0 - Mend

@ofk/eslint-config 0.2.7 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/index.d.mts CHANGED Viewed

@@ -1,12 +1,12 @@
-import * as typescript_eslint from 'typescript-eslint';
-import { ConfigWithExtends } from 'typescript-eslint';
+import * as eslint_config from 'eslint/config';
+import { ConfigWithExtends } from '@eslint/config-helpers';
 import { Linter } from 'eslint';
 declare function imports({ defaultExportFiles, node, typescript, ...config }: Pick<ConfigWithExtends, 'extends' | 'rules'> & {
     defaultExportFiles?: false | string[];
     node?: boolean;
     typescript?: boolean;
-}): typescript_eslint.FlatConfig.ConfigArray;
+}): eslint_config.Config[];
 declare function jsGlobals({ browser, es2021, es2022, es2023, es2024, es2025, node, }: {
     browser?: boolean;
@@ -16,20 +16,20 @@ declare function jsGlobals({ browser, es2021, es2022, es2023, es2024, es2025, no
     es2024?: boolean;
     es2025?: boolean;
     node?: boolean;
-}): typescript_eslint.FlatConfig.ConfigArray;
+}): eslint_config.Config[];
 declare function js({ globals, ...config }: Pick<ConfigWithExtends, 'extends' | 'rules'> & {
     globals?: false | Parameters<typeof jsGlobals>[0];
-}): typescript_eslint.FlatConfig.ConfigArray;
+}): eslint_config.Config[];
-declare function react(config: Pick<ConfigWithExtends, 'extends' | 'rules'>): typescript_eslint.FlatConfig.ConfigArray;
+declare function react(config: Pick<ConfigWithExtends, 'extends' | 'rules'>): eslint_config.Config[];
 declare function ts({ disableTypeChecked, parserOptions, strict, ...config }: Pick<ConfigWithExtends, 'extends' | 'rules'> & {
     disableTypeChecked?: boolean;
     parserOptions?: false | Linter.ParserOptions;
     strict?: boolean;
-}): typescript_eslint.FlatConfig.ConfigArray;
+}): eslint_config.Config[];
-declare function vitest(config: Pick<ConfigWithExtends, 'extends' | 'rules'>): typescript_eslint.FlatConfig.ConfigArray;
+declare function vitest(config: Pick<ConfigWithExtends, 'extends' | 'rules'>): eslint_config.Config[];
 declare function defineBaseConfig({ eslintComments: eslintCommentsOptions, ignores, imports: importsOptions, js: jsOptions, perfectionist: perfectionistOptions, settings, ts: tsOptions, unicorn: unicornOptions, unusedImports: unusedImportsOptions, vitest: vitestOptions, ...config }?: Pick<ConfigWithExtends, 'extends' | 'ignores' | 'rules' | 'settings'> & {
     eslintComments?: false | {};
@@ -40,17 +40,17 @@ declare function defineBaseConfig({ eslintComments: eslintCommentsOptions, ignor
     unicorn?: false | {};
     unusedImports?: false | {};
     vitest?: false | Parameters<typeof vitest>[0];
-}): typescript_eslint.FlatConfig.ConfigArray;
+}): eslint_config.Config[];
 declare function defineReactConfig({ jsxA11y: enabledJsxA11y, jsxRuntime: enabledJsxRuntime, reactHooks: enabledReactHooks, reactRefresh: enabledReactRefresh, ...reactOptions }?: Parameters<typeof react>[0] & {
     jsxA11y?: boolean;
     jsxRuntime?: boolean;
     reactHooks?: boolean;
     reactRefresh?: boolean;
-}): typescript_eslint.FlatConfig.ConfigArray;
+}): eslint_config.Config[];
 declare function defineConfig({ eslintComments: eslintCommentsOptions, imports: importsOptions, js: jsOptions, perfectionist: perfectionistOptions, react: reactOptions, ts: tsOptions, unusedImports: unusedImportsOptions, vitest: vitestOptions, ...config }?: Parameters<typeof defineBaseConfig>[0] & {
     react?: false | Parameters<typeof defineReactConfig>[0];
-}): typescript_eslint.FlatConfig.ConfigArray;
+}): eslint_config.Config[];
 export { defineConfig as default };

package/dist/index.d.ts CHANGED Viewed

@@ -1,12 +1,12 @@
-import * as typescript_eslint from 'typescript-eslint';
-import { ConfigWithExtends } from 'typescript-eslint';
+import * as eslint_config from 'eslint/config';
+import { ConfigWithExtends } from '@eslint/config-helpers';
 import { Linter } from 'eslint';
 declare function imports({ defaultExportFiles, node, typescript, ...config }: Pick<ConfigWithExtends, 'extends' | 'rules'> & {
     defaultExportFiles?: false | string[];
     node?: boolean;
     typescript?: boolean;
-}): typescript_eslint.FlatConfig.ConfigArray;
+}): eslint_config.Config[];
 declare function jsGlobals({ browser, es2021, es2022, es2023, es2024, es2025, node, }: {
     browser?: boolean;
@@ -16,20 +16,20 @@ declare function jsGlobals({ browser, es2021, es2022, es2023, es2024, es2025, no
     es2024?: boolean;
     es2025?: boolean;
     node?: boolean;
-}): typescript_eslint.FlatConfig.ConfigArray;
+}): eslint_config.Config[];
 declare function js({ globals, ...config }: Pick<ConfigWithExtends, 'extends' | 'rules'> & {
     globals?: false | Parameters<typeof jsGlobals>[0];
-}): typescript_eslint.FlatConfig.ConfigArray;
+}): eslint_config.Config[];
-declare function react(config: Pick<ConfigWithExtends, 'extends' | 'rules'>): typescript_eslint.FlatConfig.ConfigArray;
+declare function react(config: Pick<ConfigWithExtends, 'extends' | 'rules'>): eslint_config.Config[];
 declare function ts({ disableTypeChecked, parserOptions, strict, ...config }: Pick<ConfigWithExtends, 'extends' | 'rules'> & {
     disableTypeChecked?: boolean;
     parserOptions?: false | Linter.ParserOptions;
     strict?: boolean;
-}): typescript_eslint.FlatConfig.ConfigArray;
+}): eslint_config.Config[];
-declare function vitest(config: Pick<ConfigWithExtends, 'extends' | 'rules'>): typescript_eslint.FlatConfig.ConfigArray;
+declare function vitest(config: Pick<ConfigWithExtends, 'extends' | 'rules'>): eslint_config.Config[];
 declare function defineBaseConfig({ eslintComments: eslintCommentsOptions, ignores, imports: importsOptions, js: jsOptions, perfectionist: perfectionistOptions, settings, ts: tsOptions, unicorn: unicornOptions, unusedImports: unusedImportsOptions, vitest: vitestOptions, ...config }?: Pick<ConfigWithExtends, 'extends' | 'ignores' | 'rules' | 'settings'> & {
     eslintComments?: false | {};
@@ -40,17 +40,17 @@ declare function defineBaseConfig({ eslintComments: eslintCommentsOptions, ignor
     unicorn?: false | {};
     unusedImports?: false | {};
     vitest?: false | Parameters<typeof vitest>[0];
-}): typescript_eslint.FlatConfig.ConfigArray;
+}): eslint_config.Config[];
 declare function defineReactConfig({ jsxA11y: enabledJsxA11y, jsxRuntime: enabledJsxRuntime, reactHooks: enabledReactHooks, reactRefresh: enabledReactRefresh, ...reactOptions }?: Parameters<typeof react>[0] & {
     jsxA11y?: boolean;
     jsxRuntime?: boolean;
     reactHooks?: boolean;
     reactRefresh?: boolean;
-}): typescript_eslint.FlatConfig.ConfigArray;
+}): eslint_config.Config[];
 declare function defineConfig({ eslintComments: eslintCommentsOptions, imports: importsOptions, js: jsOptions, perfectionist: perfectionistOptions, react: reactOptions, ts: tsOptions, unusedImports: unusedImportsOptions, vitest: vitestOptions, ...config }?: Parameters<typeof defineBaseConfig>[0] & {
     react?: false | Parameters<typeof defineReactConfig>[0];
-}): typescript_eslint.FlatConfig.ConfigArray;
+}): eslint_config.Config[];
 export = defineConfig;

package/dist/index.js CHANGED Viewed

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }// src/base.ts
-var _typescripteslint = require('typescript-eslint'); var _typescripteslint2 = _interopRequireDefault(_typescripteslint);
+var _config = require('eslint/config');
 // src/configs/eslint-comments.ts
 var _configs = require('@eslint-community/eslint-plugin-eslint-comments/configs'); var _configs2 = _interopRequireDefault(_configs);
@@ -142,7 +142,7 @@ function imports({
   typescript = false,
   ...config
 }) {
-  return _typescripteslint2.default.config(
+  return _config.defineConfig.call(void 0,
     importsStrict,
     config,
     // allow default export in config files
@@ -208,8 +208,8 @@ function imports({
 // src/configs/js.ts
 var _js = require('@eslint/js'); var _js2 = _interopRequireDefault(_js);
 var _confusingbrowserglobals = require('confusing-browser-globals'); var _confusingbrowserglobals2 = _interopRequireDefault(_confusingbrowserglobals);
-var _globals = require('globals'); var _globals2 = _interopRequireDefault(_globals);
+var _globals = require('globals'); var _globals2 = _interopRequireDefault(_globals);
 var jsStrict = mergeRules(
   _js2.default.configs.recommended,
   {
@@ -447,7 +447,7 @@ function jsGlobals({
   es2025 = true,
   node = true
 }) {
-  return _typescripteslint2.default.config({
+  return _config.defineConfig.call(void 0, {
     languageOptions: {
       globals: {
         ...es2021 ? _globals2.default.es2021 : {},
@@ -465,7 +465,7 @@ function js({
   globals = {},
   ...config
 }) {
-  return _typescripteslint2.default.config(globals ? jsGlobals(globals) : {}, jsStrict, config);
+  return _config.defineConfig.call(void 0, globals ? jsGlobals(globals) : {}, jsStrict, config);
 }
 // src/configs/jsx-a11y.ts
@@ -691,7 +691,7 @@ var reactStrict = mergeRules(_nullishCoalesce(_eslintpluginreact2.default.config
   "react/void-dom-elements-no-children": "error"
 });
 function react(config) {
-  return _typescripteslint2.default.config(
+  return _config.defineConfig.call(void 0,
     {
       settings: {
         react: {
@@ -717,6 +717,7 @@ var reactRefreshStrict = mergeRules(_eslintpluginreactrefresh2.default.configs.v
 // src/configs/ts.ts
+var _typescripteslint = require('typescript-eslint'); var _typescripteslint2 = _interopRequireDefault(_typescripteslint);
 var jsStrictRules = _nullishCoalesce(jsStrict.rules, () => ( {}));
 var tsEslintOverrideRules = mergeRules(
   {},
@@ -796,12 +797,12 @@ var tsRecommendedOverride = mergeRules(
     // confilict with @typescript-eslint/consistent-type-imports
   }
 );
-var tsRecommended = _typescripteslint2.default.config(
+var tsRecommended = _config.defineConfig.call(void 0,
   _typescripteslint2.default.configs.recommended,
   tsEslintOverrideRules,
   tsRecommendedOverride
 );
-var tsStrict = _typescripteslint2.default.config(
+var tsStrict = _config.defineConfig.call(void 0,
   _typescripteslint2.default.configs.strictTypeChecked,
   _typescripteslint2.default.configs.stylisticTypeChecked,
   tsEslintOverrideRules,
@@ -860,7 +861,7 @@ function ts({
   strict = true,
   ...config
 }) {
-  return _typescripteslint2.default.config(
+  return _config.defineConfig.call(void 0,
     parserOptions ? {
       languageOptions: {
         parserOptions: {
@@ -974,7 +975,7 @@ var vitestStrict = mergeRules(
   }
 );
 function vitest(config) {
-  return _typescripteslint2.default.config({
+  return _config.defineConfig.call(void 0, {
     extends: [vitestStrict, config],
     files: ["tests/**", "*.test.*"]
   });
@@ -1079,7 +1080,7 @@ function defineBaseConfig({
   vitest: vitestOptions = {},
   ...config
 } = {}) {
-  return _typescripteslint2.default.config(
+  return _config.defineConfig.call(void 0,
     settings ? { settings } : {},
     ignores ? { ignores } : {},
     jsOptions ? js(jsOptions) : {},
@@ -1104,7 +1105,7 @@ function defineReactConfig({
   reactRefresh: enabledReactRefresh = true,
   ...reactOptions
 } = {}) {
-  return _typescripteslint2.default.config(
+  return _config.defineConfig.call(void 0,
     react({
       ...reactOptions,
       extends: [
@@ -1119,7 +1120,7 @@ function defineReactConfig({
 }
 // src/index.ts
-function defineConfig({
+function defineConfig8({
   eslintComments: eslintCommentsOptions,
   imports: importsOptions,
   js: jsOptions,
@@ -1144,6 +1145,6 @@ function defineConfig({
 }
-exports.default = defineConfig;
+exports.default = defineConfig8;
 module.exports = exports.default;

package/dist/index.mjs CHANGED Viewed

@@ -1,5 +1,5 @@
 // src/base.ts
-import pluginTs6 from "typescript-eslint";
+import { defineConfig as defineConfig6 } from "eslint/config";
 // src/configs/eslint-comments.ts
 import pluginEslintComments from "@eslint-community/eslint-plugin-eslint-comments/configs";
@@ -28,7 +28,7 @@ var eslintCommentsStrict = mergeRules(pluginEslintComments.recommended, {
 // src/configs/imports.ts
 import * as pluginImport from "eslint-plugin-import";
-import pluginTs from "typescript-eslint";
+import { defineConfig } from "eslint/config";
 var importsStrict = mergeRules(
   pluginImport.flatConfigs.recommended,
   // https://github.com/import-js/eslint-plugin-import?tab=readme-ov-file#helpful-warnings
@@ -142,7 +142,7 @@ function imports({
   typescript = false,
   ...config
 }) {
-  return pluginTs.config(
+  return defineConfig(
     importsStrict,
     config,
     // allow default export in config files
@@ -208,8 +208,8 @@ function imports({
 // src/configs/js.ts
 import pluginJs from "@eslint/js";
 import confusingBrowserGlobals from "confusing-browser-globals";
+import { defineConfig as defineConfig2 } from "eslint/config";
 import globalVariables from "globals";
-import pluginTs2 from "typescript-eslint";
 var jsStrict = mergeRules(
   pluginJs.configs.recommended,
   {
@@ -447,7 +447,7 @@ function jsGlobals({
   es2025 = true,
   node = true
 }) {
-  return pluginTs2.config({
+  return defineConfig2({
     languageOptions: {
       globals: {
         ...es2021 ? globalVariables.es2021 : {},
@@ -465,7 +465,7 @@ function js({
   globals = {},
   ...config
 }) {
-  return pluginTs2.config(globals ? jsGlobals(globals) : {}, jsStrict, config);
+  return defineConfig2(globals ? jsGlobals(globals) : {}, jsStrict, config);
 }
 // src/configs/jsx-a11y.ts
@@ -568,7 +568,7 @@ var perfectionistStrict = mergeRules(
 // src/configs/react.ts
 import pluginReact from "eslint-plugin-react";
-import pluginTs3 from "typescript-eslint";
+import { defineConfig as defineConfig3 } from "eslint/config";
 var reactStrict = mergeRules(pluginReact.configs.flat.recommended ?? {}, {
   "react/boolean-prop-naming": "off",
   "react/button-has-type": ["error", { button: true, reset: false, submit: true }],
@@ -691,7 +691,7 @@ var reactStrict = mergeRules(pluginReact.configs.flat.recommended ?? {}, {
   "react/void-dom-elements-no-children": "error"
 });
 function react(config) {
-  return pluginTs3.config(
+  return defineConfig3(
     {
       settings: {
         react: {
@@ -716,7 +716,8 @@ import pluginReactRefresh from "eslint-plugin-react-refresh";
 var reactRefreshStrict = mergeRules(pluginReactRefresh.configs.vite);
 // src/configs/ts.ts
-import pluginTs4 from "typescript-eslint";
+import { defineConfig as defineConfig4 } from "eslint/config";
+import pluginTs from "typescript-eslint";
 var jsStrictRules = jsStrict.rules ?? {};
 var tsEslintOverrideRules = mergeRules(
   {},
@@ -796,14 +797,14 @@ var tsRecommendedOverride = mergeRules(
     // confilict with @typescript-eslint/consistent-type-imports
   }
 );
-var tsRecommended = pluginTs4.config(
-  pluginTs4.configs.recommended,
+var tsRecommended = defineConfig4(
+  pluginTs.configs.recommended,
   tsEslintOverrideRules,
   tsRecommendedOverride
 );
-var tsStrict = pluginTs4.config(
-  pluginTs4.configs.strictTypeChecked,
-  pluginTs4.configs.stylisticTypeChecked,
+var tsStrict = defineConfig4(
+  pluginTs.configs.strictTypeChecked,
+  pluginTs.configs.stylisticTypeChecked,
   tsEslintOverrideRules,
   tsRecommendedOverride,
   {
@@ -860,7 +861,7 @@ function ts({
   strict = true,
   ...config
 }) {
-  return pluginTs4.config(
+  return defineConfig4(
     parserOptions ? {
       languageOptions: {
         parserOptions: {
@@ -872,7 +873,7 @@ function ts({
     strict ? tsStrict : tsRecommended,
     config,
     disableTypeChecked ? {
-      extends: [pluginTs4.configs.disableTypeChecked],
+      extends: [pluginTs.configs.disableTypeChecked],
       files: ["**/*.{js,jsx,mjs,cjs}"]
     } : {}
   );
@@ -895,7 +896,7 @@ var unusedImportsStrict = mergeRules({
 // src/configs/vitest.ts
 import pluginVitest from "@vitest/eslint-plugin";
-import pluginTs5 from "typescript-eslint";
+import { defineConfig as defineConfig5 } from "eslint/config";
 var vitestStrict = mergeRules(
   pluginVitest.configs.recommended,
   {
@@ -974,7 +975,7 @@ var vitestStrict = mergeRules(
   }
 );
 function vitest(config) {
-  return pluginTs5.config({
+  return defineConfig5({
     extends: [vitestStrict, config],
     files: ["tests/**", "*.test.*"]
   });
@@ -1079,7 +1080,7 @@ function defineBaseConfig({
   vitest: vitestOptions = {},
   ...config
 } = {}) {
-  return pluginTs6.config(
+  return defineConfig6(
     settings ? { settings } : {},
     ignores ? { ignores } : {},
     jsOptions ? js(jsOptions) : {},
@@ -1096,7 +1097,7 @@ function defineBaseConfig({
 // src/react.ts
 import pluginReact2 from "eslint-plugin-react";
-import pluginTs7 from "typescript-eslint";
+import { defineConfig as defineConfig7 } from "eslint/config";
 function defineReactConfig({
   jsxA11y: enabledJsxA11y = true,
   jsxRuntime: enabledJsxRuntime = true,
@@ -1104,7 +1105,7 @@ function defineReactConfig({
   reactRefresh: enabledReactRefresh = true,
   ...reactOptions
 } = {}) {
-  return pluginTs7.config(
+  return defineConfig7(
     react({
       ...reactOptions,
       extends: [
@@ -1119,7 +1120,7 @@ function defineReactConfig({
 }
 // src/index.ts
-function defineConfig({
+function defineConfig8({
   eslintComments: eslintCommentsOptions,
   imports: importsOptions,
   js: jsOptions,
@@ -1143,5 +1144,5 @@ function defineConfig({
   });
 }
 export {
-  defineConfig as default
+  defineConfig8 as default
 };

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@ofk/eslint-config",
-  "version": "0.2.7",
+  "version": "0.3.0",
   "description": "",
   "license": "MIT",
   "author": "ofk (https://github.com/ofk/)",
@@ -109,6 +109,7 @@
   },
   "devDependencies": {
     "@eslint-community/eslint-plugin-eslint-comments": "^4.5.0",
+    "@eslint/config-helpers": "^0.4.1",
     "@eslint/js": "^9.38.0",
     "@types/confusing-browser-globals": "^1.0.3",
     "@types/eslint-config-prettier": "^6.11.3",