Website V2

.github/workflows/release.yml

@@ -38,12 +38,12 @@ jobs:
 
       - name: Generate stdlib docs
         run: |
-          grain doc grain/stdlib -o src/stdlib --current-version=$(grain -v)
+          grain doc grain/stdlib -o src/content/docs/stdlib --current-version=$(grain -v)
 
       - name: Commit updates
         run: |
           git add src/getting_grain.md
-          git add src/stdlib/
+          git add src/content/docs/stdlib/
           git commit -m 'chore: Update website for ${{ github.event.inputs.tag }}'
 
       - name: Push updates

.gitignore

@@ -1,12 +1,32 @@
-.DS_Store
-Thumbs.db
-db.json
-*.log
+# build output
+dist/
+
+# generated types
+.astro/
+
+# dependencies
 node_modules/
-.deploy*/
-_multiconfig.yml
-/docs
-/guide
-/blog
-/try
+
+# logs
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# environment variables
+.env
+.env.production
+
+# macOS-specific files
+.DS_Store
+
+# jetbrains setting folder
+.idea/
+
+.vscode/
+
 /*.gr.wasm
+contributors.json
+
+# Local Netlify folder
+.netlify

.nvmrc

@@ -1 +1 @@
-16
+22

README.md

@@ -12,7 +12,7 @@ Documentation for the Grain programming language at [grain-lang.org](https://gra
 
 ## About
 
-This documentation site is a [Hexo](https://hexo.io/) site. All of the docs are generated from Markdown files, and Hexo builds a static website that is hosted on Netlify.
+This documentation site is an [Astro](https://astro.build/) site. All of the docs are generated from Markdown files, and the static bundle generated by Astro is hosted on Netlify.
 
 ## Contributing
 
@@ -34,9 +34,11 @@ git pull --recurse-submodules
 
 To make a change to a document, edit the corresponding Markdown file in [src](src). The file path matches the URL path after `/docs`, but if you have trouble finding the page you're looking for, you can click the "Edit on GitHub" button at the top of page on the website.
 
+Please note that standard library documentation is auto-generated from our standard library source with our documentation tool `grain doc`. If you'd like to make an edit to the standard library docs please do so in the corresponding source file in the main compiler monorepo found [here](https://github.com/grain-lang/grain/tree/main/stdlib). After editing the source file, you can run `grain doc stdlib -o stdlib --current-version=$(grain -v)` from the project root directory to generate the `.md` docs. The changes will be reflected on the website the next time we deploy changes for the next release!
+
 ### Adding a New Document
 
-Create your new Markdown file in `src`. You'll also need to update [docs_config.yml](docs_config.yml) to include your new page in the sidebar. Each document starts with some front-matter, which is a bit of yml/json that is given to the renderer. For now, this only includes the title of the page. Since the title of the page is an `h1`, headers in your document should begin at level 2:
+Create your new Markdown file in the desired location within `src/content/docs`. Each document starts with some front-matter, which is a bit of yaml that is given to the renderer. Since the title of the page is an `h1`, headers in your document should begin at level 2:
 
 ```markdown
 ---
@@ -48,20 +50,11 @@ title: Some Title of Some Topic
 
 ### Previewing the Site
 
-Once a PR is created, Netlify will create a preview site and comment on the PR with a link. If you'd like to view your changes locally,
-
-For the docs, run:
-
-```sh
-npm install
-npm run start-docs
-```
-
-For the blog, run:
+Once a PR is created, Netlify will create a preview site and comment on the PR with a link. If you'd like to view your changes locally (Node v18+ required):
 
 ```sh
 npm install
-npm run start-blog
+npm run dev
 ```
 
-This will install all build dependencies and serve the website on port 3000.
+This will install all build dependencies and serve the website on port 4321.

astro.config.mjs

@@ -0,0 +1,84 @@
+import { defineConfig } from "astro/config";
+import tailwind from "@astrojs/tailwind";
+import svelte from "@astrojs/svelte";
+import rehypeAutolinkHeadings from "rehype-autolink-headings";
+import rehypeSlug from "rehype-slug";
+import path from "node:path";
+import { createRequire } from "node:module";
+import * as fs from "node:fs";
+import rehypeContentIntroTextTransformer from "./src/rehype/rehype-content-intro-text-transformer";
+import rehypeAutolinkHeadingsConfig from "./src/rehype/rehype-autolink-headings-config";
+import rehypeTableWrapper from "./src/rehype/rehype-table-wrapper";
+
+const require = createRequire(import.meta.url);
+
+const grainLang = JSON.parse(fs.readFileSync("./grain-language-server/editor-extensions/vscode/syntaxes/grain.json"));
+const theme = JSON.parse(fs.readFileSync("./themes/github-dark-modified-lighter.json"));
+
+// https://astro.build/config
+export default defineConfig({
+  site: "https://grain-lang.org",
+  vite: {
+    // We want to include wasm files as raw data and then we glob for their urls
+    assetsInclude: ["**/*.wasm"],
+    resolve: {
+      dedupe: ["buffer"],
+      alias: {
+        path: require.resolve("path-browserify"),
+        stream: require.resolve("readable-stream/lib/ours/browser.js"),
+        // This tricks the import into allowing us to use globs with `import.meta.glob`
+        "@grain/stdlib": path.dirname(require.resolve("@grain/stdlib")),
+      },
+    },
+    define: {
+      "process.platform": JSON.stringify("posix"),
+      "process.env.NODE_DEBUG": "false",
+    },
+    optimizeDeps: {
+      esbuildOptions: {
+        target: "esnext",
+        define: {
+          global: "globalThis",
+          process: JSON.stringify({}),
+          "process.env": JSON.stringify({}),
+          "process.platform": JSON.stringify("posix"),
+          "process.env.NODE_DEBUG": "false",
+        },
+      },
+    },
+    build: {
+      target: "esnext",
+    }
+  },
+
+  integrations: [tailwind(), svelte()],
+
+  redirects: {
+    "/docs": "/docs/intro",
+    "/docs/guide": "/docs/guide/basics"
+  },
+
+  markdown: {
+    rehypePlugins: [
+      rehypeSlug,
+      [
+        rehypeAutolinkHeadings,
+        rehypeAutolinkHeadingsConfig,
+      ],
+      rehypeContentIntroTextTransformer,
+      rehypeTableWrapper,
+    ],
+    shikiConfig: {
+      theme: theme,
+      transformers: [
+        {
+          code(node) {
+            // Hack to distinguish block code from inline code in tailwind-typography
+            node.properties["data-block"] = "true";
+          }
+        }
+      ],
+      langs: [{...grainLang, name: "grain"}]
+    }
+  },
+});