Merge pull request #14186 from nextcloud/enh/systemtags_to_webpack

Move systemtags (app) to webpack

.gitattributes

@@ -7,6 +7,8 @@
 /apps/files_versions/js/files_versions.js.map binary
 /apps/oauth2/js/oauth2.js binary
 /apps/oauth2/js/oauth2.js.map binary
+/apps/systemtags/js/systemtags.js binary
+/apps/systemtags/js/systemtags.js.map binary
 /apps/twofactor_backupcodes/js/*.js binary
 /apps/twofactor_backupcodes/js/*.js.map binary
 /apps/updatenotification/js/updatenotification.js binary

apps/systemtags/.l10nignore

@@ -0,0 +1,2 @@
+#webpack bundled files
+js/systemtags.js

apps/systemtags/appinfo/app.php

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

apps/systemtags/img/tag.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1" viewBox="0 0 16 16"><path color="#000" fill="none" d="M-62.897-32.993h163.31v97.986h-163.31z"/><path d="M6.186.96L1.38.975c-.273 0-.347.21-.348.346l-.015 4.802 8.723 8.722a.498.498 0 0 0 .71 0l4.456-4.457a.5.5 0 0 0 .002-.71v.01L6.54 1.318 6.186.964zM4.02 2.814a1.144 1.144 0 0 1 1.143 1.144A1.144 1.144 0 0 1 4.02 5.1a1.144 1.144 0 0 1-1.145-1.143A1.144 1.144 0 0 1 4.02 2.813z"/></svg>

apps/systemtags/js/merged.json

@@ -1,7 +0,0 @@
-[
-  "app.js",
-  "systemtagsfilelist.js",
-  "filesplugin.js",
-  "systemtagsinfoview.js",
-  "systemtagsinfoviewtoggleview.js"
-]

apps/systemtags/src/css/systemtagsfilelist.scss

@@ -12,10 +12,6 @@
 	margin-left: 10px;
 }
 
-.nav-icon-systemtagsfilter {
-	@include icon-color('tag', 'systemtags', $color-black);
-}
-
 #app-sidebar .mainFileInfoView .tag-label {
 	cursor: pointer;
 	padding: 13px;

apps/systemtags/src/systemtags.js

@@ -0,0 +1,8 @@
+import './app'
+import './systemtagsfilelist'
+import './filesplugin'
+import './systemtagsinfoview'
+import './systemtagsinfoviewtoggleview'
+import './css/systemtagsfilelist.scss'
+
+window.OCA.SystemTags = OCA.SystemTags;

apps/systemtags/webpack.js

@@ -0,0 +1,37 @@
+const path = require('path');
+
+module.exports = {
+	entry: path.join(__dirname, 'src', 'systemtags.js'),
+	output: {
+		path: path.resolve(__dirname, './js'),
+		publicPath: '/js/',
+		filename: 'systemtags.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']
+	}
+};

core/css/icons.scss

@@ -479,7 +479,10 @@ img, object, video, button, textarea, input, select, div[contenteditable='true']
 	@include icon-color('search', 'actions', $color-black, 1, true);
 }
 
-
 .icon-talk {
 	@include icon-color('app-dark', 'spreed', $color-black, 1);
 }
+
+.nav-icon-systemtagsfilter {
+	@include icon-color('tag', 'actions', $color-black, 1, true);
+}

tests/karma.config.js

@@ -46,6 +46,7 @@ module.exports = function(config) {
 			'files',
 			'files_trashbin',
 			'files_versions',
+			'systemtags',
 			{
 				name: 'files_sharing',
 				srcFiles: [
@@ -92,18 +93,6 @@ module.exports = function(config) {
 				],
 				testFiles: ['apps/comments/tests/js/**/*.js']
 			},
-			{
-				name: 'systemtags',
-				srcFiles: [
-					// need to enforce loading order...
-					'apps/systemtags/js/app.js',
-					'apps/systemtags/js/systemtagsinfoview.js',
-					'apps/systemtags/js/systemtagsinfoviewtoggleview.js',
-					'apps/systemtags/js/systemtagsfilelist.js',
-					'apps/systemtags/js/filesplugin.js'
-				],
-				testFiles: ['apps/systemtags/tests/js/**/*.js']
-			},
 			{
 				name: 'settings',
 				srcFiles: [

webpack.common.js

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