From c8120a948719349a123c87162b3be680fd97a2ee Mon Sep 17 00:00:00 2001
From: abhijithvijayan <34790378+abhijithvijayan@users.noreply.github.com>
Date: Mon, 6 Apr 2020 10:16:52 +0530
Subject: [PATCH] fix: use package.json version for manifest generation

---
 package.json      | 2 +-
 webpack.config.js | 8 ++++++--
 yarn.lock         | 9 +++++----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 31744ea..3447230 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "webpack-cli": "^3.3.11",
     "webpack-extension-reloader": "^1.1.4",
     "webpack-fix-style-only-entries": "^0.4.0",
-    "wext-manifest-loader": "^1.0.1",
+    "wext-manifest-loader": "^1.1.2",
     "wext-manifest-webpack-plugin": "^1.0.3",
     "zip-webpack-plugin": "^3.0.0"
   }
diff --git a/webpack.config.js b/webpack.config.js
index f04dfa9..5eb9425 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -62,8 +62,12 @@ module.exports = {
             {
                 type: 'javascript/auto', // prevent webpack handling json with its own loaders,
                 test: /manifest\.json$/,
-                use: 'wext-manifest-loader',
-                exclude: /node_modules/,
+                use: {
+                    loader: 'wext-manifest-loader',
+                    options: {
+                        usePackageJSONVersion: true, // set to false to not use package.json version for manifest
+                    },
+                },
             },
             {
                 test: /.(js|jsx)$/,
diff --git a/yarn.lock b/yarn.lock
index 80be772..5b34f28 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8091,12 +8091,13 @@ webpack@^4.42.1:
     watchpack "^1.6.0"
     webpack-sources "^1.4.1"
 
-wext-manifest-loader@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/wext-manifest-loader/-/wext-manifest-loader-1.0.1.tgz#8b8c5fbbd1f78deda2286e7d23c4e3c8920a03b7"
-  integrity sha512-MSjoe2xhAu2C/3hhOD+/oDR8o0tzqsKQBREgfcE0NBMAAU0BumXCxNTeC0AxoFL8VtV+hjY4+Ljm+gcAIaJ0iw==
+wext-manifest-loader@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/wext-manifest-loader/-/wext-manifest-loader-1.1.2.tgz#a8c9c905fea0e0f611f5afd7b720c9ca4e8f7346"
+  integrity sha512-H8j2iMKGmeqBvGCYnWb6KFamG/jRtElIGiJJp7bgue/mKGlmR4LqzbXKBHBkaSyZRf1CqzykVt2BVEGvFbc2TQ==
   dependencies:
     loader-utils "^2.0.0"
+    schema-utils "^2.6.5"
 
 wext-manifest-webpack-plugin@^1.0.3:
   version "1.0.3"