Browse Source

rename legacy to umd

sebavan 6 years ago
parent
commit
fee6634bd6

+ 2 - 2
Tools/Publisher/tasks/main.js

@@ -7,7 +7,7 @@ const colorConsole = require("../../NodeHelpers/colorConsole");
 const versionNumberManager = require("./versionNumberManager");
 const versionNumberManager = require("./versionNumberManager");
 const buildBabylonJSAndDependencies = require("./buildBabylonJSAndDependencies");
 const buildBabylonJSAndDependencies = require("./buildBabylonJSAndDependencies");
 const processAdditionalPackages = require("./processAdditionalPackages");
 const processAdditionalPackages = require("./processAdditionalPackages");
-const processLegacyPackages = require("./processLegacyPackages");
+const processUMDackages = require("./processUMDPackages");
 const processEs6Packages = require("./processEs6Packages");
 const processEs6Packages = require("./processEs6Packages");
 const prepareUMDDevPackages = require("./prepareUMDDevPackages");
 const prepareUMDDevPackages = require("./prepareUMDDevPackages");
 const prepareEs6DevPackages = require("./prepareEs6DevPackages");
 const prepareEs6DevPackages = require("./prepareEs6DevPackages");
@@ -28,7 +28,7 @@ const createVersion = function(version, options) {
 
 
     if (options.umd) {
     if (options.umd) {
         // Create the packages and publish if needed.
         // Create the packages and publish if needed.
-        processLegacyPackages(version);
+        processUMDPackages(version);
         // Prepare umd Dev Folder.
         // Prepare umd Dev Folder.
         prepareUMDDevPackages();
         prepareUMDDevPackages();
     }
     }

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

@@ -24,7 +24,7 @@ function processEs6Packages(version) {
 
 
         let distPath = module.computed.distES6Directory;
         let distPath = module.computed.distES6Directory;
         let packagePath = module.computed.packageES6Directory;
         let packagePath = module.computed.packageES6Directory;
-        let legacyPackageJson = require(module.computed.packageJSONPath);
+        let umdPackageJson = require(module.computed.packageJSONPath);
 
 
         colorConsole.log("    Cleanup " + packagePath.cyan);
         colorConsole.log("    Cleanup " + packagePath.cyan);
         rmDir(packagePath);
         rmDir(packagePath);
@@ -49,27 +49,27 @@ function processEs6Packages(version) {
             });
             });
         }
         }
 
 
-        legacyPackageJson.name = es6Config.packageName;
-        legacyPackageJson.version = version;
-        legacyPackageJson.main = es6Config.index || "index.js";
-        legacyPackageJson.module = es6Config.index || "index.js";
-        legacyPackageJson.esnext = es6Config.index || "index.js";
-        legacyPackageJson.typings = es6Config.typings || "index.d.ts";
+        umdPackageJson.name = es6Config.packageName;
+        umdPackageJson.version = version;
+        umdPackageJson.main = es6Config.index || "index.js";
+        umdPackageJson.module = es6Config.index || "index.js";
+        umdPackageJson.esnext = es6Config.index || "index.js";
+        umdPackageJson.typings = es6Config.typings || "index.d.ts";
 
 
         if (es6Config.pacakagesFiles) {
         if (es6Config.pacakagesFiles) {
-            legacyPackageJson.files = es6Config.pacakagesFiles;
+            umdPackageJson.files = es6Config.pacakagesFiles;
         }
         }
         else {
         else {
             let files = getFiles(packagePath)
             let files = getFiles(packagePath)
                 .map(f => f.replace(packagePath + "/", ""))
                 .map(f => f.replace(packagePath + "/", ""))
                 .filter(f => f.indexOf("assets/") === -1);
                 .filter(f => f.indexOf("assets/") === -1);
-            legacyPackageJson.files = files;
+            umdPackageJson.files = files;
         }
         }
 
 
         ["dependencies", "peerDependencies", "devDependencies"].forEach(key => {
         ["dependencies", "peerDependencies", "devDependencies"].forEach(key => {
-            if (legacyPackageJson[key]) {
-                let dependencies = legacyPackageJson[key];
-                legacyPackageJson[key] = {};
+            if (umdPackageJson[key]) {
+                let dependencies = umdPackageJson[key];
+                umdPackageJson[key] = {};
                 Object.keys(dependencies).forEach(packageName => {
                 Object.keys(dependencies).forEach(packageName => {
                     if (packageName.indexOf("babylonjs") !== -1) {
                     if (packageName.indexOf("babylonjs") !== -1) {
                         colorConsole.log("    Checking Internal Dependency: " + packageName.cyan);
                         colorConsole.log("    Checking Internal Dependency: " + packageName.cyan);
@@ -83,9 +83,9 @@ function processEs6Packages(version) {
                                 }
                                 }
                             }
                             }
                         }
                         }
-                        legacyPackageJson[key][dependencyName] = version;
+                        umdPackageJson[key][dependencyName] = version;
                     } else if (!module.isCore) {
                     } else if (!module.isCore) {
-                        legacyPackageJson[key][packageName] = dependencies[packageName];
+                        umdPackageJson[key][packageName] = dependencies[packageName];
                     }
                     }
                 });
                 });
             }
             }
