Skip to content

Commit

Permalink
feat(package): update dependency version, use @angular/forms, fix gul…
Browse files Browse the repository at this point in the history
…p task (#232)
  • Loading branch information
otelnov authored and valorkin committed Aug 4, 2016
1 parent 2991bea commit 026ef38
Show file tree
Hide file tree
Showing 9 changed files with 54 additions and 43 deletions.
8 changes: 4 additions & 4 deletions components/table/ng-table.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import {it, expect, describe, inject, beforeEachProviders} from '@angular/core/testing';
import {it, expect, describe, inject, addProviders} from '@angular/core/testing';
import {ComponentFixture} from '@angular/compiler/testing';
import {NgTableComponent} from './ng-table.component';

describe('Directive: FileSelectDirective', () => {
beforeEachProviders(() => [
NgTableComponent
]);
beforeEach(() => {
addProviders([NgTableComponent]);
});
it('should be fine', inject([NgTableComponent], (fixture:ComponentFixture<NgTableComponent>) => {
expect(fixture).not.toBeNull();
}));
Expand Down
3 changes: 2 additions & 1 deletion demo/components/table/table-demo.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {Component, OnInit} from '@angular/core';
import {CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass, NgIf} from '@angular/common';
import {CORE_DIRECTIVES, NgClass, NgIf} from '@angular/common';
import {FORM_DIRECTIVES} from '@angular/forms';
import {PAGINATION_DIRECTIVES} from 'ng2-bootstrap/ng2-bootstrap';
import {NG_TABLE_DIRECTIVES} from '../../../ng2-table';
import {TableData} from './table-data';
Expand Down
6 changes: 5 additions & 1 deletion demo/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import {bootstrap} from '@angular/platform-browser-dynamic';
import {Component} from '@angular/core';
import {NgClass} from '@angular/common';
import {TableSectionComponent} from './components/table-section';
import {disableDeprecatedForms, provideForms} from '@angular/forms';

let gettingStarted = require('./getting-started.md');

Expand Down Expand Up @@ -40,4 +41,7 @@ let gettingStarted = require('./getting-started.md');
export class DemoComponent {
}

bootstrap(DemoComponent);
bootstrap(DemoComponent, [
disableDeprecatedForms(),
provideForms()
]);
5 changes: 3 additions & 2 deletions gulp-tasks/lint.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ gitignore.push('**/*.ts');
gulp.task('tslint', () =>
gulp
.src(gitignore)
.pipe(tslint())
.pipe(tslint.report('prose', {
.pipe(tslint({
formatter: 'verbose',
emitError: true,
summarizeFailureOutput: true,
reportLimit: 50
}))
.pipe(tslint.report())
);

gulp.task('lint', ['tslint']);
4 changes: 1 addition & 3 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@ module.exports = config => {

// preprocess matching files before serving them to the browser
// available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
preprocessors: {
'test.bundle.js': ['coverage', 'webpack', 'sourcemap']
},
preprocessors: {'test.bundle.js': ['coverage', 'webpack', 'sourcemap']},

webpack: {
resolve: {
Expand Down
52 changes: 27 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,66 +49,68 @@
"homepage": "https://github.com/valor-software/ng2-table#readme",
"dependencies": {},
"peerDependencies": {
"@angular/common": "^2.0.0-rc.1",
"@angular/compiler": "^2.0.0-rc.1",
"@angular/core": "^2.0.0-rc.1"
"@angular/common": "2.0.0-rc.4",
"@angular/compiler": "2.0.0-rc.4",
"@angular/core": "2.0.0-rc.4",
"@angular/forms": "0.2.0"
},
"devDependencies": {
"@angular/common": "^2.0.0-rc.1",
"@angular/compiler": "^2.0.0-rc.1",
"@angular/core": "^2.0.0-rc.1",
"@angular/platform-browser": "^2.0.0-rc.1",
"@angular/platform-browser-dynamic": "^2.0.0-rc.1",
"async": "1.5.2",
"@angular/common": "2.0.0-rc.4",
"@angular/compiler": "2.0.0-rc.4",
"@angular/core": "2.0.0-rc.4",
"@angular/forms": "0.2.0",
"@angular/platform-browser": "2.0.0-rc.4",
"@angular/platform-browser-dynamic": "2.0.0-rc.4",
"async": "2.0.1",
"codecov": "1.0.1",
"compression-webpack-plugin": "0.3.1",
"conventional-changelog-cli": "1.2.0",
"conventional-github-releaser": "1.1.2",
"conventional-github-releaser": "1.1.3",
"copy-webpack-plugin": "3.0.1",
"cpy-cli": "1.0.1",
"del-cli": "0.2.0",
"es6-promise": "3.2.1",
"es6-shim": "0.35.1",
"es7-reflect-metadata": "1.6.0",
"eslint-config-valorsoft": "0.0.15",
"eslint-config-valorsoft": "0.1.0",
"exports-loader": "0.6.3",
"file-loader": "0.8.5",
"file-loader": "0.9.0",
"gh-pages": "0.11.0",
"gitignore-to-glob": "0.2.1",
"gulp": "3.9.1",
"gulp-size": "2.1.0",
"gulp-tslint": "5.0.0",
"gulp-tslint": "6.0.2",
"html-loader": "0.4.3",
"html-webpack-plugin": "2.19.0",
"html-webpack-plugin": "2.22.0",
"istanbul-instrumenter-loader": "0.2.0",
"jasmine": "2.4.1",
"karma": "0.13.22",
"karma": "1.1.2",
"karma-chrome-launcher": "1.0.1",
"karma-coverage": "1.0.0",
"karma-coverage": "1.1.1",
"karma-jasmine": "1.0.2",
"karma-phantomjs-launcher": "1.0.0",
"karma-phantomjs-launcher": "1.0.1",
"karma-sourcemap-loader": "0.3.7",
"karma-spec-reporter": "0.0.26",
"karma-webpack": "1.7.0",
"lite-server": "2.2.0",
"lite-server": "2.2.2",
"markdown-loader": "0.1.7",
"marked": "0.3.5",
"ng2-bootstrap": "1.0.17",
"marked": "0.3.6",
"ng2-bootstrap": "1.0.24",
"phantomjs-polyfill": "0.0.2",
"phantomjs-prebuilt": "2.1.7",
"phantomjs-prebuilt": "2.1.9",
"pre-commit": "1.1.3",
"prismjs": "1.5.0",
"prismjs": "1.5.1",
"prismjs-loader": "0.0.3",
"raw-loader": "0.5.1",
"reflect-metadata": "0.1.3",
"require-dir": "0.3.0",
"rxjs": "5.0.0-beta.6",
"source-map-loader": "0.1.5",
"systemjs-builder": "0.15.19",
"systemjs-builder": "0.15.26",
"ts-loader": "0.8.2",
"tslint-config-valorsoft": "1.0.3",
"tslint-config-valorsoft": "1.1.0",
"typescript": "1.8.10",
"typings": "0.8.1",
"typings": "1.3.2",
"webpack": "1.13.1",
"webpack-dev-server": "1.14.1",
"zone.js": "0.6.12"
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
],
"files": [
"ng2-table.ts",
"typings/browser.d.ts"
"typings/index.d.ts"
]
}
8 changes: 7 additions & 1 deletion tslint.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
{
"extends": "tslint-config-valorsoft",
"rulesDirectory": "./node_modules/codelyzer"
"rulesDirectory": "./node_modules/codelyzer",
"rules": {
"component-selector-name": [false, ""],
"import-destructuring-spacing": false,
"only-arrow-functions": false,
"ordered-imports": false
}
}
9 changes: 4 additions & 5 deletions typings.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{
"dependencies": {
"moment": "registry:npm/moment#2.10.5+20160211003958",
"webpack": "registry:npm/webpack#1.12.9+20160219013405"
"webpack": "registry:npm/webpack#1.12.9+20160418172948"
},
"devDependencies": {},
"ambientDependencies": {
"es6-shim": "registry:dt/es6-shim#0.31.2+20160317120654",
"jasmine": "registry:dt/jasmine#2.2.0+20160317120654",
"globalDependencies": {
"es6-shim": "registry:dt/es6-shim#0.31.2+20160602141504",
"jasmine": "registry:dt/jasmine#2.2.0+20160621224255",
"require": "registry:dt/require#2.1.20+20160316155526"
}
}

0 comments on commit 026ef38

Please sign in to comment.