Skip to content

Commit dd216ec

Browse files
mysticateamysticatea
committed
Chore: upgrade dependencies
1 parent 27b44d6 commit dd216ec

22 files changed

+119
-118
lines changed

‎.eslintignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/.temp
33
/coverage
44
/node_modules
5+
/src/external
56
/src/html/util
67
/test/fixtures
78
/test/temp

‎package.json

+16-16
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
"eslint": ">=3.9.0"
1616
},
1717
"dependencies": {
18-
"debug": "^3.0.0",
18+
"debug": "^3.1.0",
1919
"eslint-scope": "^3.7.1",
20-
"espree": "^3.3.2",
20+
"espree": "^3.5.1",
2121
"esquery": "^1.0.0",
2222
"lodash": "^4.17.4"
2323
},
@@ -27,25 +27,25 @@
2727
"@types/lodash": "^4.14.71",
2828
"@types/mocha": "^2.2.41",
2929
"@types/node": "^6.0.85",
30-
"babel-eslint": "^7.1.1",
30+
"babel-eslint": "^8.0.2",
3131
"chokidar": "^1.7.0",
32-
"codecov": "^2.1.0",
32+
"codecov": "^3.0.0",
3333
"cross-spawn": "^5.1.0",
3434
"dts-bundle": "^0.7.3",
35-
"eslint": "^4.3.0",
36-
"eslint-config-mysticatea": "^11.0.0",
37-
"fs-extra": "^4.0.0",
38-
"mocha": "^3.2.0",
39-
"npm-run-all": "^4.0.2",
40-
"nyc": "^11.1.0",
41-
"opener": "^1.4.2",
42-
"rimraf": "^2.5.4",
43-
"rollup": "^0.45.2",
35+
"eslint": "^4.10.0",
36+
"eslint-config-mysticatea": "^12.0.0",
37+
"fs-extra": "^4.0.2",
38+
"mocha": "^4.0.1",
39+
"npm-run-all": "^4.1.1",
40+
"nyc": "^11.3.0",
41+
"opener": "^1.4.3",
42+
"rimraf": "^2.6.2",
43+
"rollup": "^0.50.0",
4444
"rollup-plugin-node-resolve": "^3.0.0",
4545
"rollup-plugin-sourcemaps": "^0.4.2",
4646
"rollup-watch": "^4.3.1",
47-
"typescript": "~2.4.2",
48-
"typescript-eslint-parser": "^5.0.1",
47+
"typescript": "~2.5.3",
48+
"typescript-eslint-parser": "^8.0.1",
4949
"wait-on": "^2.0.2",
5050
"warun": "^1.0.0"
5151
},
@@ -56,7 +56,7 @@
5656
"clean": "rimraf .nyc_output .temp coverage index.*",
5757
"codecov": "nyc report --reporter lcovonly && codecov",
5858
"coverage": "nyc report --reporter lcov && opener ./coverage/lcov-report/index.html",
59-
"lint": "eslint lib test",
59+
"lint": "eslint src test --ext .ts",
6060
"setup": "git submodule update --init && cd test/fixtures/eslint && npm install",
6161
"pretest": "run-s build lint",
6262
"test": "nyc npm run _mocha",

‎src/ast/errors.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* @copyright 2017 Toru Nagashima. All rights reserved.
44
* See LICENSE file in root directory for full license.
55
*/
6-
import {Location} from "./locations"
6+
import { Location } from "./locations"
77

88
/**
99
* Check whether the given value has acorn style location information.

‎src/ast/locations.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export type Offset = number
4444
* Range information in offsets.
4545
* The 1st element is the start offset.
4646
* The 2nd element is the end offset.
47-
*
47+
*
4848
* This is 0-based.
4949
*/
5050
export type OffsetRange = [Offset, Offset]

‎src/ast/nodes.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
* @copyright 2017 Toru Nagashima. All rights reserved.
44
* See LICENSE file in root directory for full license.
55
*/
6-
import {ParseError} from "./errors"
7-
import {HasLocation} from "./locations"
8-
import {Token} from "./tokens"
6+
import { ParseError } from "./errors"
7+
import { HasLocation } from "./locations"
8+
import { Token } from "./tokens"
99

