Merge webpack into main one

Signed-off-by: Julius Härtl <jus@bitgrid.net>

3 files changed, 25 insertions, 26 deletions

diff --git a/apps/files_sharing/src/additionalScripts.js b/apps/files_sharing/src/additionalScripts.js
index dc07e2e9332..081519cc648 100644
--- a/apps/files_sharing/src/additionalScripts.js
+++ b/apps/files_sharing/src/additionalScripts.js
@@ -1,6 +1,29 @@
+__webpack_public_path__ = OC.linkTo('files_sharing', 'js/');
+__webpack_nonce__ = btoa(OC.requestToken);
+
 import './share'
 import './sharetabview'
 import './sharebreadcrumbview'
 
 import './style/sharetabview.scss'
 import './style/sharebreadcrumb.scss'
+
+window.OCP.Collaboration.registerType('files', {
+	action: () => {
+		return new Promise((resolve, reject) => {
+			OC.dialogs.filepicker('Link to a file', function (f) {
+				const client = OC.Files.getClient();
+				client.getFileInfo(f).then((status, fileInfo) => {
+					resolve(fileInfo.id);
+				}, () => {
+					reject();
+				});
+			}, false);
+		});
+	},
+	/** used in "Link to a {typeString}" */
+	typeString: t('files_sharing', 'file'),
+	typeIconClass: 'icon-files-dark'
+});
+
+window.OCA.Sharing = OCA.Sharing;
diff --git a/apps/files_sharing/src/files_sharing.js b/apps/files_sharing/src/files_sharing.js
index 54bf71d8a19..631dc3a832a 100644
--- a/apps/files_sharing/src/files_sharing.js
+++ b/apps/files_sharing/src/files_sharing.js
@@ -1,29 +1,5 @@
-
 __webpack_nonce__ = btoa(OC.requestToken);
-__webpack_public_path__ = OC.linkTo('files_sharing', 'js/dist/');
+__webpack_public_path__ = OC.linkTo('files_sharing', 'js/');
 
 import '../js/app';
 import '../js/sharedfilelist';
-import '../js/sharetabview';
-import '../js/share';
-import '../js/sharebreadcrumbview';
-
-window.OCP.Collaboration.registerType('files', {
-	action: () => {
-		return new Promise((resolve, reject) => {
-			OC.dialogs.filepicker('Link to a file', function (f) {
-				const client = OC.Files.getClient();
-				client.getFileInfo(f).then((status, fileInfo) => {
-					resolve(fileInfo.id);
-				}, () => {
-					reject();
-				});
-			}, false);
-		});
-	},
-	/** used in "Link to a {typeString}" */
-	typeString: t('files_sharing', 'file'),
-	typeIconClass: 'icon-files-dark'
-});
-
-window.OCA.Sharing = OCA.Sharing;
diff --git a/apps/files_sharing/src/sharetabview.js b/apps/files_sharing/src/sharetabview.js
index eaed674775a..275a79198cc 100644
--- a/apps/files_sharing/src/sharetabview.js
+++ b/apps/files_sharing/src/sharetabview.js
@@ -83,7 +83,7 @@
 					self.trigger('sharesChanged', shareModel);
 				});
 
-				import('./../src/collaborationresources').then((Resources) => {
+				import('./collaborationresources').then((Resources) => {
 					var vm = new Resources.Vue({
 						el: '#collaborationResources',
 						render: h => h(Resources.View),