remove amp-toolbox for now

composer.json

@@ -12,7 +12,6 @@
   ],
   "minimum-stability": "dev",
   "require": {
-    "ampproject/amp-toolbox": "^0.2",
     "ampproject/amp-wp": "dev-main",
     "ext-libxml": "*",
     "ext-dom": "*",

config/amped.php

@@ -9,13 +9,8 @@
 use Arrowsgm\Amped\AmpUtils\Sanitizers\TagAndAttributeSanitizer;
 use Arrowsgm\Amped\AmpUtils\Sanitizers\IframeSanitizer;
 use Arrowsgm\Amped\AmpUtils\Sanitizers\VideoSanitizer;
-use Arrowsgm\Amped\Http\Middleware\OptimizeAmp;
 
 return [
-    'middleware' => [
-        'amped.optimize' => OptimizeAmp::class,
-    ],
-
     'amp_custom_css_path' => public_path('css'),
 
     'amp_custom_css_max_size' => 75000,

src/Amped.php

@@ -3,8 +3,6 @@
 namespace Arrowsgm\Amped;
 
 
-use AmpProject\Optimizer\ErrorCollection;
-use AmpProject\Optimizer\TransformationEngine;
 use Arrowsgm\Amped\AmpUtils\AmpContent;
 use Arrowsgm\Amped\Exceptions\ConfigNotLoadedException;
 use Illuminate\Support\Facades\File;
@@ -109,29 +107,4 @@ public function isDevParam() :string
     {
         return env('APP_DEBUG') ? '#development=1' : '';
     }
-
-    /**
-     * Optimize amp-html
-     * TODO: Errors?
-     *
-     * @param mixed $html_page
-     *
-     * @return string
-     */
-	public function optimize($html_page): string
-	{
-		if (! is_string($html_page) || !$html_page) {
-			return $html_page;
-		}
-
-        $transformationEngine = new TransformationEngine();
-        $errorCollection      = new ErrorCollection;
-
-        $optimizedHtml = $transformationEngine->optimizeHtml(
-            $html_page,
-            $errorCollection
-        );
-
-		return $optimizedHtml ?: $html_page;
-    }
-}
+}

src/AmpedLaravelServiceProvider.php

@@ -5,7 +5,6 @@
 use AMP_Autoloader;
 use Arrowsgm\Amped\Exceptions\AmpPluginNotFoundException;
 use Illuminate\Foundation\AliasLoader;
-use Illuminate\Routing\Router;
 use Illuminate\Support\ServiceProvider;
 use Arrowsgm\Amped\Facades\Amped;
 
@@ -30,7 +29,7 @@ public function register()
      * Bootstrap services.
      *
      * @return void
-     * @throws AmpPluginNotFoundException|\Illuminate\Contracts\Container\BindingResolutionException
+     * @throws AmpPluginNotFoundException
      */
     public function boot()
     {
@@ -42,7 +41,6 @@ public function boot()
 
         $this->registerFacades();
         $this->registerConfig();
-        $this->registerMiddleware();
     }
 
     /**
@@ -107,21 +105,4 @@ private function registerConfig()
         Amped::sanitizers(config('amped.sanitizers'));
         Amped::args(config('amped.args'));
     }
-
-    /**
-     * Register any default fields to the app.
-     *
-     * @return void
-     * @throws \Illuminate\Contracts\Container\BindingResolutionException
-     */
-    private function registerMiddleware()
-    {
-        $router = $this->app->make(Router::class);
-
-        foreach(config('amped.middleware', []) as $name => $class ){
-            if($name || class_exists($class)) {
-                $router->aliasMiddleware($name, $class);
-            }
-        }
-    }
 }

src/Facades/Amped.php

@@ -11,7 +11,6 @@
  * @method static string convert(string $html)
  * @method static string inlineCss(string $css_file, string $attr = 'amp-custom')
  * @method static string isDevParam()
- * @method static mixed optimize(mixed $html)
  */
 
 use Illuminate\Support\Facades\Facade;