From 3e58a944a7262b655d0f4331400cc84adc6ce3bc Mon Sep 17 00:00:00 2001
From: Ferdinand Thiessen <opensource@fthiessen.de>
Date: Thu, 8 Feb 2024 16:07:02 +0100
Subject: [PATCH] enh: Allow sharing JavaScript modules across apps and core

Initially `vue` and `@nextcloud/vue` are shared by server core.

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
---
 .../BeforeTemplateRenderedListener.php        |  4 +++
 core/src/modules/nextcloud-vue.ts             |  1 +
 core/src/modules/vue.ts                       |  4 +++
 lib/private/TemplateLayout.php                |  8 +++++
 lib/private/legacy/template/functions.php     |  9 ++++--
 lib/public/Util.php                           | 29 +++++++++++++++++++
 server.modules.mjs                            |  4 ++-
 vite.config.mjs                               |  1 +
 8 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100644 core/src/modules/nextcloud-vue.ts
 create mode 100644 core/src/modules/vue.ts

diff --git a/core/Listener/BeforeTemplateRenderedListener.php b/core/Listener/BeforeTemplateRenderedListener.php
index e1bda246afe4b..e850e46ddc82c 100644
--- a/core/Listener/BeforeTemplateRenderedListener.php
+++ b/core/Listener/BeforeTemplateRenderedListener.php
@@ -43,6 +43,10 @@ public function handle(Event $event): void {
 			return;
 		}
 
