Viewer NPM

Tools/Config/config.json

@@ -603,7 +603,7 @@
                 "processDeclaration": {
                     "moduleName": "BabylonViewer",
                     "doNotAppendNamespace": true,
-                    "prependText": "/// <reference path=\"./babylon.module.d.ts\"/>\n/// <reference path=\"./babylon.glTF2Interface.d.ts\"/>\n/// <reference path=\"./babylonjs.loaders.d.ts\"/>\ndeclare module \"babylonjs-loaders\"{ export=BABYLON;}\n",
+                    "prependText": "/// <reference path=\"./babylon.module.d.ts\"/>\n/// <reference path=\"./babylon.glTF2Interface.d.ts\"/>\n/// <reference path=\"./babylonjs.loaders.module.d.ts\"/>\n",
                     "importsToRemove": [
                         "pep",
                         "babylonjs-loaders"
@@ -611,7 +611,17 @@
                     "classMap": {
                         "babylonjs": "BABYLON",
                         "babylonjs-loaders": "BABYLON"
-                    }
+                    },
+                    "replacements": [
+                        {
+                            "from": "import(\"./configuration\")",
+                            "to": "import(\"babylonjs-viewer/configuration/configuration\")"
+                        },
+                        {
+                            "from": "import(\"./viewer\")",
+                            "to": "import(\"babylonjs-viewer/viewer/viewer\")"
+                        }
+                    ]
                 },
                 "requiredFiles": [
                     "dist/preview release/viewer/readme.md",
@@ -632,7 +642,7 @@
                             "outputDirectory": "/viewer/",
                             "addBabylonDeclaration": [
                                 "babylon.module.d.ts",
-                                "loaders/babylonjs.loaders.d.ts",
+                                "loaders/babylonjs.loaders.module.d.ts",
                                 "glTF2Interface/babylon.glTF2Interface.d.ts"
                             ]
                         }

Tools/Gulp/helpers/gulp-processModuleDeclarationToNamespace.js

@@ -232,8 +232,11 @@ module.exports = function(fileLocation, packageName, options, cb) {
         if (err) throw err;
 
         data += "";
-        // For Raanan, litteral import hack TO BETTER INTEGRATE
-        data = data.replace('import "../sass/main.scss";', "");
+        if (options.replacements) {
+            for (let replacement of options.replacements) {
+                data = data.replace(replacement.from, replacement.to);
+            }
+        }
 
         if (options.prependText) {
             data = options.prependText + '\n' + data.toString();
@@ -244,9 +247,6 @@ module.exports = function(fileLocation, packageName, options, cb) {
             newData = processData(data, packageName, options);
 
             var namespaceData = newData;
-            if (options.prependToNamespaceText) {
-                namespaceData = options.prependToNamespaceText + '\n' + namespaceData;
-            }
             fs.writeFileSync(fileLocation.replace('.module', ''), namespaceData);
         }
 

dist/preview release/viewer/babylon.viewer.d.ts

@@ -1,7 +1,6 @@
 /// <reference path="./babylon.module.d.ts"/>
 /// <reference path="./babylon.glTF2Interface.d.ts"/>
-/// <reference path="./babylonjs.loaders.d.ts"/>
-declare module "babylonjs-loaders"{ export=BABYLON;}
+/// <reference path="./babylonjs.loaders.module.d.ts"/>
 // Generated by dts-bundle v0.7.3
 // Dependencies for this module:
 //   ../../../../../Tools/Gulp/babylonjs
@@ -168,7 +167,7 @@ declare module BabylonViewer {
             /**
                 * This will be executed when the templates initialize.
                 */
-            protected _onTemplatesLoaded(): Promise<import("./viewer").AbstractViewer>;
+            protected _onTemplatesLoaded(): Promise<import("babylonjs-viewer/viewer/viewer").AbstractViewer>;
             protected _initVR(): void;
             /**
                 * Toggle fullscreen of the entire viewer
@@ -1651,7 +1650,7 @@ declare module BabylonViewer {
 }
 declare module BabylonViewer {
     export class ConfigurationLoader extends RenderOnlyConfigurationLoader {
-        protected getExtendedConfig(type: string | undefined): import("./configuration").ViewerConfiguration;
+        protected getExtendedConfig(type: string | undefined): import("babylonjs-viewer/configuration/configuration").ViewerConfiguration;
     }
 }
 declare module BabylonViewer {

dist/preview release/viewer/babylon.viewer.module.d.ts

@@ -1,7 +1,6 @@
 /// <reference path="./babylon.module.d.ts"/>
 /// <reference path="./babylon.glTF2Interface.d.ts"/>
-/// <reference path="./babylonjs.loaders.d.ts"/>
-declare module "babylonjs-loaders"{ export=BABYLON;}
+/// <reference path="./babylonjs.loaders.module.d.ts"/>
 
 // Generated by dts-bundle v0.7.3
 // Dependencies for this module:
@@ -201,7 +200,7 @@ declare module 'babylonjs-viewer/viewer/defaultViewer' {
             /**
                 * This will be executed when the templates initialize.
                 */
-            protected _onTemplatesLoaded(): Promise<import("./viewer").AbstractViewer>;
+            protected _onTemplatesLoaded(): Promise<import("babylonjs-viewer/viewer/viewer").AbstractViewer>;
             protected _initVR(): void;
             /**
                 * Toggle fullscreen of the entire viewer
@@ -1817,7 +1816,7 @@ declare module 'babylonjs-viewer/templating/eventManager' {
 declare module 'babylonjs-viewer/configuration/loader' {
     import { RenderOnlyConfigurationLoader } from "babylonjs-viewer/configuration/renderOnlyLoader";
     export class ConfigurationLoader extends RenderOnlyConfigurationLoader {
-        protected getExtendedConfig(type: string | undefined): import("./configuration").ViewerConfiguration;
+        protected getExtendedConfig(type: string | undefined): import("babylonjs-viewer/configuration/configuration").ViewerConfiguration;
     }
 }