Skip to content

Commit

Permalink
feat: update to @angular rc0 packages & latest CLI (#384)
Browse files Browse the repository at this point in the history
- Includes update to newest router
- Completely rewrites checkbox tests
  • Loading branch information
jelbourn committed May 4, 2016
1 parent 6e4fe5e commit 04c8a1f
Show file tree
Hide file tree
Showing 69 changed files with 862 additions and 1,141 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ matrix:
allow_failures:
- env: "MODE=saucelabs_optional"
- env: "MODE=browserstack_optional"
- env: "MODE=e2e"

install:
- npm install
Expand Down
17 changes: 12 additions & 5 deletions angular-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,24 @@ module.exports = function(defaults) {
'src/core/style'
]
},
vendorNpmFiles: []
vendorNpmFiles: [
'systemjs/dist/system-polyfills.js',
'systemjs/dist/system.src.js',
'zone.js/dist/*.js',
'es6-shim/es6-shim.js',
'reflect-metadata/*.js',
'rxjs/**/*.js',
'@angular/**/*.js',
]
});

const ngTree = angularAppTree.toTree();
const cssAutoprefixed = autoPrefixerTree(new Funnel(ngTree, {
const cssAutoprefixed = autoPrefixerTree(new Funnel(angularAppTree, {
include: [ '**/*.css' ]
}));

return new MergeTree([
new Funnel('src', { include: ['**/*.scss']}),
angularAppTree.toTree(),
cssAutoprefixed
angularAppTree,
cssAutoprefixed,
], { overwrite: true });
};
25 changes: 25 additions & 0 deletions angular-cli.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"project": {
"version": "0.0.37",
"name": "material2"
},
"apps": [
{"main": "src/main.ts", "tsconfig": "src/tsconfig.json"}
],
"addons": [],
"packages": [],
"e2e": {
"protractor": {
"config": "test/protractor.conf.js"
}
},
"test": {
"karma": {
"config": "test/karma.conf.js"
}
},
"defaults": {
"prefix": "",
"sourceDir": "src"
}
}
26 changes: 16 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,45 +25,51 @@
"node": ">= 4.2.1 < 5"
},
"dependencies": {
"angular2": "2.0.0-beta.17",
"@angular/common": "2.0.0-rc.0",
"@angular/compiler": "2.0.0-rc.0",
"@angular/core": "2.0.0-rc.0",
"@angular/router": "2.0.0-rc.0",
"@angular/http": "2.0.0-rc.0",
"@angular/platform-browser": "2.0.0-rc.0",
"@angular/platform-browser-dynamic": "2.0.0-rc.0",
"es6-promise": "^3.0.2",
"es6-shim": "^0.35.0",
"reflect-metadata": "0.1.2",
"reflect-metadata": "0.1.3",
"rxjs": "5.0.0-beta.6",
"systemjs": "0.19.20",
"systemjs": "0.19.26",
"zone.js": "0.6.12"
},
"devDependencies": {
"add-stream": "^1.0.0",
"angular-cli": "^0.0.31",
"angular-cli": "0.0.37",
"broccoli-autoprefixer": "^4.1.0",
"broccoli-funnel": "^1.0.1",
"broccoli-merge-trees": "^1.1.1",
"browserstacktunnel-wrapper": "^1.4.2",
"conventional-changelog": "^1.1.0",
"ember-cli-inject-live-reload": "^1.3.0",
"ember-cli-inject-live-reload": "^1.4.0",
"firebase-tools": "^2.2.1",
"fs-extra": "^0.26.5",
"glob": "^6.0.4",
"gulp": "^3.9.1",
"gulp-inline-ng2-template": "^1.1.2",
"jasmine-core": "^2.3.4",
"jasmine-core": "^2.4.1",
"js-yaml": "^3.5.2",
"karma": "^0.13.15",
"karma-browserstack-launcher": "^0.1.7",
"karma-chrome-launcher": "^0.2.1",
"karma-chrome-launcher": "^0.2.3",
"karma-firefox-launcher": "^0.1.7",
"karma-jasmine": "^0.3.6",
"karma-jasmine": "^0.3.8",
"karma-sauce-launcher": "^0.2.14",
"node-sass": "^3.4.2",
"protractor": "^3.1.1",
"protractor": "^3.3.0",
"sass": "^0.5.0",
"strip-ansi": "^3.0.0",
"symlink-or-copy": "^1.0.1",
"ts-node": "^0.5.5",
"tslint": "^3.5.0",
"typescript": "^1.8.0",
"typings": "^0.6.8",
"typings": "^0.8.1",
"which": "^1.2.4"
}
}
Empty file added public/empty-placeholder
Empty file.
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 04c8a1f

Please sign in to comment.