Merge pull request #220 from primer/release-7.3.0

Release 7.3.0

.svgo.yml

@@ -1,3 +1,4 @@
+multipass: true
 plugins:
   - removeTitle: true
   - removeViewBox: false
@@ -20,3 +21,4 @@ plugins:
   - removeEditorsNSData: true
   - removeEmptyAttrs: true
   - removeHiddenElems: true
+  - collapseGroups: true

CHANGELOG.md

@@ -1,4 +1,12 @@
-### HEAD
+# 7.3.0
+
+* Fix for heart icon https://github.com/primer/octicons/pull/211
+
+* Adding an archive icon  created by @colinkeany
+  Fixes https://github.com/primer/octicons/issues/182
+
+* Fixed versioning strategy https://github.com/primer/octicons/pull/#208
+
 
 ### Octicons_node 7.0.0
 

lerna.json

@@ -6,5 +6,5 @@
     "lib/octicons_helper",
     "lib/jekyll-octicons"
   ],
-  "version": "independent"
+  "version": "7.3.0"
 }

lib/jekyll-octicons/jekyll-octicons.gemspec

@@ -14,5 +14,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "jekyll", "~> 3.1"
-  s.add_dependency "octicons", "5.3.0"
+  s.add_dependency "octicons", "7.3.0"
 end

lib/jekyll-octicons/lib/jekyll-octicons/version.rb

@@ -3,6 +3,6 @@ module Liquid; class Tag; end; end
 
 module Jekyll
   class Octicons < Liquid::Tag
-    VERSION = "4.3.0".freeze
+    VERSION = "7.3.0".freeze
   end
 end

lib/jekyll-octicons/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jekyll-octicons",
-  "version": "4.3.0",
+  "version": "7.3.0",
   "description": "A jekyll liquid plugin that makes including svg Octicons simple.",
   "scripts": {
     "version": "../../script/rubyversion ./lib/jekyll-octicons/version.rb",
@@ -21,6 +21,6 @@
   "rubygems": "jekyll-octicons",
   "homepage": "https://github.com/primer/octicons#readme",
   "dependencies": {
-    "octicons_gem": "5.3.0"
+    "octicons_gem": "7.3.0"
   }
 }

lib/octicons_gem/lib/octicons/version.rb

@@ -1,3 +1,3 @@
 module Octicons
-  VERSION = "5.3.0".freeze
+  VERSION = "7.3.0".freeze
 end

lib/octicons_gem/package.json

@@ -1,6 +1,6 @@
 {
   "name": "octicons_gem",
-  "version": "5.3.0",
+  "version": "7.3.0",
   "description": "Don't install",
   "scripts": {
     "postinstall": "bundle install --path vendor/bundle",

lib/octicons_helper/lib/octicons_helper/version.rb

@@ -1,3 +1,3 @@
 module OcticonsHelper
-  VERSION = "4.3.0".freeze
+  VERSION = "7.3.0".freeze
 end

lib/octicons_helper/octicons_helper.gemspec

@@ -13,6 +13,6 @@ Gem::Specification.new do |s|
 
   s.require_paths = ["lib"]
 
-  s.add_dependency "octicons", "5.3.0"
+  s.add_dependency "octicons", "7.3.0"
   s.add_dependency "rails"
 end

lib/octicons_helper/package.json

@@ -1,6 +1,6 @@
 {
   "name": "octicons_helper",
-  "version": "4.3.0",
+  "version": "7.3.0",
   "description": "A rails helper that makes including svg Octicons simple.",
   "scripts": {
     "version": "../../script/rubyversion ./lib/octicons_helper/version.rb",
@@ -21,6 +21,6 @@
   "rubygems": "octicons_helper",
   "homepage": "https://github.com/primer/octicons#readme",
   "dependencies": {
-    "octicons_gem": "5.3.0"
+    "octicons_gem": "7.3.0"
   }
 }

lib/octicons_node/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "7.2.0",
+  "version": "7.3.0",
   "name": "octicons",
   "description": "A scalable set of icons handcrafted with <3 by GitHub.",
   "homepage": "https://octicons.github.com",

script/export

@@ -149,7 +149,7 @@ Promise.resolve(fs.removeSync(outputDir))
           dCount++
           return svgo.optimize(svg, {})
             .then(optimized => {
-              icon.path = /<svg.+>(.+)<\/svg>/g.exec(optimized.data).pop()
+              icon.path = optimized.data.slice(optimized.data.indexOf('>') + 1).slice(0, -6)
 
               return fs.ensureDir(path.join(outputDir, "/svg"))
                 .then(() => fs.writeFileSync(path.resolve(outputDir, `svg/${icon.name}.svg`), optimized.data, "utf8"))

script/utils.js

@@ -1,46 +1,5 @@
 const got = require('got')
 
-// Translates a path based on the xy array passed in
-const translatePath = (p, xy) => {
-
-  let ds = p.match(/([A-Z]{1,2}[\s0-9\.\-e]+)/g)
-  let [x, y] = xy
-
-  let dd = ds.map((d) => {
-    var darr = d.split(" ").reverse()
-    for(let i = 0; i < darr.length; i += 2) {
-      if(darr[i+1]) {
-        darr[i] = parseFloat(darr[i]) + y
-        darr[i+1] = parseFloat(darr[i+1]) + x
-      }
-    }
-
-    return darr.reverse().join(" ")
-  }).join("") + "Z"
-
-  return dd
-}
-
-// Gets the sum of all the `translate(x y)` and reduces it
-// <g transform="translate(-238 -286)"><g transform="translate(238 290)">
-// becomes [0, 4]
-const reduceTranslate = (t) => {
-  if(t == null) {
-    return [0, 0]
-  }
-  if(t.length == 1) {
-    return t[0].replace(/translate|[\(\)]/g,"").split(" ").map((v) => Math.round(parseFloat(v)))
-  }
-  return t.reduce((p,c) => {
-    p = p.replace(/translate|[\(\)]/g,"").split(" ")
-    c = c.replace(/translate|[\(\)]/g,"").split(" ")
-    for(let i = 0; i < c.length; i++) {
-      c[i] = Math.round(parseFloat(p[i])) + Math.round(parseFloat(c[i]))
-    }
-    return c
-  })
-}
-
 module.exports = {
   progress: (current, total) => {
     let percentage = Math.ceil((current * 10) / total)
@@ -60,19 +19,7 @@ module.exports = {
         headers: { "Content-Type": "images/svg+xml" }
       }).on('downloadProgress', downloadProgress)
 
-      let svg = response.body
-
-      let d = svg.match(/ d=["']([a-z\s0-9\.\-]+)["']/i).pop()
-      let translate = reduceTranslate(svg.match(/translate\([0-9\-\s\.e]+\)/g))
-      let d2 = translatePath(d, translate)
-
-      // Clean and replace svg elements
-      svg = svg.replace(`d="${d}"`, `d="${d2}"`)
-              .replace(/<\/?defs>/g,"")
-              .replace(/<use[^>]*>/g, "")
-
-      resolve(svg)
-      // .catch(err => reject(`There was trouble downloading ${url}\n${err}`))
+      resolve(response.body)
     })
   }
 }