Move to combined files entrypoint

Signed-off-by: Julius Härtl <[email protected]>
nextcloud · skjnldsv · Oct 26, 2021 · Apr 29, 2021 · Apr 30, 2021 · Oct 20, 2021
commit 076a72238bc7718680234bffd735c8fad0b4bfbe
diff --git a/apps/files/js/dist/files-app-settings.js b/apps/files/js/dist/files-app-settings.js
diff --git a/apps/files/js/dist/files-app-settings.js.map b/apps/files/js/dist/files-app-settings.js.map
diff --git a/apps/files/js/dist/main.js b/apps/files/js/dist/main.js
diff --git a/apps/files/js/dist/main.js.map b/apps/files/js/dist/main.js.map
diff --git a/apps/files/js/dist/personal-settings.js b/apps/files/js/dist/personal-settings.js
diff --git a/apps/files/js/dist/personal-settings.js.map b/apps/files/js/dist/personal-settings.js.map
diff --git a/apps/files/js/dist/sidebar.js b/apps/files/js/dist/sidebar.js
diff --git a/apps/files/js/dist/sidebar.js.map b/apps/files/js/dist/sidebar.js.map
diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php
@@ -182,6 +182,7 @@ public function index($dir = '', $view = '', $fileid = null, $fileNotFound = fal
 		// Load the files we need
 		\OCP\Util::addStyle('files', 'merged');
 		\OCP\Util::addScript('files', 'merged-index');
+		\OCP\Util::addScript('files', 'dist/main');
 
 		// mostly for the home storage's free space
 		// FIXME: Make non static

diff --git a/apps/files/src/main.js b/apps/files/src/main.js
@@ -0,0 +1,2 @@
+import './files-app-settings'
+import './legacy/filelistSearch'
diff --git a/apps/files/templates/appnavigation.php b/apps/files/templates/appnavigation.php
@@ -1,6 +1,3 @@
-<?php
-script(\OCA\Files\AppInfo\Application::APP_ID, 'dist/files-app-settings');
-?>
 <div id="app-navigation">
 	<ul class="with-icon">
 

diff --git a/apps/files/webpack.js b/apps/files/webpack.js
@@ -2,8 +2,8 @@ const path = require('path');
 
 module.exports = {
 	entry: {
-		'sidebar': path.join(__dirname, 'src', 'sidebar.js'),
-		'files-app-settings': path.join(__dirname, 'src', 'files-app-settings.js'),
+		main: path.join(__dirname, 'src', 'main.js'),
+		sidebar: path.join(__dirname, 'src', 'sidebar.js'),
 		'personal-settings': path.join(__dirname, 'src', 'main-personal-settings.js'),
 	},
 	output: {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		import './files-app-settings'
		import './legacy/filelistSearch'