Move systemtags to common webpack

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2019-02-13 22:54:48 +01:00
parent 15dc1fa62f
commit 0357a30a58
No known key found for this signature in database
GPG Key ID: F941078878347C0C
15 changed files with 78 additions and 10 deletions

2
.gitattributes vendored
View File

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

View File

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

View File

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

View File

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

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

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

View File

@ -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']
}
};

View File

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