sebavan пре 6 година
родитељ
комит
d8ef05b775

+ 6 - 2
Tools/Config/config.json

@@ -655,10 +655,14 @@
             "legacyPackageOutputDirectory": "../../../Viewer/build/src/",
             "es6": {
                 "buildDependencies": [
-                    "node_modules/handlebars/**/*"
+                    "node_modules/handlebars/**/*",
+                    "node_modules/@types/**/*"
                 ],
                 "packageName": "@babylonjs/viewer",
-                "readme": "Viewer/README-ES6.md"
+                "readme": "Viewer/README-ES6.md",
+                "skipLibCheck": true,
+                "index": "src/index.js",
+                "typings": "src/index.d.ts"
             }
         }
     },

+ 3 - 1
Tools/Gulp/tasks/gulpTasks-librariesES6.js

@@ -187,7 +187,9 @@ var build = function(settings, cb) {
         verbose: true
     };
 
-    let command = `node "${config.computed.tscPath}" --skipLibCheck false --inlineSources --sourceMap true -t es5 -m esNext --outDir "${settings.computed.distES6Directory}"`;
+    var skipLibCheck = settings.build.es6.skipLibCheck ? 'true' : 'false';
+    let command = `node "${config.computed.tscPath}" --skipLibCheck ${skipLibCheck} --inlineSources --sourceMap true -t es5 -m esNext --outDir "${settings.computed.distES6Directory}"`;
+
     shelljs.exec(command, options, function(code, stdout, stderr) {
         if (stderr) {
             console.log(stderr);

+ 1 - 1
Tools/Publisher/tasks/prepareEs6DevPackages.js

@@ -12,7 +12,7 @@ const config = require("../../Config/config.js");
  * Prepare an es6 Dev folder npm linked for test purpose.
  */
 function prepareEs6DevPackages() {
-    config.modules.forEach(moduleName => {
+    config.es6modules.forEach(moduleName => {
         const module = config[moduleName];
 
         colorConsole.log("Prepare " + "ES6Dev".magenta + " Package: " + moduleName.blue.bold);

+ 1 - 1
Tools/Publisher/tasks/processEs6Packages.js

@@ -16,7 +16,7 @@ const modules = config.modules.concat(config.viewerModules);
  * Process ES6 Packages.
  */
 function processEs6Packages(version) {
-    config.modules.forEach(moduleName => {
+    config.es6modules.forEach(moduleName => {
         let module = config[moduleName];
         let es6Config = module.build.es6;
 

+ 1 - 1
Tools/Publisher/tasks/processUMDViewer.js

@@ -16,7 +16,7 @@ const config = require("../../Config/config.js");
  */
 function processUMDViewer(module, version) {
 
-    let projectPath = '../../Viewer';
+    let projectPath = '../../../Viewer';
     let buildPath = path.resolve(__dirname, projectPath + "/build/src/");
 
     if (module.build.umd.requiredFiles) {

+ 0 - 1
Viewer/webpack.config.js

@@ -1,7 +1,6 @@
 const path = require('path');
 const webpack = require('webpack');
 
-const babylonExternals = require('../Tools/WebpackPlugins/babylonExternals');
 const ViewerResolve = require('../Tools/WebpackPlugins/viewerResolve');
 
 module.exports =