Merge branch 'develop' into wip/inspector-rewrite

config/develop.php

@@ -42,4 +42,20 @@ return [
     */
 
     'allowDeepSymlinks' => false,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Enable Snowboard debugging
+    |--------------------------------------------------------------------------
+    |
+    | By default, Snowboard debugging and client-side logging will be enabled
+    | if the application is in debug mode (via `app.debug`).
+    |
+    | If you wish to control Snowboard debugging independently, you may instead
+    | set this value to `true` or `false` to enable or disable Snowboard
+    | debugging, respectively.
+    |
+    */
+
+    'debugSnowboard' => env('APP_DEBUG', true),
 ];

modules/backend/layouts/_head.php

@@ -28,7 +28,11 @@ $scripts = [
     Url::asset('modules/system/assets/js/framework.js'),
     Url::asset('modules/system/assets/js/build/manifest.js'),
     Url::asset('modules/system/assets/js/snowboard/build/snowboard.vendor.js'),
-    Url::asset('modules/system/assets/js/build/system.js'),
+    Url::asset(
+        (Config::get('develop.debugSnowboard', Config::get('app.debug', false)) === true)
+            ? 'modules/system/assets/js/build/system.debug.js'
+            : 'modules/system/assets/js/build/system.js'
+    ),
     Url::asset('modules/backend/assets/ui/js/build/backend.js'),
 ];
 if (Config::get('develop.decompileBackendAssets', false)) {

modules/cms/twig/SnowboardNode.php

@@ -42,7 +42,9 @@ class SnowboardNode extends TwigNode
             ->write("\$_minify = ".CombineAssets::class."::instance()->useMinify;" . PHP_EOL);
 
         $moduleMap = [
-            'base' => (Config::get('app.debug', false) === true) ? 'snowboard.base.debug' : 'snowboard.base',
+            'base' => (Config::get('develop.debugSnowboard', Config::get('app.debug', false)) === true)
+                ? 'snowboard.base.debug'
+                : 'snowboard.base',
             'vendor' => 'snowboard.vendor',
             'request' => 'snowboard.request',
             'attr' => 'snowboard.data-attr',

modules/system/classes/CombineAssets.php

@@ -162,7 +162,9 @@ class CombineAssets
         $this->registerAlias('framework.extras', '~/modules/system/assets/css/framework.extras.css');
         $this->registerAlias('framework.extras.css', '~/modules/system/assets/css/framework.extras.css');
 
-        $snowboardBase = (Config::get('app.debug', false) === true) ? 'snowboard.base.debug.js' : 'snowboard.base.js';
+        $snowboardBase = (Config::get('develop.debugSnowboard', Config::get('app.debug', false)) === true)
+            ? 'snowboard.base.debug.js'
+            : 'snowboard.base.js';
         $this->registerAlias('snowboard.base', '~/modules/system/assets/js/snowboard/build/' . $snowboardBase);
         $this->registerAlias('snowboard.attr', '~/modules/system/assets/js/snowboard/build/snowboard.data-attr.js');
         $this->registerAlias('snowboard.request', '~/modules/system/assets/js/snowboard/build/snowboard.request.js');

modules/system/winter.mix.js

@@ -23,7 +23,7 @@ mix
     // Compile Snowboard for the Backend / System
     .js(
         [
-            './assets/js/snowboard/snowboard.base.debug.js',
+            './assets/js/snowboard/snowboard.base.js',
             './assets/js/snowboard/ajax/Request.js',
             './assets/js/snowboard/snowboard.backend.extras.js',
             './assets/ui/widgets/base/base.js',
@@ -31,6 +31,16 @@ mix
         ],
         './assets/js/build/system.js',
     )
+    .js(
+        [
+            './assets/js/snowboard/snowboard.base.debug.js',
+            './assets/js/snowboard/ajax/Request.js',
+            './assets/js/snowboard/snowboard.backend.extras.js',
+            './assets/ui/widgets/base/base.js',
+            './assets/ui/widgets/inspector/inspector.js',
+        ],
+        './assets/js/build/system.debug.js',
+    )
 
     // Compile Snowboard framework separately for the CMS module
     .js(