Merge pull request #12 from BitBagCommerce/FIN-35/fix_webpack_issues

[FIN-35]Fix webpack configuration and templates

src/Resources/assets/admin/js/index.js

@@ -0,0 +1 @@
+import './attributeGroups'

tests/Application/assets/admin/entry.js

@@ -1,2 +1 @@
 import 'sylius/bundle/AdminBundle/Resources/private/entry';
-import './product/attributeGroups'

tests/Application/config/packages/assets.yaml

@@ -5,7 +5,7 @@ framework:
                 json_manifest_path: '%kernel.project_dir%/public/build/shop/manifest.json'
             admin:
                 json_manifest_path: '%kernel.project_dir%/public/build/admin/manifest.json'
-            skeleton_shop:
-                json_manifest_path: '%kernel.project_dir%/public/build/bitbag/skeleton/shop/manifest.json'
-            skeleton_admin:
-                json_manifest_path: '%kernel.project_dir%/public/build/bitbag/skeleton/admin/manifest.json'
+            product_attribute_groups_shop:
+                json_manifest_path: '%kernel.project_dir%/public/build/bitbag/productAttributeGroups/shop/manifest.json'
+            product_attribute_groups_admin:
+                json_manifest_path: '%kernel.project_dir%/public/build/bitbag/productAttributeGroups/admin/manifest.json'

tests/Application/config/packages/webpack_encore.yaml

@@ -3,5 +3,5 @@ webpack_encore:
     builds:
         shop: '%kernel.project_dir%/public/build/shop'
         admin: '%kernel.project_dir%/public/build/admin'
-        skeleton_shop: '%kernel.project_dir%/public/build/bitbag/skeleton/shop'
-        skeleton_admin: '%kernel.project_dir%/public/build/bitbag/skeleton/admin'
+        product_attribute_groups_shop: '%kernel.project_dir%/public/build/bitbag/productAttributeGroups/shop'
+        product_attribute_groups_admin: '%kernel.project_dir%/public/build/bitbag/productAttributeGroups/admin'

tests/Application/templates/bundles/SyliusAdminBundle/Product/Attribute/attributeChoice.html.twig

@@ -1,7 +1,7 @@
 <div class="ui fluid action input" id="attributeChoice" data-action="{{ path('sylius_admin_render_attribute_forms') }}" style="margin-bottom: 30px;">
     {{ form_widget(form, {'attr': {'class': 'ui fluid search dropdown', 'id': 'sylius_product_attribute_choice', 'data-attributes': ''}}) }}
 
-    <button class="ui olive labeled icon floating dropdown link button" id="add_attributes_group" data-tab="add_attributes_group" tabindex="0" >
+    <button class="ui olive labeled icon floating dropdown button" id="add_attributes_group" data-tab="add_attributes_group" tabindex="0" type="button">
         <i class="icon clipboard list"></i> <span class="text"> {{ 'bitbag_sylius_product_attribute_group_plugin.ui.attributes_group'|trans }} </span>
 
         <div id="menuWithAttributesGroup" class="menu transition hidden" data-attribute-groups tabindex="-1"></div>

tests/Application/templates/bundles/SyliusAdminBundle/_scripts.html.twig

@@ -1,2 +1,2 @@
 {{ encore_entry_script_tags('admin-entry', null, 'admin') }}
-{{ encore_entry_script_tags('bitbag-skeleton-admin', null, 'skeleton_admin') }}
+{{ encore_entry_script_tags('bitbag-productAttributeGroups-admin', null, 'product_attribute_groups_admin') }}

tests/Application/templates/bundles/SyliusAdminBundle/_styles.html.twig

@@ -1,2 +1,2 @@
 {{ encore_entry_link_tags('admin-entry', null, 'admin') }}
-{{ encore_entry_link_tags('bitbag-skeleton-admin', null, 'skeleton_admin') }}
+{{ encore_entry_link_tags('bitbag-productAttributeGroups-admin', null, 'product_attribute_groups_admin') }}

tests/Application/webpack.config.js

@@ -1,9 +1,10 @@
 const path = require('path');
 const Encore = require('@symfony/webpack-encore');
 
-const [bitbagSkeletonShop, bitbagSkeletonAdmin] = require('../../webpack.config.js')
+const [bitbagProductAttributeGroupsShop, bitbagProductAttributeGroupsAdmin] = require('../../webpack.config.js')
 
 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/');
 
@@ -46,4 +47,4 @@ adminConfig.resolve.alias['sylius/bundle'] = syliusBundles;
 adminConfig.externals = Object.assign({}, adminConfig.externals, { window: 'window', document: 'document' });
 adminConfig.name = 'admin';
 
-module.exports = [shopConfig, adminConfig, bitbagSkeletonShop, bitbagSkeletonAdmin];
+module.exports = [shopConfig, adminConfig, bitbagProductAttributeGroupsShop, bitbagProductAttributeGroupsAdmin];

webpack.config.js

@@ -1,6 +1,6 @@
 const path = require('path');
 const Encore = require('@symfony/webpack-encore');
-const pluginName = 'skeleton';
+const pluginName = 'productAttributeGroups';
 
 const getConfig = (pluginName, type) => {
     Encore.reset();
@@ -21,8 +21,8 @@ const getConfig = (pluginName, type) => {
 }
 
 Encore
-    .setOutputPath(`src/Resources/public/`)
-    .setPublicPath(`/public/`)
+    .setOutputPath(`src/Resources/public/build/`)
+    .setPublicPath(`/public/build`)
     .addEntry(`bitbag-${pluginName}-shop`, path.resolve(__dirname, `./src/Resources/assets/shop/entry.js`))
     .addEntry(`bitbag-${pluginName}-admin`, path.resolve(__dirname, `./src/Resources/assets/admin/entry.js`))
     .cleanupOutputBeforeBuild()
@@ -34,7 +34,7 @@ distConfig.name = `bitbag-plugin-dist`;
 
 Encore.reset();
 
-const shopConfig = getConfig(pluginName, 'shop')
 const adminConfig = getConfig(pluginName, 'admin')
+const shopConfig = getConfig(pluginName, 'shop')
 
-module.exports = [shopConfig, adminConfig, distConfig];
+module.exports = [adminConfig, shopConfig, distConfig];