Convert function expressions to declarations

.eslintrc.js

@@ -30,6 +30,7 @@ module.exports = {
     '@emotion/styled-import': 'error',
     'require-atomic-updates': [0],
     'object-shorthand': ['error', 'always'],
+    'func-style': ['error', 'declaration'],
     'prefer-const': [
       'error',
       {

babel.config.js

@@ -74,7 +74,7 @@ const defaultPlugins = [
   ],
 ];
 
-const presets = () => {
+function presets() {
   return [
     '@babel/preset-react',
     '@babel/preset-env',
@@ -86,9 +86,9 @@ const presets = () => {
     ],
     '@babel/typescript',
   ];
-};
+}
 
-const plugins = () => {
+function plugins() {
   if (isESM) {
     return [
       ...defaultPlugins,
@@ -129,7 +129,7 @@ const plugins = () => {
   }
 
   return defaultPlugins;
-};
+}
 
 module.exports = {
   presets: presets(),

packages/netlify-cms-backend-azure/src/API.ts

@@ -161,7 +161,7 @@ function delay(ms: number) {
   return new Promise(resolve => setTimeout(resolve, ms));
 }
 
-const getChangeItem = (item: AzureCommitItem) => {
+function getChangeItem(item: AzureCommitItem) {
   switch (item.action) {
     case AzureCommitChangeType.ADD:
       return {
@@ -195,7 +195,7 @@ const getChangeItem = (item: AzureCommitItem) => {
     default:
       return {};
   }
-};
+}
 
 type AzureCommitItem = {
   action: AzureCommitChangeType;

packages/netlify-cms-backend-azure/src/implementation.ts

@@ -33,7 +33,7 @@ import {
 
 const MAX_CONCURRENT_DOWNLOADS = 10;
 
-const parseAzureRepo = (config: Config) => {
+function parseAzureRepo(config: Config) {
   const { repo } = config.backend;
 
   if (typeof repo !== 'string') {
@@ -51,7 +51,7 @@ const parseAzureRepo = (config: Config) => {
     project,
     repoName,
   };
-};
+}
 
 export default class Azure implements Implementation {
   lock: AsyncLock;

packages/netlify-cms-backend-bitbucket/src/API.ts

@@ -186,14 +186,14 @@ export const API_NAME = 'Bitbucket';
 
 const APPLICATION_JSON = 'application/json; charset=utf-8';
 
-const replace404WithEmptyResponse = (err: FetchError) => {
+function replace404WithEmptyResponse(err: FetchError) {
   if (err && err.status === 404) {
     console.log('This 404 was expected and handled appropriately.');
     return { size: 0, values: [] as BitBucketFile[] } as BitBucketSrcResult;
   } else {
     return Promise.reject(err);
   }
-};
+}
 
 export default class API {
   apiRoot: string;
@@ -653,8 +653,8 @@ export default class API {
       params: {
         pagelen: 50,
         q: oneLine`
-        source.repository.full_name = "${this.repo}" 
-        AND state = "${BitBucketPullRequestState.OPEN}" 
+        source.repository.full_name = "${this.repo}"
+        AND state = "${BitBucketPullRequestState.OPEN}"
         AND destination.branch.name = "${this.branch}"
         AND comment_count > 0
         AND ${sourceQuery}

packages/netlify-cms-backend-git-gateway/src/implementation.ts

@@ -121,11 +121,11 @@ interface NetlifyUser extends Credentials {
   user_metadata: { full_name: string; avatar_url: string };
 }
 
-const apiGet = async (path: string) => {
+async function apiGet(path: string) {
   const apiRoot = 'https://api.netlify.com/api/v1/sites';
   const response = await fetch(`${apiRoot}/${path}`).then(res => res.json());
   return response;
-};
+}
 
 export default class GitGateway implements Implementation {
   config: Config;

packages/netlify-cms-backend-git-gateway/src/netlify-lfs-client.ts

@@ -15,8 +15,9 @@ type ClientConfig = {
   transformImages: ImageTransformations | boolean;
 };
 
-export const matchPath = ({ patterns }: ClientConfig, path: string) =>
-  patterns.some(pattern => minimatch(path, pattern, { matchBase: true }));
+export function matchPath({ patterns }: ClientConfig, path: string) {
+  return patterns.some(pattern => minimatch(path, pattern, { matchBase: true }));
+}
 
 //
 // API interactions
@@ -26,10 +27,10 @@ const defaultContentHeaders = {
   ['Content-Type']: 'application/vnd.git-lfs+json',
 };
 
-const resourceExists = async (
+async function resourceExists(
   { rootURL, makeAuthorizedRequest }: ClientConfig,
   { sha, size }: PointerFile,
-) => {
+) {
   const response = await makeAuthorizedRequest({
     url: `${rootURL}/verify`,
     method: 'POST',
@@ -45,20 +46,20 @@ const resourceExists = async (
 
   // TODO: what kind of error to throw here? APIError doesn't seem
   // to fit
-};
+}
 
-const getTransofrmationsParams = (t: boolean | ImageTransformations) => {
+function getTransofrmationsParams(t: boolean | ImageTransformations) {
   if (isPlainObject(t) && !isEmpty(t)) {
     const { nf_resize: resize, w, h } = t as ImageTransformations;
     return `?nf_resize=${resize}&w=${w}&h=${h}`;
   }
   return '';
-};
+}
 
-const getDownloadURL = async (
+async function getDownloadURL(
   { rootURL, transformImages: t, makeAuthorizedRequest }: ClientConfig,
   { sha }: PointerFile,
-) => {
+) {
   try {
     const transformation = getTransofrmationsParams(t);
     const transformedPromise = makeAuthorizedRequest(`${rootURL}/origin/${sha}${transformation}`);
@@ -81,21 +82,23 @@ const getDownloadURL = async (
     console.error(error);
     return { url: '', blob: new Blob() };
   }
-};
+}
 
-const uploadOperation = (objects: PointerFile[]) => ({
-  operation: 'upload',
-  transfers: ['basic'],
-  objects: objects.map(({ sha, ...rest }) => ({ ...rest, oid: sha })),
-});
+function uploadOperation(objects: PointerFile[]) {
+  return {
+    operation: 'upload',
+    transfers: ['basic'],
+    objects: objects.map(({ sha, ...rest }) => ({ ...rest, oid: sha })),
+  };
+}
 
-const getResourceUploadURLs = async (
+async function getResourceUploadURLs(
   {
     rootURL,
     makeAuthorizedRequest,
   }: { rootURL: string; makeAuthorizedRequest: MakeAuthorizedRequest },
   pointerFiles: PointerFile[],
-) => {
+) {
   const response = await makeAuthorizedRequest({
     url: `${rootURL}/objects/batch`,
     method: 'POST',
@@ -113,33 +116,35 @@ const getResourceUploadURLs = async (
     },
   );
   return uploadUrls;
-};
+}
 
-const uploadBlob = (uploadURL: string, blob: Blob) =>
-  unsentRequest.fetchWithTimeout(uploadURL, {
+function uploadBlob(uploadURL: string, blob: Blob) {
+  return unsentRequest.fetchWithTimeout(uploadURL, {
     method: 'PUT',
     body: blob,
   });
+}
 
-const uploadResource = async (
+async function uploadResource(
   clientConfig: ClientConfig,
   { sha, size }: PointerFile,
   resource: Blob,
-) => {
+) {
   const existingFile = await resourceExists(clientConfig, { sha, size });
   if (existingFile) {
     return sha;
   }
   const [uploadURL] = await getResourceUploadURLs(clientConfig, [{ sha, size }]);
   await uploadBlob(uploadURL, resource);
   return sha;
-};
+}
 
 //
 // Create Large Media client
 
-const configureFn = (config: ClientConfig, fn: Function) => (...args: unknown[]) =>
-  fn(config, ...args);
+function configureFn(config: ClientConfig, fn: Function) {
+  return (...args: unknown[]) => fn(config, ...args);
+}
 
 const clientFns: Record<string, Function> = {
   resourceExists,
@@ -159,7 +164,7 @@ export type Client = {
   enabled: boolean;
 };
 
-export const getClient = (clientConfig: ClientConfig) => {
+export function getClient(clientConfig: ClientConfig) {
   return flow([
     Object.keys,
     map((key: string) => [key, configureFn(clientConfig, clientFns[key])]),
@@ -170,4 +175,4 @@ export const getClient = (clientConfig: ClientConfig) => {
       enabled: clientConfig.enabled,
     }),
   ])(clientFns);
-};
+}

packages/netlify-cms-backend-github/src/API.ts

@@ -129,12 +129,15 @@ type MediaFile = {
   path: string;
 };
 
-const withCmsLabel = (pr: GitHubPull, cmsLabelPrefix: string) =>
-  pr.labels.some(l => isCMSLabel(l.name, cmsLabelPrefix));
-const withoutCmsLabel = (pr: GitHubPull, cmsLabelPrefix: string) =>
-  pr.labels.every(l => !isCMSLabel(l.name, cmsLabelPrefix));
+function withCmsLabel(pr: GitHubPull, cmsLabelPrefix: string) {
+  return pr.labels.some(l => isCMSLabel(l.name, cmsLabelPrefix));
+}
+
+function withoutCmsLabel(pr: GitHubPull, cmsLabelPrefix: string) {
+  return pr.labels.every(l => !isCMSLabel(l.name, cmsLabelPrefix));
+}
 
-const getTreeFiles = (files: GitHubCompareFiles) => {
+function getTreeFiles(files: GitHubCompareFiles) {
   const treeFiles = files.reduce((arr, file) => {
     if (file.status === 'removed') {
       // delete the file
@@ -152,7 +155,7 @@ const getTreeFiles = (files: GitHubCompareFiles) => {
   }, [] as { sha: string | null; path: string }[]);
 
   return treeFiles;
-};
+}
 
 export type Diff = {
   path: string;
@@ -446,7 +449,7 @@ export default class API {
       headers: { Accept: 'application/vnd.github.v3.raw' },
     };
 
-    const errorHandler = (err: Error) => {
+    function errorHandler(err: Error) {
       if (err.message === 'Not Found') {
         console.log(
           '%c %s does not have metadata',
@@ -455,7 +458,7 @@ export default class API {
         );
       }
       throw err;
-    };
+    }
 
     if (!this.useOpenAuthoring) {
       const result = await this.request(

packages/netlify-cms-backend-github/src/GraphQLAPI.ts

@@ -69,14 +69,14 @@ type GraphQLPullRequest = {
   };
 };
 
-const transformPullRequest = (pr: GraphQLPullRequest) => {
+function transformPullRequest(pr: GraphQLPullRequest) {
   return {
     ...pr,
     labels: pr.labels.nodes,
     head: { ref: pr.headRefName, sha: pr.headRefOid, repo: { fork: pr.repository.isFork } },
     base: { ref: pr.baseRefName, sha: pr.baseRefOid },
   };
-};
+}
 
 type Error = GraphQLError & { type: string };
 

packages/netlify-cms-backend-github/src/__tests__/API.spec.js

@@ -8,15 +8,15 @@ describe('github API', () => {
     jest.resetAllMocks();
   });
 
-  const mockAPI = (api, responses) => {
+  function mockAPI(api, responses) {
     api.request = jest.fn().mockImplementation((path, options = {}) => {
       const normalizedPath = path.indexOf('?') !== -1 ? path.substr(0, path.indexOf('?')) : path;
       const response = responses[normalizedPath];
       return typeof response === 'function'
         ? Promise.resolve(response(options))
         : Promise.reject(new Error(`No response for path '${normalizedPath}'`));
     });
-  };
+  }
 
   describe('editorialWorkflowGit', () => {
     it('should create PR with correct base branch name when publishing with editorial workflow', () => {

packages/netlify-cms-backend-github/src/queries.ts

@@ -62,7 +62,7 @@ export const statues = gql`
   ${fragments.object}
 `;
 
-const buildFilesQuery = (depth = 1) => {
+function buildFilesQuery(depth = 1) {
   const PLACE_HOLDER = 'PLACE_HOLDER';
   let query = oneLine`
     ...ObjectParts
@@ -93,21 +93,23 @@ const buildFilesQuery = (depth = 1) => {
   query = query.replace(PLACE_HOLDER, '');
 
   return query;
-};
+}
 
-export const files = (depth: number) => gql`
-  query files($owner: String!, $name: String!, $expression: String!) {
-    repository(owner: $owner, name: $name) {
-      ...RepositoryParts
-      object(expression: $expression) {
-        ${buildFilesQuery(depth)}
+export function files(depth: number) {
+  return gql`
+    query files($owner: String!, $name: String!, $expression: String!) {
+      repository(owner: $owner, name: $name) {
+        ...RepositoryParts
+        object(expression: $expression) {
+          ${buildFilesQuery(depth)}
+        }
       }
     }
-  }
-  ${fragments.repository}
-  ${fragments.object}
-  ${fragments.fileEntry}
-`;
+    ${fragments.repository}
+    ${fragments.object}
+    ${fragments.fileEntry}
+  `;
+}
 
 const branchQueryPart = `
 branch: ref(qualifiedName: $qualifiedName) {