Moving astro website to the root (#4846)

.github/workflows/website-gh-pages.yml

@@ -53,7 +53,7 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v1
         with:
-          path: ./packages/website-astro/dist
+          path: ./website/dist
 
   # Deployment job
   deploy:

.gitignore

@@ -207,7 +207,7 @@ vite.config.ts.timestamp-*
 # Api extractor
 packages/*/etc/
 docs/**/js-api/
-packages/website-astro/src/content/docs/current/**/js-api/
+website/src/content/docs/current/**/js-api/
 
 # VS Code test web temp files
 .vscode-test-web/

.prettierignore

@@ -45,7 +45,7 @@ packages/website/versioned_docs/**/standard-library/built-in-data-types.md
 
 # Auto generated version list
 packages/website/playground-versions.json
-packages/website-astro/playground-versions.json
+website/playground-versions.json
 
 # Auto generated built-in template list
 packages/compiler/templates/scaffolding.json

eng/common/CredScanSuppression.json

@@ -10,7 +10,7 @@
       "_justification": "Files contains publicly disclosed application key."
     },
     {
-      "file": ["packages/website-astro/algolia.ts"],
+      "file": ["website/algolia.ts"],
       "_justification": "Files contains publicly disclosed application key."
     }
   ]

eng/tsp-core/pipelines/pr-tools.yml

@@ -62,7 +62,7 @@ extends:
                       --destination \$web \
                       --account-name "tspwebsitepr" \
                       --destination-path $(TYPESPEC_WEBSITE_BASE_PATH) \
-                      --source "./packages/website-astro/dist/" \
+                      --source "./website/dist/" \
                       --overwrite
 
               - script: npx tsx eng/tsp-core/scripts/create-tryit-comment.ts

eslint.config.js

@@ -144,7 +144,7 @@ export default tsEslint.config(
       "**/website/build/**/*",
       "**/.astro/**/*",
       "**/.docusaurus/**/*",
-      "packages/website-astro/src/assets/**/*",
+      "website/src/assets/**/*",
       "packages/compiler/templates/**/*", // Ignore the templates which might have invalid code and not follow exactly our rules.
       "**/venv/**/*", // Ignore python virtual env
       "**/.vscode-test-web/**/*", // Ignore VSCode test web project

pnpm-workspace.yaml

@@ -1,6 +1,7 @@
 packages:
   - "packages/*"
   - "e2e"
+  - "website"
   - "!packages/http-client-csharp/**"
   - "!packages/http-client-java/**"
   - "!packages/http-client-python/**"

packages/website-astro/astro.config.mjs → website/astro.config.mjs

@@ -13,7 +13,7 @@ import { resolveSideBars } from "./sidebars";
 
 const base = process.env.TYPESPEC_WEBSITE_BASE_PATH ?? "/";
 
-const grammarPath = resolve(import.meta.dirname, "../../grammars/typespec.json");
+const grammarPath = resolve(import.meta.dirname, "../grammars/typespec.json");
 const tspGrammar = JSON.parse((await readFile(grammarPath)).toString());
 
 const typespecLang = {

packages/website-astro/package.json → website/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "version": "0.0.1",
   "scripts": {
-    "copy": "cp -r ../../docs/. ./src/content/docs/docs && cp -r ../website/static/. ./src/assets  && cp -r ../website/static/img/. ./public/img  && cp ../website/static/1ds-init.js ./public/1ds-init.js && cp -r ../../blog/. ./src/content/blog",
+    "copy": "cp -r ../docs/. ./src/content/docs/docs && cp -r ../packages/website/static/. ./src/assets  && cp -r ../packages/website/static/img/. ./public/img  && cp ../packages/website/static/1ds-init.js ./public/1ds-init.js && cp -r ../blog/. ./src/content/blog",
     "clean": "rimraf ./dist ./temp ./.astro",
     "dev": "astro dev",
     "start": "astro dev",

packages/website-astro/src/pages/playground.astro → website/src/pages/playground.astro

@@ -1,6 +1,6 @@
 ---
 import { AsyncPlayground } from "../components/react-pages/playground";
-import packageJson from "../../../compiler/package.json";
+import packageJson from "../../../packages/compiler/package.json";
 import { LoadingSpinner } from "../components/playground-component/loading-spinner";
 import BaseLayout from "../layouts/base-layout.astro";