diff --git a/packages/hot-module-replacement/server.js b/packages/hot-module-replacement/server.js index aa08e9a8ef..a6d7d5122a 100644 --- a/packages/hot-module-replacement/server.js +++ b/packages/hot-module-replacement/server.js @@ -1,5 +1,8 @@ -if (!process.env.METEOR_HMR_SECRET) { - console.log('Restart Meteor to enable hot module replacement.'); -} else { +// METEOR_PARENT_PID +if (process.env.METEOR_HMR_SECRET) { __meteor_runtime_config__._hmrSecret = process.env.METEOR_HMR_SECRET; +} else if (process.env.METEOR_PARENT_PID) { + // if METEOR_PARENT_PID isn't set, then the app isn't being run by the meteor + // tool and restarting won't enable HRM. + console.log('Restart Meteor to enable hot module replacement.'); } diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js index 8b926afdc7..03d6de971b 100644 --- a/packages/webapp/webapp_server.js +++ b/packages/webapp/webapp_server.js @@ -929,13 +929,7 @@ function runWebAppServer() { versionReplaceable: () => WebAppHashing.calculateClientHash( manifest, - (_type, replaceable) => { - if (Meteor.isProduction && replaceable) { - throw new Error('Unexpected replaceable file in production'); - } - - return replaceable; - }, + (_type, replaceable) => replaceable, configOverrides ), cordovaCompatibilityVersions: programJson.cordovaCompatibilityVersions,