1.3.3: fix firefox CSP problem

.eslintrc.yml

@@ -12,4 +12,5 @@ rules:
 globals:
   DEBUG: true
   PRODUCTION: true
+  MOZ: true
   ga: true

config.js

@@ -2,8 +2,10 @@
 module.exports = {
   development: {
     __CLIENT_ID__: '530831729511-eq8apt6dhjimbmdli90jp2ple0lfmn3l.apps.googleusercontent.com',
+    __DEV_CSP__: process.env.MOZ ? '' : ' http://localhost:8098 chrome-extension://nhdogjmejiglipccpnnnanhbledajbpd'
   },
   production: {
     __CLIENT_ID__: '530831729511-dclgvblhv7var13mvpjochb5f295a6vc.apps.googleusercontent.com',
+    __DEV_CSP__: ''
   }
 }

package.json

@@ -8,6 +8,7 @@
   "license": "MIT",
   "scripts": {
     "dev": "NODE_ENV=development webpack --watch",
+    "dev:moz": "MOZ=1 yarn dev",
     "build": "NODE_ENV=production webpack",
     "postbuild": "yarn run package",
     "package": "rm -f dist.zip && cd dist && zip -r ../dist.zip ./*",

src/background.js

@@ -6,7 +6,7 @@ import __ from './common/i18n'
 import browser from 'webextension-polyfill'
 import boss from './common/service/boss'
 
-if (DEBUG) import(
+if (DEBUG && !MOZ) import(
   /* webpackChunkName: "autoreload", webpackMode: "lazy" */
   './common/autoreload'
 ).then(({autoreload}) => autoreload())

src/manifest.json

@@ -1,17 +1,19 @@
 {
   "manifest_version": 2,
   "name": "__MSG_ext_name__",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "default_locale": "en",
   "description": "__MSG_ext_desc__",
   "author": "WangJie <[email protected]>",
-  "icons" : {
+  "icons": {
     "16": "assets/icons/icon_16.png",
     "48": "assets/icons/icon_48.png",
     "128": "assets/icons/icon_128.png"
   },
   "background": {
-    "scripts": ["background.js"],
+    "scripts": [
+      "background.js"
+    ],
     "persistent": false
   },
   "commands": {
@@ -37,6 +39,11 @@
     }
   },
   "browser_action": {
+    "default_icon": {
+      "16": "assets/icons/icon_16.png",
+      "24": "assets/icons/icon_48.png",
+      "32": "assets/icons/icon_128.png"
+    }
   },
   "permissions": [
     "contextMenus",
@@ -54,10 +61,9 @@
   },
   "offline_enabled": true,
   "options_page": "index.html#/app/options",
-  "options_ui":
-  {
+  "options_ui": {
     "page": "index.html#/app/options",
     "open_in_tab": true
   },
-  "content_security_policy": "script-src 'self' 'unsafe-eval' https://www.google-analytics.com https://apis.google.com http://localhost:8098 chrome-extension://nhdogjmejiglipccpnnnanhbledajbpd; object-src 'self'"
+  "content_security_policy": "script-src 'self' 'unsafe-eval' https://www.google-analytics.com https://apis.google.com __DEV_CSP__; object-src 'self'"
 }

webpack.config.js

@@ -11,6 +11,7 @@ const config = require('./config')
 
 const resolve = (...paths) => path.join(__dirname, ...paths)
 const mode = process.env.NODE_ENV || 'development'
+const moz = process.env.MOZ
 module.exports = {
   mode,
   entry: {
@@ -25,6 +26,7 @@ module.exports = {
     new webpack.DefinePlugin({
       DEBUG: mode === 'development',
       PRODUCTION: mode !== 'development',
+      MOZ: moz,
     }),
     new CleanWebpackPlugin(['dist']),
     new CopyWebpackPlugin([