Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .changeset/tough-friends-warn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"create-typescript-playground-plugin": patch
"@typescript/vfs": patch
"@typescript/twoslash": patch
---

Bump dependencies
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
with:
node-version: "18.x"
node-version: "20.x"
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0

- run: pnpm install
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-prod-static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
with:
node-version: "18.x"
node-version: "20.x"

- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
token: ${{ secrets.TS_BOT_TOKEN }}
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
with:
node-version: "18.x"
node-version: "20.x"
registry-url: "https://registry.npmjs.org/"
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0

Expand Down
2 changes: 0 additions & 2 deletions .npmrc

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

### Getting Started

This repo uses pnpm workspaces with node 18+, and [watchman](https://facebook.github.io/watchman/docs/install.html). (Windows users can install [watchman via chocolatey](https://chocolatey.org/packages/watchman))
This repo uses pnpm workspaces with node 20+, and [watchman](https://facebook.github.io/watchman/docs/install.html). (Windows users can install [watchman via chocolatey](https://chocolatey.org/packages/watchman))

With those set up, clone this repo and run `pnpm install`.

Expand Down
52 changes: 33 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,52 +2,66 @@
"private": true,
"name": "root",
"engines": {
"node": ">=18",
"pnpm": ">=9"
"node": ">= 20.19"
},
"devDependencies": {
"@changesets/changelog-github": "^0.5.0",
"@changesets/cli": "^2.27.5",
"@changesets/changelog-github": "^0.5.2",
"@changesets/cli": "^2.29.8",
"@oss-docs/sync": "^1.1.4",
"@types/express": "^4.17.6",
"@types/node": "^18.19.121",
"@types/react": "^18.3.2",
"@types/express": "^5.0.6",
"@types/node": "^25.2.3",
"@types/prettier": "^2.7.3",
"@types/react": "^18.3.28",
"chalk": "^4.1.2",
"concurrently": "^8.2.2",
"cross-env": "^7.0.2",
"concurrently": "^9.2.1",
"cross-env": "^10.1.0",
"danger": "^13.0.5",
"danger-plugin-lighthouse": "^0.5.2",
"danger-plugin-spellcheck": "^2.1.0",
"fb-watchman": "^2.0.1",
"glob": "^7.2.3",
"fb-watchman": "^2.0.2",
"glob": "^13.0.5",
"gray-matter": "4.0.3",
"reflect-metadata": "^0.1.13",
"prettier": "^2.8.8",
"reflect-metadata": "^0.2.2",
"remark": "^11.0.2",
"remark-html": "^10.0.0",
"remark-shiki-twoslash": "^3.1.3",
"serve-handler": "^6.1.2"
"serve-handler": "^6.1.6"
},
"pnpm": {
"overrides": {
"remark-shiki-twoslash>@typescript/twoslash": "link:./packages/ts-twoslasher",
"remark-shiki-twoslash>@typescript/vfs": "link:./packages/typescript-vfs",
"shiki-twoslash>@typescript/twoslash": "link:./packages/ts-twoslasher",
"shiki-twoslash>@typescript/vfs": "link:./packages/typescript-vfs",
"@types/react": "^18.2.77",
"@types/react": "^18.3.28",
"@types/estree": "0.0.46",
"@types/eslint": "7.29.0",
"assert": "2.0.0",
"rollup-plugin-typescript2": "0.36.0",
"typescript": "6.0.0-dev.20260213",
"tslib": "^2.6.2",
"prettier": "^2.0.2",
"sharp": "0.28.1"
},
"patchedDependencies": {
"react-server-dom-webpack@0.0.0-experimental-c8b778b7f-20220825": "patches/react-server-dom-webpack@0.0.0-experimental-c8b778b7f-20220825.patch",
"react-intl@3.12.1": "patches/react-intl@3.12.1.patch",
"gatsby-remark-shiki-twoslash@3.0.38": "patches/gatsby-remark-shiki-twoslash@3.0.38.patch"
}
},
"ignoredBuiltDependencies": [
"@parcel/watcher",
"core-js",
"core-js-pure",
"es5-ext",
"lmdb",
"msgpackr-extract",
"spawn-sync",
"unrs-resolver"
],
"onlyBuiltDependencies": [
"esbuild",
"gatsby",
"gatsby-cli",
"sharp"
]
},
"jest": {
"transformIgnorePatterns": [
Expand Down Expand Up @@ -75,5 +89,5 @@
],
"onlyPublishWithReleaseLabel": true
},
"packageManager": "pnpm@9.1.2+sha256.19c17528f9ca20bd442e4ca42f00f1b9808a9cb419383cd04ba32ef19322aba7"
"packageManager": "pnpm@10.30.0+sha512.2b5753de015d480eeb88f5b5b61e0051f05b4301808a82ec8b840c9d2adf7748eb352c83f5c1593ca703ff1017295bc3fdd3119abb9686efc96b9fcb18200937"
}
6 changes: 3 additions & 3 deletions packages/ata/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
"access": "public"
},
"devDependencies": {
"@types/jest": "^29.5.12",
"@types/jest": "^30.0.0",
"cpy-cli": "^3.1.1",
"esbuild": "^0.17.8",
"esbuild": "^0.27.3",
"esbuild-jest": "^0.5.0",
"jest": "^29.5.0"
"jest": "^30.2.0"
},
"peerDependencies": {
"typescript": ">=4.4.4"
Expand Down
6 changes: 2 additions & 4 deletions packages/community-meta/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@
"license": "MIT",
"version": "1.0.0",
"dependencies": {
"moment": "2.24.0",
"moment-timezone": "0.5.28"
"moment": "2.30.1",
"moment-timezone": "0.6.0"
},
"scripts": {
"build": "node scripts/generateRichMeetupData.js"
},
"devDependencies": {
}
}
6 changes: 3 additions & 3 deletions packages/create-typescript-playground-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
},
"scripts": {},
"dependencies": {
"cross-spawn": "^7.0.5",
"gunzip-maybe": "^1.4.1",
"tar-fs": "^2.1.0"
"cross-spawn": "^7.0.6",
"gunzip-maybe": "^1.4.2",
"tar-fs": "^3.1.1"
}
}
2 changes: 1 addition & 1 deletion packages/glossary/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
"semi": true
},
"devDependencies": {
"ts-node": "*"
"ts-node": "^10.9.2"
}
}
2 changes: 1 addition & 1 deletion packages/playground-examples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"devDependencies": {
"@types/fs-extra": "^11.0.4",
"fs-extra": "^11.2.0",
"fs-extra": "^11.3.3",
"json5": "^2.2.3"
}
}
2 changes: 1 addition & 1 deletion packages/playground-worker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"build": "esbuild index.ts --outdir=../typescriptlang-org/static/js/playground-worker --format=esm --target=es2020 --bundle"
},
"dependencies": {
"esbuild": "^0.17.8"
"esbuild": "^0.27.3"
},
"devDependencies": {
"typescript": "*"
Expand Down
10 changes: 5 additions & 5 deletions packages/playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
"dependencies": {
"@typescript/playground-worker": "workspace:*",
"@typescript/sandbox": "workspace:*",
"esbuild": "^0.17.8"
"esbuild": "^0.27.3"
},
"devDependencies": {
"@types/jest": "^29.5.12",
"@types/react": "^18.3.2",
"jest": "^29.5.0",
"@types/jest": "^30.0.0",
"@types/react": "^18.3.28",
"jest": "^30.2.0",
"monaco-editor": "^0.32.1",
"monaco-typescript": "^3.7.0",
"monaco-typescript": "^4.10.0",
"typescript": "*"
}
}
10 changes: 5 additions & 5 deletions packages/sandbox/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@
"lz-string": "^1.5.0"
},
"devDependencies": {
"@rollup/plugin-commonjs": "^25.0.7",
"@types/jest": "^29.5.12",
"@rollup/plugin-commonjs": "^29.0.0",
"@types/jest": "^30.0.0",
"dts-cli": "^2.0.5",
"jest": "^29.5.0",
"jest": "^30.2.0",
"monaco-editor": "^0.32.1",
"monaco-typescript": "^3.7.0",
"ts-jest": "^29.0.5",
"monaco-typescript": "^4.10.0",
"ts-jest": "^29.4.6",
"typescript": "*"
}
}
18 changes: 8 additions & 10 deletions packages/ts-twoslasher/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,14 @@
"lint": "dts lint"
},
"devDependencies": {
"@types/jest": "^29.5.12",
"@types/prettier": "^2.7.3",
"@types/jest": "^30.0.0",
"dts-cli": "^2.0.5",
"jest": "^29.5.0",
"jest-file-snapshot": "^0.3.8",
"markdown-magic": "^1.0.0",
"preact": "^10.5.13",
"prettier": "^2.3.2",
"ts-jest": "^29.0.5",
"tslib": "^2.6.2",
"jest": "^30.2.0",
"jest-file-snapshot": "^0.7.0",
"markdown-magic": "^4.8.0",
"preact": "^10.28.3",
"ts-jest": "^29.4.6",
"tslib": "^2.8.1",
"typescript": "*"
},
"jest": {
Expand All @@ -53,7 +51,7 @@
},
"dependencies": {
"@typescript/vfs": "workspace:*",
"debug": "^4.1.1",
"debug": "^4.4.3",
"lz-string": "^1.5.0"
},
"peerDependencies": {
Expand Down
16 changes: 8 additions & 8 deletions packages/tsconfig-reference/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
"license": "MIT",
"private": true,
"scripts": {
"generate:json:tsconfig": "tsc --build && node --experimental-json-modules scripts/tsconfig/generateJSON",
"generate:json:cli": "tsc --build && node --experimental-json-modules scripts/cli/generateJSON",
"generate:json:schema": "tsc --build && node --experimental-json-modules scripts/schema/generateJSON",
"generate:json:msbuild": "tsc --build && node --experimental-json-modules scripts/msbuild/generateJSON",
"generate:json:tsconfig": "tsc --build && node scripts/tsconfig/generateJSON",
"generate:json:cli": "tsc --build && node scripts/cli/generateJSON",
"generate:json:schema": "tsc --build && node scripts/schema/generateJSON",
"generate:json:msbuild": "tsc --build && node scripts/msbuild/generateJSON",
"generate:json": "pnpm generate:json:tsconfig && pnpm generate:json:cli && pnpm generate:json:schema && pnpm generate:json:msbuild",
"generate:md:tsconfig": "tsc --build && node --experimental-json-modules scripts/tsconfig/generateMarkdown",
"generate:md:cli": "tsc --build && node --experimental-json-modules scripts/cli/generateMarkdown",
"generate:md:msbuild": "tsc --build && node --experimental-json-modules scripts/msbuild/generateMarkdown",
"generate:md:tsconfig": "tsc --build && node scripts/tsconfig/generateMarkdown",
"generate:md:cli": "tsc --build && node scripts/cli/generateMarkdown",
"generate:md:msbuild": "tsc --build && node scripts/msbuild/generateMarkdown",
"generate:md": "pnpm generate:md:tsconfig && pnpm generate:md:cli && pnpm generate:md:tsconfig",
"download": "node scripts/schema/downloadSchemaBase.js",
"bootstrap": "pnpm generate:json",
Expand All @@ -25,7 +25,7 @@
},
"devDependencies": {
"@types/json-schema": "^7.0.15",
"ts-node": "*",
"ts-node": "^10.9.2",
"typescript": "*",
"typescript-for-docs": "npm:typescript@5.9.3",
"xml-js": "^1.6.11"
Expand Down
16 changes: 8 additions & 8 deletions packages/typescript-vfs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,18 @@
"typescript": false
},
"dependencies": {
"debug": "^4.1.1"
"debug": "^4.4.3"
},
"devDependencies": {
"@types/jest": "^29.5.12",
"babel-jest": "^29.7.0",
"@types/jest": "^30.0.0",
"babel-jest": "^30.2.0",
"cpy-cli": "^3.1.1",
"dts-cli": "^2.0.5",
"jest": "^29.5.0",
"jest-environment-jsdom": "^29.5.0",
"jest-watch-typeahead": "^2.2.2",
"ts-jest": "^29.0.5",
"tslib": "^2.6.2",
"jest": "^30.2.0",
"jest-environment-jsdom": "^30.2.0",
"jest-watch-typeahead": "^3.0.1",
"ts-jest": "^29.4.6",
"tslib": "^2.8.1",
"typescript": "*"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/typescript-vfs/test/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ it("creates a map from the CDN and stores it in local storage cache", async () =

libs.forEach(l => expect(map.get("/" + l)).toBeDefined())

expect(store.setItem).toBeCalledTimes(libs.length)
expect(store.setItem).toHaveBeenCalledTimes(libs.length)
})

it("creates a map from the CDN and uses the existing local storage cache", async () => {
Expand All @@ -160,7 +160,7 @@ it("creates a map from the CDN and uses the existing local storage cache", async
libs.forEach(l => expect(map.get("/" + l)).toBeDefined())

// Should be one less fetch, and the first item would be from the cache instead
expect(store.setItem).toBeCalledTimes(libs.length - 1)
expect(store.setItem).toHaveBeenCalledTimes(libs.length - 1)
expect(map.get("/" + libs[0])).toMatchInlineSnapshot(`"// From Cache"`)
})

Expand Down
6 changes: 6 additions & 0 deletions packages/typescriptlang-org/gatsby-node.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ config.onPostBootstrap = () => writeAllPathsToFixture();
// see: https://github.com/gatsbyjs/gatsby/issues/17661

config.onCreateWebpackConfig = ({ loaders, actions, plugins, stage }) => {
const isSSR = stage === `build-html` || stage === `develop-html`;

actions.setWebpackConfig({
module: {
rules: [
Expand All @@ -32,6 +34,10 @@ config.onCreateWebpackConfig = ({ loaders, actions, plugins, stage }) => {
pnpapi: "commonjs pnpapi",
fs: "commonjs fs",
module: "commonjs module",
// In SSR stages, use Node's native util module instead of the browser
// polyfill (util@0.12.5), which lacks TextEncoder and breaks react-dom
// server rendering on Node >= 19.
...(isSSR ? { util: "commonjs util" } : {}),
},
resolve: {
fallback: {
Expand Down
Loading