Update Octicons to v10

build/generate-svg.js

@@ -15,7 +15,9 @@ function exit(err) {
 }
 
 async function processFile(file, {prefix = ''} = {}) {
-  const name = `${prefix}${parse(file).name}`;
+  let name = parse(file).name;
+  if (prefix) name = `${prefix}-${name}`;
+  if (prefix === 'octicon') name = name.replace(/-[0-9]+$/, ''); // chop of '-16' on octicons
 
   const svgo = new Svgo({
     plugins: [
@@ -50,8 +52,8 @@ async function main() {
     await mkdir(outputDir);
   } catch {}
 
-  for (const file of glob('../node_modules/@primer/octicons/build/svg/*.svg')) {
-    await processFile(file, {prefix: 'octicon-'});
+  for (const file of glob('../node_modules/@primer/octicons/build/svg/*-16.svg')) {
+    await processFile(file, {prefix: 'octicon'});
   }
 
   for (const file of glob('../web_src/svg/*.svg')) {

integrations/repo_test.go

@@ -156,7 +156,7 @@ func TestViewRepoWithSymlinks(t *testing.T) {
 	})
 	assert.Equal(t, len(items), 5)
 	assert.Equal(t, items[0], "a: svg octicon-file-directory")
-	assert.Equal(t, items[1], "link_b: svg octicon-file-symlink-directory")
+	assert.Equal(t, items[1], "link_b: svg octicon-file-submodule")
 	assert.Equal(t, items[2], "link_d: svg octicon-file-symlink-file")
 	assert.Equal(t, items[3], "link_hi: svg octicon-file-symlink-file")
 	assert.Equal(t, items[4], "link_link: svg octicon-file-symlink-file")

models/review.go

@@ -38,11 +38,11 @@ func (rt ReviewType) Icon() string {
 	case ReviewTypeApprove:
 		return "check"
 	case ReviewTypeReject:
-		return "request-changes"
+		return "diff"
 	case ReviewTypeComment:
 		return "comment"
 	case ReviewTypeRequest:
-		return "primitive-dot"
+		return "dot-fill"
 	default:
 		return "comment"
 	}

models/review_test.go

@@ -49,10 +49,10 @@ func TestReview_LoadCodeComments(t *testing.T) {
 
 func TestReviewType_Icon(t *testing.T) {
 	assert.Equal(t, "check", ReviewTypeApprove.Icon())
-	assert.Equal(t, "request-changes", ReviewTypeReject.Icon())
+	assert.Equal(t, "diff", ReviewTypeReject.Icon())
 	assert.Equal(t, "comment", ReviewTypeComment.Icon())
 	assert.Equal(t, "comment", ReviewTypeUnknown.Icon())
-	assert.Equal(t, "primitive-dot", ReviewTypeRequest.Icon())
+	assert.Equal(t, "dot-fill", ReviewTypeRequest.Icon())
 	assert.Equal(t, "comment", ReviewType(6).Icon())
 }
 

modules/base/tool.go

@@ -387,7 +387,7 @@ func EntryIcon(entry *git.TreeEntry) string {
 			return "file-symlink-file"
 		}
 		if te.IsDir() {
-			return "file-symlink-directory"
+			return "file-submodule"
 		}
 		return "file-symlink-file"
 	case entry.IsDir():

modules/templates/helper.go

@@ -639,7 +639,7 @@ func ActionIcon(opType models.ActionType) string {
 	case models.ActionApprovePullRequest:
 		return "check"
 	case models.ActionRejectPullRequest:
-		return "request-changes"
+		return "diff"
 	default:
 		return "question"
 	}

package.json

@@ -10,7 +10,7 @@
     "@babel/plugin-transform-runtime": "7.10.4",
     "@babel/preset-env": "7.10.4",
     "@babel/runtime": "7.10.4",
-    "@primer/octicons": "9.6.0",
+    "@primer/octicons": "10.0.0",
     "babel-loader": "8.1.0",
     "clipboard": "2.0.6",
     "core-js": "3.6.5",