Skip to content

Commit

Permalink
Merge pull request #144 from antonybudianto/update-rc6
Browse files Browse the repository at this point in the history
Update rc6
  • Loading branch information
antonybudianto7 authored Sep 1, 2016
2 parents 5e32b2f + f7aa81a commit 3753c1b
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 30 deletions.
4 changes: 4 additions & 0 deletions config/test/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ module.exports = function(config) {
files: [
'node_modules/core-js/client/shim.min.js',
'node_modules/zone.js/dist/zone.js',
'node_modules/zone.js/dist/long-stack-trace-zone.js',
'node_modules/zone.js/dist/proxy.js',
'node_modules/zone.js/dist/sync-test.js',
'node_modules/zone.js/dist/jasmine-patch.js',
'node_modules/zone.js/dist/async-test.js',
'node_modules/zone.js/dist/fake-async-test.js',
'node_modules/systemjs/dist/system.src.js'
Expand Down
50 changes: 25 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular2-starter",
"version": "1.0.0-rc.5",
"version": "1.0.0-rc.6",
"author": "Antony Budianto",
"description": "Angular 2 Starter with extensible features",
"main": "src/tmp/app/main.js",
Expand Down Expand Up @@ -42,53 +42,53 @@
"url": "https://github.com/antonybudianto/angular2-starter/issues"
},
"dependencies": {
"@angular/common": "2.0.0-rc.5",
"@angular/compiler": "2.0.0-rc.5",
"@angular/core": "2.0.0-rc.5",
"@angular/forms": "0.3.0",
"@angular/http": "2.0.0-rc.5",
"@angular/platform-browser": "2.0.0-rc.5",
"@angular/platform-browser-dynamic": "2.0.0-rc.5",
"@angular/router": "3.0.0-rc.1",
"@angular/common": "2.0.0-rc.6",
"@angular/compiler": "2.0.0-rc.6",
"@angular/core": "2.0.0-rc.6",
"@angular/forms": "2.0.0-rc.6",
"@angular/http": "2.0.0-rc.6",
"@angular/platform-browser": "2.0.0-rc.6",
"@angular/platform-browser-dynamic": "2.0.0-rc.6",
"@angular/router": "3.0.0-rc.2",
"@ngstarter/systemjs-extension": "1.0.0-rc.4",
"bootstrap-sass": "^3.3.7",
"codelyzer": "0.0.26",
"codelyzer": "0.0.28",
"core-js": "^2.4.1",
"del": "~2.2.1",
"del": "~2.2.2",
"font-awesome": "^4.6.3",
"glob": "^7.0.5",
"glob": "^7.0.6",
"gulp": "^3.9.1",
"gulp-cssnano": "^2.1.2",
"gulp-if": "~2.0.1",
"gulp-protractor": "^3.0.0",
"gulp-rev": "^7.1.0",
"gulp-rev": "^7.1.2",
"gulp-rev-replace": "^0.4.3",
"gulp-sass": "^2.3.2",
"gulp-sourcemaps": "^1.6.0",
"gulp-template": "^4.0.0",
"gulp-tslint": "6.0.2",
"gulp-tslint": "6.1.1",
"gulp-typescript": "~2.13.6",
"gulp-uglify": "~2.0.0",
"gulp-useref": "~3.1.0",
"jasmine-core": "~2.4.1",
"gulp-useref": "~3.1.2",
"jasmine-core": "~2.5.0",
"jquery": "^3.1.0",
"karma": "~1.1.2",
"karma": "~1.2.0",
"karma-coverage": "~1.1.1",
"karma-ie-launcher": "^1.0.0",
"karma-jasmine": "~1.0.2",
"karma-phantomjs-launcher": "~1.0.1",
"karma-phantomjs-launcher": "~1.0.2",
"karma-sourcemap-loader": "^0.3.7",
"lodash": "^4.14.1",
"phantomjs-prebuilt": "^2.1.9",
"lodash": "^4.15.0",
"phantomjs-prebuilt": "^2.1.12",
"remap-istanbul": "~0.6.4",
"require-dir": "~0.3.0",
"run-sequence": "~1.2.2",
"rxjs": "5.0.0-beta.6",
"systemjs": "^0.19.36",
"tslint": "~3.14.0",
"rxjs": "5.0.0-beta.11",
"systemjs": "^0.19.37",
"tslint": "~3.15.1",
"typings": "^1.3.2",
"yargs": "4.8.1",
"zone.js": "^0.6.12"
"yargs": "^5.0.0",
"zone.js": "^0.6.17"
},
"devDependencies": {
"browser-sync": "^2.14.0",
Expand Down
9 changes: 5 additions & 4 deletions src/systemjs.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,11 @@
});

ngPackageNames.forEach(function(pkgName) {
var main = global.ENV === 'testing' ? 'index.js' :
'bundles/' + pkgName + '.umd.js';

packages['@angular/'+pkgName] = { main: main, defaultExtension: 'js' };
var main = 'bundles/' + pkgName + '.umd.js';
map['@angular/' + pkgName] = 'node_modules/@angular/' + pkgName +
'/bundles/' + pkgName + '.umd.js';
map['@angular/' + pkgName+'/testing'] = 'node_modules/@angular/' + pkgName +
'/bundles/' + pkgName + '-testing.umd.js';
});

var config = {
Expand Down
2 changes: 1 addition & 1 deletion typings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
},
"globalDependencies": {
"angular-protractor": "registry:dt/angular-protractor#1.5.0+20160425143459",
"core-js": "registry:dt/core-js#0.0.0+20160602141332",
"core-js": "registry:dt/core-js#0.0.0+20160725163759",
"jasmine": "registry:dt/jasmine#2.2.0+20160621224255",
"selenium-webdriver": "registry:dt/selenium-webdriver#2.44.0+20160317120654"
}
Expand Down

0 comments on commit 3753c1b

Please sign in to comment.