From 73f9df235cb4cc2c2e20a6edf770fe1bd59e86c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Fri, 13 Nov 2020 16:23:25 +0100 Subject: [PATCH] Only build one main bundle MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- templates/main.php | 2 +- webpack.js | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/templates/main.php b/templates/main.php index 307ef42bb..12696c603 100644 --- a/templates/main.php +++ b/templates/main.php @@ -23,6 +23,6 @@ style('deck', 'globalstyles'); -script('deck', 'deck'); +script('deck', 'main'); \OC::$server->getEventDispatcher()->dispatch('\OCP\Collaboration\Resources::loadAdditionalScripts'); diff --git a/webpack.js b/webpack.js index d3503e89d..54df09859 100644 --- a/webpack.js +++ b/webpack.js @@ -1,10 +1,9 @@ const webpackConfig = require('@nextcloud/webpack-vue-config') -const path = require('path'); +const path = require('path') const { merge } = require('webpack-merge') const config = { entry: { - deck: path.join(__dirname, 'src', 'main.js'), collections: path.join(__dirname, 'src', 'init-collections.js'), dashboard: path.join(__dirname, 'src', 'init-dashboard.js'), }, @@ -17,10 +16,9 @@ const config = { extensions: ['*', '.js', '.vue', '.json'], modules: [ path.resolve(__dirname, 'node_modules'), - 'node_modules' - ] - } -}; + 'node_modules', + ], + }, +} module.exports = merge(webpackConfig, config) -