test

Tools/Config/config.js

@@ -4,7 +4,7 @@ const config = require("./config.json");
 const configFolder = __dirname;
 
 const rootFolder = path.resolve(configFolder, "../../");
-const tempFolder = path.resolve(configFolder, config.build.tempDirectory);
+const tempFolder = path.resolve(rootFolder, config.build.tempDirectory);
 const outputFolder = path.resolve(configFolder, config.build.outputDirectory);
 const localDevES6 = path.join(tempFolder, config.build.localDevES6FolderName);
 const localDevUMD = path.join(tempFolder, config.build.localDevUMDFolderName);
@@ -22,7 +22,7 @@ config.computed = {
 config.modules.map(function(module) {
     const settings = config[module];
 
-    const mainDirectory = path.resolve(configFolder, settings.build.mainFolder);
+    const mainDirectory = path.resolve(rootFolder, settings.build.mainFolder);
     const distFolder = (settings.build.distOutputDirectory !== undefined) ? settings.build.distOutputDirectory : module;
     const distDirectory = path.join(outputFolder, distFolder);
     const localDevES6Directory = path.join(localDevES6, module);
@@ -31,7 +31,9 @@ config.modules.map(function(module) {
 
     const webpackConfigPath = path.join(mainDirectory, "webpack.config.js");
     const tsConfigPath = path.join(mainDirectory, "tsconfig.json");
-    const packageJSONPath = settings.build.packageJSON || path.join(distDirectory, 'package.json');
+    const packageJSONPath = settings.build.packageJSON ? 
+        path.join(rootFolder, settings.build.packageJSON) : 
+        path.join(distDirectory, 'package.json');
 
     const tsConfig = require(tsConfigPath);
     const srcDirectory = path.resolve(mainDirectory, tsConfig.compilerOptions.rootDir);

Tools/Config/config.json

@@ -1,7 +1,7 @@
 {
     "build": {
         "outputDirectory": "../../dist/preview release",
-        "tempDirectory": "../../.temp/",
+        "tempDirectory": "./.temp/",
         "localDevES6FolderName": "localDevES6",
         "localDevUMDFolderName": "localDevUMD",
         "ES6Package": "packageES6",
@@ -51,10 +51,10 @@
             }
         ],
         "build": {
-            "mainFolder": "../../src/",
+            "mainFolder": "./src/",
             "loseDTSFiles": "LibDeclarations/*.d.ts",
             "distOutputDirectory": "",
-            "packageJSON": "../../package.json",
+            "packageJSON": "package.json",
             "umd": {
                 "packageName": "babylonjs",
                 "webpackRoot": "BABYLON",
@@ -174,7 +174,7 @@
             }
         ],
         "build": {
-            "mainFolder": "../../materialsLibrary/",
+            "mainFolder": "./materialsLibrary/",
             "umd": {
                 "packageName": "babylonjs-materials",
                 "webpackRoot": "MATERIALS",
@@ -213,7 +213,7 @@
             }
         ],
         "build": {
-            "mainFolder": "../../postProcessLibrary/",
+            "mainFolder": "./postProcessLibrary/",
             "umd": {
                 "packageName": "babylonjs-post-process",
                 "webpackRoot": "POSTPROCESSES",
@@ -292,7 +292,7 @@
             }
         ],
         "build": {
-            "mainFolder": "../../proceduralTexturesLibrary/",
+            "mainFolder": "./proceduralTexturesLibrary/",
             "umd": {
                 "packageName": "babylonjs-procedural-textures",
                 "webpackRoot": "PROCEDURALTEXTURES",
@@ -346,7 +346,7 @@
             }
         ],
         "build": {
-            "mainFolder": "../../loaders/",
+            "mainFolder": "./loaders/",
             "umd": {
                 "packageName": "babylonjs-loaders",
                 "webpackRoot": "LOADERS",
@@ -404,7 +404,7 @@
             }
         ],
         "build": {
-            "mainFolder": "../../serializers/",
+            "mainFolder": "./serializers/",
             "umd": {
                 "packageName": "babylonjs-serializers",
                 "webpackRoot": "SERIALIZERS",
@@ -454,7 +454,7 @@
             }
         ],
         "build": {
-            "mainFolder": "../../gui/",
+            "mainFolder": "./gui/",
             "umd": {
                 "packageName": "babylonjs-gui",
                 "webpackRoot": "BABYLON.GUI",
@@ -486,7 +486,7 @@
         ],
         "build": {
             "ignoreInTestMode": true,
-            "mainFolder": "../../inspector/",
+            "mainFolder": "./inspector/",
             "umd": {
                 "packageName": "babylonjs-inspector",
                 "webpackRoot": "INSPECTOR",

Tools/Gulp/tasks/gulpTasks-libraries.js

@@ -4,7 +4,7 @@ var webpack = require('webpack');
 var webpackStream = require("webpack-stream");
 var cp = require('child_process');
 var path = require("path");
-var concat = require("gulp-concat");
+var append = require('gulp-append');
 
 // Gulp Helpers
 var uncommentShaders = require('../helpers/gulp-removeShaderComments');
@@ -17,9 +17,11 @@ var del = require("del");
 var config = require("../../Config/config.js");
 
 // Constants
-const tempTypingsFileName = "tempTypings.js";
+const tempTypingsAMDFileName = "tempTypings.js";
+const tempTypingsFileName = tempTypingsAMDFileName.replace(".js", ".d.ts");
+
+const tempTypingsAMDFile = path.join(config.computed.tempFolder, tempTypingsAMDFileName);
 const tempTypingsFile = path.join(config.computed.tempFolder, tempTypingsFileName);
-const tempTypingsPath = path.join(config.computed.tempFolder, tempTypingsFileName.replace(".js", ".d.ts"));
 
 /**
  * Clean shader ts files.
@@ -93,7 +95,7 @@ var buildAMDDTSFiles = function(libraries, settings, cb) {
     let library = libraries[0];
     if (!library.preventLoadLibrary) {
         // Generate DTS the old way...
-        cp.execSync(`tsc --module amd --outFile "${tempTypingsFile}" --emitDeclarationOnly true`, {
+        cp.execSync(`tsc --module amd --outFile "${tempTypingsAMDFile}" --emitDeclarationOnly true`, {
             cwd: settings.computed.srcDirectory
         });
     }
@@ -105,11 +107,11 @@ var buildAMDDTSFiles = function(libraries, settings, cb) {
  */
 var appendLoseDTSFiles = function(settings) {
     if (settings.build.loseDTSFiles) {
-        console.log(tempTypingsPath);
+        console.log(tempTypingsFile);
+        console.log(tempTypingsFileName);
         console.log(path.join(settings.computed.srcDirectory, settings.build.loseDTSFiles));
-        return gulp.src([tempTypingsPath, path.join(settings.computed.srcDirectory, settings.build.loseDTSFiles)])
-            .pipe(concat(tempTypingsPath))
-            .pipe(gulp.dest(tempTypingsPath));
+        return gulp.src([path.join(settings.computed.srcDirectory, settings.build.loseDTSFiles)])
+            .pipe(append(tempTypingsFile));
     }
     return Promise.resolve();
 }
@@ -128,7 +130,7 @@ var processDTSFiles = function(libraries, settings, cb) {
         let fileLocation = path.join(outputDirectory, settings.build.umd.processDeclaration.filename);
 
         // Convert the tsc AMD BUNDLED declaration to our expected one
-        processAmdDeclarationToModule(tempTypingsPath, {
+        processAmdDeclarationToModule(tempTypingsFile, {
             output: fileLocation,
             moduleName: settings.build.umd.packageName,
             entryPoint: library.entry,

package.json

@@ -60,6 +60,7 @@
         "file-loader": "~2.0.0",
         "fs-extra": "^5.0.0",
         "gulp": "^4.0.0",
+        "gulp-append": "^0.3.4",
         "gulp-concat": "~2.6.1",
         "gulp-connect": "^5.6.1",
         "gulp-filter": "^5.1.0",
@@ -105,4 +106,4 @@
         "webpack-dev-server": "^3.1.5",
         "webpack-stream": "5.0.0"
     }
-}
+}