Merge branch '6.4' into 7.0

* 6.4:
  add the Workflow component
  install the AssetMapper recipe
  Update actions/checkout
  update ramsey/composer-install GitHub action to version 2 (#23)

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
 
  steps:
  - name: Checkout code
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
 
  - name: Set up PHP
  uses: shivammathur/setup-php@v2
@@ -20,7 +20,7 @@ jobs:
  coverage: none
 
  - name: Download dependencies
- uses: ramsey/composer-install@v1
+ uses: ramsey/composer-install@v2
 
  - name: Run tests
  run: ./bin/console cache:warmup --env dev

.gitignore

@@ -20,4 +20,8 @@
 npm-debug.log
 yarn-error.log
 ###< symfony/webpack-encore-bundle ###
-composer.lock
+composer.lock
+###> symfony/asset-mapper ###
+/public/assets/
+/assets/vendor/
+###< symfony/asset-mapper ###

composer.json

@@ -40,6 +40,7 @@
  "symfony/validator": "*",
  "symfony/web-link": "*",
  "symfony/webpack-encore-bundle": "^2.1",
+ "symfony/workflow": "*",
  "symfony/yaml": "*",
  "twig/extra-bundle": "^3.0",
  "twig/twig": "^3.0"
@@ -84,7 +85,8 @@
  "scripts": {
  "auto-scripts": {
  "cache:clear": "symfony-cmd",
- "assets:install %PUBLIC_DIR%": "symfony-cmd"
+ "assets:install %PUBLIC_DIR%": "symfony-cmd",
+ "importmap:install": "symfony-cmd"
  },
  "post-install-cmd": [
  "@auto-scripts"

config/packages/asset_mapper.yaml

@@ -0,0 +1,5 @@
+framework:
+ asset_mapper:
+ # The paths to make available to the asset mapper.
+ paths:
+ - assets/

config/packages/workflow.yaml

@@ -0,0 +1,2 @@
+framework:
+ workflows: null

importmap.php

@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * Returns the importmap for this application.
+ *
+ * - "path" is a path inside the asset mapper system. Use the
+ * "debug:asset-map" command to see the full list of paths.
+ *
+ * - "entrypoint" (JavaScript only) set to true for any module that will
+ * be used as an "entrypoint" (and passed to the importmap() Twig function).
+ *
+ * The "importmap:require" command can be used to add new entries to this file.
+ */
+return [
+ 'app' => [
+ 'path' => './assets/app.js',
+ 'entrypoint' => true,
+ ],
+];

symfony.lock

@@ -125,6 +125,21 @@
  "symfony/asset": {
  "version": "v5.4.0"
  },
+ "symfony/asset-mapper": {
+ "version": "7.1",
+ "recipe": {
+ "repo": "github.com/symfony/recipes",
+ "branch": "main",
+ "version": "6.4",
+ "ref": "6c28c471640cc2c6e60812ebcb961c526ef8997f"
+ },
+ "files": [
+ "assets/app.js",
+ "assets/styles/app.css",
+ "config/packages/asset_mapper.yaml",
+ "importmap.php"
+ ]
+ },
  "symfony/browser-kit": {
  "version": "v5.4.0"
  },
@@ -559,6 +574,18 @@
  "webpack.config.js"
  ]
  },
+ "symfony/workflow": {
+ "version": "5.4",
+ "recipe": {
+ "repo": "github.com/symfony/recipes",
+ "branch": "main",
+ "version": "3.3",
+ "ref": "3b2f8ca32a07fcb00f899649053943fa3d8bbfb6"
+ },
+ "files": [
+ "config/packages/workflow.yaml"
+ ]
+ },
  "symfony/yaml": {
  "version": "v5.4.0"
  },

templates/base.html.twig

@@ -10,6 +10,7 @@
  {% endblock %}
 
  {% block javascripts %}
+ {% block importmap %}{{ importmap('app') }}{% endblock %}
  {#{{ encore_entry_script_tags('app') }}#}
  {% endblock %}
  </head>