fix(server): HMR for sub-app serverMiddleware without path (nuxt#7146)

pi0 · pooya parsa · commit 30f8834bee73 · 2020-03-31T12:32:20.000+02:00
diff --git a/packages/builder/src/builder.js b/packages/builder/src/builder.js
@@ -742,7 +742,7 @@ export default class Builder {
           }
 
           // Log
-          consola.info(`[HMR] ${chalk.cyan(newItem.route)} (${chalk.grey(fileName)})`)
+          consola.info(`[HMR] ${chalk.cyan(newItem.route || '/')} (${chalk.grey(fileName)})`)
         }
         // Tree may be changed so recreate watcher
         this.serverMiddlewareHMR()
diff --git a/packages/server/src/server.js b/packages/server/src/server.js
@@ -260,6 +260,11 @@ export default class Server {
       (typeof middleware.route === 'string' ? middleware.route : '')
     ).replace(/\/\//g, '/')
 
+    // Strip trailing slash
+    if (middleware.route.endsWith('/')) {
+      middleware.route = middleware.route.slice(0, -1)
+    }
+
     // Assign _middleware to handle to make accessable from app.stack
     middleware.handle._middleware = middleware
 
@@ -294,11 +299,7 @@ export default class Server {
     serverStackItem.handle = handle
 
     // Error State
-    if (route.includes('#error')) {
-      serverStackItem.route = serverStackItem.route || '/'
-    } else {
-      serverStackItem.route = route
-    }
+    serverStackItem.route = route
 
     // Return updated item
     return serverStackItem
diff --git a/packages/server/test/server.test.js b/packages/server/test/server.test.js
@@ -333,7 +333,7 @@ describe('server: server', () => {
 
   test('should use object middleware', () => {
     const nuxt = createNuxt()
-    nuxt.options.router = { base: '/' }
+    nuxt.options.router = { base: '' }
     const server = new Server(nuxt)
     const handler = jest.fn()
 
@@ -348,7 +348,7 @@ describe('server: server', () => {
 
   test('should use function module middleware', () => {
     const nuxt = createNuxt()
-    nuxt.options.router = { base: '/' }
+    nuxt.options.router = { base: '' }
     const server = new Server(nuxt)
     const handler = jest.fn()
     nuxt.resolver.requireModule.mockReturnValueOnce(handler)

Original file line number	Diff line number	Diff line change
`@@ -742,7 +742,7 @@ export default class Builder {`
`742`	`742`	`}`
`743`	`743`
`744`	`744`	`// Log`
`745`		- consola.info(`[HMR] ${chalk.cyan(newItem.route)} (${chalk.grey(fileName)})`)
	`745`	+ consola.info(`[HMR] ${chalk.cyan(newItem.route \|\| '/')} (${chalk.grey(fileName)})`)
`746`	`746`	`}`
`747`	`747`	`// Tree may be changed so recreate watcher`
`748`	`748`	`this.serverMiddlewareHMR()`