From 2fc3f80f1f48b322acaeed0522ca6ee1a94f1d25 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Tue, 3 Oct 2017 17:04:05 +1300
Subject: [PATCH 1/2] Fix tinymce issue Fix phpunit path issue

---
 .travis.yml |  2 +-
 _config.php | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8480ebb9..4fe92675 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -72,4 +72,4 @@ after_success:
   - if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi
 
 after_failure:
-  - if [[ $BEHAT_TEST ]]; then php ./framework/tests/behat/travis-upload-artifacts.php --if-env BEHAT_TEST,ARTIFACTS_BUCKET,ARTIFACTS_KEY,ARTIFACTS_SECRET --target-path $TRAVIS_REPO_SLUG/$TRAVIS_BUILD_ID/$TRAVIS_JOB_ID --artifacts-base-url https://s3.amazonaws.com/$ARTIFACTS_BUCKET/ --artifacts-path ./artifacts/; fi
+  - if [[ $BEHAT_TEST ]]; then php ./vendor/silverstripe/framework/tests/behat/travis-upload-artifacts.php --if-env BEHAT_TEST,ARTIFACTS_BUCKET,ARTIFACTS_KEY,ARTIFACTS_SECRET --target-path $TRAVIS_REPO_SLUG/$TRAVIS_BUILD_ID/$TRAVIS_JOB_ID --artifacts-base-url https://s3.amazonaws.com/$ARTIFACTS_BUCKET/ --artifacts-path ./artifacts/; fi
diff --git a/_config.php b/_config.php
index 761749b9..55e418d1 100644
--- a/_config.php
+++ b/_config.php
@@ -16,10 +16,12 @@ call_user_func(function () {
 
     // Enable insert-link to internal pages
     TinyMCEConfig::get('cms')
-        ->enablePlugins(array(
-            'sslinkinternal' => $module->getResource('client/dist/js/TinyMCE_sslink-internal.js')->getURL(),
-            'sslinkanchor' => $module->getResource('client/dist/js/TinyMCE_sslink-anchor.js')->getURL()
-        ));
+        ->enablePlugins([
+            'sslinkinternal' => $module
+                ->getResource('client/dist/js/TinyMCE_sslink-internal.js'),
+            'sslinkanchor' => $module
+                ->getResource('client/dist/js/TinyMCE_sslink-anchor.js'),
+        ]);
 });
 
 

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 2/2] 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": [