Merge remote-tracking branch 'upstream/2.x' into 2.x

# Conflicts:
#	src/Autocomplete/assets/dist/controller.js

Author: kevinmade

.editorconfig

@@ -11,3 +11,9 @@ trim_trailing_whitespace = true
 [*.{php,html,twig}]
 indent_style = space
 indent_size = 4
+
+[*.md]
+max_line_length = 80
+
+[COMMIT_EDITMSG]
+max_line_length = 0

.gitattributes

@@ -1,5 +1 @@
 * text=auto eol=lf
-/.yarn/**            linguist-vendored
-/.yarn/releases/*    binary
-/.yarn/plugins/**/*  binary
-/.pnp.*              binary linguist-generated

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,10 +1,11 @@
-| Q             | A
-| ------------- | ---
-| Bug fix?      | yes/no
-| New feature?  | yes/no <!-- please update src/**/CHANGELOG.md files -->
-| Docs?         | yes/no <!-- required for new features -->
-| Issues        | Fix #... <!-- prefix each issue number with "Fix #", no need to create an issue if none exist, explain below instead -->
-| License       | MIT
+| Q              | A
+| -------------- | ---
+| Bug fix?       | yes/no
+| New feature?   | yes/no <!-- please update src/**/CHANGELOG.md files -->
+| Deprecations?  | yes/no <!-- if yes, also update UPGRADE-*.md and src/**/CHANGELOG.md -->
+| Documentation? | yes/no <!-- required for new features, or documentation updates -->
+| Issues         | Fix #... <!-- prefix each issue number with "Fix #", no need to create an issue if none exist, explain below instead -->
+| License        | MIT
 
 <!--
 Replace this notice by a description of your feature/bugfix.

.github/build-packages.php

@@ -9,7 +9,7 @@
 use Symfony\Component\Finder\Finder;
 
 $finder = (new Finder())
-    ->in([__DIR__.'/../src/*/', __DIR__.'/../src/*/src/Bridge/*/', __DIR__.'/../ux.symfony.com/', __DIR__.'/../test_apps/*/'])
+    ->in([__DIR__.'/../src/*/', __DIR__.'/../src/*/src/Bridge/*/', __DIR__.'/../ux.symfony.com/', __DIR__.'/../apps/*/'])
     ->depth(0)
     ->name('composer.json')
 ;

.github/workflows/.utils.sh

