Skip to content

Commit

Permalink
Fix js packages, fix twig config
Browse files Browse the repository at this point in the history
  • Loading branch information
mpysiak committed Sep 23, 2024
1 parent 5c32bd6 commit 27defbd
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 9 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ jobs:
composer config extra.symfony.require "${{ matrix.symfony }}"
# These dependencies since Sylius 1.13 have been shifted to dev ones: https://github.com/Sylius/Sylius/pull/15485
-
name: Add Payum dependencies
run: |
composer require --dev --no-update --no-progress --no-scripts --no-plugins "payum/paypal-express-checkout-nvp:^1.7.3"
composer require --dev --no-update --no-progress --no-scripts --no-plugins "payum/stripe:^1.7.3"
# -
# name: Add Payum dependencies
# run: |
# composer require --dev --no-update --no-progress --no-scripts --no-plugins "payum/paypal-express-checkout-nvp:^1.7.3"
# composer require --dev --no-update --no-progress --no-scripts --no-plugins "payum/stripe:^1.7.3"

-
name: Setup Node
Expand Down Expand Up @@ -197,7 +197,7 @@ jobs:

-
name: Run managing catalog promotion scenarios
run: vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="~@javascript&&~@mink:chromedriver&&~@todo&&~@cli&&@managing_catalog_promotions"
run: vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="~@javascript&&~@mink:chromedriver&&~@todo&&~@cli&&@managing_catalog_promotions" --suite-tags="@ui"

-
name: Run managing exchange rates scenarios
Expand Down
1 change: 0 additions & 1 deletion config/bundles.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
SyliusLabs\Polyfill\Symfony\Security\Bundle\SyliusLabsPolyfillSymfonySecurityBundle::class => ['all' => true],
League\FlysystemBundle\FlysystemBundle::class => ['all' => true],
Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true],
// Sylius\PayPalPlugin\SyliusPayPalPlugin::class => ['all' => true],
Sylius\TwigHooks\TwigHooksBundle::class => ['all' => true],
Symfony\UX\TwigComponent\TwigComponentBundle::class => ['all' => true],
Symfony\UX\LiveComponent\LiveComponentBundle::class => ['all' => true],
Expand Down
1 change: 1 addition & 0 deletions config/packages/twig.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ services:
autoconfigure: true

Twig\Extra\Intl\IntlExtension: ~
Twig\Extra\String\StringExtension: ~

when@test_cached:
twig:
Expand Down
12 changes: 10 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,28 @@
"watch": "encore dev --watch"
},
"dependencies": {
"@popperjs/core": "^2.11.8",
"@sylius-ui/admin": "file:vendor/sylius/sylius/src/Sylius/Bundle/AdminBundle",
"@sylius-ui/shop": "file:vendor/sylius/sylius/src/Sylius/Bundle/ShopBundle",
"@symfony/stimulus-bridge": "^3.2.2",
"@symfony/ux-autocomplete": "file:vendor/symfony/ux-autocomplete/assets",
"@symfony/ux-live-component": "file:vendor/symfony/ux-live-component/assets",
"apexcharts": "^3.41.0",
"bootstrap": "^5.3.3",
"chart.js": "^3.7.1",
"flag-icons": "^7.2.3"
"flag-icons": "^7.2.3",
"infinite-tree": "^1.17.1",
"slugify": "^1.6",
"stimulus-use": "^0.52.2",
"@tabler/core": "^1.0.0-beta21"
},
"devDependencies": {
"@babel/core": "^7.0.0",
"@babel/plugin-proposal-object-rest-spread": "^7.18.9",
"@babel/polyfill": "^7.0.0",
"@babel/preset-env": "^7.18.10",
"@babel/register": "^7.0.0",
"@hotwired/stimulus": "^3.0.0",
"@hotwired/stimulus": "^3.2.2",
"@symfony/stimulus-bridge": "^3.2.2",
"@symfony/webpack-encore": "^3.1.0",
"sass": "^1.54.8",
Expand Down

0 comments on commit 27defbd

Please sign in to comment.