Skip to content

Commit a28f721

Browse files
committed
chore: upgrade angular version to rc6
1 parent 440d767 commit a28f721

File tree

5 files changed

+39
-23
lines changed

5 files changed

+39
-23
lines changed

__name__.module.spec.ts

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/* tslint:disable:no-unused-variable */
2+
3+
import { TestBed, async } from '@angular/core/testing';
4+
import <%= classifiedModuleName %>Module from './<%= dasherizedModuleName %>.module';
5+
6+
describe('<%= classifiedModuleName %>Module', () => {
7+
let <%= camelizedModuleName %>Module;
8+
9+
beforeEach(() => {
10+
<%= camelizedModuleName %>Module = new <%= classifiedModuleName %>Module();
11+
});
12+
13+
it('should create an instance', () => {
14+
expect(<%= camelizedModuleName %>Module).toBeTruthy();
15+
})
16+
});

addon/ng2/blueprints/ng2/files/__path__/test.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import './polyfills.ts';
22

33
import 'zone.js/dist/long-stack-trace-zone';
4+
import 'zone.js/dist/proxy.js';
5+
import 'zone.js/dist/sync-test';
46
import 'zone.js/dist/jasmine-patch';
57
import 'zone.js/dist/async-test';
68
import 'zone.js/dist/fake-async-test';
7-
import 'zone.js/dist/sync-test';
89

910
// Unfortunately there's no typing for the `__karma__` variable. Just declare it as any.
1011
declare var __karma__: any;

addon/ng2/blueprints/ng2/files/package.json

+15-14
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@
1212
},
1313
"private": true,
1414
"dependencies": {
15-
"@angular/common": "2.0.0-rc.5",
16-
"@angular/compiler": "2.0.0-rc.5",
17-
"@angular/core": "2.0.0-rc.5",
18-
"@angular/forms": "0.3.0",
19-
"@angular/http": "2.0.0-rc.5",
20-
"@angular/platform-browser": "2.0.0-rc.5",
21-
"@angular/platform-browser-dynamic": "2.0.0-rc.5",
22-
"@angular/router": "3.0.0-rc.1",
23-
"core-js": "^2.4.0",
15+
"@angular/common": "2.0.0-rc.6",
16+
"@angular/compiler": "2.0.0-rc.6",
17+
"@angular/core": "2.0.0-rc.6",
18+
"@angular/forms": "2.0.0-rc.6",
19+
"@angular/http": "2.0.0-rc.6",
20+
"@angular/platform-browser": "2.0.0-rc.6",
21+
"@angular/platform-browser-dynamic": "2.0.0-rc.6",
22+
"@angular/router": "3.0.0-rc.2",
23+
"core-js": "^2.4.1",
2424
"rxjs": "5.0.0-beta.11",
2525
"ts-helpers": "^1.1.1",
26-
"zone.js": "0.6.12"
26+
"zone.js": "^0.6.17"
2727
},
2828
"devDependencies": {<% if(isMobile) { %>
29-
"@angular/platform-server": "2.0.0-rc.4",
29+
"@angular/platform-server": "2.0.0-rc.6",
3030
"@angular/service-worker": "0.2.0",
3131
"@angular/app-shell": "0.0.0",
3232
"angular2-universal":"0.104.5",
@@ -38,9 +38,10 @@
3838
"codelyzer": "~0.0.26",
3939
"jasmine-core": "2.4.1",
4040
"jasmine-spec-reporter": "2.5.0",
41-
"karma": "0.13.22",
42-
"karma-chrome-launcher": "0.2.3",
43-
"karma-jasmine": "0.3.8",
41+
"karma": "1.2.0",
42+
"karma-chrome-launcher": "^2.0.0",
43+
"karma-cli": "^1.0.1",
44+
"karma-jasmine": "^1.0.2",
4445
"karma-remap-istanbul": "^0.2.1",
4546
"protractor": "4.0.3",
4647
"ts-node": "1.2.1",

addon/ng2/models/webpack-build-production.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ export const getWebpackProdConfigPartial = function(projectRoot: string, appConf
1515
},
1616
plugins: [
1717
new WebpackMd5Hash(),
18-
new webpack.optimize.DedupePlugin(),
1918
new webpack.optimize.UglifyJsPlugin(<any>{
20-
mangle: { screw_ie8 : true, keep_fnames: true },
19+
mangle: { screw_ie8 : true },
2120
compress: { screw_ie8: true }
2221
}),
2322
new CompressionPlugin({

package.json

+5-6
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@
4040
},
4141
"homepage": "https://github.com/angular/angular-cli",
4242
"dependencies": {
43-
"@angular/compiler": "^2.0.0-rc.5",
43+
"@angular-cli/ast-tools": "^1.0.0",
44+
"@angular/compiler": "^2.0.0-rc.6",
4445
"@angular/compiler-cli": "^0.5.0",
45-
"@angular/core": "^2.0.0-rc.5",
46+
"@angular/core": "^2.0.0-rc.6",
4647
"@angular/tsc-wrapped": "^0.2.2",
47-
"@angular-cli/ast-tools": "^1.0.0",
4848
"angular2-template-loader": "^0.5.0",
4949
"awesome-typescript-loader": "^2.2.1",
5050
"chalk": "^1.1.3",
@@ -62,6 +62,7 @@
6262
"expose-loader": "^0.7.1",
6363
"file-loader": "^0.8.5",
6464
"fs-extra": "^0.30.0",
65+
"fs.realpath": "^1.0.0",
6566
"glob": "^7.0.3",
6667
"handlebars": "^4.0.5",
6768
"html-webpack-plugin": "^2.19.0",
@@ -79,8 +80,6 @@
7980
"offline-plugin": "^3.4.1",
8081
"opn": "4.0.1",
8182
"parse5": "^2.1.5",
82-
"phantomjs-polyfill": "0.0.2",
83-
"phantomjs-prebuilt": "^2.1.7",
8483
"postcss-loader": "^0.9.1",
8584
"protractor": "^3.3.0",
8685
"raw-loader": "^0.5.1",
@@ -104,7 +103,7 @@
104103
"typedoc": "^0.4.2",
105104
"typescript": "2.0.0",
106105
"url-loader": "^0.5.7",
107-
"webpack": "2.1.0-beta.21",
106+
"webpack": "2.1.0-beta.19",
108107
"webpack-dev-server": "2.1.0-beta.0",
109108
"webpack-md5-hash": "0.0.5",
110109
"webpack-merge": "^0.14.0"

0 commit comments

Comments
 (0)