Skip to content

Commit

Permalink
update dependencies and devDependencies
Browse files Browse the repository at this point in the history
Highlights:

* update array-to-sentence from v1 to v2
* introduce rollup-config-module to adapt to .mjs-based ecosystem
* update ESLint from v3 to v4
* introduce @shinnn/eslint-config and follow its coding rules, for example tab indent
* switch from istanbul to nyc
  • Loading branch information
shinnn committed Apr 5, 2018
1 parent 8d9b4ca commit b595e65
Show file tree
Hide file tree
Showing 9 changed files with 4,792 additions and 132 deletions.
7 changes: 5 additions & 2 deletions .editorconfig
Expand Up @@ -3,10 +3,13 @@ root = true
[*]
charset = utf-8
end_of_line = lf
indent_style = space
indent_size = 2
indent_style = tab
tab_width = 2
insert_final_newline = true
trim_trailing_whitespace = true

[*.{md,yml}]
indent_style = space

[*.md]
trim_trailing_whitespace = false
2 changes: 1 addition & 1 deletion .gitignore
@@ -1,3 +1,3 @@
bower_components
.nyc_output
coverage
node_modules
7 changes: 1 addition & 6 deletions .travis.yml
@@ -1,10 +1,5 @@
git:
depth: 1
branches:
except: /^v\d/
language: node_js
node_js: node
script: npm run-script pretest && npm run-script coverage
after_script:
- npm install istanbul-coveralls
- node node_modules/.bin/istanbul-coveralls
after_script: node_modules/.bin/nyc report --reporter=text-lcov | npx coveralls
12 changes: 0 additions & 12 deletions browser.js

This file was deleted.

22 changes: 12 additions & 10 deletions index.js
@@ -1,15 +1,17 @@
'use strict';

var arrayToSentence = require('array-to-sentence');

/*!
* array-to-sentence-ja | ISC (c) Shinnosuke Watanabe
* https://github.com/shinnn/array-to-sentence-ja
*/
'use strict';

var arrayToSentence = require('array-to-sentence');
var objectAssign = require('object-assign');

module.exports = function arrayToSentenceJa(arr, options) {
return arrayToSentence(arr, objectAssign({
separator: '、',
lastSeparator: 'および'
}, options));
};
function arrayToSentenceJa(arr, options) {
return arrayToSentence(arr, Object.assign({
separator: '、',
lastSeparator: 'および'
}, options));
}

module.exports = arrayToSentenceJa;
8 changes: 4 additions & 4 deletions index.jsnext.js → index.mjs
Expand Up @@ -5,8 +5,8 @@
import arrayToSentence from 'array-to-sentence';

export default function arrayToSentenceJa(arr, options) {
return arrayToSentence(arr, Object.assign({
separator: '、',
lastSeparator: 'および'
}, options));
return arrayToSentence(arr, Object.assign({
separator: '、',
lastSeparator: 'および'
}, options));
}

0 comments on commit b595e65

Please sign in to comment.