Move images to root assets folder

docs/reference/configuration.rst

@@ -68,7 +68,7 @@ Full Configuration Options
                     - OWNER
                 acl_user_manager: null
             title: 'Sonata Admin'
-            title_logo: bundles/sonataadmin/logo_title.png
+            title_logo: bundles/sonataadmin/images/logo_title.png
             search: true
             default_controller: 'sonata.admin.controller.crud'
             options:
@@ -179,7 +179,7 @@ Full Configuration Options
                 stylesheets:
 
                     # The default stylesheet list:
-                    - bundles/sonataadmin/dist/app.css
+                    - bundles/sonataadmin/app.css
 
                 # stylesheet paths to add to the page in addition to the list above
                 extra_stylesheets: []
@@ -190,7 +190,7 @@ Full Configuration Options
                 javascripts:
 
                     # The default javascript list:
-                    - bundles/sonataadmin/dist/app.js
+                    - bundles/sonataadmin/app.js
                     - bundles/sonataadmin/Admin.js
                     - bundles/sonataadmin/jquery.confirmExit.js
                     - bundles/sonataadmin/treeview.js

src/DependencyInjection/Configuration.php

@@ -89,7 +89,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                 ->end()
 
                 ->scalarNode('title')->defaultValue('Sonata Admin')->cannotBeEmpty()->end()
-                ->scalarNode('title_logo')->defaultValue('bundles/sonataadmin/logo_title.png')->cannotBeEmpty()->end()
+                ->scalarNode('title_logo')->defaultValue('bundles/sonataadmin/images/logo_title.png')->cannotBeEmpty()->end()
                 ->booleanNode('search')->defaultTrue()->info('Enable/disable the search form in the sidebar')->end()
 
                 ->arrayNode('global_search')
@@ -180,7 +180,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                             ->info('Enable locking when editing an object, if the corresponding object manager supports it.')
                         ->end()
                         ->scalarNode('mosaic_background')
-                            ->defaultValue('bundles/sonataadmin/default_mosaic_image.png')
+                            ->defaultValue('bundles/sonataadmin/images/default_mosaic_image.png')
                             ->info('Background used in mosaic view')
                         ->end()
                     ->end()
@@ -388,7 +388,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                     ->children()
                         ->arrayNode('stylesheets')
                             ->defaultValue([
-                                'bundles/sonataadmin/dist/app.css',
+                                'bundles/sonataadmin/app.css',
                             ])
                             ->prototype('scalar')->end()
                         ->end()
@@ -404,7 +404,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                         ->end()
                         ->arrayNode('javascripts')
                             ->defaultValue([
-                                'bundles/sonataadmin/dist/app.js',
+                                'bundles/sonataadmin/app.js',
                             ])
                             ->prototype('scalar')->end()
                         ->end()

src/DependencyInjection/SonataAdminExtension.php

