perf: bundle with vite

Signed-off-by: Richard Steinmetz <[email protected]>
nextcloud · Oct 1, 2024 · c55089b · c55089b
1 parent e3464ae
commit c55089b
Show file tree

Hide file tree

Showing 35 changed files with 5,557 additions and 2,801 deletions.
diff --git a/.eslintrc.js → .eslintrc.cjs b/.eslintrc.js → .eslintrc.cjs
diff --git a/.gitignore b/.gitignore
@@ -17,6 +17,7 @@ tests/clover*.xml
 node_modules/
 
 /js
+/css
 
 # packaged app
 build/artifacts

diff --git a/babel.config.cjs b/babel.config.cjs
@@ -0,0 +1,8 @@
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+const babelConfig = require('@nextcloud/babel-config')
+
+module.exports = babelConfig
diff --git a/babel.config.js b/babel.config.js
diff --git a/jest.config.js → jest.config.cjs b/jest.config.js → jest.config.cjs
@@ -18,9 +18,11 @@ module.exports = {
 			require.resolve('jest-transform-stub'),
 		'^.+\\.jsx?$': require.resolve('babel-jest'),
 	},
-	// support the same @ -> src alias mapping in source code
 	moduleNameMapper: {
+		// support the same @ -> src alias mapping in source code
 		'^@/(.*)$': '<rootDir>/src/$1',
+		// trim "?raw" suffixes from svg imports
+		'(.*\\.svg)\\?raw$': '$1',
 	},
 	// serializer for snapshots
 	snapshotSerializers: [

diff --git a/krankerl.toml b/krankerl.toml
@@ -3,7 +3,7 @@
 [package]
 before_cmds = [
 	"composer install --no-dev -o",
-	"npm install --deps",
+	"npm install",
 	"npm run build",
 	"composer openapi"
 ]
diff --git a/lib/Controller/MessagesController.php b/lib/Controller/MessagesController.php
@@ -582,8 +582,8 @@ public function getHtmlBody(int $id, bool $plain = false): Response {
 					$html,
 					$this->nonceManager->getNonce(),
 					$this->urlGenerator->getAbsoluteURL(
-						$this->urlGenerator->linkTo('mail', 'js/htmlresponse.js')
-					)
+						$this->urlGenerator->linkTo('mail', 'js/mail-htmlresponse.mjs')
+					),
 				);
 
 			// Harden the default security policy

diff --git a/lib/Http/HtmlResponse.php b/lib/Http/HtmlResponse.php
@@ -71,6 +71,6 @@ public function render(): string {
 			return $this->content;
 		}
 
-		return '<!DOCTYPE html><html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><script nonce="' . $this->nonce . '" src="' . $this->scriptUrl . '"></script></head><body>' . $this->content . '<div data-iframe-height></div></body></html>';
+		return '<!DOCTYPE html><html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><script nonce="' . $this->nonce . '" src="' . $this->scriptUrl . '" type="module"></script></head><body>' . $this->content . '<div data-iframe-height></div></body></html>';
 	}
 }