Skip to content

Commit 464e3c2

Browse files
chore(all): prepare release 1.0.0-rc.1.0.2
1 parent 87837cd commit 464e3c2

File tree

9 files changed

+28
-18
lines changed

9 files changed

+28
-18
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "aurelia-framework",
3-
"version": "1.0.0-rc.1.0.1",
3+
"version": "1.0.0-rc.1.0.2",
44
"description": "The aurelia framework brings together all the required core aurelia libraries into a ready-to-go application-building platform.",
55
"keywords": [
66
"aurelia",

dist/amd/aurelia-framework.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -427,8 +427,8 @@ define(['exports', 'aurelia-dependency-injection', 'aurelia-binding', 'aurelia-m
427427
var grandParent = resourcesRelativeTo[1];
428428
var name = resource;
429429

430-
if (resource.startsWith('./') && parent !== '') {
431-
name = parent + resource.substr(1);
430+
if ((resource.startsWith('./') || resource.startsWith('../')) && parent !== '') {
431+
name = (0, _aureliaPath.join)(parent, resource);
432432
}
433433

434434
this.resourcesToLoad[name] = { moduleId: name, relativeTo: grandParent };

dist/aurelia-framework.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -410,8 +410,8 @@ export class FrameworkConfiguration {
410410
let grandParent = resourcesRelativeTo[1];
411411
let name = resource;
412412

413-
if (resource.startsWith('./') && parent !== '') {
414-
name = parent + resource.substr(1);
413+
if ((resource.startsWith('./') || resource.startsWith('../')) && parent !== '') {
414+
name = join(parent, resource);
415415
}
416416

417417
this.resourcesToLoad[name] = { moduleId: name, relativeTo: grandParent };

dist/commonjs/aurelia-framework.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -437,8 +437,8 @@ var FrameworkConfiguration = function () {
437437
var grandParent = resourcesRelativeTo[1];
438438
var name = resource;
439439

440-
if (resource.startsWith('./') && parent !== '') {
441-
name = parent + resource.substr(1);
440+
if ((resource.startsWith('./') || resource.startsWith('../')) && parent !== '') {
441+
name = (0, _aureliaPath.join)(parent, resource);
442442
}
443443

444444
this.resourcesToLoad[name] = { moduleId: name, relativeTo: grandParent };

dist/es2015/aurelia-framework.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,8 @@ export let FrameworkConfiguration = class FrameworkConfiguration {
301301
let grandParent = resourcesRelativeTo[1];
302302
let name = resource;
303303

304-
if (resource.startsWith('./') && parent !== '') {
305-
name = parent + resource.substr(1);
304+
if ((resource.startsWith('./') || resource.startsWith('../')) && parent !== '') {
305+
name = join(parent, resource);
306306
}
307307

308308
this.resourcesToLoad[name] = { moduleId: name, relativeTo: grandParent };
@@ -416,4 +416,4 @@ export * from 'aurelia-task-queue';
416416
export * from 'aurelia-path';
417417
export * from 'aurelia-pal';
418418

419-
export const LogManager = TheLogManager;
419+
export const LogManager = TheLogManager;

dist/native-modules/aurelia-framework.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ function preventActionlessFormSubmit() {
2020

2121
export var Aurelia = function () {
2222
function Aurelia(loader, container, resources) {
23-
23+
2424

2525
this.loader = loader || new PLATFORM.Loader();
2626
this.container = container || new Container().makeGlobal();
@@ -263,7 +263,7 @@ var FrameworkConfiguration = function () {
263263
function FrameworkConfiguration(aurelia) {
264264
var _this4 = this;
265265

266-
266+
267267

268268
this.aurelia = aurelia;
269269
this.container = aurelia.container;
@@ -335,8 +335,8 @@ var FrameworkConfiguration = function () {
335335
var grandParent = resourcesRelativeTo[1];
336336
var name = resource;
337337

338-
if (resource.startsWith('./') && parent !== '') {
339-
name = parent + resource.substr(1);
338+
if ((resource.startsWith('./') || resource.startsWith('../')) && parent !== '') {
339+
name = join(parent, resource);
340340
}
341341

342342
this.resourcesToLoad[name] = { moduleId: name, relativeTo: grandParent };
@@ -463,4 +463,4 @@ export * from 'aurelia-task-queue';
463463
export * from 'aurelia-path';
464464
export * from 'aurelia-pal';
465465

466-
export var LogManager = TheLogManager;
466+
export var LogManager = TheLogManager;

dist/system/aurelia-framework.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,8 +418,8 @@ System.register(['aurelia-logging', 'aurelia-dependency-injection', 'aurelia-loa
418418
var grandParent = resourcesRelativeTo[1];
419419
var name = resource;
420420

421-
if (resource.startsWith('./') && parent !== '') {
422-
name = parent + resource.substr(1);
421+
if ((resource.startsWith('./') || resource.startsWith('../')) && parent !== '') {
422+
name = join(parent, resource);
423423
}
424424

425425
this.resourcesToLoad[name] = { moduleId: name, relativeTo: grandParent };

doc/CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
<a name="1.0.0-rc.1.0.2"></a>
2+
# [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)
3+
4+
5+
### Bug Fixes
6+
7+
* **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)
8+
9+
10+
111
<a name="1.0.0-rc.1.0.1"></a>
212
# [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)
313

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "aurelia-framework",
3-
"version": "1.0.0-rc.1.0.1",
3+
"version": "1.0.0-rc.1.0.2",
44
"description": "The aurelia framework brings together all the required core aurelia libraries into a ready-to-go application-building platform.",
55
"keywords": [
66
"aurelia",

0 commit comments

Comments
 (0)