Merge pull request #5971 from sebavan/master

Add Npm Marker

Tools/Publisher/tasks/versionNumberManager.js

@@ -34,7 +34,8 @@ function updateEngineVersion(newVersion) {
     colorConsole.log("Updating version in engine.ts to: " + newVersion.green);
     let engineContent = fs.readFileSync(enginePath).toString();
     let replaced = engineContent.replace(/(public static get Version\(\): string {\s*return ")(.*)(";\s*})/g, "$1" + newVersion + "$3");
-    fs.writeFileSync(enginePath, replaced);    
+    replaced = replaced.replace(/(public static get NpmPackage\(\): string {\s*return ")(.*)(";\s*})/g, "$1" + "babylonjs@" + newVersion + "$3");
+    fs.writeFileSync(enginePath, replaced);
     colorConsole.emptyLine();
 }
 

Viewer/package.json

@@ -29,7 +29,7 @@
         "base64-image-loader": "^1.2.1",
         "base64-inline-loader": "^1.1.1",
         "deepmerge": "~2.1.1",
-        "handlebars": "^4.0.11",
+        "handlebars": "^4.1.0",
         "html-loader": "^0.5.5",
         "json-loader": "^0.5.7",
         "ts-loader": "^4.4.0",

package.json

@@ -49,6 +49,7 @@
         "@types/react": "~16.7.3",
         "@types/react-dom": "~16.0.9",
         "@types/sinon": "^4.1.3",
+        "ajv": "^6.9.1",
         "awesome-typescript-loader": "^5.2.1",
         "base64-font-loader": "0.0.4",
         "chai": "^4.1.2",
@@ -56,7 +57,7 @@
         "color-support": "^1.1.3",
         "css-loader": "^1.0.0",
         "del": "3.0.0",
-        "dependency-cruiser": "^4.9.0",
+        "dependency-cruiser": "^4.13.2",
         "dts-bundle": "^0.7.3",
         "file-loader": "~2.0.0",
         "fs-extra": "^5.0.0",
@@ -85,6 +86,7 @@
         "prompt": "^1.0.0",
         "re-resizable": "~4.9.1",
         "react": "~16.6.3",
+        "react-contextmenu": "~2.10.0",
         "react-dom": "~16.6.3",
         "sass-loader": "^7.1.0",
         "shelljs": "^0.7.8",
@@ -101,7 +103,6 @@
         "webpack-cli": "^3.1.2",
         "webpack-dev-server": "^3.1.14",
         "webpack-stream": "5.0.0",
-        "react-contextmenu": "~2.10.0",
-        "ajv": "^6.9.1"
+        "xhr2": "^0.1.4"
     }
-}
+}

src/Engines/engine.ts

@@ -493,6 +493,14 @@ export class Engine {
     public static readonly SCALEMODE_CEILING = Constants.SCALEMODE_CEILING;
 
     /**
+     * Returns the current npm package of the sdk
+     */
+    // Not mixed with Version for tooling purpose.
+    public static get NpmPackage(): string {
+        return "babylonjs@4.0.0-alpha.29";
+    }
+
+    /**
      * Returns the current version of the framework
      */
     public static get Version(): string {