From bf13d522a3a8f301ad081ebe36067b99374b2fc6 Mon Sep 17 00:00:00 2001
From: Raissa North <raissa@silverstripe.com>
Date: Mon, 29 Jan 2018 11:50:39 +1300
Subject: [PATCH] FIX Update Requirements references to new build paths

---
 composer.json                                  | 5 ++++-
 src/Forms/GridField/GridFieldAddByDBField.php  | 2 +-
 src/Forms/GridField/GridFieldBlogPostState.php | 2 +-
 src/Model/Blog.php                             | 5 ++---
 src/Model/BlogMemberExtension.php              | 5 ++---
 src/Model/BlogPost.php                         | 5 ++---
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/composer.json b/composer.json
index b1417c6..4c0f3e0 100755
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,10 @@
     "extra": {
         "branch-alias": {
             "dev-master": "3.0.x-dev"
-        }
+        },
+        "expose": [
+            "client/dist"
+        ]
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Forms/GridField/GridFieldAddByDBField.php b/src/Forms/GridField/GridFieldAddByDBField.php
index 50781a0..ccdc854 100644
--- a/src/Forms/GridField/GridFieldAddByDBField.php
+++ b/src/Forms/GridField/GridFieldAddByDBField.php
@@ -159,7 +159,7 @@ class GridFieldAddByDBField implements GridField_ActionProvider, GridField_HTMLP
      */
     public function getHTMLFragments($gridField)
     {
-        Requirements::javascript(ModuleLoader::getModule('silverstripe/blog')->getRelativeResourcePath('js/gridfieldaddbydbfield.js'));
+        Requirements::javascript('silverstripe/blog:client/dist/js/main.bundle.js');
 
         /**
          * @var DataList $dataList
diff --git a/src/Forms/GridField/GridFieldBlogPostState.php b/src/Forms/GridField/GridFieldBlogPostState.php
index 4b5a4de..f2bdc51 100644
--- a/src/Forms/GridField/GridFieldBlogPostState.php
+++ b/src/Forms/GridField/GridFieldBlogPostState.php
@@ -21,7 +21,7 @@ class GridFieldBlogPostState extends GridFieldSiteTreeState
     public function getColumnContent($gridField, $record, $columnName)
     {
         if ($columnName == 'State') {
-            Requirements::css('silverstripe/blog:css/cms.css');
+            Requirements::css('silverstripe/blog:client/dist/styles/main.css');
             if ($record instanceof BlogPost) {
                 $modifiedLabel = '';
 
diff --git a/src/Model/Blog.php b/src/Model/Blog.php
index 565ce41..3a465ee 100644
--- a/src/Model/Blog.php
+++ b/src/Model/Blog.php
@@ -189,9 +189,8 @@ class Blog extends Page implements PermissionProvider
      */
     protected function addCMSRequirements()
     {
-        $module = ModuleLoader::getModule('silverstripe/blog');
-        Requirements::css($module->getRelativeResourcePath('css/cms.css'));
-        Requirements::javascript($module->getRelativeResourcePath('js/cms.js'));
+        Requirements::css('silverstripe/blog:client/dist/styles/main.css');
+        Requirements::javascript('silverstripe/blog:client/dist/js/main.bundle.js');
     }
     /**
      * {@inheritdoc}
diff --git a/src/Model/BlogMemberExtension.php b/src/Model/BlogMemberExtension.php
index 45da9e7..4ee4f73 100644
--- a/src/Model/BlogMemberExtension.php
+++ b/src/Model/BlogMemberExtension.php
@@ -113,9 +113,8 @@ class BlogMemberExtension extends DataExtension
         $fields->removeFieldFromTab('Root', 'BlogPosts');
 
         // Construct a better posts tab.
-        $module = ModuleLoader::getModule('silverstripe/blog');
-        Requirements::css($module->getRelativeResourcePath('css/cms.css'));
-        Requirements::javascript($module->getRelativeResourcePath('js/cms.js'));
+        Requirements::css('silverstripe/blog:client/dist/styles/main.css');
+        Requirements::javascript('silverstripe/blog:client/dist/js/main.bundle.js');
 
         $tab = Tab::create('BlogPosts', _t(__CLASS__ . '.TABBLOGPOSTS', 'Blog Posts'));
 
diff --git a/src/Model/BlogPost.php b/src/Model/BlogPost.php
index cb13057..f013954 100644
--- a/src/Model/BlogPost.php
+++ b/src/Model/BlogPost.php
@@ -211,9 +211,8 @@ class BlogPost extends Page
      */
     public function getCMSFields()
     {
-        $module = ModuleLoader::getModule('silverstripe/blog');
-        Requirements::css($module->getRelativeResourcePath('css/cms.css'));
-        Requirements::javascript($module->getRelativeResourcePath('js/cms.js'));
+        Requirements::css('silverstripe/blog:client/dist/styles/main.css');
+        Requirements::javascript('silverstripe/blog:client/dist/js/main.bundle.js');
 
         $this->beforeUpdateCMSFields(function ($fields) {
             $uploadField = UploadField::create('FeaturedImage', _t(__CLASS__ . '.FeaturedImage', 'Featured Image'));