Skip to content

Commit 04c8a1f

Browse files
committed
feat: update to @angular rc0 packages & latest CLI (#384)
- Includes update to newest router - Completely rewrites checkbox tests
1 parent 6e4fe5e commit 04c8a1f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+862
-1141
lines changed

.travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ matrix:
4646
allow_failures:
4747
- env: "MODE=saucelabs_optional"
4848
- env: "MODE=browserstack_optional"
49+
- env: "MODE=e2e"
4950

5051
install:
5152
- npm install

angular-cli-build.js

+12-5
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,24 @@ module.exports = function(defaults) {
2020
'src/core/style'
2121
]
2222
},
23-
vendorNpmFiles: []
23+
vendorNpmFiles: [
24+
'systemjs/dist/system-polyfills.js',
25+
'systemjs/dist/system.src.js',
26+
'zone.js/dist/*.js',
27+
'es6-shim/es6-shim.js',
28+
'reflect-metadata/*.js',
29+
'rxjs/**/*.js',
30+
'@angular/**/*.js',
31+
]
2432
});
2533

26-
const ngTree = angularAppTree.toTree();
27-
const cssAutoprefixed = autoPrefixerTree(new Funnel(ngTree, {
34+
const cssAutoprefixed = autoPrefixerTree(new Funnel(angularAppTree, {
2835
include: [ '**/*.css' ]
2936
}));
3037

3138
return new MergeTree([
3239
new Funnel('src', { include: ['**/*.scss']}),
33-
angularAppTree.toTree(),
34-
cssAutoprefixed
40+
angularAppTree,
41+
cssAutoprefixed,
3542
], { overwrite: true });
3643
};

angular-cli.json

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"project": {
3+
"version": "0.0.37",
4+
"name": "material2"
5+
},
6+
"apps": [
7+
{"main": "src/main.ts", "tsconfig": "src/tsconfig.json"}
8+
],
9+
"addons": [],
10+
"packages": [],
11+
"e2e": {
12+
"protractor": {
13+
"config": "test/protractor.conf.js"
14+
}
15+
},
16+
"test": {
17+
"karma": {
18+
"config": "test/karma.conf.js"
19+
}
20+
},
21+
"defaults": {
22+
"prefix": "",
23+
"sourceDir": "src"
24+
}
25+
}

package.json

+16-10
Original file line numberDiff line numberDiff line change
@@ -25,45 +25,51 @@
2525
"node": ">= 4.2.1 < 5"
2626
},
2727
"dependencies": {
28-
"angular2": "2.0.0-beta.17",
28+
"@angular/common": "2.0.0-rc.0",
29+
"@angular/compiler": "2.0.0-rc.0",
30+
"@angular/core": "2.0.0-rc.0",
31+
"@angular/router": "2.0.0-rc.0",
32+
"@angular/http": "2.0.0-rc.0",
33+
"@angular/platform-browser": "2.0.0-rc.0",
34+
"@angular/platform-browser-dynamic": "2.0.0-rc.0",
2935
"es6-promise": "^3.0.2",
3036
"es6-shim": "^0.35.0",
31-
"reflect-metadata": "0.1.2",
37+
"reflect-metadata": "0.1.3",
3238
"rxjs": "5.0.0-beta.6",
33-
"systemjs": "0.19.20",
39+
"systemjs": "0.19.26",
3440
"zone.js": "0.6.12"
3541
},
3642
"devDependencies": {
3743
"add-stream": "^1.0.0",
38-
"angular-cli": "^0.0.31",
44+
"angular-cli": "0.0.37",
3945
"broccoli-autoprefixer": "^4.1.0",
4046
"broccoli-funnel": "^1.0.1",
4147
"broccoli-merge-trees": "^1.1.1",
4248
"browserstacktunnel-wrapper": "^1.4.2",
4349
"conventional-changelog": "^1.1.0",
44-
"ember-cli-inject-live-reload": "^1.3.0",
50+
"ember-cli-inject-live-reload": "^1.4.0",
4551
"firebase-tools": "^2.2.1",
4652
"fs-extra": "^0.26.5",
4753
"glob": "^6.0.4",
4854
"gulp": "^3.9.1",
4955
"gulp-inline-ng2-template": "^1.1.2",
50-
"jasmine-core": "^2.3.4",
56+
"jasmine-core": "^2.4.1",
5157
"js-yaml": "^3.5.2",
5258
"karma": "^0.13.15",
5359
"karma-browserstack-launcher": "^0.1.7",
54-
"karma-chrome-launcher": "^0.2.1",
60+
"karma-chrome-launcher": "^0.2.3",
5561
"karma-firefox-launcher": "^0.1.7",
56-
"karma-jasmine": "^0.3.6",
62+
"karma-jasmine": "^0.3.8",
5763
"karma-sauce-launcher": "^0.2.14",
5864
"node-sass": "^3.4.2",
59-
"protractor": "^3.1.1",
65+
"protractor": "^3.3.0",
6066
"sass": "^0.5.0",
6167
"strip-ansi": "^3.0.0",
6268
"symlink-or-copy": "^1.0.1",
6369
"ts-node": "^0.5.5",
6470
"tslint": "^3.5.0",
6571
"typescript": "^1.8.0",
66-
"typings": "^0.6.8",
72+
"typings": "^0.8.1",
6773
"which": "^1.2.4"
6874
}
6975
}

public/empty-placeholder

Whitespace-only changes.

src/components/button/button.spec.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import {it, describe, expect, beforeEach, inject, TestComponentBuilder} from 'angular2/testing';
2-
import {Component} from 'angular2/core';
3-
import {By} from 'angular2/platform/browser';
1+
import {it, describe, expect, beforeEach, inject} from '@angular/core/testing';
2+
import {TestComponentBuilder} from '@angular/compiler/testing';
3+
import {Component} from '@angular/core';
4+
import {By} from '@angular/platform-browser';
45
import {MdButton, MdAnchor} from './button';
56

67

src/components/button/button.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
ChangeDetectionStrategy,
77
ElementRef,
88
Renderer,
9-
} from 'angular2/core';
9+
} from '@angular/core';
1010

1111
// TODO(jelbourn): Ink ripples.
1212
// TODO(jelbourn): Make the `isMouseDown` stuff done with one global listener.

src/components/card/card.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Component, ViewEncapsulation, ChangeDetectionStrategy} from 'angular2/core';
1+
import {Component, ViewEncapsulation, ChangeDetectionStrategy} from '@angular/core';
22

33

44
/*

src/components/checkbox/checkbox.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ $_md-checkbox-indeterminate-checked-easing-function: cubic-bezier(0.14, 0, 0, 1)
216216
pointer-events: none;
217217
}
218218

219-
.md-checkbox {
219+
md-checkbox {
220220
cursor: pointer;
221221

222222
&:focus {

0 commit comments

Comments
 (0)