feature/encore-webpack

.gitignore

@@ -11,61 +11,4 @@ phpstan.neon
 /.phpunit.result.cache
 /docs/_build/
 
-# clean up some non bower ready package
-src/Resources/public/vendor/admin-lte/bootstrap
-src/Resources/public/vendor/admin-lte/build
-src/Resources/public/vendor/admin-lte/dist/img
-!src/Resources/public/vendor/admin-lte/dist/img/boxed-bg.jpg # Only image called in AdminLTe.css
-src/Resources/public/vendor/admin-lte/dist/js/app.js
-src/Resources/public/vendor/admin-lte/dist/js/demo.js
-src/Resources/public/vendor/admin-lte/dist/js/pages
-src/Resources/public/vendor/admin-lte/documentation
-src/Resources/public/vendor/admin-lte/pages
-src/Resources/public/vendor/admin-lte/plugins
-src/Resources/public/vendor/admin-lte/*.html
-src/Resources/public/vendor/admin-lte/Gruntfile.js
-
-src/Resources/public/vendor/iCheck/skins/all.css
-src/Resources/public/vendor/iCheck/skins/*/*
-!src/Resources/public/vendor/iCheck/skins/square/blue.css
-!src/Resources/public/vendor/iCheck/skins/square/blue.png
-!src/Resources/public/vendor/iCheck/skins/square/[email protected]
-src/Resources/public/vendor/iCheck/icheck.js
-
-src/Resources/public/vendor/slimScroll/examples
-src/Resources/public/vendor/slimScroll/jquery.slimscroll.js
-
-src/Resources/public/vendor/bootstrap/grunt
-src/Resources/public/vendor/bootstrap/less
-src/Resources/public/vendor/bootstrap/test-infra
-src/Resources/public/vendor/bootstrap/Gruntfile.js
-
-src/Resources/public/vendor/jqueryui/themes/black-tie
-src/Resources/public/vendor/jqueryui/themes/blitzer
-src/Resources/public/vendor/jqueryui/themes/cupertino
-src/Resources/public/vendor/jqueryui/themes/dark-hive
-src/Resources/public/vendor/jqueryui/themes/dot-luv
-src/Resources/public/vendor/jqueryui/themes/eggplant
-src/Resources/public/vendor/jqueryui/themes/excite-bike
-src/Resources/public/vendor/jqueryui/themes/hot-sneaks
-src/Resources/public/vendor/jqueryui/themes/humanity
-src/Resources/public/vendor/jqueryui/themes/le-frog
-src/Resources/public/vendor/jqueryui/themes/mint-choc
-src/Resources/public/vendor/jqueryui/themes/overcast
-src/Resources/public/vendor/jqueryui/themes/pepper-grinder
-src/Resources/public/vendor/jqueryui/themes/redmond
-src/Resources/public/vendor/jqueryui/themes/smoothness
-src/Resources/public/vendor/jqueryui/themes/south-street
-src/Resources/public/vendor/jqueryui/themes/start
-src/Resources/public/vendor/jqueryui/themes/sunny
-src/Resources/public/vendor/jqueryui/themes/swanky-purse
-src/Resources/public/vendor/jqueryui/themes/trontastic
-src/Resources/public/vendor/jqueryui/themes/ui-darkness
-src/Resources/public/vendor/jqueryui/themes/ui-lightness
-src/Resources/public/vendor/jqueryui/themes/vader
-
-src/Resources/public/vendor/jquery/src
-
-src/Resources/public/vendor/jquery.scrollTo/demo
-src/Resources/public/vendor/jquery.scrollTo/tests
-
+node_modules/

.travis/install_test.sh

@@ -11,3 +11,5 @@ wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coverall
 chmod u+x "${HOME}/bin/coveralls"
 
 composer update --prefer-dist --no-interaction --prefer-stable ${COMPOSER_FLAGS}
+
+make yarn-build

Makefile

@@ -72,3 +72,19 @@ endif
 docs:
 	cd docs && sphinx-build -W -b html -d _build/doctrees . _build/html
 .PHONY: docs
