Skip to content

Commit 70ad3da

Browse files
committed
update typescript and lage
1 parent d0e16e8 commit 70ad3da

8 files changed

Lines changed: 89 additions & 299 deletions

File tree

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"type": "patch",
5+
"comment": "Update typescript to v6.0",
6+
"packageName": "beachball",
7+
"email": "elcraig@microsoft.com",
8+
"dependentChangeType": "patch"
9+
}
10+
]
11+
}

package.json

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
],
1717
"scripts": {
1818
"beachball": "node ./packages/beachball/lib/cli.js",
19-
"build": "yarn lage build",
19+
"build": "lage build",
2020
"bump": "yarn beachball bump",
2121
"change": "yarn beachball change",
2222
"checkchange": "yarn beachball check",
@@ -25,20 +25,18 @@
2525
"format": "prettier --write .",
2626
"format:check": "prettier --check .",
2727
"prepare": "husky install",
28-
"lage": "cross-env NODE_OPTIONS=\"--experimental-abortcontroller\" lage",
2928
"lint": "yarn lint:deps && yarn lint:versions && yarn lint:marketplace && yarn lint:code",
3029
"lint:ci": "yarn lint:deps --verbose && yarn lint:versions && yarn lint:marketplace && yarn lint:code --verbose",
31-
"lint:code": "yarn lage lint",
32-
"lint:deps": "yarn lage depcheck",
30+
"lint:code": "lage lint",
31+
"lint:deps": "lage depcheck",
3332
"lint:versions": "yarn syncpack:check",
3433
"lint:marketplace": "node scripts/lintMarketplace.js",
35-
"postinstall": "patch-package",
3634
"release:canary": "yarn beachball canary -y",
3735
"release:docs": "echo \"Run this from the docs folder instead\" && exit 1",
3836
"syncpack:check": "syncpack list-mismatches",
3937
"syncpack:update": "syncpack fix-mismatches",
40-
"test": "yarn lage test",
41-
"update-snapshots": "yarn lage update-snapshots"
38+
"test": "lage test",
39+
"update-snapshots": "lage update-snapshots"
4240
},
4341
"lint-staged": {
4442
"*": [
@@ -52,20 +50,18 @@
5250
"@typescript-eslint/eslint-plugin": "^5.0.0",
5351
"@typescript-eslint/parser": "^5.0.0",
5452
"@typescript-eslint/utils": "^5.0.0",
55-
"cross-env": "^7.0.0",
5653
"depcheck": "^1.4.7",
5754
"eslint": "^8.0.0",
5855
"eslint-config-prettier": "^10.1.8",
5956
"eslint-plugin-etc": "^2.0.3",
6057
"husky": "^8.0.0",
6158
"jest": "^29.0.0",
62-
"lage": "2.4.0",
59+
"lage": "^2.15.0",
6360
"lint-staged": "^12.0.0",
64-
"patch-package": "^8.0.1",
6561
"prettier": "~2.8.4",
6662
"syncpack": "^9.0.0",
6763
"ts-jest": "29.2.6",
68-
"typescript": "~5.2.0"
64+
"typescript": "~6.0.0"
6965
},
7066
"resolutions": {
7167
"@types/node": "^22.0.0",
@@ -86,7 +82,6 @@
8682
},
8783
"rationale": {
8884
"devDependencies": {
89-
"lage@2.4.0": "Pin to newest version that supports node 14",
9085
"ts-jest@29.2.6": "29.3.0 introduces type-fest v4 which requires node 16+"
9186
},
9287
"resolutions": {

packages/beachball/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"name": "beachball",
33
"version": "3.0.0-alpha.0",
44
"description": "The Sunniest Semantic Version Bumper",
5+
"type": "commonjs",
56
"repository": {
67
"type": "git",
78
"url": "https://github.com/microsoft/beachball"
@@ -21,7 +22,7 @@
2122
],
2223
"scripts": {
2324
"beachball": "node ./lib/cli.js",
24-
"build": "yarn run -T tsc",
25+
"build": "yarn run -T tsc --pretty",
2526
"depcheck": "yarn run -T depcheck .",
2627
"lint": "yarn run -T eslint --color --max-warnings=0 src",
2728
"start": "yarn run -T tsc -w --preserveWatchOutput",

patches/lage+2.4.0.patch

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

scripts/config/tsconfig.base.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
"compilerOptions": {
33
// compatible with node 22
44
"target": "ES2024",
5-
"module": "commonjs",
6-
"moduleResolution": "node",
5+
// Use CJS output for now
6+
"module": "node20",
7+
"moduleResolution": "node16",
8+
// For some reason, jest is failing with this error which isn't even an option specified...
9+
// TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0
10+
"ignoreDeprecations": "6.0",
711
"declaration": true,
812
"declarationMap": true,
913
"sourceMap": true,
10-
"strict": true,
11-
"noUnusedLocals": true,
12-
"forceConsistentCasingInFileNames": true,
13-
"esModuleInterop": true,
1414
"skipLibCheck": true,
1515
"lib": ["ES2024"],
1616
"types": ["node"]

scripts/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
"version": "1.0.0",
44
"private": true,
55
"license": "MIT",
6+
"scripts": {
7+
"build": "yarn run -T tsc --noEmit"
8+
},
69
"devDependencies": {
710
"workspace-tools": "^0.41.6"
811
}

scripts/tsconfig.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"extends": "./config/tsconfig.base.json",
3+
"compilerOptions": {
4+
"noEmit": true,
5+
"allowJs": true,
6+
"checkJs": true
7+
},
8+
"include": ["."],
9+
"exclude": ["node_modules"]
10+
}

0 commit comments

Comments
 (0)