Avoid resolving view when retrieving the previous compiler (Resolves #…

…162).
HTMLMin · Feb 10, 2022 · b23349b · b23349b
1 parent 678b959
commit b23349b
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/src/HTMLMinServiceProvider.php b/src/HTMLMinServiceProvider.php
@@ -30,6 +30,11 @@
  */
 class HTMLMinServiceProvider extends ServiceProvider
 {
+ /**
+ * @var \Illuminate\View\Compilers\CompilerInterface|null
+ */
+ protected $previousCompiler;
+
  /**
  * Boot the service provider.
  *
@@ -164,18 +169,22 @@ protected function registerBladeMinifier()
  */
  protected function registerMinifyCompiler()
  {
- $previousCompiler = $this->app->make('view')
- ->getEngineResolver()
- ->resolve('blade')
- ->getCompiler();
+ if (method_exists($this, 'callAfterResolving')) {
+ $this->callAfterResolving('view', function () {
+ $this->previousCompiler = $this->app->make('view')
+ ->getEngineResolver()
+ ->resolve('blade')
+ ->getCompiler();
+ });
+ }
 
- $this->app->singleton('htmlmin.compiler', function (Container $app) use ($previousCompiler) {
+ $this->app->singleton('htmlmin.compiler', function (Container $app) {
  $blade = $app['htmlmin.blade'];
  $files = $app['files'];
  $storagePath = $app->config->get('view.compiled');
  $ignoredPaths = $app->config->get('htmlmin.ignore', []);
 
- return new MinifyCompiler($blade, $files, $storagePath, $ignoredPaths, $previousCompiler);
+ return new MinifyCompiler($blade, $files, $storagePath, $ignoredPaths, $this->previousCompiler);
  });
 
  $this->app->alias('htmlmin.compiler', MinifyCompiler::class);