Skip to content

Commit

Permalink
Simplify loader
Browse files Browse the repository at this point in the history
 * removed `window.devel` hack
 * move sleep routine to app.js
  • Loading branch information
avindra committed Sep 14, 2021
1 parent 4e2e87c commit eed7cab
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 20 deletions.
13 changes: 12 additions & 1 deletion app.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,24 @@ import {register as registerB} from './category/index.js';
import {register as registerC} from './contrib/index.js';
import {register as registerD} from './time.js';

const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));

export const app = () => {
[
registerA,
registerB,
registerC,
registerD,
].forEach(fn => {
].forEach(async fn => {
/**
* Prevent a race... we need to ensure
* deps are fully loaded
*/
while (!('$' in window) && !('mw' in window)) {
console.warn("Race detected... deferring until deps loaded");
await sleep(500);
}

try {
fn();
} catch(e) {
Expand Down
23 changes: 4 additions & 19 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
/**
* padre forgive me
* a goofy development mode hook
Expand All @@ -15,23 +14,9 @@ const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
clearTimeout(id);
if (r.ok) {
APP_URL = LOCAL_URL;
// make sure to load dev env only once
if(!window.devel) {
window.devel = true;

/**
* Prevent a race... we need to ensure
* deps are fully loaded
*/
while (!('$' in window) && !('mw' in window)) {
console.warn("Race detected... deferring init until after jQuery is loaded");
await sleep(500);
}

mw.notify("🚀 loaded local build: " + new Date());

const {app} = await import(`${APP_URL}`);
app();
}
mw.notify("🚀 loading local build @" + new Date());
}

const {app} = await import(`${APP_URL}`);
app();
})();

0 comments on commit eed7cab

Please sign in to comment.