From 0b964222493a83f79b471e1ad387088a6f060635 Mon Sep 17 00:00:00 2001 From: Mike Brocchi Date: Wed, 31 Aug 2016 22:48:42 -0400 Subject: [PATCH] chore: upgrade angular version to rc6 --- .../ng2/blueprints/ng2/files/__path__/test.ts | 3 +- addon/ng2/blueprints/ng2/files/package.json | 29 ++++++++++--------- addon/ng2/models/webpack-build-production.ts | 3 +- package.json | 11 ++++--- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/addon/ng2/blueprints/ng2/files/__path__/test.ts b/addon/ng2/blueprints/ng2/files/__path__/test.ts index a85e8bb7823d..1a5d355fda48 100644 --- a/addon/ng2/blueprints/ng2/files/__path__/test.ts +++ b/addon/ng2/blueprints/ng2/files/__path__/test.ts @@ -1,10 +1,11 @@ import './polyfills.ts'; import 'zone.js/dist/long-stack-trace-zone'; +import 'zone.js/dist/proxy.js'; +import 'zone.js/dist/sync-test'; import 'zone.js/dist/jasmine-patch'; import 'zone.js/dist/async-test'; import 'zone.js/dist/fake-async-test'; -import 'zone.js/dist/sync-test'; // Unfortunately there's no typing for the `__karma__` variable. Just declare it as any. declare var __karma__: any; diff --git a/addon/ng2/blueprints/ng2/files/package.json b/addon/ng2/blueprints/ng2/files/package.json index bddfdd9563d3..9083e7441c8a 100644 --- a/addon/ng2/blueprints/ng2/files/package.json +++ b/addon/ng2/blueprints/ng2/files/package.json @@ -12,21 +12,21 @@ }, "private": true, "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", - "core-js": "^2.4.0", + "@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", + "core-js": "^2.4.1", "rxjs": "5.0.0-beta.11", "ts-helpers": "^1.1.1", - "zone.js": "0.6.12" + "zone.js": "^0.6.17" }, "devDependencies": {<% if(isMobile) { %> - "@angular/platform-server": "2.0.0-rc.4", + "@angular/platform-server": "2.0.0-rc.6", "@angular/service-worker": "0.2.0", "@angular/app-shell": "0.0.0", "angular2-universal":"0.104.5", @@ -38,9 +38,10 @@ "codelyzer": "~0.0.26", "jasmine-core": "2.4.1", "jasmine-spec-reporter": "2.5.0", - "karma": "0.13.22", - "karma-chrome-launcher": "0.2.3", - "karma-jasmine": "0.3.8", + "karma": "1.2.0", + "karma-chrome-launcher": "^2.0.0", + "karma-cli": "^1.0.1", + "karma-jasmine": "^1.0.2", "karma-remap-istanbul": "^0.2.1", "protractor": "4.0.3", "ts-node": "1.2.1", diff --git a/addon/ng2/models/webpack-build-production.ts b/addon/ng2/models/webpack-build-production.ts index 4b41cefee76e..da7c9b636281 100644 --- a/addon/ng2/models/webpack-build-production.ts +++ b/addon/ng2/models/webpack-build-production.ts @@ -15,9 +15,8 @@ export const getWebpackProdConfigPartial = function(projectRoot: string, appConf }, plugins: [ new WebpackMd5Hash(), - new webpack.optimize.DedupePlugin(), new webpack.optimize.UglifyJsPlugin({ - mangle: { screw_ie8 : true, keep_fnames: true }, + mangle: { screw_ie8 : true }, compress: { screw_ie8: true } }), new CompressionPlugin({ diff --git a/package.json b/package.json index f95f508de2ac..94a2fdc0f5c6 100644 --- a/package.json +++ b/package.json @@ -40,11 +40,11 @@ }, "homepage": "https://github.com/angular/angular-cli", "dependencies": { - "@angular/compiler": "^2.0.0-rc.5", + "@angular-cli/ast-tools": "^1.0.0", + "@angular/compiler": "^2.0.0-rc.6", "@angular/compiler-cli": "^0.5.0", - "@angular/core": "^2.0.0-rc.5", + "@angular/core": "^2.0.0-rc.6", "@angular/tsc-wrapped": "^0.2.2", - "@angular-cli/ast-tools": "^1.0.0", "angular2-template-loader": "^0.5.0", "awesome-typescript-loader": "^2.2.1", "chalk": "^1.1.3", @@ -62,6 +62,7 @@ "expose-loader": "^0.7.1", "file-loader": "^0.8.5", "fs-extra": "^0.30.0", + "fs.realpath": "^1.0.0", "glob": "^7.0.3", "handlebars": "^4.0.5", "html-webpack-plugin": "^2.19.0", @@ -79,8 +80,6 @@ "offline-plugin": "^3.4.1", "opn": "4.0.1", "parse5": "^2.1.5", - "phantomjs-polyfill": "0.0.2", - "phantomjs-prebuilt": "^2.1.7", "postcss-loader": "^0.9.1", "protractor": "^3.3.0", "raw-loader": "^0.5.1", @@ -104,7 +103,7 @@ "typedoc": "^0.4.2", "typescript": "2.0.0", "url-loader": "^0.5.7", - "webpack": "2.1.0-beta.21", + "webpack": "2.1.0-beta.19", "webpack-dev-server": "2.1.0-beta.0", "webpack-md5-hash": "0.0.5", "webpack-merge": "^0.14.0"