split extension v2 & v3

contrib/build-fast-web.sh

@@ -84,6 +84,12 @@ function build_preact_compat() {
   esbuild $BUNDLE_OPTIONS --loader:.js=jsx vendor/preact/test-utils/src/index.js > $DIST/react-dom/test-utils/index.js
 }
 
+function build_qrcode() {
+  mkdir -p $DIST/qrcode-generator
+
+  esbuild $BUNDLE_OPTIONS vendor/qrcode-generator/js/qrcode.js > $DIST/qrcode-generator/index.js
+}
+
 function build_history() {
   mkdir -p $DIST/{history,resolve-pathname,value-equal,tiny-warning,tiny-invariant}
 
@@ -133,6 +139,7 @@ build_preact
 build_preact-router
 build_preact_compat
 
+build_qrcode
 build_history
 build_linaria
 

packages/taler-wallet-webextension/clean_and_build.sh

@@ -2,5 +2,8 @@
 # This file is in the public domain.
 [ "also-wallet" == "$1" ] && { pnpm -C ../taler-wallet-core/ compile || exit 1; }
 [ "also-util" == "$1" ] && { pnpm -C ../taler-util/ prepare || exit 1; }
-pnpm clean && pnpm compile && rm -rf extension/ && ./pack.sh  && (cd extension/ && unzip taler*.zip)
+pnpm clean && pnpm compile && rm -rf extension/ && ./pack.sh
+(cd extension/v2 && unzip taler*.zip)
+(cd extension/v3 && unzip taler*.zip)
+
 

packages/taler-wallet-webextension/clean_and_build_fast.sh

@@ -1,4 +1,11 @@
 #!/usr/bin/env bash
 # This file is in the public domain.
-rm -rf dist lib tsconfig.tsbuildinfo && (cd ../.. && rm -rf build/web && ./contrib/build-fast-web.sh) && rm -rf extension/ && ./pack.sh  && (cd extension/ && unzip taler*.zip)
+set -e
+
+rm -rf dist lib tsconfig.tsbuildinfo
+(cd ../.. && rm -rf build/web && ./contrib/build-fast-web.sh)
+rm -rf extension/
+./pack.sh
+(cd extension/v2 && unzip taler*.zip)
+(cd extension/v3 && unzip taler*.zip)
 

packages/taler-wallet-webextension/manifest-v2.json

@@ -1,39 +1,32 @@
 {
   "manifest_version": 2,
-
   "name": "GNU Taler Wallet (git)",
   "description": "Privacy preserving and transparent payments",
   "author": "GNU Taler Developers",
   "version": "0.8.1.15",
   "version_name": "0.8.1-dev.15",
-
   "minimum_chrome_version": "51",
   "minimum_opera_version": "36",
-
   "applications": {
     "gecko": {
       "id": "wallet@taler.net",
       "strict_min_version": "57.0"
     }
   },
-
   "icons": {
     "32": "static/img/icon.png",
     "128": "static/img/logo.png"
   },
-
   "permissions": [
-    "storage",
+    "unlimitedStorage",
     "activeTab"
   ],
-
   "optional_permissions": [
     "webRequest",
     "webRequestBlocking",
     "http://*/*",
     "https://*/*"
   ],
-
   "browser_action": {
     "default_icon": {
       "32": "static/img/icon.png"
@@ -41,9 +34,8 @@
     "default_title": "Taler",
     "default_popup": "static/popup.html"
   },
-
   "background": {
     "page": "static/background.html",
     "persistent": true
   }
-}
+}

packages/taler-wallet-webextension/manifest-v3.json

@@ -0,0 +1,51 @@
+{
+  "manifest_version": 3,
+
+  "name": "GNU Taler Wallet (git)",
+  "description": "Privacy preserving and transparent payments",
+  "author": "GNU Taler Developers",
+  "version": "0.8.1.15",
+  "version_name": "0.8.1-dev.15",
+
+  "minimum_chrome_version": "88",
+
+  "applications": {
+    "gecko": {
+      "id": "wallet@taler.net",
+      "strict_min_version": "57.0"
+    }
+  },
+
+  "icons": {
+    "32": "static/img/icon.png",
+    "128": "static/img/logo.png"
+  },
+
+  "permissions": [
+    "unlimitedStorage",
+    "activeTab"
+  ],
+
+  "optional_permissions": [
+    "webRequest",
+    "webRequestBlocking"
+  ],
+
+  "host_permissions":[
+    "http://*/*",
+    "https://*/*"
+  ],
+
+  "action": {
+    "default_icon": {
+      "32": "static/img/icon.png"
+    },
+    "default_title": "Taler",
+    "default_popup": "static/popup.html"
+  },
+
+  "background": {
+    "page": "static/background.html",
+    "persistent": true
+  }
+}

packages/taler-wallet-webextension/pack.sh

@@ -8,15 +8,29 @@ if [[ ! -e package.json ]]; then
   exit 1
 fi
 
-vers_manifest=$(jq -r '.version' manifest.json)
+vers_manifest=$(jq -r '.version' manifest-v2.json)
 
 zipfile="taler-wallet-webextension-${vers_manifest}.zip"
 
 TEMP_DIR=$(mktemp -d)
-jq '. | .name = "GNU Taler Wallet" ' manifest.json > $TEMP_DIR/manifest.json
+jq '. | .name = "GNU Taler Wallet" ' manifest-v2.json > $TEMP_DIR/manifest.json
 cp -r dist static $TEMP_DIR
 (cd $TEMP_DIR && zip -r "$zipfile" dist static manifest.json)
-mkdir -p extension
+mkdir -p extension/v2
-mv "$TEMP_DIR/$zipfile" ./extension/
+mv "$TEMP_DIR/$zipfile" ./extension/v2/
 rm -rf $TEMP_DIR
-echo "Packed webextension: extension/$zipfile"
+echo "Packed webextension: extension/v2/$zipfile"
+
+
+vers_manifest=$(jq -r '.version' manifest-v3.json)
+
+zipfile="taler-wallet-webextension-${vers_manifest}.zip"
+
+TEMP_DIR=$(mktemp -d)
+jq '. | .name = "GNU Taler Wallet" ' manifest-v3.json > $TEMP_DIR/manifest.json
+cp -r dist static $TEMP_DIR
+(cd $TEMP_DIR && zip -r "$zipfile" dist static manifest.json)
+mkdir -p extension/v3
+mv "$TEMP_DIR/$zipfile" ./extension/v3/
+rm -rf $TEMP_DIR
+echo "Packed webextension: extension/v3/$zipfile"

vendor

@@ -1 +1 @@
-Subproject commit 38acabfa6089ab8ac469c12b5f55022fb96935e5
+Subproject commit 8b5f7590449f68a529e56caec647d55d119799d6