1010
//------------------------------------------------------------------------------
1111
// Common

‎src/ast/tokens.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* @copyright 2017 Toru Nagashima. All rights reserved.
44
* See LICENSE file in root directory for full license.
55
*/
6-
import {HasLocation} from "./locations"
6+
import { HasLocation } from "./locations"
77

88
/**
99
* Tokens.

‎src/ast/traverse.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* @copyright 2017 Toru Nagashima. All rights reserved.
44
* See LICENSE file in root directory for full license.
55
*/
6-
import {Node} from "./nodes"
6+
import { Node } from "./nodes"
77

88
//------------------------------------------------------------------------------
99
// Helpers
@@ -196,4 +196,4 @@ export function traverseNodes(node: Node, visitor: Visitor) {
196196
traverse(node, null, visitor)
197197
}
198198

199-
export {getFallbackKeys}
199+
export { getFallbackKeys }

‎src/common/location-calculator.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
* See LICENSE file in root directory for full license.
55
*/
66
import * as lodash from "lodash"
7-
import {HasLocation, Location, ParseError} from "../ast"
7+
import { HasLocation, Location, ParseError } from "../ast"
88

99
/**
1010
* Location calculators.
11-
*
11+
*
1212
* HTML tokenizers remove several characters to handle HTML entities and line terminators.
1313
* Tokens have the processed text as their value, but tokens have offsets and locations in the original text.
1414
* This calculator calculates the original locations from the processed texts.
15-
*
15+
*
1616
* This calculator will be used for:
17-
*
17+
*
1818
* - Adjusts the locations of script ASTs.
1919
* - Creates expression containers in postprocess.
2020
*/
@@ -60,7 +60,7 @@ export class LocationCalculator {
6060
private _getLocation(offset: number): Location {
6161
const line = lodash.sortedLastIndex(this.ltOffsets, offset) + 1
6262
const column = offset - (line === 1 ? 0 : this.ltOffsets[line - 2])
63-
return {line, column}
63+
return { line, column }
6464
}
6565

6666
/**

‎src/html/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
* @copyright 2017 Toru Nagashima. All rights reserved.
44
* See LICENSE file in root directory for full license.
55
*/
6-
export {Parser as HTMLParser} from "./parser"
7-
export {Tokenizer as HTMLTokenizer} from "./tokenizer"
6+
export { Parser as HTMLParser } from "./parser"
7+
export { Tokenizer as HTMLTokenizer } from "./tokenizer"

‎src/html/intermediate-tokenizer.ts

+11-11
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
*/
66
import assert from "assert"
77
import * as lodash from "lodash"
8-
import {ErrorCode, HasLocation, Namespace, ParseError, Token, VAttribute} from "../ast"
9-
import {debug} from "../common/debug"
10-
import {Tokenizer, TokenizerState, TokenType} from "./tokenizer"
8+
import { ErrorCode, HasLocation, Namespace, ParseError, Token, VAttribute } from "../ast"
9+
import { debug } from "../common/debug"
10+
import { Tokenizer, TokenizerState, TokenType } from "./tokenizer"
1111

1212
const DUMMY_PARENT: any = Object.freeze({})
1313

@@ -177,7 +177,7 @@ export class IntermediateTokenizer {
177177
token = {
178178
type: "Text",
179179
range: [start.range[0], end.range[1]],
180-
loc: {start: start.loc.start, end: end.loc.end},
180+
loc: { start: start.loc.start, end: end.loc.end },
181181
value,
182182
}
183183
}
@@ -253,7 +253,7 @@ export class IntermediateTokenizer {
253253
this.currentToken = {
254254
type: "Text",
255255
range: [token.range[0], token.range[1]],
256-
loc: {start: token.loc.start, end: token.loc.end},
256+
loc: { start: token.loc.start, end: token.loc.end },
257257
value: token.value,
258258
}
259259

@@ -321,7 +321,7 @@ export class IntermediateTokenizer {
321321
this.currentToken = {
322322
type: "EndTag",
323323
range: [token.range[0], token.range[1]],
324-
loc: {start: token.loc.start, end: token.loc.end},
324+
loc: { start: token.loc.start, end: token.loc.end },
325325
name: token.value,
326326
}
327327

@@ -350,13 +350,13 @@ export class IntermediateTokenizer {
350350
this.attribute = {
351351
type: "VAttribute",
352352
range: [token.range[0], token.range[1]],
353-
loc: {start: token.loc.start, end: token.loc.end},
353+
loc: { start: token.loc.start, end: token.loc.end },
354354
parent: DUMMY_PARENT,
355355
directive: false,
356356
key: {
357357
type: "VIdentifier",
358358
range: [token.range[0], token.range[1]],
359-
loc: {start: token.loc.start, end: token.loc.end},
359+
loc: { start: token.loc.start, end: token.loc.end },
360360
parent: DUMMY_PARENT,
361361
name: token.value,
362362
rawName: this.text.slice(token.range[0], token.range[1]),
@@ -385,7 +385,7 @@ export class IntermediateTokenizer {
385385
this.attribute.value = {
386386
type: "VLiteral",
387387
range: [token.range[0], token.range[1]],
388-
loc: {start: token.loc.start, end: token.loc.end},
388+
loc: { start: token.loc.start, end: token.loc.end },
389389
parent: this.attribute,
390390
value: token.value,
391391
}
@@ -473,7 +473,7 @@ export class IntermediateTokenizer {
473473
this.currentToken = {
474474
type: "StartTag",
475475
range: [token.range[0], token.range[1]],
476-
loc: {start: token.loc.start, end: token.loc.end},
476+
loc: { start: token.loc.start, end: token.loc.end },
477477
name: token.value,
478478
rawName: this.text.slice(token.range[0] + 1, token.range[1]),
479479
selfClosing: false,
@@ -548,7 +548,7 @@ export class IntermediateTokenizer {
548548
this.currentToken = {
549549
type: "Mustache",
550550
range: [start.range[0], token.range[1]],
551-
loc: {start: start.loc.start, end: token.loc.end},
551+
loc: { start: start.loc.start, end: token.loc.end },
552552
value,
553553
startToken: start,
554554
endToken: token,

‎src/html/parser.ts

+11-11
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
*/
66
import assert from "assert"
77
import * as lodash from "lodash"
8-
import {ErrorCode, HasLocation, Namespace, NS, ParseError, Token, VAttribute, VDocumentFragment, VElement, VExpressionContainer} from "../ast"
9-
import {debug} from "../common/debug"
10-
import {LocationCalculator} from "../common/location-calculator"
11-
import {convertToDirective, defineScopeAttributeVariable, processMustache, resolveReferences} from "../template"
12-
import {MATHML_ATTRIBUTE_NAME_MAP, SVG_ATTRIBUTE_NAME_MAP} from "./util/attribute-names"
13-
import {HTML_CAN_BE_LEFT_OPEN_TAGS, HTML_NON_FHRASING_TAGS, HTML_RAWTEXT_TAGS, HTML_RCDATA_TAGS, HTML_VOID_ELEMENT_TAGS, SVG_ELEMENT_NAME_MAP} from "./util/tag-names"
14-
import {IntermediateToken, IntermediateTokenizer, EndTag, Mustache, StartTag, Text} from "./intermediate-tokenizer"
15-
import {Tokenizer} from "./tokenizer"
8+
import { ErrorCode, HasLocation, Namespace, NS, ParseError, Token, VAttribute, VDocumentFragment, VElement, VExpressionContainer } from "../ast"
9+
import { debug } from "../common/debug"
10+
import { LocationCalculator } from "../common/location-calculator"
11+
import { convertToDirective, defineScopeAttributeVariable, processMustache, resolveReferences } from "../template"
12+
import { MATHML_ATTRIBUTE_NAME_MAP, SVG_ATTRIBUTE_NAME_MAP } from "./util/attribute-names"
13+
import { HTML_CAN_BE_LEFT_OPEN_TAGS, HTML_NON_FHRASING_TAGS, HTML_RAWTEXT_TAGS, HTML_RCDATA_TAGS, HTML_VOID_ELEMENT_TAGS, SVG_ELEMENT_NAME_MAP } from "./util/tag-names"
14+
import { IntermediateToken, IntermediateTokenizer, EndTag, Mustache, StartTag, Text } from "./intermediate-tokenizer"
15+
import { Tokenizer } from "./tokenizer"
1616

1717
const DIRECTIVE_NAME = /^(?:v-|[:@]).*[^.:@]$/
1818
const DT_DD = /^d[dt]$/
@@ -181,8 +181,8 @@ export class Parser {
181181
type: "VDocumentFragment",
182182
range: [0, 0],
183183
loc: {
184-
start: {line: 1, column: 0},
185-
end: {line: 1, column: 0},
184+
start: { line: 1, column: 0 },
185+
end: { line: 1, column: 0 },
186186
},
187187
parent: null,
188188
children: [],
@@ -341,7 +341,7 @@ export class Parser {
341341
const element: VElement = {
342342
type: "VElement",
343343
range: [token.range[0], token.range[1]],
344-
loc: {start: token.loc.start, end: token.loc.end},
344+
loc: { start: token.loc.start, end: token.loc.end },
345345
parent,
346346
name: adjustElementName(token.name, namespace),
347347
rawName: token.rawName,

‎src/html/tokenizer.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
* See LICENSE file in root directory for full license.
55
*/
66
import assert from "assert"
7-
import {debug} from "../common/debug"
8-
import {ErrorCode, Namespace, NS, ParseError, Token} from "../ast"
9-
import {alternativeCR} from "./util/alternative-cr"
10-
import {entitySets} from "./util/entities"
7+
import { debug } from "../common/debug"
8+
import { ErrorCode, Namespace, NS, ParseError, Token } from "../ast"
9+
import { alternativeCR } from "./util/alternative-cr"
10+
import { entitySets } from "./util/entities"
1111
import {
1212
AMPERSAND, APOSTROPHE, CARRIAGE_RETURN, EOF, EQUALS_SIGN, EXCLAMATION_MARK,
1313
GRAVE_ACCENT, GREATER_THAN_SIGN, HYPHEN_MINUS, isControl, isDigit,
@@ -383,8 +383,8 @@ export class Tokenizer {
383383
type,
384384
range: [offset, -1],
385385
loc: {
386-
start: {line, column},
387-
end: {line: -1, column: -1},
386+
start: { line, column },
387+
end: { line: -1, column: -1 },
388388
},
389389
value: "",
390390
}

‎src/index.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
*/
66
import * as path from "path"
77
import * as AST from "./ast"
8-
import {LocationCalculator} from "./common/location-calculator"
9-
import {HTMLParser, HTMLTokenizer} from "./html"
10-
import {parseScript, parseScriptElement} from "./script"
8+
import { LocationCalculator } from "./common/location-calculator"
9+
import { HTMLParser, HTMLTokenizer } from "./html"
10+
import { parseScript, parseScriptElement } from "./script"
1111
import * as services from "./parser-services"
1212

1313
const STARTS_WITH_LT = /^\s*</
@@ -106,4 +106,4 @@ export function parse(code: string, options: any): AST.ESLintProgram {
106106
return parseForESLint(code, options).ast
107107
}
108108

109-
export {AST}
109+
export { AST }

‎src/parser-services.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import EventEmitter from "events"
77
import NodeEventGenerator from "./external/node-event-generator"
88
import TokenStore from "./external/token-store"
9-
import {traverseNodes, ESLintProgram, VElement} from "./ast"
9+
import { traverseNodes, ESLintProgram, VElement } from "./ast"
1010

1111
//------------------------------------------------------------------------------
1212
// Helpers
@@ -21,7 +21,7 @@ const stores = new WeakMap<object, TokenStore>()
2121

2222
/**
2323
* Define the parser service
24-
* @param rootAST
24+
* @param rootAST
2525
*/
2626
export function define(rootAST: ESLintProgram) {
2727
return {

0 commit comments

Comments
 (0)