Skip to content

Commit 098e951

Browse files
committed
chore: Upgrade to typescript 3.7.
1 parent 41ecb8e commit 098e951

File tree

13 files changed

+20
-19
lines changed

13 files changed

+20
-19
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"tslint": "^5.9.1",
5252
"typedoc": "^0.14.2",
5353
"typedoc-plugin-monorepo": "^0.1.0",
54-
"typescript": "~3.6",
54+
"typescript": "~3.7",
5555
"watch": "^1.0.2"
5656
},
5757
"husky": {

packages/@css-blocks/cli/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"@types/yargs": "^13.0.0",
5454
"broccoli-test-helper": "^2.0.0",
5555
"node-sass": "^4.12.0",
56-
"typescript": "~3.5",
56+
"typescript": "~3.7",
5757
"watch": "^1.0.2"
5858
},
5959
"dependencies": {

packages/@css-blocks/config/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"devDependencies": {
4545
"@css-blocks/code-style": "^1.0.0-alpha.1",
4646
"@types/lodash.merge": "^4.6.6",
47-
"typescript": "~3.5",
47+
"typescript": "~3.7",
4848
"watch": "^1.0.2"
4949
},
5050
"dependencies": {

packages/@css-blocks/core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"@css-blocks/code-style": "^1.0.0-alpha.1",
4242
"@types/async": "^3.0.3",
4343
"@types/debug": "4.1.5",
44-
"typescript": "~3.6"
44+
"typescript": "~3.7"
4545
},
4646
"dependencies": {
4747
"@opticss/element-analysis": "^0.6.2",

packages/@css-blocks/glimmer/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"@css-blocks/code-style": "^1.0.0-alpha.1",
5353
"@types/fs-extra": "^8.0.0",
5454
"@types/glob": "^7.1.1",
55-
"typescript": "~3.6",
55+
"typescript": "~3.7",
5656
"watch": "^1.0.2"
5757
},
5858
"dependencies": {

packages/@css-blocks/glimmer/src/ClassnamesHelperGenerator.ts

-1
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,6 @@ function constructBoolean(builders: Builders, bool: ConditionalArg): AST.Express
319319
return constructNotExpression(builders, bool);
320320
} else {
321321
assertNever(bool);
322-
return [builders.null()];
323322
}
324323
}
325324

packages/@css-blocks/jsx/src/transformer/classNameGenerator.ts

-1
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,6 @@ function constructBoolean(bool: ConditionalArg): Array<Expression> {
263263
return constructNotExpression(bool);
264264
} else {
265265
assertNever(bool);
266-
return [builders.null()];
267266
}
268267
}
269268

packages/@css-blocks/jsx/src/utils/ExpressionReader.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ export class ExpressionReader {
224224
let state = stateGroup.presenceRule;
225225

226226
if (!state) {
227-
if (stateGroup.hasResolvedValues) {
227+
if (stateGroup.hasResolvedValues()) {
228228
let message = `State "${this.block}${blockClass.asSource()}[${this.stateName}]" expects a value.`;
229229
throw new MalformedBlockPath(message, this.loc);
230230
} else {

packages/@css-blocks/language-server/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"mocha": "^6.1.4",
2626
"sass": "^1.23.7",
2727
"tslint": "^5.9.1",
28-
"typescript": "~3.6",
28+
"typescript": "~3.7",
2929
"watch": "^1.0.2"
3030
},
3131
"scripts": {

packages/@css-blocks/playground/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"ember-cli-tslint": "^0.1.3",
3030
"ember-cli-uglify": "^3.0.0",
3131
"qunitjs": "^2.3.3",
32-
"typescript": "~3.5"
32+
"typescript": "~3.7"
3333
},
3434
"engines": {
3535
"node": "6.* || 8.* || >= 10.*"

packages/@css-blocks/vscode/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
},
2828
"main": "./dist/extension",
2929
"scripts": {
30-
"vscode:prepublish": "npx -p typescript@~3.6 tsc",
30+
"vscode:prepublish": "npx -p typescript@~3.7 tsc",
3131
"update-vscode": "vscode-install",
3232
"postinstall": "vscode-install || echo 'failed to install vscode for local development.'",
3333
"compile": "tsc --build",

packages/tsconfig.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,17 @@
33
"references": [
44
{"path": "@css-blocks/bem-to-blocks"},
55
{"path": "@css-blocks/broccoli"},
6-
{"path": "@css-blocks/core"},
76
{"path": "@css-blocks/cli"},
7+
{"path": "@css-blocks/config"},
8+
{"path": "@css-blocks/core"},
9+
{"path": "@css-blocks/eyeglass"},
810
{"path": "@css-blocks/glimmer"},
911
{"path": "@css-blocks/glimmer/tsconfig.amd.json"},
1012
{"path": "@css-blocks/jsx"},
13+
{"path": "@css-blocks/language-server"},
1114
{"path": "@css-blocks/runtime"},
1215
{"path": "@css-blocks/test-utils"},
13-
{"path": "@css-blocks/webpack"},
14-
{"path": "@css-blocks/language-server"},
15-
{"path": "@css-blocks/vscode"}
16+
{"path": "@css-blocks/vscode"},
17+
{"path": "@css-blocks/webpack"}
1618
]
1719
}

yarn.lock

+5-4
Original file line numberDiff line numberDiff line change
@@ -15789,13 +15789,14 @@ [email protected]:
1578915789
version "3.2.4"
1579015790
resolved "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz#c585cb952912263d915b462726ce244ba510ef3d"
1579115791

15792-
typescript@~3.5, typescript@~3.5.3:
15792+
typescript@~3.5.3:
1579315793
version "3.5.3"
1579415794
resolved "https://registry.npmjs.org/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977"
1579515795

15796-
typescript@~3.6:
15797-
version "3.6.4"
15798-
resolved "https://registry.npmjs.org/typescript/-/typescript-3.6.4.tgz#b18752bb3792bc1a0281335f7f6ebf1bbfc5b91d"
15796+
typescript@~3.7:
15797+
version "3.7.5"
15798+
resolved "https://registry.npmjs.org/typescript/-/typescript-3.7.5.tgz#0692e21f65fd4108b9330238aac11dd2e177a1ae"
15799+
integrity sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==
1579915800

1580015801
uc.micro@^1.0.1, uc.micro@^1.0.5:
1580115802
version "1.0.6"

0 commit comments

Comments
 (0)