Skip to content

Commit 1feb25c

Browse files
committed
Update symfony/webpack-encore-bundle recipe
1 parent 53e8280 commit 1feb25c

File tree

4 files changed

+16
-19
lines changed

4 files changed

+16
-19
lines changed

assets/controllers.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
2-
"controllers": {
3-
"@symfony/ux-live-component": {
4-
"live": {
5-
"enabled": true,
6-
"fetch": "eager",
7-
"autoimport": {
8-
"@symfony/ux-live-component/dist/live.min.css": true
9-
}
10-
}
2+
"controllers": {
3+
"@symfony/ux-live-component": {
4+
"live": {
5+
"enabled": true,
6+
"fetch": "eager",
7+
"autoimport": {
8+
"@symfony/ux-live-component/dist/live.min.css": true
119
}
12-
},
13-
"entrypoints": []
10+
}
11+
}
12+
},
13+
"entrypoints": []
1414
}

config/packages/doctrine.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ doctrine:
1111
orm:
1212
auto_generate_proxy_classes: true
1313
enable_lazy_ghost_objects: true
14-
report_fields_where_declared: true
1514
validate_xml_mapping: true
1615
naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
1716
auto_mapping: true
@@ -20,7 +19,6 @@ doctrine:
2019
App:
2120
type: attribute
2221
is_bundle: false
23-
type: attribute
2422
dir: '%kernel.project_dir%/src/Entity'
2523
prefix: 'App\Entity'
2624
alias: App

symfony.lock

+3-6
Original file line numberDiff line numberDiff line change
@@ -515,18 +515,15 @@
515515
]
516516
},
517517
"symfony/webpack-encore-bundle": {
518-
"version": "1.16",
518+
"version": "2.1",
519519
"recipe": {
520520
"repo": "github.com/symfony/recipes",
521521
"branch": "main",
522-
"version": "1.10",
523-
"ref": "f8fc53f1942f76679e9ee3c25fd44865355707b5"
522+
"version": "2.0",
523+
"ref": "082d754b3bd54b3fc669f278f1eea955cfd23cf5"
524524
},
525525
"files": [
526526
"assets/app.js",
527-
"assets/bootstrap.js",
528-
"assets/controllers.json",
529-
"assets/controllers/hello_controller.js",
530527
"assets/styles/app.css",
531528
"config/packages/webpack_encore.yaml",
532529
"package.json",

templates/base.html.twig

+2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@
1616
See https://symfony.com/doc/current/frontend.html
1717
#}
1818
{% block stylesheets %}
19+
{{ encore_entry_link_tags('app') }}
1920
{% endblock %}
2021
{% block javascripts %}
22+
{{ encore_entry_script_tags('app') }}
2123
{% endblock %}
2224

2325
<link rel="icon" type="image/x-icon" href="{{ asset('favicon.ico') }}" />

0 commit comments

Comments
 (0)