Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

/apps/accessibility/js/accessibility.js binary
/apps/accessibility/js/accessibility.js.map binary
/apps/files_sharing/js/additionalScripts.js binary
/apps/files_sharing/js/additionalScripts.js.map binary
/apps/files_versions/js/files_versions.js binary
/apps/files_versions/js/files_versions.js.map binary
/apps/oauth2/js/oauth2.js binary
Expand Down
2 changes: 2 additions & 0 deletions apps/files_sharing/.l10nignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#webpack bundled files
js/additionalScripts.js
1 change: 0 additions & 1 deletion apps/files_sharing/appinfo/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
$eventDispatcher->addListener(
'OCA\Files::loadAdditionalScripts',
function() {
\OCP\Util::addStyle('files_sharing', 'mergedAdditionalStyles');
\OCP\Util::addScript('files_sharing', 'additionalScripts');
}
);
Expand Down
2 changes: 0 additions & 2 deletions apps/files_sharing/css/mergedAdditionalStyles.scss

This file was deleted.

24 changes: 24 additions & 0 deletions apps/files_sharing/js/additionalScripts.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions apps/files_sharing/js/additionalScripts.js.map

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions apps/files_sharing/js/additionalScripts.json

This file was deleted.

6 changes: 6 additions & 0 deletions apps/files_sharing/src/additionalScripts.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import './share'
import './sharetabview'
import './sharebreadcrumbview'

import './style/sharetabview.scss'
import './style/sharebreadcrumb.scss'
File renamed without changes.
37 changes: 37 additions & 0 deletions apps/files_sharing/webpack.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
const path = require('path');

module.exports = {
entry: path.join(__dirname, 'src', 'additionalScripts.js'),
output: {
path: path.resolve(__dirname, './js'),
publicPath: '/js/',
filename: 'additionalScripts.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 changes: 1 addition & 3 deletions tests/karma.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,8 @@ module.exports = function(config) {
// up with the global namespace/classes/state
'apps/files_sharing/js/app.js',
'apps/files_sharing/js/sharedfilelist.js',
'apps/files_sharing/js/share.js',
'apps/files_sharing/js/sharebreadcrumbview.js',
'apps/files_sharing/js/additionalScripts.js',
'apps/files_sharing/js/public.js',
'apps/files_sharing/js/sharetabview.js',
'apps/files_sharing/js/files_drop.js',
'apps/files_sharing/js/templates.js',
],
Expand Down
2 changes: 2 additions & 0 deletions webpack.common.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
const core = require('./core/webpack');
const files_sharing = require('./apps/files_sharing/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_sharing,
files_trashbin,
files_versions,
oauth2,
Expand Down