Handle Windows when checking relative paths (elastic#16380) (elastic#…

…16391)
nreese · Jan 30, 2018 · 3416f43 · 3416f43
1 parent 4903ab4
commit 3416f43
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/packages/kbn-build/dist/cli.js b/packages/kbn-build/dist/cli.js
@@ -23514,7 +23514,7 @@ class Project {
   }
 
   ensureValidProjectDependency(project) {
-    const relativePathToProject = _path2.default.relative(this.path, project.path);
+    const relativePathToProject = normalizePath(_path2.default.relative(this.path, project.path));
 
     const versionInPackageJson = this.allDependencies[project.name];
     const expectedVersionInPackageJson = `${PREFIX}${relativePathToProject}`;
@@ -23554,7 +23554,12 @@ class Project {
     return (0, _scripts.installInDir)(this.path, extraArgs);
   }
 }
-exports.Project = Project;
+
+exports.Project = Project; // We normalize all path separators to `/` in generated files
+
+function normalizePath(path) {
+  return path.replace(/[\\\/]+/g, '/');
+}
 
 /***/ }),
 /* 175 */

diff --git a/packages/kbn-build/src/utils/project.js b/packages/kbn-build/src/utils/project.js
@@ -34,7 +34,7 @@ export class Project {
   }
 
   ensureValidProjectDependency(project) {
-    const relativePathToProject = path.relative(this.path, project.path);
+    const relativePathToProject = normalizePath(path.relative(this.path, project.path));
 
     const versionInPackageJson = this.allDependencies[project.name];
     const expectedVersionInPackageJson = `${PREFIX}${relativePathToProject}`;
@@ -88,3 +88,8 @@ export class Project {
     return installInDir(this.path, extraArgs);
   }
 }
+
+// We normalize all path separators to `/` in generated files
+function normalizePath(path) {
+  return path.replace(/[\\\/]+/g, '/');
+}