Skip to content

Commit 9547f30

Browse files
deltakoshDavid Catuhe
authored andcommitted
Fix sandbox loading issue (BabylonJS#16890)
Fix BabylonJS#16887 Co-authored-by: David Catuhe <[email protected]>
1 parent beba390 commit 9547f30

File tree

2 files changed

+30
-22
lines changed

2 files changed

+30
-22
lines changed

.build/config.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"versionDefinition": "patch",
3-
"preid": "rc",
4-
"nonce": 389
5-
}
2+
"versionDefinition": "patch",
3+
"preid": "rc",
4+
"nonce": 390
5+
}

packages/tools/sandbox/public/index.js

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,23 +35,23 @@ let loadScriptAsync = function (url, instantResolve) {
3535

3636
const Versions = {
3737
dist: [
38-
"https://cdn.babylonjs.com/timestamp.js?t=" + Date.now(),
39-
"https://preview.babylonjs.com/babylon.js",
40-
"https://preview.babylonjs.com/addons/babylonjs.addons.min.js",
41-
"https://preview.babylonjs.com/loaders/babylonjs.loaders.min.js",
42-
"https://preview.babylonjs.com/serializers/babylonjs.serializers.min.js",
43-
"https://preview.babylonjs.com/materialsLibrary/babylonjs.materials.min.js",
44-
"https://preview.babylonjs.com/gui/babylon.gui.min.js",
45-
"https://preview.babylonjs.com/inspector/babylon.inspector.bundle.js",
38+
{ url: "https://cdn.babylonjs.com/timestamp.js?t=" + Date.now(), instantResolve: false },
39+
{ url: "https://preview.babylonjs.com/babylon.js", instantResolve: false },
40+
{ url: "https://preview.babylonjs.com/addons/babylonjs.addons.min.js", instantResolve: false },
41+
{ url: "https://preview.babylonjs.com/loaders/babylonjs.loaders.min.js", instantResolve: false },
42+
{ url: "https://preview.babylonjs.com/serializers/babylonjs.serializers.min.js", instantResolve: true },
43+
{ url: "https://preview.babylonjs.com/materialsLibrary/babylonjs.materials.min.js", instantResolve: true },
44+
{ url: "https://preview.babylonjs.com/gui/babylon.gui.min.js", instantResolve: true },
45+
{ url: "https://preview.babylonjs.com/inspector/babylon.inspector.bundle.js", instantResolve: true },
4646
],
4747
local: [
48-
`//${window.location.hostname}:1337/babylon.js`,
49-
`//${window.location.hostname}:1337/addons/babylonjs.addons.js`,
50-
`//${window.location.hostname}:1337/loaders/babylonjs.loaders.min.js`,
51-
`//${window.location.hostname}:1337/serializers/babylonjs.serializers.min.js`,
52-
`//${window.location.hostname}:1337/materialsLibrary/babylonjs.materials.min.js`,
53-
`//${window.location.hostname}:1337/gui/babylon.gui.min.js`,
54-
`//${window.location.hostname}:1337/inspector/babylon.inspector.bundle.js`,
48+
{ url: `//${window.location.hostname}:1337/babylon.js`, instantResolve: false },
49+
{ url: `//${window.location.hostname}:1337/addons/babylonjs.addons.js`, instantResolve: false },
50+
{ url: `//${window.location.hostname}:1337/loaders/babylonjs.loaders.min.js`, instantResolve: false },
51+
{ url: `//${window.location.hostname}:1337/serializers/babylonjs.serializers.min.js`, instantResolve: false },
52+
{ url: `//${window.location.hostname}:1337/materialsLibrary/babylonjs.materials.min.js`, instantResolve: false },
53+
{ url: `//${window.location.hostname}:1337/gui/babylon.gui.min.js`, instantResolve: false },
54+
{ url: `//${window.location.hostname}:1337/inspector/babylon.inspector.bundle.js`, instantResolve: false },
5555
],
5656
};
5757

@@ -60,7 +60,9 @@ let loadInSequence = async function (versions, index, resolve) {
6060
resolve();
6161
return;
6262
}
63-
await loadScriptAsync(versions[index], index > 2);
63+
64+
await loadScriptAsync(versions[index].url, versions[index].instantResolve);
65+
6466
loadInSequence(versions, index + 1, resolve);
6567
};
6668

@@ -90,9 +92,15 @@ let checkBabylonVersionAsync = function () {
9092

9193
let versions = Versions[activeVersion] || Versions["dist"];
9294
if (snapshot && activeVersion === "dist") {
93-
versions = versions.map((v) => v.replace("https://preview.babylonjs.com", "https://snapshots-cvgtc2eugrd3cgfd.z01.azurefd.net/" + snapshot));
95+
versions = versions.map((v) => ({
96+
url: v.url.replace("https://preview.babylonjs.com", "https://snapshots-cvgtc2eugrd3cgfd.z01.azurefd.net/" + snapshot),
97+
instantResolve: v.instantResolve,
98+
}));
9499
} else if (version && activeVersion === "dist") {
95-
versions = versions.map((v) => v.replace("https://preview.babylonjs.com", "https://cdn.babylonjs.com/v" + version));
100+
versions = versions.map((v) => ({
101+
url: v.url.replace("https://preview.babylonjs.com", "https://cdn.babylonjs.com/v" + version),
102+
instantResolve: v.instantResolve,
103+
}));
96104
}
97105

98106
return new Promise((resolve, _reject) => {

0 commit comments

Comments
 (0)