sebavan 6 rokov pred
rodič
commit
67cab10642

+ 4 - 1
Tools/Config/config.json

@@ -60,7 +60,10 @@
         ],
         "build": {
             "mainFolder": "./src/",
-            "loseDTSFiles": "LibDeclarations/*.d.ts",
+            "loseDTSFiles": {
+                "glob": "LibDeclarations/*.d.ts",
+                "destFileES6": "Engines/engine.d.ts"
+            },
             "distOutputDirectory": "",
             "packageJSON": "package.json",
             "umd": {

Tools/Gulp/helpers/gulp-processLooseDeclarationEs6.js → Tools/Gulp/helpers/gulp-processLooseDeclarationsEs6.js


+ 1 - 1
Tools/Gulp/tasks/gulpTasks-libraries.js

@@ -114,7 +114,7 @@ var buildAMDDTSFiles = function(libraries, settings, cb) {
  */
 var appendLoseDTSFiles = function(settings) {
     if (settings.build.loseDTSFiles) {
-        return gulp.src([tempTypingsFile, path.join(settings.computed.srcDirectory, settings.build.loseDTSFiles)])
+        return gulp.src([tempTypingsFile, path.join(settings.computed.srcDirectory, settings.build.loseDTSFiles.glob)])
             .pipe(concat(tempTypingsFileName))
             .pipe(gulp.dest(config.computed.tempFolder));
     }

+ 6 - 5
Tools/Gulp/tasks/gulpTasks-librariesES6.js

@@ -8,7 +8,7 @@ var concat = require('gulp-concat');
 // Gulp Helpers
 var rmDir = require("../../NodeHelpers/rmDir");
 var processImports = require("../helpers/gulp-processImportsToEs6");
-var processLooseDeclaration = require("../helpers/gulp-processLooseDeclarationEs6");
+var processLooseDeclarations = require("../helpers/gulp-processLooseDeclarationsEs6");
 var uncommentShaders = require('../helpers/gulp-removeShaderComments');
 var processShaders = require("../helpers/gulp-processShaders");
 var del = require("del");
@@ -156,10 +156,11 @@ var modifyTsConfig = function(settings, cb) {
  */
 var appendLoseDTSFiles = function(settings) {
     if (settings.build.loseDTSFiles) {
-        const indexDTS = path.join(settings.computed.distES6Directory, "index.d.ts");
-        return gulp.src([indexDTS, path.join(settings.computed.srcDirectory, settings.build.loseDTSFiles)])
-            .pipe(concat("index.d.ts"))
-            .pipe(processLooseDeclaration())
+        const mainDeclarationFile = "" || "index.d.ts";
+        const indexDTS = path.join(settings.computed.distES6Directory, mainDeclarationFile);
+        return gulp.src([indexDTS, path.join(settings.computed.srcDirectory, settings.build.loseDTSFiles.glob)])
+            .pipe(concat(settings.build.loseDTSFiles.destFileES6 || "index.d.ts"))
+            .pipe(processLooseDeclarations())
             .pipe(gulp.dest(settings.computed.distES6Directory));
     }
     return Promise.resolve();