chore: convert repository to Typescript (#109)

* chore: [ts-migrate] Init tsconfig.json file Co-authored-by: ts-migrate <> * chore: [ts-migrate] Rename files from JS/JSX to TS/TSX Co-authored-by: ts-migrate <> * chore: Convert JS files to TS * chore: Update snapshot file to use Typescript file extension * chore: Remove ts-migrate dependency now that project has been converted to Typescript * chore: Add Jest Typescript types. Remove ts-expect-error comments that were introduced during initial migration with the ts-migrate tool now that the types are available in the project. * chore: Make changes needed to remove the last ts-expect-error comments Co-authored-by: Erica Pisani <[email protected]> Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
netlify · Apr 4, 2022 · 05494e7 · 05494e7
1 parent 6358e44
commit 05494e7
Show file tree

Hide file tree

Showing 12 changed files with 459 additions and 471 deletions.
diff --git a/package.json b/package.json
@@ -26,6 +26,7 @@
     "@babel/eslint-parser": "^7.16.5",
     "@babel/eslint-plugin": "^7.16.5",
     "@netlify/eslint-config-node": "^5.1.8",
+    "@types/jest": "^27.4.1",
     "babel-preset-gatsby-package": "^2.5.0",
     "cross-env": "^7.0.3",
     "gatsby": "^4.5.3",
@@ -51,7 +52,8 @@
     "url": "https://github.com/netlify/gatsby-plugin-netlify.git"
   },
   "scripts": {
-    "build": "babel src --out-dir . --ignore \"**/__tests__\"",
+    "build": "tsc && cd src/__tests__ && tsc",
+    "clean": "tsc --build --clean",
     "prepare": "cross-env NODE_ENV=production npm run build",
     "prepublishOnly": "npm run prepare",
     "format": "npm run format:code && npm run format:other",
@@ -60,7 +62,7 @@
     "lint": "eslint --ext .js,.jsx,.ts,.tsx .",
     "prettier": "prettier \"**/*.{md,css,scss,yaml,yml}\"",
     "test": "jest",
-    "watch": "babel -w src --out-dir . --ignore \"**/__tests__\""
+    "watch": "tsc --watch"
   },
   "engines": {
     "node": ">=12.13.0"

diff --git a/...snapshots__/build-headers-program.js.snap → ...snapshots__/build-headers-program.ts.snap b/...snapshots__/build-headers-program.js.snap → ...snapshots__/build-headers-program.ts.snap
diff --git a/src/__tests__/build-headers-program.js → src/__tests__/build-headers-program.ts b/src/__tests__/build-headers-program.js → src/__tests__/build-headers-program.ts
@@ -171,17 +171,20 @@ const createPluginData = async () => {
       ],
     },
     pathPrefix: ``,
-    publicFolder: (...files) => join(tmpDir, ...files),
+    publicFolder: (...files: any[]) => join(tmpDir, ...files),
   }
 }
 
