summaryrefslogtreecommitdiffstats
path: root/webpack.common.js
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2019-02-11 11:27:51 +0100
committerRoeland Jago Douma <roeland@famdouma.nl>2019-02-13 09:46:29 +0100
commit58ecc7d000e682df51c14562f369900dcd0f1eec (patch)
treedf0c23636f6c33fe80d988ea5b83129f2d6d1d9c /webpack.common.js
parenteab46d1ab151d87f8ddbe50b8719f22c7e5ec765 (diff)
downloadnextcloud-server-58ecc7d000e682df51c14562f369900dcd0f1eec.tar.gz
nextcloud-server-58ecc7d000e682df51c14562f369900dcd0f1eec.zip
Move files_trashbin to webpack
Combine the 2 js files and the scss. This saves compiling the scss on the go. And going via Nextcloud storage to obtain it. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'webpack.common.js')
-rw-r--r--webpack.common.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/webpack.common.js b/webpack.common.js
index 117c6197916..9a117ba4b3c 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -1,4 +1,5 @@
const core = require('./core/webpack');
+const files_trashbin = require('./apps/files_trashbin/webpack')
const oauth2 = require('./apps/oauth2/webpack')
-module.exports = [].concat(core, oauth2);
+module.exports = [].concat(core, files_trashbin, oauth2);