Move to combined files entrypoint

Signed-off-by: Julius Härtl <[email protected]>
nextcloud · Oct 25, 2021 · 9c937a6 · 9c937a6
1 parent 584d275
commit 9c937a6
Show file tree

Hide file tree

Showing 15 changed files with 432 additions and 422 deletions.
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/js/dist/templates.js b/apps/files/js/dist/templates.js
diff --git a/apps/files/js/dist/templates.js.map b/apps/files/js/dist/templates.js.map
diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php
@@ -197,7 +197,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/templates');
+		\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,3 @@
+import './files-app-settings'
+import './templates'
+import './legacy/filelistSearch'
diff --git a/apps/files/src/templates.js b/apps/files/src/templates.js
@@ -32,8 +32,6 @@ import Vue from 'vue'
 import TemplatePickerView from './views/TemplatePicker'
 import { showError } from '@nextcloud/dialogs'
 
-import './legacy/filelistSearch'
-
 // Set up logger
 const logger = getLoggerBuilder()
 	.setApp('files')

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
@@ -26,9 +26,8 @@ const path = require('path')
 
 module.exports = {
 	entry: {
+		main: path.join(__dirname, 'src', 'main.js'),
 		sidebar: path.join(__dirname, 'src', 'sidebar.js'),
-		templates: path.join(__dirname, 'src', 'templates.js'),
-		'files-app-settings': path.join(__dirname, 'src', 'files-app-settings.js'),
 		'personal-settings': path.join(__dirname, 'src', 'main-personal-settings.js'),
 	},
 	output: {