Use the static member of default CDN URL (#14476)

* Fix breaking issue with ScriptBaseUrl * formatting * Use the static member * replace without trailing slash
BabylonJS · Oct 30, 2023 · 919db41 · 919db41
1 parent 3d765d2
commit 919db41
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 17 deletions.
diff --git a/packages/dev/core/src/Debug/debugLayer.ts b/packages/dev/core/src/Debug/debugLayer.ts
@@ -222,7 +222,7 @@ export class DebugLayer {
      * By default it uses the babylonjs CDN.
      * @ignoreNaming
      */
-    public static InspectorURL = `https://cdn.babylonjs.com/v${Engine.Version}/inspector/babylon.inspector.bundle.js`;
+    public static InspectorURL = `${Tools._DefaultCdnUrl}/v${Engine.Version}/inspector/babylon.inspector.bundle.js`;
 
     private _scene: Scene;
 

diff --git a/packages/dev/core/src/Engines/WebGPU/webgpuTintWASM.ts b/packages/dev/core/src/Engines/WebGPU/webgpuTintWASM.ts
@@ -22,8 +22,8 @@ export interface TwgslOptions {
 export class WebGPUTintWASM {
     // Default twgsl options.
     private static readonly _TWgslDefaultOptions: TwgslOptions = {
-        jsPath: "https://cdn.babylonjs.com/twgsl/twgsl.js",
-        wasmPath: "https://cdn.babylonjs.com/twgsl/twgsl.wasm",
+        jsPath: `${Tools._DefaultCdnUrl}/twgsl/twgsl.js`,
+        wasmPath: `${Tools._DefaultCdnUrl}/twgsl/twgsl.wasm`,
     };
 
     public static ShowWGSLShaderCode = false;

diff --git a/packages/dev/core/src/Engines/webgpuEngine.ts b/packages/dev/core/src/Engines/webgpuEngine.ts
@@ -165,8 +165,8 @@ export interface WebGPUEngineOptions extends ThinEngineOptions, GPURequestAdapte
 export class WebGPUEngine extends Engine {
     // Default glslang options.
     private static readonly _GLSLslangDefaultOptions: GlslangOptions = {
-        jsPath: "https://cdn.babylonjs.com/glslang/glslang.js",
-        wasmPath: "https://cdn.babylonjs.com/glslang/glslang.wasm",
+        jsPath: `${Tools._DefaultCdnUrl}/glslang/glslang.js`,
+        wasmPath: `${Tools._DefaultCdnUrl}/glslang/glslang.wasm`,
     };
 
     /** true to enable using TintWASM to convert Spir-V to WGSL */

diff --git a/packages/dev/core/src/Materials/Node/nodeMaterial.ts b/packages/dev/core/src/Materials/Node/nodeMaterial.ts
@@ -201,7 +201,7 @@ export class NodeMaterial extends PushMaterial {
     private _animationFrame = -1;
 
     /** Define the Url to load node editor script */
-    public static EditorURL = `https://cdn.babylonjs.com/v${Engine.Version}/nodeEditor/babylon.nodeEditor.js`;
+    public static EditorURL = `${Tools._DefaultCdnUrl}/v${Engine.Version}/nodeEditor/babylon.nodeEditor.js`;
 
     /** Define the Url to load snippets */
     public static SnippetUrl = Constants.SnippetUrl;

diff --git a/packages/dev/core/src/Meshes/Compression/dracoCompression.ts b/packages/dev/core/src/Meshes/Compression/dracoCompression.ts
@@ -308,9 +308,9 @@ export class DracoCompression implements IDisposable {
      */
     public static Configuration: IDracoCompressionConfiguration = {
         decoder: {
-            wasmUrl: "https://cdn.babylonjs.com/draco_wasm_wrapper_gltf.js",
-            wasmBinaryUrl: "https://cdn.babylonjs.com/draco_decoder_gltf.wasm",
-            fallbackUrl: "https://cdn.babylonjs.com/draco_decoder_gltf.js",
+            wasmUrl: `${Tools._DefaultCdnUrl}/draco_wasm_wrapper_gltf.js`,
+            wasmBinaryUrl: `${Tools._DefaultCdnUrl}/draco_decoder_gltf.wasm`,
+            fallbackUrl: `${Tools._DefaultCdnUrl}/draco_decoder_gltf.js`,
         },
     };
 

diff --git a/packages/dev/core/src/Meshes/Compression/meshoptCompression.ts b/packages/dev/core/src/Meshes/Compression/meshoptCompression.ts
@@ -55,7 +55,7 @@ export class MeshoptCompression implements IDisposable {
      */
     public static Configuration: IMeshoptCompressionConfiguration = {
         decoder: {
-            url: "https://cdn.babylonjs.com/meshopt_decoder.js",
+            url: `${Tools._DefaultCdnUrl}/meshopt_decoder.js`,
         },
     };
 

diff --git a/packages/dev/core/src/Meshes/Node/nodeGeometry.ts b/packages/dev/core/src/Meshes/Node/nodeGeometry.ts
@@ -49,7 +49,7 @@ export class NodeGeometry {
     private _buildExecutionTime: number = 0;
 
     /** Define the Url to load node editor script */
-    public static EditorURL = `https://cdn.babylonjs.com/v${Engine.Version}/nodeGeometryEditor/babylon.nodeGeometryEditor.js`;
+    public static EditorURL = `${Tools._DefaultCdnUrl}/v${Engine.Version}/nodeGeometryEditor/babylon.nodeGeometryEditor.js`;
 
     /** Define the Url to load snippets */
     public static SnippetUrl = Constants.SnippetUrl;

diff --git a/packages/dev/core/src/Misc/basis.ts b/packages/dev/core/src/Misc/basis.ts
@@ -114,11 +114,11 @@ export const BasisToolsOptions = {
     /**
      * URL to use when loading the basis transcoder
      */
-    JSModuleURL: "https://cdn.babylonjs.com/basisTranscoder/1/basis_transcoder.js",
+    JSModuleURL: `${Tools._DefaultCdnUrl}/basisTranscoder/1/basis_transcoder.js`,
     /**
      * URL to use when loading the wasm module for the transcoder
      */
-    WasmModuleURL: "https://cdn.babylonjs.com/basisTranscoder/1/basis_transcoder.wasm",
+    WasmModuleURL: `${Tools._DefaultCdnUrl}/basisTranscoder/1/basis_transcoder.wasm`,
 };
 
 /**

diff --git a/packages/dev/core/src/Misc/tools.ts b/packages/dev/core/src/Misc/tools.ts
@@ -488,7 +488,7 @@ export class Tools {
     /**
      * @internal
      */
-    public static _DefaultCdnUrl = "https://cdn.babylonjs.com/";
+    public static _DefaultCdnUrl = "https://cdn.babylonjs.com";
 
     /**
      * Get a script URL including preprocessing
@@ -502,7 +502,9 @@ export class Tools {
         // if the base URL was set, and the script Url is an absolute path change the default path
         if (Tools.ScriptBaseUrl && scriptUrl.startsWith(Tools._DefaultCdnUrl)) {
             // change the default host, which is https://cdn.babylonjs.com with the one defined
-            const baseUrl = Tools.ScriptBaseUrl[Tools.ScriptBaseUrl.length - 1] === "/" ? Tools.ScriptBaseUrl : Tools.ScriptBaseUrl + "/";
+            // make sure no trailing slash is present
+
+            const baseUrl = Tools.ScriptBaseUrl[Tools.ScriptBaseUrl.length - 1] === "/" ? Tools.ScriptBaseUrl.substring(0, Tools.ScriptBaseUrl.length - 1) : Tools.ScriptBaseUrl;
             scriptUrl = scriptUrl.replace(Tools._DefaultCdnUrl, baseUrl);
         }
 

diff --git a/packages/dev/inspector/src/components/sceneExplorer/entities/gui/guiTools.ts b/packages/dev/inspector/src/components/sceneExplorer/entities/gui/guiTools.ts
@@ -5,7 +5,7 @@ import { GUIEditor } from "gui-editor/guiEditor";
 
 declare let BABYLON: any;
 
-let editorUrl = `https://cdn.babylonjs.com/v${Engine.Version}/guiEditor/babylon.guiEditor.js`;
+let editorUrl = `${Tools._DefaultCdnUrl}/v${Engine.Version}/guiEditor/babylon.guiEditor.js`;
 // eslint-disable-next-line @typescript-eslint/naming-convention
 let guiEditorContainer: { GUIEditor: typeof GUIEditor };
 /** Get the inspector from bundle or global */

diff --git a/packages/dev/loaders/src/glTF/glTFValidation.ts b/packages/dev/loaders/src/glTF/glTFValidation.ts
@@ -89,7 +89,7 @@ export class GLTFValidation {
      * The configuration. Defaults to `{ url: "https://cdn.babylonjs.com/gltf_validator.js" }`.
      */
     public static Configuration: IGLTFValidationConfiguration = {
-        url: "https://cdn.babylonjs.com/gltf_validator.js",
+        url: `${Tools._DefaultCdnUrl}/gltf_validator.js`,
     };
 
     private static _LoadScriptPromise: Promise<void>;