Delete some of our logos (part 1) (#2857)

Refs #2510

I'm going to delete or change some more logos in a further PR or two, but lets start off with the (hopefully) non-controversial ones. I think in all of these cases it is fairly clear-cut that we are not losing anything by removing our icon in favour of simple-icons now that we apply a sensible colour by default.

core/base-service/coalesce-badge.spec.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { expect } = require('chai')
-const { getShieldsIcon } = require('../../lib/logos')
+const { getShieldsIcon, getSimpleIcon } = require('../../lib/logos')
 const coalesceBadge = require('./coalesce-badge')
 
 describe('coalesceBadge', function() {
@@ -118,43 +118,43 @@ describe('coalesceBadge', function() {
       // .not.be.empty for confidence that nothing has changed with `getShieldsIcon()`.
       expect(
         coalesceBadge({ style: 'social' }, {}, { namedLogo: 'appveyor' }).logo
-      ).to.equal(getShieldsIcon({ name: 'appveyor' })).and.not.be.empty
+      ).to.equal(getSimpleIcon({ name: 'appveyor' })).and.not.be.empty
     })
 
     it('applies the named logo', function() {
-      expect(coalesceBadge({}, { namedLogo: 'github' }, {}).logo).to.equal(
-        getShieldsIcon({ name: 'github' })
+      expect(coalesceBadge({}, { namedLogo: 'npm' }, {}).logo).to.equal(
+        getShieldsIcon({ name: 'npm' })
       ).and.not.to.be.empty
     })
 
     it('applies the named logo with color', function() {
       expect(
-        coalesceBadge({}, { namedLogo: 'github', logoColor: 'blue' }, {}).logo
-      ).to.equal(getShieldsIcon({ name: 'github', color: 'blue' })).and.not.to
-        .be.empty
+        coalesceBadge({}, { namedLogo: 'npm', logoColor: 'blue' }, {}).logo
+      ).to.equal(getShieldsIcon({ name: 'npm', color: 'blue' })).and.not.to.be
+        .empty
     })
 
     it('overrides the logo', function() {
       expect(
-        coalesceBadge({ logo: 'github' }, { namedLogo: 'appveyor' }, {}).logo
-      ).to.equal(getShieldsIcon({ name: 'github' })).and.not.be.empty
+        coalesceBadge({ logo: 'npm' }, { namedLogo: 'appveyor' }, {}).logo
+      ).to.equal(getShieldsIcon({ name: 'npm' })).and.not.be.empty
     })
 
     it('overrides the logo with a color', function() {
       expect(
         coalesceBadge(
-          { logo: 'github', logoColor: 'blue' },
+          { logo: 'npm', logoColor: 'blue' },
           { namedLogo: 'appveyor' },
           {}
         ).logo
-      ).to.equal(getShieldsIcon({ name: 'github', color: 'blue' })).and.not.be
+      ).to.equal(getShieldsIcon({ name: 'npm', color: 'blue' })).and.not.be
         .empty
     })
 
     it("when the logo is overridden, it ignores the service's logo color, position, and width", function() {
       expect(
         coalesceBadge(
-          { logo: 'github' },
+          { logo: 'npm' },
           {
             namedLogo: 'appveyor',
             logoColor: 'red',
@@ -163,17 +163,17 @@ describe('coalesceBadge', function() {
           },
           {}
         ).logo
-      ).to.equal(getShieldsIcon({ name: 'github' })).and.not.be.empty
+      ).to.equal(getShieldsIcon({ name: 'npm' })).and.not.be.empty
     })
 
     it("overrides the service logo's color", function() {
       expect(
         coalesceBadge(
           { logoColor: 'blue' },
-          { namedLogo: 'github', logoColor: 'red' },
+          { namedLogo: 'npm', logoColor: 'red' },
           {}
         ).logo
-      ).to.equal(getShieldsIcon({ name: 'github', color: 'blue' })).and.not.be
+      ).to.equal(getShieldsIcon({ name: 'npm', color: 'blue' })).and.not.be
         .empty
     })
   })
@@ -205,7 +205,7 @@ describe('coalesceBadge', function() {
 
     it('applies the logo width', function() {
       expect(
-        coalesceBadge({}, { namedLogo: 'github', logoWidth: 275 }, {}).logoWidth
+        coalesceBadge({}, { namedLogo: 'npm', logoWidth: 275 }, {}).logoWidth
       ).to.equal(275)
     })
   })
