Skip to content
Snippets Groups Projects
Unverified Commit 0357a30a authored by Roeland Jago Douma's avatar Roeland Jago Douma
Browse files

Move systemtags to common webpack

parent 15dc1fa6
No related branches found
No related tags found
No related merge requests found
Showing with 54 additions and 10 deletions
......@@ -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
......
#webpack bundled files
js/systemtags.js
......@@ -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::addStyle('systemtags', 'systemtagsfilelist');
\OCP\Util::addScript('systemtags', 'systemtags');
}
);
......
[
"app.js",
"systemtagsfilelist.js",
"filesplugin.js",
"systemtagsinfoview.js",
"systemtagsinfoviewtoggleview.js"
]
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File moved
import './app'
import './systemtagsfilelist'
import './filesplugin'
import './systemtagsinfoview'
import './systemtagsinfoviewtoggleview'
import './css/systemtagsfilelist.scss'
window.OCA.SystemTags = OCA.SystemTags;
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']
}
};
......@@ -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
);
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment