status-im
/
re-natal
mirror of https://github.com/status-im/re-natal.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix double initialization of figwheel 

- use only (watch-and-reload ...) way to setup figwheel
- do not explicitly require figwheel.connect.build_${platform} from figwheel-bridge.js
This commit is contained in:
Artur Girenko 2017-10-04 09:59:56 +02:00
parent 6097127be4
commit dc31ddfe13
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/figwheel-bridge.js
View File

@ -190,7 +190,7 @@ function loadApp(platform, devHost, onLoadCb) {
var fileBasePath = serverBaseUrl((isChrome() ? "localhost" : devHost)) + "/" + config.basePath + platform; var fileBasePath = serverBaseUrl((isChrome() ? "localhost" : devHost)) + "/" + config.basePath + platform;
// callback when app is ready to get the reloadable component // callback when app is ready to get the reloadable component
var mainJs = '/figwheel/connect/build_' + platform + '.js'; var mainJs = `/env/${platform}/main.js`;
evalListeners.waitForFinalEval = function (url) { evalListeners.waitForFinalEval = function (url) {
if (url.indexOf(mainJs) > -1) { if (url.indexOf(mainJs) > -1) {
assertRootElExists(platform); assertRootElExists(platform);
@ -212,7 +212,7 @@ function loadApp(platform, devHost, onLoadCb) {
// seriously React packager? why. // seriously React packager? why.
var googreq = goog.require; var googreq = goog.require;
googreq('figwheel.connect.build_' + platform); googreq(`env.${platform}.main`);
}); });
}); });
} }