refactor: not detect modern browser if modern mode is disabled

nuxt · Feb 14, 2019 · 2b4d79c · 2b4d79c
1 parent 636e7e1
commit 2b4d79c
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/packages/server/src/middleware/modern.js b/packages/server/src/middleware/modern.js
@@ -53,8 +53,7 @@ const detectModernBrowser = ({ socket = {}, headers }) => {
 }
 
 const setModernMode = (req, options) => {
-  const { socket = {} } = req
-  const { isModernBrowser } = socket
+  const { socket: { isModernBrowser } = {} } = req
   if (options.modern === 'server') {
     req.modernMode = isModernBrowser
   }
@@ -65,7 +64,9 @@ const setModernMode = (req, options) => {
 
 export default ({ context }) => (req, res, next) => {
   detectModernBuild(context)
-  detectModernBrowser(req)
-  setModernMode(req, context.options)
+  if (context.options.modern !== false) {
+    detectModernBrowser(req)
+    setModernMode(req, context.options)
+  }
   next()
 }