Skip to content
Closed
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
75 changes: 0 additions & 75 deletions .github/workflows/v2-merged-staging.yml

This file was deleted.

6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
### Meta

- **URLs:** [production](https://www.typescriptlang.org), [staging](http://www.staging-typescript.org/)
- **Admin:** Prod: [Azure Portal](https://ms.portal.azure.com/#@microsoft.onmicrosoft.com/resource/subscriptions/99160d5b-9289-4b66-8074-ed268e739e8e/resourceGroups/Default-Web-WestUS/providers/Microsoft.Web/sites/TypeScript-1ebb3390-2634-4956-a955-eab987b7bb25/appServices), [Deploy logs](https://ms.portal.azure.com/#@microsoft.onmicrosoft.com/resource/subscriptions/99160d5b-9289-4b66-8074-ed268e739e8e/resourceGroups/Default-Web-WestUS/providers/Microsoft.Web/sites/TypeScript-1ebb3390-2634-4956-a955-eab987b7bb25/vstscd), [App Insights](https://ms.portal.azure.com/#@microsoft.onmicrosoft.com/resource/subscriptions/57bfeeed-c34a-4ffd-a06b-ccff27ac91b8/resourceGroups/typescriptlang-org/providers/microsoft.insights/components/TypeScriptLang-Prod-Ai/overview)
- **Translations:** [microsoft/TypeScript-Website-Localizations](https://github.com/microsoft/TypeScript-Website-Localizations)

Expand Down Expand Up @@ -33,15 +32,14 @@ Some useful knowledge you need to know:
- All packages have: `yarn build` and `yarn test`
- All packages use [debug](https://www.npmjs.com/package/debug) - which means you can do `env DEBUG="*" yarn test` to get verbose logs

You can manually via GH Actions for [production here](https://github.com/microsoft/TypeScript-Website/actions?query=workflow%3A%22Monday+Website+Push+To+Production%22) and [staging here](https://github.com/microsoft/TypeScript-Website/actions?query=workflow%3A%22Build+Website+To+Staging%22).
You can manually via GH Actions for [production here](https://github.com/microsoft/TypeScript-Website/actions?query=workflow%3A%22Monday+Website+Push+To+Production%22)

Having issues getting set up? [Consult the troubleshooting](./docs/Setup%20Troubleshooting.md).

## Deployment

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)

You can find the build logs in [GitHub Actions](https://github.com/microsoft/TypeScript-Website/actions)
Expand Down Expand Up @@ -103,7 +101,7 @@ yarn workspace tsconfig-reference run lint resolveJson

## Documentation

The docs for TypeScript. Originally ported over from [microsoft/TypeScript-Handbook](https://github.com/microsoft/TypeScript-Handbook/) then intermingled with [microsoft/TypeScript-New-Handbook](https://github.com/microsoft/TypeScript-New-Handbook), and finally updated for [Twoslash](http://www.staging-typescript.org/dev/twoslash/) and with new content.
The docs for TypeScript. Originally ported over from [microsoft/TypeScript-Handbook](https://github.com/microsoft/TypeScript-Handbook/) then intermingled with [microsoft/TypeScript-New-Handbook](https://github.com/microsoft/TypeScript-New-Handbook)and with new content.

## JSON Schema

Expand Down
2 changes: 0 additions & 2 deletions docs/Converting Twoslash Code Samples.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,3 @@ x = [10, "hello"];
````

---

A twoslash code sample can do _a lot_ - the best documentation for twoslash lives inside the [bug workbench](https://www.staging-typescript.org/dev/bug-workbench) where you can test your code sample live and read how it all works.
1 change: 0 additions & 1 deletion docs/Something Went Wrong.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ We're currently running on App Service, the places where you can find info:
The build to deploy train normally looks like this:

- `v2` branch gets pushed:
- A deploy is made to azure blob storage via [`.github/workflows/v2-merged-staging.yml`](https://github.com/microsoft/TypeScript-website/blob/v2/.github/workflows/v2-merged-staging.yml)
- Every Monday, a deploy is made from v2 to the production app via [`.github/workflows/deploy-prod.yml`](https://github.com/microsoft/TypeScript-website/blob/v2/.github/workflows/deploy-prod.yml)

You can deploy `v2` to production anytime via the ["Run workflow" button here](https://github.com/microsoft/TypeScript-Website/actions?query=workflow%3A%22Monday+Website+Push+To+Production%22), so if you have an emergency commit - it goes to `v2` then you can run the action.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ The route to handle this is via rollup:

## Deployment

This module should be deployed to npm when you would like the world to see it, this may mean making your code handle a staging vs production environment (because the URLs will be different.)
This module should be deployed to npm when you would like the world to see it, this may mean making your code handle a production environment (because the URLs will be different.)

For example, this is how you can handle getting the URL for a CSS file which is included in your `dist` folder:

Expand All @@ -57,7 +57,7 @@ const cssHref = isDev ? "http://localhost:5000/slideshow.css" : unpkgURL

### Post-Deploy

Once this is deployed, you can test it on the TypeScript playground by passing in the name of your plugin on npm to the custom plugin box. This is effectively your staging environment.
Once this is deployed, you can test it on the TypeScript playground by passing in the name of your plugin on npm to the custom plugin box.

Once you're happy and it's polished, you can apply to have it in the default plugin list.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const go = async () => {
if (!existsSync(vendor)) mkdirSync(vendor)
if (!existsSync(ds)) mkdirSync(ds)

const host = "https://www.staging-typescript.org"
const host = "https://www.typescriptlang.org"

// For playground-dev purposes
// const host = "http://localhost:8000";
Expand Down
2 changes: 1 addition & 1 deletion packages/ts-twoslasher/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ const b = "345"
```

Now returns correct query responses, I needed this for the bug workbench.
http://www.staging-typescript.org/dev/bug-workbench
https://www.typescriptlang.org/dev/bug-workbench

Also has a way to set the defaults for the config

Expand Down
1 change: 0 additions & 1 deletion packages/typescriptlang-org/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"update-static-assets": "node scripts/downloadSearchAssets.js",
"update-versions": "node scripts/getTypeScriptNPMVersions.js",
"setup-playground-cache-bust": "node scripts/cacheBustPlayground.mjs",
"setup-staging": "node scripts/setupStaging.mjs",
"create-lighthouse-json": "node scripts/createLighthouseJSON.js",
"compile-index-examples": "twoslash --reactAlso src/components/index/twoslash/*.ts src/components/index/twoslash/*.js src/components/index/twoslash/*.tsx src/components/index/twoslash/generated && node scripts/updateIndexTwoslashExamples.js",
"start": "gatsby develop",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const { join } = require("path")
const parser = require("xml-js")

const prRoot =
process.env.PR_DEPLOY_URL_ROOT || "https://www.staging-typescript.org/"
process.env.PR_DEPLOY_URL_ROOT || "https://www.typescriptlang.org/"

const go = async () => {
const sitemap = `${prRoot}/sitemap.xml`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const makeAToSitePath = path =>
`<a href='https://www.typescriptlang.org/${path}'>${path}</a>`

const makeAToPlaygroundSample = path =>
`<a href='https://www.staging-typescript.org/play/#example/${path}'>${path}</a>`
`<a href='https://www.typescriptlang.org/play/#example/${path}'>${path}</a>`

const makeAnchorAsNPMModule = path =>
`<a href='https://www.npmjs.com/package/${path}'>${path}</a>`
Expand Down
8 changes: 0 additions & 8 deletions packages/typescriptlang-org/scripts/setupStaging.mjs

This file was deleted.