Skip to content

Commit ee71fd6

Browse files
authored
Merge pull request #57 from stevex86/chore/bump-fs-extra-7.0.0
Bump node-promisify, include executive for promisified child_process
2 parents 4c655dc + a8e4e76 commit ee71fd6

File tree

6 files changed

+2451
-13
lines changed

6 files changed

+2451
-13
lines changed

.travis.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
sudo: true
2+
13
env:
24
matrix:
3-
- export NODE_VERSION="4" CC=clang CXX=clang++ npm_config_clang=1
45
- export NODE_VERSION="6" CC=clang CXX=clang++ npm_config_clang=1
5-
- export NODE_VERSION="7" CC=clang CXX=clang++ npm_config_clang=1
6+
- export NODE_VERSION="8" CC=clang CXX=clang++ npm_config_clang=1
7+
- export NODE_VERSION="10" CC=clang CXX=clang++ npm_config_clang=1
68

79
branches:
810
only:
@@ -14,6 +16,7 @@ git:
1416
compiler: clang
1517

1618
before_install:
19+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p; fi
1720
- git clone https://github.com/creationix/nvm.git ./.nvm
1821
- source ./.nvm/nvm.sh
1922
- nvm install $NODE_VERSION

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
environment:
33
matrix:
44
# Node.js
5-
- nodejs_version: "4"
65
- nodejs_version: "6"
7-
- nodejs_version: "7"
6+
- nodejs_version: "8"
7+
- nodejs_version: "10"
88

99
branches:
1010
only:

js/spec/index-spec.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
const nsfw = require('../src/');
22
const path = require('path');
3-
const promisify = require('promisify-node');
4-
const fse = promisify(require('fs-extra'));
5-
const exec = promisify((command, options, callback) =>
6-
require('child_process').exec(command, options, callback));
3+
const fse = require('fs-extra');
4+
const exec = require('executive');
75

86
jasmine.DEFAULT_TIMEOUT_INTERVAL = 120000;
97

js/src/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const { NSFW } = require('../../build/Release/nsfw.node');
2-
const fse = require('promisify-node')(require('fs-extra'));
2+
const fse = require('fs-extra');
33
const path = require('path');
44
const _isInteger = require('lodash.isinteger');
55
const _isUndefined = require('lodash.isundefined');

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@
2727
],
2828
"homepage": "https://github.com/axosoft/node-simple-file-watcher",
2929
"dependencies": {
30-
"fs-extra": "^0.26.5",
30+
"fs-extra": "^7.0.0",
3131
"lodash.isinteger": "^4.0.4",
3232
"lodash.isundefined": "^3.0.1",
33-
"nan": "^2.0.0",
34-
"promisify-node": "^0.3.0"
33+
"nan": "^2.0.0"
3534
},
3635
"devDependencies": {
3736
"babel-cli": "^6.5.1",
3837
"babel-preset-es2015": "^6.5.0",
3938
"eslint": "^2.2.0",
40-
"jasmine-node": "^2.0.0"
39+
"executive": "^1.6.3",
40+
"jasmine-node": "^2.0.1"
4141
},
4242
"keywords": [
4343
"FileWatcher",

0 commit comments

Comments
 (0)