Merge pull request #86 from synolia/fix/yarn-dependencies

Upgrade yarn dependencies

Author: oallain

README.md

@@ -171,15 +171,23 @@ If you plan override them also, you should retrieve them in your application.
 
 Copy Sylius templates overridden in plugin to your templates directory (e.g templates/bundles/)
 
-   ```shell
-    mkdir -p templates/bundles/SyliusAdminBundle/
-    mkdir -p templates/bundles/SyliusShopBundle/
-    mkdir -p templates/bundles/SyliusUiBundle/
-    cp -R vendor/payplug/sylius-payplug-plugin/src/Resources/views/SyliusAdminBundle/* templates/bundles/SyliusAdminBundle/
-    cp -R vendor/payplug/sylius-payplug-plugin/src/Resources/views/SyliusShopBundle/* templates/bundles/SyliusShopBundle/
-    cp -R vendor/payplug/sylius-payplug-plugin/src/Resources/views/SyliusUiBundle/* templates/bundles/SyliusUiBundle/
-    ```
+```shell
+mkdir -p templates/bundles/SyliusAdminBundle/
+mkdir -p templates/bundles/SyliusShopBundle/
+mkdir -p templates/bundles/SyliusUiBundle/
+cp -R vendor/payplug/sylius-payplug-plugin/src/Resources/views/SyliusAdminBundle/* templates/bundles/SyliusAdminBundle/
+cp -R vendor/payplug/sylius-payplug-plugin/src/Resources/views/SyliusShopBundle/* templates/bundles/SyliusShopBundle/
+cp -R vendor/payplug/sylius-payplug-plugin/src/Resources/views/SyliusUiBundle/* templates/bundles/SyliusUiBundle/
+```
 
+You also need to edit your twig config to add your path to avoid our configuration to be prepended :
+```yaml
+twig:
+  paths:
+    '%kernel.project_dir%/templates/bundles/SyliusAdminBundle': SyliusAdmin
+    '%kernel.project_dir%/templates/bundles/SyliusShopBundle': SyliusShop
+    '%kernel.project_dir%/templates/bundles/SyliusUiBundle': SyliusUi
+```
 ## Development
 
 See [How to contribute](CONTRIBUTING.md).

src/DependencyInjection/PayPlugSyliusPayPlugExtension.php

@@ -32,13 +32,21 @@ public function prepend(ContainerBuilder $container): void
         }
 
         $viewsPath = dirname(__DIR__) . '/Resources/views/';
-        // This add our override in twig paths with correct namespace. No need for final user to copy it
+        // This add our override in twig paths with correct namespace if there are not already overridden. No need for final user to copy it
         $paths = [
             $viewsPath . 'SyliusShopBundle' => 'SyliusShop',
             $viewsPath . 'SyliusAdminBundle' => 'SyliusAdmin',
             $viewsPath . 'SyliusUiBundle' => 'SyliusUi',
         ];
 
+        $twigConfig = $container->getExtensionConfig('twig');
+
+        foreach ($paths as $key => $path) {
+            if ($this->isPathAlreadyInConfiguration($path, $twigConfig)) {
+                unset($paths[$key]);
+            }
+        }
+
         $container->prependExtensionConfig('twig', [
             'paths' => $paths,
             'form_themes' => [
@@ -50,6 +58,27 @@ public function prepend(ContainerBuilder $container): void
         $this->prependDoctrineMigrations($container);
     }
 
+    /**
+     * Verify if a given namespace is alreay extented
+     *
+     * @param string $namespace The namespace to verify
+     * @param array  $configurations The given configurations
+     *
+     * @return bool
+     */
+    protected function isPathAlreadyInConfiguration(string $namespace, array $configurations): bool
+    {
+        foreach ($configurations as $configuration) {
+            foreach ($configuration as $parameter => $values) {
+                if ('paths' === $parameter && in_array($namespace, $values, true)) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
     protected function getMigrationsNamespace(): string
     {
         return 'PayPlug\SyliusPayPlugPlugin\Migrations';

src/Resources/dev/package.json

@@ -24,13 +24,13 @@
   "devDependencies": {
     "@babel/core": "^7.9.0",
     "@babel/eslint-parser": "^7.14.7",
-    "@parcel/babel-preset-env": "^2.0.1",
-    "@parcel/transformer-sass": "^2.0.1",
+    "@parcel/babel-preset-env": "^2.5.0",
+    "@parcel/transformer-sass": "^2.5.0",
     "eslint": "^6.8.0",
     "eslint-config-prettier": "^6.10.1",
     "eslint-plugin-prettier": "^3.1.3",
-    "parcel": "^2.0.1",
-    "prettier": "^2.0.4",
+    "parcel": "^2.5.0",
+    "prettier": "^2.6.0",
     "sass": "^1.26.3"
   },
   "dependencies": {