chore(all): prepare release 0.4.2

aurelia · Jan 30, 2015 · 17ea5da · 17ea5da
1 parent 4111cfe
commit 17ea5da
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 11 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-path",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "Utilities for path manipulation.",
   "keywords": [
     "aurelia",

diff --git a/dist/amd/index.js b/dist/amd/index.js
@@ -40,7 +40,7 @@ define(["exports"], function (exports) {
   }
 
   function join(path1, path2) {
-    var url1, url2, url3, i, ii;
+    var url1, url2, url3, i, ii, urlPrefix;
 
     if (!path1) {
       return path2;
@@ -50,6 +50,8 @@ define(["exports"], function (exports) {
       return path1;
     }
 
+    urlPrefix = path1.indexOf("/") === 0 ? "/" : "";
+
     url1 = path1.split("/");
     url2 = path2.split("/");
     url3 = [];
@@ -74,6 +76,7 @@ define(["exports"], function (exports) {
       }
     }
 
-    return url3.join("/").replace(/\:\//g, "://");;
+    return urlPrefix + url3.join("/").replace(/\:\//g, "://");;
   }
+  exports.__esModule = true;
 });
diff --git a/dist/commonjs/index.js b/dist/commonjs/index.js
@@ -39,7 +39,7 @@ function relativeToFile(name, file) {
 }
 
 function join(path1, path2) {
-  var url1, url2, url3, i, ii;
+  var url1, url2, url3, i, ii, urlPrefix;
 
   if (!path1) {
     return path2;
@@ -49,6 +49,8 @@ function join(path1, path2) {
     return path1;
   }
 
+  urlPrefix = path1.indexOf("/") === 0 ? "/" : "";
+
   url1 = path1.split("/");
   url2 = path2.split("/");
   url3 = [];
@@ -73,5 +75,6 @@ function join(path1, path2) {
     }
   }
 
-  return url3.join("/").replace(/\:\//g, "://");;
-}
+  return urlPrefix + url3.join("/").replace(/\:\//g, "://");;
+}
+exports.__esModule = true;
diff --git a/dist/es6/index.js b/dist/es6/index.js
@@ -45,7 +45,7 @@ export function relativeToFile(name, file){
 }
 
 export function join(path1, path2) {
-  var url1, url2, url3, i, ii;
+  var url1, url2, url3, i, ii, urlPrefix;
 
   if(!path1){
     return path2;
@@ -54,6 +54,8 @@ export function join(path1, path2) {
   if(!path2){
     return path1;
   }
+
+  urlPrefix = path1.indexOf('/') === 0 ? '/' : '';
 
   url1 = path1.split('/');
   url2 = path2.split('/');
@@ -79,5 +81,5 @@ export function join(path1, path2) {
     }
   }
 
-  return url3.join('/').replace(/\:\//g, '://');;
+  return urlPrefix + url3.join('/').replace(/\:\//g, '://');;
 }
diff --git a/dist/system/index.js b/dist/system/index.js
@@ -42,7 +42,7 @@ System.register([], function (_export) {
   }
 
   function join(path1, path2) {
-    var url1, url2, url3, i, ii;
+    var url1, url2, url3, i, ii, urlPrefix;
 
     if (!path1) {
       return path2;
@@ -52,6 +52,8 @@ System.register([], function (_export) {
       return path1;
     }
 
+    urlPrefix = path1.indexOf("/") === 0 ? "/" : "";
+
     url1 = path1.split("/");
     url2 = path2.split("/");
     url3 = [];
@@ -76,7 +78,7 @@ System.register([], function (_export) {
       }
     }
 
-    return url3.join("/").replace(/\:\//g, "://");;
+    return urlPrefix + url3.join("/").replace(/\:\//g, "://");;
   }
   return {
     setters: [],

diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
@@ -1,3 +1,11 @@
+### 0.4.2 (2015-01-30)
+
+
+#### Bug Fixes
+
+* **path:** joining an absolute path fragment with another incorrectly removes the first sla ([4111cfef](http://github.com/aurelia/path/commit/4111cfef9d00e4b6fbd2d04241d0e7c48526387c))
+
+
 ### 0.4.1 (2015-01-22)
 
 * Update compiler.

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-path",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "Utilities for path manipulation.",
   "keywords": [
     "aurelia",