From e42e104bc22013eae30f642c7b26e333356bc89f Mon Sep 17 00:00:00 2001 From: David Glasser Date: Mon, 24 Nov 2014 22:11:56 -0800 Subject: [PATCH] check platforms before plugins a platform change often creates a plugin change, so we should mention the more major change first. also helps with "meteor exits when cordova platforms change" self-test --- tools/run-app.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/run-app.js b/tools/run-app.js index d190d21284..fa9545a2da 100644 --- a/tools/run-app.js +++ b/tools/run-app.js @@ -496,18 +496,6 @@ _.extend(AppRunner.prototype, { bundleResult = bundleResultOrRunResult.bundleResult; firstRun = false; - var plugins = cordova.getCordovaDependenciesFromStar( - bundleResult.starManifest); - - if (self.cordovaPlugins && ! _.isEqual(self.cordovaPlugins, plugins)) { - return { - outcome: 'outdated-cordova-plugins' - }; - } - // XXX #3006 This is racy --- we should get this from the pre-runner build, - // not from the first runner build. - self.cordovaPlugins = plugins; - var platforms = self.projectContext.platformList.getCordovaPlatforms(); platforms.sort(); if (self.cordovaPlatforms && @@ -520,6 +508,18 @@ _.extend(AppRunner.prototype, { // not from the first runner build. self.cordovaPlatforms = platforms; + var plugins = cordova.getCordovaDependenciesFromStar( + bundleResult.starManifest); + + if (self.cordovaPlugins && ! _.isEqual(self.cordovaPlugins, plugins)) { + return { + outcome: 'outdated-cordova-plugins' + }; + } + // XXX #3006 This is racy --- we should get this from the pre-runner build, + // not from the first runner build. + self.cordovaPlugins = plugins; + var serverWatchSet = bundleResult.serverWatchSet; // Read the settings file, if any