Skip to content

build: replace custom file casing rule with integrated rule #14618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 2, 2019
Merged

build: replace custom file casing rule with integrated rule #14618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12ba140
build: remove custom file casing rule with integrated rule
devversion Dec 23, 2018
c5acbe8
Fix schematic tests for latest TSLint failure output
devversion Dec 23, 2018
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
"stylelint": "^9.9.0",
"ts-node": "^3.0.4",
"tsconfig-paths": "^2.3.0",
"tslint": "^5.11.0",
"tslint": "^5.12.0",
"tsutils": "^3.0.0",
"typescript": "~3.1.1",
"uglify-js": "^2.8.14"
Expand Down
4 changes: 2 additions & 2 deletions src/cdk/schematics/ng-update/test-cases/misc/method-call-checks.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ describe('v6 method call checks', () => {
});

expect(logOutput)
.toMatch(/\[15,.*Found call to "FocusMonitor\.monitor".*renderer.*has been removed/);
.toMatch(/:15.*Found call to "FocusMonitor\.monitor".*renderer.*has been removed/);
expect(logOutput)
.toMatch(/\[16,.*Found call to "FocusMonitor\.monitor".*renderer.*has been removed/);
.toMatch(/:16.*Found call to "FocusMonitor\.monitor".*renderer.*has been removed/);

removeTempDir();
});
Expand Down
4 changes: 2 additions & 2 deletions src/lib/schematics/ng-update/test-cases/misc/constructor-checks.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ describe('constructor checks', () => {
'constructor-checks': require.resolve('./constructor-checks_input.ts')
});

expect(logOutput).toMatch(/\[22.*Found "NativeDateAdapter"/,
expect(logOutput).toMatch(/:22.*Found "NativeDateAdapter"/,
'Expected the constructor checks to report if an argument is not assignable.');
expect(logOutput).not.toMatch(/\[26.*Found "NativeDateAdapter".*/,
expect(logOutput).not.toMatch(/:26.*Found "NativeDateAdapter".*/,
'Expected the constructor to not report if an argument is assignable.');

expect(logOutput).not.toMatch(/Found "NonMaterialClass".*: new NonMaterialClass\(\)/);
Expand Down
49 changes: 0 additions & 49 deletions tools/tslint-rules/fileNameCasingScopedRule.ts
View file
Open in desktop

This file was deleted.

11 changes: 6 additions & 5 deletions tslint.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,12 @@
"./tools/package-tools/rollup-globals.ts",
"src/+(lib|cdk|material-examples|material-experimental|cdk-experimental)/!(schematics)**/*.ts"
],
"file-name-casing-scoped": [
true,
// Exclude lint rule files since they have to always be camel cased and end with `Rule`.
"**/*Rule.ts"
],
"file-name-casing": [true, {
// Exclude custom lint rule files since they have to always be camel-cased and end
// with "Rule".
".*Rule.ts": "camel-case",
".*": "kebab-case"
}],
"no-unescaped-html-tag": true
},
"linterOptions": {
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10965,10 +10965,10 @@ tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==

tslint@^5.11.0:
version "5.11.0"
resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.11.0.tgz#98f30c02eae3cde7006201e4c33cb08b48581eed"
integrity sha1-mPMMAurjzecAYgHkwzywi0hYHu0=
tslint@^5.12.0:
version "5.12.0"
resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.12.0.tgz#47f2dba291ed3d580752d109866fb640768fca36"
integrity sha512-CKEcH1MHUBhoV43SA/Jmy1l24HJJgI0eyLbBNSRyFlsQvb9v6Zdq+Nz2vEOH00nC5SUx4SneJ59PZUS/ARcokQ==
dependencies:
babel-code-frame "^6.22.0"
builtin-modules "^1.1.1"
Expand Down