Skip to content
This repository has been archived by the owner on Feb 2, 2019. It is now read-only.

Feature/angular rc6 q free #301

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// Place your settings in this file to overwrite default and user settings.
{
"typescript.tsdk": "./node_modules/typescript/lib"
}
14 changes: 13 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ module.exports = function (grunt) {
styles: {options: {message: 'Styles Compiled'}},
source: {options: {message: 'Source Compiled'}}
},
exec: {
ts: {
cmd: 'tsc'
}
},
ts: {
source: {
tsconfig: true
Expand Down Expand Up @@ -213,18 +218,23 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-contrib-connect');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-exec');
grunt.loadNpmTasks('grunt-sass');
grunt.loadNpmTasks('grunt-postcss');
grunt.loadNpmTasks('grunt-notify');
grunt.loadNpmTasks('grunt-karma');
grunt.loadNpmTasks('grunt-ts');
grunt.loadNpmTasks('remap-istanbul');
grunt.registerTask('default', ['ts', 'sass', 'postcss', 'site-meta', 'rewrite-source-maps']);
// temporary kludge to get typescript 2.0 to compile, grunt-ts is not compatible with 2.0
grunt.registerTask('default-ts-2', ['exec:ts', 'sass', 'postcss', 'site-meta', 'rewrite-source-maps'])
grunt.registerTask('develop', ['default', 'watch']);
grunt.registerTask('serve', ['default', 'connect', 'watch']);
grunt.registerTask('cover', ['karma:cover', 'remapIstanbul', 'site-meta']);
grunt.registerTask('site', ['build', 'cover', 'copy:site']);
grunt.registerTask('build', ['default', 'copy:npm', 'copy:site_deps_update']);
// temporary kludge to get typescript 2.0 to compile, grunt-ts is not compatible with 2.0
grunt.registerTask('build-ts-2', ['default-ts-2', 'copy:npm', 'copy:site_deps_update'])
grunt.registerTask('tddTasks', ['ts', 'continue:on', 'karma']);
grunt.registerTask('tdd', ['tddTasks', 'watch']);

Expand All @@ -245,7 +255,9 @@ module.exports = function (grunt) {
]);
});

grunt.registerTask('build-npm', ['build', 'build-npm-package', 'rewrite-source-maps']);
// temporary kludge to get typescript 2.0 to compile, grunt-ts is not compatible with 2.0
grunt.registerTask('build-npm', ['build-ts-2', 'build-npm-package', 'rewrite-source-maps']);

