Skip to content

Commit 5968b46

Browse files
devversionmmalerba
authored andcommitted
build: replace custom file casing rule with integrated rule (#14618)
1 parent 8ce6ba4 commit 5968b46

File tree

6 files changed

+15
-63
lines changed

6 files changed

+15
-63
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
"stylelint": "^9.9.0",
137137
"ts-node": "^3.0.4",
138138
"tsconfig-paths": "^2.3.0",
139-
"tslint": "^5.11.0",
139+
"tslint": "^5.12.0",
140140
"tsutils": "^3.0.0",
141141
"typescript": "~3.1.1",
142142
"uglify-js": "^2.8.14"

src/cdk/schematics/ng-update/test-cases/misc/method-call-checks.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ describe('v6 method call checks', () => {
99
});
1010

1111
expect(logOutput)
12-
.toMatch(/\[15,.*Found call to "FocusMonitor\.monitor".*renderer.*has been removed/);
12+
.toMatch(/:15.*Found call to "FocusMonitor\.monitor".*renderer.*has been removed/);
1313
expect(logOutput)
14-
.toMatch(/\[16,.*Found call to "FocusMonitor\.monitor".*renderer.*has been removed/);
14+
.toMatch(/:16.*Found call to "FocusMonitor\.monitor".*renderer.*has been removed/);
1515

1616
removeTempDir();
1717
});

src/lib/schematics/ng-update/test-cases/misc/constructor-checks.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ describe('constructor checks', () => {
88
'constructor-checks': require.resolve('./constructor-checks_input.ts')
99
});
1010

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

1616
expect(logOutput).not.toMatch(/Found "NonMaterialClass".*: new NonMaterialClass\(\)/);

tools/tslint-rules/fileNameCasingScopedRule.ts

Lines changed: 0 additions & 49 deletions
This file was deleted.

tslint.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,12 @@
129129
"./tools/package-tools/rollup-globals.ts",
130130
"src/+(lib|cdk|material-examples|material-experimental|cdk-experimental)/!(schematics)**/*.ts"
131131
],
132-
"file-name-casing-scoped": [
133-
true,
134-
// Exclude lint rule files since they have to always be camel cased and end with `Rule`.
135-
"**/*Rule.ts"
136-
],
132+
"file-name-casing": [true, {
133+
// Exclude custom lint rule files since they have to always be camel-cased and end
134+
// with "Rule".
135+
".*Rule.ts": "camel-case",
136+
".*": "kebab-case"
137+
}],
137138
"no-unescaped-html-tag": true
138139
},
139140
"linterOptions": {

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10965,10 +10965,10 @@ tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
1096510965
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
1096610966
integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
1096710967

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

0 commit comments

Comments
 (0)