From ef2c177a7b3350d89c835f0ccdd2712085131e73 Mon Sep 17 00:00:00 2001
From: Thibaud Colas <thibaudcolas@gmail.com>
Date: Thu, 28 May 2020 23:59:37 +0100
Subject: [PATCH] Remove only usage of Webpack aliases and resolver,
 incompatible with new setup

---
 .eslintrc                                                      | 2 +-
 client/webpack.config.js                                       | 3 ---
 .../admin/static_src/wagtailadmin/app/wagtailadmin.entry.js    | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 3ca48fe5ca9..bd61bdc831a 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -8,7 +8,7 @@
   "settings": {
     "import/resolver": {
       "webpack": {
-        "config": "webpack/prod.config.js"
+        "config": "client/webpack.config.js"
       }
     }
   },
diff --git a/client/webpack.config.js b/client/webpack.config.js
index b8a4f0fcf7d..51e630ad8e1 100644
--- a/client/webpack.config.js
+++ b/client/webpack.config.js
@@ -42,9 +42,6 @@ module.exports = function exports() {
     ],
     resolve: {
       extensions: ['.ts', '.tsx', '.js'],
-      alias: {
-        'wagtail-client': path.resolve('.', 'client'),
-      },
     },
     module: {
       rules: [
diff --git a/wagtail/admin/static_src/wagtailadmin/app/wagtailadmin.entry.js b/wagtail/admin/static_src/wagtailadmin/app/wagtailadmin.entry.js
index 03fad10c348..b355a6cfbdd 100644
--- a/wagtail/admin/static_src/wagtailadmin/app/wagtailadmin.entry.js
+++ b/wagtail/admin/static_src/wagtailadmin/app/wagtailadmin.entry.js
@@ -9,7 +9,7 @@ import {
   initSkipLink,
   initIE11Warning,
   initUpgradeNotification,
-} from 'wagtail-client';
+} from '../../../../../client/src/index';
 
 if (process.env.NODE_ENV === 'development') {
   // Run react-axe in development only, so it does not affect performance