Skip to content

build: unify TypeScript on 5.9 and @types/node on 22 #1150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vezwork merged 1 commit into from
Sep 25, 2026
Merged

build: unify TypeScript on 5.9 and @types/node on 22 #1150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/lsp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@
},
"devDependencies": {
"@types/js-yaml": "^4.0.5",
"@types/node": "^20.10.6",
"@types/node": "^22.15.0",
"@types/picomatch": "^2.3.0",
"build": "*",
"esbuild": "^0.16.7",
"eslint": "^7.32.0",
"eslint-config-custom-server": "*",
"tsconfig": "*",
"tsx": "^3.12.1",
"typescript": "^4.5.2"
"typescript": "^5.9.3"
}
}
2 changes: 1 addition & 1 deletion apps/panmirror/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"eslint": "^7.32.0",
"eslint-config-custom": "*",
"tsconfig": "*",
"typescript": "^4.5.2",
"typescript": "^5.9.3",
"vite": "^3.0.0",
"vite-plugin-css-injected-by-js": "^2.1.1",
"vite-plugin-static-copy": "^0.13.0"
Expand Down
3 changes: 1 addition & 2 deletions apps/quarto-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@
"types": "./src/index.ts",
"dependencies": {
"tsconfig": "*",
"typescript": "^4.5.2",
"vscode-uri": "^3.0.3"
},
"devDependencies": {
"@types/node": "^20.10.6"
"@types/node": "^22.15.0"
}
}
2 changes: 1 addition & 1 deletion apps/vscode-editor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"eslint-config-custom": "*",
"sass": "^1.56.1",
"tsconfig": "*",
"typescript": "^4.5.2",
"typescript": "^5.9.3",
"vite": "^3.0.0",
"vite-plugin-static-copy": "^0.13.0"
}
Expand Down
2 changes: 1 addition & 1 deletion apps/vscode-markdownit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"eslint": "^7.32.0",
"eslint-config-custom": "*",
"tsconfig": "*",
"typescript": "^4.5.2",
"typescript": "^5.9.3",
"vite": "^3.0.0",
"vite-plugin-static-copy": "^0.13.0"
}
Expand Down
4 changes: 2 additions & 2 deletions apps/vscode/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1564,7 +1564,7 @@
"@types/markdown-it": "^12.2.3",
"@types/markdown-it-highlightjs": "^3.3.1",
"@types/mocha": "^9.1.0",
"@types/node": "16.x",
"@types/node": "^22.15.0",
"@types/picomatch": "^2.3.0",
"@types/semver": "^7.3.13",
"@types/tmp": "^0.2.3",
Expand All @@ -1583,7 +1583,7 @@
"mocha": "^9.2.1",
"plist": "^3.0.6",
"tsx": "^3.12.1",
"typescript": "^4.9.3",
"typescript": "^5.9.3",
"vsce": "^2.15.0",
"vscode-languageserver": "^8.1.0",
"vscode-languageserver-textdocument": "^1.0.4"
Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"eslint": "^7.32.0",
"eslint-config-custom": "*",
"prettier": "^2.5.1",
"turbo": "^1.8.5"
"turbo": "^1.8.5",
"typescript": "^5.9.3"
}
}
1 change: 0 additions & 1 deletion packages/_annotated-json/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"types": "src/index.ts",
"dependencies": {
"tsconfig": "*",
"typescript": "^5.4.2",
"@quarto/_mapped-string": "*",
"@quarto/_tidyverse-errors": "*"
},
Expand Down
1 change: 0 additions & 1 deletion packages/_json-validator/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"dependencies": {
"tsconfig": "*",
"build": "*",
"typescript": "^5.4.2",
"regexpp": "^3.2.0",
"ansi-colors": "^4.1.3",
"@quarto/_mapped-string": "*",
Expand Down
1 change: 0 additions & 1 deletion packages/_mapped-string/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"types": "src/index.ts",
"dependencies": {
"tsconfig": "*",
"typescript": "^5.4.2",
"ansi-colors": "^4.1.3",
"@quarto/_tidyverse-errors": "*"
},
Expand Down
1 change: 0 additions & 1 deletion packages/_tidyverse-errors/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"types": "./src/index.ts",
"dependencies": {
"tsconfig": "*",
"typescript": "^5.4.2",
"ansi-colors": "^4.1.3"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/annotated-json/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
"types": "dist/cjs/index.d.ts",
"files": ["dist"],
"dependencies": {
"tsconfig": "*",
"typescript": "^5.4.2",
"@quarto/mapped-string": "^0.1.8",
"@quarto/tidyverse-errors": "^0.1.9"
},
"devDependencies": {
"tsx": "^4.7.1"
"tsconfig": "*",
"tsx": "^4.7.1",
"typescript": "^5.9.3"
},
"scripts": {
"build": "npm run build:cjs",
Expand Down
3 changes: 1 addition & 2 deletions packages/build/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
"devDependencies": {
"esbuild": "^0.16.7",
"esbuild-plugin-copy": "^2.0.1",
"tsconfig": "*",
"typescript": "^4.5.2"
"tsconfig": "*"
},
"dependencies": {}
}
3 changes: 1 addition & 2 deletions packages/core-browser/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"dependencies": {
"core": "*",
"jayson": "^4.0.0",
"tsconfig": "*",
"typescript": "^4.5.2"
"tsconfig": "*"
}
}
1 change: 0 additions & 1 deletion packages/core-node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"core": "*",
"jayson": "^4.0.0",
"tsconfig": "*",
"typescript": "^4.5.2",
"vscode-languageclient": "^8.1.0",
"vscode-languageserver": "^8.1.0"
}
Expand Down
1 change: 0 additions & 1 deletion packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"markdown-it": "^13.0.1",
"markdown-it-attrs": "^4.1.6",
"tsconfig": "*",
"typescript": "^4.5.2",
"wcwidth": "^1.0.1"
},
"devDependencies": {
Expand Down
1 change: 0 additions & 1 deletion packages/editor-codemirror/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
"prosemirror-model": "^1.18.2",
"prosemirror-state": "^1.4.2",
"tsconfig": "*",
"typescript": "^4.5.2",
"vscode-languageserver-types": "^3.17.3",
"@lezer/highlight": "^1.1.3",
"lodash.debounce": "^4.0.8",
Expand Down
3 changes: 1 addition & 2 deletions packages/editor-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"dependencies": {
"core": "*",
"editor-types": "*",
"tsconfig": "*",
"typescript": "^4.5.2"
"tsconfig": "*"
}
}
3 changes: 1 addition & 2 deletions packages/editor-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,12 @@
"quarto-core": "*",
"tmp": "^0.2.7",
"tsconfig": "*",
"typescript": "^4.5.2",
"uuid": "^9.0.0",
"vscode-languageserver-types": "^3.17.3",
"vscode-uri": "^3.0.3"
},
"devDependencies": {
"@types/node": "^18.11.17",
"@types/node": "^22.15.0",
"@types/tmp": "^0.2.3",
"vscode-languageserver": "^8.1.0"
}
Expand Down
1 change: 0 additions & 1 deletion packages/editor-types/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"types": "./src/index.ts",
"dependencies": {
"tsconfig": "*",
"typescript": "^4.5.2",
"vscode-languageserver-types": "^3.17.3"
}
}
3 changes: 1 addition & 2 deletions packages/editor-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
"@types/react-dom": "^18.2.4",
"@types/react-transition-group": "^4.4.5",
"@types/typo-js": "^1.2.0",
"tsconfig": "*",
"typescript": "^4.5.2"
"tsconfig": "*"
}
}
1 change: 0 additions & 1 deletion packages/editor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
"thenby": "^1.3.3",
"tlite": "^0.1.9",
"transliteration": "^2.2.0",
"typescript": "^4.5.2",
"use-debounce": "^9.0.2",
"vscode-languageserver-types": "^3.17.3",
"zenscroll": "^4.0.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/editor/src/nodes/rmd_chunk/rmd_chunk-image.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ function imagePreviewDecorations(state: EditorState, uiContext: EditorUIContext)
const decorations: Decoration[] = [];
findChildrenByType(state.doc, state.schema.nodes.rmd_chunk).forEach(rmdChunk => {
// look for a line with knitr::include_graphics
const match = rmdChunk.node.textContent.match(/^(knitr::)?include_graphics\((['"])([^\2]+)\2/m);
const match = rmdChunk.node.textContent.match(/^(knitr::)?include_graphics\((['"])(.+?)\2/m);
if (match) {
// see if we can also find an out.width on the first line
let width = '';
Expand Down
8 changes: 4 additions & 4 deletions packages/json-validator/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@
"types": "dist/cjs/index.d.ts",
"files": ["dist"],
"dependencies": {
"tsconfig": "*",
"build": "*",
"typescript": "^5.4.2",
"regexpp": "^3.2.0",
"ansi-colors": "^4.1.3",
"@quarto/mapped-string": "^0.1.8",
"@quarto/tidyverse-errors": "^0.1.9",
"@quarto/annotated-json": "^0.1.4"
},
"devDependencies": {
"tsx": "^4.7.1"
"build": "*",
"tsconfig": "*",
"tsx": "^4.7.1",
"typescript": "^5.9.3"
},
"scripts": {
"build": "npm run build:cjs",
Expand Down
6 changes: 3 additions & 3 deletions packages/mapped-string/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
"types": "dist/cjs/index.d.ts",
"files": ["dist"],
"dependencies": {
"tsconfig": "*",
"typescript": "^5.4.2",
"ansi-colors": "^4.1.3",
"@quarto/tidyverse-errors": "^0.1.9"
},
"devDependencies": {
"tsx": "^4.7.1"
"tsconfig": "*",
"tsx": "^4.7.1",
"typescript": "^5.9.3"
},
"scripts": {
"build": "npm run build:cjs",
Expand Down
1 change: 0 additions & 1 deletion packages/quarto-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"markdown-it-attrs": "^4.1.6",
"semver": "^7.3.8",
"tsconfig": "*",
"typescript": "^4.5.2",
"vscode-languageserver-types": "^3.17.3",
"vscode-uri": "^3.0.3"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/tidyverse-errors/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
"types": "./dist/cjs/index.d.ts",
"files": ["dist"],
"dependencies": {
"tsconfig": "*",
"typescript": "^5.4.2",
"ansi-colors": "^4.1.3"
},
"devDependencies": {
"tsx": "^4.7.1"
"tsconfig": "*",
"tsx": "^4.7.1",
"typescript": "^5.9.3"
},
"scripts": {
"build": "npm run build:cjs",
Expand Down
3 changes: 1 addition & 2 deletions packages/ui-widgets/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
"flat": "^5.0.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"tsconfig": "*",
"typescript": "^4.5.2"
"tsconfig": "*"
},
"devDependencies": {
"@types/flat": "^5.0.2"
Expand Down
41 changes: 13 additions & 28 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2167,16 +2167,6 @@
resolved "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz"
integrity sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==

"@types/node@*", "@types/node@^18.11.17":
version "18.11.18"
resolved "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz"
integrity sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==

"@types/node@16.x":
version "16.18.11"
resolved "https://registry.npmjs.org/@types/node/-/node-16.18.11.tgz"
integrity sha512-3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA==

"@types/node@^12.12.54":
version "12.20.55"
resolved "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz"
Expand All @@ -2187,12 +2177,12 @@
resolved "https://registry.npmjs.org/@types/node/-/node-14.18.63.tgz"
integrity sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==

"@types/node@^20.10.6":
version "20.10.6"
resolved "https://registry.npmjs.org/@types/node/-/node-20.10.6.tgz"
integrity sha512-Vac8H+NlRNNlAmDfGUP7b5h/KA+AtWIzuXy0E6OyP8f1tCLYAtPvKRRDJjAPqhpCb0t6U2j7/xqAuLEebW2kiw==
"@types/node@*", "@types/node@^22.15.0":
version "22.20.4"
resolved "https://registry.yarnpkg.com/@types/node/-/node-22.20.4.tgz#37aab5e1beb215f4c036ea0e17343e59abf430de"
integrity sha512-zJRE40jpHtKqE/C4fgHrAKQLJuSpzEnP9ff9Y7YtoR3Wd2pwqzlekDeEuUQXjRd+QCYnVnNwuJYmhdk9XV8gvA==
dependencies:
undici-types "~5.26.4"
undici-types "~6.21.0"

"@types/orderedmap@^1.0.0":
version "1.0.0"
Expand Down Expand Up @@ -8215,15 +8205,10 @@ typedarray@^0.0.6:
resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==

typescript@^4.5.2, typescript@^4.9.3:
version "4.9.4"
resolved "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz"
integrity sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==

typescript@^5.4.2:
version "5.8.3"
resolved "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz"
integrity sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==
typescript@^5.9.3:
version "5.9.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.3.tgz#5b4f59e15310ab17a216f5d6cf53ee476ede670f"
integrity sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==

typo-js@^1.2.2:
version "1.2.2"
Expand Down Expand Up @@ -8255,10 +8240,10 @@ underscore@^1.12.1:
resolved "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz"
integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==

undici-types@~5.26.4:
version "5.26.5"
resolved "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz"
integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
undici-types@~6.21.0:
version "6.21.0"
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb"
integrity sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==

union@^0.5.0:
version "0.5.0"
Expand Down
Loading