From 9a115805636a6b15f7f2998015f32a2f11c9f2f3 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Tue, 3 Oct 2017 18:15:41 +1300
Subject: [PATCH] Patch webpack-config temporarily

---
 .eslintrc.js | 11 +++++++++++
 package.json |  8 ++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index c55d198a..8592269d 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1 +1,12 @@
 module.exports = require('@silverstripe/webpack-config/.eslintrc');
+
+// @todo Remove once upgrading webpack-config to 0.4.0
+module.exports.settings['import/resolver'].node.moduleDirectory = [
+  '.',
+  'client/src',
+  '../admin/client/src',
+  '../admin/node_modules',
+  'vendor/silverstripe/admin/client/src',
+  'vendor/silverstripe/admin/node_modules',
+  'node_modules'
+];
diff --git a/package.json b/package.json
index fb0a4b63..14fa484c 100644
--- a/package.json
+++ b/package.json
@@ -59,10 +59,10 @@
     "moduleDirectories": [
       "client/src",
       "node_modules",
-      "../silverstripe-admin/client/src",
-      "../silverstripe-admin",
-      "silverstripe-admin/client/src",
-      "silverstripe-admin",
+      "../admin/client/src",
+      "../admin",
+      "vendor/silverstripe/admin/client/src",
+      "vendor/silverstripe/admin",
       "node_modules/@silverstripe/webpack-config/node_modules"
     ],
     "testMatch": [