Merge pull request #14227 from nextcloud/enh/comments_to_webpack

Move comments to webpack

.gitattributes

@@ -3,6 +3,8 @@
 
 /apps/accessibility/js/accessibility.js binary
 /apps/accessibility/js/accessibility.js.map binary
+/apps/comments/js/*.js binary
+/apps/comments/js/*.js.map binary
 /apps/files_sharing/js/additionalScripts.js binary
 /apps/files_sharing/js/additionalScripts.js.map binary
 /apps/files_versions/js/files_versions.js binary

apps/comments/.l10nignore

 # compiled vue templates
-js/templates.js
+src/templates.js
+js/comments.js

apps/comments/js/merged.json

-[
-  "app.js",
-  "templates.js",
-  "commentmodel.js",
-  "commentcollection.js",
-  "commentsummarymodel.js",
-  "commentstabview.js",
-  "commentsmodifymenu.js",
-  "filesplugin.js",
-  "activitytabviewplugin.js",
-  "search.js",
-  "vendor/Caret.js/dist/jquery.caret.min.js",
-  "vendor/At.js/dist/js/jquery.atwho.min.js"
-]

apps/comments/lib/AppInfo/Application.php

@@ -61,9 +61,7 @@ class Application extends App {
 		$dispatcher->addListener(
 			'OCA\Files::loadAdditionalScripts',
 			function() {
-				Util::addScript('comments', 'merged');
-				Util::addStyle('comments', 'autocomplete');
-				Util::addStyle('comments', 'comments');
+				Util::addScript('comments', 'comments');
 			}
 		);
 	}

apps/comments/src/comments.js

+import './app'
+import './templates'
+import './commentmodel'
+import './commentcollection'
+import './commentsummarymodel'
+import './commentstabview'
+import './commentsmodifymenu'
+import './filesplugin'
+import './activitytabviewplugin'
+import './search'
+
+import './vendor/Caret.js/dist/jquery.caret.min'
+import './vendor/At.js/dist/js/jquery.atwho.min'
+
+import './style/autocomplete.scss'
+import './style/comments.scss'
+
+window.OCA.Comments = OCA.Comments;