Merge from vscode 2cd495805cf99b31b6926f08ff4348124b2cf73d

extensions/github-browser/package.json

@@ -13,11 +13,93 @@
     "Other"
   ],
   "activationEvents": [
-    "onFileSystem:github"
+    "onFileSystem:codespace",
+    "onFileSystem:github",
+    "onCommand:githubBrowser.openRepository"
   ],
-  "browser": "./dist/extension.js",
+  "browser": "./dist/browser/extension.js",
   "main": "./out/extension.js",
   "contributes": {
+    "commands": [
+      {
+        "command": "githubBrowser.commit",
+        "title": "Commit",
+        "icon": "$(check)",
+        "category": "GitHub Browser"
+      },
+      {
+        "command": "githubBrowser.discardChanges",
+        "title": "Discard Changes",
+        "icon": "$(discard)",
+        "category": "GitHub Browser"
+      },
+      {
+        "command": "githubBrowser.openChanges",
+        "title": "Open Changes",
+        "icon": "$(git-compare)",
+        "category": "GitHub Browser"
+      },
+      {
+        "command": "githubBrowser.openFile",
+        "title": "Open File",
+        "icon": "$(go-to-file)",
+        "category": "GitHub Browser"
+      }
+    ],
+    "menus": {
+      "commandPalette": [
+        {
+          "command": "githubBrowser.commit",
+          "when": "false"
+        },
+        {
+          "command": "githubBrowser.discardChanges",
+          "when": "false"
+        },
+        {
+          "command": "githubBrowser.openChanges",
+          "when": "false"
+        },
+        {
+          "command": "githubBrowser.openFile",
+          "when": "false"
+        }
+      ],
+      "scm/title": [
+        {
+          "command": "githubBrowser.commit",
+          "group": "navigation",
+          "when": "scmProvider == github"
+        }
+      ],
+      "scm/resourceState/context": [
+        {
+          "command": "githubBrowser.openFile",
+          "when": "scmProvider == github && scmResourceGroup == github.changes",
+          "group": "inline@0"
+        },
+        {
+          "command": "githubBrowser.discardChanges",
+          "when": "scmProvider == github && scmResourceGroup == github.changes",
+          "group": "inline@1"
+        },
+        {
+          "command": "githubBrowser.openChanges",
+          "when": "scmProvider == github && scmResourceGroup == github.changes",
+          "group": "navigation@0"
+        },
+        {
+          "command": "githubBrowser.openFile",
+          "when": "scmProvider == github && scmResourceGroup == github.changes",
+          "group": "navigation@1"
+        },
+        {
+          "command": "githubBrowser.discardChanges",
+          "when": "scmProvider == github && scmResourceGroup == github.changes",
+          "group": "1_modification@0"
+        }
+      ]
+    },
     "resourceLabelFormatters": [
       {
         "scheme": "github",
@@ -36,6 +118,24 @@
           "separator": "/",
           "workspaceSuffix": "GitHub"
         }
+      },
+      {
+        "scheme": "codespace",
+        "authority": "HEAD",
+        "formatting": {
+          "label": "github.com${path}",
+          "separator": "/",
+          "workspaceSuffix": "GitHub"
+        }
+      },
+      {
+        "scheme": "codespace",
+        "authority": "*",
+        "formatting": {
+          "label": "github.com${path} (${authority})",
+          "separator": "/",
+          "workspaceSuffix": "GitHub"
+        }
       }
     ]
   },
@@ -47,14 +147,13 @@
     "vscode:prepublish": "npm run compile"
   },
   "dependencies": {
-    "@octokit/graphql": "4.5.0",
-    "@octokit/rest": "17.11.0",
+    "@octokit/graphql": "4.5.1",
+    "@octokit/rest": "18.0.0",
     "fuzzysort": "1.1.4",
-    "node-fetch": "2.6.0"
+    "node-fetch": "2.6.0",
+    "vscode-nls": "4.1.2"
   },
   "devDependencies": {
-    "@types/node-fetch": "2.5.7",
-    "webpack": "4.43.0",
-    "webpack-cli": "3.3.11"
+    "@types/node-fetch": "2.5.7"
   }
 }