From a2901494f86dca342472c379f3268d3a5736e5a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
 <skjnldsv@protonmail.com>
Date: Fri, 3 Dec 2021 14:05:39 +0100
Subject: [PATCH] fixup! fixup! fixup! fixup! Split common vendor chunk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 lib/private/legacy/OC_Template.php        |  2 +-
 lib/private/legacy/template/functions.php | 13 ++++++++++---
 lib/public/Util.php                       | 11 ++++++++---
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/lib/private/legacy/OC_Template.php b/lib/private/legacy/OC_Template.php
index 04996a14df44f..dcca41fb1d006 100644
--- a/lib/private/legacy/OC_Template.php
+++ b/lib/private/legacy/OC_Template.php
@@ -112,11 +112,11 @@ public static function initTemplateEngine($renderAs) {
 			}
 			OC_Util::addStyle('css-variables', null, true);
 			OC_Util::addStyle('server', null, true);
-			OC_Util::addTranslations('core', null, true);
 
 			// include common nextcloud webpack bundle
 			Util::addScript('core', 'common');
 			Util::addScript('core', 'main');
+			Util::addTranslations('core');
 
 			if (\OC::$server->getSystemConfig()->getValue('installed', false) && !\OCP\Util::needUpgrade()) {
 				Util::addScript('core', 'files_fileinfo');
diff --git a/lib/private/legacy/template/functions.php b/lib/private/legacy/template/functions.php
index 6b18c9476b473..c494ba465b9e3 100644
--- a/lib/private/legacy/template/functions.php
+++ b/lib/private/legacy/template/functions.php
@@ -1,4 +1,7 @@
 <?php
+
+use OCP\Util;
+
 /**
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  *
@@ -111,17 +114,21 @@ function print_unescaped($string) {
 
 /**
  * Shortcut for adding scripts to a page
+ * All scripts are forced to be loaded after core since
+ * they are coming from a template registration.
+ * Please consider moving them into the relevant controller
+ * 
  * @param string $app the appname
  * @param string|string[] $file the filename,
  * if an array is given it will add all scripts
  */
 function script($app, $file = null) {
 	if (is_array($file)) {
-		foreach ($file as $f) {
-			OC_Util::addScript($app, $f);
+		foreach ($file as $script) {
+			Util::addScript($app, $script, 'core');
 		}
 	} else {
-		OC_Util::addScript($app, $file);
+		Util::addScript($app, $file, 'core');
 	}
 }
 
diff --git a/lib/public/Util.php b/lib/public/Util.php
index d0b23ddd3e057..8d442124202b3 100644
--- a/lib/public/Util.php
+++ b/lib/public/Util.php
@@ -238,11 +238,12 @@ public static function addScript($application, $file = null, $afterAppId = null)
 	public static function getScripts(): array {
 		// merging first and last data set
 		$mapFunc = function (array $scriptsArray): array {
-			return array_merge(...array_values($scriptsArray));
+			return array_merge($scriptsArray['first'] ?? [], $scriptsArray['last'] ?? []);
 		};
 		$appScripts = array_map($mapFunc, self::$scripts);
+
 		// sort core first
-		$scripts = array_merge(isset($appScripts['core']) ? $appScripts['core'] : [], ...array_values($appScripts));
+		$scripts = array_merge($appScripts['core'] ?? [], ...array_values($appScripts));
 		// remove duplicates
 		return array_unique($scripts);
 	}
@@ -259,10 +260,14 @@ public static function addTranslations($application, $languageCode = null) {
 		}
 		if (!empty($application)) {
 			$path = "$application/l10n/$languageCode";
+			// init script entry if empty
+			if (!array_key_exists($application, self::$scripts)) {
+				self::$scripts[$application] = ['first' => [], 'last' => []];
+			}
 		} else {
 			$path = "l10n/$languageCode";
 		}
-		self::$scripts[$application]['first'][] = $path;
+		self::$scripts[$application]['last'][] = $path;
 	}
 
 	/**