Merge pull request #285 from conwnet/master

release 0.2.0

.github/workflows/codacy-analysis.yaml

@@ -2,9 +2,9 @@ name: Codacy Security Scan
 
 on:
   push:
-    branches: ["master", "main"]
+    branches: ['master', 'main']
   pull_request:
-    branches: ["master", "main"]
+    branches: ['master', 'main']
 
 jobs:
   codacy-security-scan:
@@ -24,9 +24,11 @@ jobs:
           # Force 0 exit code to allow SARIF file generation
           # This will handover control about PR rejection to the GitHub side
           max-allowed-issues: 2147483647
+          # only scan the github1s directory
+          directory: $GITHUB_WORKSPACE/extensions/github1s
 
       # Upload the SARIF file generated in the previous step
       - name: Upload SARIF results file
         uses: github/codeql-action/upload-sarif@main
         with:
-          sarif_file: results.sarif
+          sarif_file: results.sarif

extensions/github1s/extension.webpack.config.js

@@ -8,6 +8,7 @@
 
 //@ts-check
 /** @typedef {import('webpack').Configuration} WebpackConfig **/
+const webpack = require('webpack');
 
 const path = require('path');
 
@@ -58,4 +59,9 @@ module.exports = /** @type WebpackConfig */ {
 		libraryTarget: 'commonjs',
 	},
 	devtool: 'source-map',
+	plugins: [
+		new webpack.ProvidePlugin({
+			process: 'process/browser.js',
+		}),
+	],
 };

extensions/github1s/package.json

@@ -55,6 +55,11 @@
       ]
     },
     "commands": [
+      {
+        "command": "github1s.dev-test",
+        "title": "GitHub1s Dev Test",
+        "category": "GitHub1s"
+      },
       {
         "command": "github1s.update-token",
         "title": "Update GitHub OAuth Token",
@@ -167,6 +172,32 @@
         "category": "GitHub1s",
         "icon": "$(arrow-right)",
         "enablement": "resource =~ /^[^?]*\\?[^#]*(%26|\\b)hasNextRevision(=|%3D|%3d)true/"
+      },
+      {
+        "command": "github1s.toggle-editor-gutter-blame",
+        "title": "Toggle File Blame",
+        "category": "GitHub1s",
+        "enablement": "!isInDiffEditor && resourceScheme =~ /^github1s$/"
+      },
+      {
+        "command": "github1s.open-editor-gutter-blame",
+        "title": "Toggle File Blame",
+        "category": "GitHub1s",
+        "icon": {
+          "dark": "assets/icons/dark/open-blame.svg",
+          "light": "assets/icons/light/open-blame.svg"
+        },
+        "enablement": "!isInDiffEditor && resourceScheme =~ /^github1s$/"
+      },
+      {
+        "command": "github1s.close-editor-gutter-blame",
+        "title": "Toggle File Blame",
+        "category": "GitHub1s",
+        "icon": {
+          "dark": "assets/icons/dark/close-blame.svg",
+          "light": "assets/icons/light/close-blame.svg"
+        },
+        "enablement": "!isInDiffEditor && resourceScheme =~ /^github1s$/"
       }
     ],
     "colors": [
@@ -214,6 +245,24 @@
           "dark": "#1890ff",
           "highContrast": "#1890ff"
         }
+      },
+      {
+        "id": "github1s.colors.gutterBlameBackground",
+        "description": "gutter blame background color",
+        "defaults": {
+          "light": "#00000013",
+          "dark": "#ffffff13",
+          "highContrast": "#ffffff13"
+        }
+      },
+      {
+        "id": "github1s.colors.highlightGutterBlameBackground",
+        "description": "highlight gutter blame background color",
+        "defaults": {
+          "light": "#00bcf233",
+          "dark": "#00bce233",
+          "highContrast": "#00bce233"
+        }
       }
     ],
     "menus": {
@@ -261,6 +310,14 @@
         {
           "command": "github1s.editor-view-open-next-revision",
           "when": "false"
+        },
+        {
+          "command": "github1s.open-editor-gutter-blame",
+          "when": "false"
+        },
+        {
+          "command": "github1s.close-editor-gutter-blame",
+          "when": "false"
         }
       ],
       "view/title": [
@@ -323,6 +380,16 @@
           "when": "isInDiffEditor",
           "group": "navigation@3"
         },
+        {
+          "command": "github1s.open-editor-gutter-blame",
+          "when": "!isInDiffEditor && resourceScheme =~ /^github1s$/ && !github1s.context.gutterBlameOpening",
+          "group": "navigation@4"
+        },
+        {
+          "command": "github1s.close-editor-gutter-blame",
+          "when": "!isInDiffEditor && resourceScheme =~ /^github1s$/ && github1s.context.gutterBlameOpening",
+          "group": "navigation@4"
+        },
         {
           "command": "github1s.editor-view-open-prev-revision",
           "when": "resourceScheme =~ /^github1s/",
@@ -344,7 +411,7 @@
   },
   "keywords": [],
   "author": "",
-  "license": "ISC",
+  "license": "MIT",
   "dependencies": {
     "@apollo/client": "^3.3.9",
     "dayjs": "^1.10.4",
@@ -354,13 +421,14 @@
     "json-stable-stringify": "^1.0.1",
     "match-sorter": "^6.3.0",
     "p-finally": "^2.0.1",
+    "process": "^0.11.10",
     "query-string": "^7.0.0",
-    "webpack-cli": "^4.4.0"
+    "webpack-cli": "^4.6.0"
   },
   "devDependencies": {
-    "@types/vscode": "^1.52.0",
-    "ts-loader": "^8.0.14",
-    "typescript": "^4.1.3",
-    "webpack": "^4.46.0"
+    "@types/vscode": "1.55.0",
+    "ts-loader": "^8.1.0",
+    "typescript": "^4.2.3",
+    "webpack": "^5.30.0"
   }
 }