-jest.mock(`fs-extra`, () => ({
-  ...jest.requireActual(`fs-extra`),
-  existsSync: jest.fn(),
-}))
+jest.mock(`fs-extra`, () => {
+  const actualFsExtra = jest.requireActual(`fs-extra`)
+  return {
+    ...actualFsExtra,
+    existsSync: jest.fn(),
+  }
+})
 // eslint-disable-next-line max-lines-per-function
 describe(`build-headers-program`, () => {
-  let reporter
+  let reporter: any
 
   beforeEach(() => {
     reporter = {
@@ -213,7 +216,7 @@ describe(`build-headers-program`, () => {
   it(`with manifest['pages-manifest']`, async () => {
     const pluginData = await createPluginData()
 
-    existsSync.mockImplementation((path) => !path.includes(`page-data.json`) && !path.includes(`app-data.json`))
+    existsSync.mockImplementation((path: any) => !path.includes(`page-data.json`) && !path.includes(`app-data.json`))
 
     // gatsby < 2.9 uses page-manifest
     pluginData.manifest[`pages-manifest`] = [`pages-manifest-ab11f09e0ca7ecd3b43e.js`]
@@ -244,7 +247,7 @@ describe(`build-headers-program`, () => {
       ...DEFAULT_OPTIONS,
       mergeCachingHeaders: true,
     }
-    existsSync.mockImplementation((path) => !path.includes(`app-data.json`))
+    existsSync.mockImplementation((path: any) => !path.includes(`app-data.json`))
 
     await buildHeadersProgram(pluginData, pluginOptions, reporter)
 

diff --git a/src/__tests__/gatsby-node.js → src/__tests__/gatsby-node.ts b/src/__tests__/gatsby-node.js → src/__tests__/gatsby-node.ts
diff --git a/src/__tests__/tsconfig.json b/src/__tests__/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "noEmit": true,
+  }
+}
diff --git a/src/build-headers-program.js → src/build-headers-program.ts b/src/build-headers-program.js → src/build-headers-program.ts
@@ -16,12 +16,12 @@ import {
   PAGE_DATA_DIR,
 } from './constants'
 
-const getHeaderName = (header) => {
+const getHeaderName = (header: any) => {
   const matches = header.match(/^([^:]+):/)
   return matches && matches[1]
 }
 
-const validHeaders = (headers, reporter) => {
+const validHeaders = (headers: any, reporter: any) => {
   if (!headers || !_.isObject(headers)) {
     return false
   }
@@ -40,20 +40,20 @@ const validHeaders = (headers, reporter) => {
   )
 }
 
-const linkTemplate = (assetPath, type = `script`) =>
+const linkTemplate = (assetPath: any, type = `script`) =>
   `Link: <${assetPath}>; rel=preload; as=${type}${type === `fetch` ? `; crossorigin` : ``}`
 
-const pathChunkName = (path) => {
+const pathChunkName = (path: any) => {
   const name = path === `/` ? `index` : kebabHash(path)
   return `path---${name}`
 }
 
-const getPageDataPath = (path) => {
+const getPageDataPath = (path: any) => {
   const fixedPagePath = path === `/` ? `index` : path
   return posix.join(`page-data`, fixedPagePath, `page-data.json`)
 }
 
-const getScriptPath = (file, manifest) => {
+const getScriptPath = (file: any, manifest: any) => {
   const chunk = manifest[file]
 
   if (!chunk) {
@@ -71,14 +71,19 @@ const getScriptPath = (file, manifest) => {
   })
 }
 
-const getLinkHeaders = (filesByType, pathPrefix) =>
-  Object.entries(filesByType).flatMap(([type, files]) =>
+const getLinkHeaders = (filesByType: any, pathPrefix: any) =>
+  Object.entries(filesByType).flatMap(([type, files]: [string, Array<string>]) =>
     files.map((file) => linkTemplate(`${pathPrefix}/${file}`, type)),
   )
 
-const headersPath = (pathPrefix, path) => `${pathPrefix}${path}`
+const headersPath = (pathPrefix: any, path: any) => `${pathPrefix}${path}`
 
-const preloadHeadersByPage = ({ pages, manifest, pathPrefix, publicFolder }) => {
+const preloadHeadersByPage = ({
+  pages,
+  manifest,
+  pathPrefix,
+  publicFolder
+}: any) => {
   const linksByPage = {}
 
   const appDataPath = publicFolder(PAGE_DATA_DIR, `app-data.json`)
@@ -91,7 +96,7 @@ const preloadHeadersByPage = ({ pages, manifest, pathPrefix, publicFolder }) =>
     hasPageData = existsSync(pageDataPath)
   }
 
-  pages.forEach((page) => {
+  pages.forEach((page: any) => {
     const scripts = _.flatMap(COMMON_BUNDLES, (file) => getScriptPath(file, manifest))
     scripts.push(
       ...getScriptPath(pathChunkName(page.path), manifest),
@@ -119,8 +124,8 @@ const preloadHeadersByPage = ({ pages, manifest, pathPrefix, publicFolder }) =>
   return linksByPage
 }
 
-const defaultMerge = (...headers) => {
-  const unionMerge = (objValue, srcValue) => {
+const defaultMerge = (...headers: any[]) => {
+  const unionMerge = (objValue: any, srcValue: any) => {
     if (Array.isArray(objValue)) {
       return _.union(objValue, srcValue)
     }
@@ -130,18 +135,18 @@ const defaultMerge = (...headers) => {
   return _.mergeWith({}, ...headers, unionMerge)
 }
 
-const headersMerge = (userHeaders, defaultHeaders) => {
+const headersMerge = (userHeaders: any, defaultHeaders: any) => {
   const merged = {}
   Object.keys(defaultHeaders).forEach((path) => {
     if (!userHeaders[path]) {
       merged[path] = defaultHeaders[path]
       return
     }
     const headersMap = {}
-    defaultHeaders[path].forEach((header) => {
+    defaultHeaders[path].forEach((header: any) => {
       headersMap[getHeaderName(header)] = header
     })
-    userHeaders[path].forEach((header) => {
+    userHeaders[path].forEach((header: any) => {
       // override if exists
       headersMap[getHeaderName(header)] = header
     })
@@ -155,34 +160,32 @@ const headersMerge = (userHeaders, defaultHeaders) => {
   return merged
 }
 
-const transformLink = (manifest, publicFolder, pathPrefix) => (header) =>
-  header.replace(LINK_REGEX, (__, prefix, file, suffix) => {
-    const hashed = manifest[file]
-    if (hashed) {
-      return `${prefix}${pathPrefix}${hashed}${suffix}`
-    }
-    if (existsSync(publicFolder(file))) {
-      return `${prefix}${pathPrefix}${file}${suffix}`
-    }
-    throw new Error(
-      `Could not find the file specified in the Link header \`${header}\`.` +
-        `The gatsby-plugin-netlify is looking for a matching file (with or without a ` +
-        `webpack hash). Check the public folder and your gatsby-config.js to ensure you are ` +
-        `pointing to a public file.`,
-    )
-  })
+const transformLink = (manifest: any, publicFolder: any, pathPrefix: any) => (header: any) => header.replace(LINK_REGEX, (__: any, prefix: any, file: any, suffix: any) => {
+  const hashed = manifest[file]
+  if (hashed) {
+    return `${prefix}${pathPrefix}${hashed}${suffix}`
+  }
+  if (existsSync(publicFolder(file))) {
+    return `${prefix}${pathPrefix}${file}${suffix}`
+  }
+  throw new Error(
+    `Could not find the file specified in the Link header \`${header}\`.` +
+      `The gatsby-plugin-netlify is looking for a matching file (with or without a ` +
+      `webpack hash). Check the public folder and your gatsby-config.js to ensure you are ` +
+      `pointing to a public file.`,
+  )
+})
 
 // Writes out headers file format, with two spaces for indentation
 // https://www.netlify.com/docs/headers-and-basic-auth/
-const stringifyHeaders = (headers) =>
-  Object.entries(headers).reduce((text, [path, headerList]) => {
-    const headersString = headerList.reduce((accum, header) => `${accum}  ${header}\n`, ``)
-    return `${text}${path}\n${headersString}`
-  }, ``)
+const stringifyHeaders = (headers: any) => Object.entries(headers).reduce((text, [path, headerList]: [string, Array<string>]) => {
+  const headersString = headerList.reduce((accum, header) => `${accum}  ${header}\n`, ``)
+  return `${text}${path}\n${headersString}`
+}, ``)
 
 // program methods
 
-const validateUserOptions = (pluginOptions, reporter) => (headers) => {
+const validateUserOptions = (pluginOptions: any, reporter: any) => (headers: any) => {
   if (!validHeaders(headers, reporter)) {
     throw new Error(
       `The "headers" option to gatsby-plugin-netlify is in the wrong shape. ` +
@@ -192,7 +195,7 @@ const validateUserOptions = (pluginOptions, reporter) => (headers) => {
     )
   }
 
-  ;[`mergeSecurityHeaders`, `mergeLinkHeaders`, `mergeCachingHeaders`].forEach((mergeOption) => {
+  [`mergeSecurityHeaders`, `mergeLinkHeaders`, `mergeCachingHeaders`].forEach((mergeOption) => {
     if (!_.isBoolean(pluginOptions[mergeOption])) {
       throw new TypeError(
         `The "${mergeOption}" option to gatsby-plugin-netlify must be a boolean. Check your gatsby-config.js.`,
@@ -212,18 +215,23 @@ const validateUserOptions = (pluginOptions, reporter) => (headers) => {
 }
 
 const mapUserLinkHeaders =
-  ({ manifest, pathPrefix, publicFolder }) =>
-  (headers) =>
-    Object.fromEntries(
-      Object.entries(headers).map(([path, headerList]) => [
-        path,
-        headerList.map(transformLink(manifest, publicFolder, pathPrefix)),
-      ]),
-    )
+  ({
+    manifest,
+    pathPrefix,
+    publicFolder
+  }: any) =>
+  (headers: any) => Object.fromEntries(
+    Object.entries(headers).map(([path, headerList]: [string, Array<string>]) => [
+      path,
+      headerList.map(transformLink(manifest, publicFolder, pathPrefix)),
+    ]),
+  )
 
 const mapUserLinkAllPageHeaders =
-  (pluginData, { allPageHeaders }) =>
-  (headers) => {
+  (pluginData: any, {
+    allPageHeaders
+  }: any) =>
+  (headers: any) => {
     if (!allPageHeaders) {
       return headers
     }
@@ -233,7 +241,7 @@ const mapUserLinkAllPageHeaders =
     const headersList = allPageHeaders.map(transformLink(manifest, publicFolder, pathPrefix))
 
     const duplicateHeadersByPage = {}
-    pages.forEach((page) => {
+    pages.forEach((page: any) => {
       const pathKey = headersPath(pathPrefix, page.path)
       duplicateHeadersByPage[pathKey] = headersList
     })
@@ -242,8 +250,10 @@ const mapUserLinkAllPageHeaders =
   }
 
 const applyLinkHeaders =
-  (pluginData, { mergeLinkHeaders }) =>
-  (headers) => {
+  (pluginData: any, {
+    mergeLinkHeaders
+  }: any) =>
+  (headers: any) => {
     if (!mergeLinkHeaders) {
       return headers
     }
@@ -260,8 +270,10 @@ const applyLinkHeaders =
   }
 
 const applySecurityHeaders =
-  ({ mergeSecurityHeaders }) =>
-  (headers) => {
+  ({
+    mergeSecurityHeaders
+  }: any) =>
+  (headers: any) => {
     if (!mergeSecurityHeaders) {
       return headers
     }
@@ -270,8 +282,10 @@ const applySecurityHeaders =
   }
 
 const applyCachingHeaders =
-  (pluginData, { mergeCachingHeaders }) =>
-  (headers) => {
+  (pluginData: any, {
+    mergeCachingHeaders
+  }: any) =>
+  (headers: any) => {
     if (!mergeCachingHeaders) {
       return headers
     }
@@ -301,18 +315,20 @@ const applyCachingHeaders =
   }
 
 const applyTransfromHeaders =
-  ({ transformHeaders }) =>
-  (headers) =>
-    _.mapValues(headers, transformHeaders)
+  ({
+    transformHeaders
+  }: any) =>
+  (headers: any) => _.mapValues(headers, transformHeaders)
 
-const transformToString = (headers) => `${HEADER_COMMENT}\n\n${stringifyHeaders(headers)}`
+const transformToString = (headers: any) => `${HEADER_COMMENT}\n\n${stringifyHeaders(headers)}`
 
 const writeHeadersFile =
-  ({ publicFolder }) =>
-  (contents) =>
-    writeFile(publicFolder(NETLIFY_HEADERS_FILENAME), contents)
+  ({
+    publicFolder
+  }: any) =>
+  (contents: any) => writeFile(publicFolder(NETLIFY_HEADERS_FILENAME), contents)
 
-const buildHeadersProgram = (pluginData, pluginOptions, reporter) =>
+const buildHeadersProgram = (pluginData: any, pluginOptions: any, reporter: any) =>
   _.flow(
     validateUserOptions(pluginOptions, reporter),
     mapUserLinkHeaders(pluginData),

diff --git a/src/constants.js → src/constants.ts b/src/constants.js → src/constants.ts
diff --git a/src/create-redirects.js → src/create-redirects.ts b/src/create-redirects.js → src/create-redirects.ts
@@ -3,7 +3,7 @@ import { existsSync, readFile, writeFile } from 'fs-extra'
 import { HEADER_COMMENT } from './constants'
 
 // eslint-disable-next-line max-statements
-export default async function writeRedirectsFile(pluginData, redirects, rewrites) {
+export default async function writeRedirectsFile(pluginData: any, redirects: any, rewrites: any) {
   const { publicFolder } = pluginData
 
   if (redirects.length === 0 && rewrites.length === 0) return null
@@ -22,7 +22,7 @@ export default async function writeRedirectsFile(pluginData, redirects, rewrites
   ])
 
   // Map redirect data to the format Netlify expects
-  redirects = redirects.map((redirect) => {
+  redirects = redirects.map((redirect: any) => {
     const { fromPath, isPermanent, redirectInBrowser, force, toPath, statusCode, ...rest } = redirect
 
     let status = isPermanent ? `301` : `302`
@@ -49,7 +49,10 @@ export default async function writeRedirectsFile(pluginData, redirects, rewrites
     return pieces.join(`  `)
   })
 
-  rewrites = rewrites.map(({ fromPath, toPath }) => `${fromPath}  ${toPath}  200`)
+  rewrites = rewrites.map(({
+    fromPath,
+    toPath
+  }: any) => `${fromPath}  ${toPath}  200`)
 
   let commentFound = false