no tsFolder, webpack from main

Tools/Gulp/config.json

@@ -51,7 +51,7 @@
             }
         ],
         "build": {
-            "webpack": "../../src/webpack.config.js",
+            "mainFolder": "../../src/",
             "srcDirectory": "../../src/",
             "loseDTSFiles": "../../src/LibDeclarations/*.d.ts",
             "distOutputDirectory": "/",
@@ -83,7 +83,6 @@
             },
             "es6": {
                 "packageName": "@babylonjs/core",
-                "tsFolder": "../../src/",
                 "requiredFiles": [
                     "../../readme.md"
                 ]
@@ -173,7 +172,7 @@
             }
         ],
         "build": {
-            "webpack": "../../materialsLibrary/webpack.config.js",
+            "mainFolder": "../../materialsLibrary/",
             "srcDirectory": "../../materialsLibrary/src/",
             "distOutputDirectory": "/materialsLibrary/",
             "processDeclaration": {
@@ -187,7 +186,6 @@
             },
             "es6": {
                 "packageName": "@babylonjs/materials",
-                "tsFolder": "../../materialsLibrary/",
                 "requiredFiles": [
                     "../../dist/preview release/materialsLibrary/readme.md"
                 ]
@@ -212,7 +210,7 @@
             }
         ],
         "build": {
-            "webpack": "../../postProcessLibrary/webpack.config.js",
+            "mainFolder": "../../postProcessLibrary/",
             "srcDirectory": "../../postProcessLibrary/src/",
             "distOutputDirectory": "/postProcessesLibrary/",
             "processDeclaration": {
@@ -226,7 +224,6 @@
             },
             "es6": {
                 "packageName": "@babylonjs/post-processes",
-                "tsFolder": "../../postProcessLibrary/",
                 "requiredFiles": [
                     "../../dist/preview release/postProcessesLibrary/readme.md"
                 ]
@@ -291,7 +288,7 @@
             }
         ],
         "build": {
-            "webpack": "../../proceduralTexturesLibrary/webpack.config.js",
+            "mainFolder": "../../proceduralTexturesLibrary/",
             "srcDirectory": "../../proceduralTexturesLibrary/src/",
             "distOutputDirectory": "/proceduralTexturesLibrary/",
             "processDeclaration": {
@@ -305,7 +302,6 @@
             },
             "es6": {
                 "packageName": "@babylonjs/procedural-textures",
-                "tsFolder": "../../proceduralTexturesLibrary/",
                 "requiredFiles": [
                     "../../dist/preview release/proceduralTexturesLibrary/readme.md"
                 ]
@@ -345,7 +341,7 @@
             }
         ],
         "build": {
-            "webpack": "../../loaders/webpack.config.js",
+            "mainFolder": "../../loaders/",
             "srcDirectory": "../../loaders/src/",
             "distOutputDirectory": "/loaders/",
             "processDeclaration": {
@@ -378,7 +374,6 @@
             },
             "es6": {
                 "packageName": "@babylonjs/loaders",
-                "tsFolder": "../../loaders/",
                 "requiredFiles": [
                     "../../dist/preview release/loaders/readme.md"
                 ]
@@ -403,7 +398,7 @@
             }
         ],
         "build": {
-            "webpack": "../../serializers/webpack.config.js",
+            "mainFolder": "../../serializers/",
             "srcDirectory": "../../serializers/src/",
             "distOutputDirectory": "/serializers/",
             "processDeclaration": {
@@ -438,7 +433,6 @@
             },
             "es6": {
                 "packageName": "@babylonjs/serializers",
-                "tsFolder": "../../serializers/",
                 "requiredFiles": [
                     "../../dist/preview release/serializers/readme.md"
                 ]
@@ -453,7 +447,7 @@
             }
         ],
         "build": {
-            "webpack": "../../gui/webpack.config.js",
+            "mainFolder": "../../gui/",
             "srcDirectory": "../../gui/src/",
             "distOutputDirectory": "/gui/",
             "processDeclaration": {
@@ -469,7 +463,6 @@
             },
             "es6": {
                 "packageName": "@babylonjs/gui",
-                "tsFolder": "../../gui/",
                 "requiredFiles": [
                     "../../dist/preview release/gui/readme.md"
                 ]
@@ -486,7 +479,7 @@
         ],
         "build": {
             "ignoreInTestMode": true,
-            "webpack": "../../inspector/webpack.config.js",
+            "mainFolder": "../../inspector/",
             "srcDirectory": "../../inspector/src/",
             "distOutputDirectory": "/inspector/",
             "processDeclaration": {

Tools/Gulp/tasks/gulpTasks-libraries.js

@@ -50,7 +50,8 @@ var buildExternalLibrariesMultiEntry = function(libraries, settings, isMin) {
 
     // Webpack Config.
     var configFolder = path.dirname(path.resolve(__dirname, configPath));
-    var wpConfig = require(path.resolve(configFolder, settings.build.webpack));
+    var configPath = path.join(settings.build.mainFolder, "webpack.config.js");
+    var wpConfig = require(path.resolve(configFolder, configPath));
 
     // Create multi entry list.
     wpConfig.entry = { };

Tools/Gulp/tasks/gulpTasks-viewerLibraries.js

@@ -22,7 +22,8 @@ var buildViewerLibrary = function(library, settings) {
     var outputDirectory = config.build.outputDirectory + settings.build.distOutputDirectory;
 
     settings.build.outputs.forEach(out => {
-        let wpConfig = require(settings.build.webpack);
+        var configPath = path.join(settings.build.mainFolder, "webpack.config.js");
+        let wpConfig = require(configPath);
         if (!out.minified) {
             wpConfig.mode = "development";
         }

Tools/Gulp/tasks/gulpTasks-watchLibraries.js

@@ -18,7 +18,7 @@ gulp.task("watchLibraries", function startWatch() {
 
     config.modules.map(function(module) {
         var settings = config[module].build;
-        if (!config[module].isCore && settings && settings.webpack) {
+        if (!config[module].isCore && settings) {
             for (var index = 0; index < config[module].libraries.length; index++) {
                 var library = config[module].libraries[index];
                 if (library.preventLoadLibrary) { 
@@ -26,7 +26,8 @@ gulp.task("watchLibraries", function startWatch() {
                 }
 
                 var configFolder = path.dirname(path.resolve(__dirname, configPath));
-                var wpConfig = require(path.resolve(configFolder, settings.webpack));
+                var configPath = path.join(settings.build.mainFolder, "webpack.config.js");
+                var wpConfig = require(path.resolve(configFolder, configPath));
 
                 // watch on.
                 wpConfig.watch = true;

Tools/Publisher/publisher.js

@@ -123,7 +123,7 @@ function processEs6Packages(version) {
 
         colorConsole.log("Process " + "ES6".magenta + " Package: " + moduleName.blue.bold);
 
-        let projectPath = es6Config.tsFolder;
+        let projectPath = module.build.mainFolder;
         let buildPath = path.normalize(tempPath + moduleName);
         let legacyPackageJson = require(module.build.packageJSON || basePath + module.build.distOutputDirectory + 'package.json');
 

Tools/WebpackPlugins/babylonWebpackConfig.js

@@ -16,7 +16,8 @@ module.exports = function defaultConfig(options) {
     const settings = config[module];
 
     const src = path.resolve(__dirname, settings.build.srcDirectory);
-    const webpackFolder = path.dirname(path.resolve(configFolder, settings.build.webpack));
+    const configPath = path.join(settings.build.mainFolder, "webpack.config.js");
+    const webpackFolder = path.dirname(path.resolve(configFolder, configPath));
 
     options.resolveExtensions = options.resolveExtensions || [];
     options.moduleRules = options.moduleRules || [];