Merge branch 'develop' into wip/support-uploading-packages-update-manager-changes

Author: LukeTowers

.devcontainer/Dockerfile

@@ -1,40 +1,32 @@
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the
 // README at: https://github.com/devcontainers/templates/tree/main/src/debian
 {
-    "name": "Winter on PHP 8.3",
-    "build": {
-        "dockerfile": "./Dockerfile",
-        "context": "."
-    },
+    "name": "Winter on PHP 8.4",
+    "image": "ghcr.io/wintercms/winter:latest",
     "features": {
         "ghcr.io/devcontainers/features/common-utils:2": {
-            "installZsh": "true",
+            "installZsh": true,
             "configureZshAsDefaultShell": true,
-            "username": "vscode",
-            "userUid": "1000",
-            "userGid": "1000",
-            "upgradePackages": "true"
-        },
-        "ghcr.io/devcontainers/features/node:1": {
-            "version": "22"
+            "username": "winter",
+            "upgradePackages": false
         },
-        "ghcr.io/devcontainers/features/git:1": {},
         "ghcr.io/devcontainers/features/github-cli:1": {},
-        "./local-features/apache-config": "latest",
         // Comment the following feature if you wish to bootstrap and configure Winter manually (ie. you wish to use this for your own project)
         "./local-features/bootstrap-winter": "latest"
     },
-    "overrideFeatureInstallOrder": [
-        "ghcr.io/devcontainers/features/common-utils"
-    ],
+    "workspaceMount": "source=${localWorkspaceFolder},target=/winter,type=bind",
+    "workspaceFolder": "/winter",
     "containerEnv": {
+        "APP_DEBUG": "true",
+        "XDEBUG_MODE": "debug",
+        "ROUTES_CACHE": "false",
+        "ASSET_CACHE": "false",
         "DB_CONNECTION": "sqlite",
         "DB_DATABASE": "${containerWorkspaceFolder}/storage/database.sqlite"
     },
-    "postStartCommand": "sudo rm -rf /var/www/html && sudo ln -s ${containerWorkspaceFolder} /var/www/html && service apache2 start",
-    "forwardPorts": [8080],
+    "forwardPorts": [8000],
     "portsAttributes": {
-        "8080": {
+        "8000": {
             "label": "Preview Winter installation",
             "onAutoForward": "openPreview"
         },
@@ -63,5 +55,6 @@
             ]
         }
     },
-    "remoteUser": "vscode"
+    "postAttachCommand": "nohup ${containerWorkspaceFolder}/.devcontainer/run-frankenphp.sh > /dev/null 2>&1",
+    "remoteUser": "winter"
 }

.devcontainer/devcontainer.json

@@ -2,9 +2,11 @@
 
 set -e
 
-echo "### Updating Composer dependencies"
-php ${PWD}/.devcontainer/local-features/bootstrap-winter/update-composer.php
-composer update --no-interaction --no-scripts --no-audit
+if [ ! -d "${PWD}/vendor" ] && [ ! -f "${PWD}/composer.lock" ]; then
+    echo "### Updating Composer dependencies"
+    php ${PWD}/.devcontainer/local-features/bootstrap-winter/update-composer.php
+    composer update --no-interaction --no-scripts --no-audit
+fi
 
 if [ ! -f "${PWD}/.env" ]; then
     echo "### Generating .env file"
@@ -21,14 +23,14 @@ fi
 echo "### Run migrations"
 php artisan migrate
 
+echo "### Set theme"
+php artisan theme:use workshop
+
 if [ "${SETUP_ADMIN}" = true ]; then
     echo "### Setup admin"
     php artisan winter:passwd admin admin
 fi
 
-echo "### Switch theme"
-php artisan theme:use workshop
-
 echo "### Ignoring files in Git"
 echo "plugins/*" >> "${PWD}/.git/info/exclude"
 echo "themes/*" >> "${PWD}/.git/info/exclude"
@@ -38,9 +40,12 @@ git restore config
 
 cp ${PWD}/.devcontainer/.vscode/launch.json ${PWD}/.vscode/launch.json
 
+echo "### Mirror site to public directory"
+php artisan winter:mirror public
+
 if [ "${CODESPACES}" = "true" ]; then
     echo "### Configure for Codespaces"
     php ${PWD}/.devcontainer/local-features/bootstrap-winter/codespaces.php
     git update-index --assume-unchanged config/app.php
-    gh codespace ports visibility 8080:public -c $CODESPACE_NAME
+    gh codespace ports visibility 8000:public -c $CODESPACE_NAME
 fi

.devcontainer/local-features/apache-config/devcontainer-feature.json

@@ -2,4 +2,7 @@
 
 set -e
 
+# Install Xdebug extension
+install-php-extensions xdebug
+
 echo "Done"

.devcontainer/local-features/apache-config/install.sh

@@ -16,6 +16,11 @@
     }
 }
 
+// Change Merge plugin config
+$composer['extra']['merge-plugin']['include'] = [
+    'plugins/*/*/composer.json',
+];
+
 file_put_contents(
     $composerPath,
     json_encode($composer, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)

.devcontainer/local-features/bootstrap-winter/bootstrap.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+set -e
+
+USER_ID=$(id -u)
+GROUP_ID=$(id -g)
+
+# Ensure the Caddy config and data directories are owned by the current user
+sudo chown -R $USER_ID:$GROUP_ID /config/caddy
+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
+
+# Run server in background
+if [ "${CODESPACES}" = "true" ]; then
+    # Ensure environment variables are set correctly for Codespaces
+    SERVER_NAME="http://:8000" APP_URL="https://${CODESPACE_NAME}-8000.app.github.dev" /usr/local/bin/frankenphp run -c /etc/frankenphp/Caddyfile -a caddyfile > /var/log/frankenphp.log 2>&1 &
+else
+    /usr/local/bin/frankenphp run -c /etc/frankenphp/Caddyfile -a caddyfile > /var/log/frankenphp.log 2>&1 &
+fi
+

.devcontainer/local-features/bootstrap-winter/install.sh

@@ -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:

.devcontainer/local-features/bootstrap-winter/update-composer.php

@@ -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