Skip to content

Commit cc9fec4

Browse files
committedMar 19, 2019
Remove enforcing the use of types
1 parent 1c6bcfb commit cc9fec4

File tree

14 files changed

+15
-42
lines changed

14 files changed

+15
-42
lines changed
 

‎source/lib/rules/types-property.ts

-10
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,6 @@ import {getJSONPropertyPosition} from '../utils';
1212
export default (context: Context): Diagnostic[] => {
1313
const {pkg} = context;
1414

15-
if (!pkg.types && !pkg.typings) {
16-
return [
17-
{
18-
fileName: 'package.json',
19-
message: 'Can\'t find `types` property.',
20-
severity: 'error'
21-
}
22-
];
23-
}
24-
2515
if (!pkg.types && pkg.typings) {
2616
const content = fs.readFileSync(path.join(context.cwd, 'package.json'), 'utf8');
2717

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
{
2-
"name": "foo",
3-
"types": "index.d.ts"
2+
"name": "foo"
43
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
{
2-
"name": "foo",
3-
"types": "index.d.ts"
2+
"name": "foo"
43
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
{
2-
"name": "foo",
3-
"types": "index.d.ts"
2+
"name": "foo"
43
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
{
2-
"name": "foo",
3-
"types": "index.d.ts"
2+
"name": "foo"
43
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
{
2-
"name": "foo",
3-
"types": "index.d.ts"
2+
"name": "foo"
43
}
+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
{
2-
"name": "foo",
3-
"types": "index.d.ts"
2+
"name": "foo"
43
}

‎source/test/fixtures/no-files/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"name": "foo",
3-
"types": "index.d.ts",
43
"files": [
54
"index.js"
65
]
+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
{
2-
"name": "foo",
3-
"types": "index.d.ts"
2+
"name": "foo"
43
}

‎source/test/fixtures/non-strict-check-with-config/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"name": "foo",
3-
"types": "index.d.ts",
43
"tsd-check": {
54
"compilerOptions": {
65
"strict": false

‎source/test/fixtures/success/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"name": "foo",
3-
"types": "index.d.ts",
43
"files": [
54
"index.js",
65
"index.d.ts"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"name": "foo",
3+
"tsd-check": {
4+
"directory": "test"
5+
}
6+
}

‎source/test/fixtures/top-level-await/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"name": "foo",
3-
"types": "index.d.ts",
43
"files": [
54
"index.js",
65
"index.d.ts"

‎source/test/test.ts

+2-14
Original file line numberDiff line numberDiff line change
@@ -37,25 +37,13 @@ test('fail if typings file is not part of `files` list', async t => {
3737
fileName: 'package.json',
3838
message: 'TypeScript type definition `index.d.ts` is not part of the `files` list.',
3939
severity: 'error',
40-
line: 4,
40+
line: 3,
4141
column: 1
4242
}
4343
]);
4444
});
4545

46-
test('fail if `types` property is not set', async t => {
47-
const diagnostics = await m({cwd: path.join(__dirname, 'fixtures/types-property/no-property')});
48-
49-
t.deepEqual(diagnostics, [
50-
{
51-
fileName: 'package.json',
52-
message: 'Can\'t find `types` property.',
53-
severity: 'error'
54-
}
55-
]);
56-
});
57-
58-
test('fail if `typings` property is is used instead of `types`', async t => {
46+
test('fail if `typings` property is used instead of `types`', async t => {
5947
const diagnostics = await m({cwd: path.join(__dirname, 'fixtures/types-property/typings')});
6048

6149
t.deepEqual(diagnostics, [

0 commit comments

Comments
 (0)
Please sign in to comment.