Move bundles to /dist

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

12 files changed, 15 insertions, 16 deletions

diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php
index 06a6253adef..bba8660399c 100644
--- a/apps/files/lib/Controller/ViewController.php
+++ b/apps/files/lib/Controller/ViewController.php
@@ -197,7 +197,9 @@ class ViewController extends Controller {
 		// Load the files we need
 		\OCP\Util::addStyle('files', 'merged');
 		\OCP\Util::addScript('files', 'merged-index');
-		\OCP\Util::addScript('files', 'dist/main');
+		\OCP\Util::addScript('files', 'templates');
+		\OCP\Util::addScript('files', 'files-app-settings');
+		\OCP\Util::addScript('files', 'legacy-filelist-search');
 
 		// mostly for the home storage's free space
 		// FIXME: Make non static
diff --git a/apps/files/lib/Listener/LoadSidebarListener.php b/apps/files/lib/Listener/LoadSidebarListener.php
index aa24538c2ee..15f24279e0a 100644
--- a/apps/files/lib/Listener/LoadSidebarListener.php
+++ b/apps/files/lib/Listener/LoadSidebarListener.php
@@ -37,7 +37,7 @@ class LoadSidebarListener implements IEventListener {
 			return;
 		}
 
-		Util::addScript(Application::APP_ID, 'dist/sidebar');
+		Util::addScript(Application::APP_ID, 'sidebar');
 		// needed by the Sidebar legacy tabs
 		// TODO: remove when all tabs migrated to the new api
 		Util::addScript('files', 'fileinfomodel');
diff --git a/apps/files/src/main.js b/apps/files/src/main.js
deleted file mode 100644
index a979822bdc4..00000000000
--- a/apps/files/src/main.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import './files-app-settings'
-import './templates'
-import './legacy/filelistSearch'
diff --git a/apps/files/templates/settings-personal.php b/apps/files/templates/settings-personal.php
index 1cddae3d33d..7aefb470cd6 100644
--- a/apps/files/templates/settings-personal.php
+++ b/apps/files/templates/settings-personal.php
@@ -22,7 +22,7 @@
  */
 
 
-script(\OCA\Files\AppInfo\Application::APP_ID, 'dist/personal-settings');
+script(\OCA\Files\AppInfo\Application::APP_ID, 'personal-settings');
 
 ?>
 <div id="files-personal-settings" class="section">
diff --git a/apps/files_sharing/lib/AppInfo/Application.php b/apps/files_sharing/lib/AppInfo/Application.php
index 056d246296f..befd1532d02 100644
--- a/apps/files_sharing/lib/AppInfo/Application.php
+++ b/apps/files_sharing/lib/AppInfo/Application.php
@@ -113,7 +113,7 @@ class Application extends App implements IBootstrap {
 		/**
 		 * Always add main sharing script
 		 */
-		Util::addScript(self::APP_ID, 'dist/main');
+		Util::addScript(self::APP_ID, 'main');
 	}
 
 
@@ -129,7 +129,7 @@ class Application extends App implements IBootstrap {
 		$dispatcher->addServiceListener(LoadSidebar::class, LoadSidebarListener::class);
 		$dispatcher->addServiceListener(ShareCreatedEvent::class, ShareInteractionListener::class);
 		$dispatcher->addListener('\OCP\Collaboration\Resources::loadAdditionalScripts', function () {
-			\OCP\Util::addScript('files_sharing', 'dist/collaboration');
+			\OCP\Util::addScript('files_sharing', 'collaboration');
 		});
 		$dispatcher->addServiceListener(ShareCreatedEvent::class, UserShareAcceptanceListener::class);
 		$dispatcher->addServiceListener(UserAddedEvent::class, UserAddedToGroupListener::class);
diff --git a/apps/files_sharing/lib/Listener/LoadAdditionalListener.php b/apps/files_sharing/lib/Listener/LoadAdditionalListener.php
index f24dca62a00..8c11fec3999 100644
--- a/apps/files_sharing/lib/Listener/LoadAdditionalListener.php
+++ b/apps/files_sharing/lib/Listener/LoadAdditionalListener.php
@@ -38,9 +38,9 @@ class LoadAdditionalListener implements IEventListener {
 		}
 
 		// After files for the files list shared content
-		Util::addScript(Application::APP_ID, 'dist/files_sharing', 'files');
+		Util::addScript(Application::APP_ID, 'files_sharing', 'files');
 		// After files for the breadcrumb share indicator
-		Util::addScript(Application::APP_ID, 'dist/additionalScripts', 'files');
+		Util::addScript(Application::APP_ID, 'additionalScripts', 'files');
 		Util::addStyle(Application::APP_ID, 'icons');
 	}
 }
