Skip to content

Commit 34a3b4e

Browse files
committed
⚒ upgrade dependencies
1 parent 7d72969 commit 34a3b4e

11 files changed

+48
-22
lines changed

Diff for: .eslintrc.yml

+7
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,10 @@ overrides:
99
- error
1010
- allowModules:
1111
- estree
12+
13+
settings:
14+
node:
15+
tryExtensions:
16+
- .ts
17+
- .js
18+
- .json

Diff for: .nycrc

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"include": [
3+
"src/**/*.ts"
4+
],
5+
"exclude": [
6+
"src/external/**/*.ts"
7+
],
8+
"extension": [
9+
".ts"
10+
],
11+
"require": [
12+
"ts-node/register"
13+
],
14+
"reporter": [
15+
"lcov",
16+
"text-summary"
17+
],
18+
"sourceMap": true
19+
}

Diff for: package.json

+10-11
Original file line numberDiff line numberDiff line change
@@ -35,40 +35,39 @@
3535
"dts-bundle": "^0.7.3",
3636
"eslint": "^5.13.0",
3737
"fs-extra": "^7.0.1",
38-
"mocha": "^5.2.0",
38+
"mocha": "^6.1.4",
3939
"npm-run-all": "^4.1.5",
40-
"nyc": "^13.2.0",
40+
"nyc": "^14.0.0",
4141
"opener": "^1.5.1",
4242
"rimraf": "^2.6.3",
4343
"rollup": "^1.1.2",
4444
"rollup-plugin-node-resolve": "^4.0.0",
4545
"rollup-plugin-sourcemaps": "^0.4.2",
46-
"rollup-watch": "^4.3.1",
47-
"typescript": "~3.3.1",
46+
"ts-node": "^8.1.0",
47+
"typescript": "~3.4.4",
4848
"wait-on": "^3.2.0",
4949
"warun": "^1.0.0"
5050
},
5151
"scripts": {
52-
"_mocha": "_mocha \"test/*.js\" --reporter dot --timeout 10000",
5352
"prebuild": "npm run -s clean",
54-
"build": "tsc && rollup -c -o index.js && dts-bundle --name vue-eslint-parser --main .temp/index.d.ts --out ../index.d.ts",
53+
"build": "tsc --module es2015 && rollup -c -o index.js && dts-bundle --name vue-eslint-parser --main .temp/index.d.ts --out ../index.d.ts",
5554
"clean": "rimraf .nyc_output .temp coverage index.*",
56-
"codecov": "nyc report --reporter lcovonly && codecov",
57-
"coverage": "nyc report --reporter lcov && opener ./coverage/lcov-report/index.html",
55+
"codecov": "codecov",
56+
"coverage": "opener ./coverage/lcov-report/index.html",
5857
"lint": "eslint src test --ext .js,.ts",
5958
"setup": "git submodule update --init && cd test/fixtures/eslint && npm install",
6059
"pretest": "run-s build lint",
61-
"test": "nyc npm run _mocha",
60+
"test": "nyc mocha \"test/*.js\" --reporter dot --timeout 10000",
6261
"preupdate-fixtures": "npm run -s build",
6362
"update-fixtures": "node scripts/update-fixtures-ast.js",
6463
"preversion": "npm test",
6564
"version": "npm run -s build",
6665
"postversion": "git push && git push --tags",
6766
"prewatch": "npm run -s clean",
6867
"watch": "run-p watch:*",
69-
"watch:tsc": "tsc --watch",
68+
"watch:tsc": "tsc --module es2015 --watch",
7069
"watch:rollup": "wait-on .temp/index.js && rollup -c -o index.js --watch",
71-
"watch:test": "wait-on index.js && warun index.js \"test/*.js\" \"test/fixtures/ast/*/*.json\" \"test/fixtures/*\" --debounce 1000 --no-initial -- nyc -r lcov npm run -s _mocha",
70+
"watch:test": "wait-on index.js && warun index.js \"test/*.js\" \"test/fixtures/ast/*/*.json\" \"test/fixtures/*\" --debounce 1000 --no-initial -- nyc mocha \"test/*.js\" --reporter dot --timeout 10000",
7271
"watch:update-ast": "wait-on index.js && warun index.js \"test/fixtures/ast/*/*.vue\" -- node scripts/update-fixtures-ast.js",
7372
"watch:coverage-report": "wait-on coverage/lcov-report/index.html && opener coverage/lcov-report/index.html"
7473
},

