Merge branch 'develop' into 1.2

Author: LukeTowers

.devcontainer/run-frankenphp.sh

@@ -11,6 +11,11 @@ sudo chown -R $USER_ID:$GROUP_ID /data/caddy
 sudo touch /var/log/frankenphp.log
 sudo chown $USER_ID:$GROUP_ID /var/log/frankenphp.log
 
+# If debugging is enabled, disable Opcache so changes are reflected immediately
+if [ "${APP_DEBUG}" = "true" ] || [ "${APP_DEBUG}" = "1" ]; then
+    sudo sed -i 's/opcache.enable = On/opcache.enable = Off/' /usr/local/etc/php/conf.d/winter.ini
+fi
+
 # Run server in background
 if [ "${CODESPACES}" = "true" ]; then
     # Ensure environment variables are set correctly for Codespaces

.github/workflows/code-quality.yaml

@@ -9,16 +9,15 @@ on:
       - 1.2
       - develop
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   codeQuality:
     runs-on: ubuntu-latest
     name: PHP
     steps:
-      - name: Cancel previous incomplete runs
-        uses: styfle/cancel-workflow-action@0.8.0
-        with:
-          access_token: ${{ github.token }}
-
       - name: Checkout changes
         uses: actions/checkout@v2
         with:

.github/workflows/tests.yml

@@ -7,6 +7,10 @@ on:
       - develop
   pull_request:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   frontendTests:
     strategy:
@@ -22,11 +26,6 @@ jobs:
       extensions: curl, fileinfo, gd, mbstring, openssl, pdo, pdo_sqlite, sqlite3, xml, zip
       key: winter-cms-cache-develop
     steps:
-      - name: Cancel previous incomplete runs
-        uses: styfle/cancel-workflow-action@0.8.0
-        with:
-          access_token: ${{ github.token }}
-
       - name: Checkout changes
         uses: actions/checkout@v3
 
@@ -104,13 +103,8 @@ jobs:
       extensions: curl, fileinfo, gd, mbstring, openssl, pdo, pdo_sqlite, sqlite3, xml, zip
       key: winter-cms-cache-develop
     steps:
-      - name: Cancel previous incomplete runs
-        uses: styfle/cancel-workflow-action@0.8.0
-        with:
-          access_token: ${{ github.token }}
-
       - name: Checkout changes
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup extension cache
         id: extcache

modules/backend/ServiceProvider.php

@@ -10,6 +10,7 @@
 use Backend\Models\UserRole;
 use Exception;
 use Illuminate\Support\Facades\Event;
+use System\Classes\Asset\PackageManager;
 use System\Classes\CombineAssets;
 use System\Classes\MailManager;
 use System\Classes\SettingsManager;
@@ -31,7 +32,6 @@ public function register()
 
         $this->registerConsole();
         $this->registerMailer();
-        $this->registerAssetBundles();
         $this->registerBackendPermissions();
         $this->registerBackendUserEvents();
 
@@ -53,6 +53,7 @@ public function register()
      */
     public function boot()
     {
+        $this->registerAssetBundles();
         parent::boot('backend');
     }
 
@@ -90,13 +91,12 @@ protected function registerAssetBundles()
             $combiner->registerBundle('~/modules/backend/assets/less/winter.less');
             $combiner->registerBundle('~/modules/backend/assets/js/winter.js');
             $combiner->registerBundle('~/modules/backend/widgets/table/assets/js/build.js');
+            $combiner->registerBundle('~/modules/backend/assets/vendor/ace-codeeditor/build.js');
             $combiner->registerBundle('~/modules/backend/widgets/mediamanager/assets/js/mediamanager-browser.js');
             $combiner->registerBundle('~/modules/backend/widgets/mediamanager/assets/less/mediamanager.less');
             $combiner->registerBundle('~/modules/backend/widgets/reportcontainer/assets/less/reportcontainer.less');
             $combiner->registerBundle('~/modules/backend/widgets/table/assets/less/table.less');
-            $combiner->registerBundle('~/modules/backend/formwidgets/codeeditor/assets/less/codeeditor.less');
             $combiner->registerBundle('~/modules/backend/formwidgets/repeater/assets/less/repeater.less');
-            $combiner->registerBundle('~/modules/backend/formwidgets/codeeditor/assets/js/build.js');
             $combiner->registerBundle('~/modules/backend/formwidgets/fileupload/assets/less/fileupload.less');
             $combiner->registerBundle('~/modules/backend/formwidgets/nestedform/assets/less/nestedform.less');
             $combiner->registerBundle('~/modules/backend/formwidgets/richeditor/assets/js/build-plugins.js');
@@ -111,6 +111,10 @@ protected function registerAssetBundles()
                 $combiner->registerBundle('~/modules/backend/formwidgets/richeditor/assets/js/build.js');
             }
         });
+
+        PackageManager::instance()->registerCallback(function ($mix) {
+            $mix->registerPackage('module-backend.formwidgets.codeeditor', '~/modules/backend/formwidgets/codeeditor/assets/winter.mix.js');
+        });
     }
 
     /*

modules/backend/assets/.gitignore

@@ -0,0 +1 @@
+!vendor