Merge pull request #218 from duylam/v2

Upgrade to new Firefox package tool

gulpfile.babel.js

@@ -115,7 +115,9 @@ gulp.task('firefox', ['firefox:js'], () => {
 })
 
 gulp.task('firefox:xpi', (cb) => {
-  $.run('cd ./tmp/firefox && cfx xpi --output-file=../../dist/firefox.xpi').exec(cb)
+  // TODO: waiting for --output-file option to be merged
+  // The PR is at https://github.com/mozilla-jetpack/jpm/pull/344
+  $.run('cd ./tmp/firefox && jpm xpi && mv jid1-Om7eJGwA1U8Akg*.xpi ../../dist/firefox.xpi').exec(cb)
 })
 
 // Safari

package.json

@@ -4,7 +4,9 @@
   "description": "Display GitHub code in tree format",
   "main": "inject.js",
   "scripts": {
-    "test": "gulp test"
+    "test": "gulp test",
+    "dist": "gulp dist",
+    "preinstall": "npm i -g jpm gulp"
   },
   "repository": {
     "type": "git",
@@ -23,7 +25,6 @@
     "crx": "^0.4.4",
     "event-stream": "*",
     "firefox-profile": "~0.3.6",
-    "gulp": "^3.9.0",
     "gulp-autoprefixer": "0.0.8",
     "gulp-babel": "^6.1.0",
     "gulp-clean": "^0.3.1",

src/config/firefox/package.json

@@ -1,15 +1,13 @@
 {
   "name": "octotree",
   "title": "Octotree",
-  "id": "jid1-Om7eJGwA1U8Akg",
+  "id": "jid1-Om7eJGwA1U8Akg@jetpack",
   "description": "Display GitHub code in tree format",
   "author": "Buu Nguyen",
   "homepage": "https://github.com/buunguyen/octotree",
-  "lib": "lib",
   "main": "lib/firefox",
-  "data": "data",
-  "icon": "data/icons/icon48.png",
-  "icon64": "data/icons/icon64.png",
+  "icon": "resource://jid1-Om7eJGwA1U8Akg-at-jetpack/data/icons/icon48.png",
+  "icon64": "resource://jid1-Om7eJGwA1U8Akg-at-jetpack/data/icons/icon64.png",
   "license": "MIT",
   "version": "2.0.0",
   "permissions": {