Merge pull request #2540 from nextcloud/bugfix/2528

Only build one main bundle
nextcloud · Nov 16, 2020 · 3d051c8 · 3d051c8
2 parents d085720 + 73f9df2
commit 3d051c8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git 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
@@ -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)
-