Skip to content

Commit 963c62f

Browse files
authored
fix: wrong dependency (#358)
* fix: change to use @html-eslint/parser * fix
1 parent 5d15eed commit 963c62f

File tree

13 files changed

+23
-27
lines changed

13 files changed

+23
-27
lines changed

packages/eslint-plugin/lib/rules/indent/indent.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
*/
3636

3737
const { parse } = require("@html-eslint/template-parser");
38-
const { NodeTypes } = require("es-html-parser");
38+
const { NODE_TYPES } = require("@html-eslint/parser");
3939
const { RULE_CATEGORY } = require("../../constants");
4040
const {
4141
splitToLineNodes,
@@ -158,7 +158,7 @@ module.exports = {
158158
return getTagIncreasingLevel(node);
159159
}
160160
const type = node.type;
161-
if (type === NodeTypes.Attribute) {
161+
if (type === NODE_TYPES.Attribute) {
162162
const optionIndent = indentLevelOptions[type];
163163
if (typeof optionIndent === "number") {
164164
return optionIndent;
@@ -329,7 +329,7 @@ module.exports = {
329329
indentLevel.indent(node);
330330
if (hasTemplate(node)) {
331331
node.parts.forEach((part) => {
332-
if (part.type !== NodeTypes.Part) {
332+
if (part.type !== NODE_TYPES.Part) {
333333
if (part.open) {
334334
checkIndent(part.open);
335335
}
@@ -362,7 +362,7 @@ module.exports = {
362362
indentLevel.indent(node);
363363
if (hasTemplate(node)) {
364364
node.parts.forEach((part) => {
365-
if (part.type !== NodeTypes.Part) {
365+
if (part.type !== NODE_TYPES.Part) {
366366
if (part.open) {
367367
checkIndent(part.open);
368368
}

packages/eslint-plugin/lib/rules/no-duplicate-class.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* @property {import("@html-eslint/types").AnyNode['range']} range
1111
*/
1212

13-
const { NodeTypes } = require("es-html-parser");
13+
const { NODE_TYPES } = require("@html-eslint/parser");
1414
const { RULE_CATEGORY } = require("../constants");
1515
const { createVisitors } = require("./utils/visitors");
1616
const { getRuleUrl } = require("./utils/rule");
@@ -73,7 +73,7 @@ module.exports = {
7373
if (
7474
!attributeValue ||
7575
!attributeValue.value ||
76-
attributeValue.parts.some((part) => part.type === NodeTypes.Template)
76+
attributeValue.parts.some((part) => part.type === NODE_TYPES.Template)
7777
) {
7878
return;
7979
}

packages/eslint-plugin/lib/rules/no-invalid-role.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* @typedef { import("../types").RuleModule<[]> } RuleModule
33
*/
44

5-
const { NodeTypes } = require("es-html-parser");
5+
const { NODE_TYPES } = require("@html-eslint/parser");
66
const { RULE_CATEGORY } = require("../constants");
77
const { findAttr } = require("./utils/node");
88
const { createVisitors } = require("./utils/visitors");
@@ -262,7 +262,7 @@ module.exports = {
262262
*/
263263
if (
264264
role.value &&
265-
role.value.parts.some((part) => part.type === NodeTypes.Template)
265+
role.value.parts.some((part) => part.type === NODE_TYPES.Template)
266266
) {
267267
return;
268268
}

packages/eslint-plugin/lib/rules/no-multiple-empty-lines.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @typedef { import("es-html-parser").AnyToken } AnyToken
2+
* @typedef { import("@html-eslint/types").AnyToken } AnyToken
33
* @typedef { import("@html-eslint/types").Document } Document
44
* @typedef { import("@html-eslint/types").CommentContent } CommentContent
55
* @typedef { import("@html-eslint/types").Text } Text

packages/eslint-plugin/lib/rules/quotes.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* @typedef { import("../types").RuleModule<[Option]> } RuleModule
1010
*/
1111

12-
const { NodeTypes } = require("es-html-parser");
12+
const { NODE_TYPES } = require("@html-eslint/parser");
1313
const { RULE_CATEGORY } = require("../constants");
1414
const { getSourceCode } = require("./utils/source-code");
1515
const { createVisitors } = require("./utils/visitors");
@@ -94,7 +94,7 @@ module.exports = {
9494
* Allow template expression.
9595
* ex: html`<div foo=${foo}></div>`
9696
*/
97-
if (attr.value.parts.some((part) => part.type === NodeTypes.Template)) {
97+
if (attr.value.parts.some((part) => part.type === NODE_TYPES.Template)) {
9898
return;
9999
}
100100

packages/eslint-plugin/lib/rules/require-form-method.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* @typedef { import("../types").RuleModule<[]> } RuleModule
33
*/
44

5-
const { NodeTypes } = require("es-html-parser");
5+
const { NODE_TYPES } = require("@html-eslint/parser");
66
const { RULE_CATEGORY } = require("../constants");
77
const { findAttr } = require("./utils/node");
88
const { createVisitors } = require("./utils/visitors");
@@ -67,7 +67,7 @@ module.exports = {
6767

6868
if (
6969
method.value.parts &&
70-
method.value.parts.some((part) => part.type !== NodeTypes.Part)
70+
method.value.parts.some((part) => part.type !== NODE_TYPES.Part)
7171
) {
7272
return;
7373
}

packages/eslint-plugin/lib/rules/utils/node.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@
1616
* @typedef { import("@html-eslint/types").CloseTemplate } CloseTemplate
1717
* @typedef { import("eslint").AST.Range } Range
1818
* @typedef { import("eslint").AST.SourceLocation } SourceLocation
19-
* @typedef { import("es-html-parser").AnyToken } AnyToken
19+
* @typedef { import("@html-eslint/types").AnyToken } AnyToken
2020
*/
2121

2222
const { NODE_TYPES } = require("@html-eslint/parser");
23-
const { NodeTypes, TokenTypes } = require("es-html-parser");
2423

2524
/**
2625
* @param {Tag | ScriptTag | StyleTag} node
@@ -68,7 +67,7 @@ function isRangesOverlap(rangeA, rangeB) {
6867
*/
6968
function isOverlapWithTemplates(parts, range) {
7069
return parts
71-
.filter((part) => part.type !== NodeTypes.Part)
70+
.filter((part) => part.type !== NODE_TYPES.Part)
7271
.some((part) => isRangesOverlap(part.range, range));
7372
}
7473

@@ -77,7 +76,7 @@ function isOverlapWithTemplates(parts, range) {
7776
* @returns {boolean}
7877
*/
7978
function hasTemplate(node) {
80-
return node.parts.some((part) => part.type !== NodeTypes.Part);
79+
return node.parts.some((part) => part.type !== NODE_TYPES.Part);
8180
}
8281

8382
/**
@@ -101,7 +100,7 @@ function splitToLineNodes(node) {
101100
function hasTemplate(range) {
102101
return parts.some(
103102
(part) =>
104-
part.type !== NodeTypes.Part && isRangesOverlap(part.range, range)
103+
part.type !== NODE_TYPES.Part && isRangesOverlap(part.range, range)
105104
);
106105
}
107106

@@ -248,7 +247,7 @@ function getTemplateTokens(tokens) {
248247
.map((token) => token["parts"] || [])
249248
)
250249
// @ts-ignore
251-
.filter((token) => token.type !== TokenTypes.Part)
250+
.filter((token) => token.type !== NODE_TYPES.Part)
252251
);
253252
}
254253

packages/template-syntax-parser/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
"devDependencies": {
3131
"@html-eslint/types": "^0.40.0",
3232
"eslint": "^9.19.0",
33-
"espree": "^10.3.0",
3433
"globals": "^15.12.0"
3534
}
3635
}

packages/types/lib/ast.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
import { AnyHTMLNode } from "./html-ast";
22
import { AnyJsNode } from "./js-ast";
3-
3+
export { AnyToken } from "es-html-parser";
44
export type AnyNode = AnyHTMLNode | AnyJsNode;

packages/types/lib/html-ast.d.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
import * as Parser from "es-html-parser";
2-
import eslint from "eslint";
3-
import * as estree from "estree";
42

53
export interface Document extends Parser.DocumentNode {
64
parent: null;

0 commit comments

Comments
 (0)