Skip to content
Merged
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
7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"e2e.live": "protractor --elementExplorer",
"gulp": "gulp",
"i18n": "ng-xi18n && gulp clean.i18n",
"lint": "gulp tslint",
"lint": "tslint src/**/*.ts tools/**/*.ts",
"karma": "karma",
"karma.start": "karma start",
"postinstall": "gulp check.versions && gulp build.bundle.rxjs && npm prune && gulp webdriver && gulp print.banner",
Expand Down Expand Up @@ -66,7 +66,7 @@
"async": "^2.1.1",
"autoprefixer": "^6.5.1",
"browser-sync": "^2.17.3",
"codelyzer": "~1.0.0-beta.4",
"codelyzer": "~2.0.0-beta.1",
"compodoc": "^0.0.15",
"connect-history-api-fallback": "^1.3.0",
"cssnano": "^3.7.7",
Expand All @@ -90,7 +90,6 @@
"gulp-sass": "^2.3.2",
"gulp-sourcemaps": "2.2.0",
"gulp-template": "^4.0.0",
"gulp-tslint": "^6.1.2",
"gulp-typescript": "^3.0.2",
"gulp-uglify": "^2.0.0",
"gulp-util": "^3.0.7",
Expand Down Expand Up @@ -119,7 +118,7 @@
"tildify": "^1.2.0",
"traceur": "^0.0.111",
"ts-node": "^1.4.3",
"tslint": "^3.15.1",
"tslint": "^4.0.0",
"typescript": "^2.0.3",
"walk": "^2.3.9",
"yargs": "^6.0.0",
Expand Down
9 changes: 2 additions & 7 deletions tools/config/seed.tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,11 @@
],
"no-arg": true,
"no-construct": true,
"no-duplicate-key": true,
"no-duplicate-variable": true,
"no-empty": true,
"no-eval": true,
"no-trailing-whitespace": true,
"no-unused-expression": true,
"no-unused-variable": true,
"no-unreachable": true,
"no-use-before-declare": true,
"one-line": [true,
"check-open-brace",
Expand All @@ -34,10 +31,8 @@
"triple-equals": true,
"variable-name": false,

"directive-selector-name": [true, "camelCase"],
"component-selector-name": [true, "kebab-case"],
"directive-selector-type": [true, "attribute"],
"component-selector-type": [true, "element"],
"directive-selector": [true, "attribute", [], "camelCase"],
"component-selector": [true, "element", [], "kebab-case"],
"use-input-property-decorator": true,
"use-output-property-decorator": true,
"use-host-property-decorator": true,
Expand Down
45 changes: 23 additions & 22 deletions tools/tasks/seed/tslint.ts
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
import * as gulp from 'gulp';
import * as gulpLoadPlugins from 'gulp-load-plugins';
import { join } from 'path';

import Config from '../../config';

const plugins = <any>gulpLoadPlugins();
// import * as gulp from 'gulp';
// import * as gulpLoadPlugins from 'gulp-load-plugins';
// import { join } from 'path';
//
// import Config from '../../config';
//
// const plugins = <any>gulpLoadPlugins();

/**
* Executes the build process, linting the TypeScript files using `codelyzer`.
*/
export = () => {
let src = [
join(Config.APP_SRC, '**/*.ts'),
'!' + join(Config.APP_SRC, '**/*.d.ts'),
join(Config.E2E_SRC, '**/*.ts'),
'!' + join(Config.E2E_SRC, '**/*.d.ts'),
join(Config.TOOLS_DIR, '**/*.ts'),
'!' + join(Config.TOOLS_DIR, '**/*.d.ts')
];

return gulp.src(src, {'base': '.'})
.pipe(plugins.tslint())
.pipe(plugins.tslint.report({
emitError: require('is-ci')
}));
export = (done: any) => {
done();
// let src = [
// join(Config.APP_SRC, '**/*.ts'),
// '!' + join(Config.APP_SRC, '**/*.d.ts'),
// join(Config.E2E_SRC, '**/*.ts'),
// '!' + join(Config.E2E_SRC, '**/*.d.ts'),
// join(Config.TOOLS_DIR, '**/*.ts'),
// '!' + join(Config.TOOLS_DIR, '**/*.d.ts')
// ];
//
// return gulp.src(src, {'base': '.'})
// .pipe(plugins.tslint())
// .pipe(plugins.tslint.report({
// emitError: require('is-ci')
// }));
};
Loading