Merge pull request #10729 from ethereum/dev

Release candidate 7.17.1

Author: corwintines

.all-contributorsrc

@@ -10285,6 +10285,60 @@
       "contributions": [
         "ideas"
       ]
+    },
+    {
+      "login": "SahityaRoy",
+      "name": "Sahitya Roy",
+      "avatar_url": "https://avatars.githubusercontent.com/u/72821604?v=4",
+      "profile": "https://www.linkedin.com/in/sahitya-roy-244b941a2/",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "Keecointoken",
+      "name": "KeeCoin",
+      "avatar_url": "https://avatars.githubusercontent.com/u/99338330?v=4",
+      "profile": "https://www.keecoin.io",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "tomatowax",
+      "name": "Seungwook Chi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/799503?v=4",
+      "profile": "http://www.tomatowax.com/",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "0xx92",
+      "name": "0xx92",
+      "avatar_url": "https://avatars.githubusercontent.com/u/133748557?v=4",
+      "profile": "https://github.com/0xx92",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "altinocoelho",
+      "name": "altinocoelho",
+      "avatar_url": "https://avatars.githubusercontent.com/u/92543849?v=4",
+      "profile": "https://github.com/altinocoelho",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "viac92",
+      "name": "viac92",
+      "avatar_url": "https://avatars.githubusercontent.com/u/64146594?v=4",
+      "profile": "https://github.com/viac92",
+      "contributions": [
+        "content"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/workflows/get-crowdin-contributors.yml

@@ -22,7 +22,7 @@ jobs:
 
       - name: Install ts-node
         run: yarn global add ts-node
-         
+
       - name: Set up git
         run: |
           git config --global user.email "[email protected]"

README.md

@@ -1,6 +1,6 @@
 {
   "name": "ethereum-org-website",
-  "version": "7.17.0",
+  "version": "7.17.1",
   "description": "Website of ethereum.org",
   "main": "index.js",
   "repository": "[email protected]:ethereum/ethereum-org-website.git",
@@ -17,6 +17,7 @@
     "@emotion/styled": "^11.9.3",
     "@formatjs/intl-locale": "^2.4.14",
     "@formatjs/intl-numberformat": "^6.1.4",
+    "@googleapis/calendar": "^6.0.0",
     "@mdx-js/mdx": "^1.6.5",
     "@mdx-js/react": "^1.6.5",
     "algoliasearch": "^4.3.0",
@@ -55,6 +56,7 @@
     "gatsby-transformer-json": "^5.4.0",
     "gatsby-transformer-remark": "^6.4.0",
     "gatsby-transformer-sharp": "^5.4.0",
+    "googleapis": "^118.0.0",
     "htmr": "^1.0.2",
     "i18next": "^21.9.2",
     "is-relative-url": "^3.0.0",
@@ -105,6 +107,7 @@
     "babel-loader": "^8.3.0",
     "babel-preset-gatsby": "^2.23.0",
     "chromatic": "^6.19.9",
+    "cross-env": "^7.0.3",
     "github-slugger": "^1.3.0",
     "gray-matter": "^4.0.3",
     "husky": "^4.2.5",
@@ -122,8 +125,8 @@
   "scripts": {
     "postinstall": "yarn theme",
     "build": "gatsby build",
-    "build:lambda": "NODE_OPTIONS=--openssl-legacy-provider netlify-lambda build src/lambda --config=./webpack.lambda.js",
-    "build:10gb": "NODE_OPTIONS=--max-old-space-size=10240 gatsby build",
+    "build:lambda": "cross-env NODE_OPTIONS=--openssl-legacy-provider netlify-lambda build src/lambda --config=./webpack.lambda.js",
+    "build:10gb": "cross-env NODE_OPTIONS=--max-old-space-size=10240 gatsby build",
     "clean": "gatsby clean",
     "crowdin-clean": "rm -rf .crowdin && mkdir .crowdin",
     "crowdin-import": "ts-node src/scripts/crowdin-import.ts",
@@ -132,6 +135,7 @@
     "generate-heading-ids": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/generateHeadingIds.ts",
     "unused-translations": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/unusedTranslations.ts",
     "reorg-intl": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/reorgIntlFiles.ts",
+    "optimize-images": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/optimizeImages.ts",
     "crowdin-contributors": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/crowdin/getCrowdinContributors.ts",
     "start": "gatsby develop",
     "start:lambda": "netlify-lambda serve src/lambda",

package.json

@@ -0,0 +1,93 @@
+import {
+  createMultiStyleConfigHelpers,
+  cssVar,
+  defineStyle,
+  getToken,
+} from "@chakra-ui/react"
+import { avatarAnatomy } from "@chakra-ui/anatomy"
+import { avatarDefaultTheme, defineMergeStyles } from "./components.utils"
+import { pick } from "lodash"
+
+const { defineMultiStyleConfig, definePartsStyle } =
+  createMultiStyleConfigHelpers(avatarAnatomy.keys)
+
+const { baseStyle: defaultBaseStyle, sizes: defaultSizes } = avatarDefaultTheme
+
+const $border = cssVar("avatar-border-color", "transparent")
+const $mlBySize = cssVar("ml-by-size")
+
+const baseStyleContainer = defineStyle((props) => {
+  const primaryLowContrast = getToken(
+    "colors",
+    "primary.lowContrast"
+  )(props.theme)
+
+  return defineMergeStyles(defaultBaseStyle?.(props).container, {
+    [$border.variable]: "transparent",
+    borderWidth: "1px",
+    "&:hover, [data-peer]:hover ~ &": {
+      boxShadow: `0.15em 0.15em 0 ${primaryLowContrast}`,
+    },
+    _focus: {
+      outline: "4px solid",
+      outlineColor: "primary.hover",
+      outlineOffset: "-1px",
+    },
+    _active: {
+      [$border.variable]: "colors.primary.hover",
+      boxShadow: "none",
+      "& img": {
+        opacity: 0.7,
+      },
+    },
+    "[role='group'] &": {
+      [$border.variable]: "colors.background.base",
+      _notLast: {
+        marginLeft: $mlBySize.reference,
+      },
+    },
+  })
+})
+
+const baseStyleExessLabel = defineStyle((props) =>
+  defineMergeStyles(defaultBaseStyle?.(props).excessLabel, {
+    bg: "body.base",
+    color: "background.base",
+    ms: $mlBySize.reference,
+  })
+)
+
+const baseStyle = definePartsStyle((props) => ({
+  container: baseStyleContainer(props),
+  excessLabel: baseStyleExessLabel(props),
+}))
+
+const USED_SIZES = ["xs", "sm", "md", "lg"] as const
+
+const pickedDefaultSizes: { [k in (typeof USED_SIZES)[number]]?: object } =
+  pick(defaultSizes, ...USED_SIZES)
+
+const sizes = defineMergeStyles(pickedDefaultSizes, {
+  xs: {
+    group: {
+      [$mlBySize.variable]: "space.-1",
+    },
+    excessLabel: {
+      fontSize: "0.563rem",
+    },
+  },
+  sm: {
+    group: {
+      [$mlBySize.variable]: "space.-2",
+    },
+    excessLabel: {
+      fontSize: "sm",
+    },
+  },
+})
+
+export const Avatar = defineMultiStyleConfig({
+  baseStyle,
+  // @ts-expect-error
+  sizes,
+})

src/@chakra-ui/gatsby-plugin/components/Avatar.ts

@@ -1,3 +1,4 @@
+import { Avatar } from "./Avatar"
 import { Badge } from "./Badge"
 import { Button } from "./Button"
 import { Link } from "./Link"
@@ -12,7 +13,6 @@ import { Switch } from "./Switch"
 import { Input } from "./Input"
 import {
   accordionDefaultTheme,
-  avatarDefaultTheme,
   breadcrumbDefaultTheme,
   closeButtonDefaultTheme,
   codeDefaultTheme,
@@ -28,7 +28,7 @@ import {
 
 export default {
   Accordion: accordionDefaultTheme,
-  Avatar: avatarDefaultTheme,
+  Avatar,
   Badge,
   Breadcrumb: breadcrumbDefaultTheme,
   Button,

src/@chakra-ui/gatsby-plugin/components/index.ts

@@ -101,12 +101,6 @@ const semanticTokens = {
         "linear-gradient(102.7deg, rgba(185, 185, 241, 0.2) 0%, rgba(84, 132, 234, 0.2) 51.56%, rgba(58, 142, 137, 0.2) 100%)",
     },
   },
-  shadows: {
-    buttonHover: {
-      _light: "4px 4px 0 var(--eth-colors-blue-100)",
-      _dark: "4px 4px 0 #352313",
-    },
-  },
 }
 
 export default semanticTokens

src/@chakra-ui/gatsby-plugin/semanticTokens.ts

@@ -0,0 +1,17 @@
+import type { GatsbyFunctionRequest, GatsbyFunctionResponse } from "gatsby"
+import { lambda } from "../lambda/calendarEvents"
+
+async function handler(
+  __req: GatsbyFunctionRequest,
+  res: GatsbyFunctionResponse
+): Promise<void> {
+  // passing env vars as arguments due to a bug on GC functions where env vars
+  // can not be accessed by imported functions
+  const { statusCode, body } = await lambda(
+    process.env.GOOGLE_API_KEY!,
+    process.env.GOOGLE_CALENDAR_ID!
+  )
+  res.status(statusCode).send(body)
+}
+
+export default handler