diff --git a/apps/files_sharing/lib/Listener/LoadSidebarListener.php b/apps/files_sharing/lib/Listener/LoadSidebarListener.php
index 9eac82e6024..cb5ebf8a792 100644
--- a/apps/files_sharing/lib/Listener/LoadSidebarListener.php
+++ b/apps/files_sharing/lib/Listener/LoadSidebarListener.php
@@ -37,6 +37,6 @@ class LoadSidebarListener implements IEventListener {
 			return;
 		}
 
-		Util::addScript(Application::APP_ID, 'dist/files_sharing_tab', 'files');
+		Util::addScript(Application::APP_ID, 'files_sharing_tab', 'files');
 	}
 }
diff --git a/apps/files_sharing/templates/Settings/personal.php b/apps/files_sharing/templates/Settings/personal.php
index 0fe0e2f5445..30caeb16206 100644
--- a/apps/files_sharing/templates/Settings/personal.php
+++ b/apps/files_sharing/templates/Settings/personal.php
@@ -22,7 +22,7 @@ declare(strict_types=1);
  *
  */
 
-script(\OCA\Files_Sharing\AppInfo\Application::APP_ID, 'dist/personal-settings');
+script(\OCA\Files_Sharing\AppInfo\Application::APP_ID, 'personal-settings');
 
 ?>
 <div id="files-sharing-personal-settings" class="section">
diff --git a/apps/systemtags/lib/AppInfo/Application.php b/apps/systemtags/lib/AppInfo/Application.php
index 5fdd98f3526..cdc059d4a42 100644
--- a/apps/systemtags/lib/AppInfo/Application.php
+++ b/apps/systemtags/lib/AppInfo/Application.php
@@ -52,7 +52,7 @@ class Application extends App implements IBootstrap {
 			$dispatcher->addListener(
 				'OCA\Files::loadAdditionalScripts',
 				function () {
-					\OCP\Util::addScript('core', 'dist/systemtags');
+					\OCP\Util::addScript('core', 'systemtags');
 					\OCP\Util::addScript(self::APP_ID, 'systemtags');
 				}
 			);
diff --git a/apps/systemtags/templates/admin.php b/apps/systemtags/templates/admin.php
index 33e5f2b061d..998e8628c3d 100644
--- a/apps/systemtags/templates/admin.php
+++ b/apps/systemtags/templates/admin.php
@@ -19,7 +19,7 @@
  *
  */
 
-script('core', 'dist/systemtags');
+script('core', 'systemtags');
 
 script('systemtags', 'admin');
 style('systemtags', 'settings');
diff --git a/apps/user_status/lib/Listener/BeforeTemplateRenderedListener.php b/apps/user_status/lib/Listener/BeforeTemplateRenderedListener.php
index 24090188170..c98e988a37c 100644
--- a/apps/user_status/lib/Listener/BeforeTemplateRenderedListener.php
+++ b/apps/user_status/lib/Listener/BeforeTemplateRenderedListener.php
@@ -99,7 +99,7 @@ class BeforeTemplateRenderedListener implements IEventListener {
 			return ['profileEnabled' => $this->isProfileEnabled($account)];
 		});
 
-		\OCP\Util::addScript('user_status', 'user-status-menu');
+		\OCP\Util::addScript('user_status', 'user_status-menu');
 		\OCP\Util::addStyle('user_status', 'user-status-menu');
 	}
 }
diff --git a/apps/workflowengine/lib/Listener/LoadAdditionalSettingsScriptsListener.php b/apps/workflowengine/lib/Listener/LoadAdditionalSettingsScriptsListener.php
index dd1b345a69b..6c38051d41a 100644
--- a/apps/workflowengine/lib/Listener/LoadAdditionalSettingsScriptsListener.php
+++ b/apps/workflowengine/lib/Listener/LoadAdditionalSettingsScriptsListener.php
@@ -41,7 +41,7 @@ class LoadAdditionalSettingsScriptsListener implements IEventListener {
 			class_exists(Template::class, true);
 		}
 
-		script('core', 'dist/systemtags');
+		script('core', 'systemtags');
 
 		script(Application::APP_ID, [
 			'workflowengine',