feat(cli): "serve" cmd new param: "index" (defaults to /index.html)

Author: rstoenescu

cli/bin/quasar-serve

@@ -13,20 +13,22 @@ const argv = parseArgs(process.argv.slice(2), {
     c: 'cache',
     m: 'micro',
     history: 'history',
+    i: 'index',
     https: 'https',
     C: 'cert',
     K: 'key',
     P: 'proxy',
     h: 'help'
   },
-  boolean: ['g', 'https', 'colors', 'S', 'history', 'h'],
-  string: ['H', 'C', 'K'],
+  boolean: ['g', 'https', 'colors', 'history', 'h'],
+  string: ['H', 'C', 'K', 'i'],
   default: {
     p: process.env.PORT || 4000,
     H: process.env.HOSTNAME || '0.0.0.0',
     g: true,
     c: 24 * 60 * 60,
     m: 1,
+    i: 'index.html',
     colors: true
   }
 })
@@ -44,26 +46,31 @@ if (argv.help) {
     control is yielded to /index.js and params have no effect.
 
   Options
-    --port, -p             Port to use (default: 4000)
-    --hostname, -H         Address to use (default: 0.0.0.0)
-    --gzip, -g             Compress content (default: true)
-    --silent, -s           Supress log message
-    --colors               Log messages with colors (default: true)
-    --open, -o             Open browser window after starting
-    --cache, -c <number>   Cache time (max-age) in seconds;
-                           Does not apply to /service-worker.js
-                           (default: 86400 - 24 hours)
-    --micro, -m <seconds>  Use micro-cache (default: 1 second)
-    --history              Use history api fallback;
-                           All requests fallback to index.html
-    --https                Enable HTTPS
-    --cert, -C [path]      Path to SSL cert file (Optional)
-    --key, -K [path]       Path to SSL key file (Optional)
-    --proxy <file.js>      Proxy specific requests defined in file;
-                           File must export Array ({ path, rule })
-                           See example below. "rule" is defined at:
-                           https://github.com/chimurai/http-proxy-middleware
-    --help, -h             Displays this message
+    --port, -p              Port to use (default: 4000)
+    --hostname, -H          Address to use (default: 0.0.0.0)
+    --gzip, -g              Compress content (default: true)
+    --silent, -s            Supress log message
+    --colors                Log messages with colors (default: true)
+    --open, -o              Open browser window after starting
+    --cache, -c <number>    Cache time (max-age) in seconds;
+                            Does not apply to /service-worker.js
+                            (default: 86400 - 24 hours)
+    --micro, -m <seconds>   Use micro-cache (default: 1 second)
+
+    --history               Use history api fallback;
+                              All requests fallback to /index.html,
+                              unless using "--index" parameter
+    --index, -i <file>      History mode (only!) index url path
+                              (default: index.html)
+
+    --https                 Enable HTTPS
+    --cert, -C [path]       Path to SSL cert file (Optional)
+    --key, -K [path]        Path to SSL key file (Optional)
+    --proxy <file.js>       Proxy specific requests defined in file;
+                            File must export Array ({ path, rule })
+                            See example below. "rule" is defined at:
+                            https://github.com/chimurai/http-proxy-middleware
+    --help, -h              Displays this message
 
   Proxy file example
     module.exports = [
@@ -127,9 +134,15 @@ if (ssrDetected === false) {
       : false
 
   function serve (path, cache) {
-    return express.static(resolve(path), {
+    const opts = {
       maxAge: cache ? parseInt(argv.cache, 10) * 1000 : 0
-    })
+    }
+
+    if (argv.history !== true) {
+      opts.index = argv.index
+    }
+
+    return express.static(resolve(path), opts)
   }
 
   const app = express()
@@ -155,7 +168,13 @@ if (ssrDetected === false) {
 
   if (argv.history) {
     const history = require('connect-history-api-fallback')
-    app.use(history())
+    app.use(
+      history({
+        index: argv.index.startsWith('/')
+          ? argv.index
+          : '/' + argv.index
+      })
+    )
   }
 
   app.use('/', serve('.', true))
@@ -212,6 +231,7 @@ if (ssrDetected === false) {
       ['Cache (max-age)', argv.cache || 'disabled'],
       microCacheSeconds ? ['Micro-cache', microCacheSeconds + 's'] : '',
       argv.history ? ['History mode', 'enabled'] : '',
+      argv.history ? ['History mode index', argv.index] : '',
       argv.proxy ? ['Proxy definitions', argv.proxy] : ''
     ]
     .filter(msg => msg)

docs/yarn.lock

@@ -940,9 +940,9 @@
     babel-plugin-transform-imports "^1.0.0"
 
 "@quasar/extras@^1.1.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@quasar/extras/-/extras-1.3.2.tgz#d50f34fec235b79d4e570dc7f8b36209b0a9ada1"
-  integrity sha512-EGBvl4By7Cv/WFGD4dc2FX+iLA+GX7YOnDj8AH92Df4pSMDKxP3TdvpXRnKs3V6bfHKyafc3VklVdf30hT5EoA==
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/@quasar/extras/-/extras-1.3.3.tgz#4eade1e9ad4087ec05bee676d2e2cfb5c30c1810"
+  integrity sha512-xRXoIl0ZtRjQbTt6iLsvLMMOy8nyroeh2bahDlQmF14dkIU+gKQqKH7pMyn5as9xJq+Vubyw6957rbyasa8WOQ==
 
 "@quasar/fastclick@1.1.4":
   version "1.1.4"