Merge 'upstream/master' into 'stanwolverine/master'

Author: Darksonn

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
     name: Test code blocks in markdown
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install Rust
         run: rustup update stable
 
@@ -31,7 +31,7 @@ jobs:
     name: Test tutorial-code directory
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install Rust
         run: rustup update stable
 
@@ -43,3 +43,17 @@ jobs:
       - name: Actually run the tests
         run: cargo test --all
         working-directory: tutorial-code
+  fmt-check:
+    name: Verify project code style
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '18'
+
+      - name: Install node dependencies
+        run: npm install
+
+      - name: Check formatting
+        run: npm run fmt:check

README.md

@@ -4,7 +4,7 @@ The website for the Tokio project. Lives at https://tokio.rs.
 
 Besides containing the content for the website, it also includes crates
 containing the example code used in the tutorial. These crates can be compiled
-and ran.
+and run.
 
 * [hello-tokio](tutorial-code/hello-tokio/src/main.rs)
 * [spawning](tutorial-code/spawning/src/main.rs)

components/content.tsx

@@ -1,4 +1,4 @@
-import Menu from "../components/menu";
+import Menu from "./menu";
 import { DiscordIcon, GitHubIcon } from "./icons";
 import React, { useEffect, useMemo, useRef, useState } from "react";
 import Link from "next/link";
@@ -112,6 +112,7 @@ export default function Content({
   prev,
   body,
   mdPath,
+  description,
 }) {
   const isBlogRoute = href.startsWith("/blog");
 
@@ -146,9 +147,13 @@ export default function Content({
           <section className="section content">
             <div className="columns">
               <div className="column is-two-thirds tk-markdown" ref={mdRef}>
-                <h1 className="title" id="">
+                <h1
+                  className={`title ${isBlogRoute ? "blog-title" : ""}`}
+                  id=""
+                >
                   {title}
                 </h1>
+                {isBlogRoute && <p className="description">{description}</p>}
                 <div dangerouslySetInnerHTML={{ __html: body }}></div>
                 <Footer next={next} prev={prev} mdPath={mdPath} />
               </div>

components/footer.tsx

@@ -17,10 +17,14 @@ export default function Footer() {
     <div key={name} className="column is-one-third">
       <p className="tk-lib-name">{name}</p>
       <p>
-        <a href={docs}>Docs</a>
+        <a href={docs} target="_blank">
+          Docs
+        </a>
       </p>
       <p>
-        <a href={github}>Github</a>
+        <a href={github} target="_blank">
+          Github
+        </a>
       </p>
     </div>
   ));
@@ -38,16 +42,19 @@ export default function Footer() {
             <div className="tk-help-links">
               <p>
                 Get Help:
-                <a href="https://github.com/tokio-rs/tokio/discussions">
+                <a
+                  href="https://github.com/tokio-rs/tokio/discussions"
+                  target="_blank"
+                >
                   <GitHubIcon className="is-medium" />
                 </a>
-                <a href="https://discord.gg/tokio">
+                <a href="https://discord.gg/tokio" target="_blank">
                   <DiscordIcon className="is-medium" />
                 </a>
               </p>
               <p>
                 Stay up to date:
-                <a href="https://twitter.com/tokio_rs">
+                <a href="https://twitter.com/tokio_rs" target="_blank">
                   <TwitterIcon className="is-medium" />
                 </a>
               </p>
@@ -74,7 +81,10 @@ export default function Footer() {
         <div className="container has-text-centered">
           <p>
             with the help of{" "}
-            <a href="https://github.com/tokio-rs/tokio/graphs/contributors">
+            <a
+              href="https://github.com/tokio-rs/tokio/graphs/contributors"
+              target="_blank"
+            >
               our contributors
             </a>
             .
@@ -83,7 +93,11 @@ export default function Footer() {
         <div className="container has-text-centered">
           <p>
             Hosted by{" "}
-            <a href="https://netlify.com" rel="sponsored nofollow">
+            <a
+              href="https://netlify.com"
+              target="_blank"
+              rel="sponsored nofollow"
+            >
               Netlify
             </a>
           </p>

components/icons.tsx

@@ -47,7 +47,7 @@ export function TwitterIcon({ className = "" }) {
     <Icon className={className}>
       <path
         className="tk-svg-path"
-        d="M1684 408q-67 98-162 167 1 14 1 42 0 130-38 259.5t-115.5 248.5-184.5 210.5-258 146-323 54.5q-271 0-496-145 35 4 78 4 225 0 401-138-105-2-188-64.5t-114-159.5q33 5 61 5 43 0 85-11-112-23-185.5-111.5t-73.5-205.5v-4q68 38 146 41-66-44-105-115t-39-154q0-88 44-163 121 149 294.5 238.5t371.5 99.5q-8-38-8-74 0-134 94.5-228.5t228.5-94.5q140 0 236 102 109-21 205-78-37 115-142 178 93-10 186-50z"
+        d="m 1033.0757,785.67723 536.386,-610.09838 H 1442.3554 L 976.61152,705.31871 604.62327,175.57885 H 175.57884 L 738.0981,976.63931 175.57884,1616.4212 h 127.11352 l 491.83748,-559.4233 392.84686,559.4233 h 429.0444 L 1033.0445,785.67723 Z M 858.97635,983.69686 801.9814,903.9293 348.49316,269.21053 h 195.2389 l 365.97034,512.23831 56.9949,79.76754 475.7181,665.83142 H 1247.1765 L 858.97635,983.72736 Z"
         fill="#fff"
       />
     </Icon>

components/menu.jsx renamed to components/menu.tsx

@@ -1,6 +1,5 @@
 import { Fragment, useCallback, useState } from "react";
 import classnames from "classnames";
-import Link from "next/link";
 
 const monthNames = [
   "January",
@@ -130,7 +129,8 @@ function Level2({ href, menu }) {
   return <ul>{items}</ul>;
 }
 
-function pagesFor(menu) {
+// TODO: Type the menu hierarchy
+function pagesFor(menu: Record<PropertyKey, any>) {
   return Object.entries(menu).map(([, entry]) => {
     if (entry.page) {
       return {

content/blog/2017-01-tokio-0-1.md

@@ -1,7 +1,7 @@
 ---
 date: "2017-01-10"
 title: "Announcing Tokio 0.1"
-description: "10 January 2017"
+description: "January 10, 2017"
 ---
 
 Today we are publishing the preliminary version of the Tokio stack, 0.1!

content/blog/2017-03-tokio-io.md

@@ -1,7 +1,7 @@
 ---
 date: "2017-03-17"
 title: "Announcing the tokio-io Crate"
-description: "17 March 2017"
+description: "March 17, 2017"
 ---
 
 Today we're happy to announce a new crate and several new tools to work with in

content/blog/2017-09-tokio-reform.md

@@ -1,7 +1,7 @@
 ---
 date: "2017-09-19"
 title: "An RFC for a Tokio revamp"
-description: "19 September 2017"
+description: "September 19, 2017"
 ---
 
 Hi there, Tokio community!

content/blog/2018-02-tokio-reform-shipped.md

@@ -1,7 +1,7 @@
 ---
 date: "2018-02-07"
 title: "Tokio Reform is Shipped and the Road to 0.2"
-description: "07 February 2018"
+description: "February 7, 2018"
 ---
 
 Hi all!