From 7809d814eb335758540caf74147fb7a3892c526d Mon Sep 17 00:00:00 2001 From: zodern Date: Tue, 15 Feb 2022 15:46:26 -0600 Subject: [PATCH 1/2] Remove check for replaceable files in production There are replaceable files when the app was built with the --debug option, and then run with NODE_ENV set to production. There are no problems with replaceable files. --- packages/webapp/webapp_server.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) 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, From 5893114701a9b6a7c530b4c9b6a0b473f9df75bf Mon Sep 17 00:00:00 2001 From: zodern Date: Tue, 15 Feb 2022 15:48:59 -0600 Subject: [PATCH 2/2] Don't log to restart when outside of meteor tool --- packages/hot-module-replacement/server.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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.'); }