Permalink
Browse files

feat: update to @angular rc0 packages & latest CLI (#384)

- Includes update to newest router
- Completely rewrites checkbox tests
  • Loading branch information...
1 parent 6e4fe5e commit 04c8a1f8301263f415f4ee6345b0cccf3ab31b03 @jelbourn jelbourn committed May 4, 2016
Showing with 862 additions and 1,141 deletions.
  1. +1 −0 .travis.yml
  2. +12 −5 angular-cli-build.js
  3. +25 −0 angular-cli.json
  4. +16 −10 package.json
  5. 0 public/empty-placeholder
  6. +4 −3 src/components/button/button.spec.ts
  7. +1 −1 src/components/button/button.ts
  8. +1 −1 src/components/card/card.ts
  9. +1 −1 src/components/checkbox/checkbox.scss
  10. +354 −665 src/components/checkbox/checkbox.spec.ts
  11. +22 −11 src/components/checkbox/checkbox.ts
  12. +1 −1 src/components/grid-list/grid-list.ts
  13. +1 −1 src/components/icon/fake-svgs.ts
  14. +9 −10 src/components/icon/icon-registry.ts
  15. +5 −5 src/components/icon/icon.spec.ts
  16. +5 −6 src/components/icon/icon.ts
  17. +8 −8 src/components/input/input.spec.ts
  18. +10 −11 src/components/input/input.ts
  19. +4 −4 src/components/list/list.spec.ts
  20. +13 −2 src/components/list/list.ts
  21. +4 −3 src/components/progress-bar/progress-bar.spec.ts
  22. +3 −8 src/components/progress-bar/progress-bar.ts
  23. +4 −3 src/components/progress-circle/progress-circle.spec.ts
  24. +1 −1 src/components/progress-circle/progress-circle.ts
  25. +4 −4 src/components/radio/radio.spec.ts
  26. +6 −4 src/components/radio/radio.ts
  27. +3 −1 src/components/radio/radio_dispatcher.ts
  28. +9 −10 src/components/sidenav/sidenav.spec.ts
  29. +22 −23 src/components/sidenav/sidenav.ts
  30. +4 −4 src/components/toolbar/toolbar.spec.ts
  31. +3 −3 src/components/toolbar/toolbar.ts
  32. +13 −0 src/core/async/promise-completer.ts
  33. +2 −2 src/core/gestures/MdGestureConfig.ts
  34. +7 −8 src/core/live-announcer/live-announcer.spec.ts
  35. +1 −1 src/core/live-announcer/live-announcer.ts
  36. +3 −3 src/core/overlay/overlay.spec.ts
  37. +1 −1 src/core/overlay/overlay.ts
  38. +1 −1 src/core/overlay/position/global-position-strategy.spec.ts
  39. +1 −1 src/core/overlay/position/relative-position-strategy.ts
  40. +5 −8 src/core/portal/dom-portal-host.ts
  41. +4 −5 src/core/portal/portal-directives.ts
  42. +7 −10 src/core/portal/{portal-exceptions.ts → portal-errors.ts}
  43. +46 −86 src/core/portal/portal.spec.ts
  44. +19 −22 src/core/portal/portal.ts
  45. +1 −1 src/core/rtl/dir.ts
  46. +1 −1 src/demo-app/button/button-demo.ts
  47. +1 −1 src/demo-app/card/card-demo.ts
  48. +4 −0 src/demo-app/checkbox/checkbox-demo.html
  49. +3 −2 src/demo-app/checkbox/checkbox-demo.ts
  50. +16 −16 src/demo-app/demo-app.html
  51. +20 −20 src/demo-app/demo-app.ts
  52. +1 −1 src/demo-app/gestures/gestures-demo.ts
  53. +1 −1 src/demo-app/grid-list/grid-list-demo.ts
  54. +1 −1 src/demo-app/icon/icon-demo.ts
  55. +1 −1 src/demo-app/input/input-demo.ts
  56. +1 −1 src/demo-app/list/list-demo.ts
  57. +1 −1 src/demo-app/live-announcer/live-announcer-demo.ts
  58. +1 −1 src/demo-app/overlay/overlay-demo.ts
  59. +3 −3 src/demo-app/portal/portal-demo.ts
  60. +1 −1 src/demo-app/progress-bar/progress-bar-demo.ts
  61. +1 −1 src/demo-app/progress-circle/progress-circle-demo.ts
  62. +1 −1 src/demo-app/radio/radio-demo.ts
  63. +1 −1 src/demo-app/sidenav/sidenav-demo.ts
  64. +1 −1 src/demo-app/toolbar/toolbar-demo.ts
  65. +10 −24 src/index.html
  66. +6 −6 src/main.ts
  67. +66 −0 src/system-config.ts
  68. +46 −80 test/karma-test-shim.js
  69. +7 −18 test/karma.config.ts
View
@@ -46,6 +46,7 @@ matrix:
allow_failures:
- env: "MODE=saucelabs_optional"
- env: "MODE=browserstack_optional"
+ - env: "MODE=e2e"
install:
- npm install
View
@@ -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 });
};
View
@@ -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"
+ }
+}
View
@@ -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"
}
}
No changes.
@@ -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';
@@ -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.
@@ -1,4 +1,4 @@
-import {Component, ViewEncapsulation, ChangeDetectionStrategy} from 'angular2/core';
+import {Component, ViewEncapsulation, ChangeDetectionStrategy} from '@angular/core';
/*
@@ -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 {
Oops, something went wrong.

0 comments on commit 04c8a1f

Please sign in to comment.