Skip to content

Commit ba6907a

Browse files
committed
Update composer, dependencies and adjust frontend
1 parent 8ceeac0 commit ba6907a

File tree

8 files changed

+1384
-1448
lines changed

8 files changed

+1384
-1448
lines changed

build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
<SymfonyConsole command="ckeditor:install" checkReturn="true" console="${symfony-bin-console}" >
128128
<arg value="-nq" />
129129
</SymfonyConsole>
130-
<exec command="${project.yarn-bin} install" passthru="true" />
130+
<exec command="${project.yarn-bin} install --prod" passthru="true" />
131131
</target>
132132

133133
<target name="dependencies-list-updates" description="Check updates for all dependencies">

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
},
7474
"config": {
7575
"platform": {
76-
"php": "7.3.13"
76+
"php": "7.3.14"
7777
},
7878
"preferred-install": {
7979
"*": "dist"

composer.lock

Lines changed: 349 additions & 342 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

composer.phar

2.79 KB
Binary file not shown.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"devDependencies": {
2+
"dependencies": {
33
"@symfony/webpack-encore": "^0.28.2",
44
"less": "^3.0.4",
55
"less-loader": "^5.0.0",

symfony.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@
183183
"version": "1.0.1"
184184
},
185185
"php": {
186-
"version": "7.3.13"
186+
"version": "7.3.14"
187187
},
188188
"php-cs-fixer/diff": {
189189
"version": "v1.3.0"

templates/base.html.twig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77
<link href="/favicon.ico" rel="shortcut icon" type="image/x-icon"/>
88
<title>{% if title is defined %}{{ title }} - {% endif %}PhpOfBy</title>
9-
{# It look that we should use encore_entry_script_tags() for js, when it appears in webpack.config.js #}
10-
<script src="{{ asset('runtime.js') }}"></script>
9+
{{ encore_entry_script_tags('css/common') }}
1110
{{ encore_entry_link_tags('css/common') }}
1211
{% block stylesheets %}{% endblock %}
1312
{{ macros.getGoogleAnalyticsCode(google_analytics_id) }}

yarn.lock

Lines changed: 1030 additions & 1100 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)