Merge pull request #10482 from nextcloud/revert/vite

chore: welcome back webpack
nextcloud · Dec 12, 2024 · 099e479 · 099e479
2 parents 1309b9e + 2025394
commit 099e479
Show file tree

Hide file tree

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

diff --git a/babel.config.cjs b/babel.config.cjs
diff --git a/babel.config.js b/babel.config.js
@@ -0,0 +1,19 @@
+/**
+ * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+module.exports = {
+	plugins: [
+		'@babel/plugin-syntax-dynamic-import'
+	],
+	presets: [
+		[
+			'@babel/preset-env',
+			{
+				modules: process.env.NODE_ENV === 'testing' ? 'commonjs' : undefined,
+				useBuiltIns: process.env.NODE_ENV === 'testing' ? 'usage' : 'entry',
+				corejs: 3
+			}
+		]
+	]
+};
diff --git a/src/css/html-response.css → css/html-response.css b/src/css/html-response.css → css/html-response.css
diff --git a/src/css/mail.scss → css/mail.scss b/src/css/mail.scss → css/mail.scss
diff --git a/src/css/mobile.scss → css/mobile.scss b/src/css/mobile.scss → css/mobile.scss
diff --git a/src/css/redirect.css → css/redirect.css b/src/css/redirect.css → css/redirect.css
diff --git a/jest.config.cjs → jest.config.js b/jest.config.cjs → jest.config.js
@@ -18,11 +18,9 @@ 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",
+	"npm install --deps",
 	"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/mail-htmlresponse.mjs')
-					),
+						$this->urlGenerator->linkTo('mail', 'js/htmlresponse.js')
+					)
 				);
 
 			// 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 . '" type="module"></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 . '"></script></head><body>' . $this->content . '<div data-iframe-height></div></body></html>';
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,6 @@ tests/clover*.xml @@
     node_modules/
     /js
-    /css
     # packaged app
     build/artifacts
@@ Expand Down @@