@@ -205,7 +205,7 @@ public function getNamespace(): string
     private function buildStylesheets(array $config): array
     {
         $config['assets']['stylesheets'][] = sprintf(
-            'bundles/sonataadmin/dist/admin-lte-skins/%s.min.css',
+            'bundles/sonataadmin/admin-lte-skins/%s.min.css',
             $config['options']['skin']
         );
 

src/Object/Metadata.php

@@ -18,7 +18,7 @@ final class Metadata implements MetadataInterface
     /**
      * @var string
      */
-    public const DEFAULT_MOSAIC_BACKGROUND = 'bundles/sonataadmin/default_mosaic_image.png';
+    public const DEFAULT_MOSAIC_BACKGROUND = 'bundles/sonataadmin/images/default_mosaic_image.png';
 
     /**
      * @var string

src/Resources/public/dist/entrypoints.json → src/Resources/public/entrypoints.json

@@ -2,10 +2,10 @@
   "entrypoints": {
     "app": {
       "css": [
-        "/bundles/sonataadmin/dist/app.css"
+        "/bundles/sonataadmin/app.css"
       ],
       "js": [
-        "/bundles/sonataadmin/dist/app.js"
+        "/bundles/sonataadmin/app.js"
       ]
     }
   }

src/Resources/views/CRUD/Association/edit_many_script.html.twig

@@ -517,7 +517,7 @@ This code manages the many-to-[one|many] association field popup
                 return;
             }
 
-            jQuery('#field_widget_{{ id }}').html("<span><img src=\"{{ asset('bundles/sonataadmin/ajax-loader.gif') }}\" style=\"vertical-align: middle; margin-right: 10px\"/>{{ 'loading_information'|trans([], 'SonataAdminBundle') }}</span>");
+            jQuery('#field_widget_{{ id }}').html("<span><img src=\"{{ asset('bundles/sonataadmin/images/ajax-loader.gif') }}\" style=\"vertical-align: middle; margin-right: 10px\"/>{{ 'loading_information'|trans([], 'SonataAdminBundle') }}</span>");
             jQuery.ajax({
                 type: 'GET',
                 url: '{{ path('sonata_admin_short_object_information', {

src/Resources/views/standard_layout.html.twig

@@ -68,14 +68,14 @@ file that was distributed with this source code.
             {# localize moment #}
             {% set localeForMoment = canonicalize_locale_for_moment() %}
             {% if localeForMoment %}
-                <script src="{{ asset('bundles/sonataadmin/dist/moment-locale/' ~ localeForMoment ~ '.js') }}"></script>
+                <script src="{{ asset('bundles/sonataadmin/moment-locale/' ~ localeForMoment ~ '.js') }}"></script>
             {% endif %}
 
             {# localize select2 #}
             {% if sonata_config.getOption('use_select2') %}
                 {% set localeForSelect2 = canonicalize_locale_for_select2() %}
                 {% if localeForSelect2 %}
-                    <script src="{{ asset('bundles/sonataadmin/dist/select2-locale/' ~ localeForSelect2 ~ '.js') }}"></script>
+                    <script src="{{ asset('bundles/sonataadmin/select2-locale/' ~ localeForSelect2 ~ '.js') }}"></script>
                 {% endif %}
             {% endif %}
         {% endblock %}

tests/DependencyInjection/ConfigurationTest.php

@@ -33,7 +33,7 @@ public function testOptions(): void
         $this->assertTrue($config['options']['confirm_exit']);
         $this->assertFalse($config['options']['js_debug']);
         $this->assertTrue($config['options']['use_icheck']);
-        $this->assertSame('bundles/sonataadmin/default_mosaic_image.png', $config['options']['mosaic_background']);
+        $this->assertSame('bundles/sonataadmin/images/default_mosaic_image.png', $config['options']['mosaic_background']);
         $this->assertSame('default', $config['options']['default_group']);
         $this->assertSame('SonataAdminBundle', $config['options']['default_label_catalogue']);
         $this->assertSame('<i class="fa fa-folder"></i>', $config['options']['default_icon']);

tests/DependencyInjection/SonataAdminExtensionTest.php

@@ -124,8 +124,8 @@ public function testRemoveStylesheetsGetRemoved(): void
     {
         $this->container->setParameter('kernel.bundles', []);
         $removeStylesheets = [
-            'bundles/sonataadmin/dist/app.css',
-            'bundles/sonataadmin/dist/admin-lte-skins/skin-black.min.css',
+            'bundles/sonataadmin/app.css',
+            'bundles/sonataadmin/admin-lte-skins/skin-black.min.css',
         ];
         $this->load([
             'assets' => [
@@ -165,7 +165,7 @@ public function testRemoveJavascriptsGetRemoved(): void
     {
         $this->container->setParameter('kernel.bundles', []);
         $removeJavascripts = [
-            'bundles/sonataadmin/dist/app.js',
+            'bundles/sonataadmin/app.js',
         ];
         $this->load([
             'assets' => [
@@ -189,11 +189,11 @@ public function testAssetsCanBeAddedAndRemoved(): void
         $extraStylesheets = ['foo/bar.css', 'bar/quux.css'];
         $extraJavascripts = ['foo/bar.js', 'bar/quux.js'];
         $removeStylesheets = [
-            'bundles/sonataadmin/dist/app.css',
-            'bundles/sonataadmin/dist/admin-lte-skins/skin-black.min.css',
+            'bundles/sonataadmin/app.css',
+            'bundles/sonataadmin/admin-lte-skins/skin-black.min.css',
         ];
         $removeJavascripts = [
-            'bundles/sonataadmin/dist/app.js',
+            'bundles/sonataadmin/app.js',
         ];
         $this->load([
             'assets' => [
@@ -371,7 +371,7 @@ private function getDefaultStylesheets(?string $skin = 'skin-black'): array
 
         $defaultStylesheets = $this->defaultConfiguration['assets']['stylesheets'];
         $defaultStylesheets[] = sprintf(
-            'bundles/sonataadmin/dist/admin-lte-skins/%s.min.css',
+            'bundles/sonataadmin/admin-lte-skins/%s.min.css',
             $skin
         );
 

tests/SonataConfigurationTest.php

@@ -36,7 +36,7 @@ protected function setUp(): void
             'javascripts' => [],
             'js_debug' => false,
             'lock_protection' => false,
-            'mosaic_background' => 'bundles/sonataadmin/default_mosaic_image.png',
+            'mosaic_background' => 'bundles/sonataadmin/images/default_mosaic_image.png',
             'pager_links' => null,
             'role_admin' => 'ROLE_SONATA_ADMIN',
             'role_super_admin' => 'ROLE_SUPER_ADMIN',

webpack.config.js

@@ -2,9 +2,9 @@ var Encore = require('@symfony/webpack-encore');
 const StyleLintPlugin = require('stylelint-webpack-plugin');
 
 Encore
-  .setOutputPath('./src/Resources/public/dist')
-  .setPublicPath('/bundles/sonataadmin/dist')
-  .setManifestKeyPrefix('bundles/sonataadmin/dist')
+  .setOutputPath('./src/Resources/public')
+  .setPublicPath('/bundles/sonataadmin')
+  .setManifestKeyPrefix('bundles/sonataadmin')
 
   .cleanupOutputBeforeBuild()
   .enableSassLoader()
@@ -45,6 +45,7 @@ Encore
   })
 
   .copyFiles([
+    { from: './assets/images/', pattern: /\.(png|gif)$/, to: 'images/[name].[ext]' },
     { from: './node_modules/admin-lte/dist/css/skins/', pattern: /skin-.*\.min.css/, to: 'admin-lte-skins/[name].[ext]' },
     { from: './node_modules/select2/dist/js/i18n/', pattern: /\.js/, to: 'select2-locale/[name].[ext]' },
     { from: './node_modules/moment/locale/', to: 'moment-locale/[name].[ext]' },