Merge remote-tracking branch 'origin/new-toolbar' into new-toolbar

composer.json

@@ -3,7 +3,7 @@
     "type": "library",
     "description": "Yii Debug Viewer",
     "keywords": [
-        "yii", "debug"
+        "yii", "debug", "dev"
     ],
     "homepage": "https://www.yiiframework.com/",
     "license": "BSD-3-Clause",

config/.merge-plan.php

@@ -0,0 +1,182 @@
+<?php
+
+declare(strict_types=1);
+
+// Do not edit. Content will be replaced.
+return [
+    '/' => [
+        'params' => [
+            'yiisoft/assets' => [
+                'config/params.php',
+            ],
+            'yiisoft/data-response' => [
+                'config/params.php',
+            ],
+            'yiisoft/view' => [
+                'config/params.php',
+            ],
+            'yiisoft/router-fastroute' => [
+                'config/params.php',
+            ],
+            'yiisoft/aliases' => [
+                'config/params.php',
+            ],
+            'yiisoft/log-target-file' => [
+                'config/params.php',
+            ],
+            '/' => [
+                'params.php',
+            ],
+        ],
+        'di-web' => [
+            'yiisoft/assets' => [
+                'config/di-web.php',
+            ],
+            'yiisoft/data-response' => [
+                'config/di-web.php',
+            ],
+            'yiisoft/view' => [
+                'config/di-web.php',
+            ],
+            'yiisoft/router-fastroute' => [
+                'config/di-web.php',
+            ],
+            'yiisoft/error-handler' => [
+                'config/di-web.php',
+            ],
+            'yiisoft/yii-event' => [
+                'config/di-web.php',
+            ],
+            '/' => [
+                'di-web.php',
+            ],
+        ],
+        'di' => [
+            'yiisoft/view' => [
+                'config/di.php',
+            ],
+            'yiisoft/router-fastroute' => [
+                'config/di.php',
+            ],
+            'yiisoft/aliases' => [
+                'config/di.php',
+            ],
+            'yiisoft/cache' => [
+                'config/di.php',
+            ],
+            'yiisoft/log-target-file' => [
+                'config/di.php',
+            ],
+            'yiisoft/router' => [
+                'config/di.php',
+            ],
+            'yiisoft/yii-event' => [
+                'config/di.php',
+            ],
+        ],
+        'events-console' => [
+            'yiisoft/log' => [
+                'config/events-console.php',
+            ],
+            'yiisoft/yii-console' => [
+                'config/events-console.php',
+            ],
+        ],
+        'events-web' => [
+            'yiisoft/log' => [
+                'config/events-web.php',
+            ],
+        ],
+        'params-console' => [
+            'yiisoft/yii-console' => [
+                'config/params-console.php',
+            ],
+            'yiisoft/yii-event' => [
+                'config/params-console.php',
+            ],
+        ],
+        'di-console' => [
+            'yiisoft/yii-console' => [
+                'config/di-console.php',
+            ],
+            'yiisoft/yii-event' => [
+                'config/di-console.php',
+            ],
+        ],
+        'params-web' => [
+            'yiisoft/yii-event' => [
+                'config/params-web.php',
+            ],
+        ],
+        'routes' => [
+            '/' => [
+                'routes.php',
+            ],
+        ],
+    ],
+    'yii-debug-viewer-app' => [
+        'params' => [
+            '/' => [
+                'app/params.php',
+            ],
+        ],
+        'di' => [
+            '/' => [
+                'app/di.php',
+            ],
+        ],
+        'di-console' => [
+            '/' => [
+                '$di',
+            ],
+        ],
+        'di-web' => [
+            '/' => [
+                '$di',
+                'app/web.php',
+            ],
+        ],
+        'events' => [
+            '/' => [],
+        ],
+        'events-web' => [
+            '/' => [
+                '$events',
+            ],
+        ],
+        'events-console' => [
+            '/' => [
+                '$events',
+            ],
+        ],
+        'di-providers' => [
+            '/' => [],
+        ],
+        'di-providers-web' => [
+            '/' => [
+                '$di-providers',
+            ],
+        ],
+        'di-providers-console' => [
+            '/' => [
+                '$di-providers',
+            ],
+        ],
+        'routes' => [
+            '/' => [],
+        ],
+        'bootstrap' => [
+            '/' => [],
+        ],
+        'bootstrap-web' => [
+            '/' => [
+                '$bootstrap',
+            ],
+        ],
+        'bootstrap-console' => [
+            '/' => [
+                '$bootstrap',
+            ],
+        ],
+    ],
+];

resources/views/debug.php

@@ -42,12 +42,11 @@
         <meta name="theme-color" content="#01617b">
         <link rel="manifest" href="https://yiisoft.github.io/yii-dev-panel/manifest.json"/>
         <title>Yii Dev Panel</title>
-        <?php
-        $this->head() ?>
+        <?php $this->head() ?>
     </head>
     <body style="display:flex;flex-direction:column;min-height:100vh;justify-content:space-between">
     <?php
-    $this->beginBody(); ?>
+    $this->beginBody() ?>
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root" style="flex:1"></div>
     <?php

src/Asset/DevPanelAsset.php

@@ -5,13 +5,19 @@
 namespace Yiisoft\Yii\Debug\Viewer\Asset;
 
 use Yiisoft\Assets\AssetBundle;
+use Yiisoft\View\WebView;
 
 final class DevPanelAsset extends AssetBundle
 {
     public bool $cdn = true;
 
     public array $js = [
-        'https://yiisoft.github.io/yii-dev-panel/bundle.js',
+        [
+            'https://yiisoft.github.io/yii-dev-panel/bundle.js',
+            WebView::POSITION_END,
+            'type' => 'module',
+        ],
+        'https://yiisoft.github.io/yii-dev-panel/registerSW.js',
     ];
 
     public array $css = [