@vue-jsx/eslint 3.3.0-beta.0 → 3.3.0-rc.1

package/dist/index.d.ts

@@ -1,6 +1,4 @@
-import * as _$_typescript_eslint_utils_ts_eslint0 from "@typescript-eslint/utils/ts-eslint";
-import { ClassicConfig, Linter } from "@typescript-eslint/utils/ts-eslint";
-
+import { FlatConfig, Linter } from "@typescript-eslint/utils/ts-eslint";
 //#region src/rules/jsx-sort-props/types.d.ts
 interface JsxSortPropsSchema0 {
   callbacksLast?: boolean;
@@ -25,24 +23,24 @@ type MessageIds = 'define-style' | 'define-style-syntax-error';
 //#endregion
 //#region src/rules/index.d.ts
 declare const ruleOptions: {
-  'jsx-sort-props': _$_typescript_eslint_utils_ts_eslint0.RuleModule<MessageIds$1, JsxSortPropsRuleOptions, unknown, _$_typescript_eslint_utils_ts_eslint0.RuleListener>;
-  'define-style': _$_typescript_eslint_utils_ts_eslint0.RuleModule<MessageIds, DefineStyleRuleOptions, unknown, _$_typescript_eslint_utils_ts_eslint0.RuleListener>;
+  'jsx-sort-props': import("@typescript-eslint/utils/ts-eslint").RuleModule<MessageIds$1, JsxSortPropsRuleOptions, unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
+  'define-style': import("@typescript-eslint/utils/ts-eslint").RuleModule<MessageIds, DefineStyleRuleOptions, unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
 };
 interface RuleOptions {
-  'vue-jsx-vapor/jsx-sort-props': JsxSortPropsRuleOptions;
-  'vue-jsx-vapor/define-style': DefineStyleRuleOptions;
+  'vue-jsx/jsx-sort-props': JsxSortPropsRuleOptions;
+  'vue-jsx/define-style': DefineStyleRuleOptions;
 }
-type Rules = Partial<{ [K in keyof RuleOptions]: Linter.Severity | [Linter.Severity, ...RuleOptions[K]] }>;
+type Rules = Partial<{ [K in keyof RuleOptions]: Linter.Severity | [Linter.Severity, ...RuleOptions[K]]; }>;
 //#endregion
 //#region src/index.d.ts
-declare const plugins: {
-  'vue-jsx-vapor': {
+export declare const plugins: {
+  'vue-jsx': {
     rules: {
-      'jsx-sort-props': _$_typescript_eslint_utils_ts_eslint0.RuleModule<MessageIds$1, JsxSortPropsRuleOptions, unknown, _$_typescript_eslint_utils_ts_eslint0.RuleListener>;
-      'define-style': _$_typescript_eslint_utils_ts_eslint0.RuleModule<MessageIds, DefineStyleRuleOptions, unknown, _$_typescript_eslint_utils_ts_eslint0.RuleListener>;
+      'jsx-sort-props': import("@typescript-eslint/utils/ts-eslint").RuleModule<MessageIds$1, JsxSortPropsRuleOptions, unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
+      'define-style': import("@typescript-eslint/utils/ts-eslint").RuleModule<MessageIds, DefineStyleRuleOptions, unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
     };
   };
 };
-declare const config: (options: ClassicConfig.Config) => Record<string, unknown>;
+declare const config: (options?: FlatConfig.Config) => FlatConfig.Config;
 //#endregion
-export { type Rules, config as default, plugins, ruleOptions as rules };
+export { type Rules, config as default, ruleOptions as rules };

package/dist/index.js

@@ -214,52 +214,54 @@ function getGroupsOfSortableAttributes(attributes, context) {
 			groupCount += 1;
 			sortableAttributeGroups[groupCount - 1] = [];
 		}
-		if (!attrIsSpread) if (comment.length === 0) {
-			attributeMap.set(attribute, {
-				end: attribute.range[1],
-				hasComment: false
-			});
-			addtoSortableAttributeGroups(attribute);
-		} else {
-			const firstComment = comment[0];
-			const commentline = firstComment.loc.start.line;
-			if (comment.length === 1) {
-				if (attributeline + 1 === commentline && nextAttribute) {
-					attributeMap.set(attribute, {
-						end: nextAttribute.range[1],
-						hasComment: true
-					});
-					addtoSortableAttributeGroups(attribute);
-					i += 1;
-				} else if (attributeline === commentline) {
-					if (firstComment.type === "Block" && nextAttribute) {
+		if (!attrIsSpread) {
+			if (comment.length === 0) {
+				attributeMap.set(attribute, {
+					end: attribute.range[1],
+					hasComment: false
+				});
+				addtoSortableAttributeGroups(attribute);
+			} else {
+				const firstComment = comment[0];
+				const commentline = firstComment.loc.start.line;
+				if (comment.length === 1) {
+					if (attributeline + 1 === commentline && nextAttribute) {
 						attributeMap.set(attribute, {
 							end: nextAttribute.range[1],
 							hasComment: true
 						});
+						addtoSortableAttributeGroups(attribute);
 						i += 1;
-					} else if (firstComment.type === "Block") attributeMap.set(attribute, {
-						end: firstComment.range[1],
+					} else if (attributeline === commentline) {
+						if (firstComment.type === "Block" && nextAttribute) {
+							attributeMap.set(attribute, {
+								end: nextAttribute.range[1],
+								hasComment: true
+							});
+							i += 1;
+						} else if (firstComment.type === "Block") attributeMap.set(attribute, {
+							end: firstComment.range[1],
+							hasComment: true
+						});
+						else attributeMap.set(attribute, {
+							end: firstComment.range[1],
+							hasComment: false
+						});
+						addtoSortableAttributeGroups(attribute);
+					}
+				} else if (comment.length > 1 && attributeline + 1 === comment[1].loc.start.line && nextAttribute) {
+					const commentNextAttribute = sourceCode.getCommentsAfter(nextAttribute);
+					attributeMap.set(attribute, {
+						end: nextAttribute.range[1],
 						hasComment: true
 					});
-					else attributeMap.set(attribute, {
-						end: firstComment.range[1],
-						hasComment: false
+					if (commentNextAttribute.length === 1 && nextAttribute.loc.start.line === commentNextAttribute[0].loc.start.line) attributeMap.set(attribute, {
+						end: commentNextAttribute[0].range[1],
+						hasComment: true
 					});
 					addtoSortableAttributeGroups(attribute);
+					i += 1;
 				}
-			} else if (comment.length > 1 && attributeline + 1 === comment[1].loc.start.line && nextAttribute) {
-				const commentNextAttribute = sourceCode.getCommentsAfter(nextAttribute);
-				attributeMap.set(attribute, {
-					end: nextAttribute.range[1],
-					hasComment: true
-				});
-				if (commentNextAttribute.length === 1 && nextAttribute.loc.start.line === commentNextAttribute[0].loc.start.line) attributeMap.set(attribute, {
-					end: commentNextAttribute[0].range[1],
-					hasComment: true
-				});
-				addtoSortableAttributeGroups(attribute);
-				i += 1;
 			}
 		}
 	}
@@ -490,14 +492,14 @@ const ruleOptions = {
 };
 //#endregion
 //#region src/index.ts
-const plugins = { "vue-jsx-vapor": { rules: ruleOptions } };
+const plugins = { "vue-jsx": { rules: ruleOptions } };
 const config = ({ rules = {}, ...options } = {}) => ({
-	name: "vue-jsx-vapor",
+	name: "vue-jsx",
 	plugins,
 	rules: {
 		"style/jsx-sort-props": "off",
 		"react/jsx-sort-props": "off",
-		"vue-jsx-vapor/jsx-sort-props": rules["vue-jsx-vapor/jsx-sort-props"] || ["warn", {
+		"vue-jsx/jsx-sort-props": rules["vue-jsx/jsx-sort-props"] || ["warn", {
 			callbacksLast: true,
 			shorthandFirst: true,
 			reservedFirst: [
@@ -516,7 +518,7 @@ const config = ({ rules = {}, ...options } = {}) => ({
 				"v-html"
 			]
 		}],
-		"vue-jsx-vapor/define-style": rules["vue-jsx-vapor/define-style"] || "warn"
+		"vue-jsx/define-style": rules["vue-jsx/define-style"] || "warn"
 	},
 	...options
 });

package/package.json

@@ -1,43 +1,44 @@
 {
   "name": "@vue-jsx/eslint",
-  "type": "module",
-  "version": "3.3.0-beta.0",
+  "version": "3.3.0-rc.1",
   "description": "Vue JSX ESLint Plugin",
-  "license": "MIT",
+  "keywords": [
+    "eslint",
+    "jsx",
+    "vapor",
+    "vue"
+  ],
   "homepage": "https://github.com/vuejs/vue-jsx-vapor#readme",
+  "bugs": {
+    "url": "https://github.com/vuejs/vue-jsx-vapor/issues"
+  },
+  "license": "MIT",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-jsx-vapor.git"
   },
-  "bugs": {
-    "url": "https://github.com/vuejs/vue-jsx-vapor/issues"
-  },
-  "keywords": [
-    "vue",
-    "jsx",
-    "vapor",
-    "eslint"
+  "files": [
+    "dist"
   ],
+  "type": "module",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "exports": {
     ".": "./dist/index.js",
     "./*": "./*"
   },
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "files": [
-    "dist"
-  ],
   "dependencies": {
     "@prettier/sync": "^0.6.1",
     "@typescript-eslint/utils": "^8.59.1"
   },
   "devDependencies": {
-    "eslint-vitest-rule-tester": "^3.1.0"
+    "eslint-vitest-rule-tester": "^3.1.0",
+    "vitest": "4.1.11"
   },
   "scripts": {
-    "build": "tsdown",
-    "dev": "DEV=true tsdown",
+    "build": "vp pack",
+    "dev": "DEV=true vp pack",
     "release": "bumpp && npm publish",
-    "test": "vitest"
+    "test": "vp test"
   }
 }