@pengzhanbo/eslint-config-solid 1.7.0 → 1.8.0

package/README.md

@@ -15,6 +15,7 @@ pnpm add @pengzhanbo/eslint-config-solid
 ## Configuration
 
 `eslint.config.js`
+
 ```js
 import eslintConfig from '@pengzhanbo/eslint-config-solid'
 
@@ -22,6 +23,7 @@ export default eslintConfig()
 ```
 
 ## 相关资源
+
 - [@pengzhanbo/eslint-config](https://github.com/pengzhanbo/configs/tree/main/packages/eslint-config)
 - [@pengzhanbo/eslint-config-vue](https://github.com/pengzhanbo/configs/tree/main/packages/eslint-config-vue)
 - [@pengzhanbo/eslint-config-react](https://github.com/pengzhanbo/configs/tree/main/packages/eslint-config-react)

package/dist/index.d.ts

@@ -1,16 +1,6 @@
-import * as _pengzhanbo_eslint_config from '@pengzhanbo/eslint-config';
-import { OptionsOverrides, OptionsHasTypeScript, OptionsStylistic, OptionsFiles, FlatConfigItem, PresetItem } from '@pengzhanbo/eslint-config';
+import { EslintConfigOptions, UserConfig, EslintConfigReturn } from '@pengzhanbo/eslint-config';
 export * from '@pengzhanbo/eslint-config';
 
-declare module '@pengzhanbo/eslint-config' {
-    interface OptionsFrameworkExtract {
-        solid?: OptionsOverrides;
-    }
-}
-declare const eslintSolidConfig: _pengzhanbo_eslint_config.EslintFlatConfigFunction;
+declare function solidEslintFlatConfig(options: EslintConfigOptions, ...userConfigs: UserConfig[]): EslintConfigReturn;
 
-declare function solid(options?: OptionsHasTypeScript & OptionsOverrides & OptionsStylistic & OptionsFiles): Promise<FlatConfigItem[]>;
-
-declare const solidPreset: PresetItem;
-
-export { eslintSolidConfig as default, solid, solidPreset };
+export { solidEslintFlatConfig as default, solidEslintFlatConfig };

package/dist/index.js

@@ -1,63 +1,16 @@
-// src/factory.ts
-import { createConfig } from "@pengzhanbo/eslint-config";
-
-// src/preset.ts
-import { getOverrides } from "@pengzhanbo/eslint-config";
-
-// src/solid.ts
-import { GLOB_JSX, GLOB_TSX, interopDefault } from "@pengzhanbo/eslint-config";
-async function solid(options = {}) {
-  const {
-    files = [GLOB_JSX, GLOB_TSX],
-    overrides = {},
-    typescript = true
-  } = options;
-  const pluginSolid = await interopDefault(import("eslint-plugin-solid"));
-  const rules = typescript ? pluginSolid.configs.typescript.rules : pluginSolid.configs.recommended.rules;
-  return [
-    {
-      name: "config:solid:setup",
-      plugins: {
-        solid: pluginSolid
-      }
-    },
-    {
-      files,
-      languageOptions: {
-        parserOptions: {
-          ecmaFeatures: {
-            jsx: true
-          }
-        }
-      },
-      name: "config:solid:rules",
-      rules: {
-        ...rules,
-        "solid/components-return-once": "error",
-        "solid/style-prop": "error",
-        "solid/prefer-for": "off",
-        ...overrides
-      }
-    }
-  ];
-}
-
-// src/preset.ts
-var solidPreset = (options) => {
-  return [solid({
-    overrides: getOverrides(options, "solid"),
-    typescript: !!options.typescript
-  })];
-};
-
-// src/factory.ts
-var eslintSolidConfig = createConfig(solidPreset);
-
 // src/index.ts
+import {
+  eslintFlatConfig as basicConfig
+} from "@pengzhanbo/eslint-config";
 export * from "@pengzhanbo/eslint-config";
-var src_default = eslintSolidConfig;
+function solidEslintFlatConfig(options, ...userConfigs) {
+  return basicConfig({
+    solid: true,
+    ...options
+  }, ...userConfigs);
+}
+var src_default = solidEslintFlatConfig;
 export {
   src_default as default,
-  solid,
-  solidPreset
+  solidEslintFlatConfig
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pengzhanbo/eslint-config-solid",
   "type": "module",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "author": "pengzhanbo <q942450674@outlook.com> (https://github/pengzhanbo/)",
   "license": "MIT",
   "homepage": "https://github.com/pengzhanbo/configs#readme",
@@ -19,10 +19,6 @@
       "import": {
         "types": "./dist/index.d.ts",
         "default": "./dist/index.js"
-      },
-      "require": {
-        "types": "./dist/index.d.cts",
-        "default": "./dist/index.cjs"
       }
     },
     "./package.json": "./package.json"
@@ -35,29 +31,26 @@
   "peerDependencies": {
     "@unocss/eslint-plugin": ">=0.50.0",
     "eslint": ">=8.40.0",
+    "eslint-plugin-format": ">=0.1.0",
     "eslint-plugin-tailwindcss": ">=3.10.0"
   },
   "peerDependenciesMeta": {
     "@unocss/eslint-plugin": {
       "optional": true
     },
+    "eslint-plugin-format": {
+      "optional": true
+    },
     "eslint-plugin-tailwindcss": {
       "optional": true
     }
   },
   "dependencies": {
-    "@typescript-eslint/parser": "^7.2.0",
-    "eslint-plugin-solid": "^0.13.1",
-    "@pengzhanbo/eslint-config": "1.7.0"
-  },
-  "devDependencies": {
-    "eslint": "^8.57.0",
-    "eslint-flat-config-viewer": "^0.1.11",
-    "tsup": "^8.0.2"
+    "eslint-plugin-solid": "^0.13.2",
+    "@pengzhanbo/eslint-config": "1.8.0"
   },
   "scripts": {
-    "dev": "tsup src/index.ts --format esm --watch & eslint-flat-config-viewer",
-    "build": "tsup src/index.ts --format esm,cjs --clean --dts --shims",
+    "build": "tsup src/index.ts --format esm --clean --dts --shims",
     "stub": "tsup src/index.ts --format esm"
   }
 }

package/dist/index.cjs

@@ -1,103 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/index.ts
-var src_exports = {};
-__export(src_exports, {
-  default: () => src_default,
-  solid: () => solid,
-  solidPreset: () => solidPreset
-});
-module.exports = __toCommonJS(src_exports);
-
-// src/factory.ts
-var import_eslint_config3 = require("@pengzhanbo/eslint-config");
-
-// src/preset.ts
-var import_eslint_config2 = require("@pengzhanbo/eslint-config");
-
-// src/solid.ts
-var import_eslint_config = require("@pengzhanbo/eslint-config");
-async function solid(options = {}) {
-  const {
-    files = [import_eslint_config.GLOB_JSX, import_eslint_config.GLOB_TSX],
-    overrides = {},
-    typescript = true
-  } = options;
-  const pluginSolid = await (0, import_eslint_config.interopDefault)(import("eslint-plugin-solid"));
-  const rules = typescript ? pluginSolid.configs.typescript.rules : pluginSolid.configs.recommended.rules;
-  return [
-    {
-      name: "config:solid:setup",
-      plugins: {
-        solid: pluginSolid
-      }
-    },
-    {
-      files,
-      languageOptions: {
-        parserOptions: {
-          ecmaFeatures: {
-            jsx: true
-          }
-        }
-      },
-      name: "config:solid:rules",
-      rules: {
-        ...rules,
-        "solid/components-return-once": "error",
-        "solid/style-prop": "error",
-        "solid/prefer-for": "off",
-        ...overrides
-      }
-    }
-  ];
-}
-
-// src/preset.ts
-var solidPreset = (options) => {
-  return [solid({
-    overrides: (0, import_eslint_config2.getOverrides)(options, "solid"),
-    typescript: !!options.typescript
-  })];
-};
-
-// src/factory.ts
-var eslintSolidConfig = (0, import_eslint_config3.createConfig)(solidPreset);
-
-// src/index.ts
-__reExport(src_exports, require("@pengzhanbo/eslint-config"), module.exports);
-var src_default = eslintSolidConfig;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  solid,
-  solidPreset,
-  ...require("@pengzhanbo/eslint-config")
-});

package/dist/index.d.cts

@@ -1,16 +0,0 @@
-import * as _pengzhanbo_eslint_config from '@pengzhanbo/eslint-config';
-import { OptionsOverrides, OptionsHasTypeScript, OptionsStylistic, OptionsFiles, FlatConfigItem, PresetItem } from '@pengzhanbo/eslint-config';
-export * from '@pengzhanbo/eslint-config';
-
-declare module '@pengzhanbo/eslint-config' {
-    interface OptionsFrameworkExtract {
-        solid?: OptionsOverrides;
-    }
-}
-declare const eslintSolidConfig: _pengzhanbo_eslint_config.EslintFlatConfigFunction;
-
-declare function solid(options?: OptionsHasTypeScript & OptionsOverrides & OptionsStylistic & OptionsFiles): Promise<FlatConfigItem[]>;
-
-declare const solidPreset: PresetItem;
-
-export { eslintSolidConfig as default, solid, solidPreset };