Skip to content

Commit e676e84

Browse files
Merge pull request #99 from gridsome/build/upgrade-deps
build: upgrade deps
2 parents 765764c + 54664ee commit e676e84

File tree

6 files changed

+1507
-3044
lines changed

6 files changed

+1507
-3044
lines changed

.eslintrc.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ module.exports = {
33
parserOptions: {
44
ecmaVersion: 2017,
55
project: "tsconfig.json",
6+
sourceType: "module",
67
},
8+
79
extends: ["plugin:@mysticatea/es2017", "plugin:@mysticatea/+eslint-plugin"],
810
rules: {
911
"@mysticatea/prettier": [

package-lock.json

Lines changed: 1486 additions & 3024 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,37 +47,40 @@
4747
"build": "tsc --project ./tsconfig.build.json"
4848
},
4949
"dependencies": {
50-
"@typescript-eslint/experimental-utils": "^2.33.0",
50+
"@typescript-eslint/experimental-utils": "^3.3.0",
5151
"prettier": "^2.0.5",
5252
"vue-eslint-parser": "^7.1.0"
5353
},
5454
"devDependencies": {
5555
"@mysticatea/eslint-plugin": "^13.0.0",
5656
"@types/chai": "^4.2.11",
57-
"@types/eslint": "^6.8.1",
57+
"@types/eslint": "^7.2.0",
5858
"@types/mocha": "^7.0.2",
5959
"@types/prettier": "^2.0.0",
60-
"all-contributors-cli": "^6.14.2",
60+
"all-contributors-cli": "^6.16.0",
6161
"chai": "^4.2.0",
6262
"change-case": "^4.1.1",
6363
"commitizen": "^4.1.2",
6464
"cz-conventional-changelog": "^3.2.0",
65-
"eslint": "^6.8.0",
65+
"eslint": "^7.3.0",
6666
"hygen": "^5.0.3",
67-
"lint-staged": "^10.2.2",
68-
"mocha": "^7.1.2",
67+
"lint-staged": "^10.2.11",
68+
"mocha": "^8.0.1",
6969
"npm-run-all": "^4.1.5",
7070
"shipjs": "^0.18.4",
71-
"ts-node": "^8.10.1",
72-
"typescript": "^3.9.2",
73-
"vuepress": "^1.4.1"
71+
"ts-node": "^8.10.2",
72+
"typescript": "^3.9.5",
73+
"vuepress": "^1.5.2"
7474
},
7575
"engines": {
7676
"node": "^10.13.0 || ^12.13.0 || ^13.0.0 || >=14.0.0"
7777
},
7878
"publishConfig": {
7979
"access": "public"
8080
},
81+
"peerDependencies": {
82+
"eslint": ">=6.0.0"
83+
},
8184
"lint-staged": {
8285
"*.js": [
8386
"prettier --write",

tools/update-rules-list.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const rulesListPath = `${DIR_LIB}/rules.ts`;
66

77
export const updateRulesList = async () => {
88
const { rulesMetaData } = await getRulesMetaData();
9-
const { list } = createRulesList(rulesMetaData);
9+
const { list } = await createRulesList(rulesMetaData);
1010

1111
if (list !== undefined) {
1212
fs.writeFileSync(rulesListPath, list);

tools/util/create-rules-list.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const exportSection = (ruleNames: RuleMetaData["name"][]) => {
2828
${footer}
2929
`;
3030
};
31-
export const createRulesList = (rulesMetaData: RuleMetaData[]) => {
31+
export const createRulesList = async (rulesMetaData: RuleMetaData[]) => {
3232
const ruleNames = rulesMetaData.map((ruleMetaData) => ruleMetaData.name);
3333

3434
const content = `
@@ -37,5 +37,5 @@ export const createRulesList = (rulesMetaData: RuleMetaData[]) => {
3737
${exportSection(ruleNames)}
3838
`;
3939

40-
return { list: formatTypescript(content) };
40+
return { list: await formatTypescript(content) };
4141
};

tools/util/format-typescript.ts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
import eslint from "eslint";
22

3-
export const formatTypescript = (content: string) => {
4-
// @todo Use `ESLint.lintText`, if @types/eslint supports ESLint class. https://eslint.org/blog/2020/05/eslint-v7.0.0-released#new-eslint-class
5-
const linter = new eslint.CLIEngine({
6-
fix: true,
7-
});
8-
// @see https://github.com/typescript-eslint/typescript-eslint/issues/885#issuecomment-523083616
9-
const report = linter.executeOnText(content, "tools/util/index.ts");
3+
export const formatTypescript = async (content: string) => {
4+
const linter = new eslint.ESLint({ fix: true });
5+
const results = await linter.lintText(content);
106

11-
return report.results[0].output;
7+
return results[0].output;
128
};

0 commit comments

Comments
 (0)