Merge pull request #6307 from ethereum/ts

Typescript migration
ethereum · May 19, 2022 · ea6d453 · ea6d453
2 parents 4397ca8 + 4a28461
commit ea6d453
Show file tree

Hide file tree

Showing 33 changed files with 610 additions and 659 deletions.
diff --git a/.github/workflows/docsearch-crawl.yml b/.github/workflows/docsearch-crawl.yml
@@ -11,12 +11,17 @@ jobs:
     steps:
       - name: Checkout codebase
         uses: actions/checkout@v2
+      - name: Install node and ts-node
+        uses: actions/setup-node@v2
+        with:
+          node-version: "14"
+      - run: npm install -g ts-node
       - name: Crawl the site
         env:
           APPLICATION_ID: ${{ secrets.DOCSEARCH_APP_ID }}
           API_KEY: ${{ secrets.DOCSEARCH_API_KEY }}
         run: |
           docker run \
           -e APPLICATION_ID -e API_KEY \
-          -e CONFIG="$(node .github/workflows/docsearchConfigScript.js | cat .github/workflows/docsearchConfig.json)" \
+          -e CONFIG="$(ts-node -O '{\"module\": \"commonjs\"}' .github/workflows/docsearchConfigScript.js | cat .github/workflows/docsearchConfig.json)" \
           algolia/docsearch-scraper:v1.6.0
diff --git a/.github/workflows/docsearchConfigScript.js b/.github/workflows/docsearchConfigScript.js
@@ -1,5 +1,5 @@
 const fs = require("fs")
-const translations = require("../../src/data/translations.json")
+const translations = require("../../src/utils/languages").default
 
 var config = {
   index_name: "prod-ethereum-org",

diff --git a/.prettierignore b/.prettierignore
@@ -1,4 +1,4 @@
 .cache
 package.json
 package-lock.json
-public
+public
diff --git a/gatsby-browser.js → gatsby-browser.tsx b/gatsby-browser.js → gatsby-browser.tsx
@@ -11,9 +11,9 @@ import Prism from "prism-react-renderer/prism"
 ;(typeof global !== "undefined" ? global : window).Prism = Prism
 
 // FormatJS Polyfill imports - Used for intl number formatting
-require("@formatjs/intl-locale/polyfill")
-require("@formatjs/intl-numberformat/polyfill")
-require("@formatjs/intl-numberformat/locale-data/en")
+import "@formatjs/intl-locale/polyfill"
+import "@formatjs/intl-numberformat/polyfill"
+import "@formatjs/intl-numberformat/locale-data/en"
 
 // Default languages included:
 // https://github.com/FormidableLabs/prism-react-renderer/blob/master/src/vendor/prism/includeLangs.js

diff --git a/gatsby-config.js → gatsby-config.ts b/gatsby-config.js → gatsby-config.ts
@@ -1,8 +1,14 @@
-require("dotenv").config()
+import "dotenv/config"
+import path from "path"
 
-const { supportedLanguages, allLanguages } = require("./src/utils/translations")
+import type { GatsbyConfig } from "gatsby"
+
+import {
+  supportedLanguages,
+  defaultLanguage,
+  ignoreLanguages,
+} from "./src/utils/languages"
 
-const defaultLanguage = `en`
 const siteUrl = `https://ethereum.org`
 
 const ignoreContent = (process.env.IGNORE_CONTENT || "")
@@ -11,11 +17,11 @@ const ignoreContent = (process.env.IGNORE_CONTENT || "")
 
 const isPreviewDeploy = process.env.IS_PREVIEW_DEPLOY === "true"
 
-const ignoreTranslations = Object.keys(allLanguages)
-  .filter((lang) => !supportedLanguages.includes(lang))
-  .map((lang) => `**/translations\/${lang}`)
+const ignoreTranslations = ignoreLanguages.map(
+  (lang) => `**/translations\/${lang}`
+)
 
-const config = {
+const config: GatsbyConfig = {
   siteMetadata: {
     // `title` & `description` pulls from respective ${lang}.json files in PageMetadata.js
     title: `ethereum.org`,
@@ -33,7 +39,7 @@ const config = {
       resolve: `gatsby-plugin-intl`,
       options: {
         // language JSON resource path
-        path: `${__dirname}/src/intl`,
+        path: path.resolve(`src/intl`),
         // supported language
         languages: supportedLanguages,
         // language file path
@@ -125,7 +131,7 @@ const config = {
         gatsbyRemarkPlugins: [
           {
             // Local plugin to adjust the images urls of the translated md files
-            resolve: require.resolve(`./plugins/gatsby-remark-image-urls`),
+            resolve: path.resolve(`./plugins/gatsby-remark-image-urls`),
           },
           {
             resolve: `gatsby-remark-autolink-headers`,
@@ -181,15 +187,15 @@ const config = {
       resolve: `gatsby-source-filesystem`,
       options: {
         name: `assets`,
-        path: `${__dirname}/src/assets`,
+        path: path.resolve(`src/assets`),
       },
     },
     // Process files from /src/content/ (used in gatsby-node.js)
     {
       resolve: `gatsby-source-filesystem`,
       options: {
         name: `content`,
-        path: `${__dirname}/src/content`,
+        path: path.resolve(`src/content`),
         ignore: [...ignoreContent, ...ignoreTranslations],
       },
     },
@@ -198,13 +204,13 @@ const config = {
       resolve: `gatsby-source-filesystem`,
       options: {
         name: `data`,
-        path: `${__dirname}/src/data`,
+        path: path.resolve(`src/data`),
       },
     },
     {
       resolve: `gatsby-source-filesystem`,
       options: {
-        path: `${__dirname}/src/data/translation-reports`,
+        path: path.resolve(`src/data/translation-reports`),
       },
     },
     // Process files within /src/data/
@@ -250,4 +256,4 @@ if (!isPreviewDeploy) {
   ]
 }
 
-module.exports = config
+export default config