Skip to content

Commit 81e9719

Browse files
authored
Merge pull request #52 from textlint-rule/modern
refactor: update dependencies
2 parents 082f030 + 513ac70 commit 81e9719

File tree

12 files changed

+3649
-2562
lines changed

12 files changed

+3649
-2562
lines changed

.babelrc

Lines changed: 0 additions & 12 deletions
This file was deleted.

.eslintrc

Lines changed: 0 additions & 7 deletions
This file was deleted.

.githooks/pre-commit

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/bin/sh
2+
npx --no-install lint-staged

.github/workflows/test.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: test
2+
on: [push, pull_request]
3+
jobs:
4+
test:
5+
name: "Test on Node.js ${{ matrix.node-version }}"
6+
runs-on: ubuntu-latest
7+
strategy:
8+
matrix:
9+
node-version: [ 12, 14, 16 ]
10+
steps:
11+
- name: checkout
12+
uses: actions/checkout@v2
13+
- name: setup Node.js ${{ matrix.node-version }}
14+
uses: actions/setup-node@v2
15+
with:
16+
node-version: ${{ matrix.node-version }}
17+
- name: Install
18+
run: yarn install
19+
- name: Test
20+
run: yarn test

.travis.yml

Lines changed: 0 additions & 8 deletions
This file was deleted.

ReadMe.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# textlint-rule-write-good
22

33
[![npm](https://img.shields.io/npm/v/textlint-rule-write-good.svg)](https://www.npmjs.com/package/textlint-rule-write-good)
4-
[![Build Status](https://travis-ci.org/textlint-rule/textlint-rule-write-good.svg?branch=master)](https://travis-ci.org/textlint-rule/textlint-rule-write-good)
4+
[![Actions Status: test](https://github.com/textlint-rule/textlint-rule-write-good/workflows/test/badge.svg)](https://github.com/textlint-rule/textlint-rule-write-good/actions?query=workflow%3A"test")
55
[![Dependency Status](https://david-dm.org/textlint-rule/textlint-rule-write-good.svg)](https://david-dm.org/textlint-rule/textlint-rule-write-good)
66
[![devDependency Status](https://david-dm.org/textlint-rule/textlint-rule-write-good/dev-status.svg)](https://david-dm.org/textlint-rule/textlint-rule-write-good#info=devDependencies)
77

package.json

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,43 +7,48 @@
77
},
88
"main": "lib/write-good.js",
99
"scripts": {
10-
"build": "babel src -d lib --source-maps",
10+
"build": "textlint-scripts build",
1111
"prepublish": "npm run --if-present build",
12-
"test": "npm-run-all lint mocha",
13-
"lint": "eslint --fix src test",
14-
"mocha": "mocha",
12+
"test": "textlint-scripts test",
1513
"precommit": "lint-staged",
16-
"prettier": "prettier --write \"**/*.{js,json,md}\""
14+
"format": "prettier --write \"**/*.{js,jsx,ts,tsx,css}\"",
15+
"prepare": "git config --local core.hooksPath .githooks"
1716
},
18-
"files": ["lib", "src"],
19-
"keywords": ["textlint", "rule", "english", "proofreading"],
17+
"files": [
18+
"lib",
19+
"src"
20+
],
21+
"keywords": [
22+
"textlint",
23+
"rule",
24+
"english",
25+
"proofreading"
26+
],
2027
"author": "nodaguti",
2128
"license": "MIT",
2229
"bugs": "https://github.com/textlint-rule/textlint-rule-write-good/issues",
2330
"homepage": "https://github.com/textlint-rule/textlint-rule-write-good",
2431
"repository": "textlint-rule/textlint-rule-write-good",
2532
"dependencies": {
26-
"textlint-rule-helper": "^2.0.0",
33+
"textlint-rule-helper": "^2.2.0",
2734
"write-good": "^0.11.0"
2835
},
2936
"lint-staged": {
30-
"*.js": ["prettier", "git add"],
31-
"*.json": ["prettier", "git add"]
37+
"*.{js,jsx,ts,tsx,css}": [
38+
"prettier --write"
39+
]
3240
},
3341
"devDependencies": {
34-
"babel-cli": "^6.26.0",
35-
"babel-core": "^6.26.0",
36-
"babel-preset-env": "^1.6.1",
37-
"eslint": "^4.13.1",
38-
"eslint-config-airbnb-base": "^12.1.0",
39-
"eslint-config-prettier": "^2.9.0",
40-
"eslint-plugin-import": "^2.8.0",
41-
"husky": "^0.14.3",
42-
"lint-staged": "^6.0.0",
43-
"mocha": "^4.0.1",
44-
"npm-run-all": "^4.1.2",
45-
"prettier": "^1.9.2",
46-
"textlint": "^9.1.1",
47-
"textlint-tester": "^3.0.3"
42+
"lint-staged": "^11.0.0",
43+
"npm-run-all": "^4.1.5",
44+
"prettier": "^2.3.1",
45+
"textlint-scripts": "^12.0.1",
46+
"textlint-tester": "^12.0.0"
47+
},
48+
"prettier": {
49+
"singleQuote": false,
50+
"printWidth": 120,
51+
"tabWidth": 4,
52+
"trailingComma": "none"
4853
}
4954
}

src/write-good.js

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
import { RuleHelper } from 'textlint-rule-helper';
2-
import writeGood from 'write-good';
1+
import { RuleHelper } from "textlint-rule-helper";
2+
import writeGood from "write-good";
33

44
function reporter(context, options = {}) {
5-
const { Syntax, getSource, report, RuleError } = context;
6-
const helper = new RuleHelper(context);
5+
const { Syntax, getSource, report, RuleError } = context;
6+
const helper = new RuleHelper(context);
77

8-
return {
9-
[Syntax.Str](node) {
10-
if (helper.isChildNode(node, [Syntax.BlockQuote])) {
11-
return;
12-
}
8+
return {
9+
[Syntax.Str](node) {
10+
if (!helper.isPlainStrNode(node)) {
11+
return;
12+
}
1313

14-
const text = getSource(node);
15-
const suggestions = writeGood(text, options);
14+
const text = getSource(node);
15+
const suggestions = writeGood(text, options);
1616

17-
suggestions.forEach((suggestion) => {
18-
const { index, reason: message } = suggestion;
17+
suggestions.forEach((suggestion) => {
18+
const { index, reason: message } = suggestion;
1919

20-
report(node, new RuleError(message, { index }));
21-
});
22-
},
23-
};
20+
report(node, new RuleError(message, { index }));
21+
});
22+
}
23+
};
2424
}
2525

2626
export default {
27-
linter: reporter,
28-
fixer: reporter,
27+
linter: reporter,
28+
fixer: reporter
2929
};

test/.eslintrc

Lines changed: 0 additions & 5 deletions
This file was deleted.

test/mocha.opts

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)