chore(all): prepare release 1.0.0-rc.1.0.2

an0o0nym · Jul 12, 2016 · 464e3c2 · 464e3c2
1 parent 87837cd
commit 464e3c2
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 18 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-framework",
-  "version": "1.0.0-rc.1.0.1",
+  "version": "1.0.0-rc.1.0.2",
   "description": "The aurelia framework brings together all the required core aurelia libraries into a ready-to-go application-building platform.",
   "keywords": [
     "aurelia",

diff --git a/dist/amd/aurelia-framework.js b/dist/amd/aurelia-framework.js
@@ -427,8 +427,8 @@ define(['exports', 'aurelia-dependency-injection', 'aurelia-binding', 'aurelia-m
         var grandParent = resourcesRelativeTo[1];
         var name = resource;
 
-        if (resource.startsWith('./') && parent !== '') {
-          name = parent + resource.substr(1);
+        if ((resource.startsWith('./') || resource.startsWith('../')) && parent !== '') {
+          name = (0, _aureliaPath.join)(parent, resource);
         }
 
         this.resourcesToLoad[name] = { moduleId: name, relativeTo: grandParent };

diff --git a/dist/aurelia-framework.js b/dist/aurelia-framework.js
@@ -410,8 +410,8 @@ export class FrameworkConfiguration {
       let grandParent = resourcesRelativeTo[1];
       let name = resource;
 
-      if (resource.startsWith('./') && parent !== '') {
-        name = parent + resource.substr(1);
+      if ((resource.startsWith('./') || resource.startsWith('../')) && parent !== '') {
+        name = join(parent, resource);
       }
 
       this.resourcesToLoad[name] = { moduleId: name, relativeTo: grandParent };

diff --git a/dist/commonjs/aurelia-framework.js b/dist/commonjs/aurelia-framework.js
@@ -437,8 +437,8 @@ var FrameworkConfiguration = function () {
       var grandParent = resourcesRelativeTo[1];
       var name = resource;
 
-      if (resource.startsWith('./') && parent !== '') {
-        name = parent + resource.substr(1);
+      if ((resource.startsWith('./') || resource.startsWith('../')) && parent !== '') {
+        name = (0, _aureliaPath.join)(parent, resource);
       }
 
       this.resourcesToLoad[name] = { moduleId: name, relativeTo: grandParent };

diff --git a/dist/es2015/aurelia-framework.js b/dist/es2015/aurelia-framework.js
@@ -301,8 +301,8 @@ export let FrameworkConfiguration = class FrameworkConfiguration {
       let grandParent = resourcesRelativeTo[1];
       let name = resource;
 
-      if (resource.startsWith('./') && parent !== '') {
-        name = parent + resource.substr(1);
+      if ((resource.startsWith('./') || resource.startsWith('../')) && parent !== '') {
+        name = join(parent, resource);
       }
 
       this.resourcesToLoad[name] = { moduleId: name, relativeTo: grandParent };
@@ -416,4 +416,4 @@ export * from 'aurelia-task-queue';
 export * from 'aurelia-path';
 export * from 'aurelia-pal';
 
-export const LogManager = TheLogManager;
+export const LogManager = TheLogManager;
diff --git a/dist/native-modules/aurelia-framework.js b/dist/native-modules/aurelia-framework.js
@@ -20,7 +20,7 @@ function preventActionlessFormSubmit() {
 
 export var Aurelia = function () {
   function Aurelia(loader, container, resources) {
-
+    
 
     this.loader = loader || new PLATFORM.Loader();
     this.container = container || new Container().makeGlobal();
@@ -263,7 +263,7 @@ var FrameworkConfiguration = function () {
   function FrameworkConfiguration(aurelia) {
     var _this4 = this;
 
-
+    
 
     this.aurelia = aurelia;
     this.container = aurelia.container;
@@ -335,8 +335,8 @@ var FrameworkConfiguration = function () {
       var grandParent = resourcesRelativeTo[1];
       var name = resource;
 
-      if (resource.startsWith('./') && parent !== '') {
-        name = parent + resource.substr(1);
+      if ((resource.startsWith('./') || resource.startsWith('../')) && parent !== '') {
+        name = join(parent, resource);
       }
 
       this.resourcesToLoad[name] = { moduleId: name, relativeTo: grandParent };
@@ -463,4 +463,4 @@ export * from 'aurelia-task-queue';
 export * from 'aurelia-path';
 export * from 'aurelia-pal';
 
-export var LogManager = TheLogManager;
+export var LogManager = TheLogManager;
diff --git a/dist/system/aurelia-framework.js b/dist/system/aurelia-framework.js
@@ -418,8 +418,8 @@ System.register(['aurelia-logging', 'aurelia-dependency-injection', 'aurelia-loa
             var grandParent = resourcesRelativeTo[1];
             var name = resource;
 
-            if (resource.startsWith('./') && parent !== '') {
-              name = parent + resource.substr(1);
+            if ((resource.startsWith('./') || resource.startsWith('../')) && parent !== '') {
+              name = join(parent, resource);
             }
 
             this.resourcesToLoad[name] = { moduleId: name, relativeTo: grandParent };

diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
@@ -1,3 +1,13 @@
+<a name="1.0.0-rc.1.0.2"></a>
+# [1.0.0-rc.1.0.2](https://github.com/aurelia/framework/compare/1.0.0-rc.1.0.1...v1.0.0-rc.1.0.2) (2016-07-12)
+
+
+### Bug Fixes
+
+* **framework-configuration:** bug in path joining for resources ([b462a79](https://github.com/aurelia/framework/commit/b462a79)), closes [#434](https://github.com/aurelia/framework/issues/434)
+
+
+
 <a name="1.0.0-rc.1.0.1"></a>
 # [1.0.0-rc.1.0.1](https://github.com/aurelia/framework/compare/1.0.0-rc.1.0.0...v1.0.0-rc.1.0.1) (2016-06-30)
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-framework",
-  "version": "1.0.0-rc.1.0.1",
+  "version": "1.0.0-rc.1.0.2",
   "description": "The aurelia framework brings together all the required core aurelia libraries into a ready-to-go application-building platform.",
   "keywords": [
     "aurelia",