Merge pull request #73 from pureooze/browser-specific-manifest

Fixed issue where manifest is not tailored for specific browser

Author: pureooze

manifest/chrome.json

@@ -0,0 +1,15 @@
+{
+  "background": {
+    "page": "background_page.html",
+    "persistent": true
+  },
+  "commands": {
+    "toggleSaka4": {
+      "description": "Toggle Saka",
+      "global": true
+    }
+  },
+  "permissions": ["chrome://favicon/"],
+  "key":
+    "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsgFNwezxiHxK/AIKh9K4LVefUPIDisRzQLmmRBjFftr3yrxJuLBaO1LvMISsRlvbFmbZ0B6KHzyGDEnmOMIo3X9wUxBwSV+q3kigp3XFryllhOHbKcl+FUVMRQabBs49CS6ttq2l4Jx+ULEsmprqub+IV+cvY3slXxxuyMF0TjmnRwDYnSREgbfzK7g/msZ8e0gi+hrPETNVKOibbVwd8S7gSy0hDug71WOA338FGe08DiXpnVoKLL0fmd+TO6Z4fAhH+oSqr15WIt6qCglYmZi2BEydL0zhUcidkis0zJjNX5nQi0xzggmxwsMJyfmfGoniwsUg3rAy+M0v5gaSUQIDAQAB"
+}

static/manifest.json manifest/common.json

@@ -9,8 +9,7 @@
     "open_in_tab": true
   },
   "background": {
-    "page": "background_page.html",
-    "persistent": true
+    "page": "background_page.html"
   },
   "commands": {
     "toggleSaka": {
@@ -34,8 +33,7 @@
       "suggested_key": {
         "default": "Ctrl+Shift+1"
       },
-      "description": "Toggle Saka",
-      "global": true
+      "description": "Toggle Saka"
     }
   },
   "browser_action": {
@@ -56,20 +54,12 @@
     "sessions",
     "history",
     "bookmarks",
-    "chrome://favicon/",
     "storage",
     "contextMenus"
   ],
   "web_accessible_resources": [
     "saka.html",
     "material-icons.css",
     "MaterialIcons-Regular.woff2"
-  ],
-  "key":
-    "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsgFNwezxiHxK/AIKh9K4LVefUPIDisRzQLmmRBjFftr3yrxJuLBaO1LvMISsRlvbFmbZ0B6KHzyGDEnmOMIo3X9wUxBwSV+q3kigp3XFryllhOHbKcl+FUVMRQabBs49CS6ttq2l4Jx+ULEsmprqub+IV+cvY3slXxxuyMF0TjmnRwDYnSREgbfzK7g/msZ8e0gi+hrPETNVKOibbVwd8S7gSy0hDug71WOA338FGe08DiXpnVoKLL0fmd+TO6Z4fAhH+oSqr15WIt6qCglYmZi2BEydL0zhUcidkis0zJjNX5nQi0xzggmxwsMJyfmfGoniwsUg3rAy+M0v5gaSUQIDAQAB",
-  "applications": {
-    "gecko": {
-      "id": "{7d7cad35-2182-4457-972d-5a41a2051240}"
-    }
-  }
+  ]
 }

manifest/firefox.json

@@ -0,0 +1,7 @@
+{
+  "applications": {
+    "gecko": {
+      "id": "{7d7cad35-2182-4457-972d-5a41a2051240}"
+    }
+  }
+}

package.json

@@ -51,6 +51,7 @@
     "eslint-plugin-react": "^7.2.0",
     "eslint-plugin-standard": "^3.0.1",
     "extract-loader": "^2.0.1",
+    "generate-json-webpack-plugin": "^0.3.1",
     "html-loader": "^0.4.5",
     "jest": "^23.5.0",
     "jest-dom": "^1.12.0",
@@ -66,7 +67,8 @@
     "sinon-chrome": "^2.3.1",
     "style-loader": "^0.18.2",
     "webpack": "^4.0.0",
-    "webpack-cli": "^2.0.14"
+    "webpack-cli": "^2.0.14",
+    "webpack-merge": "^4.1.4"
   },
   "dependencies": {
     "fuse.js": "^3.2.0",

webpack.config.js

@@ -1,16 +1,19 @@
 const webpack = require('webpack');
 const BabiliPlugin = require('babili-webpack-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
-
-// process.traceDeprecation = true;
-// markdown convert to html
+const GenerateJsonPlugin = require('generate-json-webpack-plugin');
 const marked = require('marked');
+const path = require('path');
+const merge = require('webpack-merge');
+const { version } = require('./manifest/common.json'); // mode controls:
 
 const renderer = new marked.Renderer();
-
-const path = require('path');
+// process.traceDeprecation = true;
+// markdown convert to html
 
 module.exports = function webpackConfig(env) {
+  const [mode, platform, benchmark] = env.split(':');
+
   const config = {
     resolve: {
       alias: {
@@ -107,13 +110,20 @@ module.exports = function webpackConfig(env) {
           from: '**/config.json',
           to: 'config_[folder].json'
         }
-      ])
+      ]),
+      new GenerateJsonPlugin(
+        'manifest.json',
+        merge(
+          require('./manifest/common.json'),
+          require(`./manifest/${platform}.json`),
+          { version }
+        ),
+        null,
+        2
+      )
     ]
   };
 
-  const [mode, platform, benchmark] = env.split(':');
-  const version = require('./static/manifest.json').version;
-  // mode controls:
   // 1. SAKA_DEBUG: boolean(true | false)
   //   * true for development builds
   //   * false for production build

yarn.lock

@@ -4503,6 +4503,10 @@ generate-function@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
 
+generate-json-webpack-plugin@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/generate-json-webpack-plugin/-/generate-json-webpack-plugin-0.3.1.tgz#b5ebb383ba552d8be663ce177ed134f480735144"
+
 generate-object-property@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
@@ -10258,6 +10262,12 @@ webpack-hot-middleware@^2.21.2:
     querystring "^0.2.0"
     strip-ansi "^3.0.0"
 
+webpack-merge@^4.1.4:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.4.tgz#0fde38eabf2d5fd85251c24a5a8c48f8a3f4eb7b"
+  dependencies:
+    lodash "^4.17.5"
+
 webpack-sources@^1.0.1, webpack-sources@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54"