chore: upgrade webpack, optimize, build

tabrindle · Nov 6, 2018 · 2a4590a · 2a4590a
1 parent 4543a06
commit 2a4590a
Show file tree

Hide file tree

Showing 7 changed files with 353 additions and 156 deletions.
diff --git a/dist/cli.js b/dist/cli.js
diff --git a/dist/envinfo.js b/dist/envinfo.js
diff --git a/package.json b/package.json
@@ -65,8 +65,7 @@
     "os-name": "^2.0.1",
     "pkg": "^4.3.4",
     "prettier-eslint-cli": "^4.1.1",
-    "uglifyjs-webpack-plugin": "^1.2.1",
-    "webpack": "^4.5.0",
+    "webpack": "^4.25.1",
     "webpack-cli": "^2.0.14",
     "which": "^1.2.14",
     "yamlify-object": "^0.4.5"

diff --git a/src/cli.js b/src/cli.js
@@ -1,6 +1,6 @@
-const packageJson = require('../package.json');
 const envinfo = require('./envinfo.js');
 const argv = require('minimist')(process.argv.slice(2));
+const version = __VERSION__ || ''; // eslint-disable-line
 
 argv.console = true;
 
@@ -18,7 +18,7 @@ if (argv.help || argv._.indexOf('help') > -1) {
  ,,,                                                                       ,,,
   ,,,'                                                                  ',,,
 
-  VERSION: ${packageJson.version}
+  VERSION: ${version}
 
   USAGE:
 
@@ -47,7 +47,7 @@ if (argv.help || argv._.indexOf('help') > -1) {
   `);
   process.exit(0);
 } else if (argv.version || argv.v || argv._.indexOf('version') > -1) {
-  console.log(packageJson.version);
+  console.log(version); // eslint-disable-line no-console
   process.exit(0);
 }
 

diff --git a/src/utils.js b/src/utils.js
@@ -22,7 +22,7 @@ const run = cmd => {
 const log = function log(level) {
   const args = Object.values(Array.prototype.slice.call(arguments).slice(1));
   if ((process.env.ENVINFO_DEBUG || '').toLowerCase() === level)
-    console.log(level, JSON.stringify(args));
+    console.log(level, JSON.stringify(args)); // eslint-disable-line no-console
 };
 
 const fileExists = filePath => {

diff --git a/webpack.config.js b/webpack.config.js
@@ -1,6 +1,6 @@
 const path = require('path');
 const webpack = require('webpack');
-const UglifyJSPlugin = require('uglifyjs-webpack-plugin');
+const packageJson = require('./package.json');
 
 module.exports = {
   entry: {
@@ -9,19 +9,24 @@ module.exports = {
   },
   target: 'node',
   mode: 'production',
+  optimization: {
+    minimize: true,
+  },
   output: {
     libraryTarget: 'commonjs2',
     filename: '[name].js',
     path: path.join(__dirname, '/dist'),
   },
   plugins: [
-    new UglifyJSPlugin(),
     new webpack.BannerPlugin({
       banner: `#!/usr/bin/env node
       "use strict"`,
       raw: true,
       include: 'cli',
     }),
+    new webpack.DefinePlugin({
+      __VERSION__: JSON.stringify(packageJson.version),
+    }),
     new webpack.IgnorePlugin(/spawn-sync/),
   ],
 };