Skip to content

Commit 4a00091

Browse files
authored
Merge pull request #86 from jolicode/chore/deps-update
Frontend deps update
2 parents 5ee830e + f716232 commit 4a00091

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+955
-893
lines changed

.castor/docker.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
use function Castor\log;
1414
use function Castor\run as castor_run;
1515

16-
const DEFAULT_PHP_VERSION = '8.3';
16+
const DEFAULT_PHP_VERSION = '8.2';
1717

1818
#[AsTask(description: 'Build the test infrastructure')]
1919
function build(

.castor/frontend.php

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66

77
use function Castor\io;
88
use function Castor\notify;
9-
use function Castor\run;
9+
use function docker\docker_run;
1010

1111
#[AsTask(description: 'Compile assets')]
1212
function compile(): void
1313
{
1414
io()->title('Compiling frontend assets');
1515

1616
install();
17-
run('yarn encore production');
17+
docker_run('yarn encore production');
1818

1919
notify('Frontend assets have been compiled.');
2020
io()->success('Frontend assets have been compiled.');
@@ -25,18 +25,28 @@ function install(): void
2525
{
2626
io()->title('Installing frontend assets');
2727

28-
run('yarn install');
28+
docker_run('yarn install');
2929

3030
io()->success('Frontend assets have been installed.');
3131
}
3232

33+
#[AsTask(description: 'Update asset dependencies')]
34+
function update(): void
35+
{
36+
io()->title('Updating frontend assets');
37+
38+
docker_run('yarn upgrade');
39+
40+
io()->success('Frontend assets have been updated.');
41+
}
42+
3343
#[AsTask(description: 'Watch frontend assets')]
3444
function watch(): void
3545
{
3646
io()->title('Watching frontend assets. Type CTRL+C to stop.');
3747

3848
install();
39-
run('yarn encore dev --watch');
49+
docker_run('yarn encore dev --watch');
4050

4151
notify('Frontend assets are being watched. Type CTRL+C to stop.');
4252
io()->success('Frontend assets are being watched. Type CTRL+C to stop.');

rector.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44

55
use Rector\Caching\ValueObject\Storage\FileCacheStorage;
66
use Rector\Config\RectorConfig;
7+
use Rector\DeadCode\Rector\If_\RemoveAlwaysTrueIfConditionRector;
78
use Rector\Doctrine\Set\DoctrineSetList;
9+
use Rector\Symfony\CodeQuality\Rector\Class_\ControllerMethodInjectionToConstructorRector;
810
use Rector\Symfony\Configs\Rector\Closure\FromServicePublicToDefaultsPublicRector;
911
use Rector\Symfony\Configs\Rector\Closure\ServiceTagsToDefaultsAutoconfigureRector;
1012
use Rector\Symfony\Set\SymfonySetList;
@@ -39,6 +41,12 @@
3941
TwigSetList::TWIG_UNDERSCORE_TO_NAMESPACE,
4042
])
4143
->withSkip([
44+
RemoveAlwaysTrueIfConditionRector::class => [
45+
__DIR__ . '/tests/src/Twig/Component/PictureTest.php',
46+
],
47+
ControllerMethodInjectionToConstructorRector::class => [
48+
__DIR__ . '/src/Bridge/EasyAdmin/src/Controller/MediaAdminController.php',
49+
],
4250
ServiceTagsToDefaultsAutoconfigureRector::class,
4351
FromServicePublicToDefaultsPublicRector::class,
4452
])

src/Bridge/EasyAdmin/public/entrypoints.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"entrypoints": {
33
"joli-media-easy-admin": {
44
"css": [
5-
"./joli-media-easy-admin.72f01548.css"
5+
"./joli-media-easy-admin.a173958a.css"
66
],
77
"js": [
8-
"./joli-media-easy-admin.d53cb5bd.js"
8+
"./joli-media-easy-admin.45db1bbc.js"
99
]
1010
}
1111
}

src/Bridge/EasyAdmin/public/joli-media-easy-admin.45db1bbc.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Bridge/EasyAdmin/public/joli-media-easy-admin.72f01548.css renamed to src/Bridge/EasyAdmin/public/joli-media-easy-admin.a173958a.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Bridge/EasyAdmin/public/joli-media-easy-admin.d53cb5bd.js

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"joli-media-easy-admin.css": "./joli-media-easy-admin.72f01548.css",
3-
"joli-media-easy-admin.js": "./joli-media-easy-admin.d53cb5bd.js"
2+
"joli-media-easy-admin.css": "./joli-media-easy-admin.a173958a.css",
3+
"joli-media-easy-admin.js": "./joli-media-easy-admin.45db1bbc.js"
44
}

src/Bridge/SonataAdmin/public/entrypoints.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"entrypoints": {
33
"joli-media-sonata-admin": {
44
"css": [
5-
"./joli-media-sonata-admin.9f1cf113.css"
5+
"./joli-media-sonata-admin.501cbd68.css"
66
],
77
"js": [
8-
"./joli-media-sonata-admin.5ea8b321.js"
8+
"./joli-media-sonata-admin.4deda32b.js"
99
]
1010
}
1111
}

src/Bridge/SonataAdmin/public/joli-media-sonata-admin.4deda32b.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)