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
37 changes: 28 additions & 9 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: "16.x"
node-version: "18.x"

# Install, should be basically instant if cached
- run: yarn install
Expand All @@ -31,25 +31,44 @@ jobs:

# Verify it compiles
- run: yarn build-site
- run: cp -r packages/typescriptlang-org/public site

- uses: actions/upload-artifact@v4
if: github.event_name == 'pull_request'
with:
name: site
path: packages/typescriptlang-org/public

# Run all the package's tests
- run: yarn test
env:
CI: true

- uses: actions/upload-artifact@v4
if: github.event_name == 'pull_request'
with:
name: site
path: site

# danger for PR builds
- if: github.event_name == 'pull_request' && github.event.pull_request.base.repo.id == github.event.pull_request.head.repo.id
run: "yarn danger ci"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- run: |
git add .
if ! git diff --staged --exit-code --quiet; then
echo "This PR is missing some generated changes. Please update locally or merge the patch artifact."
echo ""
git diff --staged
git diff --staged > missing.patch
exit 1
fi
name: Check for uncommitted changes
id: check-diff
if: github.event_name == 'pull_request'

- name: Upload diff artifact
if: ${{ failure() && steps.check-diff.conclusion == 'failure' }}
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
with:
name: missing.patch
path: missing.patch

windows:
runs-on: windows-latest

Expand All @@ -58,7 +77,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: "16.x"
node-version: "18.x"

# Get local dependencies
- run: yarn 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 @@ -20,7 +20,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-node@v2
with:
node-version: "14.x"
node-version: "18.x"
cache: yarn

# Builds the modules, and boostraps the other modules
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/v2-merged-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-node@v2
with:
node-version: "16.x"
node-version: "18.x"
registry-url: "https://registry.npmjs.org/"
cache: yarn

Expand Down
13 changes: 13 additions & 0 deletions .yarn/patches/react-intl-npm-3.12.1-65fec75b25.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/lib/react-intl.d.ts b/lib/react-intl.d.ts
index e24bb8a41ecbf948de4c08486afb0efac36afad4..b9dec1e421f10923a27a806613d1f09ec31dec07 100644
--- a/lib/react-intl.d.ts
+++ b/lib/react-intl.d.ts
@@ -186,7 +186,7 @@ export declare interface IntlFormatters {
formatDisplayName(value: Parameters<DisplayNames['of']>[0], opts?: FormatDisplayNameOptions): string | undefined;
}

-export declare class IntlProvider extends React.PureComponent<OptionalIntlConfig, State> {
+export declare class IntlProvider extends React.PureComponent<React.PropsWithChildren<OptionalIntlConfig>, State> {
static displayName: string;
static defaultProps: Pick<IntlConfig, "formats" | "messages" | "timeZone" | "textComponent" | "defaultLocale" | "defaultFormats" | "onError">;
private cache;
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/cjs/react-server-dom-webpack-writer.node.production.min.server.js b/cjs/react-server-dom-webpack-writer.node.production.min.server.js
index 4394bdf1cfd80330b37fff9207d2c47a26e39ac9..ffa34990d303224cd1a24549e26c8f6a5a2c7d86 100644
--- a/cjs/react-server-dom-webpack-writer.node.production.min.server.js
+++ b/cjs/react-server-dom-webpack-writer.node.production.min.server.js
@@ -8,6 +8,8 @@
* LICENSE file in the root directory of this source tree.
*/
'use strict';var aa=require("util"),e=require("react"),k=null,l=0,m=!0;function p(a,b){a=a.write(b);m=m&&a}
+aa.TextEncoder = aa.TextEncoder || TextEncoder
+aa.TextDecoder = aa.TextDecoder || TextDecoder
function q(a,b){if("string"===typeof b){if(0!==b.length)if(2048<3*b.length)0<l&&(p(a,k.subarray(0,l)),k=new Uint8Array(2048),l=0),p(a,r.encode(b));else{var d=k;0<l&&(d=k.subarray(l));d=r.encodeInto(b,d);var c=d.read;l+=d.written;c<b.length&&(p(a,k),k=new Uint8Array(2048),l=r.encodeInto(b.slice(c),k).written);2048===l&&(p(a,k),k=new Uint8Array(2048),l=0)}}else 0!==b.byteLength&&(2048<b.byteLength?(0<l&&(p(a,k.subarray(0,l)),k=new Uint8Array(2048),l=0),p(a,b)):(d=k.length-l,d<b.byteLength&&(0===d?p(a,
k):(k.set(b.subarray(0,d),l),l+=d,p(a,k),b=b.subarray(d)),k=new Uint8Array(2048),l=0),k.set(b,l),l+=b.byteLength,2048===l&&(p(a,k),k=new Uint8Array(2048),l=0)));return m}var r=new aa.TextEncoder;function t(a){return r.encode(a)}var w=JSON.stringify,x=Symbol.for("react.module.reference"),y=Symbol.for("react.element"),ba=Symbol.for("react.fragment"),z=Symbol.for("react.provider"),ca=Symbol.for("react.forward_ref"),da=Symbol.for("react.memo"),A=Symbol.for("react.lazy"),B=Symbol.for("react.default_value");
function C(a,b,d,c,f,g,h){this.acceptsBooleans=2===b||3===b||4===b;this.attributeName=c;this.attributeNamespace=f;this.mustUseProperty=d;this.propertyName=a;this.type=b;this.sanitizeURL=g;this.removeEmptyString=h}var D="children dangerouslySetInnerHTML defaultValue defaultChecked innerHTML suppressContentEditableWarning suppressHydrationWarning style".split(" ");D.push("innerText","textContent");D.forEach(function(a){new C(a,0,!1,a,null,!1,!1)});
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

### Getting Started

This repo uses [yarn workspaces][y-wrk] with node 13+, 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 [yarn workspaces][y-wrk] 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))

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

