Skip to content

Commit

Permalink
feat: update material to new @angular packages
Browse files Browse the repository at this point in the history
  • Loading branch information
jelbourn committed May 2, 2016
1 parent 6e4fe5e commit 35f270b
Show file tree
Hide file tree
Showing 64 changed files with 742 additions and 998 deletions.
10 changes: 9 additions & 1 deletion angular-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,21 @@ module.exports = function(defaults) {
});

const ngTree = angularAppTree.toTree();
const ngNewPackagesRelease = new Funnel('node_modules/@angular', {destDir: '@angular'});
const rxjs = new Funnel('node_modules/rxjs', {destDir: 'rxjs'});
const zonejs = new Funnel('node_modules/zone.js', {destDir: 'zonejs'});
const reflectMetadata = new Funnel('node_modules/reflect-metadata', {destDir: 'reflect-metadata'});
const cssAutoprefixed = autoPrefixerTree(new Funnel(ngTree, {
include: [ '**/*.css' ]
}));

return new MergeTree([
new Funnel('src', { include: ['**/*.scss']}),
angularAppTree.toTree(),
cssAutoprefixed
cssAutoprefixed,
ngNewPackagesRelease,
rxjs,
zonejs,
reflectMetadata,
], { overwrite: true });
};
11 changes: 10 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,20 @@
},
"dependencies": {
"angular2": "2.0.0-beta.17",

"@angular/common": "0.0.0-5",
"@angular/compiler": "0.0.0-5",
"@angular/core": "0.0.0-5",
"@angular/router": "0.0.0-5",
"@angular/http": "0.0.0-5",
"@angular/platform-browser": "0.0.0-5",
"@angular/platform-browser-dynamic": "0.0.0-5",

"es6-promise": "^3.0.2",
"es6-shim": "^0.35.0",
"reflect-metadata": "0.1.2",
"rxjs": "5.0.0-beta.6",
"systemjs": "0.19.20",
"systemjs": "0.19.26",
"zone.js": "0.6.12"
},
"devDependencies": {
Expand Down
7 changes: 4 additions & 3 deletions src/components/button/button.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import {it, describe, expect, beforeEach, inject, TestComponentBuilder} from 'angular2/testing';
import {Component} from 'angular2/core';
import {By} from 'angular2/platform/browser';
import {it, describe, expect, beforeEach, inject} from '@angular/core/testing';
import {TestComponentBuilder} from '@angular/compiler/testing';
import {Component} from '@angular/core';
import {By} from '@angular/platform-browser';
import {MdButton, MdAnchor} from './button';


Expand Down
2 changes: 1 addition & 1 deletion src/components/button/button.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
ChangeDetectionStrategy,
ElementRef,
Renderer,
} from 'angular2/core';
} from '@angular/core';

// TODO(jelbourn): Ink ripples.
// TODO(jelbourn): Make the `isMouseDown` stuff done with one global listener.
Expand Down
2 changes: 1 addition & 1 deletion src/components/card/card.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Component, ViewEncapsulation, ChangeDetectionStrategy} from 'angular2/core';
import {Component, ViewEncapsulation, ChangeDetectionStrategy} from '@angular/core';


/*
Expand Down
2 changes: 1 addition & 1 deletion src/components/checkbox/checkbox.scss
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ $_md-checkbox-indeterminate-checked-easing-function: cubic-bezier(0.14, 0, 0, 1)
pointer-events: none;
}

.md-checkbox {
md-checkbox {
cursor: pointer;

&:focus {
Expand Down
Loading

0 comments on commit 35f270b

Please sign in to comment.