Merge pull request meteor#11639 from meteor/bugfix/logging-package-chalk

Only include chalk on server - avoid serving it to the client, even if not evaluated

packages/logging/logging.js

@@ -307,13 +307,9 @@ Log.format = (obj, options = {}) => {
     sourceInfo,
     stderrIndicator].join('');
 
-  const prettify = function (line, color) {
-    return (options.color && Meteor.isServer && color) ?
-      require('chalk')[color](line) : line;
-  };
 
-  return prettify(metaPrefix, platformColor(options.metaColor || META_COLOR)) +
-    prettify(message, platformColor(LEVEL_COLORS[level]));
+  return Formatter.prettify(metaPrefix, options.color && platformColor(options.metaColor || META_COLOR)) +
+      Formatter.prettify(message, options.color && platformColor(LEVEL_COLORS[level]));
 };
 
 // Turn a line of text into a loggable object.

packages/logging/logging_browser.js

@@ -0,0 +1,4 @@
+Formatter = {};
+Formatter.prettify = function(line, color){
+    return line;
+}

packages/logging/logging_server.js

@@ -0,0 +1,5 @@
+Formatter = {};
+Formatter.prettify = function(line, color){
+    if(!color) return line;
+    return require("chalk")[color](line);
+}

packages/logging/package.js

@@ -1,8 +1,11 @@
 Package.describe({
   summary: 'Logging facility.',
-  version: '1.3.0'
+  version: '1.3.1'
 });
 
+Npm.depends({
+  'chalk': '4.1.1'
+});
 
 Npm.strip({
   'es5-ext': ['test/']
@@ -16,6 +19,8 @@ Package.onUse(function (api) {
   // `[email protected]` or newer.
   api.use(['ejson', 'ecmascript', 'ecmascript-runtime-client']);
   api.mainModule('logging.js');
+  api.addFiles('logging_server.js', 'server')
+  api.addFiles('logging_browser.js', 'client')
   api.mainModule('logging_cordova.js', 'web.cordova');
 });