Skip to content

Commit

Permalink
Merge pull request #789 from spencermountain/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
spencermountain authored Oct 16, 2020
2 parents 7376f02 + a21bdd5 commit f1c5b50
Show file tree
Hide file tree
Showing 101 changed files with 4,809 additions and 1,198 deletions.
35 changes: 23 additions & 12 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,31 +1,32 @@
{
"root": true,
"env": {
"node": true,
"browser": true
},
"globals": {
"Promise": true
"es6": true,
"browser": true,
"node": true
},
"parserOptions": {
"ecmaVersion": 6,
"ecmaVersion": 2017,
"sourceType": "module",
"ecmaFeatures": {
"jsx": false
}
"ecmaFeatures": {}
},
"extends": [],
"rules": {
"semi": ["warn", "never"],
"indent": ["error", 2],
"spaced-comment": 0,
"no-cond-assign": 2,
"no-var": 1,
"prefer-const": 0,
"no-extra-parens": 0,
"no-dupe-keys": 2,
"no-undef": 2,
"no-unreachable": 2,
"eqeqeq": 1,
"keyword-spacing": 0,
"no-native-reassign": 2,
"no-redeclare": 2,
"radix": 1,
"indent": 0,
"quotes": [0, "single", "avoid-escape"],
"no-shadow": 2,
"no-unused-vars": 1,
Expand All @@ -38,7 +39,17 @@
"no-octal-escape": 2,
"no-constant-condition": 1,
"no-unused-expressions": 2,
"no-undefined": 0,
"no-undef": 2
"comma-dangle": [1, "only-multiline"],
"space-before-function-paren": 0,
"max-len": [
"error",
{
"code": 120,
"ignoreComments": true,
"ignoreStrings": true,
"ignoreTemplateLiterals": true,
"ignoreRegExpLiterals": true
}
]
}
}
29 changes: 29 additions & 0 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# sends test-coverage data to codecov.io
# https://codecov.io/gh/spencermountain/compromise
name: Coverage

on:
push:
branches: [master]
pull_request:
branches: [master]

jobs:
getCoverage:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/[email protected]
with:
node-version: '12'

- uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
- run: npm ci
- run: npm run codecov
2 changes: 1 addition & 1 deletion builds/compromise-tokenize.js

Large diffs are not rendered by default.

536 changes: 405 additions & 131 deletions builds/compromise.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion builds/compromise.min.js

Large diffs are not rendered by default.

536 changes: 405 additions & 131 deletions builds/compromise.mjs

Large diffs are not rendered by default.

11 changes: 10 additions & 1 deletion changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,16 @@ compromise uses semver, and pushes to npm frequently

While all _Major_ releases should be reviewed, our only two _large_ releases are **v6** in 2016 and and **v12** in 2019. Others have been mostly incremental, or niche.

#### [Unreleased]
<!-- #### [Unreleased] -->

#### 13.6.0

- **[new]** first-attempt at `verbs().subject()` method
- **[change]** avoid conjugating imperative tense - 'please close the door'
- **[change]** misc tagging fixes #786
- **[change]** .nouns() results split on quotations #783
- **[change]** NumberRange must be < 4 digits #735
- **[change]** reduction in #Person tag false-positives

#### 13.5.0

Expand Down
2 changes: 0 additions & 2 deletions data/abbreviations/honorifics.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ module.exports = [
'mrs',
'ms',
'mstr',
'op',
'ord',
'phd',
'prof',
'pvt',
Expand Down
2 changes: 1 addition & 1 deletion data/abbreviations/places.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = [
'ave',
'blvd',
'cl',
'ct',
// 'ct',
'cres',
'hwy',
//states
Expand Down
Loading

0 comments on commit f1c5b50

Please sign in to comment.