feat(core): load AppMenu as a deferred core script

Register the core/appmenu entry in the user layout so the waffle
launcher mounts like every other core script.

Signed-off-by: Peter Ringelmann <peter.ringelmann@nextcloud.com>

Author: pringelmann

core/src/appmenu/main.ts

@@ -4,10 +4,6 @@
  *
  * Standalone entry for the waffle launcher (AppMenu). Mounts independently of
  * core-main so the app grid lives in its own chunk.
- *
- * Uses Vue 2 syntax because the legacy webpack pipeline (build/frontend-legacy/)
- * still resolves `vue` to 2.7.16. The modern Vite pipeline ships Vue 3 but does
- * not currently include core; migrating core is out of scope for this work.
  */
 import Vue from 'vue'
 import AppMenu from './AppMenu.vue'
@@ -17,7 +13,7 @@ interface AppMenuInstance {
 }
 
 declare global {
-	// eslint-disable-next-line no-var
+
 	var OC: {
 		setNavigationCounter?: (id: string, counter: number) => void
 	}
@@ -38,6 +34,4 @@ function mount(): void {
 	}
 }
 
-// Loaded as a deferred core script, so the document is already parsed and the
-// nav container exists by the time this runs.
 mount()

core/src/tests/appmenu/main.spec.ts

@@ -4,10 +4,6 @@
  */
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
-// Match every transitive dependency reachable from AppMenu.vue so its module
-// graph resolves cleanly inside JSDOM. We do NOT mock `vue`: the legacy Vitest
-// config aliases `vue` to Vue 2.7, which matches what the production webpack
-// bundle resolves to. Using the real Vue exercises the actual mount path.
 vi.mock('@nextcloud/initial-state', () => ({
 	loadState: () => [],
 }))

lib/private/TemplateLayout.php

@@ -42,7 +42,8 @@
 use OCP\Template\ITemplateManager;
 use OCP\Util;
 
-class TemplateLayout {
+class TemplateLayout
+{
 	private string $versionHash = '';
 	/** @var string[] */
 	private array $cacheBusterCache = [];
@@ -59,10 +60,10 @@ public function __construct(
 		private ITemplateManager $templateManager,
 		private ServerVersion $serverVersion,
 		private IRequest $request,
-	) {
-	}
+	) {}
 
-	public function getPageTemplate(string $renderAs, string $appId): ITemplate {
+	public function getPageTemplate(string $renderAs, string $appId): ITemplate
+	{
 		// Add fallback theming variables if not rendered as user
 		if ($renderAs !== TemplateResponse::RENDER_AS_USER) {
 			// TODO cache generated default theme if enabled for fallback if server is erroring ?
@@ -92,6 +93,8 @@ public function getPageTemplate(string $renderAs, string $appId): ITemplate {
 					Util::addScript('core', 'unified-search', 'core');
 				}
 
+				Util::addScript('core', 'appmenu', 'core');
+
 				// Set logo link target
 				$logoUrl = $this->config->getSystemValueString('logo_url', '');
 				$page->assign('logoUrl', $logoUrl);
@@ -267,7 +270,8 @@ public function getPageTemplate(string $renderAs, string $appId): ITemplate {
 
 		// Do not initialise scss appdata until we have a fully installed instance
 		// Do not load scss for update, errors, installation or login page
-		if ($this->config->getSystemValueBool('installed', false)
+		if (
+			$this->config->getSystemValueBool('installed', false)
 			&& !Util::needUpgrade()
 			&& $pathInfo !== ''
 			&& !preg_match('/^\/login/', $pathInfo)
@@ -315,7 +319,8 @@ public function getPageTemplate(string $renderAs, string $appId): ITemplate {
 		return $page;
 	}
 
-	protected function getVersionHashSuffix(string $path = '', string $file = ''): string {
+	protected function getVersionHashSuffix(string $path = '', string $file = ''): string
+	{
 		if ($this->config->getSystemValueBool('debug', false)) {
 			// allows chrome workspace mapping in debug mode
 			return '';
@@ -346,7 +351,8 @@ protected function getVersionHashSuffix(string $path = '', string $file = ''): s
 		return '?v=' . $hash . $themingSuffix;
 	}
 
-	private function getVersionHashByPath(string $path): string|false {
+	private function getVersionHashByPath(string $path): string|false
+	{
 		if (array_key_exists($path, $this->cacheBusterCache) === false) {
 			// Not yet cached, so lets find the cache buster string
 			$appId = $this->getAppNamefromPath($path);
@@ -373,15 +379,17 @@ private function getVersionHashByPath(string $path): string|false {
 		return $this->cacheBusterCache[$path];
 	}
 
-	private function findStylesheetFiles(array $styles): array {
+	private function findStylesheetFiles(array $styles): array
+	{
 		if ($this->cssLocator === null) {
 			$this->cssLocator = Server::get(CSSResourceLocator::class);
 		}
 		$this->cssLocator->find($styles);
 		return $this->cssLocator->getResources();
 	}
 
-	public function getAppNamefromPath(string $path): string|false {
+	public function getAppNamefromPath(string $path): string|false
+	{
 		if ($path !== '') {
 			$pathParts = explode('/', $path);
 			if ($pathParts[0] === 'css') {
@@ -395,7 +403,8 @@ public function getAppNamefromPath(string $path): string|false {
 		return false;
 	}
 
-	private function findJavascriptFiles(array $scripts): array {
+	private function findJavascriptFiles(array $scripts): array
+	{
 		if ($this->jsLocator === null) {
 			$this->jsLocator = Server::get(JSResourceLocator::class);
 		}
@@ -409,7 +418,8 @@ private function findJavascriptFiles(array $scripts): array {
 	 * @return string Relative path
 	 * @throws \Exception If $filePath is not under \OC::$SERVERROOT
 	 */
-	public static function convertToRelativePath(string $filePath) {
+	public static function convertToRelativePath(string $filePath)
+	{
 		$relativePath = explode(\OC::$SERVERROOT, $filePath);
 		if (count($relativePath) !== 2) {
 			throw new \Exception('$filePath is not under the \OC::$SERVERROOT');