Resolve conflicts between 2.0 and 2.1

GSadee · GSadee · commit d7675aa61dd0 · 2025-07-15T11:38:32.000+02:00
diff --git a/assets/admin/bootstrap.js b/assets/admin/bootstrap.js
@@ -0,0 +1,10 @@
+import { startStimulusApp } from '@symfony/stimulus-bridge';
+
+// Registers Stimulus controllers from controllers.json and in the controllers/ directory
+export const app = startStimulusApp(require.context(
+  '@symfony/stimulus-bridge/lazy-controller-loader!./controllers',
+  true,
+  /\.[jt]sx?$/
+));
+// register any custom, 3rd party controllers here
+// app.register('some_controller_name', SomeImportedController);
diff --git a/assets/admin/controllers.json b/assets/admin/controllers.json
@@ -0,0 +1,47 @@
+{
+  "controllers": {
+    "@sylius/admin-bundle": {
+      "slug": {
+        "enabled": true,
+        "fetch": "lazy"
+      },
+      "taxon-slug": {
+        "enabled": true,
+        "fetch": "lazy"
+      },
+      "taxon-tree": {
+        "enabled": true,
+        "fetch": "lazy"
+      },
+      "delete-taxon": {
+        "enabled": true,
+        "fetch": "lazy"
+      },
+      "product-attribute-autocomplete": {
+        "enabled": true,
+        "fetch": "lazy"
+      },
+      "product-taxon-tree": {
+        "enabled": true,
+        "fetch": "lazy"
+      },
+      "save-positions": {
+        "enabled": true,
+        "fetch": "lazy"
+      },
+      "compound-form-errors": {
+        "enabled": true,
+        "fetch": "lazy"
+      },
+      "tabs-errors": {
+        "enabled": true,
+        "fetch": "lazy"
+      },
+      "back-button": {
+        "enabled": true,
+        "fetch": "lazy"
+      }
+    }
+  },
+  "entrypoints": []
+}
diff --git a/assets/admin/controllers/.gitignore b/assets/admin/controllers/.gitignore
diff --git a/assets/admin/entrypoint.js b/assets/admin/entrypoint.js
@@ -0,0 +1,4 @@
+import './bootstrap.js';
+
+// In this file you can import assets like images or stylesheets
+console.log('Hello Webpack Encore! Edit me in assets/admin/entrypoint.js');
diff --git a/assets/controllers.json b/assets/controllers.json
@@ -0,0 +1,25 @@
+{
+    "controllers": {
+        "@symfony/ux-autocomplete": {
+            "autocomplete": {
+                "enabled": true,
+                "fetch": "eager",
+                "autoimport": {
+                    "tom-select/dist/css/tom-select.default.css": true,
+                    "tom-select/dist/css/tom-select.bootstrap4.css": false,
+                    "tom-select/dist/css/tom-select.bootstrap5.css": false
+                }
+            }
+        },
+        "@symfony/ux-live-component": {
+            "live": {
+                "enabled": true,
+                "fetch": "eager",
+                "autoimport": {
+                    "@symfony/ux-live-component/dist/live.min.css": true
+                }
+            }
+        }
+    },
+    "entrypoints": []
+}
diff --git a/assets/shop/bootstrap.js b/assets/shop/bootstrap.js
@@ -0,0 +1,10 @@
+import { startStimulusApp } from '@symfony/stimulus-bridge';
+
+// Registers Stimulus controllers from controllers.json and in the controllers/ directory
+export const app = startStimulusApp(require.context(
+  '@symfony/stimulus-bridge/lazy-controller-loader!./controllers',
+  true,
+  /\.[jt]sx?$/
+));
+// register any custom, 3rd party controllers here
+// app.register('some_controller_name', SomeImportedController);
diff --git a/assets/shop/controllers.json b/assets/shop/controllers.json
@@ -0,0 +1,11 @@
+{
+  "controllers": {
+    "@sylius/shop-bundle": {
+      "api-login": {
+        "enabled": true,
+        "fetch": "lazy"
+      }
+    }
+  },
+  "entrypoints": []
+}
diff --git a/assets/shop/controllers/.gitignore b/assets/shop/controllers/.gitignore
diff --git a/assets/shop/entrypoint.js b/assets/shop/entrypoint.js
@@ -0,0 +1,4 @@
+import './bootstrap.js';
+
+// In this file you can import assets like images or stylesheets
+console.log('Hello Webpack Encore! Edit me in assets/shop/entrypoint.js');
diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
     "license": "MIT",
     "require": {
         "php": "^8.2",
-        "sylius/sylius": "~2.0.0",
+        "sylius/sylius": "~2.1.0",
         "symfony/debug-bundle": "*",
         "symfony/dotenv": "*",
         "symfony/flex": "*",
diff --git a/package.json b/package.json
@@ -9,6 +9,8 @@
     "dependencies": {
         "@sylius-ui/admin": "file:../sylius/src/Sylius/Bundle/AdminBundle",
         "@sylius-ui/shop": "file:../sylius/src/Sylius/Bundle/ShopBundle",
+        "@sylius/admin-bundle": "file:../sylius/src/Sylius/Bundle/AdminBundle/Resources/assets",
+        "@sylius/shop-bundle": "file:../sylius/src/Sylius/Bundle/ShopBundle/Resources/assets",
         "@symfony/ux-autocomplete": "file:../../symfony/ux-autocomplete/assets",
         "@symfony/ux-live-component": "file:../../symfony/ux-live-component/assets"
     },
diff --git a/webpack.config.js b/webpack.config.js
@@ -1,20 +1,26 @@
 const path = require('path');
+const fs = require('fs');
+
 const Encore = require('@symfony/webpack-encore');
 
 const SyliusAdmin = require('@sylius-ui/admin');
 const SyliusShop = require('@sylius-ui/shop');
 
 // Admin config
-const adminConfig = SyliusAdmin.getWebpackConfig(path.resolve(__dirname));
+const adminConfig = SyliusAdmin.getBaseWebpackConfig(path.resolve(__dirname));
 
 // Shop config
-const shopConfig = SyliusShop.getWebpackConfig(path.resolve(__dirname));
+const shopConfig = SyliusShop.getBaseWebpackConfig(path.resolve(__dirname));
+
+// Shared controllers
+const common_controllers = path.resolve(__dirname, './assets/controllers.json');
+const common_plugin_controllers = path.resolve(__dirname, '../../../assets/controllers.json');
 
 // App shop config
 Encore
     .setOutputPath('public/build/app/shop')
     .setPublicPath('/build/app/shop')
-    .addEntry('app-shop-entry', '../../../assets/shop/entrypoint.js')
+    .addEntry('app-shop-entry', path.resolve(__dirname, './assets/shop/entrypoint.js'))
     .addAliases({
         '@vendor': path.resolve(__dirname, '../..'),
     })
@@ -23,7 +29,15 @@ Encore
     .enableSourceMaps(!Encore.isProduction())
     .enableVersioning(Encore.isProduction())
     .enableSassLoader()
-    .enableStimulusBridge(path.resolve(__dirname, '../../../assets/shop/controllers.json'))
+    .enableStimulusBridge(mergeControllers(
+        'shop',
+        [
+            common_controllers,
+            common_plugin_controllers,
+            path.resolve(__dirname, './assets/shop/controllers.json'),
+            path.resolve(__dirname, '../../../assets/shop/controllers.json'),
+        ]
+    ))
 ;
 
 const appShopConfig = Encore.getWebpackConfig();
@@ -37,7 +51,7 @@ Encore.reset();
 Encore
     .setOutputPath('public/build/app/admin')
     .setPublicPath('/build/app/admin')
-    .addEntry('app-admin-entry', '../../../assets/admin/entrypoint.js')
+    .addEntry('app-admin-entry', path.resolve(__dirname, './assets/admin/entrypoint.js'))
     .addAliases({
         '@vendor': path.resolve(__dirname, '../..'),
     })
@@ -46,7 +60,15 @@ Encore
     .enableSourceMaps(!Encore.isProduction())
     .enableVersioning(Encore.isProduction())
     .enableSassLoader()
-    .enableStimulusBridge(path.resolve(__dirname, '../../../assets/admin/controllers.json'))
+    .enableStimulusBridge(mergeControllers(
+        'admin',
+        [
+            common_controllers,
+            common_plugin_controllers,
+            path.resolve(__dirname, './assets/admin/controllers.json'),
+            path.resolve(__dirname, '../../../assets/admin/controllers.json'),
+        ]
+    ))
 ;
 
 const appAdminConfig = Encore.getWebpackConfig();
@@ -64,3 +86,30 @@ appShopConfig.resolve.modules = nodeModulesPath;
 appAdminConfig.resolve.modules = nodeModulesPath;
 
 module.exports = [shopConfig, adminConfig, appShopConfig, appAdminConfig];
+
+/**
+ * Merge controllers.json from multiple files into one and store in cache
+ * Used to merge both controllers.json fed by packages and the one from the app
+ */
+function mergeControllers(name, filePaths, cacheDir = 'var/cache/webpack') {
+    const merged = filePaths.reduce(
+        (acc, filePath) => {
+            if (!fs.existsSync(filePath)) {
+                return acc;
+            }
+            const json = JSON.parse(fs.readFileSync(filePath, {encoding: 'utf-8'}));
+            acc.controllers  = { ...acc.controllers,  ...json.controllers  };
+            acc.entrypoints  = { ...acc.entrypoints,  ...json.entrypoints  };
+            return acc;
+        },
+        { controllers: {}, entrypoints: {} }
+    );
+
+    const tmpDir = path.resolve(__dirname, cacheDir);
+    if (!fs.existsSync(tmpDir)) fs.mkdirSync(tmpDir, { recursive: true });
+
+    const outFile = path.join(tmpDir, `controllers.merged.${name}.json`);
+    fs.writeFileSync(outFile, JSON.stringify(merged, null, 2), 'utf-8');
+
+    return outFile;
+}
