Assets reorganization

UPGRADE-2.0.md

@@ -135,3 +135,5 @@
 
    Exceptions:
    - Services required by Symfony to be `public` (e.g., controllers, event listeners) remain public.
+
+1. `_javascript.html.twig` file has been removed, and its code has been moved to `src/Resources/assets/js/refund-button.js`. When upgrading to 2.0, import the `src/Resources/assets/entrypoint.js` file into your application’s main js file.

src/Resources/assets/entrypoint.js

@@ -0,0 +1 @@
+import './js/refund-button';

src/Resources/assets/js/refund-button.js

@@ -0,0 +1,22 @@
+$(document).ready(function() {
+    const $refundButtons = $('[data-refund]');
+    const $refundAllButton = $('[data-refund-all]');
+    const $refundClearAllButton = $('[data-refund-clear]');
+    const $refundInputs = $('[data-refund-input]');
+
+    $refundButtons.on('click', function(e) {
+        const $button = $(this);
+        const refundValue = $button.attr('data-refund');
+        const $refundInput = $button.closest('tr').find('[data-refund-input]');
+
+        $refundInput.val(refundValue);
+    });
+
+    $refundAllButton.on('click', function () {
+        $refundButtons.not(':disabled').trigger('click');
+    });
+
+    $refundClearAllButton.on('click', function () {
+        $refundInputs.val('');
+    });
+});

src/Resources/views/orderRefunds.html.twig

@@ -20,6 +20,4 @@
 
 {% block javascripts %}
     {{ parent() }}
-
-    {% include '@SyliusRefundPlugin/_javascripts.html.twig' %}
 {% endblock %}

tests/Application/assets/admin/entry.js

@@ -1 +1 @@
-import 'sylius/bundle/AdminBundle/Resources/private/entry';
+import '../../../../src/Resources/assets/entrypoint';

tests/Application/assets/shop/entry.js

@@ -1 +0,0 @@
-import 'sylius/bundle/ShopBundle/Resources/private/entry';

tests/Application/package.json

@@ -3,11 +3,19 @@
   "scripts": {
     "build": "encore dev",
     "build:prod": "encore production",
-    "postinstall": "semantic-ui-css-patch",
-    "lint": "yarn lint:js",
-    "watch": "encore dev --watch"
+    "watch": "encore dev --watch",
+    "postinstall": "cd ./node_modules/@symfony/ux-autocomplete && npm install && cd - && cd ./node_modules/@symfony/ux-live-component && npm install && cd -"
+  },
+  "dependencies": {
+    "@sylius-ui/admin": "git+https://github.com/Sylius/SyliusAdminBundle.git#2.0",
+    "@sylius-ui/shop": "git+https://github.com/Sylius/SyliusShopBundle.git#2.0",
+    "@symfony/ux-autocomplete": "file:../../vendor/symfony/ux-autocomplete/assets",
+    "@symfony/ux-live-component": "file:../../vendor/symfony/ux-live-component/assets"
   },
   "devDependencies": {
-    "@sylius-ui/frontend": "^1.0"
+    "@hotwired/stimulus": "^3.0.0",
+    "@symfony/stimulus-bridge": "^3.2.0",
+    "@symfony/webpack-encore": "^5.0.1",
+    "tom-select": "^2.2.2"
   }
 }

tests/Application/webpack.config.js

@@ -1,49 +1,47 @@
 const path = require('path');
 const Encore = require('@symfony/webpack-encore');
 
-const syliusBundles = path.resolve(__dirname, '../../vendor/sylius/sylius/src/Sylius/Bundle/');
-const uiBundleScripts = path.resolve(syliusBundles, 'UiBundle/Resources/private/js/');
-const uiBundleResources = path.resolve(syliusBundles, 'UiBundle/Resources/private/');
+const SyliusAdmin = require('@sylius-ui/admin');
+const SyliusShop = require('@sylius-ui/shop');
+
+// Admin config
+const adminConfig = SyliusAdmin.getWebpackConfig(path.resolve(__dirname));
 
 // Shop config
+const shopConfig = SyliusShop.getWebpackConfig(path.resolve(__dirname));
+
+// App shop config
 Encore
-  .setOutputPath('public/build/shop/')
-  .setPublicPath('/build/shop')
-  .addEntry('shop-entry', './assets/shop/entry.js')
-  .disableSingleRuntimeChunk()
-  .cleanupOutputBeforeBuild()
-  .enableSourceMaps(!Encore.isProduction())
-  .enableVersioning(Encore.isProduction())
-  .enableSassLoader();
-
-const shopConfig = Encore.getWebpackConfig();
-
-shopConfig.resolve.alias['sylius/ui'] = uiBundleScripts;
-shopConfig.resolve.alias['sylius/ui-resources'] = uiBundleResources;
-shopConfig.resolve.alias['sylius/bundle'] = syliusBundles;
-shopConfig.resolve.alias['chart.js/dist/Chart.min'] = path.resolve(__dirname, 'node_modules/chart.js/dist/chart.min.js');
-shopConfig.name = 'shop';
+    .setOutputPath('public/build/app/shop')
+    .setPublicPath('/build/app/shop')
+    .addEntry('app-shop-entry', './assets/shop/entry.js')
+    .disableSingleRuntimeChunk()
+    .cleanupOutputBeforeBuild()
+    .enableSourceMaps(!Encore.isProduction())
+    .enableVersioning(Encore.isProduction())
+    .enableSassLoader();
+
+const appShopConfig = Encore.getWebpackConfig();
+
+appShopConfig.externals = Object.assign({}, appShopConfig.externals, { window: 'window', document: 'document' });
+appShopConfig.name = 'app.shop';
 
 Encore.reset();
 
-// Admin config
+// App admin config
 Encore
-  .setOutputPath('public/build/admin/')
-  .setPublicPath('/build/admin')
-  .addEntry('admin-entry', './assets/admin/entry.js')
-  .disableSingleRuntimeChunk()
-  .cleanupOutputBeforeBuild()
-  .enableSourceMaps(!Encore.isProduction())
-  .enableVersioning(Encore.isProduction())
-  .enableSassLoader();
-
-const adminConfig = Encore.getWebpackConfig();
-
-adminConfig.resolve.alias['sylius/ui'] = uiBundleScripts;
-adminConfig.resolve.alias['sylius/ui-resources'] = uiBundleResources;
-adminConfig.resolve.alias['sylius/bundle'] = syliusBundles;
-adminConfig.resolve.alias['chart.js/dist/Chart.min'] = path.resolve(__dirname, 'node_modules/chart.js/dist/chart.min.js');
-adminConfig.externals = { ...adminConfig.externals, window: 'window', document: 'document' };
-adminConfig.name = 'admin';
-
-module.exports = [shopConfig, adminConfig];
+    .setOutputPath('public/build/app/admin')
+    .setPublicPath('/build/app/admin')
+    .addEntry('app-admin-entry', './assets/admin/entry.js')
+    .disableSingleRuntimeChunk()
+    .cleanupOutputBeforeBuild()
+    .enableSourceMaps(!Encore.isProduction())
+    .enableVersioning(Encore.isProduction())
+    .enableSassLoader();
+
+const appAdminConfig = Encore.getWebpackConfig();
+
+appAdminConfig.externals = Object.assign({}, appAdminConfig.externals, { window: 'window', document: 'document' });
+appAdminConfig.name = 'app.admin';
+
+module.exports = [shopConfig, adminConfig, appShopConfig, appAdminConfig];