Skip to content

Commit 6385322

Browse files
committed
feat: update material to new @angular packages
1 parent 6e4fe5e commit 6385322

Some content is hidden

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

64 files changed

+761
-987
lines changed

angular-cli-build.js

+9-1
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,21 @@ module.exports = function(defaults) {
2424
});
2525

2626
const ngTree = angularAppTree.toTree();
27+
const ngNewPackagesRelease = new Funnel('node_modules/@angular', {destDir: '@angular'});
28+
const rxjs = new Funnel('node_modules/rxjs', {destDir: 'rxjs'});
29+
const zonejs = new Funnel('node_modules/zone.js', {destDir: 'zonejs'});
30+
const reflectMetadata = new Funnel('node_modules/reflect-metadata', {destDir: 'reflect-metadata'});
2731
const cssAutoprefixed = autoPrefixerTree(new Funnel(ngTree, {
2832
include: [ '**/*.css' ]
2933
}));
3034

3135
return new MergeTree([
3236
new Funnel('src', { include: ['**/*.scss']}),
3337
angularAppTree.toTree(),
34-
cssAutoprefixed
38+
cssAutoprefixed,
39+
ngNewPackagesRelease,
40+
rxjs,
41+
zonejs,
42+
reflectMetadata,
3543
], { overwrite: true });
3644
};

package.json

+10-1
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,20 @@
2626
},
2727
"dependencies": {
2828
"angular2": "2.0.0-beta.17",
29+
30+
"@angular/common": "0.0.0-5",
31+
"@angular/compiler": "0.0.0-5",
32+
"@angular/core": "0.0.0-5",
33+
"@angular/router": "0.0.0-5",
34+
"@angular/http": "0.0.0-5",
35+
"@angular/platform-browser": "0.0.0-5",
36+
"@angular/platform-browser-dynamic": "0.0.0-5",
37+
2938
"es6-promise": "^3.0.2",
3039
"es6-shim": "^0.35.0",
3140
"reflect-metadata": "0.1.2",
3241
"rxjs": "5.0.0-beta.6",
33-
"systemjs": "0.19.20",
42+
"systemjs": "0.19.26",
3443
"zone.js": "0.6.12"
3544
},
3645
"devDependencies": {

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)