Skip to content
This repository has been archived by the owner on Mar 3, 2020. It is now read-only.

Commit

Permalink
Merge branch 'release/1.0.14'
Browse files Browse the repository at this point in the history
  • Loading branch information
thetutlage committed Oct 31, 2017
2 parents f536ea2 + a3804d7 commit 56b5228
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 4 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
<a name="1.0.14"></a>
## [1.0.14](https://github.com/adonisjs/adonis-ignitor/compare/v1.0.13...v1.0.14) (2017-10-31)


### Bug Fixes

* **helpers:** return true from isAceCommand when executed via adonis global ([6117093](https://github.com/adonisjs/adonis-ignitor/commit/6117093)), closes [#3](https://github.com/adonisjs/adonis-ignitor/issues/3)



<a name="1.0.13"></a>
## [1.0.13](https://github.com/adonisjs/adonis-ignitor/compare/v1.0.12...v1.0.13) (2017-10-29)

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@adonisjs/ignitor",
"version": "1.0.13",
"version": "1.0.14",
"description": "Fire the adonis-app (in good sense)",
"main": "index.js",
"scripts": {
Expand Down
10 changes: 9 additions & 1 deletion src/Helpers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,15 @@ class Helpers {
*/
isAceCommand () {
const processFile = process.mainModule.filename
return processFile.endsWith('ace')
if (processFile.endsWith('ace')) {
return true
}

/**
* When command is executed via `adonis cli`, then ace is a children
* of the process mainModule
*/
return !!process.mainModule.children.find((child) => child.filename.endsWith('ace'))
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/Ignitor/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ const Helpers = require('../Helpers')
const hooks = require('../Hooks')

const WARNING_MESSAGE = `
WARNING: Adonis has detect an unhandled promise rejection, which may
WARNING: Adonis has detected an unhandled promise rejection, which may
cause undesired behavior in production.
Make sure to always attach (catch) method on promises and wrap await
To stop this warning, use catch() on promises and wrap await
calls inside try/catch.
`

Expand Down

0 comments on commit 56b5228

Please sign in to comment.