From 9cb91ab252e1ab2d77597fac700e5c9011c0ee7d Mon Sep 17 00:00:00 2001
From: Dmitry Krupenya <dkrupenya@gmail.com>
Date: Wed, 20 May 2020 14:42:45 +0300
Subject: [PATCH] chore: log build time, minimize in production

---
 webapp/packages/builder/bin/index.js                   | 10 ++++++++--
 .../packages/builder/configs/webpack-build-config.js   |  8 ++++----
 webapp/packages/builder/package.json                   |  4 +---
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/webapp/packages/builder/bin/index.js b/webapp/packages/builder/bin/index.js
index 6106aab3b4..b1490a60e5 100644
--- a/webapp/packages/builder/bin/index.js
+++ b/webapp/packages/builder/bin/index.js
@@ -98,7 +98,9 @@ require('yargs')
       async function build() {
         const config = createRollupConfig()
         for (const moduleConfig of config) {
-          console.log(`Building ${packageName} ${moduleConfig.output.dir}`);
+          const module = moduleConfig.output.dir.replace('dist' , '')
+          const start = Date.now()
+          console.log(`Building ${packageName}${module}`);
           try {
             const bundle = await rollup.rollup(moduleConfig);
             await bundle.write(moduleConfig.output);
@@ -106,7 +108,8 @@ require('yargs')
             console.error(e)
             process.exitCode = 1;
           } finally {
-            console.log(`Build finished ${packageName} ${moduleConfig.output.dir}`);
+            const buildTime = Math.floor((Date.now() - start) / 1000);
+            console.log(`Build finished ${packageName}${module}, ${buildTime} s`);
           }
         }
       }
@@ -143,6 +146,7 @@ require('yargs')
       },
     },
     function (argv) {
+      const start = Date.now()
       const webpackArgv = createWebpackArgv(argv);
       // console.log(webpackArgv)
       const configObject = buildConfig({}, webpackArgv)
@@ -150,6 +154,8 @@ require('yargs')
 
       compiler.run((err, stats) => {
         console.log(stats.compilation.errors)
+        const buildTime = Math.floor((Date.now() - start) / 1000);
+        console.log(`Build app finished in ${buildTime} s`);
       });
     }
   )
diff --git a/webapp/packages/builder/configs/webpack-build-config.js b/webapp/packages/builder/configs/webpack-build-config.js
index b67f7463e1..02327a3187 100644
--- a/webapp/packages/builder/configs/webpack-build-config.js
+++ b/webapp/packages/builder/configs/webpack-build-config.js
@@ -12,11 +12,11 @@ module.exports = (env, argv) => merge(commonConfig(env, argv), {
     path: path.resolve(argv.currentDir, './dist'),
     publicPath: '',
   },
-  devtool: 'source-map',
+  devtool: argv.mode === 'production' ? false : 'source-map',
   plugins: [],
   optimization: {
-    minimize: false,
-    namedModules: true,
-    concatenateModules: false,
+    minimize: argv.mode === 'production',
+    namedModules: argv.mode !== 'production',
+    concatenateModules: argv.mode === 'production',
   },
 });
diff --git a/webapp/packages/builder/package.json b/webapp/packages/builder/package.json
index 8a3a58503f..7f1df7674c 100644
--- a/webapp/packages/builder/package.json
+++ b/webapp/packages/builder/package.json
@@ -7,9 +7,6 @@
   "scripts": {
     "lint": "eslint ./src/ --ext .ts,.tsx"
   },
-  "peerDependencies": {
-    "@dbeaver/core": "^0.1.0"
-  },
   "dependencies": {
     "@babel/cli": "^7.7.4",
     "@babel/core": "^7.7.4",
@@ -22,6 +19,7 @@
     "@babel/preset-react": "^7.7.4",
     "@babel/preset-typescript": "^7.7.4",
     "@csstools/postcss-sass": "^4.0.0",
+    "@dbeaver/core": "^0.1.0",
     "@material/button": "^4.0.0",
     "@material/elevation": "^4.0.0",
     "@material/ripple": "^4.0.0",