+		// Modules we share everywhere
+		Util::addSharedModule('core', 'shared-vue', 'vue');
+		Util::addSharedModule('core', 'shared-nextcloud-vue', '@nextcloud/vue');
+
 		if ($event->getResponse()->getRenderAs() === TemplateResponse::RENDER_AS_USER) {
 			// Making sure to inject just after core
 			Util::addScript('core', 'unsupported-browser-redirect');
diff --git a/core/src/modules/nextcloud-vue.ts b/core/src/modules/nextcloud-vue.ts
new file mode 100644
index 0000000000000..350604d036c01
--- /dev/null
+++ b/core/src/modules/nextcloud-vue.ts
@@ -0,0 +1 @@
+export * from '@nextcloud/vue'
diff --git a/core/src/modules/vue.ts b/core/src/modules/vue.ts
new file mode 100644
index 0000000000000..9b25ab1430d6d
--- /dev/null
+++ b/core/src/modules/vue.ts
@@ -0,0 +1,4 @@
+import Vue from 'vue'
+
+export * from 'vue'
+export default Vue
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
index b4490dfe101d0..4e28a9e4362ca 100644
--- a/lib/private/TemplateLayout.php
+++ b/lib/private/TemplateLayout.php
@@ -274,6 +274,14 @@ public function __construct($renderAs, $appId = '') {
 			$this->append('jsfiles', $web.'/'.$file . $this->getVersionHashSuffix());
 		}
 
+		$jsModules = array_map(function (string $path) {
+			$info = end(self::findJavascriptFiles([$path]));
+			$web = $info[1];
+			$file = $info[2];
+			return $web . '/' . $file . $this->getVersionHashSuffix();
+		}, Util::getSharedModules());
+		$this->assign('jsmodules', $jsModules);
+
 		try {
 			$pathInfo = \OC::$server->getRequest()->getPathInfo();
 		} catch (\Exception $e) {
diff --git a/lib/private/legacy/template/functions.php b/lib/private/legacy/template/functions.php
index bcc0906dcdfb3..bbd435778a138 100644
--- a/lib/private/legacy/template/functions.php
+++ b/lib/private/legacy/template/functions.php
@@ -80,10 +80,10 @@ function emit_script_tag(string $src, string $script_content = '', string $conte
 	$defer_str = ' defer';
 	$type = $content_type !== '' ? ' type="' . $content_type . '"' : '';
 
-	$s = '<script nonce="' . $nonceManager->getNonce() . '"';
+	$s = '<script nonce="' . $nonceManager->getNonce() . '"' . $type;
 	if (!empty($src)) {
 		// emit script tag for deferred loading from $src
-		$s .= $defer_str.' src="' . $src .'"' . $type . '>';
+		$s .= $defer_str.' src="' . $src .'">';
 	} elseif ($script_content !== '') {
 		// emit script tag for inline script from $script_content without defer (see MDN)
 		$s .= ">\n".$script_content."\n";
@@ -100,11 +100,16 @@ function emit_script_tag(string $src, string $script_content = '', string $conte
  * @param array $obj all the script information from template
  */
 function emit_script_loading_tags($obj) {
+	if (!empty($obj['jsmodules'])) {
+		emit_script_tag('', json_encode(['imports' => $obj['jsmodules']]), 'importmap');
+	}
+
 	foreach ($obj['jsfiles'] as $jsfile) {
 		$fileName = explode('?', $jsfile, 2)[0];
 		$type = str_ends_with($fileName, '.mjs') ? 'module' : '';
 		emit_script_tag($jsfile, '', $type);
 	}
+
 	if (!empty($obj['inline_ocjs'])) {
 		emit_script_tag('', $obj['inline_ocjs']);
 	}
diff --git a/lib/public/Util.php b/lib/public/Util.php
index 4009237db5dc7..1fd982dbf260c 100644
--- a/lib/public/Util.php
+++ b/lib/public/Util.php
@@ -63,6 +63,7 @@ class Util {
 	private static array $scriptsInit = [];
 	private static array $scripts = [];
 	private static array $scriptDeps = [];
+	private static array $sharedModules = [];
 
 	/**
 	 * get the current installed version of Nextcloud
@@ -206,6 +207,34 @@ public static function addScript(string $application, string $file = null, strin
 		}
 	}
 
+	/**
+	 * Provide a shared JavaScript module
+	 * Apps - if using this - should only provide their own API packages not external dependencies as this can conflict with server core.
+	 *
+	 * @param string $application The application where to look for the entry point (see `addScript`)
+	 * @param string $file The JavaScript entry point file name (see `addScript`)
+	 * @param string $module The modul name
+	 * @since 29.0.0
+	 */
+	public static function addSharedModule(string $application, string $file, string $module): void {
+		if (!empty($application)) {
+			$path = "$application/js/$file";
+		} else {
+			$path = "js/$file";
+		}
+
+		self::$sharedModules[$module] = $path;
+	}
+
+	/**
+	 * Get all shared JavaScript modules
+	 *
+	 * @since 29.0.0
+	 */
+	public static function getSharedModules(): array {
+		return self::$sharedModules;
+	}
+
 	/**
 	 * Return the list of scripts injected to the page
 	 *
diff --git a/server.modules.mjs b/server.modules.mjs
index 109c74bfd64df..3d4291fe56a1b 100644
--- a/server.modules.mjs
+++ b/server.modules.mjs
@@ -23,7 +23,7 @@
 import { dirname, join } from 'path'
 import { fileURLToPath } from 'url'
 
-const __dirname = import.meta.dirname ?? dirname(fileURLToPath(import.meta.url))
+const __dirname = globalThis?.__dirname ?? import.meta.dirname ?? dirname(fileURLToPath(import.meta.url))
 
 export default {
 	comments: {
@@ -32,6 +32,8 @@ export default {
 		init: join(__dirname, 'apps/comments/src', 'init.ts'),
 	},
 	core: {
+		'shared-vue': join(__dirname, 'core/src', 'modules/vue.ts'),
+		'shared-nextcloud-vue': join(__dirname, 'core/src', 'modules/nextcloud-vue.ts'),
 		backgroundjobs: join(__dirname, 'core/src', 'cron.ts'),
 		files_client: join(__dirname, 'core/src', 'files/client.js'),
 		files_fileinfo: join(__dirname, 'core/src', 'files/fileinfo.js'),
diff --git a/vite.config.mjs b/vite.config.mjs
index cbdb3d38cd851..0f9062a8c052d 100644
--- a/vite.config.mjs
+++ b/vite.config.mjs
@@ -24,6 +24,7 @@ export default createAppConfig(
 			build: {
 				cssCodeSplit: false,
 				rollupOptions: {
+					preserveEntrySignatures: 'allow-extension',
 					output: {
 						chunkFileNames: (info) => info.name.match(/core-common/) ? 'dist/core-common.mjs' : 'dist/chunks/[name]-[hash].mjs',
 						entryFileNames: 'dist/[name].mjs',