Skip to content

Commit

Permalink
Moving astro website to the root (#4846)
Browse files Browse the repository at this point in the history
timotheeguerin authored Oct 23, 2024
1 parent e600be5 commit 1832801
Showing 99 changed files with 51 additions and 68 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/website-gh-pages.yml
Original file line number Diff line number Diff line change
@@ -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:
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -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/
2 changes: 1 addition & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion eng/common/CredScanSuppression.json
Original file line number Diff line number Diff line change
@@ -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."
}
]
2 changes: 1 addition & 1 deletion eng/tsp-core/pipelines/pr-tools.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion eslint.config.js
Original file line number Diff line number Diff line change
@@ -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
8 changes: 0 additions & 8 deletions packages/website-astro/public/favicon.svg

This file was deleted.

Binary file removed packages/website-astro/src/assets/houston.webp
Binary file not shown.
92 changes: 41 additions & 51 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pnpm-workspace.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
packages:
- "packages/*"
- "e2e"
- "website"
- "!packages/http-client-csharp/**"
- "!packages/http-client-java/**"
- "!packages/http-client-python/**"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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 = {
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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",
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Empty file added website/src/content/docs/.keep
Empty file.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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";
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 1832801

Please sign in to comment.