Skip to content

Commit 4f2456d

Browse files
frenicfrenic
committed
Bump Typescript
1 parent 7dbb6bf commit 4f2456d

10 files changed

+159
-157
lines changed

‎__tests__/__fixtures__/typecheck.js

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const css: CSS.Properties<> = {
88
flexDirection: 'row',
99
MozAppearance: 'button',
1010
msOverflowStyle: 'scrollbar',
11+
color: '#abcdef',
1112

1213
// Test custom string
1314
borderBottomWidth: 'calc(1px)',

‎__tests__/__fixtures__/typecheck.ts

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const css: CSS.Properties = {
1212
flexDirection: 'row',
1313
MozAppearance: 'button',
1414
msOverflowStyle: 'scrollbar',
15+
color: '#abcdef',
1516

1617
// Test custom string
1718
width: 'calc(1px)',

‎__tests__/__snapshots__/dist.flow.ts.snap

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

3-
exports[`it detects errors 1`] = `"41:43 - Cannot assign object literal to \`unknownProperty\` because property \`unknownProperty\` is missing in \`Properties\` [1] but exists in object literal [2]. [prop-missing]"`;
3+
exports[`it detects errors 1`] = `"42:43 - Cannot assign object literal to \`unknownProperty\` because property \`unknownProperty\` is missing in \`Properties\` [1] but exists in object literal [2]. [prop-missing]"`;
44

5-
exports[`it detects errors 2`] = `"47:10 - Cannot assign object literal to \`cssWithDisallowedValue\` because in property \`order\`: [incompatible-type] Either string [1] is incompatible with literal union [2]. Or string [1] is incompatible with number [3]."`;
5+
exports[`it detects errors 2`] = `"48:10 - Cannot assign object literal to \`cssWithDisallowedValue\` because in property \`order\`: [incompatible-type] Either string [1] is incompatible with literal union [2]. Or string [1] is incompatible with number [3]."`;
66

7-
exports[`it detects errors 3`] = `"52:11 - Cannot assign object literal to \`cssWithDisallowedFallbackValues\` because in property \`bottom\`: [incompatible-type] Either array literal [1] is incompatible with string literal \`-moz-initial\` [2]. Or array literal [1] is incompatible with string literal \`inherit\` [3]. Or array literal [1] is incompatible with string literal \`initial\` [4]. Or array literal [1] is incompatible with string literal \`revert\` [5]. Or array literal [1] is incompatible with string literal \`unset\` [6]. Or array literal [1] is incompatible with string [7]. Or array literal [1] is incompatible with number literal \`0\` [8]. Or array literal [1] is incompatible with string literal \`auto\` [9]. Or array literal [1] is incompatible with string [10]."`;
7+
exports[`it detects errors 3`] = `"53:11 - Cannot assign object literal to \`cssWithDisallowedFallbackValues\` because in property \`bottom\`: [incompatible-type] Either array literal [1] is incompatible with string literal \`-moz-initial\` [2]. Or array literal [1] is incompatible with string literal \`inherit\` [3]. Or array literal [1] is incompatible with string literal \`initial\` [4]. Or array literal [1] is incompatible with string literal \`revert\` [5]. Or array literal [1] is incompatible with string literal \`unset\` [6]. Or array literal [1] is incompatible with string [7]. Or array literal [1] is incompatible with number literal \`0\` [8]. Or array literal [1] is incompatible with string literal \`auto\` [9]. Or array literal [1] is incompatible with string [10]."`;
88

9-
exports[`it detects errors 4`] = `"53:10 - Cannot assign object literal to \`cssWithDisallowedFallbackValues\` because in property \`order\`: [incompatible-type] Either array literal [1] is incompatible with string literal \`-moz-initial\` [2]. Or array literal [1] is incompatible with string literal \`inherit\` [3]. Or array literal [1] is incompatible with string literal \`initial\` [4]. Or array literal [1] is incompatible with string literal \`revert\` [5]. Or array literal [1] is incompatible with string literal \`unset\` [6]. Or array literal [1] is incompatible with number [7]."`;
9+
exports[`it detects errors 4`] = `"54:10 - Cannot assign object literal to \`cssWithDisallowedFallbackValues\` because in property \`order\`: [incompatible-type] Either array literal [1] is incompatible with string literal \`-moz-initial\` [2]. Or array literal [1] is incompatible with string literal \`inherit\` [3]. Or array literal [1] is incompatible with string literal \`initial\` [4]. Or array literal [1] is incompatible with string literal \`revert\` [5]. Or array literal [1] is incompatible with string literal \`unset\` [6]. Or array literal [1] is incompatible with number [7]."`;

‎__tests__/__snapshots__/dist.typescript.ts.snap

+105-105
Large diffs are not rendered by default.

‎__tests__/dist.typescript.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const COMPILER_OPTIONS = {
88

99
describe('Typescript 4.1', () => {
1010
it('detects errors', async () => {
11-
const ts = await import('typescript4.1');
11+
const ts = await import('typescript');
1212
const program = ts.createProgram([path.resolve(__dirname, '__fixtures__/typecheck.ts')], COMPILER_OPTIONS);
1313
const diagnostics = ts.getPreEmitDiagnostics(program);
1414
const errors = diagnostics.map(diagnostic => {
@@ -28,7 +28,7 @@ describe('Typescript 4.1', () => {
2828

2929
describe('Typescript 4.0', () => {
3030
it('detects errors', async () => {
31-
const ts = await import('typescript');
31+
const ts = await import('typescript4.0');
3232
const program = ts.createProgram([path.resolve(__dirname, '__fixtures__/typecheck.ts')], COMPILER_OPTIONS);
3333
const diagnostics = ts.getPreEmitDiagnostics(program);
3434
const errors = diagnostics.map(diagnostic => {

‎__tests__/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"name": "csstype-test",
33
"dependencies": {
4-
"typescript3.5": "npm:[email protected]",
5-
"typescript3.6": "npm:[email protected]",
6-
"typescript3.7": "npm:[email protected]",
7-
"typescript3.8": "npm:[email protected]",
8-
"typescript3.9": "npm:[email protected]",
9-
"typescript4.1": "npm:typescript@4.1.0-beta"
4+
"typescript3.5": "npm:typescript@~3.5.3",
5+
"typescript3.6": "npm:typescript@~3.6.5",
6+
"typescript3.7": "npm:typescript@~3.7.5",
7+
"typescript3.8": "npm:typescript@~3.8.3",
8+
"typescript3.9": "npm:typescript@~3.9.7",
9+
"typescript4.0": "npm:typescript@~4.0.5"
1010
}
1111
}

‎__tests__/yarn.lock

+33-33
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
2-
# yarn lockfile v1
3-
4-
5-
"typescript3.5@npm:[email protected]":
6-
version "3.5.3"
7-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977"
8-
integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==
9-
10-
"typescript3.6@npm:[email protected]":
11-
version "3.6.5"
12-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.5.tgz#dae20114a7b4ff4bd642db9c8c699f2953e8bbdb"
13-
integrity sha512-BEjlc0Z06ORZKbtcxGrIvvwYs5hAnuo6TKdNFL55frVDlB+na3z5bsLhFaIxmT+dPWgBIjMo6aNnTOgHHmHgiQ==
14-
15-
"typescript3.7@npm:[email protected]":
16-
version "3.7.5"
17-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.5.tgz#0692e21f65fd4108b9330238aac11dd2e177a1ae"
18-
integrity sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==
19-
20-
"typescript3.8@npm:[email protected]":
21-
version "3.8.3"
22-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061"
23-
integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==
24-
25-
"typescript3.9@npm:[email protected]":
26-
version "3.9.7"
27-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa"
28-
integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==
29-
30-
"typescript4.1@npm:typescript@4.1.0-beta":
31-
version "4.1.0-beta"
32-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.0-beta.tgz#e4d054035d253b7a37bdc077dd71706508573e69"
33-
integrity sha512-b/LAttdVl3G6FEmnMkDsK0xvfvaftXpSKrjXn+OVCRqrwz5WD/6QJOiN+dTorqDY+hkaH+r2gP5wI1jBDmdQ7A==
1+
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
2+
# yarn lockfile v1
3+
4+
5+
"typescript3.5@npm:typescript@~3.5.3":
6+
version "3.5.3"
7+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977"
8+
integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==
9+
10+
"typescript3.6@npm:typescript@~3.6.5":
11+
version "3.6.5"
12+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.5.tgz#dae20114a7b4ff4bd642db9c8c699f2953e8bbdb"
13+
integrity sha512-BEjlc0Z06ORZKbtcxGrIvvwYs5hAnuo6TKdNFL55frVDlB+na3z5bsLhFaIxmT+dPWgBIjMo6aNnTOgHHmHgiQ==
14+
15+
"typescript3.7@npm:typescript@~3.7.5":
16+
version "3.7.5"
17+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.5.tgz#0692e21f65fd4108b9330238aac11dd2e177a1ae"
18+
integrity sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==
19+
20+
"typescript3.8@npm:typescript@~3.8.3":
21+
version "3.8.3"
22+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061"
23+
integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==
24+
25+
"typescript3.9@npm:typescript@~3.9.7":
26+
version "3.9.7"
27+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa"
28+
integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==
29+
30+
"typescript4.0@npm:typescript@~4.0.5":
31+
version "4.0.5"
32+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.5.tgz#ae9dddfd1069f1cb5beb3ef3b2170dd7c1332389"
33+
integrity sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"tslint": "^6.1.3",
3131
"tslint-config-prettier": "^1.18.0",
3232
"turndown": "^7.0.0",
33-
"typescript": "~4.0.5",
33+
"typescript": "~4.1.2",
3434
"yarn": "^1.22.10"
3535
},
3636
"scripts": {

‎utils.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export const TYPESCRIPT_FILENAME = 'index.d.ts';
88
export const FLOW_FILENAME = 'index.js.flow';
99

1010
export function writeFileAsync(filename: string, content: string) {
11-
return new Promise((resolve, reject) => {
11+
return new Promise<void>((resolve, reject) => {
1212
writeFile(filename, content, 'utf-8', error => {
1313
if (error) {
1414
reject(error);
@@ -39,7 +39,7 @@ export function spawnAsync(command: string, optionsOrArg: SpawnOptions | string,
3939
cp.stdout.on('data', chunk => (data += chunk));
4040
cp.on('close', code => (code === 0 ? resolve(data) : reject(data)));
4141
} else {
42-
cp.on('close', code => (code === 0 ? resolve() : reject()));
42+
cp.on('close', code => (code === 0 ? resolve('') : reject()));
4343
}
4444

4545
cp.on('error', reject);

‎yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -3676,10 +3676,10 @@ typedarray-to-buffer@^3.1.5:
36763676
dependencies:
36773677
is-typedarray "^1.0.0"
36783678

3679-
typescript@~4.0.5:
3680-
version "4.0.5"
3681-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.5.tgz#ae9dddfd1069f1cb5beb3ef3b2170dd7c1332389"
3682-
integrity sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==
3679+
typescript@~4.1.2:
3680+
version "4.1.2"
3681+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.2.tgz#6369ef22516fe5e10304aae5a5c4862db55380e9"
3682+
integrity sha512-thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ==
36833683

36843684
union-value@^1.0.0:
36853685
version "1.0.1"

0 commit comments

Comments
 (0)