Skip to content

Commit 9830c6f

Browse files
committed
WIP NEW PACKAGHES
1 parent 6e4fe5e commit 9830c6f

Some content is hidden

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

63 files changed

+766
-642
lines changed

angular-cli-build.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,15 @@ module.exports = function(defaults) {
2424
});
2525

2626
const ngTree = angularAppTree.toTree();
27+
const ngNewPackagesRelease = new Funnel('node_modules/@angular', {destDir: '@angular'});
2728
const cssAutoprefixed = autoPrefixerTree(new Funnel(ngTree, {
2829
include: [ '**/*.css' ]
2930
}));
3031

3132
return new MergeTree([
3233
new Funnel('src', { include: ['**/*.scss']}),
3334
angularAppTree.toTree(),
34-
cssAutoprefixed
35+
cssAutoprefixed,
36+
ngNewPackagesRelease,
3537
], { overwrite: true });
3638
};

package.json

Lines changed: 10 additions & 1 deletion
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-2",
31+
"@angular/compiler": "0.0.0-2",
32+
"@angular/core": "0.0.0-2",
33+
"@angular/router": "0.0.0-0",
34+
"@angular/http": "0.0.0-0",
35+
"@angular/platform-browser": "0.0.0-2",
36+
"@angular/platform-browser-dynamic": "0.0.0-2",
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

Lines changed: 4 additions & 3 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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.spec.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@ import {
66
fakeAsync,
77
inject,
88
tick,
9-
ComponentFixture,
10-
TestComponentBuilder,
11-
} from 'angular2/testing';
12-
import {Component, DebugElement, EventEmitter} from 'angular2/core';
13-
import {By} from 'angular2/platform/browser';
9+
} from '@angular/core/testing';
10+
import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
11+
import {Component, DebugElement, EventEmitter} from '@angular/core';
12+
import {By} from '@angular/platform-browser';
1413

1514
import {MdCheckbox} from './checkbox';
1615

src/components/checkbox/checkbox.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@ import {
88
Provider,
99
Renderer,
1010
ViewEncapsulation,
11-
forwardRef
12-
} from 'angular2/core';
13-
11+
forwardRef,
12+
} from '@angular/core';
1413
import {
1514
NG_VALUE_ACCESSOR,
16-
ControlValueAccessor
17-
} from 'angular2/src/common/forms/directives/control_value_accessor';
15+
ControlValueAccessor,
16+
} from '@angular/common';
17+
18+
1819

1920
/**
2021
* Monotonically increasing integer used to auto-generate unique ids for checkbox components.

src/components/grid-list/grid-list.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Component} from 'angular2/core';
1+
import {Component} from '@angular/core';
22

33
@Component({
44
selector: 'md-grid-list',

src/components/icon/fake-svgs.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {
22
Response,
3-
ResponseOptions} from 'angular2/http';
3+
ResponseOptions} from '@angular/http';
44

55
/**
66
* Fake URLs and associated SVG documents used by tests.

src/components/icon/icon-registry.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import {Injectable} from 'angular2/core';
2-
import {BaseException} from 'angular2/src/facade/exceptions';
3-
import {Http} from 'angular2/http';
1+
import {Injectable} from '@angular/core';
2+
import {Http} from '@angular/http';
43
import {Observable} from 'rxjs/Rx';
4+
import {BaseException} from '../../core/errors/base-exception';
55

66

77
/** Exception thrown when attempting to load an icon with a name that cannot be found. */

0 commit comments

Comments
 (0)