TASK: Make fusion includes local to the prototypes that use them

neos · Jan 12, 2024 · b1dbfd4 · b1dbfd4
1 parent f995819
commit b1dbfd4
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 4 deletions.
diff --git a/Resources/Private/Fusion/Backend/Application.fusion b/Resources/Private/Fusion/Backend/Application.fusion
@@ -8,6 +8,10 @@
  * source code.
  */
 
+include: resource://Neos.Fusion/Private/Fusion/Root.fusion
+
+include: ./Component/**/*.fusion
+
 #
 # The Base component for Neos UI Applications
 #

diff --git a/Resources/Private/Fusion/Backend/Component/HeadIcons.fusion b/Resources/Private/Fusion/Backend/Component/HeadIcons.fusion
@@ -8,6 +8,8 @@
  * source code.
  */
 
+include: resource://Neos.Fusion/Private/Fusion/Root.fusion
+
 /** @internal */
 prototype(Neos.Neos.Ui:Component.HeadIcons) < prototype(Neos.Fusion:Join) {
     appleTouchIcon = Neos.Fusion:Tag {

diff --git a/Resources/Private/Fusion/Backend/Component/HeadStylesheets.fusion b/Resources/Private/Fusion/Backend/Component/HeadStylesheets.fusion
@@ -8,6 +8,8 @@
  * source code.
  */
 
+include: resource://Neos.Fusion/Private/Fusion/Root.fusion
+
 /** @internal */
 prototype(Neos.Neos.Ui:Component.HeadStylesheets) < prototype(Neos.Fusion:Value) {
     value = ${headStylesheets}

diff --git a/Resources/Private/Fusion/Backend/Component/InitialData.fusion b/Resources/Private/Fusion/Backend/Component/InitialData.fusion
@@ -8,6 +8,8 @@
  * source code.
  */
 
+include: ../../Prototypes/RenderConfiguration.fusion
+
 /** @internal */
 prototype(Neos.Neos.Ui:Component.InitialData) < prototype(Neos.Fusion:DataStructure) {
     configuration = Neos.Fusion:DataStructure {

diff --git a/Resources/Private/Fusion/Backend/Component/ModuleMenu.fusion b/Resources/Private/Fusion/Backend/Component/ModuleMenu.fusion
@@ -1,3 +1,16 @@
+/*
+ * This file is part of the Neos.Neos.Ui package.
+ *
+ * (c) Contributors of the Neos Project - www.neos.io
+ *
+ * This package is Open Source Software. For the full copyright and license
+ * information, please view the LICENSE file which was distributed with this
+ * source code.
+ */
+
+include: resource://Neos.Fusion/Private/Fusion/Root.fusion
+
+/** @internal */
 prototype(Neos.Neos.Ui:Component.ModuleMenu) < prototype(Neos.Fusion:Map) {
     items = ${modulesForMenu}
     itemName = 'module'

diff --git a/Resources/Private/Fusion/Backend/Component/Scripts.fusion b/Resources/Private/Fusion/Backend/Component/Scripts.fusion
@@ -8,6 +8,8 @@
  * source code.
  */
 
+include: resource://Neos.Fusion/Private/Fusion/Root.fusion
+
 /** @internal */
 prototype(Neos.Neos.Ui:Component.Scripts) < prototype(Neos.Fusion:Value) {
     value = ${scripts}

diff --git a/Resources/Private/Fusion/Backend/Component/SplashScreen/SplashScreen.fusion b/Resources/Private/Fusion/Backend/Component/SplashScreen/SplashScreen.fusion
@@ -8,6 +8,8 @@
  * source code.
  */
 
+include: resource://Neos.Fusion/Private/Fusion/Root.fusion
+
 #
 # The SplashScreen is shown during initialization of the Neos UI
 #

diff --git a/Resources/Private/Fusion/Backend/Root.fusion b/Resources/Private/Fusion/Backend/Root.fusion
@@ -1,10 +1,18 @@
-include: resource://Neos.Fusion/Private/Fusion/Root.fusion
-include: resource://Neos.Neos/Private/Fusion/Prototypes/NodeUri.fusion
-include: resource://Neos.Neos.Ui/Private/Fusion/Prototypes/RenderConfiguration.fusion
-include: resource://Neos.Neos.Ui/Private/Fusion/Backend/Component/**/*.fusion
+/*
+ * This file is part of the Neos.Neos.Ui package.
+ *
+ * (c) Contributors of the Neos Project - www.neos.io
+ *
+ * This package is Open Source Software. For the full copyright and license
+ * information, please view the LICENSE file which was distributed with this
+ * source code.
+ */
 
 include: ./Application.fusion
 
+#
+# Neos UI (Content Module) entry point
+#
 backend = Neos.Neos.Ui:Application {
     title = 'Neos CMS'
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,8 @@ @@
      * source code.
      */
+    include: resource://Neos.Fusion/Private/Fusion/Root.fusion
     #
     # The SplashScreen is shown during initialization of the Neos UI
     #
@@ Expand Down @@