Remove only usage of Webpack aliases and resolver, incompatible with …

…new setup
wagtail · Oct 21, 2020 · ef2c177 · ef2c177
1 parent d0dd682
commit ef2c177
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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