grunt.registerTask('build-npm-package', function () {
var fs = require('fs');
var path = require('path');
Expand Down
1 change: 0 additions & 1 deletion ng2-material.d.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
/// <reference path="typings/index.d.ts"/>
export * from './src/index';
107 changes: 55 additions & 52 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ng2-material",
"version": "0.7.0-0",
"version": "0.7.0-1",
"description": "",
"main": "./index.js",
"repository": {
Expand All @@ -13,70 +13,73 @@
"scripts": {
"tdd": "./node_modules/.bin/grunt tdd",
"start": "./node_modules/.bin/grunt serve",
"test": "./node_modules/.bin/grunt karma",
"postinstall": "./node_modules/.bin/typings install"
"test": "./node_modules/.bin/grunt karma"
},
"dependencies": {
"@angular/common": "2.0.0-rc.5",
"@angular/compiler": "2.0.0-rc.5",
"@angular/core": "2.0.0-rc.5",
"@angular/forms": "^0.3.0",
"@angular/platform-browser": "2.0.0-rc.5",
"@angular/platform-browser-dynamic": "2.0.0-rc.5",
"@angular/router": "3.0.0-rc.1",
"@angular2-material/checkbox": "2.0.0-alpha.7-4",
"@angular2-material/core": "2.0.0-alpha.7-4",
"es6-promise": ">=3.0.2",
"es6-shim": "^0.35.0",
"grunt-sass": "^1.2.0",
"reflect-metadata": "^0.1.3",
"rxjs": "^5.0.0-beta.6",
"@angular/common": "2.0.0-rc.6",
"@angular/compiler": "2.0.0-rc.6",
"@angular/core": "2.0.0-rc.6",
"@angular/forms": "^2.0.0-rc.6",
"@angular/platform-browser": "2.0.0-rc.6",
"@angular/platform-browser-dynamic": "2.0.0-rc.6",
"@angular/router": "3.0.0-rc.2",
"@angular2-material/checkbox": "2.0.0-alpha.8-1",
"@angular2-material/core": "2.0.0-alpha.8-1",
"es6-promise": ">=3.2.1",
"es6-shim": "^0.35.1",
"grunt-sass": "^1.2.1",
"reflect-metadata": "^0.1.8",
"rxjs": "^5.0.0-beta.11",
"zone.js": "^0.6.17"
},
"typings": "./index.d.ts",
"devDependencies": {
"autoprefixer": "6.2.0",
"codelyzer": "0.0.19",
"core-js": "^2.4.0",
"coveralls": "2.11.6",
"@types/hammerjs": "^2.0.32",
"@types/jasmine": "^2.2.33",
"@types/node": "^6.0.38",
"autoprefixer": "6.4.1",
"codelyzer": "0.0.28",
"core-js": "^2.4.1",
"coveralls": "2.11.12",
"css": "^2.2.1",
"css-loader": "0.23.1",
"es6-module-loader": "0.17.4",
"file-loader": "0.8.5",
"glob": "6.0.1",
"grunt": "0.4.5",
"grunt-bump": "0.7.0",
"grunt-cli": "0.1.13",
"css-loader": "0.25.0",
"es6-module-loader": "0.17.11",
"file-loader": "0.9.0",
"glob": "7.0.6",
"grunt": "1.0.1",
"grunt-bump": "0.8.0",
"grunt-cli": "1.2.0",
"grunt-continue": "^0.1.0",
"grunt-contrib-clean": "0.7.0",
"grunt-contrib-connect": "0.11.2",
"grunt-contrib-copy": "0.8.2",
"grunt-contrib-sass": "0.9.2",
"grunt-contrib-watch": "0.6.1",
"grunt-conventional-changelog": "5.0.0",
"grunt-karma": "0.12.1",
"grunt-notify": "0.4.3",
"grunt-contrib-clean": "1.0.0",
"grunt-contrib-connect": "1.0.2",
"grunt-contrib-copy": "1.0.0",
"grunt-contrib-sass": "1.0.0",
"grunt-contrib-watch": "1.0.0",
"grunt-conventional-changelog": "6.1.0",
"grunt-exec": "^1.0.0",
"grunt-karma": "2.0.0",
"grunt-notify": "0.4.5",
"grunt-npm": "0.0.2",
"grunt-postcss": "0.7.1",
"grunt-ts": "5.2.0",
"grunt-postcss": "0.8.0",
"grunt-ts": "6.0.0-beta.3",
"highlightjs": "8.7.0",
"istanbul": "1.0.0-alpha.2",
"karma": "0.13.19",
"karma-chrome-launcher": "0.2.2",
"karma-coverage": "0.5.3",
"karma-firefox-launcher": "0.1.7",
"karma-jasmine": "0.2.2",
"karma-mocha-reporter": "1.1.5",
"karma-sauce-launcher": "0.3.0",
"karma": "1.2.0",
"karma-chrome-launcher": "2.0.0",
"karma-coverage": "1.1.1",
"karma-firefox-launcher": "1.0.0",
"karma-jasmine": "1.0.2",
"karma-mocha-reporter": "2.1.0",
"karma-sauce-launcher": "1.0.0",
"lcov-parse": "0.0.10",
"marked": "0.3.5",
"npm": "^3.9.2",
"remap-istanbul": "0.4.0",
"style-loader": "0.13.0",
"systemjs": "0.19.27",
"marked": "0.3.6",
"npm": "^3.10.7",
"remap-istanbul": "0.6.4",
"style-loader": "0.13.1",
"systemjs": "0.19.38",
"tslint": "^3.15.1",
"typescript": ">=1.8.9",
"typings": "^1.0.4",
"typescript": "^2.0.0",
"typings": "^1.3.3",
"underscore": "1.8.3"
},
"contributors": [
Expand Down
1 change: 1 addition & 0 deletions src/.baseDir.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// Ignore this file. See https://github.com/grunt-ts/grunt-ts/issues/77
4 changes: 0 additions & 4 deletions src/components.scss
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
@import "components/backdrop/backdrop";
@import "components/button/button";
@import "components/card/card";
@import "components/content/content";
@import "components/data-table/data_table";
@import "components/dialog/dialog";
@import "components/divider/divider";
@import "components/icon/icon";
@import "components/list/list";
@import "components/form/messages";
@import "components/pagination/pagination";
@import "components/peekaboo/peekaboo";
@import "components/subheader/subheader";
@import "components/switch/switch";
@import "components/whiteframe/whiteframe";
Loading