From 0301521cf1de1daf417f343808c65b62b59848dc Mon Sep 17 00:00:00 2001 From: Philippe von Bergen Date: Tue, 18 Jul 2023 07:18:54 +0000 Subject: [PATCH 1/3] Rector updates and beautifying --- src/Plugin/Block/DecoupledBlockBase.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Plugin/Block/DecoupledBlockBase.php b/src/Plugin/Block/DecoupledBlockBase.php index fbb56be..14c0c98 100644 --- a/src/Plugin/Block/DecoupledBlockBase.php +++ b/src/Plugin/Block/DecoupledBlockBase.php @@ -2,14 +2,14 @@ namespace Drupal\iq_progressive_decoupler\Plugin\Block; +use Drupal\Component\Serialization\Yaml; +use Drupal\Component\Serialization\Yaml as YamlSerializer; use Drupal\Core\Block\BlockBase; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; -use Symfony\Component\DependencyInjection\ContainerInterface; use Drupal\ui_patterns\UiPatternsManager; -use Drupal\Component\Serialization\Yaml; +use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\Yaml\Yaml as YamlParser; -use Drupal\Component\Serialization\Yaml as YamlSerializer; /** * Base block for decoupling. From 229f1810b89294d9b4dc083a2c504695b011ae36 Mon Sep 17 00:00:00 2001 From: Benjamin Komel Date: Wed, 26 Jul 2023 08:45:08 +0000 Subject: [PATCH 2/3] Update core version requirement version --- .../iq_progressive_decoupler_rest_block.info.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/iq_progressive_decoupler_rest_block/iq_progressive_decoupler_rest_block.info.yml b/modules/iq_progressive_decoupler_rest_block/iq_progressive_decoupler_rest_block.info.yml index f9365a1..a47044e 100644 --- a/modules/iq_progressive_decoupler_rest_block/iq_progressive_decoupler_rest_block.info.yml +++ b/modules/iq_progressive_decoupler_rest_block/iq_progressive_decoupler_rest_block.info.yml @@ -2,7 +2,7 @@ name: iqual progressive decoupler rest block description: REST Block for decoupling package: Custom type: module -core_version_requirement: ^8.8 || ^9 +core_version_requirement: ^9.5 || ^10 dependencies: - iq_progressive_decoupler:iq_progressive_decoupler - drupal:hal From f6c8e40b05a43d73d03f4b7edb2179020e74266e Mon Sep 17 00:00:00 2001 From: Daniel Wirz Date: Fri, 11 Aug 2023 06:13:50 +0000 Subject: [PATCH 3/3] cleanup & coding standards --- README.md | 8 ++++++-- iq_progressive_decoupler.info.yml | 2 +- iq_progressive_decoupler.libraries.yml | 3 --- .../iq_progressive_decoupler_rest_block.libraries.yml | 3 +-- resources/css/base.css | 1 - 5 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 resources/css/base.css diff --git a/README.md b/README.md index 6eab051..dcd9f24 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,13 @@ Module that provides progressive decoupling for drupal 8 with ui patterns. Uses twigjs (https://github.com/twigjs/twig.js) for rendering in browser. -Includes **DecoupledBlockBase**: A block base class to be used for creating block plugins that make use of decoupling. It provides pattern selection for each block instance and stores pattern-related data (e.g. its twig code) into drupalSettings to make it accessible in the frontend. +Includes **DecoupledBlockBase**: A block base class to be used for creating +block plugins that make use of decoupling. It provides pattern selection for +each block instance and stores pattern-related data (e.g. its twig code) into +drupalSettings to make it accessible in the frontend. **Submodules** - iq_progressive_decoupler_rest_block -A block that asynchronously loads data from a REST endpoint and renders with a pattern +A block that asynchronously loads data from a REST endpoint and renders with +a pattern diff --git a/iq_progressive_decoupler.info.yml b/iq_progressive_decoupler.info.yml index d5b013b..0feb79d 100644 --- a/iq_progressive_decoupler.info.yml +++ b/iq_progressive_decoupler.info.yml @@ -2,6 +2,6 @@ name: iqual progressive decoupler description: Provides progressive decoupling for drupal with ui patterns. package: Custom type: module -core_version_requirement: ^9.5 || ^10 +core_version_requirement: ^9.5 || ^10 dependencies: - drupal:rest diff --git a/iq_progressive_decoupler.libraries.yml b/iq_progressive_decoupler.libraries.yml index 1476772..6b8639d 100644 --- a/iq_progressive_decoupler.libraries.yml +++ b/iq_progressive_decoupler.libraries.yml @@ -1,8 +1,5 @@ initialize: version: VERSION - css: - theme: - resources/css/base.css: {} js: //cdnjs.cloudflare.com/ajax/libs/twig.js/0.8.9/twig.min.js: { type: external, minified: true } resources/js/twig-functions.js: {} diff --git a/modules/iq_progressive_decoupler_rest_block/iq_progressive_decoupler_rest_block.libraries.yml b/modules/iq_progressive_decoupler_rest_block/iq_progressive_decoupler_rest_block.libraries.yml index 6807665..1c754a9 100644 --- a/modules/iq_progressive_decoupler_rest_block/iq_progressive_decoupler_rest_block.libraries.yml +++ b/modules/iq_progressive_decoupler_rest_block/iq_progressive_decoupler_rest_block.libraries.yml @@ -2,5 +2,4 @@ rest-block: version: VERSION js: resources/js/init-rest-block.js: {} - dependencies: - - iq_progressive_decoupler/frontend-rendering + diff --git a/resources/css/base.css b/resources/css/base.css deleted file mode 100644 index 8b13789..0000000 --- a/resources/css/base.css +++ /dev/null @@ -1 +0,0 @@ -