Merge pull request #14218 from nextcloud/enh/files_sharing_to_webpack

Move files_sharing additionalscripts over to webpack

.gitattributes

@@ -3,6 +3,8 @@
 
 /apps/accessibility/js/accessibility.js binary
 /apps/accessibility/js/accessibility.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/files_versions/js/files_versions.js.map binary
 /apps/oauth2/js/oauth2.js binary

apps/files_sharing/.l10nignore

+#webpack bundled files
+js/additionalScripts.js

apps/files_sharing/appinfo/app.php

@@ -42,7 +42,6 @@ $eventDispatcher = \OC::$server->getEventDispatcher();
 $eventDispatcher->addListener(
 	'OCA\Files::loadAdditionalScripts',
 	function() {
-		\OCP\Util::addStyle('files_sharing', 'mergedAdditionalStyles');
 		\OCP\Util::addScript('files_sharing', 'additionalScripts');
 	}
 );

apps/files_sharing/css/mergedAdditionalStyles.scss

-@import 'sharetabview.scss';
-@import 'sharebreadcrumb.scss';

apps/files_sharing/js/additionalScripts.json

-[
-	"share.js",
-	"sharetabview.js",
-	"sharebreadcrumbview.js"
-]

apps/files_sharing/src/additionalScripts.js

+import './share'
+import './sharetabview'
+import './sharebreadcrumbview'
+
+import './style/sharetabview.scss'
+import './style/sharebreadcrumb.scss'

apps/files_sharing/webpack.js

+const path = require('path');
+
+module.exports = {
+	entry: path.join(__dirname, 'src', 'additionalScripts.js'),
+	output: {
+		path: path.resolve(__dirname, './js'),
+		publicPath: '/js/',
+		filename: 'additionalScripts.js'
+	},
+	module: {
+		rules: [
+			{
+				test: /\.css$/,
+				use: ['style-loader', 'css-loader']
+			},
+			{
+				test: /\.scss$/,
+				use: ['style-loader', 'css-loader', 'sass-loader']
+			},
+			{
+				test: /\.js$/,
+				loader: 'babel-loader',
+				exclude: /node_modules/
+			},
+			{
+				test: /\.(png|jpg|gif|svg)$/,
+				loader: 'file-loader',
+				options: {
+					name: '[name].[ext]?[hash]'
+				}
+			}
+		]
+	},
+	resolve: {
+		extensions: ['*', '.js']
+	}
+};

tests/karma.config.js

@@ -54,10 +54,8 @@ module.exports = function(config) {
 					// up with the global namespace/classes/state
 					'apps/files_sharing/js/app.js',
 					'apps/files_sharing/js/sharedfilelist.js',
-					'apps/files_sharing/js/share.js',
-					'apps/files_sharing/js/sharebreadcrumbview.js',
+					'apps/files_sharing/js/additionalScripts.js',
 					'apps/files_sharing/js/public.js',
-					'apps/files_sharing/js/sharetabview.js',
 					'apps/files_sharing/js/files_drop.js',
 					'apps/files_sharing/js/templates.js',
 				],

webpack.common.js

 const core = require('./core/webpack');
+const files_sharing = require('./apps/files_sharing/webpack')
 const files_trashbin = require('./apps/files_trashbin/webpack')
 const files_versions = require('./apps/files_versions/webpack');
 const oauth2 = require('./apps/oauth2/webpack')
@@ -6,6 +7,7 @@ const systemtags = require('./apps/systemtags/webpack')
 
 module.exports = [].concat(
 	core,
+	files_sharing,
 	files_trashbin,
 	files_versions,
 	oauth2,