tonyair/silverstripe-webpack
1
1
Fork 0
mirror of https://github.com/a2nt/silverstripe-webpack.git synced 2024-10-22 17:05:31 +02:00
Code Issues Projects Releases Wiki Activity

Minor bugfixtures

Browse Source
This commit is contained in:
Tony Air 2020-04-24 17:31:16 +07:00
parent 5891ff3ff8
commit 860b176359
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/Pages/PageController.php
View File

@ -6,6 +6,7 @@
use SilverStripe\Control\Controller; use SilverStripe\Control\Controller;
use SilverStripe\CMS\Controllers\ContentController; use SilverStripe\CMS\Controllers\ContentController;
use SilverStripe\Control\Director;
use SilverStripe\ORM\FieldType\DBDatetime; use SilverStripe\ORM\FieldType\DBDatetime;
use SilverStripe\View\ArrayData; use SilverStripe\View\ArrayData;
use SilverStripe\CMS\Model\SiteTree; use SilverStripe\CMS\Model\SiteTree;

1
app/src/Templates/WebpackTemplateProvider.php
View File

@ -122,6 +122,7 @@ class WebpackTemplateProvider implements TemplateGlobalProvider
$cfg = self::config(); $cfg = self::config();
return strpos($path, '//') === false ? return strpos($path, '//') === false ?
Controller::join_links( Controller::join_links(
RESOURCES_DIR,
self::projectName(), self::projectName(),
$cfg['dist'], $cfg['dist'],
(strpos($path, '.css') ? 'css' : 'js'), (strpos($path, '.css') ? 'css' : 'js'),