es 6 remap dependencies

Tools/Gulp/config.json

@@ -99,8 +99,11 @@
                 "prependToNamespaceText": "declare module 'babylonjs' { export = BABYLON; }"
             },
             "es6": {
-                "packageName": "babylonjs-es6",
-                "tsFolder": "../../src/"
+                "packageName": "@babylonjs/core",
+                "tsFolder": "../../src/",
+                "requiredFiles": [
+                    "../../readme.md"
+                ]
             }
         }
     },
@@ -200,8 +203,11 @@
                 }
             },
             "es6": {
-                "packageName": "babylonjs-materials-es6",
-                "tsFolder": "../../materialsLibrary/"
+                "packageName": "@babylonjs/materials",
+                "tsFolder": "../../materialsLibrary/",
+                "requiredFiles": [
+                    "../../dist/preview release/materialsLibrary/readme.md"
+                ]
             }
         }
     },
@@ -236,8 +242,11 @@
                 }
             },
             "es6": {
-                "packageName": "babylonjs-post-process-es6",
-                "tsFolder": "../../postProcessLibrary/"
+                "packageName": "@babylonjs/post-processes",
+                "tsFolder": "../../postProcessLibrary/",
+                "requiredFiles": [
+                    "../../dist/preview release/postProcessesLibrary/readme.md"
+                ]
             }
         }
     },
@@ -312,8 +321,11 @@
                 }
             },
             "es6": {
-                "packageName": "babylonjs-procedural-textures-es6",
-                "tsFolder": "../../proceduralTexturesLibrary/"
+                "packageName": "@babylonjs/procedural-textures",
+                "tsFolder": "../../proceduralTexturesLibrary/",
+                "requiredFiles": [
+                    "../../dist/preview release/proceduralTexturesLibrary/readme.md"
+                ]
             }
         }
     },
@@ -382,8 +394,11 @@
                 }
             },
             "es6": {
-                "packageName": "babylonjs-loaders-es6",
-                "tsFolder": "../../loaders/"
+                "packageName": "@babylonjs/loaders",
+                "tsFolder": "../../loaders/",
+                "requiredFiles": [
+                    "../../dist/preview release/loaders/readme.md"
+                ]
             }
         }
     },
@@ -439,8 +454,11 @@
                 ]
             },
             "es6": {
-                "packageName": "babylonjs-serializers-es6",
-                "tsFolder": "../../serializers/"
+                "packageName": "@babylonjs/serializers",
+                "tsFolder": "../../serializers/",
+                "requiredFiles": [
+                    "../../dist/preview release/serializers/readme.md"
+                ]
             }
         }
     },
@@ -467,8 +485,11 @@
                 }
             },
             "es6": {
-                "packageName": "babylonjs-gui-es6",
-                "tsFolder": "../../gui/"
+                "packageName": "@babylonjs/gui",
+                "tsFolder": "../../gui/",
+                "requiredFiles": [
+                    "../../dist/preview release/gui/readme.md"
+                ]
             }
         }
     },
@@ -497,10 +518,6 @@
                     "babylonjs-serializers": "BABYLON",
                     "babylonjs-gui": "BABYLON.GUI"
                 }
-            },
-            "es6": {
-                "packageName": "babylonjs-inspector-es6",
-                "tsFolder": "../../inspector/"
             }
         }
     },

Tools/Publisher/publisher.js

@@ -139,6 +139,12 @@ function processEs6Packages(version) {
                 fs.copySync(file, buildPath + '/' + path.basename(file));
             });
         }
+        if (es6Config.requiredFiles) {
+            es6Config.requiredFiles.forEach(file => {
+                colorConsole.log("    Copy es6 required file: ", file.cyan, (buildPath + '/' + path.basename(file)).cyan);
+                fs.copySync(file, buildPath + '/' + path.basename(file));
+            });
+        }
 
         let files = getFiles(buildPath).map(f => f.replace(buildPath + "/", "")).filter(f => f.indexOf("assets/") === -1);
 
@@ -155,9 +161,20 @@ function processEs6Packages(version) {
                 let dependencies = legacyPackageJson[key];
                 legacyPackageJson[key] = {};
                 Object.keys(dependencies).forEach(packageName => {
-                    if (dependencies[packageName].indexOf("babylonjs") !== -1) {
-                        legacyPackageJson[key][packageName + "-es6"] = version;
-                    } else {
+                    if (packageName.indexOf("babylonjs") !== -1) {
+                        colorConsole.log("    Checking Internal Dependency: " + packageName.cyan);
+                        let dependencyName = packageName;
+                        for (var moduleName of modules) {
+                            if (config[moduleName] && config[moduleName].build.processDeclaration && config[moduleName].build.processDeclaration.packageName === packageName) {
+                                if (config[moduleName].build.es6) {
+                                    dependencyName = config[moduleName].build.es6.packageName;
+                                    colorConsole.log("    Replace Dependency: " + packageName.cyan + " by " + dependencyName.cyan);
+                                    break;
+                                }
+                            }
+                        }
+                        legacyPackageJson[key][dependencyName] = version;
+                    } else if (!module.isCore) {
                         legacyPackageJson[key][packageName] = dependencies[packageName];
                     }
                 });