File tree Expand file tree Collapse file tree 1 file changed +7
-7
lines changed Expand file tree Collapse file tree 1 file changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -61,7 +61,7 @@ protected static function updateBootstrapping()
61
61
{
62
62
copy (__DIR__ .'/tabler-stubs/webpack.mix.js ' , base_path ('webpack.mix.js ' ));
63
63
64
- if (self ::isLaravel57orUp ()) {
64
+ if (! self ::expectsAssetsFolder ()) {
65
65
file_put_contents (base_path ('webpack.mix.js ' ),
66
66
str_replace (
67
67
'assets/ ' ,
@@ -111,20 +111,20 @@ protected static function compileControllerStub()
111
111
*/
112
112
protected static function getResourcePath ($ path = '' )
113
113
{
114
- if (self ::isLaravel57orUp ()) {
115
- return resource_path ($ path );
114
+ if (self ::expectsAssetsFolder ()) {
115
+ return resource_path (' assets/ ' . $ path );
116
116
}
117
117
118
- return resource_path (' assets/ ' . $ path );
118
+ return resource_path ($ path );
119
119
}
120
120
121
121
/**
122
- * Is running in Laravel 5.7 or up ?
122
+ * Should we expect to see an assets folder within this version of Laravel ?
123
123
*
124
124
* @return bool
125
125
*/
126
- protected static function isLaravel57orUp ()
126
+ protected static function expectsAssetsFolder ()
127
127
{
128
- return (int ) str_replace ('. ' , '' , app ()->version ()) >= 570 ;
128
+ return (int ) str_replace ('. ' , '' , app ()->version ()) < 570 ;
129
129
}
130
130
}
You can’t perform that action at this time.
0 commit comments