Fix release (#210)

2017-09-29 01:39:56 +01:00 · 2017-09-29 01:39:56 +01:00 · 3f9a36dadc
--- a/.eslintignore
+++ b/.eslintignore
@ -1,2 +1,2 @@
 /shavar-prod-lists/*
-/ext-libs/*
+/src/ext-libs/*
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,5 @@
-.DS_Store
-node_modules
-npm-debug.log
-ext-libs
-web-ext-artifacts
+.DS_Store
+node_modules
+npm-debug.log
+src/ext-libs
+src/web-ext-artifacts
--- a/package.json
+++ b/package.json
@ -4,9 +4,10 @@
  "description": "Firefox Lightbeam web extension",
  "main": "background.js",
  "scripts": {
-    "build": "npm install && npm run updatesubmodule && npm run createlib && web-ext build --overwrite-dest",
+    "build": "npm install && npm run updatesubmodule && npm run createlib && cd src && web-ext build --overwrite-dest",
    "updatesubmodule": "git submodule init && git submodule update",
-    "createlib": "rm -rf ext-libs/ && mkdir ext-libs && cp node_modules/dexie/dist/dexie.js ext-libs && cp node_modules/d3/build/d3.min.js ext-libs",
+    "createlib": "cd src && rm -rf ext-libs/ && mkdir ext-libs && npm run movelibcontents",
+    "movelibcontents": "cp node_modules/dexie/dist/dexie.js src/ext-libs && cp node_modules/d3/build/d3.min.js src/ext-libs && cat shavar-prod-lists/disconnect-entitylist.json  | json > src/ext-libs/disconnect-entitylist.json",
    "lint": "npm-run-all lint:*",
    "lint:eslint": "eslint --ext=.js,.json .",
    "lint:webext": "web-ext -s js lint",
--- a/src/css/OpenSans.css
+++ b/src/css/OpenSans.css
--- a/src/css/first-run.css
+++ b/src/css/first-run.css
--- a/src/css/style.css
+++ b/src/css/style.css
--- a/src/first-run.html
+++ b/src/first-run.html
--- a/src/fonts/OpenSans-Bold.ttf
+++ b/src/fonts/OpenSans-Bold.ttf
--- a/src/fonts/OpenSans-Light.ttf
+++ b/src/fonts/OpenSans-Light.ttf
--- a/src/fonts/OpenSans-LightItalic.ttf
+++ b/src/fonts/OpenSans-LightItalic.ttf
--- a/src/fonts/OpenSans-Regular.ttf
+++ b/src/fonts/OpenSans-Regular.ttf
--- a/src/images/lightbeam-48.png
+++ b/src/images/lightbeam-48.png
--- a/src/images/lightbeam-96.png
+++ b/src/images/lightbeam-96.png
--- a/src/images/lightbeam-icon-charcoal.svg
+++ b/src/images/lightbeam-icon-charcoal.svg
--- a/src/images/lightbeam-icon.svg
+++ b/src/images/lightbeam-icon.svg
--- a/src/images/lightbeam_150x45.png
+++ b/src/images/lightbeam_150x45.png
--- a/src/images/lightbeam_icon_about.png
+++ b/src/images/lightbeam_icon_about.png
--- a/src/images/lightbeam_icon_download.png
+++ b/src/images/lightbeam_icon_download.png
--- a/src/images/lightbeam_icon_feedback.png
+++ b/src/images/lightbeam_icon_feedback.png
--- a/src/images/lightbeam_icon_graph.png
+++ b/src/images/lightbeam_icon_graph.png
--- a/src/images/lightbeam_icon_help.png
+++ b/src/images/lightbeam_icon_help.png
--- a/src/images/lightbeam_icon_list.png
+++ b/src/images/lightbeam_icon_list.png
--- a/src/images/lightbeam_icon_reset.png
+++ b/src/images/lightbeam_icon_reset.png
--- a/src/images/lightbeam_icon_website.png
+++ b/src/images/lightbeam_icon_website.png
--- a/src/images/lightbeam_logo-only_16x16.png
+++ b/src/images/lightbeam_logo-only_16x16.png
--- a/src/images/lightbeam_logo-wordmark_300x150.png
+++ b/src/images/lightbeam_logo-wordmark_300x150.png
--- a/src/index.html
+++ b/src/index.html
--- a/src/js/background.js
+++ b/src/js/background.js
--- a/src/js/capture.js
+++ b/src/js/capture.js
--- a/src/js/lightbeam.js
+++ b/src/js/lightbeam.js
--- a/src/js/store.js
+++ b/src/js/store.js
@ -1,5 +1,5 @@
 const store = {
-  ALLOWLIST_URL: '/shavar-prod-lists/disconnect-entitylist.json',
+  ALLOWLIST_URL: '/ext-libs/disconnect-entitylist.json',
  db: null,

  async init() {
--- a/src/js/storeChild.js
+++ b/src/js/storeChild.js
--- a/src/js/viz.js
+++ b/src/js/viz.js
--- a/src/manifest.json
+++ b/src/manifest.json
@ -29,7 +29,7 @@
  "applications": {
    "gecko": {
      "id": "jid1-F9UJ2thwoAm5gQ@jetpack",
-      "strict_min_version": "52"
+      "strict_min_version": "52.0"
    }
  },