@@ -96,10 +96,10 @@ function processEs6Packages(version) {
         var mainPackageJSON = fs.readJSONSync(mainPackageJSONPath);
         var mainPackageJSON = fs.readJSONSync(mainPackageJSONPath);
         var tslibSemver = mainPackageJSON["devDependencies"]["tslib"];
         var tslibSemver = mainPackageJSON["devDependencies"]["tslib"];
         colorConsole.log("    Adding tslib version: ", tslibSemver.yellow);
         colorConsole.log("    Adding tslib version: ", tslibSemver.yellow);
-        legacyPackageJson["dependencies"]["tslib"] = tslibSemver;
+        umdPackageJson["dependencies"]["tslib"] = tslibSemver;
 
 
         let packageJSONPath = path.join(packagePath, "package.json");
         let packageJSONPath = path.join(packagePath, "package.json");
-        fs.writeFileSync(packageJSONPath, JSON.stringify(legacyPackageJson, null, 4));
+        fs.writeFileSync(packageJSONPath, JSON.stringify(umdPackageJson, null, 4));
 
 
         publish(version, es6Config.packageName, packagePath, true);
         publish(version, es6Config.packageName, packagePath, true);
         colorConsole.emptyLine();
         colorConsole.emptyLine();

+ 5 - 5
Tools/Publisher/tasks/processLegacyPackages.js

@@ -6,22 +6,22 @@ const colorConsole = require("../../NodeHelpers/colorConsole");
 
 
 // Helpers.
 // Helpers.
 const publish = require("../helpers/publish");
 const publish = require("../helpers/publish");
-const processLegacyViewer = require("./processLegacyViewer");
+const processUMDViewer = require("./processUMDViewer");
 
 
 // Global Variables.
 // Global Variables.
 const config = require("../../Config/config.js");
 const config = require("../../Config/config.js");
 const modules = config.modules.concat(config.viewerModules);
 const modules = config.modules.concat(config.viewerModules);
 
 
 /**
 /**
- * Process Legacy Packages.
+ * Process UMD Packages.
  */
  */
-function processLegacyPackages(version) {
+function processUMDPackages(version) {
     modules.forEach(moduleName => {
     modules.forEach(moduleName => {
         let module = config[moduleName];
         let module = config[moduleName];
         colorConsole.log("Process " + "UMD".magenta + " Package: " + moduleName.blue.bold);
         colorConsole.log("Process " + "UMD".magenta + " Package: " + moduleName.blue.bold);
 
 
         if (moduleName === "viewer") {
         if (moduleName === "viewer") {
-            processLegacyViewer(module, version);
+            processUMDViewer(module, version);
         }
         }
         else {
         else {
             let outputDirectory = module.build.legacyPackageOutputDirectory || module.computed.distDirectory;
             let outputDirectory = module.build.legacyPackageOutputDirectory || module.computed.distDirectory;
@@ -114,4 +114,4 @@ function processLegacyPackages(version) {
 /**
 /**
  * Main function driving the publication.
  * Main function driving the publication.
  */
  */
-module.exports = processLegacyPackages;
+module.exports = processUMDPackages;

+ 3 - 3
Tools/Publisher/tasks/processLegacyViewer.js

@@ -12,9 +12,9 @@ const getFiles = require("../helpers/getFiles");
 const config = require("../../Config/config.js");
 const config = require("../../Config/config.js");
 
 
 /**
 /**
- * Special treatment for legacy viewer.
+ * Special treatment for umd viewer.
  */
  */
-function processLegacyViewer(module, version) {
+function processUMDViewer(module, version) {
 
 
     let projectPath = '../../../Viewer';
     let projectPath = '../../../Viewer';
     let buildPath = projectPath + "/build/src/";
     let buildPath = projectPath + "/build/src/";
@@ -58,4 +58,4 @@ function processLegacyViewer(module, version) {
 /**
 /**
  * Main function driving the publication.
  * Main function driving the publication.
  */
  */
-module.exports = processLegacyViewer;
+module.exports = processUMDViewer;