Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[5.5] Mix() won't throw an exception #20603

Merged
merged 12 commits into from
Aug 20, 2017
Merged

[5.5] Mix() won't throw an exception #20603

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7ed8bbf
reports an exception in Mix to be handled on a case by case basis
adampatterson Aug 17, 2017
3d5b16d
Merge branch 'master' of github.com:laravel/framework
adampatterson Aug 17, 2017
97d0d3c
.
adampatterson Aug 17, 2017
4b1c935
.
adampatterson Aug 17, 2017
e777494
.
adampatterson Aug 17, 2017
4a8cdce
.
adampatterson Aug 17, 2017
13e1735
.
adampatterson Aug 17, 2017
c8ba799
.
adampatterson Aug 17, 2017
3e844c7
.
adampatterson Aug 17, 2017
490c7e2
CI doesn’t like the message.
adampatterson Aug 17, 2017
d3e5ab6
removed logging from mix()
adampatterson Aug 17, 2017
0d450fb
will return the mix path if debug is false.
adampatterson Aug 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/Illuminate/Foundation/helpers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,10 +570,12 @@ function mix($path, $manifestDirectory = '')
$manifest = $manifests[$manifestPath];

if (! isset($manifest[$path])) {
throw new Exception(
"Unable to locate Mix file: {$path}. Please check your ".
'webpack.mix.js output paths and try again.'
);
report(new Exception("Unable to locate Mix file: {$path}. Please check your ".
'webpack.mix.js output paths and try again.'));

if (! app('config')->get('app.debug')) {
return $path;
}
}

return new HtmlString($manifestDirectory.$manifest[$path]);
Expand Down