Skip to content

Commit

Permalink
fix for node v10
Browse files Browse the repository at this point in the history
  • Loading branch information
rbren committed Sep 18, 2018
1 parent 25ebae0 commit 711eab7
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 5 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
language: node_js
node_js:
- "6"
- "10"
script:
- npm link
- npm link datafire
Expand Down
5 changes: 3 additions & 2 deletions bin/datafire
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/usr/bin/env node
if (process.version > 'v6') {
var version = require('../src/util/node-version.js');
if (version > 6) {
module.exports = require('../src/cmd');
} else {
module.exports = require('../distribution/cmd');
module.exports = require('../distribution/src/cmd');
}
9 changes: 8 additions & 1 deletion src/cmd.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
let yargs = require('yargs').argv;
let logger = require('./util/logger');
let npath = require('path');

let packageFile = npath.join(__dirname, '..');
if (packageFile.endsWith('distribution')) {
packageFile = npath.join(packageFile, '..');
}
packageFile = npath.join(packageFile, 'package.json');

const COMMANDS = [{
name: 'version',
description: "Shows the current version",
runner: args => {
console.log("DataFire v" + require('../package').version);
console.log("DataFire v" + require(packageFile).version);
return Promise.resolve();
}
}, {
Expand Down
3 changes: 2 additions & 1 deletion src/entry.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
if (process.version > 'v6') {
var version = require('./util/node-version.js');
if (version > 6) {
module.exports = require('./index');
} else {
module.exports = require('../distribution/src/index');
Expand Down
3 changes: 2 additions & 1 deletion src/test/flow.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ describe('Flow', () => {
})
})
.then(_ => {
if (process.version < 'v6') {
let version = require('../util/node-version');
if (version <= 4) {
delete results[2]; // FIXME: last result not getting added in node v4.2
}
expect(context.results).to.deep.equal(results);
Expand Down
4 changes: 4 additions & 0 deletions src/util/node-version.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// Note: keep this file compatible with old NodeJS versions (<= 4)
var version = process.version.substring(1);
version = +version.split('.')[0];
module.exports = version;

0 comments on commit 711eab7

Please sign in to comment.