Merge pull request #14013 from nextcloud/enh/core_systemtags_js

Move core/systemtags to webpack

apps/systemtags/appinfo/app.php

@@ -33,9 +33,8 @@ $eventDispatcher->addListener(
 	'OCA\Files::loadAdditionalScripts',
 	function() {
 		// FIXME: no public API for these ?
-		\OCP\Util::addScript('systemtags/merged');
+		\OCP\Util::addScript('dist/systemtags');
 		\OCP\Util::addScript('systemtags', 'merged');
-		\OCP\Util::addStyle('systemtags');
 		\OCP\Util::addStyle('systemtags', 'systemtagsfilelist');
 	}
 );

core/js/systemtags/merged-systemtags.js

@@ -0,0 +1,8 @@
+import './systemtags.js'
+import './templates.js'
+import './systemtagmodel.js'
+import './systemtagsmappingcollection.js'
+import './systemtagscollection.js'
+import './systemtagsinputfield.js'
+
+import '../../css/systemtags.scss'

core/js/systemtags/merged.json

@@ -1,8 +0,0 @@
-[
-  "systemtags.js",
-  "templates.js",
-  "systemtagmodel.js",
-  "systemtagsmappingcollection.js",
-  "systemtagscollection.js",
-  "systemtagsinputfield.js"
-]

core/webpack.common.js

@@ -59,7 +59,8 @@ module.exports = [
 	},
 	{
 		entry: {
-			share_backend: path.resolve(__dirname, 'js/merged-share-backend.js')
+			share_backend: path.resolve(__dirname, 'js/merged-share-backend.js'),
+			systemtags: path.resolve(__dirname, 'js/systemtags/merged-systemtags.js')
 		},
 		output: {
 			filename: '[name].js',
@@ -71,7 +72,15 @@ module.exports = [
 					test: /\.js$/,
 					loader: 'babel-loader',
 					exclude: /node_modules/
-				}
+				},
+				{
+					test: /\.css$/,
+					use: ['style-loader', 'css-loader']
+				},
+				{
+					test: /\.scss$/,
+					use: ['style-loader', 'css-loader', 'sass-loader']
+				},
 			]
 		}
 	}

package.json

@@ -50,6 +50,8 @@
     "css-loader": "^2.1.0",
     "exports-loader": "^0.7.0",
     "handlebars-loader": "^1.7.1",
+    "node-sass": "^4.11.0",
+    "sass-loader": "^7.1.0",
     "style-loader": "^0.23.1",
     "url-loader": "^1.1.2",
     "webpack": "^4.29.1",