Skip to content

Commit

Permalink
Merge branch 'feature/typescript_conversion'
Browse files Browse the repository at this point in the history
# Conflicts:
#	bin/bump.js
#	lib/index.js
#	test/specs/commit.spec.js
  • Loading branch information
JamesMessinger committed Mar 11, 2019
2 parents d89d823 + 2ed54c6 commit 19cce02
Show file tree
Hide file tree
Showing 67 changed files with 5,877 additions and 1,927 deletions.
11 changes: 0 additions & 11 deletions .eslintrc.yml

This file was deleted.

25 changes: 25 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Git attributes
# https://git-scm.com/docs/gitattributes
# https://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes

# Normalize line endings for all files that git determines to be text.
# https://git-scm.com/docs/gitattributes#gitattributes-Settostringvalueauto
* text=auto

# Normalize line endings to LF on checkin, and do NOT convert to CRLF when checking-out on Windows.
# https://git-scm.com/docs/gitattributes#gitattributes-Settostringvaluelf
*.txt text eol=lf
*.html text eol=lf
*.md text eol=lf
*.css text eol=lf
*.scss text eol=lf
*.map text eol=lf
*.js text eol=lf
*.jsx text eol=lf
*.ts text eol=lf
*.tsx text eol=lf
*.json text eol=lf
*.yml text eol=lf
*.yaml text eol=lf
*.xml text eol=lf
*.svg text eol=lf
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ pids
# Dependencies
node_modules

# Build output
/lib

# Test output
/.nyc_output
/coverage
14 changes: 14 additions & 0 deletions .mocharc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Mocha options
# https://mochajs.org/#configuring-mocha-nodejs
# https://github.com/mochajs/mocha/blob/master/example/config/.mocharc.yml

spec:
- test/fixtures/setup-mocks.js
- test/fixtures/mocha-hooks.js
- test/specs/**/*.spec.js

bail: true
timeout: 10000
slow: 2000
retries: 2
recursive: true
8 changes: 6 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,18 @@ language: node_js
node_js:
- 10
- 8
- 6

os:
- linux
- osx
- windows

script: npm run lint && npm run coverage
before_script:
- npm run lint
- npm run build

script:
- npm run coverage

after_success:
# send code-coverage data to Coveralls
Expand Down
4 changes: 2 additions & 2 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ title: Version Bump Prompt
logo: https://jsdevtools.org/img/logos/logo.png

author:
twitter: JS_DevTools
twitter: JSDevTools

google_analytics: UA-68102273-3

twitter:
username: JS_DevTools
username: JSDevTools
card: summary

defaults:
Expand Down
Loading

0 comments on commit 19cce02

Please sign in to comment.