Merge branch '5.7-beta' into 5.x

Author: danharrin

.github/workflows/tests.yml

@@ -146,41 +146,41 @@ jobs:
       - name: Execute tests (parallel)
         id: parallel-tests
         continue-on-error: true
-        run: ./vendor/bin/pest --configuration=phpunit.${{ matrix.db }}.xml --parallel --exclude-group=commands
+        run: ./vendor/bin/pest --configuration=phpunit.${{ matrix.db }}.xml --parallel --exclude-group=serial
         env:
           DB_PASSWORD: password
       - name: Retry tests (parallel, attempt 2)
         if: steps.parallel-tests.outcome == 'failure'
         id: parallel-retry-2
         continue-on-error: true
-        run: ./vendor/bin/pest --configuration=phpunit.${{ matrix.db }}.xml --parallel --bail --exclude-group=commands
+        run: ./vendor/bin/pest --configuration=phpunit.${{ matrix.db }}.xml --parallel --bail --exclude-group=serial
         env:
           DB_PASSWORD: password
       - name: Retry tests (parallel, attempt 3)
         if: steps.parallel-retry-2.outcome == 'failure'
         id: parallel-retry-3
         continue-on-error: true
-        run: ./vendor/bin/pest --configuration=phpunit.${{ matrix.db }}.xml --parallel --bail --exclude-group=commands
+        run: ./vendor/bin/pest --configuration=phpunit.${{ matrix.db }}.xml --parallel --bail --exclude-group=serial
         env:
           DB_PASSWORD: password
       - name: Retry tests (parallel, attempt 4)
         if: steps.parallel-retry-3.outcome == 'failure'
         id: parallel-retry-4
         continue-on-error: true
-        run: ./vendor/bin/pest --configuration=phpunit.${{ matrix.db }}.xml --parallel --bail --exclude-group=commands
+        run: ./vendor/bin/pest --configuration=phpunit.${{ matrix.db }}.xml --parallel --bail --exclude-group=serial
         env:
           DB_PASSWORD: password
       - name: Retry tests (parallel, attempt 5)
         if: steps.parallel-retry-4.outcome == 'failure'
         id: parallel-retry-5
-        run: ./vendor/bin/pest --configuration=phpunit.${{ matrix.db }}.xml --parallel --bail --exclude-group=commands
+        run: ./vendor/bin/pest --configuration=phpunit.${{ matrix.db }}.xml --parallel --bail --exclude-group=serial
         env:
           DB_PASSWORD: password
       - name: Warn about flaky tests
         if: steps.parallel-tests.outcome == 'failure' && (steps.parallel-retry-2.outcome == 'success' || steps.parallel-retry-3.outcome == 'success' || steps.parallel-retry-4.outcome == 'success' || steps.parallel-retry-5.outcome == 'success')
         run: |
           echo "::warning::Parallel tests failed but a retry passed. This may indicate a race condition or test isolation issue."
-      - name: Execute command tests (serial)
-        run: ./vendor/bin/pest --configuration=phpunit.${{ matrix.db }}.xml --group=commands
+      - name: Execute serial tests
+        run: ./vendor/bin/pest --configuration=phpunit.${{ matrix.db }}.xml --group=serial
         env:
           DB_PASSWORD: password

composer.json

@@ -85,13 +85,13 @@
         ],
         "pint": "pint --config pint-strict-imports.json --cache-file=.pint.cache",
         "rector": "rector",
-        "test:pest": "pest --parallel --exclude-group=commands",
-        "test:sqlite": "pest --configuration=phpunit.sqlite.xml --parallel --exclude-group=commands",
-        "test:mysql": "pest --configuration=phpunit.mysql.xml --parallel --exclude-group=commands",
-        "test:pgsql": "pest --configuration=phpunit.pgsql.xml --parallel --exclude-group=commands",
-        "test:commands:sqlite": "pest --configuration=phpunit.sqlite.xml --group=commands",
-        "test:commands:mysql": "pest --configuration=phpunit.mysql.xml --group=commands",
-        "test:commands:pgsql": "pest --configuration=phpunit.pgsql.xml --group=commands",
+        "test:pest": "pest --parallel --exclude-group=serial",
+        "test:sqlite": "pest --configuration=phpunit.sqlite.xml --parallel --exclude-group=serial",
+        "test:mysql": "pest --configuration=phpunit.mysql.xml --parallel --exclude-group=serial",
+        "test:pgsql": "pest --configuration=phpunit.pgsql.xml --parallel --exclude-group=serial",
+        "test:serial:sqlite": "pest --configuration=phpunit.sqlite.xml --group=serial",
+        "test:serial:mysql": "pest --configuration=phpunit.mysql.xml --group=serial",
+        "test:serial:pgsql": "pest --configuration=phpunit.pgsql.xml --group=serial",
         "test:all-databases": [
             "@test:sqlite",
             "@test:mysql",
@@ -100,7 +100,7 @@
         "test:phpstan": "phpstan analyse",
         "test": [
             "@test:sqlite",
-            "@test:commands:sqlite",
+            "@test:serial:sqlite",
             "@test:phpstan"
         ]
     },

packages/actions/dist/index.js

@@ -7,8 +7,12 @@ export default ({ livewireId }) => ({
 
     focusTargetsByNestingIndex: {},
 
+    boundSyncActionModals: null,
+
+    boundOnModalClosed: null,
+
     init() {
-        window.addEventListener('sync-action-modals', (event) => {
+        this.boundSyncActionModals = (event) => {
             if (event.detail.id !== livewireId) {
                 return
             }
@@ -17,9 +21,9 @@ export default ({ livewireId }) => ({
                 event.detail.newActionNestingIndex,
                 event.detail.shouldOverlayParentActions ?? false,
             )
-        })
+        }
 
-        window.addEventListener('modal-closed', (event) => {
+        this.boundOnModalClosed = (event) => {
             const actionNestingIndex = this.getActionNestingIndexFromModalId(
                 event.detail.id,
             )
@@ -34,7 +38,31 @@ export default ({ livewireId }) => ({
             }
 
             this.closedActionNestingIndexes.push(actionNestingIndex)
-        })
+        }
+
+        window.addEventListener(
+            'sync-action-modals',
+            this.boundSyncActionModals,
+        )
+
+        window.addEventListener('modal-closed', this.boundOnModalClosed)
+    },
+
+    destroy() {
+        if (this.boundSyncActionModals) {
+            window.removeEventListener(
+                'sync-action-modals',
+                this.boundSyncActionModals,
+            )
+
+            this.boundSyncActionModals = null
+        }
+
+        if (this.boundOnModalClosed) {
+            window.removeEventListener('modal-closed', this.boundOnModalClosed)
+
+            this.boundOnModalClosed = null
+        }
     },
 
     syncActionModals(