Upgrade dep following security advices (#935)

* Upgrade dep following security advices

* Fix prettier 2.3

Author: fcollonval

package.json

@@ -144,7 +144,8 @@
   },
   "homepage": "https://github.com/jupyterlab/jupyterlab-git",
   "resolutions": {
-    "@types/react": "^17.0.0"
+    "@types/react": "^17.0.0",
+    "codemirror": "~5.61.0"
   },
   "jupyterlab": {
     "discovery": {

src/commandsAndMenu.tsx

@@ -84,7 +84,7 @@ export namespace CommandArguments {
 
 function pluralizedContextLabel(singular: string, plural: string) {
   return (args: any) => {
-    const { files } = (args as any) as CommandArguments.IGitContextAction;
+    const { files } = args as any as CommandArguments.IGitContextAction;
     if (files.length > 1) {
       return plural;
     } else {
@@ -423,7 +423,7 @@ export function addCommands(
     label: trans.__('Show Diff'),
     caption: trans.__('Display a file diff.'),
     execute: async args => {
-      const { model, isText } = (args as any) as {
+      const { model, isText } = args as any as {
         model: Git.Diff.IModel<string>;
         isText?: boolean;
       };
@@ -516,7 +516,7 @@ export function addCommands(
       trans.__('Open selected files')
     ),
     execute: async args => {
-      const { files } = (args as any) as CommandArguments.IGitContextAction;
+      const { files } = args as any as CommandArguments.IGitContextAction;
       for (const file of files) {
         const { x, y, to } = file;
         if (x === 'D' || y === 'D') {
@@ -549,7 +549,7 @@ export function addCommands(
       trans.__('Diff selected files')
     ),
     execute: async args => {
-      const { files } = (args as any) as CommandArguments.IGitFileDiff;
+      const { files } = args as any as CommandArguments.IGitFileDiff;
       for (const file of files) {
         const { context, filePath, isText, status } = file;
 
@@ -656,7 +656,7 @@ export function addCommands(
       trans.__('Stage or track the changes of selected files')
     ),
     execute: async args => {
-      const { files } = (args as any) as CommandArguments.IGitContextAction;
+      const { files } = args as any as CommandArguments.IGitContextAction;
       for (const file of files) {
         await gitModel.add(file.to);
       }
@@ -671,7 +671,7 @@ export function addCommands(
       trans.__('Stage the changes of selected files')
     ),
     execute: async args => {
-      const { files } = (args as any) as CommandArguments.IGitContextAction;
+      const { files } = args as any as CommandArguments.IGitContextAction;
       for (const file of files) {
         await gitModel.add(file.to);
       }
@@ -686,7 +686,7 @@ export function addCommands(
       trans.__('Start tracking selected files')
     ),
     execute: async args => {
-      const { files } = (args as any) as CommandArguments.IGitContextAction;
+      const { files } = args as any as CommandArguments.IGitContextAction;
       for (const file of files) {
         await gitModel.add(file.to);
       }
@@ -701,7 +701,7 @@ export function addCommands(
       trans.__('Unstage the changes of selected files')
     ),
     execute: async args => {
-      const { files } = (args as any) as CommandArguments.IGitContextAction;
+      const { files } = args as any as CommandArguments.IGitContextAction;
       for (const file of files) {
         if (file.x !== 'D') {
           await gitModel.reset(file.to);
@@ -727,7 +727,7 @@ export function addCommands(
       trans.__('Delete these files')
     ),
     execute: async args => {
-      const { files } = (args as any) as CommandArguments.IGitContextAction;
+      const { files } = args as any as CommandArguments.IGitContextAction;
       const fileList = representFiles(files);
 
       const result = await showDialog({
@@ -770,7 +770,7 @@ export function addCommands(
       trans.__('Discard recent changes of selected files')
     ),
     execute: async args => {
-      const { files } = (args as any) as CommandArguments.IGitContextAction;
+      const { files } = args as any as CommandArguments.IGitContextAction;
       const fileList = representFiles(files);
 
       const result = await showDialog({
@@ -828,7 +828,7 @@ export function addCommands(
       trans.__('Ignore these files (add to .gitignore)')
     ),
     execute: async args => {
-      const { files } = (args as any) as CommandArguments.IGitContextAction;
+      const { files } = args as any as CommandArguments.IGitContextAction;
       for (const file of files) {
         if (file) {
           await gitModel.ignore(file.to, false);
@@ -839,7 +839,7 @@ export function addCommands(
 
   commands.addCommand(ContextCommandIDs.gitIgnoreExtension, {
     label: args => {
-      const { files } = (args as any) as CommandArguments.IGitContextAction;
+      const { files } = args as any as CommandArguments.IGitContextAction;
       const extensions = files
         .map(file => PathExt.extname(file.to))
         .filter(extension => extension.length > 0);
@@ -855,7 +855,7 @@ export function addCommands(
       trans.__('Ignore these files extension (add to .gitignore)')
     ),
     execute: async args => {
-      const { files } = (args as any) as CommandArguments.IGitContextAction;
+      const { files } = args as any as CommandArguments.IGitContextAction;
       for (const selectedFile of files) {
         if (selectedFile) {
           const extension = PathExt.extname(selectedFile.to);
@@ -879,7 +879,7 @@ export function addCommands(
       }
     },
     isVisible: args => {
-      const { files } = (args as any) as CommandArguments.IGitContextAction;
+      const { files } = args as any as CommandArguments.IGitContextAction;
       return files.some(selectedFile => {
         const extension = PathExt.extname(selectedFile.to);
         return extension.length > 0;
@@ -967,22 +967,22 @@ export function addMenuItems(
     if (command === ContextCommandIDs.gitFileDiff) {
       contextMenu.addItem({
         command,
-        args: ({
+        args: {
           files: selectedFiles.map(file => {
             return {
               filePath: file.to,
               isText: !file.is_binary,
               status: file.status
             };
           })
-        } as CommandArguments.IGitFileDiff) as any
+        } as CommandArguments.IGitFileDiff as any
       });
     } else {
       contextMenu.addItem({
         command,
-        args: ({
+        args: {
           files: selectedFiles
-        } as CommandArguments.IGitContextAction) as any
+        } as CommandArguments.IGitContextAction as any
       });
     }
   });
@@ -1148,7 +1148,7 @@ namespace Private {
       switch (operation) {
         case Operation.Clone:
           // eslint-disable-next-line no-case-declarations
-          const { path, url } = (args as any) as IGitCloneArgs;
+          const { path, url } = args as any as IGitCloneArgs;
           result = await model.clone(path, url, authentication);
           break;
         case Operation.Pull:

src/components/FileList.tsx

@@ -227,9 +227,9 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
 
   /** Discard changes in a specific unstaged or staged file */
   discardChanges = async (file: Git.IStatusFile): Promise<void> => {
-    await this.props.commands.execute(ContextCommandIDs.gitFileDiscard, ({
+    await this.props.commands.execute(ContextCommandIDs.gitFileDiscard, {
       files: [file]
-    } as CommandArguments.IGitContextAction) as any);
+    } as CommandArguments.IGitContextAction as any);
   };
 
   /** Add all untracked files */
@@ -347,9 +347,9 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
     const { data, index, style } = rowProps;
     const file = data[index] as Git.IStatusFile;
     const openFile = () => {
-      this.props.commands.execute(ContextCommandIDs.gitFileOpen, ({
+      this.props.commands.execute(ContextCommandIDs.gitFileOpen, {
         files: [file]
-      } as CommandArguments.IGitContextAction) as any);
+      } as CommandArguments.IGitContextAction as any);
     };
     const diffButton = this._createDiffButton(file);
     return (
@@ -434,9 +434,9 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
     const { data, index, style } = rowProps;
     const file = data[index] as Git.IStatusFile;
     const openFile = () => {
-      this.props.commands.execute(ContextCommandIDs.gitFileOpen, ({
+      this.props.commands.execute(ContextCommandIDs.gitFileOpen, {
         files: [file]
-      } as CommandArguments.IGitContextAction) as any);
+      } as CommandArguments.IGitContextAction as any);
     };
     const diffButton = this._createDiffButton(file);
     return (
@@ -548,9 +548,9 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
               icon={openIcon}
               title={this.props.trans.__('Open this file')}
               onClick={() => {
-                this.props.commands.execute(ContextCommandIDs.gitFileOpen, ({
+                this.props.commands.execute(ContextCommandIDs.gitFileOpen, {
                   files: [file]
-                } as CommandArguments.IGitContextAction) as any);
+                } as CommandArguments.IGitContextAction as any);
               }}
             />
             <ActionButton
@@ -568,9 +568,9 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
         model={this.props.model}
         onDoubleClick={() => {
           if (!doubleClickDiff) {
-            this.props.commands.execute(ContextCommandIDs.gitFileOpen, ({
+            this.props.commands.execute(ContextCommandIDs.gitFileOpen, {
               files: [file]
-            } as CommandArguments.IGitContextAction) as any);
+            } as CommandArguments.IGitContextAction as any);
           }
         }}
         selected={this._isSelectedFile(file)}
@@ -622,9 +622,9 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
       .composite as boolean;
 
     const openFile = () => {
-      this.props.commands.execute(ContextCommandIDs.gitFileOpen, ({
+      this.props.commands.execute(ContextCommandIDs.gitFileOpen, {
         files: [file]
-      } as CommandArguments.IGitContextAction) as any);
+      } as CommandArguments.IGitContextAction as any);
     };
 
     // Default value for actions and double click
@@ -761,15 +761,15 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
    */
   private async _openDiffView(file: Git.IStatusFile): Promise<void> {
     try {
-      await this.props.commands.execute(ContextCommandIDs.gitFileDiff, ({
+      await this.props.commands.execute(ContextCommandIDs.gitFileDiff, {
         files: [
           {
             filePath: file.to,
             isText: !file.is_binary,
             status: file.status
           }
         ]
-      } as CommandArguments.IGitFileDiff) as any);
+      } as CommandArguments.IGitFileDiff as any);
     } catch (reason) {
       console.error(`Failed to open diff view for ${file.to}.\n${reason}`);
     }

src/components/SinglePastCommitInfo.tsx

@@ -350,7 +350,7 @@ export class SinglePastCommitInfo extends React.Component<
       event.stopPropagation();
 
       try {
-        self.props.commands.execute(ContextCommandIDs.gitFileDiff, ({
+        self.props.commands.execute(ContextCommandIDs.gitFileDiff, {
           files: [
             {
               filePath: fpath,
@@ -361,7 +361,7 @@ export class SinglePastCommitInfo extends React.Component<
               }
             }
           ]
-        } as CommandArguments.IGitFileDiff) as any);
+        } as CommandArguments.IGitFileDiff as any);
       } catch (err) {
         console.error(`Failed to open diff view for ${fpath}.\n${err}`);
       }

src/widgets/AuthorBox.ts

@@ -7,7 +7,8 @@ import { Git } from '../tokens';
  */
 export class GitAuthorForm
   extends Widget
-  implements Dialog.IBodyWidget<Git.IIdentity> {
+  implements Dialog.IBodyWidget<Git.IIdentity>
+{
   constructor() {
     super();
     this.node.appendChild(this.createBody());

src/widgets/CredentialsBox.tsx

@@ -8,7 +8,8 @@ import { Git } from '../tokens';
  */
 export class GitCredentialsForm
   extends Widget
-  implements Dialog.IBodyWidget<Git.IAuth> {
+  implements Dialog.IBodyWidget<Git.IAuth>
+{
   constructor(
     trans: TranslationBundle,
     textContent = trans.__('Enter credentials for remote repository'),