Raanan Weber před 7 roky
rodič
revize
ed9f97da56
2 změnil soubory, kde provedl 27 přidání a 20 odebrání
  1. 26 15
      Viewer/tsconfig-gulp.json
  2. 1 5
      Viewer/webpack.gulp.config.js

+ 26 - 15
Viewer/tsconfig-gulp.json

@@ -2,32 +2,43 @@
     "compilerOptions": {
         "target": "es5",
         "module": "commonjs",
-        "noResolve": false,
-        "noImplicitAny": false,
-        "strictNullChecks": true,
-        "removeComments": false,
-        "preserveConstEnums": true,
-        "sourceMap": false,
-        "experimentalDecorators": true,
-        "isolatedModules": false,
         "declaration": true,
+        "experimentalDecorators": true,
+        "emitDecoratorMetadata": true,
+        "moduleResolution": "node",
+        "strictNullChecks": true,
+        "noImplicitAny": false,
+        "noFallthroughCasesInSwitch": true,
+        "inlineSourceMap": true,
         "lib": [
+            "es5",
             "dom",
             "es2015.promise",
-            "es5"
-        ],
-        "types": [
-            "node"
+            "es2015.collection",
+            "es2015.iterable"
         ],
-        "baseUrl": "./",
+        "skipDefaultLibCheck": true,
+        "skipLibCheck": true,
+        "baseUrl": "./src/",
+        "rootDir": "./",
         "paths": {
             "babylonjs": [
-                "../dist/preview release/babylon.d.ts"
+                "../../dist/preview release/babylon.d.ts"
             ],
             "babylonjs-loaders": [
                 "externalModules.d.ts"
+            ],
+            "babylonjs-gltf2interface": [
+                "../../dist/babylon.glTF2Interface.d.ts"
+            ],
+            "deepmerge": [
+                "./helper/deepmerge.d.ts"
+            ],
+            "handlebars": [
+                "./templates/handlebars.d.ts"
             ]
-        }
+        },
+        "outDir": "./dist/build"
     },
     "exclude": [
         "node_modules",

+ 1 - 5
Viewer/webpack.gulp.config.js

@@ -12,8 +12,6 @@ module.exports = {
     externals: {
         cannon: 'CANNON',
         oimo: 'OIMO',
-        vertx: true,
-        "./Oimo": "OIMO",
         "earcut": true
     },
     resolve: {
@@ -21,9 +19,7 @@ module.exports = {
         alias: {
             "babylonjs": __dirname + '/../dist/preview release/babylon.max.js',
             "babylonjs-materials": __dirname + '/../dist/preview release/materialsLibrary/babylonjs.materials.js',
-            "babylonjs-loaders": __dirname + '/../dist/preview release/loaders/babylonjs.loaders.js',
-            // "es6-promise": __dirname + '/assets/es6-promise.min.js',
-            "pep": __dirname + '/assets/pep.min.js',
+            "babylonjs-loaders": __dirname + '/../dist/preview release/loaders/babylonjs.loaders.js'
         }
     },
     module: {