Browse Source

Move systemtags to common webpack

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
tags/v16.0.0alpha1
Roeland Jago Douma 5 years ago
parent
commit
0357a30a58
No account linked to committer's email address

+ 2
- 0
.gitattributes View File

@@ -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

+ 2
- 0
apps/systemtags/.l10nignore View File

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

+ 1
- 2
apps/systemtags/appinfo/app.php View File

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


+ 0
- 7
apps/systemtags/js/merged.json View File

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

+ 23
- 0
apps/systemtags/js/systemtags.js
File diff suppressed because it is too large
View File


+ 1
- 0
apps/systemtags/js/systemtags.js.map
File diff suppressed because it is too large
View File


apps/systemtags/js/app.js → apps/systemtags/src/app.js View File


apps/systemtags/css/systemtagsfilelist.scss → apps/systemtags/src/css/systemtagsfilelist.scss View File


apps/systemtags/js/filesplugin.js → apps/systemtags/src/filesplugin.js View File


+ 8
- 0
apps/systemtags/src/systemtags.js 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;

apps/systemtags/js/systemtagsfilelist.js → apps/systemtags/src/systemtagsfilelist.js View File


apps/systemtags/js/systemtagsinfoview.js → apps/systemtags/src/systemtagsinfoview.js View File


apps/systemtags/js/systemtagsinfoviewtoggleview.js → apps/systemtags/src/systemtagsinfoviewtoggleview.js View File


+ 37
- 0
apps/systemtags/webpack.js 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']
}
};

+ 4
- 1
webpack.common.js View File

@@ -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
);

Loading…
Cancel
Save