From 867e8e1e84d563b336dd34ad03e6cf16e021c9f5 Mon Sep 17 00:00:00 2001
From: Alexander Lichter <manniL@gmx.net>
Date: Sun, 30 Dec 2018 15:28:42 +0100
Subject: [PATCH] fix: plugins for modern mode (#4659)

---
 packages/builder/src/builder.js |  4 ++--
 packages/webpack/src/builder.js | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/builder/src/builder.js b/packages/builder/src/builder.js
index 61730e6cb5..075173fc21 100644
--- a/packages/builder/src/builder.js
+++ b/packages/builder/src/builder.js
@@ -146,8 +146,8 @@ export default class Builder {
       }
 
       const modes = ['client', 'server']
-      const modernPattern = new RegExp(`\\.(${modes.join('|')})\\.\\w+$`)
-      pluginFiles[0].replace(modernPattern, (_, mode) => {
+      const modePattern = new RegExp(`\\.(${modes.join('|')})\\.\\w+$`)
+      pluginFiles[0].replace(modePattern, (_, mode) => {
         // mode in nuxt.config has higher priority
         if (p.mode === 'all' && modes.includes(mode)) {
           p.mode = mode
diff --git a/packages/webpack/src/builder.js b/packages/webpack/src/builder.js
index f24d6d8cfc..c66286d91b 100644
--- a/packages/webpack/src/builder.js
+++ b/packages/webpack/src/builder.js
@@ -66,15 +66,15 @@ export class WebpackBundler {
         clientConfig.resolve.alias[p.name] = p.mode === 'server' ? './empty.js' : p.src
       }
 
+      // Modern config
+      if (modernConfig && !modernConfig.resolve.alias[p.name]) {
+        modernConfig.resolve.alias[p.name] = p.mode === 'server' ? './empty.js' : p.src
+      }
+
       // Server config
       if (serverConfig && !serverConfig.resolve.alias[p.name]) {
         serverConfig.resolve.alias[p.name] = p.mode === 'client' ? './empty.js' : p.src
       }
-
-      // Modern config
-      if (modernConfig && !modernConfig.resolve.alias[p.name]) {
-        modernConfig.resolve.alias[p.name] = p.mode === 'client' ? './empty.js' : p.src
-      }
     }
 
     // Check styleResource existence