diff --git a/packages/schematics/angular/workspace/files/tslint.json.template b/packages/schematics/angular/workspace/files/tslint.json.template deleted file mode 100644 index 733008b755..0000000000 --- a/packages/schematics/angular/workspace/files/tslint.json.template +++ /dev/null @@ -1,140 +0,0 @@ -{ - "extends": "tslint:recommended", - "rulesDirectory": [ - "codelyzer" - ], - "rules": { - "align": { - "options": [ - "parameters", - "statements" - ] - }, - "array-type": false, - "arrow-return-shorthand": true, - "curly": true, - "deprecation": { - "severity": "warning" - }, - "eofline": true, - "import-blacklist": [ - true, - "rxjs/Rx" - ], - "import-spacing": true, - "indent": { - "options": [ - "spaces" - ] - }, - "max-classes-per-file": false, - "max-line-length": [ - true, - 140 - ], - "member-ordering": [ - true, - { - "order": [ - "static-field", - "instance-field", - "static-method", - "instance-method" - ] - } - ], - "no-console": [ - true, - "debug", - "info", - "time", - "timeEnd", - "trace" - ], - "no-empty": false, - "no-inferrable-types": [ - true, - "ignore-params" - ], - "no-non-null-assertion": true, - "no-redundant-jsdoc": true, - "no-switch-case-fall-through": true, - "no-var-requires": false, - "object-literal-key-quotes": [ - true, - "as-needed" - ], - "quotemark": [ - true, - "single" - ], - "semicolon": { - "options": [ - "always" - ] - }, - "space-before-function-paren": { - "options": { - "anonymous": "never", - "asyncArrow": "always", - "constructor": "never", - "method": "never", - "named": "never" - } - }, - "typedef": [ - true, - "call-signature" - ], - "typedef-whitespace": { - "options": [ - { - "call-signature": "nospace", - "index-signature": "nospace", - "parameter": "nospace", - "property-declaration": "nospace", - "variable-declaration": "nospace" - }, - { - "call-signature": "onespace", - "index-signature": "onespace", - "parameter": "onespace", - "property-declaration": "onespace", - "variable-declaration": "onespace" - } - ] - }, - "variable-name": { - "options": [ - "ban-keywords", - "check-format", - "allow-pascal-case" - ] - }, - "whitespace": { - "options": [ - "check-branch", - "check-decl", - "check-operator", - "check-separator", - "check-type", - "check-typecast" - ] - }, - "component-class-suffix": true, - "contextual-lifecycle": true, - "directive-class-suffix": true, - "no-conflicting-lifecycle": true, - "no-host-metadata-property": true, - "no-input-rename": true, - "no-inputs-metadata-property": true, - "no-output-native": true, - "no-output-on-prefix": true, - "no-output-rename": true, - "no-outputs-metadata-property": true, - "template-banana-in-box": true, - "template-no-negated-async": true, - "use-lifecycle-interface": true, - "use-pipe-transform-interface": true - } -} diff --git a/packages/schematics/angular/workspace/index.ts b/packages/schematics/angular/workspace/index.ts index 05282267ba..fe40febfdc 100644 --- a/packages/schematics/angular/workspace/index.ts +++ b/packages/schematics/angular/workspace/index.ts @@ -20,10 +20,8 @@ import { Schema as WorkspaceOptions } from './schema'; export default function (options: WorkspaceOptions): Rule { - const minimalFilesRegExp = /(.editorconfig|tslint.json)\.template$/; - return mergeWith(apply(url('./files'), [ - options.minimal ? filter(path => !minimalFilesRegExp.test(path)) : noop(), + options.minimal ? filter(path => !path.endsWith('editorconfig.template')) : noop(), applyTemplates({ utils: strings, ...options, diff --git a/packages/schematics/angular/workspace/index_spec.ts b/packages/schematics/angular/workspace/index_spec.ts index e3ff5984f2..a57e925285 100644 --- a/packages/schematics/angular/workspace/index_spec.ts +++ b/packages/schematics/angular/workspace/index_spec.ts @@ -33,7 +33,6 @@ describe('Workspace Schematic', () => { '/package.json', '/README.md', '/tsconfig.json', - '/tslint.json', ])); }); @@ -69,7 +68,6 @@ describe('Workspace Schematic', () => { '/tsconfig.json', ])); - expect(files).not.toContain('/tslint.json'); expect(files).not.toContain('/.editorconfig'); }); diff --git a/tests/legacy-cli/e2e/tests/commands/new/new-minimal.ts b/tests/legacy-cli/e2e/tests/commands/new/new-minimal.ts index 54998811d7..0b080efa92 100644 --- a/tests/legacy-cli/e2e/tests/commands/new/new-minimal.ts +++ b/tests/legacy-cli/e2e/tests/commands/new/new-minimal.ts @@ -15,7 +15,6 @@ export default function() { .then(() => expectFileNotToExist('protractor.conf.js')) .then(() => expectFileNotToExist('src/test.ts')) .then(() => expectFileNotToExist('tsconfig.spec.json')) - .then(() => expectFileNotToExist('tslint.json')) .then(() => expectFileNotToExist('src/app/app.component.html')) .then(() => expectFileNotToExist('src/app/app.component.css')) .then(() => expectFileNotToExist('src/app/app.component.spec.ts'))