Expand Down Expand Up @@ -41,8 +41,7 @@ Having issues getting set up? [Consult the troubleshooting](./docs/Setup%20Troub

Deployment is automatic:

- Pushes to the branch `v2` deploy to [staging](http://www.staging-typescript.org)
- On a Monday the v2 branch is deployed to [production](https://www.typescriptlang.org)
- Pushes to the branch `v2` deploy to [production](https://www.typescriptlang.org)

You can find the build logs in [GitHub Actions](https://github.com/microsoft/TypeScript-Website/actions)

Expand Down Expand Up @@ -125,7 +124,7 @@ The code samples used in the Playground split across many languages.

# Infra Packages

Most of these packages use [`tsdx`](https://tsdx.io).
Most of these packages use (a maintained [fork](https://github.com/weiran-zsd/dts-cli) of) [`tsdx`](https://tsdx.io).

## TS Twoslash

Expand Down
15 changes: 10 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"packages/*"
],
"engines": {
"node": ">=13, <= 16"
"node": ">=18"
},
"devDependencies": {
"concurrently": "^5.1.0",
Expand All @@ -19,14 +19,19 @@
"reflect-metadata": "^0.1.13"
},
"resolutions": {
"@types/react": "16.9.17",
"@types/react": "^18.2.77",
"@types/estree": "0.0.46",
"@types/eslint": "7.29.0",
"assert": "2.0.0",
"rollup-plugin-typescript2": "0.34.1",
"node-gyp": "5.1.0",
"typescript": "5.4.5",
"tslib": "2.6.0",
"prettier": "^2.0.2",
"shelljs": "0.8.4",
"sharp": "0.28.1"
"sharp": "0.28.1",
"react-server-dom-webpack@0.0.0-experimental-c8b778b7f-20220825": "patch:react-server-dom-webpack@npm%3A0.0.0-experimental-c8b778b7f-20220825#./.yarn/patches/react-server-dom-webpack-npm-0.0.0-experimental-c8b778b7f-20220825-b0e92c72ae.patch",
"react-intl@^3.12.1": "patch:react-intl@npm%3A3.12.1#./.yarn/patches/react-intl-npm-3.12.1-65fec75b25.patch"
},
"jest": {
"transformIgnorePatterns": [
Expand All @@ -48,8 +53,8 @@
"dependencies": {
"@oss-docs/sync": "^1.1.4",
"@types/express": "^4.17.6",
"gray-matter": "4.0.2",
"node-polyfill-webpack-plugin": "^1.1.0",
"gray-matter": "4.0.3",
"node-polyfill-webpack-plugin": "^2.0.1",
"serve-handler": "^6.1.2",
"xmldom": "^0.5.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/ata/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"devDependencies": {
"cpy-cli": "^3.1.1",
"esbuild": "^0.12.9",
"esbuild": "^0.17.8",
"esbuild-jest": "^0.5.0",
"jest": "^29.5.0"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@
"@types/lz-string": "^1.3.34"
},
"dependencies": {
"tslib": "^1.10.0"
"tslib": "^2.5.0"
}
}
2 changes: 1 addition & 1 deletion packages/playground-worker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"build": "esbuild index.ts --outdir=../typescriptlang-org/static/js/playground-worker --format=esm --target=es2020 --bundle"
},
"dependencies": {
"esbuild": "^0.13.4"
"esbuild": "^0.17.8"
},
"devDependencies": {
"typescript": "*"
Expand Down
2 changes: 1 addition & 1 deletion packages/playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"dependencies": {
"@typescript/playground-worker": "0.1.0",
"@typescript/sandbox": "0.1.2",
"esbuild": "^0.13.4"
"esbuild": "^0.17.8"
},
"devDependencies": {
"@types/jest": "^25.1.3",
Expand Down
Loading