@ntnyq/eslint-config 2.0.0-beta.17 → 2.0.0-beta.18

package/dist/index.cjs

@@ -56,15 +56,16 @@ __export(src_exports, {
   all: () => all,
   astro: () => astro,
   basic: () => basic,
+  common: () => common,
   eslintComments: () => eslintComments,
   getVueVersion: () => getVueVersion,
   imports: () => imports,
   js: () => js,
+  jsonOrder: () => jsonOrder,
   jsonc: () => jsonc,
   jsx: () => jsx,
   markdown: () => markdown,
   ntnyq: () => ntnyq,
-  pkgOrder: () => pkgOrder,
   prettier: () => prettier,
   react: () => react,
   reactHooksPlugin: () => import_eslint_plugin_react_hooks.default,
@@ -338,7 +339,7 @@ var js = [
       semi: ["error", "never"],
       "semi-spacing": ["error", { before: false, after: true }],
       "space-before-blocks": ["error", "always"],
-      "space-before-function-paren": ["error", "always"],
+      "space-before-function-paren": ["error", "never"],
       "space-in-parens": ["error", "never"],
       "space-infix-ops": "error",
       "space-unary-ops": ["error", { words: true, nonwords: false }],
@@ -803,7 +804,7 @@ var react = [
 
 // src/configs/astro.ts
 var import_eslint_plugin_astro = __toESM(require("eslint-plugin-astro"), 1);
-var import_astro_eslint_parser = __toESM(require("astro-eslint-parser"), 1);
+var astroParser = __toESM(require("astro-eslint-parser"), 1);
 var astro = [
   {
     files: [GLOB_ASTRO],
@@ -811,7 +812,7 @@ var astro = [
       astro: import_eslint_plugin_astro.default
     },
     languageOptions: {
-      parser: import_astro_eslint_parser.default,
+      parser: astroParser,
       parserOptions: {
         parser: "@typescript-eslint/parser",
         extraFileExtensions: [".astro"]
@@ -826,7 +827,7 @@ var astro = [
 
 // src/configs/jsonc.ts
 var import_eslint_plugin_jsonc = __toESM(require("eslint-plugin-jsonc"), 1);
-var import_jsonc_eslint_parser = __toESM(require("jsonc-eslint-parser"), 1);
+var jsoncParser = __toESM(require("jsonc-eslint-parser"), 1);
 var jsonc = [
   {
     files: [GLOB_JSON, GLOB_JSON5, GLOB_JSONC, "**/*rc"],
@@ -834,7 +835,7 @@ var jsonc = [
       jsonc: import_eslint_plugin_jsonc.default
     },
     languageOptions: {
-      parser: import_jsonc_eslint_parser.default
+      parser: jsoncParser
     },
     // @ts-expect-error 2322
     rules: {
@@ -868,7 +869,7 @@ var jsonc = [
     }
   }
 ];
-var pkgOrder = [
+var jsonOrder = [
   {
     files: ["**/package.json"],
     rules: {
@@ -1041,31 +1042,26 @@ var basic = [
   ...js,
   ...jsx,
   ...ts,
-  ...yml,
   ...imports,
   ...unicorn,
-  ...jsonc,
-  ...pkgOrder,
   ...eslintComments
 ];
-var all = [
+var common = [
   ...basic,
-  ...vue,
-  ...react,
-  ...astro,
-  ...unocss,
+  ...yml,
+  ...jsonc,
+  ...jsonOrder,
   ...prettier,
   ...markdown
 ];
+var all = [...common, ...vue, ...react, ...astro, ...unocss];
 function ntnyq(config = [], {
   vue: enableVue = false,
   react: enableReact = false,
   astro: enableAstro = false,
-  prettier: enablePrettier = false,
-  markdown: enableMarkdown = false,
   unocss: enableUnoCSS = false
 } = {}) {
-  const configs4 = [...basic];
+  const configs4 = [...common];
   if (enableVue) {
     configs4.push(...vue);
   }
@@ -1078,12 +1074,6 @@ function ntnyq(config = [], {
   if (enableUnoCSS) {
     configs4.push(...unocss);
   }
-  if (enableMarkdown) {
-    configs4.push(...markdown);
-  }
-  if (enablePrettier) {
-    configs4.push(...prettier);
-  }
   if (Object.keys(config).length > 0) {
     configs4.push(...Array.isArray(config) ? config : [config]);
   }
@@ -1117,15 +1107,16 @@ function ntnyq(config = [], {
   all,
   astro,
   basic,
+  common,
   eslintComments,
   getVueVersion,
   imports,
   js,
+  jsonOrder,
   jsonc,
   jsx,
   markdown,
   ntnyq,
-  pkgOrder,
   prettier,
   react,
   reactHooksPlugin,

package/dist/index.d.cts

@@ -35,9 +35,10 @@ declare const GLOB_LOCKFILE: string[];
 declare const GLOB_EXCLUDE: string[];
 
 /**
- * no framework
+ * only js and ts
  */
 declare const basic: FlatESLintConfig[];
+declare const common: FlatESLintConfig[];
 /**
  * all supported framework
  */
@@ -45,12 +46,10 @@ declare const all: FlatESLintConfig[];
 /**
  * custom framework support
  */
-declare function ntnyq(config?: FlatESLintConfig | FlatESLintConfig[], { vue: enableVue, react: enableReact, astro: enableAstro, prettier: enablePrettier, markdown: enableMarkdown, unocss: enableUnoCSS, }?: {
+declare function ntnyq(config?: FlatESLintConfig | FlatESLintConfig[], { vue: enableVue, react: enableReact, astro: enableAstro, unocss: enableUnoCSS, }?: {
     vue?: boolean | undefined;
     react?: boolean | undefined;
     astro?: boolean | undefined;
-    prettier?: boolean | undefined;
-    markdown?: boolean | undefined;
     unocss?: boolean | undefined;
 }): FlatESLintConfig[];
 
@@ -71,7 +70,7 @@ declare const react: FlatESLintConfig[];
 declare const astro: FlatESLintConfig[];
 
 declare const jsonc: FlatESLintConfig[];
-declare const pkgOrder: FlatESLintConfig[];
+declare const jsonOrder: FlatESLintConfig[];
 
 declare const unocss: FlatESLintConfig[];
 
@@ -81,4 +80,4 @@ declare const markdown: FlatESLintConfig[];
 
 declare const eslintComments: FlatESLintConfig[];
 
-export { GLOB_ALL_SRC, GLOB_ASTRO, GLOB_CSS, GLOB_DIST, GLOB_EXCLUDE, GLOB_HTML, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_JSX, GLOB_LESS, GLOB_LOCKFILE, GLOB_MARKDOWN, GLOB_NODE_MODULES, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLE, GLOB_TS, GLOB_TSX, GLOB_VUE, GLOB_YAML, all, astro, basic, eslintComments, getVueVersion, imports, js, jsonc, jsx, markdown, ntnyq, pkgOrder, prettier, react, ts, unicorn, unocss, vue, yml };
+export { GLOB_ALL_SRC, GLOB_ASTRO, GLOB_CSS, GLOB_DIST, GLOB_EXCLUDE, GLOB_HTML, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_JSX, GLOB_LESS, GLOB_LOCKFILE, GLOB_MARKDOWN, GLOB_NODE_MODULES, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLE, GLOB_TS, GLOB_TSX, GLOB_VUE, GLOB_YAML, all, astro, basic, common, eslintComments, getVueVersion, imports, js, jsonOrder, jsonc, jsx, markdown, ntnyq, prettier, react, ts, unicorn, unocss, vue, yml };

package/dist/index.d.ts

@@ -35,9 +35,10 @@ declare const GLOB_LOCKFILE: string[];
 declare const GLOB_EXCLUDE: string[];
 
 /**
- * no framework
+ * only js and ts
  */
 declare const basic: FlatESLintConfig[];
+declare const common: FlatESLintConfig[];
 /**
  * all supported framework
  */
@@ -45,12 +46,10 @@ declare const all: FlatESLintConfig[];
 /**
  * custom framework support
  */
-declare function ntnyq(config?: FlatESLintConfig | FlatESLintConfig[], { vue: enableVue, react: enableReact, astro: enableAstro, prettier: enablePrettier, markdown: enableMarkdown, unocss: enableUnoCSS, }?: {
+declare function ntnyq(config?: FlatESLintConfig | FlatESLintConfig[], { vue: enableVue, react: enableReact, astro: enableAstro, unocss: enableUnoCSS, }?: {
     vue?: boolean | undefined;
     react?: boolean | undefined;
     astro?: boolean | undefined;
-    prettier?: boolean | undefined;
-    markdown?: boolean | undefined;
     unocss?: boolean | undefined;
 }): FlatESLintConfig[];
 
@@ -71,7 +70,7 @@ declare const react: FlatESLintConfig[];
 declare const astro: FlatESLintConfig[];
 
 declare const jsonc: FlatESLintConfig[];
-declare const pkgOrder: FlatESLintConfig[];
+declare const jsonOrder: FlatESLintConfig[];
 
 declare const unocss: FlatESLintConfig[];
 
@@ -81,4 +80,4 @@ declare const markdown: FlatESLintConfig[];
 
 declare const eslintComments: FlatESLintConfig[];
 
-export { GLOB_ALL_SRC, GLOB_ASTRO, GLOB_CSS, GLOB_DIST, GLOB_EXCLUDE, GLOB_HTML, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_JSX, GLOB_LESS, GLOB_LOCKFILE, GLOB_MARKDOWN, GLOB_NODE_MODULES, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLE, GLOB_TS, GLOB_TSX, GLOB_VUE, GLOB_YAML, all, astro, basic, eslintComments, getVueVersion, imports, js, jsonc, jsx, markdown, ntnyq, pkgOrder, prettier, react, ts, unicorn, unocss, vue, yml };
+export { GLOB_ALL_SRC, GLOB_ASTRO, GLOB_CSS, GLOB_DIST, GLOB_EXCLUDE, GLOB_HTML, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_JSX, GLOB_LESS, GLOB_LOCKFILE, GLOB_MARKDOWN, GLOB_NODE_MODULES, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLE, GLOB_TS, GLOB_TSX, GLOB_VUE, GLOB_YAML, all, astro, basic, common, eslintComments, getVueVersion, imports, js, jsonOrder, jsonc, jsx, markdown, ntnyq, prettier, react, ts, unicorn, unocss, vue, yml };

package/dist/index.js

@@ -255,7 +255,7 @@ var js = [
       semi: ["error", "never"],
       "semi-spacing": ["error", { before: false, after: true }],
       "space-before-blocks": ["error", "always"],
-      "space-before-function-paren": ["error", "always"],
+      "space-before-function-paren": ["error", "never"],
       "space-in-parens": ["error", "never"],
       "space-infix-ops": "error",
       "space-unary-ops": ["error", { words: true, nonwords: false }],
@@ -720,7 +720,7 @@ var react = [
 
 // src/configs/astro.ts
 import astroPlugin, { configs as configs2 } from "eslint-plugin-astro";
-import astroParser from "astro-eslint-parser";
+import * as astroParser from "astro-eslint-parser";
 var astro = [
   {
     files: [GLOB_ASTRO],
@@ -743,7 +743,7 @@ var astro = [
 
 // src/configs/jsonc.ts
 import jsoncPlugin, { configs as configs3 } from "eslint-plugin-jsonc";
-import jsoncParser from "jsonc-eslint-parser";
+import * as jsoncParser from "jsonc-eslint-parser";
 var jsonc = [
   {
     files: [GLOB_JSON, GLOB_JSON5, GLOB_JSONC, "**/*rc"],
@@ -785,7 +785,7 @@ var jsonc = [
     }
   }
 ];
-var pkgOrder = [
+var jsonOrder = [
   {
     files: ["**/package.json"],
     rules: {
@@ -958,31 +958,26 @@ var basic = [
   ...js,
   ...jsx,
   ...ts,
-  ...yml,
   ...imports,
   ...unicorn,
-  ...jsonc,
-  ...pkgOrder,
   ...eslintComments
 ];
-var all = [
+var common = [
   ...basic,
-  ...vue,
-  ...react,
-  ...astro,
-  ...unocss,
+  ...yml,
+  ...jsonc,
+  ...jsonOrder,
   ...prettier,
   ...markdown
 ];
+var all = [...common, ...vue, ...react, ...astro, ...unocss];
 function ntnyq(config = [], {
   vue: enableVue = false,
   react: enableReact = false,
   astro: enableAstro = false,
-  prettier: enablePrettier = false,
-  markdown: enableMarkdown = false,
   unocss: enableUnoCSS = false
 } = {}) {
-  const configs4 = [...basic];
+  const configs4 = [...common];
   if (enableVue) {
     configs4.push(...vue);
   }
@@ -995,12 +990,6 @@ function ntnyq(config = [], {
   if (enableUnoCSS) {
     configs4.push(...unocss);
   }
-  if (enableMarkdown) {
-    configs4.push(...markdown);
-  }
-  if (enablePrettier) {
-    configs4.push(...prettier);
-  }
   if (Object.keys(config).length > 0) {
     configs4.push(...Array.isArray(config) ? config : [config]);
   }
@@ -1033,15 +1022,16 @@ export {
   all,
   astro,
   basic,
+  common,
   eslintComments,
   getVueVersion,
   imports,
   js,
+  jsonOrder,
   jsonc,
   jsx,
   markdown,
   ntnyq,
-  pkgOrder,
   prettier,
   react,
   reactHooksPlugin,

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@ntnyq/eslint-config",
   "type": "module",
-  "version": "2.0.0-beta.17",
-  "packageManager": "pnpm@8.7.5",
+  "version": "2.0.0-beta.18",
+  "packageManager": "pnpm@8.7.6",
   "description": "ESLint flat config of ntnyq",
   "keywords": [
     "eslint",
@@ -43,9 +43,9 @@
   },
   "dependencies": {
     "@eslint/js": "^8.49.0",
-    "@typescript-eslint/eslint-plugin": "^6.7.0",
-    "@typescript-eslint/parser": "^6.7.0",
-    "@unocss/eslint-plugin": "^0.55.7",
+    "@typescript-eslint/eslint-plugin": "^6.7.2",
+    "@typescript-eslint/parser": "^6.7.2",
+    "@unocss/eslint-plugin": "^0.56.0",
     "astro-eslint-parser": "^0.15.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-define-config": "^1.23.0",
@@ -68,14 +68,14 @@
     "yaml-eslint-parser": "^1.2.2"
   },
   "devDependencies": {
-    "@ntnyq/prettier-config": "^1.13.0",
-    "@types/node": "^20.6.0",
+    "@ntnyq/prettier-config": "^1.14.0",
+    "@types/node": "^20.6.3",
     "bumpp": "^9.2.0",
     "eslint": "^8.49.0",
     "husky": "^8.0.3",
     "nano-staged": "^0.8.0",
     "npm-run-all": "^4.1.5",
-    "pnpm": "^8.7.5",
+    "pnpm": "^8.7.6",
     "rimraf": "^5.0.1",
     "tsup": "^7.2.0",
     "typescript": "5.2.2"