Replace uglify-es to terser

wojtkowiak · Jul 20, 2018 · b583072 · b583072
1 parent ec45178
commit b583072
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/lib/electronApp.js b/lib/electronApp.js
@@ -12,7 +12,7 @@ import path from 'path';
 import shell from 'shelljs';
 import spawn from 'cross-spawn';
 import semver from 'semver';
-import uglify from 'uglify-es';
+import uglify from 'terser';
 
 import { getGypEnv } from 'electron-builder-lib/out/util/yarn';
 
@@ -347,13 +347,6 @@ export default class ElectronApp {
             process.exit(1);
         }
 
-        try {
-            await this.linkNpmPackages();
-        } catch (e) {
-            this.log.error(`linking packages failed: ${e}`);
-            process.exit(1);
-        }
-
         try {
             await this.rebuildDeps(true);
         } catch (e) {
@@ -370,6 +363,13 @@ export default class ElectronApp {
             }
         }
 
+        try {
+            await this.linkNpmPackages();
+        } catch (e) {
+            this.log.error(`linking packages failed: ${e}`);
+            process.exit(1);
+        }
+
         try {
             await this.installLocalNodeModules();
         } catch (e) {
@@ -594,6 +594,9 @@ export default class ElectronApp {
      * Runs npm link for every package specified in settings.json->linkPackages.
      */
     async linkNpmPackages() {
+        if (this.$.env.isProductionBuild()) {
+            return;
+        }
         const settings = this.$.desktop.getSettings();
         const promises = [];
         if ('linkPackages' in this.$.desktop.getSettings()) {

diff --git a/plugins/bundler/bundler.js b/plugins/bundler/bundler.js
@@ -73,7 +73,7 @@ class MeteorDesktopBundler {
             'del',
             '@babel/core',
             '@babel/preset-env',
-            'uglify-es',
+            'terser',
             'md5',
             'cacache'
         ];
@@ -495,7 +495,7 @@ class MeteorDesktopBundler {
             let shelljs;
             let babelCore;
             let babelPresetEnv;
-            let uglifyEs;
+            let terser;
             let del;
             let cacache;
             let md5;
@@ -693,7 +693,7 @@ class MeteorDesktopBundler {
                     del,
                     babelCore,
                     babelPresetEnv,
-                    uglifyEs,
+                    terser,
                     md5
                 } = deps);
             } catch (e) {
@@ -804,7 +804,7 @@ class MeteorDesktopBundler {
                             let code = cacheEntry.data;
                             let error;
                             if (settings.env === 'prod' && uglifyingEnabled) {
-                                ({ code, error } = uglifyEs.minify(code.toString('utf8'), options));
+                                ({ code, error } = terser.minify(code.toString('utf8'), options));
                             }
                             if (error) {
                                 reject(error);
@@ -836,7 +836,7 @@ class MeteorDesktopBundler {
                                         let error;
                                         if (settings.env === 'prod' && uglifyingEnabled) {
                                             ({ code: uglifiedCode, error } =
-                                                uglifyEs.minify(code, options));
+                                                terser.minify(code, options));
                                         }
 
                                         if (error) {