Update symfony/webpack-encore-bundle recipe

symfony · Oct 25, 2023 · 1feb25c · 1feb25c
1 parent 53e8280
commit 1feb25c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 19 deletions.
diff --git a/assets/controllers.json b/assets/controllers.json
@@ -1,14 +1,14 @@
 {
-    "controllers": {
-        "@symfony/ux-live-component": {
-            "live": {
-                "enabled": true,
-                "fetch": "eager",
-                "autoimport": {
-                    "@symfony/ux-live-component/dist/live.min.css": true
-                }
-            }
+  "controllers": {
+    "@symfony/ux-live-component": {
+      "live": {
+        "enabled": true,
+        "fetch": "eager",
+        "autoimport": {
+          "@symfony/ux-live-component/dist/live.min.css": true
         }
-    },
-    "entrypoints": []
+      }
+    }
+  },
+  "entrypoints": []
 }
diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml
@@ -11,7 +11,6 @@ doctrine:
     orm:
         auto_generate_proxy_classes: true
         enable_lazy_ghost_objects: true
-        report_fields_where_declared: true
         validate_xml_mapping: true
         naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
         auto_mapping: true
@@ -20,7 +19,6 @@ doctrine:
             App:
                 type: attribute
                 is_bundle: false
-                type: attribute
                 dir: '%kernel.project_dir%/src/Entity'
                 prefix: 'App\Entity'
                 alias: App

diff --git a/symfony.lock b/symfony.lock
@@ -515,18 +515,15 @@
         ]
     },
     "symfony/webpack-encore-bundle": {
-        "version": "1.16",
+        "version": "2.1",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "main",
-            "version": "1.10",
-            "ref": "f8fc53f1942f76679e9ee3c25fd44865355707b5"
+            "version": "2.0",
+            "ref": "082d754b3bd54b3fc669f278f1eea955cfd23cf5"
         },
         "files": [
             "assets/app.js",
-            "assets/bootstrap.js",
-            "assets/controllers.json",
-            "assets/controllers/hello_controller.js",
             "assets/styles/app.css",
             "config/packages/webpack_encore.yaml",
             "package.json",

diff --git a/templates/base.html.twig b/templates/base.html.twig
@@ -16,8 +16,10 @@
             See https://symfony.com/doc/current/frontend.html
         #}
         {% block stylesheets %}
+            {{ encore_entry_link_tags('app') }}
         {% endblock %}
         {% block javascripts %}
+            {{ encore_entry_script_tags('app') }}
         {% endblock %}
 
         <link rel="icon" type="image/x-icon" href="{{ asset('favicon.ico') }}" />