WIP

Author: jissereitsma

MODULE.json

@@ -1,10 +1,8 @@
 {
     "sequence": [
-        "Magento_Csp",
         "Magento_Store"
     ],
     "modules": [
-        "Magento_Csp",
         "Magento_Store"
     ],
     "components": [],

view/frontend/layout/loki_theme_add_alpine.xml

@@ -16,6 +16,11 @@
             <block name="loki.script.components.newsletter" template="Loki_Theme::script/components/newsletter.phtml"/>
             <block name="loki.script.components.tabs" template="Loki_Theme::script/components/tabs.phtml"/>
             <block name="loki.script.components.messages" template="Loki_Theme::script/components/messages.phtml"/>
+            <block name="loki.script.components.minicart" template="Loki_Theme::script/components/minicart.phtml"/>
+        </referenceContainer>
+
+        <referenceContainer name="minicart.addons">
+            <block name="loki.minicart-contents" template="Loki_Theme::minicart.phtml"/>
         </referenceContainer>
     </body>
 </page>

view/frontend/templates/script/alpine-csp.phtml

@@ -1,7 +1,6 @@
 <?php declare(strict_types=1);
 
-/** @version 0.0.3 */
-
+/** @version 0.0.2 */
 /** @var \Magento\Framework\View\Element\Template $block */
 
 $jsUrl = $block->getViewFileUrl('Loki_Theme::js/alpine-csp.js');

view/frontend/templates/script/components/main-menu.phtml

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-/** @version 0.0.3 */
+/** @version 0.0.2 */
 
 use Magento\Framework\View\Element\Template;
 

view/frontend/templates/script/components/messages.phtml

@@ -1,11 +1,12 @@
 <?php
 declare(strict_types=1);
 
-/** @version 0.0.3 */
 
 use Magento\Framework\View\Element\Template;
 
+/** @version 0.0.2 */
 /** @var Template $block */
+
 $timeout = $block->getTimeout();
 if (false === is_numeric($timeout)) {
     $timeout = 5000;
@@ -65,9 +66,7 @@ if (false === is_numeric($timeout)) {
                 messagesElement.appendChild(messageElement);
 
                 setTimeout(() => {
-                    if (messagesElement.contains(messageElement)) {
-                        messagesElement.removeChild(messageElement);
-                    }
+                    messagesElement.removeChild(messageElement);
                 }, <?= /* @noEscape */ (int)$timeout ?>);
             });
         }
@@ -79,7 +78,7 @@ if (false === is_numeric($timeout)) {
 
             const messages = Alpine.store('LumaLocalStorage').data.messages.messages;
             displayMessages(messages);
-            store.set('messages', null);
+            store.remove('messages');
         })
 
         displayMessages(getMessagesFromCookie());

view/frontend/templates/script/components/newsletter.phtml

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-/** @version 0.0.3 */
+/** @version 0.0.2 */
 
 use Magento\Framework\View\Element\Template;
 

view/frontend/templates/script/components/tabs.phtml

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-/** @version 0.0.3 */
+/** @version 0.0.2 */
 
 use Magento\Framework\View\Element\Template;
 

view/frontend/templates/script/store/local-storage.phtml

@@ -1,10 +1,10 @@
 <?php
 declare(strict_types=1);
 
-/** @version 0.0.3 */
 
 use Magento\Framework\View\Element\Template;
 
+/** @version 0.0.2 */
 /** @var Template $block */
 
 // @todo: Invalidate sections based on data_id

view/frontend/templates/script/variables.phtml

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-/** @version 0.0.3 */
+/** @version 0.0.2 */
 
 use Loki\Theme\ViewModel\FormKeyValue;
 use Magento\Framework\View\Element\Template;