Diff for: test/ast.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ const assert = require("assert")
1313
const fs = require("fs")
1414
const path = require("path")
1515
const lodash = require("lodash")
16-
const parser = require("..")
16+
const parser = require("../src")
1717
const Linter = require("./fixtures/eslint").Linter
1818

1919
//------------------------------------------------------------------------------
2020
// Helpers
2121
//------------------------------------------------------------------------------
2222

23-
const PARSER = path.resolve(__dirname, "..")
23+
const PARSER = path.resolve(__dirname, "../src/index.ts")
2424
const ROOT = path.join(__dirname, "fixtures/ast")
2525
const TARGETS = fs.readdirSync(ROOT)
2626
const PARSER_OPTIONS = {

Diff for: test/core-rules.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const RuleTester = require("./fixtures/eslint/lib/testers/rule-tester")
1919

2020
const RULE_DEFS_ROOT = path.join(__dirname, "fixtures/eslint/lib/rules")
2121
const RULE_TESTS_ROOT = path.join(__dirname, "fixtures/eslint/tests/lib/rules")
22-
const PARSER_PATH = path.resolve(__dirname, "../index.js")
22+
const PARSER_PATH = path.resolve(__dirname, "../src/index.ts")
2323
const EXCEPTIONS = new Set([
2424
// Those rules check outside `<script>` tag as well.
2525
// It cannot fix the behavior in vue-eslint-parser side.

Diff for: test/fixtures/eslint

Submodule eslint updated 268 files

Diff for: test/index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
const assert = require("assert")
1313
const path = require("path")
1414
const fs = require("fs-extra")
15-
const parse = require("..").parse
16-
const parseForESLint = require("..").parseForESLint
15+
const parse = require("../src").parse
16+
const parseForESLint = require("../src").parseForESLint
1717
const eslint = require("./fixtures/eslint")
1818
const CLIEngine = eslint.CLIEngine
1919
const Linter = eslint.Linter
@@ -24,7 +24,7 @@ const Linter = eslint.Linter
2424

2525
const ORIGINAL_FIXTURE_DIR = path.join(__dirname, "fixtures")
2626
const FIXTURE_DIR = path.join(__dirname, "temp")
27-
const PARSER_PATH = path.resolve(__dirname, "../index.js")
27+
const PARSER_PATH = path.resolve(__dirname, "../src/index.ts")
2828

2929
//------------------------------------------------------------------------------
3030
// Tests

Diff for: test/parser-options.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
const assert = require("assert")
88
const { rules } = require("@mysticatea/eslint-plugin")
9-
const parseForESLint = require("..").parseForESLint
9+
const { parseForESLint } = require("../src")
1010
const eslint = require("./fixtures/eslint")
1111
const Linter = eslint.Linter
1212

Diff for: test/tokens.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//------------------------------------------------------------------------------
1111

1212
const assert = require("assert")
13-
const parse = require("..").parseForESLint
13+
const parse = require("../src").parseForESLint
1414

1515
//------------------------------------------------------------------------------
1616
// Helpers

Diff for: test/variables-references.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//------------------------------------------------------------------------------
1111

1212
const assert = require("assert")
13-
const parse = require("..").parseForESLint
13+
const parse = require("../src").parseForESLint
1414

1515
//------------------------------------------------------------------------------
1616
// Helpers

Diff for: tsconfig.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@
99
"baseUrl": ".",
1010
"checkJs": false,
1111
"declaration": true,
12+
"esModuleInterop": true,
1213
"forceConsistentCasingInFileNames": true,
1314
"inlineSources": true,
1415
"lib": [
1516
"es2015"
1617
],
17-
"module": "es2015",
18+
"module": "commonjs",
1819
"moduleResolution": "node",
1920
"newLine": "LF",
2021
"noEmitOnError": true,

0 commit comments

Comments
 (0)