Merge pull request #813 from NativeScript/vchimev/merge-release-into-master

chore: merge release into master

Author: vchimev

Diff for: lib/utils.js

@@ -1,10 +1,8 @@
 const os = require("os");
-const path = require("path");
 
 const {
     getAppPathFromProjectData,
     getAppResourcesPathFromProjectData,
-    getProjectDir,
     isAndroid,
 } = require("../projectHelpers");
 
@@ -92,12 +90,17 @@ function removeListener(eventEmitter, name) {
     }
 }
 
+function convertToUnixPath(relativePath) {
+    return relativePath.replace(/\\/g, "/");
+}
+
 module.exports = {
     buildEnvData,
     debuggingEnabled,
     shouldSnapshot,
     getUpdatedEmittedFiles,
     parseHotUpdateChunkName,
     addListener,
-    removeListener
+    removeListener,
+    convertToUnixPath
 };

Diff for: markup-hot-loader.js

@@ -1,7 +1,9 @@
 const { reload } = require("./hot-loader-helper");
+const { convertToUnixPath } = require("./lib/utils");
 
 module.exports = function (source) {
     const typeMarkup = "markup";
-    const modulePath = this.resourcePath.replace(this.rootContext, ".");
+    const moduleRelativePath = this.resourcePath.replace(this.rootContext, ".");
+    const modulePath = convertToUnixPath(moduleRelativePath);
     return `${source};${reload({ type: typeMarkup, path: modulePath })}`;
 };

Diff for: script-hot-loader.js

@@ -1,7 +1,9 @@
 const { reload } = require("./hot-loader-helper");
+const { convertToUnixPath } = require("./lib/utils");
 
 module.exports = function (source) {
     const typeScript = "script";
-    const modulePath = this.resourcePath.replace(this.rootContext, ".");
+    const moduleRelativePath = this.resourcePath.replace(this.rootContext, ".");
+    const modulePath = convertToUnixPath(moduleRelativePath);
     return `${source};${reload({ type: typeScript, path: modulePath })}`;
 };

Diff for: style-hot-loader.js

@@ -1,7 +1,9 @@
 const { reload } = require("./hot-loader-helper");
+const { convertToUnixPath } = require("./lib/utils");
 
 module.exports = function (source) {
     const typeStyle = "style";
-    const modulePath = this.resourcePath.replace(this.rootContext, ".");
+    const moduleRelativePath = this.resourcePath.replace(this.rootContext, ".");
+    const modulePath = convertToUnixPath(moduleRelativePath);
     return `${source};${reload({ type: typeStyle, path: modulePath })}`;
 };