+
+YARN ?= @docker run --rm -it -v ${PWD}:/usr/src/app -w /usr/src/app node:11-alpine yarn
+yarn-install:
+	${YARN} install
+
+yarn-watch:
+	${YARN} watch
+
+yarn.lock:
+	$(MAKE) yarn-install
+
+node_modules: yarn.lock
+	$(MAKE) yarn-install
+
+yarn-build: yarn.lock node_modules
+	${YARN} build

UPGRADE-4.0.md

@@ -70,4 +70,16 @@ The Twig filters that come with the bundle will no longer load a default templat
 The `sonata_admin` twig extension is now final. You may no longer extend it.
 
 ## SimplePager
-Method `SimplePager::getResults` is always returning an array
+Method `SimplePager::getResults` is always returning an array
+
+## WebpackEncoreBundle
+
+In `config/sonata_admin.yaml` the complete `assets:` section was removed and is no longer available.
+
+Execute `bin/console assets:install` and add following to the `config/sonata_admin.yaml` file:
+
+```yaml
+webpack_encore:
+    builds:
+        sonata_admin: '%kernel.project_dir%/public/bundles/sonataadmin/dist'
+```

composer.json

@@ -54,6 +54,7 @@
         "symfony/twig-bridge": "^4.3",
         "symfony/twig-bundle": "^4.3",
         "symfony/validator": "^4.3",
+        "symfony/webpack-encore-bundle": "^1.6",
         "twig/extensions": "^1.5",
         "twig/twig": "^2.12"
     },

docs/getting_started/installation.rst

@@ -135,6 +135,22 @@ install the assets:
     bin/console cache:clear
     bin/console assets:install
 
+Webpack Encore Integration
+--------------------------
+
+When the assets are installed add following to your configuration:
+
+.. code-block:: yaml
+
+    # config/sonata_admin.yaml
+
+    webpack_encore:
+        builds:
+            sonata_admin: '%kernel.project_dir%/public/bundles/sonataadmin/dist'
+            # Handling multiple entry points. For example app entry
+            #app: '%kernel.project_dir%/public/build'
+
+
 The Admin Interface
 -------------------
 

docs/reference/configuration.rst

@@ -172,62 +172,6 @@ Full Configuration Options
                 pager_results: '@SonataAdmin/Pager/results.html.twig'
                 tab_menu_template: '@SonataAdmin/Core/tab_menu_template.html.twig'
                 knp_menu_template: '@SonataAdmin/Menu/sonata_menu.html.twig'
