Move preview to new deployment, pin dependencies, misc cleanup (#3091)

Co-authored-by: navya9singh <[email protected]>

Author: jakebailey

.github/dependabot.yml

@@ -0,0 +1,15 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'weekly'
+    groups:
+      github-actions:
+        patterns:
+          - '*'

.github/workflows/CI.yml

@@ -9,8 +9,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Check out, and set up the node/ruby infra
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
         with:
           node-version: "18.x"
 
@@ -32,7 +32,7 @@ jobs:
       # Verify it compiles
       - run: yarn build-site
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
         if: github.event_name == 'pull_request'
         with:
           name: site
@@ -74,8 +74,8 @@ jobs:
 
     steps:
       # Check out, and set up the node infra
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
         with:
           node-version: "18.x"
 

.github/workflows/close-preview.yml

@@ -15,6 +15,6 @@ jobs:
     steps:
       - uses: Azure/static-web-apps-deploy@v1
         with:
-          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_PROD }}
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_PREVIEW }}
           action: close
           app_location: /dev/null

.github/workflows/deploy-preview.yml

@@ -24,7 +24,7 @@ jobs:
     steps:
       - name: Get PR/workflow run info
         id: get-info
-        uses: actions/github-script@v7
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           script: |
             let pr;
@@ -104,7 +104,7 @@ jobs:
 
       - name: Download site build from PR
         if: ${{ steps.get-info.outputs.result != 'null' }}
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
         with:
           name: site
           path: site
@@ -116,7 +116,7 @@ jobs:
         if: ${{ steps.get-info.outputs.result != 'null' }}
         uses: Azure/static-web-apps-deploy@v1
         with:
-          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_PROD }}
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_PREVIEW }}
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           action: "upload"
           app_location: "site"
@@ -127,7 +127,7 @@ jobs:
       - name: Comment on PR
         # azure/static-web-apps-deploy seems to comment itself when the event is pull_request_target
         if: ${{ steps.get-info.outputs.result != 'null' && github.event_name != 'pull_request_target' }}
-        uses: actions/github-script@v7
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         env:
           PR_NUMBER: ${{ fromJson(steps.get-info.outputs.result).pr }}
           SITE_URL: ${{ steps.deploy.outputs.static_web_app_url }}

.github/workflows/deploy-prod-static.yml

@@ -1,4 +1,4 @@
-name: Deploy to Azure Static Web Apps
+name: Deploy to GitHub Pages
 
 on:
   push:
@@ -26,11 +26,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
         with:
           # Fetch the full history, to build attribution.json
           fetch-depth: 0
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
         with:
           node-version: "18.x"
           cache: yarn
@@ -53,16 +53,6 @@ jobs:
         env:
           YARN_CHECKSUM_BEHAVIOR: ignore
 
-      - name: Deploy
-        id: builddeploy
-        uses: Azure/static-web-apps-deploy@v1
-        with:
-          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_PROD }}
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          action: "upload"
-          app_location: "site"
-          skip_app_build: true
-      
       - name: Setup Pages
         uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b # v5
 
@@ -80,4 +70,4 @@ jobs:
     steps:      
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e # v4
+        uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e # v4

.github/workflows/keepalive.yml

@@ -11,7 +11,7 @@ jobs:
       contents: write
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
       - run: |
           if [[ $(git log --format="%H" --since "50 days" | head -c1 | wc -c) == 0 ]]; then
             git config user.email "[email protected]"

.github/workflows/publish-packages.yml

@@ -0,0 +1,44 @@
+name: Publish packages
+
+on:
+  push:
+    branches: [v2]
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      # Check out, and set up the node/ruby infra
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        with:
+          # Fetch the full history, to build attribution.json
+          fetch-depth: 0
+      - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        with:
+          node-version: "18.x"
+          registry-url: "https://registry.npmjs.org/"
+          cache: yarn
+
+      - name: Prepare website v2
+        run: |
+          yarn install
+          yarn docs-sync pull microsoft/TypeScript-Website-localizations#main 1
+          yarn bootstrap
+          yarn workspace typescriptlang-org setup-playground-cache-bust
+          yarn build
+        env:
+          YARN_CHECKSUM_BEHAVIOR: ignore
+
+      - name: Build website v2
+        run: |
+          yarn build-site
+          cp -r packages/typescriptlang-org/public site
+
+      # Deploy
+      - name: Deploy npm Packages
+        run: |
+          yarn pleb publish
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}

.github/workflows/update_teams.yml

@@ -80,3 +80,9 @@ packages/sandbox/src/release_data.ts
 packages/typescriptlang-org/src/lib/documentationNavigation.ts
 
 .idea/
+
+**/.vscode/*
+!**/.vscode/tasks.json
+!**/.vscode/settings.template.json
+!**/.vscode/launch.json
+!**/.vscode/extensions.json

.github/workflows/v2-merged-staging.yml

@@ -5,5 +5,5 @@
     "**/packages/typescriptlang-org/.cache/*": true
   },
   "typescript.tsdk": "node_modules/typescript/lib",
-  "deno.enable": false,
+  "deno.enable": false
 }

.gitignore

@@ -1,7 +1,6 @@
 ### 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)
+- **URLs:** [production](https://www.typescriptlang.org)
 - **Translations:** [microsoft/TypeScript-Website-Localizations](https://github.com/microsoft/TypeScript-Website-Localizations)
 
 ### Getting Started
@@ -33,8 +32,6 @@ 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).
-
 Having issues getting set up? [Consult the troubleshooting](./docs/Setup%20Troubleshooting.md).
 
 ## Deployment
@@ -102,7 +99,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).
 
 ## JSON Schema
 

.vscode/settings.json .vscode/settings.template.json

@@ -65,4 +65,4 @@ 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.
+A twoslash code sample can do _a lot_ - the best documentation for twoslash lives inside the [bug workbench](https://www.typescriptlang.org/dev/bug-workbench) where you can test your code sample live and read how it all works.

README.md

@@ -20,11 +20,10 @@ 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)
+- `v2` branch gets pushed
+- The website is deployed to GitHub pages
 
-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.
+You can deploy `v2` to production anytime via the ["Run workflow" button here](https://github.com/microsoft/TypeScript-Website/actions/workflows/deploy-prod-static.yml), so if you have an emergency commit - it goes to `v2` then you can run the action.
 
 App Service apps are configured by [`Web.config`](https://github.com/microsoft/TypeScript-website/blob/v2/packages/typescriptlang-org/static/Web.config). [Here's a reference on the format](https://hangouts.google.com/call/H553wrJ9d97l2LMpNh9hAEEE). I've seen files (`*.json` & `*.manifest`) be 404s on the site because they were not in the config.
 

docs/Converting Twoslash Code Samples.md

@@ -63,4 +63,4 @@ Once you're happy and it's polished, you can apply to have it in the default plu
 
 ## Support
 
-Ask questions either on the TypeScript Website issues](https://github.com/microsoft/TypeScript-Website/issues), or in the [TypeScript Community Discord](https://discord.gg/typescript) - in the TypeScript Website channel.
+Ask questions either on the [TypeScript Website issues](https://github.com/microsoft/TypeScript-Website/issues), or in the [TypeScript Community Discord](https://discord.gg/typescript) - in the TypeScript Website channel.