From c2db0f8761c0f5de9b2f81984c68d1af894d640f Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Thu, 6 May 2021 14:57:42 +0200
Subject: [PATCH] Update to v11.x-dev (current master)

Remove some none compatible and none used extensions like feedit and
components like secure web.

Remove private folder, due to missing secure web.
---
 Classes/Frontend/RssFeed/XmlSitemapRenderer.php         | 5 +++--
 Configuration/TypoScript/setup.typoscript               | 1 -
 Resources/Private/Sass/Frontend/components/_feedit.scss | 8 --------
 Resources/Private/Sass/Frontend/index.scss              | 1 -
 package.json                                            | 1 +
 5 files changed, 4 insertions(+), 12 deletions(-)
 delete mode 100644 Resources/Private/Sass/Frontend/components/_feedit.scss

diff --git a/Classes/Frontend/RssFeed/XmlSitemapRenderer.php b/Classes/Frontend/RssFeed/XmlSitemapRenderer.php
index b607edb..605d257 100644
--- a/Classes/Frontend/RssFeed/XmlSitemapRenderer.php
+++ b/Classes/Frontend/RssFeed/XmlSitemapRenderer.php
@@ -21,6 +21,7 @@ namespace DanielSiepmann\DsSite\Frontend\RssFeed;
  * 02110-1301, USA.
  */
 
+use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
 use TYPO3\CMS\Seo\XmlSitemap\XmlSitemapRenderer as Typo3XmlSitemapRenderer;
 
@@ -31,7 +32,7 @@ class XmlSitemapRenderer extends Typo3XmlSitemapRenderer
      */
     public $cObj;
 
-    public function render(string $_, array $typoScriptConfiguration): string
+    public function render(string $_, array $typoScriptConfiguration, ServerRequestInterface $request): string
     {
         $settings = [];
         foreach (array_keys($typoScriptConfiguration['userFunc.']['variables.'] ?? []) as $variableName) {
@@ -45,6 +46,6 @@ class XmlSitemapRenderer extends Typo3XmlSitemapRenderer
         }
         $this->view->assign('settings', $settings);
 
-        return parent::render($_, $typoScriptConfiguration);
+        return parent::render($_, $typoScriptConfiguration, $request);
     }
 }
diff --git a/Configuration/TypoScript/setup.typoscript b/Configuration/TypoScript/setup.typoscript
index 78b8f31..efd1c76 100644
--- a/Configuration/TypoScript/setup.typoscript
+++ b/Configuration/TypoScript/setup.typoscript
@@ -1,4 +1,3 @@
 @import 'EXT:seo/Configuration/TypoScript/XmlSitemap/setup.typoscript'
-@import 'EXT:feedit/Configuration/TypoScript/setup.typoscript'
 @import 'EXT:ds_site/Configuration/TypoScript/Setup/'
 @import 'EXT:ds_site/Configuration/TypoScript/Setup/ContentElements/'
diff --git a/Resources/Private/Sass/Frontend/components/_feedit.scss b/Resources/Private/Sass/Frontend/components/_feedit.scss
deleted file mode 100644
index 8e89575..0000000
--- a/Resources/Private/Sass/Frontend/components/_feedit.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-.typo3-feedit-element {
-    margin-top: $spacer * 3;
-}
-.typo3-editPanel-btn .icon {
-    height: 1em;
-    width: 1em;
-    background: $blue-dark;
-}
diff --git a/Resources/Private/Sass/Frontend/index.scss b/Resources/Private/Sass/Frontend/index.scss
index 4ea26b5..a6d6e51 100644
--- a/Resources/Private/Sass/Frontend/index.scss
+++ b/Resources/Private/Sass/Frontend/index.scss
@@ -12,7 +12,6 @@
 @import "layout";
 
 @import "components/codeHighlighting";
-@import "components/feedit";
 @import "components/adminpanel";
 @import "components/ckeditor";
 @import "components/admonition";
diff --git a/package.json b/package.json
index 6b9ad30..25c1a16 100644
--- a/package.json
+++ b/package.json
@@ -1,4 +1,5 @@
 {
+    "private": true,
     "scripts": {
         "build": "gulp default",
         "watch": "gulp watch"