Merge pull request #33 from crnbrdrck/automated-firefox-deployment

v1.0.6

CHANGELOG.md

@@ -1,3 +1,11 @@
+# 1.0.6
+- Automated deployment to AMO for Firefox users
+- Updated colours
+    - Go
+    - Dockerfile
+- Fixed security vulnerability due to lodash versioning
+    - [CVE-2018-16487](https://nvd.nist.gov/vuln/detail/CVE-2018-16487)
+
 # 1.0.5
 - Fixed an issue where the chart was being displayed too small when there was a large number of languages and the legend was displayed
 

deploy.sh

@@ -1,15 +1,40 @@
+#!/bin/bash
+
 # Write message stating which version is being deployed
-echo "Deploying github-user-languages $(jq '.version' package.json) to the Web Store!"
+echo "Deploying github-user-languages $(jq '.version' package.json) to the Web Stores!"
 
 # Build the production code
+echo "Building the Code"
 npm run build
+echo "Done!"
 
 # Create the distribution zipfile
+echo "Building the AMO distribution zip"
+cd dist
+zip -r ../dist.zip *
+cd ..
+echo "Done!"
+
+# Deploy to AMO
+echo "Deploying to AMO"
+npm run deploy-amo
+echo "Done!"
+
+# When deploying to the Chrome Store we have to remove the "applications" key from the manifest
+echo "Removing the applications key from the manifest for Chrome"
+echo $(jq 'del(.applications)' dist/manifest.json) > dist/manifest.json
+echo "Done!"
+
+# Re-zip
+echo "Building the Chrome distribution zip"
 cd dist
 zip -r ../dist.zip *
 cd ..
+echo "Done!"
 
 # Deploy to Chrome Web Store
+echo "Deploying to Chrome Web Store"
 ACCESS_TOKEN=$(curl "https://accounts.google.com/o/oauth2/token" -d "client_id=${CLIENT_ID}&client_secret=${CLIENT_SECRET}&refresh_token=${REFRESH_TOKEN}&grant_type=refresh_token&redirect_uri=urn:ietf:wg:oauth:2.0:oob" | jq -r .access_token)
 curl -H "Authorization: Bearer ${ACCESS_TOKEN}" -H "x-goog-api-version: 2" -X PUT -T dist.zip -v "https://www.googleapis.com/upload/chromewebstore/v1.1/items/${APP_ID}"
 curl -H "Authorization: Bearer ${ACCESS_TOKEN}" -H "x-goog-api-version: 2" -H "Content-Length: 0" -X POST -v "https://www.googleapis.com/chromewebstore/v1.1/items/${APP_ID}/publish"
+echo "Done!"

dist/colors.json

@@ -1 +1 @@
-{"1C Enterprise": "#814CCC", "ABAP": "#E8274B", "AGS Script": "#B9D9FF", "AMPL": "#E6EFBB", "ANTLR": "#9DC3FF", "API Blueprint": "#2ACCA8", "APL": "#5A8164", "ASP": "#6a40fd", "ATS": "#1ac620", "ActionScript": "#882B0F", "Ada": "#02f88c", "Agda": "#315665", "Alloy": "#64C800", "AngelScript": "#C7D7DC", "AppleScript": "#101F1F", "Arc": "#aa2afe", "AspectJ": "#a957b0", "Assembly": "#6E4C13", "AutoHotkey": "#6594b9", "AutoIt": "#1C3552", "Ballerina": "#FF5000", "Batchfile": "#C1F12E", "BlitzMax": "#cd6400", "Boo": "#d4bec1", "Brainfuck": "#2F2530", "C": "#555555", "C#": "#178600", "C++": "#f34b7d", "CSS": "#563d7c", "Ceylon": "#dfa535", "Chapel": "#8dc63f", "Cirru": "#ccccff", "Clarion": "#db901e", "Clean": "#3F85AF", "Click": "#E4E6F3", "Clojure": "#db5855", "CoffeeScript": "#244776", "ColdFusion": "#ed2cd6", "Common Lisp": "#3fb68b", "Common Workflow Language": "#B5314C", "Component Pascal": "#B0CE4E", "Crystal": "#000100", "Cuda": "#3A4E3A", "D": "#ba595e", "DM": "#447265", "Dart": "#00B4AB", "DataWeave": "#003a52", "Dockerfile": "#0db7ed", "Dogescript": "#cca760", "Dylan": "#6c616e", "E": "#ccce35", "ECL": "#8a1267", "EQ": "#a78649", "Eiffel": "#946d57", "Elixir": "#6e4a7e", "Elm": "#60B5CC", "Emacs Lisp": "#c065db", "EmberScript": "#FFF4F3", "Erlang": "#B83998", "F#": "#b845fc", "F*": "#572e30", "FLUX": "#88ccff", "Factor": "#636746", "Fancy": "#7b9db4", "Fantom": "#14253c", "Forth": "#341708", "Fortran": "#4d41b1", "FreeMarker": "#0050b2", "Frege": "#00cafe", "GDScript": "#355570", "Game Maker Language": "#71b417", "Genie": "#fb855d", "Gherkin": "#5B2063", "Glyph": "#c1ac7f", "Gnuplot": "#f0a9f0", "Go": "#375eab", "Golo": "#88562A", "Gosu": "#82937f", "Grammatical Framework": "#79aa7a", "Groovy": "#e69f56", "HTML": "#e34c26", "Hack": "#878787", "Harbour": "#0e60e3", "Haskell": "#5e5086", "Haxe": "#df7900", "HiveQL": "#dce200", "Hy": "#7790B2", "IDL": "#a3522f", "Idris": "#b30000", "Io": "#a9188d", "Ioke": "#078193", "Isabelle": "#FEFE00", "J": "#9EEDFF", "JSONiq": "#40d47e", "Java": "#b07219", "JavaScript": "#f1e05a", "Jolie": "#843179", "Julia": "#a270ba", "Jupyter Notebook": "#DA5B0B", "KRL": "#28430A", "Kotlin": "#F18E33", "LFE": "#4C3023", "LLVM": "#185619", "LOLCODE": "#cc9900", "LSL": "#3d9970", "Lasso": "#999999", "Lex": "#DBCA00", "LiveScript": "#499886", "LookML": "#652B81", "Lua": "#000080", "MAXScript": "#00a6a6", "MQL4": "#62A8D6", "MQL5": "#4A76B8", "MTML": "#b7e1f4", "Makefile": "#427819", "Mask": "#f97732", "Matlab": "#e16737", "Max": "#c4a79c", "Mercury": "#ff2b2b", "Meson": "#007800", "Metal": "#8f14e9", "Mirah": "#c7a938", "Modula-3": "#223388", "NCL": "#28431f", "Nearley": "#990000", "Nemerle": "#3d3c6e", "NetLinx": "#0aa0ff", "NetLinx+ERB": "#747faa", "NetLogo": "#ff6375", "NewLisp": "#87AED7", "Nextflow": "#3ac486", "Nim": "#37775b", "Nit": "#009917", "Nix": "#7e7eff", "Nu": "#c9df40", "OCaml": "#3be133", "Objective-C": "#438eff", "Objective-C++": "#6866fb", "Objective-J": "#ff0c5a", "Omgrofl": "#cabbff", "Opal": "#f7ede0", "Oxygene": "#cdd0e3", "Oz": "#fab738", "P4": "#7055b5", "PHP": "#4F5D95", "PLSQL": "#dad8d8", "Pan": "#cc0000", "Papyrus": "#6600cc", "Parrot": "#f3ca0a", "Pascal": "#E3F171", "Pawn": "#dbb284", "Pep8": "#C76F5B", "Perl": "#0298c3", "Perl 6": "#0000fb", "PigLatin": "#fcd7de", "Pike": "#005390", "PogoScript": "#d80074", "PostScript": "#da291c", "PowerBuilder": "#8f0f8d", "PowerShell": "#012456", "Processing": "#0096D8", "Prolog": "#74283c", "Propeller Spin": "#7fa2a7", "Puppet": "#302B6D", "PureBasic": "#5a6986", "PureScript": "#1D222D", "Python": "#3572A5", "QML": "#44a51c", "Quake": "#882233", "R": "#198CE7", "RAML": "#77d9fb", "RUNOFF": "#665a4e", "Racket": "#22228f", "Ragel": "#9d5200", "Rascal": "#fffaa0", "Rebol": "#358a5b", "Red": "#f50000", "Ren'Py": "#ff7f7f", "Ring": "#2D54CB", "Roff": "#ecdebe", "Rouge": "#cc0088", "Ruby": "#701516", "Rust": "#dea584", "SAS": "#B34936", "SQF": "#3F3F3F", "SRecode Template": "#348a34", "SaltStack": "#646464", "Scala": "#c22d40", "Scheme": "#1e4aec", "Self": "#0579aa", "Shell": "#89e051", "Shen": "#120F14", "Slash": "#007eff", "Slice": "#003fa2", "Smalltalk": "#596706", "Solidity": "#AA6746", "SourcePawn": "#5c7611", "Squirrel": "#800000", "Stan": "#b2011d", "Standard ML": "#dc566d", "SuperCollider": "#46390b", "Swift": "#ffac45", "SystemVerilog": "#DAE1C2", "TI Program": "#A0AA87", "Tcl": "#e4cc98", "TeX": "#3D6117", "Terra": "#00004c", "Turing": "#cf142b", "TypeScript": "#2b7489", "UnrealScript": "#a54c4d", "VCL": "#148AA8", "VHDL": "#adb2cb", "Vala": "#fbe5cd", "Verilog": "#b2b7f8", "Vim script": "#199f4b", "Visual Basic": "#945db7", "Volt": "#1F1F1F", "Vue": "#2c3e50", "WebAssembly": "#04133b", "X10": "#4B6BEF", "XC": "#99DA07", "XQuery": "#5232e7", "XSLT": "#EB8CEB", "YARA": "#220000", "YASnippet": "#32AB90", "Yacc": "#4B6C4B", "Zephir": "#118f9e", "eC": "#913960", "nesC": "#94B0C7", "ooc": "#b0b77e", "q": "#0040cd", "sed": "#64b970", "wdl": "#42f1f4", "wisp": "#7582D1", "xBase": "#403a40"}
+{"1C Enterprise": "#814CCC", "ABAP": "#E8274B", "AGS Script": "#B9D9FF", "AMPL": "#E6EFBB", "ANTLR": "#9DC3FF", "API Blueprint": "#2ACCA8", "APL": "#5A8164", "ASP": "#6a40fd", "ATS": "#1ac620", "ActionScript": "#882B0F", "Ada": "#02f88c", "Agda": "#315665", "Alloy": "#64C800", "AngelScript": "#C7D7DC", "AppleScript": "#101F1F", "Arc": "#aa2afe", "AspectJ": "#a957b0", "Assembly": "#6E4C13", "Asymptote": "#4a0c0c", "AutoHotkey": "#6594b9", "AutoIt": "#1C3552", "Ballerina": "#FF5000", "Batchfile": "#C1F12E", "BlitzMax": "#cd6400", "Boo": "#d4bec1", "Brainfuck": "#2F2530", "C": "#555555", "C#": "#178600", "C++": "#f34b7d", "CSS": "#563d7c", "Ceylon": "#dfa535", "Chapel": "#8dc63f", "Cirru": "#ccccff", "Clarion": "#db901e", "Clean": "#3F85AF", "Click": "#E4E6F3", "Clojure": "#db5855", "CoffeeScript": "#244776", "ColdFusion": "#ed2cd6", "Common Lisp": "#3fb68b", "Common Workflow Language": "#B5314C", "Component Pascal": "#B0CE4E", "Crystal": "#000100", "Cuda": "#3A4E3A", "D": "#ba595e", "DM": "#447265", "Dart": "#00B4AB", "DataWeave": "#003a52", "Dockerfile": "#384d54", "Dogescript": "#cca760", "Dylan": "#6c616e", "E": "#ccce35", "ECL": "#8a1267", "EQ": "#a78649", "Eiffel": "#946d57", "Elixir": "#6e4a7e", "Elm": "#60B5CC", "Emacs Lisp": "#c065db", "EmberScript": "#FFF4F3", "Erlang": "#B83998", "F#": "#b845fc", "F*": "#572e30", "FLUX": "#88ccff", "Factor": "#636746", "Fancy": "#7b9db4", "Fantom": "#14253c", "Forth": "#341708", "Fortran": "#4d41b1", "FreeMarker": "#0050b2", "Frege": "#00cafe", "GDScript": "#355570", "Game Maker Language": "#71b417", "Genie": "#fb855d", "Gherkin": "#5B2063", "Glyph": "#c1ac7f", "Gnuplot": "#f0a9f0", "Go": "#00ADD8", "Golo": "#88562A", "Gosu": "#82937f", "Grammatical Framework": "#79aa7a", "Groovy": "#e69f56", "HTML": "#e34c26", "Hack": "#878787", "Harbour": "#0e60e3", "Haskell": "#5e5086", "Haxe": "#df7900", "HiveQL": "#dce200", "Hy": "#7790B2", "IDL": "#a3522f", "Idris": "#b30000", "Io": "#a9188d", "Ioke": "#078193", "Isabelle": "#FEFE00", "J": "#9EEDFF", "JSONiq": "#40d47e", "Java": "#b07219", "JavaScript": "#f1e05a", "Jolie": "#843179", "Julia": "#a270ba", "Jupyter Notebook": "#DA5B0B", "KRL": "#28430A", "Kotlin": "#F18E33", "LFE": "#4C3023", "LLVM": "#185619", "LOLCODE": "#cc9900", "LSL": "#3d9970", "Lasso": "#999999", "Lex": "#DBCA00", "LiveScript": "#499886", "LookML": "#652B81", "Lua": "#000080", "MATLAB": "#e16737", "MAXScript": "#00a6a6", "MQL4": "#62A8D6", "MQL5": "#4A76B8", "MTML": "#b7e1f4", "Makefile": "#427819", "Mask": "#f97732", "Max": "#c4a79c", "Mercury": "#ff2b2b", "Meson": "#007800", "Metal": "#8f14e9", "Mirah": "#c7a938", "Modula-3": "#223388", "NCL": "#28431f", "Nearley": "#990000", "Nemerle": "#3d3c6e", "NetLinx": "#0aa0ff", "NetLinx+ERB": "#747faa", "NetLogo": "#ff6375", "NewLisp": "#87AED7", "Nextflow": "#3ac486", "Nim": "#37775b", "Nit": "#009917", "Nix": "#7e7eff", "Nu": "#c9df40", "OCaml": "#3be133", "Objective-C": "#438eff", "Objective-C++": "#6866fb", "Objective-J": "#ff0c5a", "Omgrofl": "#cabbff", "Opal": "#f7ede0", "Oxygene": "#cdd0e3", "Oz": "#fab738", "P4": "#7055b5", "PHP": "#4F5D95", "PLSQL": "#dad8d8", "Pan": "#cc0000", "Papyrus": "#6600cc", "Parrot": "#f3ca0a", "Pascal": "#E3F171", "Pawn": "#dbb284", "Pep8": "#C76F5B", "Perl": "#0298c3", "Perl 6": "#0000fb", "PigLatin": "#fcd7de", "Pike": "#005390", "PogoScript": "#d80074", "PostScript": "#da291c", "PowerBuilder": "#8f0f8d", "PowerShell": "#012456", "Processing": "#0096D8", "Prolog": "#74283c", "Propeller Spin": "#7fa2a7", "Puppet": "#302B6D", "PureBasic": "#5a6986", "PureScript": "#1D222D", "Python": "#3572A5", "QML": "#44a51c", "Quake": "#882233", "R": "#198CE7", "RAML": "#77d9fb", "RUNOFF": "#665a4e", "Racket": "#22228f", "Ragel": "#9d5200", "Rascal": "#fffaa0", "Rebol": "#358a5b", "Red": "#f50000", "Ren'Py": "#ff7f7f", "Ring": "#2D54CB", "Roff": "#ecdebe", "Rouge": "#cc0088", "Ruby": "#701516", "Rust": "#dea584", "SAS": "#B34936", "SQF": "#3F3F3F", "SRecode Template": "#348a34", "SaltStack": "#646464", "Scala": "#c22d40", "Scheme": "#1e4aec", "Self": "#0579aa", "Shell": "#89e051", "Shen": "#120F14", "Slash": "#007eff", "Slice": "#003fa2", "Smalltalk": "#596706", "Solidity": "#AA6746", "SourcePawn": "#5c7611", "Squirrel": "#800000", "Stan": "#b2011d", "Standard ML": "#dc566d", "SuperCollider": "#46390b", "Swift": "#ffac45", "SystemVerilog": "#DAE1C2", "TI Program": "#A0AA87", "Tcl": "#e4cc98", "TeX": "#3D6117", "Terra": "#00004c", "Turing": "#cf142b", "TypeScript": "#2b7489", "UnrealScript": "#a54c4d", "VCL": "#148AA8", "VHDL": "#adb2cb", "Vala": "#fbe5cd", "Verilog": "#b2b7f8", "Vim script": "#199f4b", "Visual Basic": "#945db7", "Volt": "#1F1F1F", "Vue": "#2c3e50", "WebAssembly": "#04133b", "X10": "#4B6BEF", "XC": "#99DA07", "XQuery": "#5232e7", "XSLT": "#EB8CEB", "YARA": "#220000", "YASnippet": "#32AB90", "Yacc": "#4B6C4B", "Zephir": "#118f9e", "Zig": "#ec915c", "eC": "#913960", "nesC": "#94B0C7", "ooc": "#b0b77e", "q": "#0040cd", "sed": "#64b970", "wdl": "#42f1f4", "wisp": "#7582D1", "xBase": "#403a40"}

dist/manifest.json

@@ -38,8 +38,8 @@
     "tabs"
   ],
   "short_name": "github-user-languages",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "web_accessible_resources": [
     "colors.json"
   ]
-}
+}

dist/popup.html

@@ -37,7 +37,7 @@ <h4>API Token <small>Click out of input to save</small></h4>
         <p>If you wish to be able to see your own private repos in the chart, be sure to select the <b>repo</b> scope for the token also.</p>
     </main>
     <footer>
-        <small>GitHub User Languages v1.0.5</small>
+        <small>GitHub User Languages v1.0.6</small>
     </footer>
     <script src="js/popup.js"></script>
 </body>