@@ -1,4 +1,7 @@
-_run_task() {
+# Create a non-exiting version of _run_task for sequential execution
+# This is used to run the tests sequentially on Windows
+# because parallel is not available on Windows.
+_run_task_sequential() {
     local ok=0
     local title="$1"
     local start=$(date -u +%s)
@@ -16,7 +19,13 @@ _run_task() {
       echo -e "\n\\e[32mOK\\e[0m $title\\n\\n::endgroup::"
     fi
 
-    exit $ok
+    return $ok
+}
+export -f _run_task_sequential
+
+_run_task() {
+    _run_task_sequential "$1" "$2"
+    exit $?
 }
 export -f _run_task
 

.github/workflows/app-tests.yaml

@@ -35,69 +35,64 @@ jobs:
 
         - uses: actions/setup-node@v4
           with:
-            cache: 'yarn'
-            cache-dependency-path: |
-              yarn.lock
-              package.json
-              src/**/package.json
-              test_apps/encore-app/package.json
+            node-version-file: '.nvmrc'
 
         - uses: shivammathur/setup-php@v2
 
         - name: Install root dependencies
-          run: composer install
+          uses: ramsey/composer-install@v3
+          with:
+            working-directory: ${{ github.workspace }}
 
         - name: Build root packages
           run: php .github/build-packages.php
 
-        # We always install PHP deps because we of the UX Translator, which requires `var/translations` to exists
-        - name: Install App dependenies
-          run: composer update
-          working-directory: test_apps/encore-app
+        # We always install PHP deps because of the UX Translator, which requires `var/translations` to exists
+        - name: Install PHP dependencies
+          uses: ramsey/composer-install@v3
+          with:
+            working-directory: apps/encore
+            dependency-versions: highest
 
-        - if: matrix.ux-packages-source == 'php-vendor'
-          name: Refresh dependencies from vendor/
-          working-directory: test_apps/encore-app
-          run: yarn
-          env:
-            YARN_ENABLE_HARDENED_MODE: 0
-            YARN_ENABLE_IMMUTABLE_INSTALLS: 0
+        - working-directory: apps/encore
+          run: npm install --install-links
 
         - if: matrix.ux-packages-source == 'js-packages'
           name: Install UX JS packages with a JS package manager
-          working-directory: test_apps/encore-app
+          working-directory: apps/encore
           run: |
             PACKAGES_TO_INSTALL=''
-            for PACKAGE in $(cd ../..; yarn workspaces list --no-private --json); do
-              PACKAGE_DIR=../../$(echo $PACKAGE | jq -r '.location')
-              PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL $PACKAGE_DIR"
+            for PACKAGE_DATA in $(pnpm ls -r --json --depth -1 | jq 'map(select(.private != true))' | jq -c '.[]'); do
+              PACKAGE_PATH=$(echo $PACKAGE_DATA | jq -r '.path')
+              PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL file:$(realpath --relative-to=. "$PACKAGE_PATH")"
             done
+
             echo "Installing packages: $PACKAGES_TO_INSTALL"
-            yarn add --dev $PACKAGES_TO_INSTALL
+            npm add --save-dev --install-links $PACKAGES_TO_INSTALL
 
-        - name: Ensure UX packages are installed from "${{ matrix.ux-packages-source == 'php-vendor' && 'vendor/symfony/ux-...' || '../../../src/**/assets' }}"
-          working-directory: test_apps/encore-app
+        - name: Ensure UX packages are installed from "${{ env.EXPECTED_PATTERN }}"
+          working-directory: apps/encore
           run: |
-            for PACKAGE in $(cat package.json | jq -c '(.dependencies // {}) + (.devDependencies // {}) | to_entries[] | select(.key | startswith("@symfony/ux-")) | {name: .key, version: .value}'); do
-              PACKAGE_NAME=$(echo $PACKAGE | jq -r '.name')
-              PACKAGE_VERSION=$(echo $PACKAGE | jq -r '.version')
+            for PACKAGE_DATA in $(cat package.json | jq -c '(.dependencies // {}) + (.devDependencies // {}) | to_entries[] | select(.key | startswith("@symfony/ux-")) | {name: .key, version: .value}'); do
+              PACKAGE=$(echo $PACKAGE_DATA | jq -r '.name')
+              PACKAGE_VERSION=$(echo $PACKAGE_DATA | jq -r '.version')
 
-              echo -n "Checking $PACKAGE_NAME@$PACKAGE_VERSION..."
+              echo -n "Checking $PACKAGE@$PACKAGE_VERSION..."
               if [[ $PACKAGE_VERSION == $EXPECTED_PATTERN* ]]; then
-                echo " OK"
+                echo "✅ OK"
               else
-                echo " KO"
-                echo "The package version of $PACKAGE_NAME must starts with the pattern (e.g.: $EXPECTED_PATTERN), got $PACKAGE_VERSION instead."
+                echo "❌ KO"
+                echo "ℹ️ The package version of $PACKAGE must starts with the pattern (e.g.: $EXPECTED_PATTERN), got $PACKAGE_VERSION instead."
                 exit 1
               fi
             done;
           env:
-            EXPECTED_PATTERN: ${{ matrix.ux-packages-source == 'php-vendor' && 'file:vendor/symfony/*' || '../../src/*' }}
+            EXPECTED_PATTERN: ${{ matrix.ux-packages-source == 'php-vendor' && 'file:vendor/symfony/*' || 'file:../../src/*' }}
 
-        - name: Run Encore (dev)
-          working-directory: test_apps/encore-app
-          run: yarn encore dev
+        - name: Ensure project can be built in dev mode
+          working-directory: apps/encore
+          run: npm run dev
 
-        - name: Run Encore (prod)
-          working-directory: test_apps/encore-app
-          run: yarn encore production
+        - name: Ensure project can be built in prod mode
+          working-directory: apps/encore
+          run: npm run build

.github/workflows/browser-tests.yml

@@ -0,0 +1,119 @@
+name: Browser Tests
+
+defaults:
+    run:
+        shell: bash
+
+on:
+    push:
+        paths-ignore:
+            - 'src/*/doc/**'
+            - 'src/**/*.md'
+            - 'ux.symfony.com/**'
+            - '.github/workflows/app-tests.yaml'
+            - '.github/workflows/unit-tests.yaml'
+    pull_request:
+        paths-ignore:
+            - 'src/*/doc/**'
+            - 'src/**/*.md'
+            - 'ux.symfony.com/**'
+            - '.github/workflows/app-tests.yaml'
+            - '.github/workflows/unit-tests.yaml'
+
+concurrency:
+    group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+    cancel-in-progress: true
+
+jobs:
+    test:
+        runs-on: ubuntu-latest
+        strategy:
+            fail-fast: false
+            matrix:
+                symfony: ['6.4', '7.3']
+        env:
+            SYMFONY_REQUIRE: '${{ matrix.symfony }}.*'
+        steps:
+            -   uses: actions/checkout@v4
+
+            -   run: npm i -g corepack && corepack enable
+            -   uses: actions/setup-node@v4
+                with:
+                    node-version-file: '.nvmrc'
+                    cache: 'pnpm'
+                    cache-dependency-path: |
+                        pnpm-lock.yaml
+                        package.json
+
+            - name: Install root JS dependencies
+              run: pnpm install --frozen-lockfile
+
+            - name: Install custom browsers
+              run: node ./bin/get_browsers.mjs
+
+            - name: Install browsers with Playwright
+              run: pnpm exec playwright install firefox ffmpeg
+
+            - uses: shivammathur/setup-php@v2
+              with:
+                  php-version: 8.2
+                  tools: symfony-cli, flex
+
+            - name: Install root PHP dependencies
+              uses: ramsey/composer-install@v3
+              with:
+                  working-directory: ${{ github.workspace }}
+
+            - name: Build root packages
+              run: php .github/build-packages.php
+
+            - name: Start Docker containers
+              run: docker compose up -d --build
+              working-directory: apps/e2e
+
+            - name: Configure E2E app
+              run: |
+                  echo 'APP_ENV=prod' >> .env.local
+                  echo 'APP_DEBUG=0' >> .env.local
+                  echo 'APP_SECRET=df4c071596e64cc75a349456f2887ae2419ae650' >> .env.local
+              working-directory: apps/e2e
+
+            - name: Install E2E PHP dependencies
+              uses: ramsey/composer-install@v3
+              with:
+                  working-directory: apps/e2e
+                  dependency-versions: highest
+                  composer-options: --no-dev
+                  custom-cache-suffix: symfony-${{ matrix.symfony }}
+
+            - name: Prepare E2E app
+              run: |
+                  symfony composer dump-autoload --classmap-authoritative --no-dev
+                  symfony composer dump-env
+                  symfony console asset-map:compile
+                  symfony console ux:icons:warm-cache
+              working-directory: apps/e2e
+
+            - name: Start E2E app
+              run: symfony serve --daemon
+              working-directory: apps/e2e
+
+            - name: Run browser tests
+              run: pnpm run test:browser
+              id: browser-tests
+
+            - uses: actions/upload-artifact@v4
+              if: ${{ always() && steps.browser-tests.conclusion == 'failure' }}
+              with:
+                  name: Playwright report and output (${{ matrix.symfony }})
+                  path: |
+                      src/**/assets/.playwright-report/
+                      src/**/assets/.playwright-output/
+                  retention-days: 7
+
+            - uses: actions/upload-artifact@v4
+              if: ${{ always() && steps.browser-tests.conclusion == 'failure' }}
+              with:
+                  name: Symfony logs (${{ matrix.symfony }})
+                  path: apps/e2e/var/log/
+                  retention-days: 7