-            assets:
-                stylesheets:
-
-                    # The default stylesheet list:
-                    - bundles/sonatacore/vendor/bootstrap/dist/css/bootstrap.min.css
-                    - bundles/sonatacore/vendor/components-font-awesome/css/font-awesome.min.css
-                    - bundles/sonatacore/vendor/ionicons/css/ionicons.min.css
-                    - bundles/sonataadmin/vendor/admin-lte/dist/css/AdminLTE.min.css
-                    - bundles/sonataadmin/vendor/admin-lte/dist/css/skins/skin-black.min.css
-                    - bundles/sonataadmin/vendor/iCheck/skins/square/blue.css
-                    - bundles/sonatacore/vendor/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css
-                    - bundles/sonataadmin/vendor/jqueryui/themes/base/jquery-ui.css
-                    - bundles/sonatacore/vendor/select2/select2.css
-                    - bundles/sonatacore/vendor/select2-bootstrap-css/select2-bootstrap.min.css
-                    - bundles/sonataadmin/vendor/x-editable/dist/bootstrap3-editable/css/bootstrap-editable.css
-                    - bundles/sonataadmin/css/styles.css
-                    - bundles/sonataadmin/css/layout.css
-                    - bundles/sonataadmin/css/tree.css
-                    - bundles/sonataadmin/css/colors.css
-
-                # stylesheet paths to add to the page in addition to the list above
-                extra_stylesheets: []
-
-                # stylesheet paths to remove from the page
-                remove_stylesheets: []
-
-                javascripts:
-
-                    # The default javascript list:
-                    - 'bundles/sonatacore/vendor/jquery/dist/jquery.min.js'
-                    - 'bundles/sonataadmin/vendor/jquery.scrollTo/jquery.scrollTo.min.js'
-                    - 'bundles/sonataadmin/vendor/jqueryui/ui/minified/jquery-ui.min.js'
-                    - 'bundles/sonataadmin/vendor/jqueryui/ui/minified/i18n/jquery-ui-i18n.min.js'
-                    - 'bundles/sonatacore/vendor/moment/min/moment.min.js'
-                    - 'bundles/sonatacore/vendor/bootstrap/dist/js/bootstrap.min.js'
-                    - 'bundles/sonatacore/vendor/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js'
-                    - 'bundles/sonataadmin/vendor/jquery-form/jquery.form.js'
-                    - 'bundles/sonataadmin/jquery/jquery.confirmExit.js'
-                    - 'bundles/sonataadmin/vendor/x-editable/dist/bootstrap3-editable/js/bootstrap-editable.min.js'
-                    - 'bundles/sonatacore/vendor/select2/select2.min.js'
-                    - 'bundles/sonataadmin/vendor/admin-lte/dist/js/app.min.js'
-                    - 'bundles/sonataadmin/vendor/iCheck/icheck.min.js'
-                    - 'bundles/sonataadmin/vendor/slimScroll/jquery.slimscroll.min.js'
-                    - 'bundles/sonataadmin/vendor/waypoints/lib/jquery.waypoints.min.js'
-                    - 'bundles/sonataadmin/vendor/waypoints/lib/shortcuts/sticky.min.js'
-                    - 'bundles/sonataadmin/vendor/readmore-js/readmore.min.js'
-                    - 'bundles/sonataadmin/vendor/masonry/dist/masonry.pkgd.min.js'
-                    - 'bundles/sonataadmin/Admin.js'
-                    - 'bundles/sonataadmin/treeview.js'
-                    - 'bundles/sonataadmin/sidebar.js'
-
-                # javascript paths to add to the page in addition to the list above
-                extra_javascripts: []
-
-                # javascript paths to remove from the page
-                remove_javascripts: []
 
             extensions:
 

package.json

@@ -0,0 +1,38 @@
+{
+  "dependencies": {
+    "admin-lte": "~2.3.10",
+    "bootstrap": "^3.3",
+    "eonasdan-bootstrap-datetimepicker": "~3.1.3",
+    "bootstrap3-dialog": "^1.34",
+    "font-awesome": "^4.7",
+    "icheck": "^1.0",
+    "ionicons": "^4.5.5",
+    "jquery": "^2.2.3",
+    "jquery-form": "^4.0",
+    "jquery-slimscroll": "^1.3",
+    "jquery-ui": "^1.12.1",
+    "jquery.scrollto": "^1.4",
+    "masonry": "^0.0.2",
+    "masonry-layout": "^4.2",
+    "moment": "^2.10",
+    "node-sass": "^4.11.0",
+    "readmore-js": "^2.2.1",
+    "sass-loader": "^7.0.1",
+    "select2": "^3.5",
+    "select2-bootstrap-css": "^1.4",
+    "waypoints": "^4.0",
+    "x-editable": "^1.5"
+  },
+  "devDependencies": {
+    "@symfony/webpack-encore": "^0.27.0",
+    "webpack-notifier": "^1.6.0"
+  },
+  "license": "UNLICENSED",
+  "private": true,
+  "scripts": {
+    "dev-server": "encore dev-server",
+    "dev": "encore dev",
+    "watch": "encore dev --watch",
+    "build": "encore production --progress"
+  }
+}

src/DependencyInjection/Compiler/WebpackEntriesCompilerPass.php

@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Sonata Project package.
+ *
+ * (c) Thomas Rabaix <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Sonata\AdminBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * @author Silas Joisten <[email protected]>
+ */
+final class WebpackEntriesCompilerPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container): void
+    {
+        $configs = $container->getExtensionConfig('webpack_encore');
+
+        $entries = [];
+        foreach ($configs as $config) {
+            if (!isset($config['builds'])) {
+                continue;
+            }
+
+            $entries = array_merge($entries, $config['builds']);
+        }
+
+        if (0 === \count($entries)) {
+            return;
+        }
+
+        $container->getDefinition('twig')
+            ->addMethodCall('addGlobal', ['sonata_admin_webpack_entries', $entries]);
+    }
+}