update astro to v2 and use content collections for docs

.eslintrc.js

@@ -13,6 +13,7 @@ module.exports = {
   plugins: ["@typescript-eslint", "prettier"],
   rules: {
     "no-unused-expressions": "off",
+    "@typescript-eslint/triple-slash-reference": "off",
     "prettier/prettier": [2],
   },
 }

.gitignore

@@ -36,4 +36,6 @@ typechain-types/
 .temp*
 
 .cache
-.vscode
+.vscode
+
+.astro/

astro-i18next.config.ts

@@ -1,5 +1,6 @@
 /** @type {import('astro-i18next').AstroI18nextConfig} */
 export default {
   defaultLocale: "en",
+  showDefaultLocale: true,
   locales: ["en", "zh"],
 }

package.json

@@ -55,7 +55,7 @@
     "@types/github-slugger": "^1.3.0",
     "@typescript-eslint/eslint-plugin": "^5.43.0",
     "@typescript-eslint/parser": "^5.43.0",
-    "astro": "^1.6.8",
+    "astro": "^2.4.4",
     "dart-linkcheck": "^2.0.15",
     "dotenv": "^16.0.3",
     "eslint": "^8.27.0",

public/locales/en/translation.json

@@ -83,5 +83,8 @@
     "infrastructure": {
       "introduction": "Introduction"
     }
+  },
+  "notTranslated": {
+    "notTranslated": "This page has not been translated yet."
   }
 }

public/locales/zh/translation.json

@@ -83,5 +83,8 @@
     "infrastructure": {
       "introduction": "介绍"
     }
+  },
+  "notTranslated": {
+    "notTranslated": "此页面尚未翻译。"
   }
 }

src/components/LeftSidebar/LeftSidebar.astro

@@ -58,9 +58,9 @@ const currentPageMatch = removeSlashes(currentPage.slice(1))
                   <>
                     <li class="nav-link">
                       <a
-                        href={isExternal(child.url) ? `${child.url}` : localizePath(child.url)}
+                        href={isExternal(child.url) ? `${child.url}` : localizePath("/docs/" + child.url)}
                         target={isExternal(child.url) ? "_blank" : "_self"}
