Skip to content

Commit 874da15

Browse files
committed
minor #1174 [Site] Upgrading ux.symfony.com to AssetMapper 6.4 (weaverryan)
This PR was squashed before being merged into the 2.x branch. Discussion ---------- [Site] Upgrading ux.symfony.com to AssetMapper 6.4 | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | Tickets | None | License | MIT A PR to work on upgrading ux.symfony.com AssetMapper 6.4. Development for 6.4 should slow be "feature complete" within a week, and we can finalize this. There is also some work to do still on StimulusBundle & AssetMapper 6.4. TODO * [X] Update install instructions on the homepage - done in #1254 Cheers! Commits ------- 6cd7e70 [Site] Upgrading ux.symfony.com to AssetMapper 6.4
2 parents 5dce994 + 6cd7e70 commit 874da15

File tree

8 files changed

+1043
-893
lines changed

8 files changed

+1043
-893
lines changed

.github/workflows/ux.symfony.com.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ jobs:
2828
with:
2929
working-directory: ux.symfony.com
3030

31+
- name: Importmap dependencies
32+
run: php bin/console importmap:install
33+
3134
- name: Build Sass assets
3235
run: php bin/console sass:build
3336

ux.symfony.com/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@
1414

1515
###> symfony/asset-mapper ###
1616
/public/assets/
17+
/assets/vendor/
1718
###< symfony/asset-mapper ###

ux.symfony.com/assets/app.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import './styles/app.scss';
12
import { registerReactControllerComponents } from '@symfony/ux-react';
23
import {registerVueControllerComponents} from "@symfony/ux-vue";
34
import { registerSvelteControllerComponents } from "@symfony/ux-svelte";

ux.symfony.com/composer.json

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
"type": "project",
33
"license": "proprietary",
44
"prefer-stable": true,
5+
"minimum-stability": "dev",
56
"require": {
67
"php": ">=8.1",
78
"ext-ctype": "*",
89
"ext-iconv": "*",
910
"babdev/pagerfanta-bundle": "^3.8",
11+
"composer/semver": "^3.4",
1012
"doctrine/doctrine-bundle": "^2.10",
1113
"doctrine/doctrine-migrations-bundle": "^3.2.4",
1214
"doctrine/orm": "^2.15.3",
@@ -15,22 +17,22 @@
1517
"league/commonmark": "^2.4",
1618
"pagerfanta/twig": "^3.8",
1719
"scrivo/highlight.php": "^9.18.1.10",
18-
"symfony/asset": "^6.3.0",
19-
"symfony/asset-mapper": "^6.3.1",
20-
"symfony/console": "^6.3.0",
21-
"symfony/dotenv": "^6.3.0",
22-
"symfony/expression-language": "^6.3.0",
20+
"symfony/asset": "6.4.*",
21+
"symfony/asset-mapper": "6.4.*",
22+
"symfony/console": "6.4.*",
23+
"symfony/dotenv": "6.4.*",
24+
"symfony/expression-language": "6.4.*",
2325
"symfony/flex": "^2.3.1",
24-
"symfony/form": "^6.3.0",
25-
"symfony/framework-bundle": "^6.3.1",
26+
"symfony/form": "6.4.*",
27+
"symfony/framework-bundle": "6.4.*",
2628
"symfony/mercure-bundle": "^0.3.7",
2729
"symfony/monolog-bundle": "^3.8",
28-
"symfony/notifier": "^6.3.0",
29-
"symfony/proxy-manager-bridge": "^6.3.0",
30-
"symfony/runtime": "^6.3.1",
30+
"symfony/notifier": "6.4.*",
31+
"symfony/proxy-manager-bridge": "6.4.*",
32+
"symfony/runtime": "6.4.*",
3133
"symfony/stimulus-bundle": "2.x-dev",
32-
"symfony/translation": "^6.3.0",
33-
"symfony/twig-bundle": "^6.3.0",
34+
"symfony/translation": "6.4.*",
35+
"symfony/twig-bundle": "6.4.*",
3436
"symfony/ux-autocomplete": "2.x-dev",
3537
"symfony/ux-chartjs": "2.x-dev",
3638
"symfony/ux-cropperjs": "2.x-dev",
@@ -47,8 +49,8 @@
4749
"symfony/ux-twig-component": "2.x-dev",
4850
"symfony/ux-typed": "2.x-dev",
4951
"symfony/ux-vue": "2.x-dev",
50-
"symfony/validator": "^6.3.1",
51-
"symfony/yaml": "^6.3.0",
52+
"symfony/validator": "6.4.*",
53+
"symfony/yaml": "6.4.*",
5254
"symfonycasts/dynamic-forms": "^0.1.0",
5355
"symfonycasts/sass-bundle": "^0.2.0",
5456
"twbs/bootstrap": "^5.3",
@@ -105,18 +107,19 @@
105107
"extra": {
106108
"symfony": {
107109
"allow-contrib": false,
108-
"require": "6.3.*"
110+
"require": "6.4.*",
111+
"docker": true
109112
}
110113
},
111114
"require-dev": {
112115
"phpunit/phpunit": "^9.6.9",
113-
"symfony/browser-kit": "^6.3.0",
114-
"symfony/css-selector": "^6.3.0",
115-
"symfony/debug-bundle": "^6.3.0",
116+
"symfony/browser-kit": "6.4.*",
117+
"symfony/css-selector": "6.4.*",
118+
"symfony/debug-bundle": "6.4.*",
116119
"symfony/maker-bundle": "^1.49",
117-
"symfony/phpunit-bridge": "^6.3.1",
118-
"symfony/stopwatch": "^6.3.0",
119-
"symfony/web-profiler-bundle": "^6.3.1",
120+
"symfony/phpunit-bridge": "6.4.*",
121+
"symfony/stopwatch": "6.4.*",
122+
"symfony/web-profiler-bundle": "6.4.*",
120123
"zenstruck/browser": "^1.4",
121124
"zenstruck/foundry": "^1.33"
122125
}

0 commit comments

Comments
 (0)