Tree shaking

packages/babel-compiler/babel.js

@@ -47,5 +47,40 @@ Babel = {
 
   getMinimumModernBrowserVersions: function () {
     return Npm.require("@meteorjs/babel/modern-versions.js").get();
+  },
+  replaceMeteorInternalState: function(source, globalDefsMapping) {
+    try {
+      const globalDefsKeys = Object.keys(globalDefsMapping);
+      return Npm.require("@babel/core").transformSync(source, {
+        compact: false,
+        plugins: [
+          function replaceStateVars({types: t}) {
+            return {
+              visitor: {
+                MemberExpression: {
+                  exit(path) {
+                    const object = path.node.object.name;
+                    const property = path.node.property.name;
+                    const globalDefsForStart = object && globalDefsKeys.indexOf(object) > -1 && globalDefsMapping[object];
+                    const mappingForEnds = property && globalDefsForStart
+                    && Object.keys(globalDefsForStart).indexOf(property) > -1
+                        ? globalDefsForStart[property] : null;
+
+                    if (mappingForEnds !== null && path.parentPath.node.type !== "AssignmentExpression") {
+                      path.replaceWith(
+                          t.booleanLiteral(mappingForEnds === 'true' || mappingForEnds === true)
+                      );
+                      path.skip();
+                    }
+                  },
+                }
+              },
+            };
+          },
+        ],
+      }).code;
+    } catch(e){
+      return source;
+    }
   }
 };

packages/meteor/client_environment.js