-                        aria-current={`${currentPage === localizePath(child.url) ? "page" : "false"}`}
+                        aria-current={`${currentPage === localizePath("/docs/" + child.url) ? "page" : "false"}`}
                       >
                         {child.title}
                         {isExternal(child.url) && (
@@ -77,9 +77,11 @@ const currentPageMatch = removeSlashes(currentPage.slice(1))
                         {child.children.map((childItem) => (
                           <li class="nav-link nested">
                             <a
-                              href={isExternal(childItem.url) ? childItem.url : localizePath(childItem.url)}
+                              href={isExternal(childItem.url) ? childItem.url : localizePath("/docs/" + childItem.url)}
                               target={isExternal(child.url) ? "_blank" : "_self"}
-                              aria-current={`${currentPage === localizePath(childItem.url) ? "page" : "false"}`}
+                              aria-current={`${
+                                currentPage === localizePath("/docs/" + childItem.url) ? "page" : "false"
+                              }`}
                             >
                               {childItem.title}
                               {isExternal(childItem.url) && (

src/config/menu.ts

@@ -10,21 +10,21 @@ export const MENU: MenuItems = {
   en: [
     {
       text: "Getting Started",
-      link: "/getting-started/overview",
+      link: "/en/docs/getting-started/overview",
       section: "gettingStarted",
     },
-    { text: "Developers", link: "/developers", section: "developers" },
-    { text: "Technology", link: "/technology", section: "technology" },
-    { text: "Learn", link: "/learn", section: "learn" },
+    { text: "Developers", link: "/en/docs/developers", section: "developers" },
+    { text: "Technology", link: "/en/docs/technology", section: "technology" },
+    { text: "Learn", link: "/en/docs/learn", section: "learn" },
   ],
   zh: [
     {
       text: "入门",
-      link: "/zh/getting-started/overview",
+      link: "/zh/docs/getting-started/overview",
       section: "gettingStarted",
     },
-    { text: "开发者", link: "/zh/developers", section: "developers" },
-    { text: "技术", link: "/zh/technology", section: "technology" },
-    { text: "学习", link: "/zh/learn", section: "learn" },
+    { text: "开发者", link: "/zh/docs/developers", section: "developers" },
+    { text: "技术", link: "/zh/docs/technology", section: "technology" },
+    { text: "学习", link: "/zh/docs/learn", section: "learn" },
   ],
 }

src/content/config.ts

@@ -0,0 +1,12 @@
+import { defineCollection, z } from "astro:content"
+
+const docsCollection = defineCollection({
+  schema: z.object({
+    title: z.string(),
+    section: z.string(),
+  }),
+})
+
+export const collections = {
+  docs: docsCollection,
+}

src/pages/developers/alpha-testnet-contracts.md → src/content/docs/en/developers/alpha-testnet-contracts.md

@@ -1,5 +1,4 @@
 ---
-layout: ../../layouts/MainLayout.astro
 section: developers
 date: Last Modified
 title: "Alpha Testnet Contracts"

src/pages/developers/developer-quickstart.md → src/content/docs/en/developers/developer-quickstart.md

@@ -1,5 +1,4 @@
 ---
-layout: ../../layouts/MainLayout.astro
 section: developers
 date: Last Modified
 title: "Developer Quickstart"

src/pages/developers/ethereum-and-alpha-testnet-differences.md → src/content/docs/en/developers/ethereum-and-alpha-testnet-differences.md

@@ -1,5 +1,4 @@
 ---
-layout: ../../layouts/MainLayout.astro
 section: developers
 date: Last Modified
 title: "Ethereum & Alpha Testnet Differences"

src/pages/developers/guides/contract-deployment-tutorial.md → src/content/docs/en/developers/guides/contract-deployment-tutorial.md

@@ -1,5 +1,4 @@
 ---
-layout: ../../../layouts/MainLayout.astro
 section: developers
 date: Last Modified
 title: "Contract Deployment Tutorial"

src/pages/developers/index.mdx → src/content/docs/en/developers/index.mdx

@@ -1,5 +1,4 @@
 ---
-layout: ../../layouts/MainLayout.astro
 section: developers
 date: Last Modified
 title: "Building on Scroll"

src/pages/developers/integrations.md → src/content/docs/en/developers/integrations.md

@@ -1,5 +1,4 @@
 ---
-layout: ../../layouts/MainLayout.astro
 section: developers
 date: Last Modified
 title: ""

src/pages/getting-started/overview.md → src/content/docs/en/getting-started/overview.md

@@ -1,5 +1,4 @@
 ---
-layout: ../../layouts/MainLayout.astro
 section: gettingStarted
 date: Last Modified
 title: "Scroll Overview"

src/pages/learn/index.mdx → src/content/docs/en/learn/index.mdx

@@ -1,15 +1,14 @@
 ---
-layout: ../../layouts/MainLayout.astro
 section: learn
 title: "Learn Landing Title"
 lang: "en"
 isMdx: true
 ---
 
-import ClickToZoom from "../../components/ClickToZoom.astro"
-import priceAggr from "../../assets/images/contract-devs/price-aggr.png"
-import ToggleElement from "../../components/ToggleElement.astro"
-import Aside from "../../components/Aside.astro"
+import ClickToZoom from "../../../../components/ClickToZoom.astro"
+import priceAggr from "../../../../assets/images/contract-devs/price-aggr.png"
+import ToggleElement from "../../../../components/ToggleElement.astro"
+import Aside from "../../../../components/Aside.astro"
 
 Content for the Research landing page. for fancy stuff, see the infrastructure page.
 

src/pages/technology/index.mdx → src/content/docs/en/technology/index.mdx

@@ -1,5 +1,4 @@
 ---
-layout: ../../layouts/MainLayout.astro
 section: technology
 title: "Technology Landing Page"
 lang: "en"

src/pages/user-guide/bridge.mdx → src/content/docs/en/user-guide/bridge.mdx

@@ -1,5 +1,4 @@
 ---
-layout: ../../layouts/MainLayout.astro
 section: gettingStarted
 date: Last Modified
 title: "Bridge"
@@ -8,7 +7,7 @@ permalink: "user-guide/bridge/"
 excerpt: "To start bridging assets from Goerli, navigate to the Bridge app."
 ---
 
-import ClickToZoom from "../../components/ClickToZoom.astro"
+import ClickToZoom from "../../../../components/ClickToZoom.astro"
 import bridge1 from "./images/bridge1.png"
 import bridge2 from "./images/bridge2.png"
 import bridge3 from "./images/bridge3.png"

src/pages/user-guide/common-errors.md → src/content/docs/en/user-guide/common-errors.md

@@ -1,5 +1,4 @@
 ---
-layout: ../../layouts/MainLayout.astro
 section: gettingStarted
 date: Last Modified
 title: "Common Errors"

src/pages/user-guide/faucet.md → src/content/docs/en/user-guide/faucet.md

@@ -1,5 +1,4 @@
 ---
-layout: ../../layouts/MainLayout.astro
 section: gettingStarted
 date: Last Modified
 title: "Faucet"

src/pages/user-guide/index.md → src/content/docs/en/user-guide/index.md

@@ -1,5 +1,4 @@
 ---
-layout: ../../layouts/MainLayout.astro
 section: gettingStarted
 date: Last Modified
 title: "Alpha Testnet User Guide"

src/pages/user-guide/setup.md → src/content/docs/en/user-guide/setup.md

@@ -1,5 +1,4 @@
 ---
-layout: ../../layouts/MainLayout.astro
 section: gettingStarted
 date: Last Modified
 title: "Setup"

src/pages/user-guide/transfer-tokens.md → src/content/docs/en/user-guide/transfer-tokens.md

@@ -1,5 +1,4 @@
 ---
-layout: ../../layouts/MainLayout.astro
 section: gettingStarted
 date: Last Modified
 title: "Transfer Tokens"

src/pages/zh/developers/alpha-testnet-contracts.md → src/content/docs/zh/developers/alpha-testnet-contracts.md

@@ -1,5 +1,4 @@
 ---
-layout: ../../../layouts/MainLayout.astro
 section: developers
 date: Last Modified
 title: "Alpha 测试网合约"

src/pages/zh/developers/developer-quickstart.md → src/content/docs/zh/developers/developer-quickstart.md

@@ -1,5 +1,4 @@
 ---
-layout: ../../../layouts/MainLayout.astro
 section: developers
 date: Last Modified
 title: "开发人员快速入门"

src/pages/zh/developers/ethereum-and-alpha-testnet-differences.md → src/content/docs/zh/developers/ethereum-and-alpha-testnet-differences.md

@@ -1,5 +1,4 @@
 ---
-layout: ../../../layouts/MainLayout.astro
 section: developers
 date: Last Modified
 title: "以太坊和 Alpha 测试网的差异"

src/pages/zh/developers/guides/contract-deployment-tutorial.md → src/content/docs/zh/developers/guides/contract-deployment-tutorial.md

@@ -1,5 +1,4 @@
 ---
-layout: ../../../../layouts/MainLayout.astro
 section: developers
 date: Last Modified
 title: "合约部署教程"

src/pages/zh/developers/index.mdx → src/content/docs/zh/developers/index.mdx

@@ -1,5 +1,4 @@
 ---
-layout: ../../../layouts/MainLayout.astro
 section: developers
 date: Last Modified
 title: "在Scroll上构建"

src/pages/zh/developers/integrations.md → src/content/docs/zh/developers/integrations.md

@@ -1,5 +1,4 @@
 ---
-layout: ../../../layouts/MainLayout.astro
 section: developers
 date: Last Modified
 title: ""

src/pages/zh/getting-started/overview.md → src/content/docs/zh/getting-started/overview.md

@@ -1,5 +1,4 @@
 ---
-layout: ../../../layouts/MainLayout.astro
 section: gettingStarted
 date: Last Modified
 title: "Scroll 概述"

src/pages/zh/learn/index.mdx → src/content/docs/zh/learn/index.mdx

@@ -1,15 +1,14 @@
 ---
-layout: ../../../layouts/MainLayout.astro
 section: learn
 title: "学习登陆标题"
 lang: "zh"
 isMdx: true
 ---
 
-import ClickToZoom from "../../../components/ClickToZoom.astro"
-import priceAggr from "../../../assets/images/contract-devs/price-aggr.png"
-import ToggleElement from "../../../components/ToggleElement.astro"
-import Aside from "../../../components/Aside.astro"
+import ClickToZoom from "../../../../components/ClickToZoom.astro"
+import priceAggr from "../../../../assets/images/contract-devs/price-aggr.png"
+import ToggleElement from "../../../../components/ToggleElement.astro"
+import Aside from "../../../../components/Aside.astro"
 
 Content for the Research landing page. for fancy stuff, see the infrastructure page.
 

src/pages/zh/user-guide/bridge.mdx → src/content/docs/zh/user-guide/bridge.mdx

@@ -1,5 +1,4 @@
 ---
-layout: ../../../layouts/MainLayout.astro
 section: gettingStarted
 date: Last Modified
 title: "桥"
@@ -8,7 +7,7 @@ permalink: "user-guide/bridge/"
 excerpt: "To start bridging assets from Goerli, navigate to the Bridge app."
 ---
 
-import ClickToZoom from "../../../components/ClickToZoom.astro"
+import ClickToZoom from "../../../../components/ClickToZoom.astro"
 import bridge1 from "./images/bridge1.png"
 import bridge2 from "./images/bridge2.png"
 import bridge3 from "./images/bridge3.png"

src/pages/zh/user-guide/common-errors.md → src/content/docs/zh/user-guide/common-errors.md

@@ -1,5 +1,4 @@
 ---
-layout: ../../../layouts/MainLayout.astro
 section: gettingStarted
 date: Last Modified
 title: "常见错误"

src/pages/zh/user-guide/faucet.md → src/content/docs/zh/user-guide/faucet.md

@@ -1,5 +1,4 @@
 ---
-layout: ../../../layouts/MainLayout.astro
 section: gettingStarted
 date: Last Modified
 title: "水龙头"

src/pages/zh/user-guide/index.md → src/content/docs/zh/user-guide/index.md

@@ -1,5 +1,4 @@
 ---
-layout: ../../../layouts/MainLayout.astro
 section: gettingStarted
 date: Last Modified
 title: "Alpha 测试网用户指南"

src/pages/zh/user-guide/setup.md → src/content/docs/zh/user-guide/setup.md

@@ -1,5 +1,4 @@
 ---
-layout: ../../../layouts/MainLayout.astro
 section: gettingStarted
 date: Last Modified
 title: "设置"

src/pages/zh/user-guide/transfer-tokens.md → src/content/docs/zh/user-guide/transfer-tokens.md

@@ -1,5 +1,4 @@
 ---
-layout: ../../../layouts/MainLayout.astro
 section: gettingStarted
 date: Last Modified
 title: "转移代币"

src/env.d.ts

@@ -1 +1,2 @@
+/// <reference path="../.astro/types.d.ts" />
 /// <reference types="@astrojs/image/client" />