diff --git a/bin/pm2 b/bin/pm2 index 19dbbcafc..3ee1ac760 100755 --- a/bin/pm2 +++ b/bin/pm2 @@ -3,7 +3,7 @@ var semver = require('semver'); -if (semver.satisfies(process.versions.node, '>= 5.7.0')) +if (semver.satisfies(process.versions.node, '>= 6.0.0')) require('v8-compile-cache'); process.env.PM2_USAGE = 'CLI'; diff --git a/lib/API.js b/lib/API.js index 3c84365c4..d99b8d312 100644 --- a/lib/API.js +++ b/lib/API.js @@ -17,7 +17,7 @@ const fclone = require('fclone'); var conf = require('../constants.js'); var Client = require('./Client'); var Common = require('./Common'); -var KMDaemon = require('keymetrics-agent/src/InteractorClient'); +var KMDaemon = require('@pm2/agent/src/InteractorClient'); var Config = require('./tools/Config'); var Modularizer = require('./API/Modules/Modularizer.js'); var path_structure = require('../paths.js'); diff --git a/lib/API/Configuration.js b/lib/API/Configuration.js index cebc8529e..321a295e4 100644 --- a/lib/API/Configuration.js +++ b/lib/API/Configuration.js @@ -6,7 +6,7 @@ var chalk = require('chalk'); var async = require('async'); var Configuration = require('../Configuration.js'); //@todo double check that imported methods works -var InteractorDaemonizer = require('keymetrics-agent/src/InteractorClient'); +var InteractorDaemonizer = require('@pm2/agent/src/InteractorClient'); module.exports = function(CLI) { diff --git a/lib/API/Interaction.js b/lib/API/Interaction.js index 3181127ac..8feaa69da 100644 --- a/lib/API/Interaction.js +++ b/lib/API/Interaction.js @@ -6,7 +6,7 @@ var chalk = require('chalk'); var async = require('async'); var path = require('path'); var fs = require('fs'); -var KMDaemon = require('keymetrics-agent/src/InteractorClient'); +var KMDaemon = require('@pm2/agent/src/InteractorClient'); var pkg = require('../../package.json') module.exports = function(CLI) { diff --git a/lib/API/Keymetrics/cli-api.js b/lib/API/Keymetrics/cli-api.js index 18107f85b..308521439 100644 --- a/lib/API/Keymetrics/cli-api.js +++ b/lib/API/Keymetrics/cli-api.js @@ -5,7 +5,7 @@ var chalk = require('chalk'); var async = require('async'); var path = require('path'); var fs = require('fs'); -var KMDaemon = require('keymetrics-agent/src/InteractorClient'); +var KMDaemon = require('@pm2/agent/src/InteractorClient'); var KM = require('./kmapi.js'); var Table = require('cli-table-redemption'); var open = require('../../tools/open.js'); diff --git a/lib/Client.js b/lib/Client.js index 1ddc0d224..cf5eb2229 100644 --- a/lib/Client.js +++ b/lib/Client.js @@ -6,7 +6,7 @@ var debug = require('debug')('pm2:client'); var Common = require('./Common.js'); -var KMDaemon = require('keymetrics-agent/src/InteractorClient'); +var KMDaemon = require('@pm2/agent/src/InteractorClient'); var rpc = require('pm2-axon-rpc'); var async = require('async'); var axon = require('pm2-axon'); diff --git a/lib/Common.js b/lib/Common.js index 5762f5c2d..bae553738 100644 --- a/lib/Common.js +++ b/lib/Common.js @@ -23,7 +23,7 @@ var isBinary = require('./tools/isbinaryfile.js'); var cst = require('../constants.js'); var extItps = require('./API/interpreter.json'); var Config = require('./tools/Config'); -var KMDaemon = require('keymetrics-agent/src/InteractorClient'); +var KMDaemon = require('@pm2/agent/src/InteractorClient'); var Common = module.exports; diff --git a/lib/Satan.js b/lib/Satan.js index 968a4bbbe..a6c77c264 100644 --- a/lib/Satan.js +++ b/lib/Satan.js @@ -328,7 +328,7 @@ Satan.launchDaemon = function launchDaemon(cb) { debug('Launching daemon'); var SatanJS = p.resolve(p.dirname(module.filename), 'Satan.js'); - var InteractorDaemonizer = require('keymetrics-agent/src/InteractorClient'); + var InteractorDaemonizer = require('@pm2/agent/src/InteractorClient'); var node_args = []; diff --git a/package.json b/package.json index 54ab207a2..6cb2bf9e0 100644 --- a/package.json +++ b/package.json @@ -159,20 +159,20 @@ }, "dependencies": { "@pm2/io": "latest", - "async": "^2.5", + "@pm2/agent": "^0.4.0", + "async": "^2.6", "blessed": "^0.1.81", - "chalk": "^2.3.1", - "chokidar": "^2.0.2", + "chalk": "^2.4.1", + "chokidar": "^2.0.3", "cli-table-redemption": "^1.0.0", - "commander": "2.14.1", + "commander": "2.15.1", "cron": "^1.3", - "debug": "^3.0", + "debug": "^3.1", "eventemitter2": "5.0.1", "fclone": "1.0.11", "fs-extra": "^5.0.0", - "keymetrics-agent": "^0.4.0", "mkdirp": "0.5.1", - "moment": "^2.19", + "moment": "^2.22", "needle": "^2.2.0", "nssocket": "0.6.0", "pidusage": "^2.0.6", @@ -181,12 +181,12 @@ "pm2-deploy": "^0.3.9", "pm2-multimeter": "^0.1.2", "promptly": "2.2.0", - "semver": "^5.3", - "shelljs": "0.8.1", + "semver": "^5.5", + "shelljs": "~0.8.2", "source-map-support": "^0.5", "sprintf-js": "1.1.1", - "v8-compile-cache": "^1.1.0", - "vizion": "0.2.0", + "v8-compile-cache": "^2.0.0", + "vizion": "~0.2.0", "yamljs": "^0.3.0" }, "devDependencies": { diff --git a/test/e2e/modules/module.sh b/test/e2e/modules/module.sh index fb1e1c534..715abb2d9 100644 --- a/test/e2e/modules/module.sh +++ b/test/e2e/modules/module.sh @@ -20,11 +20,11 @@ $pm2 unset pm2-probe $pm2 set 'pm2-probe:config1xxx' true -$pm2 install pm2-probe +$pm2 install pm2-probe@latest spec "Should install a module" should 'should app be online' 'online' 1 -$pm2 install pm2-probe +$pm2 install pm2-probe@latest spec "Should update a module" should 'should app be online' 'online' 1