Skip to content

Commit

Permalink
fix($browser): Fixed issue Bundle not working with angular-rc.1
Browse files Browse the repository at this point in the history
  • Loading branch information
akserg committed May 26, 2016
1 parent 0281839 commit 3fa1f9a
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 25 deletions.
22 changes: 12 additions & 10 deletions bundles/ng2-slim-loading-bar.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
System.registerDynamic("src/component", ["angular2/core", "angular2/src/facade/lang", "angular2/common", "./service"], true, function($__require, exports, module) {
System.registerDynamic("src/component", ["@angular/core", "@angular/common/src/facade/lang", "@angular/common", "./service"], true, function($__require, exports, module) {
"use strict";
;
var define,
global = this,
Expand All @@ -19,9 +20,9 @@ System.registerDynamic("src/component", ["angular2/core", "angular2/src/facade/l
if (typeof Reflect === "object" && typeof Reflect.metadata === "function")
return Reflect.metadata(k, v);
};
var core_1 = $__require('angular2/core');
var lang_1 = $__require('angular2/src/facade/lang');
var common_1 = $__require('angular2/common');
var core_1 = $__require('@angular/core');
var lang_1 = $__require('@angular/common/src/facade/lang');
var common_1 = $__require('@angular/common');
var service_1 = $__require('./service');
var SlimLoadingBar = (function() {
function SlimLoadingBar(service) {
Expand Down Expand Up @@ -67,12 +68,13 @@ System.registerDynamic("src/component", ["angular2/core", "angular2/src/facade/l
template: "\n<div class=\"slim-loading-bar\">\n <div class=\"slim-loading-bar-progress\" [style.width]=\"progress\" [style.backgroundColor]=\"color\" [style.color]=\"color\"\n [style.height]=\"height\" [style.opacity]=\"show ? '1' : '0'\"></div>\n</div>"
}), __metadata('design:paramtypes', [service_1.SlimLoadingBarService])], SlimLoadingBar);
return SlimLoadingBar;
})();
}());
exports.SlimLoadingBar = SlimLoadingBar;
return module.exports;
});

System.registerDynamic("src/service", ["angular2/core", "angular2/src/facade/lang", "rxjs/Observable"], true, function($__require, exports, module) {
System.registerDynamic("src/service", ["@angular/core", "@angular/common/src/facade/lang", "rxjs/Observable"], true, function($__require, exports, module) {
"use strict";
;
var define,
global = this,
Expand All @@ -93,8 +95,8 @@ System.registerDynamic("src/service", ["angular2/core", "angular2/src/facade/lan
if (typeof Reflect === "object" && typeof Reflect.metadata === "function")
return Reflect.metadata(k, v);
};
var core_1 = $__require('angular2/core');
var lang_1 = $__require('angular2/src/facade/lang');
var core_1 = $__require('@angular/core');
var lang_1 = $__require('@angular/common/src/facade/lang');
var Observable_1 = $__require('rxjs/Observable');
(function(SlimLoadingBarEventType) {
SlimLoadingBarEventType[SlimLoadingBarEventType["PROGRESS"] = 0] = "PROGRESS";
Expand All @@ -109,7 +111,7 @@ System.registerDynamic("src/service", ["angular2/core", "angular2/src/facade/lan
this.value = value;
}
return SlimLoadingBarEvent;
})();
}());
exports.SlimLoadingBarEvent = SlimLoadingBarEvent;
var SlimLoadingBarService = (function() {
function SlimLoadingBarService() {
Expand Down Expand Up @@ -223,7 +225,7 @@ System.registerDynamic("src/service", ["angular2/core", "angular2/src/facade/lan
};
SlimLoadingBarService = __decorate([core_1.Injectable(), __metadata('design:paramtypes', [])], SlimLoadingBarService);
return SlimLoadingBarService;
})();
}());
exports.SlimLoadingBarService = SlimLoadingBarService;
return module.exports;
});
Expand Down
2 changes: 1 addition & 1 deletion bundles/ng2-slim-loading-bar.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions make.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ var config = {
module: 'cjs'
},
map: {
typescript: './node_modules/typescript/lib/typescript.js',
angular2: path.resolve('node_modules/angular2'),
rxjs: path.resolve('node_modules/rxjs')
'typescript': './node_modules/typescript/lib/typescript.js',
'@angular': path.resolve('node_modules/@angular'),
'rxjs': path.resolve('node_modules/rxjs')
},
paths: {
'*': '*.js'
},
meta: {
'node_modules/angular2/*': { build: false },
'node_modules/@angular/*': { build: false },
'node_modules/rxjs/*': { build: false }
},
};
Expand Down
10 changes: 6 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"main": "ng2-slim-loading-bar.js",
"typings": "./ng2-slim-loading-bar.d.ts",
"homepage": "https://github.com/akserg/ng2-slim-loading-bar",
"devDependencies": {
"dependencies": {
"@angular/common": "^2.0.0-rc.1",
"@angular/compiler": "^2.0.0-rc.1",
"@angular/core": "^2.0.0-rc.1",
Expand All @@ -38,7 +38,9 @@
"es6-shim": "~0.35.0",
"reflect-metadata": "0.1.2",
"rxjs": "5.0.0-beta.6",
"zone.js": "~0.6.12",
"zone.js": "~0.6.12"
},
"devDependencies": {
"jasmine-core": "~2.3.4",
"karma": "~0.13.15",
"karma-chrome-launcher": "~0.2.2",
Expand All @@ -49,8 +51,8 @@
"systemjs": "~0.19.6",
"systemjs-builder": "^0.15.6",
"tsd": "^0.6.5",
"typescript": "~1.7.3",
"typings": "^0.6.8",
"typescript": "^1.8.7",
"typings": "^0.8.1",
"uglify-js": "^2.6.2",
"commitizen": "^2.7.6",
"cz-conventional-changelog": "^1.1.5"
Expand Down
9 changes: 3 additions & 6 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,9 @@
"moduleResolution": "node",
"sourceMap": true
},
"files": [
"exclude": [
"node_modules",
"typings/main.d.ts",
"ng2-slim-loading-bar.ts",
"./src/component.ts",
"./src/service.ts",
"./tests/component.spec.ts",
"./tests/service.spec.ts"
"typings/main"
]
}

0 comments on commit 3fa1f9a

Please sign in to comment.