deepmerge reference

.gitignore

@@ -178,7 +178,7 @@ dist/preview release/viewer/babylon.d.ts
 dist/preview release/viewer/babylonjs.loaders.d.ts
 dist/preview release/viewer/babylon.glTF2Interface.d.ts
 Viewer/dist/viewer.max.js
-!Viewer/src/externalModules.d.ts
+!Viewer/src/**/*.d.ts
 Viewer/tests/unit/src/**/*.js
 Viewer/tests/Lib/**/*.js
 Viewer/tests/commons/**/*.js

Viewer/src/helper/deepmerge.d.ts

@@ -0,0 +1,9 @@
+interface Ideepmerge {
+    (a: any, b: any, options?: any): any;
+    all(array: Array<any>, options?: any): any;
+}
+declare const deepmerge: Ideepmerge;
+
+declare module "deepmerge" {
+    export = deepmerge;
+}

Viewer/src/helper/index.ts

@@ -1,4 +1,4 @@
-import * as deepmerge from '../../assets/deepmerge.min.js';
+import * as deepmerge from 'deepmerge';
 
 export { deepmerge };
 

Viewer/tsconfig.json

@@ -1,25 +1,26 @@
 {
     "compilerOptions": {
-        "target": "es5",
-        "module": "commonjs",
-        "noResolve": false,
-        "noImplicitAny": false, //mainly due to usage of external libs without typings.
-        "strictNullChecks": true,
-        "removeComments": true,
-        "preserveConstEnums": true,
-        "sourceMap": true,
+        "target": "es2015",
+        "module": "es2015",
+        "declaration": true,
         "experimentalDecorators": true,
-        "isolatedModules": false,
-        "declaration": false,
+        "emitDecoratorMetadata": true,
+        "moduleResolution": "node",
+        "strictNullChecks": true,
+        "noImplicitAny": false,
+        "noFallthroughCasesInSwitch": true,
+        "inlineSourceMap": true,
         "lib": [
+            "es5",
             "dom",
             "es2015.promise",
-            "es5"
-        ],
-        "types": [
-            "node"
+            "es2015.collection",
+            "es2015.iterable"
         ],
+        "skipDefaultLibCheck": true,
+        "skipLibCheck": true,
         "baseUrl": "./src/",
+        "rootDir": "./",
         "paths": {
             "babylonjs": [
                 "../../dist/preview release/babylon.d.ts"
@@ -29,15 +30,11 @@
             ],
             "babylonjs-gltf2interface": [
                 "../../dist/babylon.glTF2Interface.d.ts"
+            ],
+            "deepmerge": [
+                "./helper/deepmerge.d.ts"
             ]
         },
-        //"outDir": "./dist/build"
-    },
-    "files": [
-        "./src/index.ts"
-    ],
-    "exclude": [
-        "node_modules",
-        "dist"
-    ]
+        "outDir": "./dist/build"
+    }
 }