diff --git a/commands/start.js b/commands/start.js index 1567b75..9825dd9 100644 --- a/commands/start.js +++ b/commands/start.js @@ -16,7 +16,7 @@ function * run (context) { execArgv.push(context.args.processname) } else { let procfile = context.flags.procfile || 'Procfile' - let procHash = require('foreman/lib/procfile.js').loadProc(procfile) + let procHash = require('@heroku/foreman/lib/procfile.js').loadProc(procfile) let processes = Object.keys(procHash).filter((x) => x !== 'release') execArgv.push(processes.join(',')) } diff --git a/lib/run_foreman.js b/lib/run_foreman.js index f55080d..f9b480e 100644 --- a/lib/run_foreman.js +++ b/lib/run_foreman.js @@ -1 +1 @@ -require('foreman/nf.js') +require('@heroku/foreman/nf.js') diff --git a/package.json b/package.json index 07185f5..d3941ca 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,8 @@ "url": "https://github.com/heroku/heroku-local/issues" }, "dependencies": { + "@heroku/foreman": "^2.0.1", "co": "^4.6.0", - "foreman": "https://github.com/heroku/node-foreman.git", "heroku-cli-util": "^6.2.0", "lodash.flatten": "^4.4.0" }, diff --git a/test/version.bats b/test/version.bats index 6f8d3ea..2c6245d 100755 --- a/test/version.bats +++ b/test/version.bats @@ -8,5 +8,5 @@ setup() { run heroku local:version echo $output [ "$status" -eq 0 ] - [[ "$output" =~ "2.0.0" ]] + [[ "$output" =~ "2.0" ]] } diff --git a/yarn.lock b/yarn.lock index daf102f..44e2900 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,6 +2,15 @@ # yarn lockfile v1 +"@heroku/foreman@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@heroku/foreman/-/foreman-2.0.1.tgz#093d96f181e1b7d1dcd6984cd71654c8d036366f" + dependencies: + commander "~2.9.0" + http-proxy "~1.11.1" + mustache "^2.2.1" + shell-quote "~1.4.2" + acorn-jsx@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"