Skip to content

Commit

Permalink
meta tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
sindresorhus committed May 18, 2016
1 parent 9f27b14 commit 6e09483
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 15 deletions.
5 changes: 1 addition & 4 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[package.json]
[{package.json,*.yml}]
indent_style = space
indent_size = 2

[*.md]
trim_trailing_whitespace = false
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
sudo: false
language: node_js
node_js:
- 'iojs'
- '6'
- '4'
- '0.12'
- '0.10'
script: 'npm test && npm run bench'
2 changes: 1 addition & 1 deletion bench.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* global bench */
'use strict';
/* global bench */
var fs = require('fs');
var rimraf = require('rimraf');
var globbyMaster = require('globby');
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"devDependencies": {
"glob-stream": "wearefractal/glob-stream#master",
"globby": "sindresorhus/globby#master",
"matcha": "^0.6.0",
"matcha": "^0.7.0",
"mocha": "*",
"rimraf": "^2.2.8",
"xo": "*"
Expand Down
12 changes: 6 additions & 6 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,25 +32,25 @@ globby(['*', '!cake']).then(paths => {

### globby(patterns, [options])

Returns a promise that resolves to an array of matching paths.
Returns a Promise for an array of matching paths.

### globby.sync(patterns, [options])

Returns an array of matching paths.

### globby.generateGlobTasks(patterns, [options])

Returns an array of objects in the format `{ pattern: String, opts: Object }`, which can be passed as arguments to [node-glob](https://github.com/isaacs/node-glob). This is useful for other globbing-related packages.
Returns an array of objects in the format `{ pattern: string, opts: Object }`, which can be passed as arguments to [`node-glob`](https://github.com/isaacs/node-glob). This is useful for other globbing-related packages.

#### patterns

Type: `string`, `array`
Type: `string`, `Array`

See supported `minimatch` [patterns](https://github.com/isaacs/minimatch#usage).

#### options

Type: `object`
Type: `Object`

See the `node-glob` [options](https://github.com/isaacs/node-glob#options).

Expand All @@ -65,7 +65,7 @@ Just a quick overview.
- `{}` allows for a comma-separated list of "or" expressions
- `!` at the beginning of a pattern will negate the match

[Various patterns and expected matches](https://github.com/sindresorhus/multimatch/blob/master/test.js).
[Various patterns and expected matches.](https://github.com/sindresorhus/multimatch/blob/master/test.js)


## Related
Expand All @@ -77,4 +77,4 @@ Just a quick overview.

## License

MIT © [Sindre Sorhus](http://sindresorhus.com)
MIT © [Sindre Sorhus](https://sindresorhus.com)

0 comments on commit 6e09483

Please sign in to comment.