@@ -53,7 +53,8 @@ Meteor = {
    * @static
    * @type {Boolean}
    */
-  isModern: config.isModern
+  isModern: config.isModern,
+  ...config.GLOBAL_DEFINITIONS
 };
 
 if (config.gitCommitHash) {

packages/meteor/server_environment.js

@@ -26,6 +26,9 @@ Meteor.settings = {};
 if (process.env.METEOR_SETTINGS) {
   try {
     Meteor.settings = JSON.parse(process.env.METEOR_SETTINGS);
+    if(Meteor.settings.globalDefinitions){
+      Object.assign(Meteor, Meteor.settings.globalDefinitions);
+    }
   } catch (e) {
     throw new Error("METEOR_SETTINGS are not valid JSON.");
   }
@@ -44,6 +47,7 @@ if (! Meteor.settings.public) {
 // settings will be sent to the client.
 if (config) {
   config.PUBLIC_SETTINGS = Meteor.settings.public;
+  config.GLOBAL_DEFINITIONS = Meteor.settings.globalDefinitions ? Meteor.settings.globalDefinitions : {};
 }
 
 if (config && config.gitCommitHash) {

packages/minifier-js/minifier.js

@@ -1,35 +1,77 @@
 var terser;
 
-meteorJsMinify = function (source) {
+const getGlobalDefsOptions = ({ arch, buildMode }) => ({
+  "Meteor.isServer": false,
+  "Meteor.isTest": buildMode === "test",
+  "Meteor.isDevelopment": false,
+  "Meteor.isClient": true,
+  "Meteor.isProduction": true,
+  "Meteor.isCordova": arch === 'web.cordova',
+});
+
+meteorJsMinify = function (source, options) {
   var result = {};
   var NODE_ENV = process.env.NODE_ENV || "development";
-
   terser = terser || Npm.require("terser");
+  const globalDefs = getGlobalDefsOptions(options);
+
+  let customSettings = {};
+
+  /*
+    settings.json:
+    {
+      globalDefinitions: {
+        isAdmin: true
+      }
+    }
+    will replace Meteor.isAdmin with true
+ */
+  if(process.env.METEOR_SETTINGS) {
+    const settings = JSON.parse(process.env.METEOR_SETTINGS);
+    customSettings = settings && settings.globalDefinitions || {};
+  }
+
 
+  var globalDefsMapping = Object.entries(globalDefs).reduce((acc, [from, to]) => {
+    const parts = from.split('.');
+    if (parts.length < 2) {
+      return acc;
+    }
+    const startValue = parts[0];
+    const endValue = parts[1];
+    return ({
+      ...acc,
+      [startValue]: {
+        ...acc[startValue], [endValue]: to
+      }
+    });
+  }, {});
+  globalDefsMapping.Meteor = {...globalDefsMapping.Meteor, ...customSettings};
   try {
-    var terserResult = terser.minify(source, {
+    var optimizedCode = Babel.replaceMeteorInternalState(source, globalDefsMapping)
+    var terserResult = Meteor.wrapAsync(callback => terser.minify(optimizedCode, {
       compress: {
         drop_debugger: false,
-        unused: false,
+        unused: true,
         dead_code: true,
         global_defs: {
-          "process.env.NODE_ENV": NODE_ENV
-        }
+          "process.env.NODE_ENV": NODE_ENV,
+          "process.env.NODE_DEBUG": false,
+        },
+        // passes: 2
       },
       // Fix issue #9866, as explained in this comment:
       // https://github.com/mishoo/UglifyJS2/issues/1753#issuecomment-324814782
       // And fix terser issue #117: https://github.com/terser-js/terser/issues/117
       safari10: true,
-    });
-
+    }).then((result) => callback(null, result)).catch((err) => callback(err, null)))();
     if (typeof terserResult.code === "string") {
       result.code = terserResult.code;
       result.minifier = 'terser';
     } else {
       throw terserResult.error ||
-        new Error("unknown terser.minify failure");
+      new Error("unknown terser.minify failure");
     }
-
   } catch (e) {
     // Although Babel.minify can handle a wider variety of ECMAScript
     // 2015+ syntax, it is substantially slower than UglifyJS/terser, so
@@ -40,6 +82,5 @@ meteorJsMinify = function (source) {
     result.code = Babel.minify(source, options).code;
     result.minifier = 'babel-minify';
   }
-
   return result;
 };

packages/minifier-js/package.js

@@ -4,7 +4,7 @@ Package.describe({
 });
 
 Npm.depends({
-  terser: "4.8.0"
+  terser: "5.3.2"
 });
 
 Package.onUse(function (api) {

packages/non-core/bundle-visualizer/package.js

@@ -22,5 +22,6 @@ Package.onUse(function(api) {
     'webapp',
   ]);
   api.mainModule('server.js', 'server');
+  api.setSideEffects(true);
   api.mainModule('client.js', 'client');
 });

packages/standard-minifier-js/plugin/minify-js.js

@@ -1,4 +1,4 @@
-import { extractModuleSizesTree } from "./stats.js";
+import {extractModuleSizesTree} from "./stats.js";
 
 Plugin.registerMinifier({
   extensions: ['js'],
@@ -8,9 +8,10 @@ Plugin.registerMinifier({
   return minifier;
 });
 
-function MeteorBabelMinifier () {};
+function MeteorBabelMinifier() {
+};
 
-MeteorBabelMinifier.prototype.processFilesForBundle = function(files, options) {
+MeteorBabelMinifier.prototype.processFilesForBundle = function (files, options) {
   var mode = options.minifyMode;
 
   // don't minify anything for development
@@ -117,21 +118,22 @@ MeteorBabelMinifier.prototype.processFilesForBundle = function(files, options) {
 
   files.forEach(file => {
     // Don't reminify *.min.js.
-    if (/\.min\.js$/.test(file.getPathInBundle())) {
-      toBeAdded.data += file.getContentsAsString();
+    const content = file.getContentsAsString();
+    const filePath = file.getPathInBundle();
+    if (/\.min\.js$/.test(filePath)) {
+      toBeAdded.data += content;
     } else {
       var minified;
 
       try {
-        minified = meteorJsMinify(file.getContentsAsString());
+
+        minified = meteorJsMinify(content, options);
 
         if (!(minified && typeof minified.code === "string")) {
           throw new Error();
         }
 
       } catch (err) {
-        var filePath = file.getPathInBundle();
-
         maybeThrowMinifyErrorBySourceFile(err, file);
 
         err.message += " while minifying " + filePath;
@@ -140,10 +142,10 @@ MeteorBabelMinifier.prototype.processFilesForBundle = function(files, options) {
 
       const tree = extractModuleSizesTree(minified.code);
       if (tree) {
-        toBeAdded.stats[file.getPathInBundle()] =
+        toBeAdded.stats[filePath] =
           [Buffer.byteLength(minified.code), tree];
       } else {
-        toBeAdded.stats[file.getPathInBundle()] =
+        toBeAdded.stats[filePath] =
           Buffer.byteLength(minified.code);
       }
 

tools/cli/commands.js

@@ -922,6 +922,7 @@ var buildCommands = {
     architecture: { type: String },
     "server-only": { type: Boolean },
     'mobile-settings': { type: String },
+    'settings': { type: String },
     server: { type: String },
     "cordova-server-port": { type: String },
     // Indicates whether these build is running headless, e.g. in a
@@ -1011,10 +1012,9 @@ var buildCommand = function (options) {
   const serverOnly = options._bundleOnly || !!options['server-only'];
 
   // options['mobile-settings'] is used to set the initial value of
-  // `Meteor.settings` on mobile apps. Pass it on to options.settings,
-  // which is used in this command.
-  if (options['mobile-settings']) {
-    options.settings = options['mobile-settings'];
+  // `Meteor.settings` on mobile apps.
+  if (options.settings) {
+    process.env.METEOR_SETTINGS = files.readFile(options.settings, 'utf8');
   }
 
   const appName = files.pathBasename(options.appDir);
@@ -1167,7 +1167,7 @@ ${Console.command("meteor build ../output")}`,
         import { CordovaProject } from '../cordova/project.js';
 
         cordovaProject = new CordovaProject(projectContext, {
-          settingsFile: options.settings,
+          settingsFile: options['mobile-settings'],
           mobileServerUrl: utils.formatUrl(parsedMobileServerUrl),
           cordovaServerPort: parsedCordovaServerPort });
         if (buildmessage.jobHasMessages()) return;