ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #2540 from nextcloud/bugfix/2528

Browse Source 
Only build one main bundle
This commit is contained in:
Julius Härtl
2020-11-16 08:44:18 +01:00
committed by GitHub
parent d085720e4f 73f9df235c
commit 3d051c8d1b
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/main.php
View File

@@ -23,6 +23,6 @@
style('deck', 'globalstyles'); style('deck', 'globalstyles');
script('deck', 'deck'); script('deck', 'main');
\OC::$server->getEventDispatcher()->dispatch('\OCP\Collaboration\Resources::loadAdditionalScripts'); \OC::$server->getEventDispatcher()->dispatch('\OCP\Collaboration\Resources::loadAdditionalScripts');

12
webpack.js
View File

@@ -1,10 +1,9 @@
const webpackConfig = require('@nextcloud/webpack-vue-config') const webpackConfig = require('@nextcloud/webpack-vue-config')
const path = require('path'); const path = require('path')
const { merge } = require('webpack-merge') const { merge } = require('webpack-merge')
const config = { const config = {
entry: { entry: {
deck: path.join(__dirname, 'src', 'main.js'),
collections: path.join(__dirname, 'src', 'init-collections.js'), collections: path.join(__dirname, 'src', 'init-collections.js'),
dashboard: path.join(__dirname, 'src', 'init-dashboard.js'), dashboard: path.join(__dirname, 'src', 'init-dashboard.js'),
}, },
@@ -17,10 +16,9 @@ const config = {
extensions: ['*', '.js', '.vue', '.json'], extensions: ['*', '.js', '.vue', '.json'],
modules: [ modules: [
path.resolve(__dirname, 'node_modules'), path.resolve(__dirname, 'node_modules'),
'node_modules' 'node_modules',
] ],
} },
}; }
module.exports = merge(webpackConfig, config) module.exports = merge(webpackConfig, config)