chore: update prettier (#5412)

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

.prettierrc

@@ -1,4 +1,5 @@
 {
+  "arrowParens": "avoid",
   "trailingComma": "all",
   "singleQuote": true,
   "printWidth": 100

package.json

@@ -148,7 +148,7 @@
     "nock": "^13.0.0",
     "node-fetch": "^2.3.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^1.19.1",
+    "prettier": "^2.3.0",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
     "react-test-renderer": "^16.8.4",

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

@@ -277,9 +277,9 @@ export default class BitbucketBackend implements Implementation {
   }
 
   apiRequestFunction = async (req: ApiRequest) => {
-    const token = (this.refreshedTokenPromise
+    const token = (
-      ? await this.refreshedTokenPromise
+      this.refreshedTokenPromise ? await this.refreshedTokenPromise : this.token
-      : this.token) as string;
+    ) as string;
 
     const authorizedRequest = unsentRequest.withHeaders({ Authorization: `Bearer ${token}` }, req);
     const response: Response = await unsentRequest.performRequest(authorizedRequest);

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

@@ -310,10 +310,10 @@ export default class API {
     let responseStatus = 500;
 
     try {
-      const req = (unsentRequest.fromFetchArguments(url, {
+      const req = unsentRequest.fromFetchArguments(url, {
         ...options,
         headers,
-      }) as unknown) as ApiRequest;
+      }) as unknown as ApiRequest;
       const response = await requestWithBackoff(this, req);
       responseStatus = response.status;
       const parsedResponse = await parser(response);
@@ -366,8 +366,7 @@ export default class API {
       .catch(() => {
         // Meta ref doesn't exist
         const readme = {
-          raw:
+          raw: '# Netlify CMS\n\nThis tree is used by the Netlify CMS to store metadata information for specific files and branches.',
-            '# Netlify CMS\n\nThis tree is used by the Netlify CMS to store metadata information for specific files and branches.',
         };
 
         return this.uploadBlob(readme)
@@ -808,7 +807,8 @@ export default class API {
     let branches: string[];
     if (this.useOpenAuthoring) {
       // open authoring branches can exist without a pr
-      const cmsBranches: Octokit.GitListMatchingRefsResponse = await this.getOpenAuthoringBranches();
+      const cmsBranches: Octokit.GitListMatchingRefsResponse =
+        await this.getOpenAuthoringBranches();
       branches = cmsBranches.map(b => b.ref.substring('refs/heads/'.length));
       // filter irrelevant branches
       const branchesWithFilter = await Promise.all(
@@ -1036,7 +1036,7 @@ export default class API {
         author,
         committer,
       );
-      return (newCommit as unknown) as GitHubCompareCommit;
+      return newCommit as unknown as GitHubCompareCommit;
     } else {
       return commit;
     }

packages/netlify-cms-backend-github/src/AuthenticationPage.js

@@ -75,10 +75,8 @@ export default class GitHubAuthenticationPage extends React.Component {
     };
     const auth = new NetlifyAuthenticator(cfg);
 
-    const {
+    const { open_authoring: openAuthoring = false, auth_scope: authScope = '' } =
-      open_authoring: openAuthoring = false,
+      this.props.config.backend;
-      auth_scope: authScope = '',
-    } = this.props.config.backend;
 
     const scope = authScope || (openAuthoring ? 'public_repo' : 'repo');
     auth.authenticate({ provider: 'github', scope }, (err, data) => {

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

@@ -300,7 +300,7 @@ export default class GraphQLAPI extends API {
 
     const mapped = pullRequests.nodes.map(transformPullRequest);
 
-    return ((mapped as unknown) as Octokit.PullsListResponseItem[]).filter(
+    return (mapped as unknown as Octokit.PullsListResponseItem[]).filter(
       pr => pr.head.ref.startsWith(`${CMS_BRANCH_PREFIX}/`) && predicate(pr),
     );
   }
@@ -673,7 +673,7 @@ export default class GraphQLAPI extends API {
       },
     });
     const { pullRequest } = data!.createPullRequest;
-    return (transformPullRequest(pullRequest) as unknown) as Octokit.PullsCreateResponse;
+    return transformPullRequest(pullRequest) as unknown as Octokit.PullsCreateResponse;
   }
 
   async getFileSha(path: string, { repoURL = this.repoURL, branch = this.branch } = {}) {

packages/netlify-cms-backend-github/src/implementation.tsx

@@ -537,9 +537,9 @@ export default class GitHub implements Implementation {
     }
 
     const readFile = (path: string, id: string | null | undefined) =>
-      this.api!.readFile(path, id, { repoURL: this.api!.originRepoURL }).catch(() => '') as Promise<
+      this.api!.readFile(path, id, { repoURL: this.api!.originRepoURL }).catch(
-        string
+        () => '',
-      >;
+      ) as Promise<string>;
 
     const entries = await entriesByFiles(
       result.files,

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

@@ -245,10 +245,8 @@ export default class API {
   MAINTAINER_ACCESS = 40;
 
   hasWriteAccess = async () => {
-    const {
+    const { shared_with_groups: sharedWithGroups, permissions }: GitLabRepo =
-      shared_with_groups: sharedWithGroups,
+      await this.requestJSON(this.repoURL);
-      permissions,
-    }: GitLabRepo = await this.requestJSON(this.repoURL);
 
     const { project_access: projectAccess, group_access: groupAccess } = permissions;
     if (projectAccess && projectAccess.access_level >= this.WRITE_ACCESS) {

packages/netlify-cms-backend-gitlab/src/__tests__/gitlab.spec.js

@@ -287,10 +287,7 @@ describe('gitlab backend', () => {
   function interceptFiles(backend, path) {
     const api = mockApi(backend);
     const url = `${expectedRepoUrl}/repository/files/${encodeURIComponent(path)}/raw`;
-    api
+    api.get(url).query(true).reply(200, mockRepo.files[path]);
-      .get(url)
-      .query(true)
-      .reply(200, mockRepo.files[path]);
 
     api
       .get(`${expectedRepoUrl}/repository/commits`)
@@ -391,10 +388,7 @@ describe('gitlab backend', () => {
 
     it('returns an entry from folder collection', async () => {
       const entryTree = mockRepo.tree[collectionContentConfig.folder][0];
-      const slug = entryTree.path
+      const slug = entryTree.path.split('/').pop().replace('.md', '');
-        .split('/')
-        .pop()
-        .replace('.md', '');
 
       interceptFiles(backend, entryTree.path);
       interceptCollection(backend, collectionContentConfig);

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

@@ -80,7 +80,7 @@ export default class ProxyBackend implements Implementation {
   }
 
   authenticate() {
-    return (Promise.resolve() as unknown) as Promise<User>;
+    return Promise.resolve() as unknown as Promise<User>;
   }
 
   logout() {

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

@@ -54,7 +54,7 @@ function getFile(path: string, tree: RepoTree) {
   while (obj && segments.length) {
     obj = obj[segments.shift() as string] as RepoTree;
   }
-  return ((obj as unknown) as RepoFile) || {};
+  return (obj as unknown as RepoFile) || {};
 }
 
 function writeFile(path: string, content: string | AssetProxy, tree: RepoTree) {
@@ -146,7 +146,7 @@ export default class TestBackend implements Implementation {
   }
 
   authenticate() {
-    return (Promise.resolve() as unknown) as Promise<User>;
+    return Promise.resolve() as unknown as Promise<User>;
   }
 
   logout() {

packages/netlify-cms-core/index.d.ts

@@ -516,9 +516,12 @@ declare module 'netlify-cms-core' {
     };
   }
 
-  type GetAssetFunction = (
+  type GetAssetFunction = (asset: string) => {
-    asset: string,
+    url: string;
-  ) => { url: string; path: string; field?: any; fileObj: File };
+    path: string;
+    field?: any;
+    fileObj: File;
+  };
 
   export type PreviewTemplateComponentProps = {
     entry: Map<string, any>;

packages/netlify-cms-core/src/actions/__tests__/entries.spec.js

@@ -436,9 +436,9 @@ describe('entries', () => {
     });
 
     it('should not return error on meta path field', () => {
-      expect(
+      expect(validateMetaField(null, null, fromJS({ meta: true, name: 'other' }), null, t)).toEqual(
-        validateMetaField(null, null, fromJS({ meta: true, name: 'other' }), null, t),
+        { error: false },
-      ).toEqual({ error: false });
+      );
     });
 
     it('should return error on empty path', () => {

packages/netlify-cms-core/src/actions/__tests__/media.spec.ts

@@ -9,9 +9,8 @@ import { State } from '../../types/redux';
 import AssetProxy from '../../valueObjects/AssetProxy';
 
 const middlewares = [thunk];
-const mockStore = configureMockStore<Partial<State>, ThunkDispatch<State, {}, AnyAction>>(
+const mockStore =
-  middlewares,
+  configureMockStore<Partial<State>, ThunkDispatch<State, {}, AnyAction>>(middlewares);
-);
 const mockedSelectMediaFilePath = mocked(selectMediaFilePath);
 
 jest.mock('../../reducers/entries');

packages/netlify-cms-core/src/actions/config.ts

@@ -474,9 +474,11 @@ export async function handleLocalBackend(originalConfig: CmsConfig) {
     return originalConfig;
   }
 
-  const { proxyUrl, publish_modes: publishModes, type: backendType } = await detectProxyServer(
+  const {
-    originalConfig.local_backend,
+    proxyUrl,
-  );
+    publish_modes: publishModes,
+    type: backendType,
+  } = await detectProxyServer(originalConfig.local_backend);
 
   if (!proxyUrl) {
     return originalConfig;

packages/netlify-cms-core/src/actions/editorialWorkflow.ts

@@ -519,7 +519,7 @@ export function unpublishPublishedEntry(collection: Collection, slug: string) {
     const state = getState();
     const backend = currentBackend(state.config);
     const entry = selectEntry(state, collection.get('name'), slug);
-    const entryDraft = (Map().set('entry', entry) as unknown) as EntryDraft;
+    const entryDraft = Map().set('entry', entry) as unknown as EntryDraft;
     dispatch(unpublishedEntryPersisting(collection, slug));
     return backend
       .deleteEntry(state, collection, slug)

packages/netlify-cms-core/src/backend.ts

@@ -1322,7 +1322,7 @@ export function resolveBackend(config: CmsConfig) {
   }
 }
 
-export const currentBackend = (function() {
+export const currentBackend = (function () {
   let backend: Backend;
 
   return (config: CmsConfig) => {

packages/netlify-cms-core/src/components/App/App.js

@@ -25,7 +25,7 @@ import Header from './Header';
 
 TopBarProgress.config({
   barColors: {
-    '0': colors.active,
+    0: colors.active,
     '1.0': colors.active,
   },
   shadowBlur: 0,

packages/netlify-cms-core/src/components/Editor/Editor.js

@@ -192,7 +192,7 @@ export class Editor extends React.Component {
     window.removeEventListener('beforeunload', this.exitBlocker);
   }
 
-  createBackup = debounce(function(entry, collection) {
+  createBackup = debounce(function (entry, collection) {
     this.props.persistLocalBackup(entry, collection);
   }, 2000);
 
@@ -202,14 +202,8 @@ export class Editor extends React.Component {
   };
 
   handleChangeStatus = newStatusName => {
-    const {
+    const { entryDraft, updateUnpublishedEntryStatus, collection, slug, currentStatus, t } =
-      entryDraft,
+      this.props;
-      updateUnpublishedEntryStatus,
-      collection,
-      slug,
-      currentStatus,
-      t,
-    } = this.props;
     if (entryDraft.get('hasChanged')) {
       window.alert(t('editor.editor.onUpdatingWithUnsavedChanges'));
       return;
@@ -318,15 +312,8 @@ export class Editor extends React.Component {
   };
 
   handleDeleteUnpublishedChanges = async () => {
-    const {
+    const { entryDraft, collection, slug, deleteUnpublishedEntry, loadEntry, isModification, t } =
-      entryDraft,
+      this.props;
-      collection,
-      slug,
-      deleteUnpublishedEntry,
-      loadEntry,
-      isModification,
-      t,
-    } = this.props;
     if (
       entryDraft.get('hasChanged') &&
       !window.confirm(t('editor.editor.onDeleteUnpublishedChangesWithUnsavedChanges'))

packages/netlify-cms-core/src/integrations/index.js

@@ -20,7 +20,7 @@ export function resolveIntegrations(interationsConfig, getToken) {
   return integrationInstances;
 }
 
-export const getIntegrationProvider = (function() {
+export const getIntegrationProvider = (function () {
   let integrations = null;
 
   return (interationsConfig, getToken, provider) => {

packages/netlify-cms-core/src/lib/formatters.ts

@@ -182,7 +182,7 @@ export function previewUrlFormatter(
   let fields = entry.get('data') as Map<string, string>;
   fields = addFileTemplateFields(entry.get('path'), fields, collection.get('folder'));
   const dateFieldName = getDateField() || selectInferedField(collection, 'date');
-  const date = parseDateFromEntry((entry as unknown) as Map<string, unknown>, dateFieldName);
+  const date = parseDateFromEntry(entry as unknown as Map<string, unknown>, dateFieldName);
 
   // Prepare and sanitize slug variables only, leave the rest of the
   // `preview_path` template as is.
@@ -213,7 +213,7 @@ export function summaryFormatter(summaryTemplate: string, entry: EntryMap, colle
   let entryData = entry.get('data');
   const date =
     parseDateFromEntry(
-      (entry as unknown) as Map<string, unknown>,
+      entry as unknown as Map<string, unknown>,
       selectInferedField(collection, 'date'),
     ) || null;
   const identifier = entryData.getIn(keyToPathArray(selectIdentifier(collection) as string));
@@ -247,7 +247,7 @@ export function folderFormatter(
 
   const date =
     parseDateFromEntry(
-      (entry as unknown) as Map<string, unknown>,
+      entry as unknown as Map<string, unknown>,
       selectInferedField(collection, 'date'),
     ) || null;
   const identifier = fields.getIn(keyToPathArray(selectIdentifier(collection) as string));

packages/netlify-cms-core/src/lib/urlHelper.ts

@@ -36,7 +36,8 @@ export function stripProtocol(urlString: string) {
  *   but JS stores strings as UTF-16/UCS-2 internally, so we should not normalize or re-encode.
  */
 const uriChars = /[\w\-.~]/i;
-const ucsChars = /[\xA0-\u{D7FF}\u{F900}-\u{FDCF}\u{FDF0}-\u{FFEF}\u{10000}-\u{1FFFD}\u{20000}-\u{2FFFD}\u{30000}-\u{3FFFD}\u{40000}-\u{4FFFD}\u{50000}-\u{5FFFD}\u{60000}-\u{6FFFD}\u{70000}-\u{7FFFD}\u{80000}-\u{8FFFD}\u{90000}-\u{9FFFD}\u{A0000}-\u{AFFFD}\u{B0000}-\u{BFFFD}\u{C0000}-\u{CFFFD}\u{D0000}-\u{DFFFD}\u{E1000}-\u{EFFFD}]/u;
+const ucsChars =
+  /[\xA0-\u{D7FF}\u{F900}-\u{FDCF}\u{FDF0}-\u{FFEF}\u{10000}-\u{1FFFD}\u{20000}-\u{2FFFD}\u{30000}-\u{3FFFD}\u{40000}-\u{4FFFD}\u{50000}-\u{5FFFD}\u{60000}-\u{6FFFD}\u{70000}-\u{7FFFD}\u{80000}-\u{8FFFD}\u{90000}-\u{9FFFD}\u{A0000}-\u{AFFFD}\u{B0000}-\u{BFFFD}\u{C0000}-\u{CFFFD}\u{D0000}-\u{DFFFD}\u{E1000}-\u{EFFFD}]/u;
 
 function validURIChar(char: string) {
   return uriChars.test(char);
@@ -80,9 +81,7 @@ export function sanitizeURI(
 
   // `Array.from` must be used instead of `String.split` because
   //   `split` converts things like emojis into UTF-16 surrogate pairs.
-  return Array.from(str)
+  return Array.from(str).map(getCharReplacer(encoding, replacement)).join('');
-    .map(getCharReplacer(encoding, replacement))
-    .join('');
 }
 
 export function sanitizeChar(char: string, options?: CmsSlug) {
@@ -95,8 +94,11 @@ export function sanitizeSlug(str: string, options?: CmsSlug) {
     throw new Error('The input slug must be a string.');
   }
 
-  const { encoding, clean_accents: stripDiacritics, sanitize_replacement: replacement } =
+  const {
-    options || {};
+    encoding,
+    clean_accents: stripDiacritics,
+    sanitize_replacement: replacement,
+  } = options || {};
 
   const sanitizedSlug = flow([
     ...(stripDiacritics ? [diacritics.remove] : []),

packages/netlify-cms-core/src/mediaLibrary.ts

@@ -25,7 +25,7 @@ function handleInsert(url: string) {
 }
 
 const initializeMediaLibrary = once(async function initializeMediaLibrary(name, options) {
-  const lib = (getMediaLibrary(name) as unknown) as MediaLibrary | undefined;
+  const lib = getMediaLibrary(name) as unknown as MediaLibrary | undefined;
   if (!lib) {
     const err = new Error(
       `Missing external media library '${name}'. Please use 'registerMediaLibrary' to register it.`,

packages/netlify-cms-core/src/reducers/__tests__/collections.spec.js

@@ -368,30 +368,15 @@ describe('collections', () => {
       });
 
       expect(selectField(collection, 'en.title')).toBe(
-        collection
+        collection.get('fields').get(0).get('fields').get(0),
-          .get('fields')
-          .get(0)
-          .get('fields')
-          .get(0),
       );
 
       expect(selectField(collection, 'it.title.subTitle')).toBe(
-        collection
+        collection.get('fields').get(2).get('field').get('fields').get(0),
-          .get('fields')
-          .get(2)
-          .get('field')
-          .get('fields')
-          .get(0),
       );
 
       expect(selectField(collection, 'fr.title.variableType')).toBe(
-        collection
+        collection.get('fields').get(3).get('fields').get(0).get('types').get(0),
-          .get('fields')
-          .get(3)
-          .get('fields')
-          .get(0)
-          .get('types')
-          .get(0),
       );
     });
   });

packages/netlify-cms-core/src/reducers/collections.ts

@@ -144,10 +144,7 @@ export function selectFieldsWithMediaFolders(collection: Collection, slug: strin
     const fields = collection.get('fields').toArray();
     return getFieldsWithMediaFolders(fields);
   } else if (collection.has('files')) {
-    const fields =
+    const fields = getFileFromSlug(collection, slug)?.get('fields').toArray() || [];
-      getFileFromSlug(collection, slug)
-        ?.get('fields')
-        .toArray() || [];
     return getFieldsWithMediaFolders(fields);
   }
 
@@ -317,7 +314,8 @@ export function selectInferedField(collection: Collection, fieldName: string) {
   if (fieldName === 'title' && collection.get('identifier_field')) {
     return selectIdentifier(collection);
   }
-  const inferableField = (INFERABLE_FIELDS as Record<
+  const inferableField = (
+    INFERABLE_FIELDS as Record<
       string,
       {
         type: string;
@@ -326,7 +324,8 @@ export function selectInferedField(collection: Collection, fieldName: string) {
         fallbackToFirstField: boolean;
         showError: boolean;
       }
-  >)[fieldName];
+    >
+  )[fieldName];
   const fields = collection.get('fields');
   let field;
 

packages/netlify-cms-core/src/reducers/entries.ts

@@ -105,10 +105,9 @@ function persistSort(sort: Sort | undefined) {
     const storageSort: StorageSort = {};
     sort.keySeq().forEach(key => {
       const collection = key as string;
-      const sortObjects = (sort
+      const sortObjects = (sort.get(collection).valueSeq().toJS() as SortObject[]).map(
-        .get(collection)
+        (value, index) => ({ ...value, index }),
-        .valueSeq()
+      );
-        .toJS() as SortObject[]).map((value, index) => ({ ...value, index }));
 
       sortObjects.forEach(value => {
         set(storageSort, [collection, value.key], value);
@@ -333,7 +332,7 @@ function entries(
     }
 
     case CHANGE_VIEW_STYLE: {
-      const payload = (action.payload as unknown) as ChangeViewStylePayload;
+      const payload = action.payload as unknown as ChangeViewStylePayload;
       const { style } = payload;
       const newState = state.withMutations(map => {
         map.setIn(['viewStyle'], style);
@@ -492,10 +491,8 @@ export function selectGroups(state: Entries, collection: Collection) {
     return [];
   }
 
-  let groups: Record<
+  let groups: Record<string, { id: string; label: string; value: string | boolean | undefined }> =
-    string,
+    {};
-    { id: string; label: string; value: string | boolean | undefined }
-  > = {};
   const groupedEntries = groupBy(entries.toArray(), entry => {
     const group = getGroup(entry, selectedGroup);
     groups = { ...groups, [group.id]: group };

packages/netlify-cms-core/src/reducers/mediaLibrary.ts

@@ -262,7 +262,7 @@ export function selectMediaFileByPath(state: State, path: string) {
 export function selectMediaDisplayURL(state: State, id: string) {
   const displayUrlState = state.mediaLibrary.getIn(
     ['displayURLs', id],
-    (Map() as unknown) as DisplayURLState,
+    Map() as unknown as DisplayURLState,
   );
   return displayUrlState;
 }

packages/netlify-cms-core/src/redux/index.ts

@@ -7,7 +7,7 @@ import { State } from '../types/redux';
 import { Reducer } from 'react';
 
 const store = createStore<State | undefined, AnyAction, unknown, unknown>(
-  (createRootReducer() as unknown) as Reducer<State | undefined, AnyAction>,
+  createRootReducer() as unknown as Reducer<State | undefined, AnyAction>,
   composeWithDevTools(applyMiddleware(thunkMiddleware as ThunkMiddleware<State>, waitUntilAction)),
 );
 

packages/netlify-cms-core/src/redux/middleware/waitUntilAction.ts

@@ -51,7 +51,8 @@ export const waitUntilAction: Middleware<{}, State, Dispatch> = ({
     }
   }
 
-  return (next: Dispatch<AnyAction>) => (action: AnyAction): null | AnyAction => {
+  return (next: Dispatch<AnyAction>) =>
+    (action: AnyAction): null | AnyAction => {
       if (action.type === WAIT_UNTIL_ACTION) {
         pending.push(action as WaitAction);
         return null;

packages/netlify-cms-core/src/routing/__tests__/history.spec.ts

@@ -3,7 +3,7 @@ import { mocked } from 'ts-jest/utils';
 
 jest.mock('history');
 
-const history = ({ push: jest.fn(), replace: jest.fn() } as unknown) as History;
+const history = { push: jest.fn(), replace: jest.fn() } as unknown as History;
 const mockedCreateHashHistory = mocked(createHashHistory);
 mockedCreateHashHistory.mockReturnValue(history);
 

packages/netlify-cms-core/src/types/immutable.ts

@@ -11,7 +11,7 @@ export interface StaticallyTypedRecord<T> {
     K1 extends keyof T,
     K2 extends keyof T[K1],
     K3 extends keyof T[K1][K2],
-    V extends T[K1][K2][K3]
+    V extends T[K1][K2][K3],
   >(
     keys: [K1, K2, K3],
     defaultValue?: V,

packages/netlify-cms-lib-auth/src/pkce-oauth.js

@@ -26,10 +26,7 @@ function generateVerifierCode() {
 async function createCodeChallenge(codeVerifier) {
   const sha = await sha256(codeVerifier);
   // https://tools.ietf.org/html/rfc7636#appendix-A
-  return btoa(sha)
+  return btoa(sha).split('=')[0].replace(/\+/g, '-').replace(/\//g, '_');
-    .split('=')[0]
-    .replace(/\+/g, '-')
-    .replace(/\//g, '_');
 }
 
 const CODE_VERIFIER_STORAGE_KEY = 'netlify-cms-pkce-verifier-code';

packages/netlify-cms-lib-util/src/__tests__/unsentRequest.spec.js

@@ -3,11 +3,10 @@ import unsentRequest from '../unsentRequest';
 describe('unsentRequest', () => {
   describe('withHeaders', () => {
     it('should create new request with headers', () => {
-      expect(
+      expect(unsentRequest.withHeaders({ Authorization: 'token' })('path').toJS()).toEqual({
-        unsentRequest
+        url: 'path',
-          .withHeaders({ Authorization: 'token' })('path')
+        headers: { Authorization: 'token' },
-          .toJS(),
+      });
-      ).toEqual({ url: 'path', headers: { Authorization: 'token' } });
     });
 
     it('should add headers to existing request', () => {

packages/netlify-cms-lib-util/src/loadScript.js

@@ -7,7 +7,7 @@ export default function loadScript(url) {
     const head = document.getElementsByTagName('head')[0];
     const script = document.createElement('script');
     script.src = url;
-    script.onload = script.onreadystatechange = function() {
+    script.onload = script.onreadystatechange = function () {
       if (
         !done &&
         (!this.readyState || this.readyState === 'loaded' || this.readyState === 'complete')

packages/netlify-cms-lib-util/src/unsentRequest.js

@@ -60,13 +60,7 @@ function toURL(req) {
 }
 
 function toFetchArguments(req) {
-  return [
+  return [toURL(req), req.remove('url').remove('params').toJS()];
-    toURL(req),
-    req
-      .remove('url')
-      .remove('params')
-      .toJS(),
-  ];
 }
 
 function maybeRequestArg(req) {

packages/netlify-cms-proxy-server/src/middlewares/joi/index.spec.ts

@@ -601,7 +601,7 @@ describe('joi', () => {
     } as express.Request;
     const json = jest.fn();
     const status = jest.fn(() => ({ json }));
-    const res: express.Response = ({ status } as unknown) as express.Response;
+    const res: express.Response = { status } as unknown as express.Response;
 
     joi(defaultSchema())(req, res, next);
 

packages/netlify-cms-proxy-server/src/middlewares/joi/index.ts

@@ -132,9 +132,7 @@ export function defaultSchema({ path = requiredString } = {}) {
             cmsLabelPrefix: Joi.string().optional(),
             entry: dataFile, // entry is kept for backwards compatibility
             dataFiles: Joi.array().items(dataFile),
-            assets: Joi.array()
+            assets: Joi.array().items(asset).required(),
-              .items(asset)
-              .required(),
             options: Joi.object({
               collectionName: Joi.string(),
               commitMessage: requiredString,
@@ -207,10 +205,7 @@ export function defaultSchema({ path = requiredString } = {}) {
         is: 'deleteFiles',
         then: defaultParams
           .keys({
-            paths: Joi.array()
+            paths: Joi.array().items(path).min(1).required(),
-              .items(path)
-              .min(1)
-              .required(),
             options: Joi.object({
               commitMessage: requiredString,
             }).required(),

packages/netlify-cms-proxy-server/src/middlewares/localFs/index.ts

@@ -24,7 +24,7 @@ type FsOptions = {
 };
 
 export function localFsMiddleware({ repoPath, logger }: FsOptions) {
-  return async function(req: express.Request, res: express.Response) {
+  return async function (req: express.Request, res: express.Response) {
     try {
       const { body } = req;
 

packages/netlify-cms-proxy-server/src/middlewares/localGit/index.spec.ts

@@ -123,7 +123,7 @@ describe('localGitMiddleware', () => {
   describe('localGitMiddleware', () => {
     const json = jest.fn();
     const status = jest.fn(() => ({ json }));
-    const res: express.Response = ({ status } as unknown) as express.Response;
+    const res: express.Response = { status } as unknown as express.Response;
 
     const repoPath = '.';
 

packages/netlify-cms-proxy-server/src/middlewares/localGit/index.ts

@@ -173,7 +173,7 @@ export function localGitMiddleware({ repoPath, logger }: GitOptions) {
   // we can only perform a single git operation at any given time
   const mutex = withTimeout(new Mutex(), 3000, new Error('Request timed out'));
 
-  return async function(req: express.Request, res: express.Response) {
+  return async function (req: express.Request, res: express.Response) {
     let release;
     try {
       release = await mutex.acquire();
@@ -345,12 +345,8 @@ export function localGitMiddleware({ repoPath, logger }: GitOptions) {
           break;
         }
         case 'updateUnpublishedEntryStatus': {
-          const {
+          const { collection, slug, newStatus, cmsLabelPrefix } =
-            collection,
+            body.params as UpdateUnpublishedEntryStatusParams;
-            slug,
-            newStatus,
-            cmsLabelPrefix,
-          } = body.params as UpdateUnpublishedEntryStatusParams;
           const contentKey = generateContentKey(collection, slug);
           const cmsBranch = branchFromContentKey(contentKey);
           const description = statusToLabel(newStatus, cmsLabelPrefix || '');

packages/netlify-cms-proxy-server/src/middlewares/utils/entries.ts

@@ -3,10 +3,7 @@ import path from 'path';
 import { promises as fs } from 'fs';
 
 function sha256(buffer: Buffer) {
-  return crypto
+  return crypto.createHash('sha256').update(buffer).digest('hex');
-    .createHash('sha256')
-    .update(buffer)
-    .digest('hex');
 }
 
 // normalize windows os path format

packages/netlify-cms-widget-boolean/src/BooleanControl.js

@@ -17,14 +17,8 @@ function BooleanBackground({ isActive, ...props }) {
 
 export default class BooleanControl extends React.Component {
   render() {
-    const {
+    const { value, forID, onChange, classNameWrapper, setActiveStyle, setInactiveStyle } =
-      value,
+      this.props;
-      forID,
-      onChange,
-      classNameWrapper,
-      setActiveStyle,
-      setInactiveStyle,
-    } = this.props;
     return (
       <div className={classNameWrapper}>
         <Toggle

packages/netlify-cms-widget-colorstring/src/ColorControl.js

@@ -111,15 +111,8 @@ export default class ColorControl extends React.Component {
     this.props.onChange(formattedColor);
   };
   render() {
-    const {
+    const { forID, value, field, onChange, classNameWrapper, setActiveStyle, setInactiveStyle } =
-      forID,
+      this.props;
-      value,
-      field,
-      onChange,
-      classNameWrapper,
-      setActiveStyle,
-      setInactiveStyle,
-    } = this.props;
 
     const allowInput = field.get('allowInput', false);
 

packages/netlify-cms-widget-datetime/src/DateTimeControl.js

@@ -24,7 +24,7 @@ function NowButton({ t, handleChange }) {
           ${buttons.default}
     ${buttons.lightBlue}
     ${buttons.small}
-`}
+        `}
         onClick={() => {
           handleChange(moment());
         }}

packages/netlify-cms-widget-markdown/src/MarkdownControl/__tests__/slate.spec.js

@@ -40,10 +40,7 @@ describe.skip('slate', () => {
     );
 
     function fn(editor) {
-      editor
+      editor.deleteBackward().insertText('b').setBlocks('heading-one');
-        .deleteBackward()
-        .insertText('b')
-        .setBlocks('heading-one');
     }
 
     const [actual, expected] = run(input, output, fn);

packages/netlify-cms-widget-markdown/src/MarkdownControl/plugins/ForceInsert.js

@@ -19,16 +19,10 @@ function ForceInsert({ defaultType }) {
       forceInsertBeforeNode(editor, node) {
         const block = { type: defaultType, object: 'block' };
         const parent = editor.value.document.getParent(node.key);
-        return editor
+        return editor.insertNodeByKey(parent.key, 0, block).moveToStartOfNode(parent).focus();
-          .insertNodeByKey(parent.key, 0, block)
-          .moveToStartOfNode(parent)
-          .focus();
       },
       forceInsertAfterNode(editor, node) {
-        return editor
+        return editor.moveToEndOfNode(node).insertBlock(defaultType).focus();
-          .moveToEndOfNode(node)
-          .insertBlock(defaultType)
-          .focus();
       },
       moveToEndOfDocument(editor) {
         const lastBlock = editor.value.document.nodes.last();

packages/netlify-cms-widget-markdown/src/MarkdownControl/plugins/LineBreak.js

@@ -7,10 +7,7 @@ function LineBreak() {
       if (!isShiftEnter) {
         return next();
       }
-      return editor
+      return editor.insertInline('break').insertText('').moveToStartOfNextText();
-        .insertInline('break')
-        .insertText('')
-        .moveToStartOfNextText();
     },
   };
 }

packages/netlify-cms-widget-markdown/src/serializers/__tests__/commonmark.spec.js

@@ -25,24 +25,7 @@ const skips = [
   { number: 507, reason: 'Remark allows a space between link alt and url' },
   {
     number: [
-      511,
+      511, 516, 525, 528, 529, 530, 532, 533, 534, 540, 541, 542, 543, 546, 548, 560, 565, 567,
-      516,
-      525,
-      528,
-      529,
-      530,
-      532,
-      533,
-      534,
-      540,
-      541,
-      542,
-      543,
-      546,
-      548,
-      560,
-      565,
-      567,
     ],
     reason: 'we convert link references to standard links, but Remark also fails these',
   },
@@ -81,7 +64,7 @@ const parse = flow([markdownToSlate, slateToMarkdown]);
  * tests, of which we're passing about 300 as of introduction of this suite. To
  * work on improving Commonmark support, update __fixtures__/commonmarkExpected.json
  */
-describe.skip('Commonmark support', function() {
+describe.skip('Commonmark support', function () {
   const specs =
     onlys.length > 0
       ? commonmarkSpec.filter(({ number }) => onlys.includes(number))

packages/netlify-cms-widget-markdown/src/serializers/__tests__/index.spec.js

@@ -23,8 +23,7 @@ describe('markdownToSlate', () => {
             },
             {
               object: 'text',
-              text:
+              text: 'this_mark, and your charge is but a penny; tothisa penny more; and so on to the full glass—the Cape Horn measure, which you may gulp down for a shilling.\\n\\nUpon entering the place I found a number of young seamen gathered about a table, examining by a dim light divers specimens ofskrimshander',
-                'this_mark, and your charge is but a penny; tothisa penny more; and so on to the full glass—the Cape Horn measure, which you may gulp down for a shilling.\\n\\nUpon entering the place I found a number of young seamen gathered about a table, examining by a dim light divers specimens ofskrimshander',
               marks: [
                 {
                   type: 'italic',

packages/netlify-cms-widget-markdown/src/serializers/__tests__/remarkAllowHtmlEntities.spec.js

@@ -3,10 +3,7 @@ import markdownToRemark from 'remark-parse';
 import remarkAllowHtmlEntities from '../remarkAllowHtmlEntities';
 
 function process(markdown) {
-  const mdast = unified()
+  const mdast = unified().use(markdownToRemark).use(remarkAllowHtmlEntities).parse(markdown);
-    .use(markdownToRemark)
-    .use(remarkAllowHtmlEntities)
-    .parse(markdown);
 
   /**
    * The MDAST will look like:

packages/netlify-cms-widget-markdown/src/serializers/__tests__/remarkEscapeMarkdownEntities.spec.js

@@ -4,9 +4,7 @@ import remarkEscapeMarkdownEntities from '../remarkEscapeMarkdownEntities';
 
 function process(text) {
   const tree = u('root', [u('text', text)]);
-  const escapedMdast = unified()
+  const escapedMdast = unified().use(remarkEscapeMarkdownEntities).runSync(tree);
-    .use(remarkEscapeMarkdownEntities)
-    .runSync(tree);
 
   return escapedMdast.children[0].value;
 }

packages/netlify-cms-widget-markdown/src/serializers/__tests__/remarkPaddedLinks.spec.js

@@ -12,10 +12,7 @@ function input(markdown) {
 }
 
 function output(markdown) {
-  return unified()
+  return unified().use(markdownToRemark).use(remarkToMarkdown).processSync(markdown).contents;
-    .use(markdownToRemark)
-    .use(remarkToMarkdown)
-    .processSync(markdown).contents;
 }
 
 describe('remarkPaddedLinks', () => {

packages/netlify-cms-widget-markdown/src/serializers/__tests__/remarkStripTrailingBreaks.spec.js

@@ -4,9 +4,7 @@ import remarkStripTrailingBreaks from '../remarkStripTrailingBreaks';
 
 function process(children) {
   const tree = u('root', children);
-  const strippedMdast = unified()
+  const strippedMdast = unified().use(remarkStripTrailingBreaks).runSync(tree);
-    .use(remarkStripTrailingBreaks)
-    .runSync(tree);
 
   return strippedMdast.children;
 }

packages/netlify-cms-widget-markdown/src/serializers/index.js

@@ -72,9 +72,7 @@ export function markdownToRemark(markdown) {
   /**
    * Further transform the MDAST with plugins.
    */
-  const result = unified()
+  const result = unified().use(remarkSquashReferences).runSync(parsed);
-    .use(remarkSquashReferences)
-    .runSync(parsed);
 
   return result;
 }
@@ -173,9 +171,7 @@ export function markdownToHtml(markdown, { getAsset, resolveWidget } = {}) {
  * pastes.
  */
 export function htmlToSlate(html) {
-  const hast = unified()
+  const hast = unified().use(htmlToRehype, { fragment: true }).parse(html);
-    .use(htmlToRehype, { fragment: true })
-    .parse(html);
 
   const mdast = unified()
     .use(rehypePaperEmoji)

packages/netlify-cms-widget-markdown/src/serializers/slateRemark.js

@@ -233,11 +233,8 @@ export default function slateToRemark(raw, { voidCodeBlock }) {
           const node = markNodes[0];
           convertedNodes.push(convertInlineNode(node, convertInlineAndTextChildren(node.nodes)));
         } else {
-          const {
+          const { leadingWhitespace, trailingWhitespace, centerNodes } =
-            leadingWhitespace,
+            normalizeFlankingWhitespace(markNodes);
-            trailingWhitespace,
-            centerNodes,
-          } = normalizeFlankingWhitespace(markNodes);
           const children = convertInlineAndTextChildren(centerNodes);
           const markNode = u(markMap[markType], children);
 

packages/netlify-cms-widget-relation/src/RelationControl.js

@@ -247,15 +247,8 @@ export default class RelationControl extends React.Component {
   }, 500);
 
   render() {
-    const {
+    const { value, field, forID, classNameWrapper, setActiveStyle, setInactiveStyle, queryHits } =
-      value,
+      this.props;
-      field,
-      forID,
-      classNameWrapper,
-      setActiveStyle,
-      setInactiveStyle,
-      queryHits,
-    } = this.props;
     const isMultiple = this.isMultiple();
     const isClearable = !field.get('required', true) || isMultiple;
 

packages/netlify-cms-widget-relation/src/__tests__/relation.spec.js

@@ -382,10 +382,10 @@ describe('Relation widget', () => {
 
     expect(onChangeSpy).toHaveBeenCalledTimes(2);
     expect(onChangeSpy).toHaveBeenCalledWith(1, {
-      numbers: { numbers_collection: { '1': { index: 1, slug: 'post-1', title: 'post # 1' } } },
+      numbers: { numbers_collection: { 1: { index: 1, slug: 'post-1', title: 'post # 1' } } },
     });
     expect(onChangeSpy).toHaveBeenCalledWith(2, {
-      numbers: { numbers_collection: { '2': { index: 2, slug: 'post-2', title: 'post # 2' } } },
+      numbers: { numbers_collection: { 2: { index: 2, slug: 'post-2', title: 'post # 2' } } },
     });
   });
 

packages/netlify-cms-widget-text/src/TextControl.js

@@ -28,14 +28,8 @@ export default class TextControl extends React.Component {
   }
 
   render() {
-    const {
+    const { forID, value, onChange, classNameWrapper, setActiveStyle, setInactiveStyle } =
-      forID,
+      this.props;
-      value,
-      onChange,
-      classNameWrapper,
-      setActiveStyle,
-      setInactiveStyle,
-    } = this.props;
 
     return (
       <Textarea

website/gatsby-config.js

@@ -57,7 +57,7 @@ module.exports = {
               noInlineHighlight: true,
             },
           },
-        ]
+        ],
       },
     },
     'gatsby-transformer-yaml',

website/src/templates/blog-post.js

@@ -9,15 +9,8 @@ import BlogPostTemplate from '../components/blog-post-template';
 
 function BlogPost({ data }) {
   const { html, frontmatter } = data.markdownRemark;
-  const {
+  const { author, title, date, description, meta_description, twitter_image, canonical_url } =
-    author,
+    frontmatter;
-    title,
-    date,
-    description,
-    meta_description,
-    twitter_image,
-    canonical_url,
-  } = frontmatter;
   const { siteUrl } = data.site.siteMetadata;
   const twitterImageUrl =
     twitter_image && `${trimEnd(siteUrl, '/')}/${trimStart(twitter_image, '/')}`;

website/src/templates/doc-page.js

@@ -7,10 +7,7 @@ import Layout from '../components/layout';
 import DocsTemplate from '../components/docs-template';
 
 function filenameFromPath(p) {
-  return p
+  return p.split('/').slice(-1)[0].split('.')[0];
-    .split('/')
-    .slice(-1)[0]
-    .split('.')[0];
 }
 
 function toMenu(menu, nav) {

yarn.lock

@@ -14244,10 +14244,10 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@^1.19.1:
+prettier@^2.3.0:
-  version "1.19.1"
+  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.0.tgz#b6a5bf1284026ae640f17f7ff5658a7567fc0d18"
-  integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
+  integrity sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w==
 
 pretty-bytes@^5.6.0:
   version "5.6.0"