Merge branch 'release/4.0.12'

CHANGELOG.md

@@ -1,3 +1,17 @@
+## [4.0.12](https://github.com/adonisjs/adonis-cli/compare/4.0.11...4.0.12) (2019-04-11)
+
+
+### Bug Fixes
+
+* package.json to reduce vulnerabilities ([#130](https://github.com/adonisjs/adonis-cli/issues/130)) ([57b5520](https://github.com/adonisjs/adonis-cli/commit/57b5520))
+
+
+### Features
+
+* **serve:** merge --ext with default in development mode ([#126](https://github.com/adonisjs/adonis-cli/issues/126)) ([a6fa0dd](https://github.com/adonisjs/adonis-cli/commit/a6fa0dd))
+
+
+
 <a name="4.0.11"></a>
 ## [4.0.11](https://github.com/adonisjs/adonis-cli/compare/v4.0.10...v4.0.11) (2019-01-18)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adonisjs/cli",
-  "version": "4.0.11",
+  "version": "4.0.12",
   "description": "Command line tool for Adonisjs",
   "keywords": [
     "adonis",
@@ -36,7 +36,7 @@
     "gradient-string": "^1.2.0",
     "is-git-url": "^1.0.0",
     "lodash": "^4.17.11",
-    "marked": "^0.5.2",
+    "marked": "^0.6.2",
     "nodemon": "^1.18.7",
     "opn": "^5.4.0",
     "pluralize": "^7.0.0",

src/Commands/Serve/index.js

@@ -31,7 +31,7 @@ class Serve extends Command {
     serve
     { --dev : Start development server }
     { -w, --watch=@value : A custom set of only files to watch },
-    { -e, --ext=@value : A custom set of extensions to watch },
+    { -e, --ext=@value : A custom set of extensions to watch. In development, they will be merged with the default .js and .json },
     { -i, --ignore=@value : A custom set of folders to ignore watching },
     { -p, --polling : Use polling to find file changes. Also required when using Docker }
     { --debug?=@value: Start server in debug mode }
@@ -146,7 +146,11 @@ class Serve extends Command {
      * The file extensions only when dev mode
      * is true
      */
-    ext = ext || (dev ? 'js json' : 'null')
+    if (dev) {
+      ext = `${ext || ''} js json`
+    } else {
+      ext = ext || 'null'
+    }
 
     /**
      * Directories to watch