@@ -219,7 +219,7 @@ describe('coalesceBadge', function() {
 
     it('applies the logo position', function() {
       expect(
-        coalesceBadge({}, { namedLogo: 'github', logoPosition: -10 }, {})
+        coalesceBadge({}, { namedLogo: 'npm', logoPosition: -10 }, {})
           .logoPosition
       ).to.equal(-10)
     })

lib/logos.js

@@ -7,6 +7,15 @@ const { svg2base64 } = require('./svg-helpers')
 const logos = require('./load-logos')()
 const simpleIcons = require('./load-simple-icons')()
 
+// for backwards-compatibility with deleted logos
+const logoAliases = {
+  azuredevops: 'azure-devops',
+  eclipse: 'eclipse-ide',
+  'gitter-white': 'gitter',
+  stackoverflow: 'stack-overflow',
+  tfs: 'azure-devops',
+}
+
 function prependPrefix(s, prefix) {
   if (s === undefined) {
     return undefined
@@ -81,7 +90,10 @@ function getSimpleIconStyle({ icon, style }) {
 }
 
 function getSimpleIcon({ name, color, style }) {
-  const key = name.toLowerCase().replace(/ /g, '-')
+  let key = name.toLowerCase().replace(/ /g, '-')
+  if (key in logoAliases) {
+    key = logoAliases[key]
+  }
 
   if (!(key in simpleIcons)) {
     return undefined
@@ -127,5 +139,6 @@ module.exports = {
   decodeDataUrlFromQueryParam,
   prepareNamedLogo,
   getShieldsIcon,
+  getSimpleIcon,
   makeLogo,
 }

lib/logos.spec.js

@@ -26,11 +26,11 @@ describe('Logo helpers', function() {
   test(prepareNamedLogo, () => {
     // These two strings are identical except for characters 159-165 which
     // differ.
-    given({ name: 'github' }).expect(
-      'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI0MCIgaGVpZ2h0PSI0MCIgdmlld0JveD0iMTIgMTIgNDAgNDAiPgo8cGF0aCBmaWxsPSIjMzMzMzMzIiBkPSJNMzIsMTMuNGMtMTAuNSwwLTE5LDguNS0xOSwxOWMwLDguNCw1LjUsMTUuNSwxMywxOGMxLDAuMiwxLjMtMC40LDEuMy0wLjljMC0wLjUsMC0xLjcsMC0zLjIgYy01LjMsMS4xLTYuNC0yLjYtNi40LTIuNkMyMCw0MS42LDE4LjgsNDEsMTguOCw0MWMtMS43LTEuMiwwLjEtMS4xLDAuMS0xLjFjMS45LDAuMSwyLjksMiwyLjksMmMxLjcsMi45LDQuNSwyLjEsNS41LDEuNiBjMC4yLTEuMiwwLjctMi4xLDEuMi0yLjZjLTQuMi0wLjUtOC43LTIuMS04LjctOS40YzAtMi4xLDAuNy0zLjcsMi01LjFjLTAuMi0wLjUtMC44LTIuNCwwLjItNWMwLDAsMS42LTAuNSw1LjIsMiBjMS41LTAuNCwzLjEtMC43LDQuOC0wLjdjMS42LDAsMy4zLDAuMiw0LjcsMC43YzMuNi0yLjQsNS4yLTIsNS4yLTJjMSwyLjYsMC40LDQuNiwwLjIsNWMxLjIsMS4zLDIsMywyLDUuMWMwLDcuMy00LjUsOC45LTguNyw5LjQgYzAuNywwLjYsMS4zLDEuNywxLjMsMy41YzAsMi42LDAsNC42LDAsNS4yYzAsMC41LDAuNCwxLjEsMS4zLDAuOWM3LjUtMi42LDEzLTkuNywxMy0xOC4xQzUxLDIxLjksNDIuNSwxMy40LDMyLDEzLjR6Ii8+Cjwvc3ZnPgo='
+    given({ name: 'npm' }).expect(
+      'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0MCA0MCI+PHBhdGggZD0iTTAgMGg0MHY0MEgwVjB6IiBmaWxsPSIjY2IwMDAwIi8+PHBhdGggZmlsbD0iI2ZmZiIgZD0iTTcgN2gyNnYyNmgtN1YxNGgtNnYxOUg3eiIvPjwvc3ZnPgo='
     )
-    given({ name: 'github', color: 'blue' }).expect(
-      'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI0MCIgaGVpZ2h0PSI0MCIgdmlld0JveD0iMTIgMTIgNDAgNDAiPgo8cGF0aCBmaWxsPSIjMDA3ZWM2IiBkPSJNMzIsMTMuNGMtMTAuNSwwLTE5LDguNS0xOSwxOWMwLDguNCw1LjUsMTUuNSwxMywxOGMxLDAuMiwxLjMtMC40LDEuMy0wLjljMC0wLjUsMC0xLjcsMC0zLjIgYy01LjMsMS4xLTYuNC0yLjYtNi40LTIuNkMyMCw0MS42LDE4LjgsNDEsMTguOCw0MWMtMS43LTEuMiwwLjEtMS4xLDAuMS0xLjFjMS45LDAuMSwyLjksMiwyLjksMmMxLjcsMi45LDQuNSwyLjEsNS41LDEuNiBjMC4yLTEuMiwwLjctMi4xLDEuMi0yLjZjLTQuMi0wLjUtOC43LTIuMS04LjctOS40YzAtMi4xLDAuNy0zLjcsMi01LjFjLTAuMi0wLjUtMC44LTIuNCwwLjItNWMwLDAsMS42LTAuNSw1LjIsMiBjMS41LTAuNCwzLjEtMC43LDQuOC0wLjdjMS42LDAsMy4zLDAuMiw0LjcsMC43YzMuNi0yLjQsNS4yLTIsNS4yLTJjMSwyLjYsMC40LDQuNiwwLjIsNWMxLjIsMS4zLDIsMywyLDUuMWMwLDcuMy00LjUsOC45LTguNyw5LjQgYzAuNywwLjYsMS4zLDEuNywxLjMsMy41YzAsMi42LDAsNC42LDAsNS4yYzAsMC41LDAuNCwxLjEsMS4zLDAuOWM3LjUtMi42LDEzLTkuNywxMy0xOC4xQzUxLDIxLjksNDIuNSwxMy40LDMyLDEzLjR6Ii8+Cjwvc3ZnPgo='
+    given({ name: 'npm', color: 'blue' }).expect(
+      'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0MCA0MCI+PHBhdGggZD0iTTAgMGg0MHY0MEgwVjB6IiBmaWxsPSIjMDA3ZWM2Ii8+PHBhdGggZmlsbD0iIzAwN2VjNiIgZD0iTTcgN2gyNnYyNmgtN1YxNGgtNnYxOUg3eiIvPjwvc3ZnPgo='
     )
 
     it('preserves color if light logo on dark background', function() {
@@ -95,8 +95,8 @@ describe('Logo helpers', function() {
     forCases([given('npm', { logo: '' }), given(undefined, {})]).expect(
       undefined
     )
-    given('github', {}).expect(
-      'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI0MCIgaGVpZ2h0PSI0MCIgdmlld0JveD0iMTIgMTIgNDAgNDAiPgo8cGF0aCBmaWxsPSIjMzMzMzMzIiBkPSJNMzIsMTMuNGMtMTAuNSwwLTE5LDguNS0xOSwxOWMwLDguNCw1LjUsMTUuNSwxMywxOGMxLDAuMiwxLjMtMC40LDEuMy0wLjljMC0wLjUsMC0xLjcsMC0zLjIgYy01LjMsMS4xLTYuNC0yLjYtNi40LTIuNkMyMCw0MS42LDE4LjgsNDEsMTguOCw0MWMtMS43LTEuMiwwLjEtMS4xLDAuMS0xLjFjMS45LDAuMSwyLjksMiwyLjksMmMxLjcsMi45LDQuNSwyLjEsNS41LDEuNiBjMC4yLTEuMiwwLjctMi4xLDEuMi0yLjZjLTQuMi0wLjUtOC43LTIuMS04LjctOS40YzAtMi4xLDAuNy0zLjcsMi01LjFjLTAuMi0wLjUtMC44LTIuNCwwLjItNWMwLDAsMS42LTAuNSw1LjIsMiBjMS41LTAuNCwzLjEtMC43LDQuOC0wLjdjMS42LDAsMy4zLDAuMiw0LjcsMC43YzMuNi0yLjQsNS4yLTIsNS4yLTJjMSwyLjYsMC40LDQuNiwwLjIsNWMxLjIsMS4zLDIsMywyLDUuMWMwLDcuMy00LjUsOC45LTguNyw5LjQgYzAuNywwLjYsMS4zLDEuNywxLjMsMy41YzAsMi42LDAsNC42LDAsNS4yYzAsMC41LDAuNCwxLjEsMS4zLDAuOWM3LjUtMi42LDEzLTkuNywxMy0xOC4xQzUxLDIxLjksNDIuNSwxMy40LDMyLDEzLjR6Ii8+Cjwvc3ZnPgo='
+    given('npm', {}).expect(
+      'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0MCA0MCI+PHBhdGggZD0iTTAgMGg0MHY0MEgwVjB6IiBmaWxsPSIjY2IwMDAwIi8+PHBhdGggZmlsbD0iI2ZmZiIgZD0iTTcgN2gyNnYyNmgtN1YxNGgtNnYxOUg3eiIvPjwvc3ZnPgo='
     )
   })
 })